初始化

.env.build

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

.env.dev

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

.env.development.example

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

.env.pro

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

.env.production.example

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

package.json

@@ -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"
     },

src/config/index.ts

@@ -5,9 +5,7 @@ const config = {
     baseUrl: `${
       import.meta.env.VITE_APP_BASE_URL
       }/`, //请求接口域名
-    // baseUrl: 'http://127.0.0.1:30005/',
     urlPrefix: 'adminapi', //请求默认前缀
     timeout: 10 * 1000 //请求超时时长
 }
-
 export default config

src/main.ts

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

src/views/land/bind.vue

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

src/views/land/edit.vue

@@ -1,169 +1,73 @@
 <template>
   <div class="edit-popup">
-        <popup
+    <popup ref="popupRef" :title="popupTitle" :async="true" width="650px" @confirm="handleSubmit" @close="handleClose">
-            ref="popupRef"
+      <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
-            :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
+          <el-select v-model="formData.user_id" remote filterable placeholder="请输入用户信息" :remote-method="queryUser"
-        v-model="formData.user_id"
+            :loading="loading">
-        remote
+            <el-option v-for="(item, index) in optionsData.user" :key="index" :label="item.userinfo" :value="item.id" />
-        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>
         <el-form-item label="土地名称" prop="title">
           <el-input v-model="formData.title" clearable placeholder="请输入土地名称" />
-</el-form-item>
+        </el-form-item>
-<el-form-item label="详细地址" prop="address">
+        <el-form-item label="详细地址" prop="address">
           <el-input v-model="formData.address" clearable placeholder="请输入详细地址" />
-</el-form-item>
+        </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>
         <!-- <el-form-item label="剩余面积" prop="residual_area">
     <el-input v-model="formData.residual_area" clearable disabled placeholder="请输入剩余面积" />
 </el-form-item> -->
 
-  <el-form-item
+        <el-form-item label="省" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" prop="province_code">
-      label="省"
+          <el-select v-model="formData.province_code" placeholder="请选择省" clearable @change="province_change"
-      :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
+            :style="{ width: '100%' }">
-      prop="province_code"
+            <el-option v-for="(item, index) in datas.provinceOptions" :key="index" :label="item.province_name"
-  >
+              :value="item.province_code"></el-option>
-    <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
+        <el-form-item label="市" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" prop="city_code">
-      label="市"
+          <el-select v-model="formData.city_code" placeholder="请选择市" clearable @change="city_change"
-      :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
+            :style="{ width: '100%' }">
-      prop="city_code"
+            <el-option v-for="(item, index) in datas.cityOptions" :key="index" :label="item.city_name"
-  >
+              :value="item.city_code"></el-option>
-    <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
+        <el-form-item label="区" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" prop="county_code">
-      label="区"
+          <el-select v-model="formData.county_code" placeholder="请选择区" clearable @change="area_change"
-      :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
+            :style="{ width: '100%' }">
-      prop="county_code"
+            <el-option v-for="(item, index) in datas.areaOptions" :key="index" :label="item.county_name"
-  >
+              :value="item.county_code"></el-option>
-    <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
+        <el-form-item label="镇" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" prop="town_code">
-      label="镇"
+          <el-select v-model="formData.town_code" placeholder="请选择镇" clearable @change="street_change"
-      :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
+            :style="{ width: '100%' }">
-      prop="town_code"
+            <el-option v-for="(item, index) in datas.streetOptions" :key="index" :label="item.town_name"
-  >
+              :value="item.town_code"></el-option>
-    <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
+        <el-form-item label="村" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" prop="village_code">
-      label="村"
+          <el-select v-model="formData.village_code" placeholder="请选择村" clearable @change="village_change"
-      :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
+            :style="{ width: '100%' }">
-      prop="village_code"
+            <el-option v-for="(item, index) in datas.villageOptions" :key="index" :label="item.village_name"
-  >
+              :value="item.village_code"></el-option>
-    <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
+        <el-form-item label="队" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]" prop="group_code">
-      label="队"
+          <el-select v-model="formData.group_code" placeholder="请选择队" clearable :style="{ width: '100%' }">
-      :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
+            <el-option v-for="(item, index) in datas.brigadeOptions" :key="index" :label="item.group_name"
-      prop="group_code"
+              :value="item.id"></el-option>
-  >
-    <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>
         <el-form-item label="负责人电话" prop="master_phone">
           <el-input v-model="formData.master_phone" clearable placeholder="请输入负责人电话" />
