fix: 修改农场地址等为生产队名称

src/views/authentic/index.vue

@@ -63,21 +63,20 @@
         </div>
         <div class="content">
             <el-form :inline="true" :model="formInlineSearch" class="search-form" ref="formInlineRef">
-                <el-form-item label="农场地址">
-                    <el-input v-model="formInlineSearch.address" placeholder="请输入农场地址" clearable />
-                </el-form-item>
-                <el-form-item label="农场名称">
-                    <el-input v-model="formInlineSearch.farmName" placeholder="请输入农场名称" clearable />
-                </el-form-item>
-                <el-form-item label="作物物种">
-                    <el-input v-model="formInlineSearch.speciesTypeName" placeholder="请输入作物物种" clearable />
-                </el-form-item>
-                <el-form-item label="客户姓名">
-                    <el-input v-model="formInlineSearch.masterName" placeholder="请输入客户姓名" clearable />
-                </el-form-item>
-                <el-form-item label="联系电话">
-                    <el-input v-model="formInlineSearch.masterTel" placeholder="请输入联系电话" clearable />
-                </el-form-item>
+                <div>
+                    <el-form-item label="生产队名称">
+                        <el-input v-model="formInlineSearch.address" placeholder="请输入生产队名称" clearable />
+                    </el-form-item>
+                    <el-form-item label="林段名称">
+                        <el-input v-model="formInlineSearch.farmName" placeholder="请输入林段名称" clearable />
+                    </el-form-item>
+                    <el-form-item label="橡胶品种">
+                        <el-input v-model="formInlineSearch.speciesTypeName" placeholder="请输入橡胶品种" clearable />
+                    </el-form-item>
+                    <!-- <el-form-item label="客户姓名">
+                        <el-input v-model="formInlineSearch.masterName" placeholder="请输入客户姓名" clearable />
+                    </el-form-item> -->
+                </div>
                 <div class="button">
                     <el-button
                         class="btn"
@@ -143,26 +142,26 @@
                             class="form-inline"
                             :class="{'no-area': store.state.authentic.isEditStatus}"
                         >
-                            <el-form-item label="农场地址" prop="address">
-                                <el-input v-model="formInline.address" placeholder="请输入农场地址" clearable />
+                            <el-form-item label="生产队名称" prop="address">
+                                <el-input v-model="formInline.address" placeholder="请输入生产队名称" clearable />
                             </el-form-item>
-                            <el-form-item label="农场名称" prop="farmName">
-                                <el-input v-model="formInline.farmName" placeholder="请输入农场名称" clearable />
+                            <el-form-item label="林段名称" prop="farmName">
+                                <el-input v-model="formInline.farmName" placeholder="请输入林段名称" clearable />
                             </el-form-item>
                             <el-form-item label="创建时间">
                                 <el-input v-model="formInline.createDate" clearable disabled />
                             </el-form-item>
-                            <el-form-item label="农场面积">
+                            <el-form-item label="林段面积">
                                 <el-input v-model="formInline.mu" disabled clearable />
                             </el-form-item>
-                            <el-form-item label="作物物种" prop="speciesTypeName">
-                                <el-input v-model="formInline.speciesTypeName" placeholder="请输入作物物种" clearable />
+                            <el-form-item label="橡胶品种" prop="speciesTypeName">
+                                <el-input v-model="formInline.speciesTypeName" placeholder="请输入橡胶品种" clearable />
                             </el-form-item>
                             <el-form-item label="斜面面积" v-show="!store.state.authentic.isEditStatus">
                                 <el-input v-model="formInline.slopeMu" disabled clearable />
                             </el-form-item>
-                            <el-form-item label="联系电话" prop="masterTel">
-                                <el-input v-model="formInline.masterTel" placeholder="请输入联系电话" clearable />
+                            <el-form-item label="橡胶株数" prop="plantNum">
+                                <el-input v-model="formInline.plantNum" placeholder="请输入橡胶株数" clearable />
                             </el-form-item>
                         </el-form>
                         <div class="list-box" :class="{'no-area': store.state.authentic.isEditStatus}" v-show="pointList.length > 0">
@@ -188,10 +187,10 @@
     <el-dialog v-model="dialogVisible" width="82%" center :show-close="false" modal-class="dialog-dark">
         <div>
             <el-table :data="gridData" border max-height="600" class="table-dark">
-                <el-table-column property="farmName" label="农场名称" show-overflow-tooltip />
-                <el-table-column property="address" label="农场地址" width="230" show-overflow-tooltip />
+                <el-table-column property="farmName" label="林段名称" show-overflow-tooltip />
+                <el-table-column property="address" label="生产队名称" width="230" show-overflow-tooltip />
                 <el-table-column property="createDate" label="创建时间" width="170" />
-                <el-table-column property="mu" label="农场面积">
+                <el-table-column property="mu" label="林段面积">
                     <template #default="scope">
                         <span>{{ scope.row.mu }}亩</span>
                     </template>
@@ -201,9 +200,10 @@
                         <span>{{ scope.row.slopeMu }}亩</span>
                     </template>
                 </el-table-column>
-                <el-table-column property="speciesTypeName" label="作物物种" />
+                <el-table-column property="speciesTypeName" label="橡胶品种" />
+                <el-table-column property="plantNum" label="橡胶株数" />
                 <el-table-column property="masterName" label="客户姓名" />
