初始化

This commit is contained in:
zmj 2023-12-25 00:18:59 +08:00
parent 557827e55b
commit 78d29c53b2
16 changed files with 414 additions and 662 deletions

7
.env.build Normal file
View File

@ -0,0 +1,7 @@
NODE_ENV = 'test'
VITE_APP_BASE_URL='http://test-suyuan.lihaink.cn'

7
.env.dev Normal file
View File

@ -0,0 +1,7 @@
NODE_ENV = 'production'
VITE_APP_BASE_URL='http://ceshi-suyuan.lihaink.cn'

View File

@ -1,4 +0,0 @@
NODE_ENV = 'development'
# Base API
VITE_APP_BASE_URL=''

3
.env.pro Normal file
View File

@ -0,0 +1,3 @@
NODE_ENV = 'production'
# Base API
VITE_APP_BASE_URL='https://suyuan.lihaink.cn'

View File

@ -1,3 +0,0 @@
NODE_ENV = 'production'
# Base API
VITE_APP_BASE_URL=''

View File

@ -3,9 +3,12 @@
"version": "0.0.0",
"license": "MIT",
"scripts": {
"dev": "vite",
"serve": "vite",
"dev": "vite --mode dev --port 8080",
"pro": "vite --mode pro --port 8080",
"preview": "vite preview --port 4173",
"build": "vite build && node scripts/release.mjs",
"build1": "vite build && node scripts/release.mjs && --mode build",
"type-check": "vue-tsc --noEmit",
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore"
},

View File

@ -3,11 +3,9 @@ const config = {
title: '后台管理系统', //网站默认标题
version: '1.6.0', //版本号
baseUrl: `${
import.meta.env.VITE_APP_BASE_URL
import.meta.env.VITE_APP_BASE_URL
}/`, //请求接口域名
// baseUrl: 'http://127.0.0.1:30005/',
urlPrefix: 'adminapi', //请求默认前缀
timeout: 10 * 1000 //请求超时时长
}
export default config

View File

@ -10,3 +10,6 @@ const app = createApp(App)
app.use(install)
app.provide('base_url', configs.baseUrl+configs.urlPrefix);
app.mount('#app')

View File

@ -1,42 +1,20 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="650px"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-form-item label="土地ID" prop="id">
<el-input v-model="formData.id" disabled clearable placeholder="请输入土地ID" />
</el-form-item>
<el-form-item label="土地名称" prop="title">
<el-input
v-model="formData.title"
disabled
clearable
placeholder="请输入土地名称"
/>
</el-form-item>
<el-form-item label="绑定产品" prop="product_id">
<el-select
v-model="formData.product_id"
remote
filterable
placeholder="请输入产品信息"
:remote-method="queryProduct"
:loading="loading"
>
<el-option
v-for="(item, index) in optionsData.product"
:key="index"
:label="item.productinfo"
:value="item.id"
/>
</el-select>
</el-form-item>
<popup ref="popupRef" :title="popupTitle" :async="true" width="650px" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-form-item label="土地ID" prop="id">
<el-input v-model="formData.id" disabled clearable placeholder="请输入土地ID" />
</el-form-item>
<el-form-item label="土地名称" prop="title">
<el-input v-model="formData.title" disabled clearable placeholder="请输入土地名称" />
</el-form-item>
<el-form-item label="绑定产品" prop="product_id">
<el-select v-model="formData.product_id" remote filterable placeholder="请输入产品信息"
:remote-method="queryProduct" :loading="loading">
<el-option v-for="(item, index) in optionsData.product" :key="index" :label="item.productinfo"
:value="item.id" />
</el-select>
</el-form-item>
</el-form>
</popup>
</div>

View File