-</el-form-item>
+        </el-form-item>
         <!-- <el-form-item label="土地图片" prop="pic">
     <material-picker v-model="formData.pic" :limit="4" />
 </el-form-item> -->
@@ -340,8 +244,8 @@ const datas = reactive({
 function province_change(value: string) {
   getCityList();
   // 给省名称赋值
-  datas['provinceOptions'].forEach((item: any) =>{
+  datas['provinceOptions'].forEach((item: any) => {
-    if(item.province_code == value) {
+    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) =>{
+  datas['cityOptions'].forEach((item: any) => {
-    if(item.city_code == formData.city_code) {
+    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) =>{
+  datas['areaOptions'].forEach((item: any) => {
-    if(item.county_code == formData.county_code) {
+    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) =>{
+  datas['streetOptions'].forEach((item: any) => {
-    if(item.town_code == formData.town_code) {
+    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) =>{
+  datas['villageOptions'].forEach((item: any) => {
-    if(item.village_code == formData.village_code) {
+    if (item.village_code == formData.village_code) {
       formData.village_name = item.village_name
     }
   })

src/views/land/index.vue

@@ -1,42 +1,34 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                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>
                 <el-form-item label="土地名称" prop="title">
                     <el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入土地名称" />
-</el-form-item>
+                </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-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-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
+            <el-button v-perms="['land.land/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
-                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
+                            <el-button v-perms="['land.land/edit']" type="primary" link @click="handleEdit(row)">
-                                v-perms="['land.land/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
                                 编辑
                             </el-button>
-                            <el-button
+                            <el-button v-perms="['land.land/bind']" type="primary" link @click="handleBind(row)">
-                                v-perms="['land.land/bind']"
-                                type="primary"
-                                link
-                                @click="handleBind(row)"
-                            >
                                 绑定产品
                             </el-button>
-                            <el-button
+                            <el-button v-perms="['land.product/lists']" type="primary" link>
-                                v-perms="['land.product/lists']"
+                                <router-link :to="{
-                                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
+                            <el-button v-perms="['land.land_plant/lists']" type="primary" link>
-                                v-perms="['land.land_plant/lists']"
+                                <router-link :to="{
-                                type="primary"
-                                link
-                            >
-                                <router-link
-                                    :to="{
                                     path: getRoutePath('land.land_plant/lists'),
                                     query: {
                                         land_id: row.id
                                     }
-                                    }"
+                                }">
-                                >
                                     种植信息
                                 </router-link>
                             </el-button>
-                            <el-button
+                            <el-button v-perms="['land.land/delete']" type="danger" link @click="handleDelete(row.id)">
-                                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
+            <el-image style="width: 200px; height: 200px" :src="img" :zoom-rate="1.2" :max-scale="5" :min-scale="0.2"
-                style="width: 200px; height: 200px"
+                :preview-src-list="detailData.picData" :initial-index="4" fit="cover" center />
-                :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>>()

src/views/monitor_threshold/edit.vue

@@ -1,74 +1,67 @@
 <template>
     <div class="edit-popup">
-        <popup
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="650px" @confirm="handleSubmit" @close="handleClose">
-            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-form-item>
                 <el-form-item label="土壤最低温度" prop="soil_temp_min">
                     <el-input v-model="formData.soil_temp_min" clearable placeholder="请输入土壤最低温度" />
-</el-form-item>
+                </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-form-item>
                 <el-form-item label="土壤最低湿度" prop="soil_mois_min">
                     <el-input v-model="formData.soil_mois_min" clearable placeholder="请输入土壤最低湿度" />
-</el-form-item>
+                </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-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-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-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-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-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-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-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-form-item>
                 <el-form-item label="空气最高温度" prop="air_temp_max">
                     <el-input v-model="formData.air_temp_max" clearable placeholder="请输入空气最高温度" />
-</el-form-item>
+                </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-form-item>
                 <el-form-item label="空气最高湿度" prop="air_mois_max">
                     <el-input v-model="formData.air_mois_max" clearable placeholder="请输入空气最高湿度" />
-</el-form-item>
+                </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-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-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-form-item>
                 <el-form-item label="最大风速" prop="wind_speed_max">
                     <el-input v-model="formData.wind_speed_max" clearable placeholder="请输入最大风速" />
-</el-form-item>
+                </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-form-item>
             </el-form>
         </popup>
     </div>

src/views/monitor_threshold/index.vue

@@ -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)

src/views/product/bind.vue

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

src/views/product/edit.vue

@@ -1,13 +1,6 @@
 <template>
     <div class="edit-popup">
-        <popup
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
-            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="请输入产品名称" />
@@ -19,21 +12,10 @@
                     <el-input v-model="formData.desc" />
                 </el-form-item>
                 <el-form-item label="产品图" prop="image">
-              <el-upload
+                    <el-upload class="avatar-uploader" :accept="acceptFileTypes" v-model="formData.image" :data="{ cid: 1 }"
-                  class="avatar-uploader"
+                        :headers="{ Token: userStore.token }" :action="action" :show-file-list="false"
-                  :accept="acceptFileTypes"
+                        :on-success="handleAvatarSuccessAvatar">
-                  v-model="formData.image"
+                        <img v-if="formData.image" :src="formData.image" class="avatar" />
-                  :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 />
@@ -44,39 +26,18 @@
                 </el-form-item>
 
                 <el-form-item v-if="formData.root == 1" label="所属用户" prop="user_id">
-    <el-select
+                    <el-select v-model="formData.user_id" remote filterable placeholder="请输入用户信息" :remote-method="queryUser"
-        v-model="formData.user_id"
+                        @change="selectedUser" :loading="loading">
-        remote
+                        <el-option v-for="(item, index) in optionsData.user" :key="index" :label="item.userinfo"
-        filterable
+                            :value="item.id" />
-        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>
 
                 <el-form-item label="所属土地" prop="land_id">
-                <el-select
+                    <el-select v-model="formData.land_id" remote filterable placeholder="请输入土地信息" :remote-method="queryLand"
-                    v-model="formData.land_id"
+                        :loading="loading">
-                    remote
+                        <el-option v-for="(item, index) in optionsData.land" :key="index" :label="item.landinfo"
-                    filterable
+                            :value="item.id" />
-                    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>
@@ -86,16 +47,17 @@
 
 <script lang="ts" setup name="productEdit">
 import { useDictOptions } from '@/hooks/useDictOptions'
-import {  type FormInstance,
+import {
+    type FormInstance,
     type UploadProps,
     ElMessage,
-   } from 'element-plus'
+} 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: {
@@ -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>) => {

src/views/product/index.vue

@@ -1,40 +1,29 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                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>
-<el-form-item label="土地ID" prop="land_id">
+                <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>
                 <el-form-item label="产品编号" prop="code">
                     <el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入产品编号" />
-</el-form-item>
+                </el-form-item>
                 <el-form-item label="产品名称" prop="name">
                     <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入产品名称" />
-</el-form-item>
+                </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 
+                        <el-option v-for="(item, index) in dictData.product_status" :key="index" :label="item.name"
-            v-for="(item, index) in dictData.product_status"
+                            :value="item.value" />
-            :key="index" 
-            :label="item.name"
-            :value="item.value"
-        />
                     </el-select>
-</el-form-item>
+                </el-form-item>
                 <el-form-item label="创建时间" prop="create_time">
-    <daterange-picker
+                    <daterange-picker v-model:startTime="queryParams.start_time" v-model:endTime="queryParams.end_time" />
-        v-model:startTime="queryParams.start_time"
+                </el-form-item>
-        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
+            <el-button v-perms="['land.product/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
-                v-perms="['land.product/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
                 删除
             </el-button>
             <div class="mt-4">
@@ -78,48 +63,31 @@
                         <template #default="{ row }">
                             <dict-value :options="dictData.product_status" :value="row.status" />
                         </template>
-</el-table-column>
+                    </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>
+                    </el-table-column>
                     <el-table-column label="操作" width="300" align="center" fixed="right">
                         <template #default="{ row }">
-                            <el-button
+                            <el-button v-perms="['land.product/edit']" type="primary" link @click="handleEdit(row)">
-                                v-perms="['land.product/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
                                 编辑
                             </el-button>
-                            <el-button
+                            <el-button v-perms="['land.product/bind']" type="primary" link @click="handleBind(row)">
-                                v-perms="['land.product/bind']"
-                                type="primary"
-                                link
-                                @click="handleBind(row)"
-                            >
                                 绑定设备
                             </el-button>
-                            <el-button v-perms="['device.device/lists']" type="primary" link >
+                            <el-button v-perms="['device.device/lists']" type="primary" link>
-                                <router-link
+                                <router-link :to="{
-                                    :to="{
                                     path: getRoutePath('device.device/lists'),
                                     query: {
                                         product_id: row.id
                                     }
-                                    }"
+                                }">
-                                >
                                     设备管理
                                 </router-link>
                             </el-button>
-                            <el-button
+                            <el-button v-perms="['land.product/delete']" type="danger" link @click="handleDelete(row.id)">
-                                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)