-                <el-table-column property="masterTel" width="120" label="联系电话" />
+                <!-- <el-table-column property="masterTel" width="120" label="联系电话" /> -->
                 <el-table-column property="points" label="边界点经纬度" width="480" show-overflow-tooltip />
             </el-table>
         </div>
@@ -320,11 +320,11 @@ const validatePhoneNumber = (rule, value, callback) => {
     }
 };
 const rules = {
-    address: [{ required: true, message: "请输入农场地址", trigger: "change" }],
-    farmName: [{ required: true, message: "请输入农场名称", trigger: "change" }],
-    speciesTypeName: [{ required: true, message: "请输入作物物种", trigger: "change" }],
+    address: [{ required: true, message: "请输入生产队名称", trigger: "change" }],
+    farmName: [{ required: true, message: "请输入林段名称", trigger: "change" }],
+    speciesTypeName: [{ required: true, message: "请输入橡胶品种", trigger: "change" }],
     masterName: [{ required: true, message: "请输入姓名", trigger: "change" }],
-    masterTel: [{ required: true, validator: validatePhoneNumber, trigger: "change" }],
+    // masterTel: [{ required: true, validator: validatePhoneNumber, trigger: "change" }],
 };
 const ruleFormRef = ref(null);
 const initForm = {
@@ -335,6 +335,7 @@ const initForm = {
     mu: "",
     slopeMu: "",
     speciesTypeName: "",
+    plantNum: "",
     masterName: "",
     masterTel: "",
     geom: "",
@@ -405,22 +406,24 @@ const onSubmit = () => {
                 formInline.height = heightArr.value
             }
             VE_API.authentic.saveData(formInline).then((res) => {
-                store.commit("authentic/SET_ISEDIT_STATUS", false);
-                isUpdata.value = false;
-                disabledForm.value = true;
-                mapData.disabledForm = true;
-                Object.assign(formInlineSearch, initForm);
-                authenticMap.endDraw();
-                getList().then(() => {
-                    isRefresh.value = false;
-                    isEdit.value = false;
-                    authenticMap.allUnSelect();
-                    authenticMap.clearMapData();
-                    // authenticMap.getSelectPointArr(
-                    //   point.id || plotList.value[plotList.value.length - 1].id
-                    // );
-                });
-            });
+                if (res.code === 0) {
+                    store.commit("authentic/SET_ISEDIT_STATUS", false);
+                    isUpdata.value = false;
+                    disabledForm.value = true;
+                    mapData.disabledForm = true;
+                    Object.assign(formInlineSearch, initForm);
+                    authenticMap.endDraw();
+                    getList().then(() => {
+                        isRefresh.value = false;
+                        isEdit.value = false;
+                        authenticMap.allUnSelect();
+                        authenticMap.clearMapData();
+                        // authenticMap.getSelectPointArr(
+                        //   point.id || plotList.value[plotList.value.length - 1].id
+                        // );
+                    });
+                }
+            })
         }
     });
 };
@@ -580,13 +583,13 @@ const handleExport = () => {
 // 下载
 const handleDowload = () => {
     const fieldLabels = [
-        "农场名称",
-        "农场地址",
+        "林段名称",
+        "生产队名称",
         "创建时间",
-        "农场面积",
-        "作物物种",
+        "林段面积",
+        "橡胶品种",
         "客户姓名",
-        "联系电话",
+        // "联系电话",
         "边界点经纬度",
     ];
     const fieldKeys = [
@@ -595,8 +598,9 @@ const handleDowload = () => {
         "createDate",
         "mu",
         "speciesTypeName",
+        "plantNum",
         "masterName",
-        "masterTel",
+        // "masterTel",
         "points",
     ];
     const fileName = "农场数据" + dateFormat(new Date(), "YYYY-mm-dd HH:MM");
@@ -811,8 +815,8 @@ watch(
             height: 40px;
             margin: 5px 0;
             display: flex;
-            //   justify-content: flex-end;
-            justify-content: space-between;
+            justify-content: flex-end;
+            // justify-content: space-between;
             ::v-deep {
                 .el-form-item__label {
                     color: #fff;

src/views/home/components/tabs.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="btn-group">
         <div
-            :class="['btn-item', { active: active === index }]"
+            :class="['btn-item', { active: activeVal === index }]"
             @click="handleActive(item,index)"
             v-for="(item, index) in baseList"
             :key="index + item"
@@ -42,14 +42,14 @@ onUnmounted(()=>{
 const emit = defineEmits(["handleActive"])
 
 const baseList = ref([])
-const active = ref(0);
+const activeVal = ref(0);
 const handleActive = (item,index) => {
-    active.value = index;
+    activeVal.value = index;
     eventBus.emit('handleActive',{name:item,key:props.keyStr,index})
 };
 
 function handleTab(e){
-  active.value = 0
+  activeVal.value = 0
 }
 
 watch(()=>props.list,(newValue,oldValue)=>{
@@ -62,7 +62,7 @@ watch(()=>props.active,(newValue,oldValue)=>{
     if(newValue){
         const index = props.list.findIndex(item =>item===newValue)
         if(index!==-1){
-            active.value = index
+            activeVal.value = index
             handleActive(newValue,index)
         }
     }