@ -1,175 +1,79 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="650px"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-form-item v-if="formData.root == 1" label="所属用户" prop="user_id">
<el-select
v-model="formData.user_id"
remote
filterable
placeholder="请输入用户信息"
:remote-method="queryUser"
:loading="loading"
>
<el-option
v-for="(item, index) in optionsData.user"
:key="index"
:label="item.userinfo"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="土地名称" prop="title">
<el-input v-model="formData.title" clearable placeholder="请输入土地名称" />
</el-form-item>
<el-form-item label="详细地址" prop="address">
<el-input v-model="formData.address" clearable placeholder="请输入详细地址" />
</el-form-item>
<el-form-item label="土地面积" prop="total_area">
<el-input v-model="formData.total_area" clearable placeholder="请输入土地面积" />
</el-form-item>
<!-- <el-form-item label="剩余面积" prop="residual_area">
<div class="edit-popup">
<popup ref="popupRef" :title="popupTitle" :async="true" width="650px" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-form-item v-if="formData.root == 1" label="所属用户" prop="user_id">
<el-select v-model="formData.user_id" remote filterable placeholder="请输入用户信息" :remote-method="queryUser"
:loading="loading">
<el-option v-for="(item, index) in optionsData.user" :key="index" :label="item.userinfo" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="土地名称" prop="title">
<el-input v-model="formData.title" clearable placeholder="请输入土地名称" />
</el-form-item>
<el-form-item label="详细地址" prop="address">
<el-input v-model="formData.address" clearable placeholder="请输入详细地址" />
</el-form-item>
<el-form-item label="土地面积" prop="total_area">
<el-input v-model="formData.total_area" clearable placeholder="请输入土地面积" />
</el-form-item>
<!-- <el-form-item label="剩余面积" prop="residual_area">
<el-input v-model="formData.residual_area" clearable disabled placeholder="请输入剩余面积" />
</el-form-item> -->
<el-form-item
label="省"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
prop="province_code"
>
<el-select
v-model="formData.province_code"
placeholder="请选择省"
clearable
@change="province_change"
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in datas.provinceOptions"
:key="index"
:label="item.province_name"
:value="item.province_code"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label="市"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
prop="city_code"
>
<el-select
v-model="formData.city_code"
placeholder="请选择市"
clearable
@change="city_change"
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in datas.cityOptions"
:key="index"
:label="item.city_name"
:value="item.city_code"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label="区"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
prop="county_code"
>
<el-select
v-model="formData.county_code"
placeholder="请选择区"
clearable
@change="area_change"
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in datas.areaOptions"
:key="index"
:label="item.county_name"
:value="item.county_code"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label="镇"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
prop="town_code"
>
<el-select
v-model="formData.town_code"
placeholder="请选择镇"
clearable
@change="street_change"
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in datas.streetOptions"
:key="index"
:label="item.town_name"
:value="item.town_code"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label="村"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
prop="village_code"
>
<el-select
v-model="formData.village_code"
placeholder="请选择村"
clearable
@change="village_change"
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in datas.villageOptions"
:key="index"
:label="item.village_name"
:value="item.village_code"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label="队"
:rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
prop="group_code"
>
<el-select
v-model="formData.group_code"
placeholder="请选择队"
clearable
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in datas.brigadeOptions"
:key="index"
:label="item.group_name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="土地负责人" prop="master_name">
<el-input v-model="formData.master_name" clearable placeholder="请输入土地负责人" />
</el-form-item>
<el-form-item label="负责人电话" prop="master_phone">
<el-input v-model="formData.master_phone" clearable placeholder="请输入负责人电话" />
</el-form-item>
<!-- <el-form-item label="土地图片" prop="pic">
<el-form-item label="省" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" prop="province_code">
<el-select v-model="formData.province_code" placeholder="请选择省" clearable @change="province_change"
:style="{ width: '100%' }">
<el-option v-for="(item, index) in datas.provinceOptions" :key="index" :label="item.province_name"
:value="item.province_code"></el-option>
</el-select>
</el-form-item>
<el-form-item label="市" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" prop="city_code">
<el-select v-model="formData.city_code" placeholder="请选择市" clearable @change="city_change"
:style="{ width: '100%' }">
<el-option v-for="(item, index) in datas.cityOptions" :key="index" :label="item.city_name"
:value="item.city_code"></el-option>
</el-select>
</el-form-item>
<el-form-item label="区" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" prop="county_code">
<el-select v-model="formData.county_code" placeholder="请选择区" clearable @change="area_change"
:style="{ width: '100%' }">
<el-option v-for="(item, index) in datas.areaOptions" :key="index" :label="item.county_name"
:value="item.county_code"></el-option>
</el-select>
</el-form-item>
<el-form-item label="镇" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" prop="town_code">
<el-select v-model="formData.town_code" placeholder="请选择镇" clearable @change="street_change"
:style="{ width: '100%' }">
<el-option v-for="(item, index) in datas.streetOptions" :key="index" :label="item.town_name"
:value="item.town_code"></el-option>
</el-select>
</el-form-item>
<el-form-item label="村" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" prop="village_code">
<el-select v-model="formData.village_code" placeholder="请选择村" clearable @change="village_change"
:style="{ width: '100%' }">
<el-option v-for="(item, index) in datas.villageOptions" :key="index" :label="item.village_name"
:value="item.village_code"></el-option>
</el-select>
</el-form-item>
<el-form-item label="队" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" prop="group_code">
<el-select v-model="formData.group_code" placeholder="请选择队" clearable :style="{ width: '100%' }">
<el-option v-for="(item, index) in datas.brigadeOptions" :key="index" :label="item.group_name"
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="土地负责人" prop="master_name">
<el-input v-model="formData.master_name" clearable placeholder="请输入土地负责人" />
</el-form-item>
<el-form-item label="负责人电话" prop="master_phone">
<el-input v-model="formData.master_phone" clearable placeholder="请输入负责人电话" />
</el-form-item>
<!-- <el-form-item label="土地图片" prop="pic">
<material-picker v-model="formData.pic" :limit="4" />
</el-form-item> -->
</el-form>
</popup>
</div>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="landEdit">
@ -187,10 +91,10 @@ import {
} from "@/api/common";
import type { PropType } from 'vue'
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
@ -206,127 +110,127 @@ const popupTitle = computed(() => {
getVillageList();
getBrigadeList();
}
return mode.value == 'edit' ? '编辑土地' : '新增土地'
return mode.value == 'edit' ? '编辑土地' : '新增土地'
})
//
const formData = reactive({
id: '',
user_id: '',
root: 0,
title: '',
total_area: '',
residual_area: '',
province_code: '',
province_name: '',
city_code: '',
city_name: '',
county_code: '',
county_name: '',
town_code: '',
town_name: '',
village_code: '',
village_name: '',
group_code: '',
group_name: '',
master_name: '',
master_phone: '',
address: '',
pic: '',
mode: mode.value
id: '',
user_id: '',
root: 0,
title: '',
total_area: '',
residual_area: '',
province_code: '',
province_name: '',
city_code: '',
city_name: '',
county_code: '',
county_name: '',
town_code: '',
town_name: '',
village_code: '',
village_name: '',
group_code: '',
group_name: '',
master_name: '',
master_phone: '',
address: '',
pic: '',
mode: mode.value
})
//
const formRules = reactive<any>({
title: [{
required: true,
message: '请输入土地名称',
trigger: ['blur']
}],
address: [{
required: true,
message: '请输入详细地址',
trigger: ['blur']
}],
master_name: [{
required: true,
message: '请输入土地负责人',
trigger: ['blur']
}],
master_phone: [{
required: true,
message: '请输入负责人电话',
trigger: ['blur']
}]
title: [{
required: true,
message: '请输入土地名称',
trigger: ['blur']
}],
address: [{
required: true,
message: '请输入详细地址',
trigger: ['blur']
}],
master_name: [{
required: true,
message: '请输入土地负责人',
trigger: ['blur']
}],
master_phone: [{
required: true,
message: '请输入负责人电话',
trigger: ['blur']
}]
})
//
const setFormData = async (data: Record<any, any>) => {
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key]
if (key == 'pic') {
formData[key] = ''
}
}
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key]
if (key == 'pic') {
formData[key] = ''
}
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiLandDetail({
id: row.id
})
setFormData(data)
const data = await apiLandDetail({
id: row.id
})
setFormData(data)
}
const { optionsData } = useDictOptions<{
user: any[]
user: any[]
}>({
user: {
api: getUserList
}
user: {
api: getUserList
}
})
const loading = ref(false)
const queryUser = async (query: string) => {
loading.value = true
const userList = await getUserList({
keyword: query ?? ''
})
optionsData.user = userList
loading.value = false
loading.value = true
const userList = await getUserList({
keyword: query ?? ''
})
optionsData.user = userList
loading.value = false
}
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiLandEdit(data)
: await apiLandAdd(data)
popupRef.value?.close()
emit('success')
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiLandEdit(data)
: await apiLandAdd(data)
popupRef.value?.close()
emit('success')
}
//
const open = (type = 'add') => {
mode.value = type
popupRef.value?.open()
getUserInfo()
.then((res: any) => {
const root = res.user.root ?? 0
formData.root = root
})
.catch((err: any) => {
console.log('err', err)
})
mode.value = type
popupRef.value?.open()
getUserInfo()
.then((res: any) => {
const root = res.user.root ?? 0
formData.root = root
})
.catch((err: any) => {
console.log('err', err)
})
}
//
const handleClose = () => {
emit('close')
emit('close')
}
const datas = reactive({
@ -340,8 +244,8 @@ const datas = reactive({
function province_change(value: string) {
getCityList();
//
datas['provinceOptions'].forEach((item: any) =>{
if(item.province_code == value) {
datas['provinceOptions'].forEach((item: any) => {
if (item.province_code == value) {
formData.province_name = item.province_name
}
})
@ -373,8 +277,8 @@ const getAreaList = async () => {
const data = await apiAreaList({ area: formData.city_code });
datas["areaOptions"] = data;
//
datas['cityOptions'].forEach((item: any) =>{
if(item.city_code == formData.city_code) {
datas['cityOptions'].forEach((item: any) => {
if (item.city_code == formData.city_code) {
formData.city_name = item.city_name
}
})
@ -383,8 +287,8 @@ const getStreetList = async () => {
const data = await apiStreetList({ street: formData.county_code });
datas["streetOptions"] = data;
//
datas['areaOptions'].forEach((item: any) =>{
if(item.county_code == formData.county_code) {
datas['areaOptions'].forEach((item: any) => {
if (item.county_code == formData.county_code) {
formData.county_name = item.county_name
}
})
@ -392,9 +296,9 @@ const getStreetList = async () => {
const getVillageList = async () => {
const data = await apiVillageList({ village: formData.town_code });
datas["villageOptions"] = data;
//
datas['streetOptions'].forEach((item: any) =>{
if(item.town_code == formData.town_code) {
//
datas['streetOptions'].forEach((item: any) => {
if (item.town_code == formData.town_code) {
formData.town_name = item.town_name
}
})
@ -403,8 +307,8 @@ const getBrigadeList = async () => {
const data = await apiBrigadeList();
datas["brigadeOptions"] = data;
//
datas['villageOptions'].forEach((item: any) =>{
if(item.village_code == formData.village_code) {
datas['villageOptions'].forEach((item: any) => {
if (item.village_code == formData.village_code) {
formData.village_name = item.village_name
}
})
@ -412,8 +316,8 @@ const getBrigadeList = async () => {
getProvinceList(); //
defineExpose({
open,
setFormData,
getDetail
open,
setFormData,
getDetail
})
</script>

View File

@ -1,42 +1,34 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form
class="mb-[-16px]"
:model="queryParams"
inline
>
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="用户ID" prop="user_id">
<el-input class="w-[280px]" v-model="queryParams.user_id" clearable placeholder="请输入用户ID" />
</el-form-item>
<el-input class="w-[280px]" v-model="queryParams.user_id" clearable placeholder="请输入用户ID" />
</el-form-item>
<el-form-item label="土地名称" prop="title">
<el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入土地名称" />
</el-form-item>
<el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入土地名称" />
</el-form-item>
<el-form-item label="土地负责人" prop="master_name">
<el-input class="w-[280px]" v-model="queryParams.master_name" clearable placeholder="请输入土地负责人" />
</el-form-item>
<el-input class="w-[280px]" v-model="queryParams.master_name" clearable placeholder="请输入土地负责人" />
</el-form-item>
<el-form-item label="负责人电话" prop="master_phone">
<el-input class="w-[280px]" v-model="queryParams.master_phone" clearable placeholder="请输入负责人电话" />
</el-form-item>
<el-input class="w-[280px]" v-model="queryParams.master_phone" clearable placeholder="请输入负责人电话" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-card class="!border-none" v-loading="pager.loading" shadow="never" >
<el-button v-perms="['land.land/add']" type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button
v-perms="['land.land/delete']"
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
<el-button v-perms="['land.land/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
删除
</el-button>
<div class="mt-4">
@ -56,64 +48,36 @@
<el-table-column label="负责人电话" prop="master_phone" show-overflow-tooltip />
<el-table-column label="操作" width="400" align="center" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['land.land/edit']"
type="primary"
link
@click="handleEdit(row)"
>
<el-button v-perms="['land.land/edit']" type="primary" link @click="handleEdit(row)">
编辑
</el-button>
<el-button
v-perms="['land.land/bind']"
type="primary"
link
@click="handleBind(row)"
>
<el-button v-perms="['land.land/bind']" type="primary" link @click="handleBind(row)">
绑定产品
</el-button>
<el-button
v-perms="['land.product/lists']"
type="primary"
link
>
<router-link
:to="{
path: getRoutePath('land.product/lists'),
query: {
land_id: row.id
}
}"
>
<el-button v-perms="['land.product/lists']" type="primary" link>
<router-link :to="{
path: getRoutePath('land.product/lists'),
query: {
land_id: row.id
}
}">
产品管理
</router-link>
</el-button>
<el-button type="primary" link @click="handleDetail(row)"
>
<el-button type="primary" link @click="handleDetail(row)">
土地图片
</el-button>
<el-button
v-perms="['land.land_plant/lists']"
type="primary"
link
>
<router-link
:to="{
path: getRoutePath('land.land_plant/lists'),
query: {
land_id: row.id
}
}"
>
<el-button v-perms="['land.land_plant/lists']" type="primary" link>
<router-link :to="{
path: getRoutePath('land.land_plant/lists'),
query: {
land_id: row.id
}
}">
种植信息
</router-link>
</el-button>
<el-button
v-perms="['land.land/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
<el-button v-perms="['land.land/delete']" type="danger" link @click="handleDelete(row.id)">
删除
</el-button>
</template>
@ -130,17 +94,8 @@
<el-dialog v-model="dialogPicVisible" title="土地图片" center>
<div style="display: inline-block; margin: 12px" v-for="img in detailData.picData" :key="img">
<el-image
style="width: 200px; height: 200px"
:src="img"
:zoom-rate="1.2"
:max-scale="5"
:min-scale="0.2"
:preview-src-list="detailData.picData"
:initial-index="4"
fit="cover"
center
/>
<el-image style="width: 200px; height: 200px" :src="img" :zoom-rate="1.2" :max-scale="5" :min-scale="0.2"
:preview-src-list="detailData.picData" :initial-index="4" fit="cover" center />
</div>
</el-dialog>
</template>
@ -155,6 +110,7 @@ import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
import BindPopup from './bind.vue'
const { query } = useRoute()
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
const bindRef = shallowRef<InstanceType<typeof BindPopup>>()

View File

@ -1,74 +1,67 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="650px"
@confirm="handleSubmit"
@close="handleClose"
>
<popup ref="popupRef" :title="popupTitle" :async="true" width="650px" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="170px" :rules="formRules">
<el-form-item label="土壤最高温度" prop="soil_temp_max">
<el-input v-model="formData.soil_temp_max" clearable placeholder="请输入土壤最高温度" />
</el-form-item>
<el-input v-model="formData.soil_temp_max" clearable placeholder="请输入土壤最高温度" />
</el-form-item>
<el-form-item label="土壤最低温度" prop="soil_temp_min">
<el-input v-model="formData.soil_temp_min" clearable placeholder="请输入土壤最低温度" />
</el-form-item>
<el-input v-model="formData.soil_temp_min" clearable placeholder="请输入土壤最低温度" />
</el-form-item>
<el-form-item label="土壤最高湿度" prop="soil_mois_max">
<el-input v-model="formData.soil_mois_max" clearable placeholder="请输入土壤最高湿度" />
</el-form-item>
<el-input v-model="formData.soil_mois_max" clearable placeholder="请输入土壤最高湿度" />
</el-form-item>
<el-form-item label="土壤最低湿度" prop="soil_mois_min">
<el-input v-model="formData.soil_mois_min" clearable placeholder="请输入土壤最低湿度" />
</el-form-item>
<el-input v-model="formData.soil_mois_min" clearable placeholder="请输入土壤最低湿度" />
</el-form-item>
<el-form-item label="土壤最高PH值" prop="soil_ph_max">
<el-input v-model="formData.soil_ph_max" clearable placeholder="请输入土壤最高PH值" />
</el-form-item>
<el-input v-model="formData.soil_ph_max" clearable placeholder="请输入土壤最高PH值" />
</el-form-item>
<el-form-item label="土壤最低PH值" prop="soil_ph_min">
<el-input v-model="formData.soil_ph_min" clearable placeholder="请输入土壤最低PH值" />
</el-form-item>
<el-input v-model="formData.soil_ph_min" clearable placeholder="请输入土壤最低PH值" />
</el-form-item>
<el-form-item label="土壤最高氮含量" prop="soil_n_content_max">
<el-input v-model="formData.soil_n_content_max" clearable placeholder="请输入土壤最高氮含量" />
</el-form-item>
<el-input v-model="formData.soil_n_content_max" clearable placeholder="请输入土壤最高氮含量" />
</el-form-item>
<el-form-item label="土壤最低氮含量" prop="soil_n_content_min">
<el-input v-model="formData.soil_n_content_min" clearable placeholder="请输入土壤最低氮含量" />
</el-form-item>
<el-input v-model="formData.soil_n_content_min" clearable placeholder="请输入土壤最低氮含量" />
</el-form-item>
<el-form-item label="土壤最高磷含量" prop="soil_p_content_max">
<el-input v-model="formData.soil_p_content_max" clearable placeholder="请输入土壤最高磷含量" />
</el-form-item>
<el-input v-model="formData.soil_p_content_max" clearable placeholder="请输入土壤最高磷含量" />
</el-form-item>
<el-form-item label="土壤最低磷含量" prop="soil_p_content_min">
<el-input v-model="formData.soil_p_content_min" clearable placeholder="请输入土壤最低磷含量" />
</el-form-item>
<el-input v-model="formData.soil_p_content_min" clearable placeholder="请输入土壤最低磷含量" />
</el-form-item>
<el-form-item label="土壤最高钾含量" prop="soil_k_content_max">
<el-input v-model="formData.soil_k_content_max" clearable placeholder="请输入土壤最高钾含量" />
</el-form-item>
<el-input v-model="formData.soil_k_content_max" clearable placeholder="请输入土壤最高钾含量" />
</el-form-item>
<el-form-item label="土壤最低钾含量" prop="soil_k_content_min">
<el-input v-model="formData.soil_k_content_min" clearable placeholder="请输入土壤最低钾含量" />
</el-form-item>
<el-input v-model="formData.soil_k_content_min" clearable placeholder="请输入土壤最低钾含量" />
</el-form-item>
<el-form-item label="空气最高温度" prop="air_temp_max">
<el-input v-model="formData.air_temp_max" clearable placeholder="请输入空气最高温度" />
</el-form-item>
<el-input v-model="formData.air_temp_max" clearable placeholder="请输入空气最高温度" />
</el-form-item>
<el-form-item label="空气最低温度" prop="air_temp_min">
<el-input v-model="formData.air_temp_min" clearable placeholder="请输入空气最低温度" />
</el-form-item>
<el-input v-model="formData.air_temp_min" clearable placeholder="请输入空气最低温度" />
</el-form-item>
<el-form-item label="空气最高湿度" prop="air_mois_max">
<el-input v-model="formData.air_mois_max" clearable placeholder="请输入空气最高湿度" />
</el-form-item>
<el-input v-model="formData.air_mois_max" clearable placeholder="请输入空气最高湿度" />
</el-form-item>
<el-form-item label="空气最低湿度" prop="air_mois_min">
<el-input v-model="formData.air_mois_min" clearable placeholder="请输入空气最低湿度" />
</el-form-item>
<el-input v-model="formData.air_mois_min" clearable placeholder="请输入空气最低湿度" />
</el-form-item>
<el-form-item label="空气最大二氧化碳含量" prop="air_co2_content_max">
<el-input v-model="formData.air_co2_content_max" clearable placeholder="请输入空气最大二氧化碳含量" />
</el-form-item>
<el-input v-model="formData.air_co2_content_max" clearable placeholder="请输入空气最大二氧化碳含量" />
</el-form-item>
<el-form-item label="空气最小二氧化碳含量" prop="air_co2_content_min">
<el-input v-model="formData.air_co2_content_min" clearable placeholder="请输入空气最小二氧化碳含量" />
</el-form-item>
<el-input v-model="formData.air_co2_content_min" clearable placeholder="请输入空气最小二氧化碳含量" />
</el-form-item>
<el-form-item label="最大风速" prop="wind_speed_max">
<el-input v-model="formData.wind_speed_max" clearable placeholder="请输入最大风速" />
</el-form-item>
<el-input v-model="formData.wind_speed_max" clearable placeholder="请输入最大风速" />
</el-form-item>
<el-form-item label="最小风速" prop="wind_speed_min">
<el-input v-model="formData.wind_speed_min" clearable placeholder="请输入最小风速" />
</el-form-item>
<el-input v-model="formData.wind_speed_min" clearable placeholder="请输入最小风速" />
</el-form-item>
</el-form>
</popup>
</div>
@ -251,7 +244,7 @@ const getDetail = async (row: Record<string, any>) => {
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
const data = { ...formData, }
mode.value == 'edit'
? await apiMonitorThresholdEdit(data)
: await apiMonitorThresholdAdd(data)

View File

@ -81,6 +81,7 @@ const handleAdd = async () => {
//
const handleEdit = async (data: any) => {
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)

View File

@ -1,44 +1,20 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="650px"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-form-item label="产品ID" prop="id">
<el-input v-model="formData.id" disabled clearable placeholder="请输入产品ID" />
</el-form-item>
<el-form-item label="产品名称" prop="name">
<el-input
v-model="formData.name"
disabled
clearable
placeholder="请输入产品名称"
/>
</el-form-item>
<el-form-item label="绑定设备" prop="device_id">
<el-select
v-model="formData.device_id"
filterable
multiple
remote
reserve-keyword
placeholder="请输入设备信息"
:remote-method="queryDevice"
:loading="loading"
>
<el-option
v-for="(item, index) in optionsData.device"
:key="index"
:label="item.deviceinfo"
:value="item.id"
/>
</el-select>
</el-form-item>
<popup ref="popupRef" :title="popupTitle" :async="true" width="650px" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
<el-form-item label="产品ID" prop="id">
<el-input v-model="formData.id" disabled clearable placeholder="请输入产品ID" />
</el-form-item>
<el-form-item label="产品名称" prop="name">
<el-input v-model="formData.name" disabled clearable placeholder="请输入产品名称" />
</el-form-item>
<el-form-item label="绑定设备" prop="device_id">
<el-select v-model="formData.device_id" filterable multiple remote reserve-keyword placeholder="请输入设备信息"
:remote-method="queryDevice" :loading="loading">
<el-option v-for="(item, index) in optionsData.device" :key="index" :label="item.deviceinfo"
:value="item.id" />
</el-select>
</el-form-item>
</el-form>
</popup>
</div>
@ -116,7 +92,7 @@ const queryDevice = async (query: string) => {
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
const data = { ...formData, }
await apiProductBind(data)
popupRef.value?.close()
emit('success')

View File

@ -1,84 +1,45 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="550px"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form-item label="产品名称" prop="name">
<el-input v-model="formData.name" clearable placeholder="请输入产品名称" />
</el-form-item>
<el-form-item label="产品编号" prop="code">
<el-input v-model="formData.code" clearable disabled placeholder="请输入产品编号" />
</el-form-item>
<el-form-item label="产品介绍" prop="desc">
<el-input v-model="formData.desc" />
</el-form-item>
<el-form-item label="产品图" prop="image">
<el-upload
class="avatar-uploader"
:accept="acceptFileTypes"
v-model="formData.image"
:data="{ cid: 1 }"
:headers="{ Token: userStore.token }"
:action="action"
:show-file-list="false"
:on-success="handleAvatarSuccessAvatar"
>
<img
v-if="formData.image"
:src="formData.image"
class="avatar"
/>
<div v-else class="avatar-uploader-icon">
<el-icon>
<Plus />
</el-icon>
</div>
</el-upload>
<popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form-item label="产品名称" prop="name">
<el-input v-model="formData.name" clearable placeholder="请输入产品名称" />
</el-form-item>
<el-form-item label="产品编号" prop="code">
<el-input v-model="formData.code" clearable disabled placeholder="请输入产品编号" />
</el-form-item>
<el-form-item label="产品介绍" prop="desc">
<el-input v-model="formData.desc" />
</el-form-item>
<el-form-item label="产品图" prop="image">
<el-upload class="avatar-uploader" :accept="acceptFileTypes" v-model="formData.image" :data="{ cid: 1 }"
:headers="{ Token: userStore.token }" :action="action" :show-file-list="false"
:on-success="handleAvatarSuccessAvatar">
<img v-if="formData.image" :src="formData.image" class="avatar" />
<div v-else class="avatar-uploader-icon">
<el-icon>
<Plus />
</el-icon>
</div>
</el-upload>
</el-form-item>
</el-form-item>
<el-form-item v-if="formData.root == 1" label="所属用户" prop="user_id">
<el-select
v-model="formData.user_id"
remote
filterable
placeholder="请输入用户信息"
:remote-method="queryUser"
@change="selectedUser"
:loading="loading"
>
<el-option
v-for="(item, index) in optionsData.user"
:key="index"
:label="item.userinfo"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item v-if="formData.root == 1" label="所属用户" prop="user_id">
<el-select v-model="formData.user_id" remote filterable placeholder="请输入用户信息" :remote-method="queryUser"
@change="selectedUser" :loading="loading">
<el-option v-for="(item, index) in optionsData.user" :key="index" :label="item.userinfo"
:value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="所属土地" prop="land_id">
<el-select
v-model="formData.land_id"
remote
filterable
placeholder="请输入土地信息"
:remote-method="queryLand"
:loading="loading"
>
<el-option
v-for="(item, index) in optionsData.land"
:key="index"
:label="item.landinfo"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="所属土地" prop="land_id">
<el-select v-model="formData.land_id" remote filterable placeholder="请输入土地信息" :remote-method="queryLand"
:loading="loading">
<el-option v-for="(item, index) in optionsData.land" :key="index" :label="item.landinfo"
:value="item.id" />
</el-select>
</el-form-item>
</el-form>
</popup>
</div>
@ -86,16 +47,17 @@
<script lang="ts" setup name="productEdit">
import { useDictOptions } from '@/hooks/useDictOptions'
import { type FormInstance,
type UploadProps,
ElMessage,
} from 'element-plus'
import {
type FormInstance,
type UploadProps,
ElMessage,
} from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiProductAdd, apiProductEdit, apiProductDetail, getUserList, getUserInfo, apiLandLists } from '@/api/product'
import { timeFormat } from '@/utils/util'
import useUserStore from "@/stores/modules/user";
import type { PropType } from 'vue'
import {ref} from "vue";
import { ref } from "vue";
import config from "@/config";
defineProps({
dictData: {
@ -115,11 +77,11 @@ const handleAvatarSuccessAvatar: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) {
ElMessage.error(response.msg);
return;
}
formData.image = response.data.uri;
if (response.code == 0) {
ElMessage.error(response.msg);
return;
}
formData.image = response.data.uri;
};
//
const popupTitle = computed(() => {
@ -164,7 +126,7 @@ const setFormData = async (data: Record<any, any>) => {
}
}
//@ts-ignore
formData.create_time = timeFormat(formData.create_time,'yyyy-mm-dd hh:MM:ss')
formData.create_time = timeFormat(formData.create_time, 'yyyy-mm-dd hh:MM:ss')
}
const getDetail = async (row: Record<string, any>) => {
@ -261,33 +223,33 @@ defineExpose({
</script>
<style scoped>
.avatar-uploader .avatar {
width: 178px;
height: 178px;
display: block;
width: 178px;
height: 178px;
display: block;
}
</style>
<style>
.avatar-uploader .el-upload {
width: 200px;
height: 130px;
border: 1px dashed var(--el-border-color);
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
transition: var(--el-transition-duration-fast);
width: 200px;
height: 130px;
border: 1px dashed var(--el-border-color);
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
transition: var(--el-transition-duration-fast);
}
.avatar-uploader .el-upload:hover {
border-color: var(--el-color-primary);
border-color: var(--el-color-primary);
}
.el-icon.avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 178px;
height: 178px;
text-align: center;
font-size: 28px;
color: #8c939d;
width: 178px;
height: 178px;
text-align: center;
}
</style>

View File

@ -1,40 +1,29 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form
class="mb-[-16px]"
:model="queryParams"
inline
>
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="用户ID" prop="user_id">
<el-input class="w-[280px]" v-model="queryParams.user_id" clearable placeholder="请输入用户ID" />
</el-form-item>
<el-form-item label="土地ID" prop="land_id">
<el-input class="w-[280px]" v-model="queryParams.land_id" clearable placeholder="请输入土地ID" />
</el-form-item>
<el-input class="w-[280px]" v-model="queryParams.user_id" clearable placeholder="请输入用户ID" />
</el-form-item>
<el-form-item label="土地ID" prop="land_id">
<el-input class="w-[280px]" v-model="queryParams.land_id" clearable placeholder="请输入土地ID" />
</el-form-item>
<el-form-item label="产品编号" prop="code">
<el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入产品编号" />
</el-form-item>
<el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入产品编号" />
</el-form-item>
<el-form-item label="产品名称" prop="name">
<el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入产品名称" />
</el-form-item>
<el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入产品名称" />
</el-form-item>
<el-form-item label="产品状态" prop="status">
<el-select class="w-[280px]" v-model="queryParams.status" clearable placeholder="请选择产品状态">
<el-option label="全部" value=""></el-option>
<el-option
v-for="(item, index) in dictData.product_status"
:key="index"
:label="item.name"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-select class="w-[280px]" v-model="queryParams.status" clearable placeholder="请选择产品状态">
<el-option label="全部" value=""></el-option>
<el-option v-for="(item, index) in dictData.product_status" :key="index" :label="item.name"
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="create_time">
<daterange-picker
v-model:startTime="queryParams.start_time"
v-model:endTime="queryParams.end_time"
/>
</el-form-item>
<daterange-picker v-model:startTime="queryParams.start_time" v-model:endTime="queryParams.end_time" />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
@ -49,11 +38,7 @@
</template>
新增
</el-button>
<el-button
v-perms="['land.product/delete']"
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
<el-button v-perms="['land.product/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
删除
</el-button>
<div class="mt-4">
@ -75,51 +60,34 @@
</template>
</el-table-column>
<el-table-column label="产品状态" align="center" prop="status">
<template #default="{ row }">
<dict-value :options="dictData.product_status" :value="row.status" />
</template>
</el-table-column>
<template #default="{ row }">
<dict-value :options="dictData.product_status" :value="row.status" />
</template>
</el-table-column>
<el-table-column label="创建时间" width="180" align="center" prop="create_time">
<template #default="{ row }">
<span>{{ row.create_time ? timeFormat(row.create_time, 'yyyy-mm-dd hh:MM:ss') : '' }}</span>
</template>
</el-table-column>
<template #default="{ row }">
<span>{{ row.create_time ? timeFormat(row.create_time, 'yyyy-mm-dd hh:MM:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="300" align="center" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['land.product/edit']"
type="primary"
link
@click="handleEdit(row)"
>
<el-button v-perms="['land.product/edit']" type="primary" link @click="handleEdit(row)">
编辑
</el-button>
<el-button
v-perms="['land.product/bind']"
type="primary"
link
@click="handleBind(row)"
>
<el-button v-perms="['land.product/bind']" type="primary" link @click="handleBind(row)">
绑定设备
</el-button>
<el-button v-perms="['device.device/lists']" type="primary" link >
<router-link
:to="{
path: getRoutePath('device.device/lists'),
query: {
product_id: row.id
}
}"
>
<el-button v-perms="['device.device/lists']" type="primary" link>
<router-link :to="{
path: getRoutePath('device.device/lists'),
query: {
product_id: row.id
}
}">
设备管理
</router-link>
</router-link>
</el-button>
<el-button
v-perms="['land.product/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
<el-button v-perms="['land.product/delete']" type="danger" link @click="handleDelete(row.id)">
删除
</el-button>
</template>
@ -148,7 +116,7 @@ import BindPopup from './bind.vue'
const { query } = useRoute()
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
const bindRef = shallowRef<InstanceType<typeof BindPopup>>()
const bindRef = shallowRef<InstanceType<typeof BindPopup>>()
//
const showEdit = ref(false)
const bindEdit = ref(false)