检测图斑公共组件提取,接口修改

src/views/farmlandProtection/components/jclxqk.vue

@@ -75,20 +75,8 @@ import { QueryOne, QueryList } from "@/api/cockpitNew";
 import { GetDateList, CodeList, JscQueryList } from "@/api/ghss/jctb.js";
 export default {
   props: {
-    region: {
-      type: String,
-    },
-    tab: {
-      type: Number,
-    },
-    val0: {
-      type: String,
-    },
-    val1: {
-      type: String,
-    },
-    val2: {
-      type: String,
+    updateObj: {
+      type: Object,
     },
   },
   components: {
@@ -96,7 +84,7 @@ export default {
   },
   data() {
     return {
-      // region: "4602",
+      region: "4602",
       xzqTreeData: [], //申请范围
       tab: 1,
       options: [
@@ -110,16 +98,13 @@ export default {
       monitorOpt: [],
       monitorVal: "",
       yearsVal: "",
-      // val0: "2024-02-17 00:00:00",
-      // val1: "2024-12-31 23:59:59",
-      // val2: "",
+      val0: "",
+      val1: "",
+      val2: "",
     };
   },
   computed: {},
-  mounted() {
-    // this.getXzqTreeData();
-    this.getData();
-  },
+  mounted() {},
   methods: {
     GetInfo(val) {
       this.tab = val;
@@ -163,7 +148,6 @@ export default {
       });
     },
     async initEcharts() {
-      console.log(this.val0, this.val1, "-----------");
       this.myChart = echarts.init(this.$refs.echars_pie);
       let jclxres = await JscQueryList({
         jscType: "t_gdbh_jctb_jclx",
@@ -304,17 +288,19 @@ export default {
         ],
       };
 
-      this.myChart.clear();;
+      this.myChart.clear();
       this.myChart.setOption(option);
     },
   },
   watch: {
-    val0: {
+    updateObj: {
       handler(newVal, oldVal) {
-        if (!oldVal) {
-        this.getData();
-        }
-
+        (this.region = newVal.region),
+          (this.tab = newVal.tab),
+          (this.val0 = newVal.val0),
+          (this.val1 = newVal.val1),
+          (this.val2 = newVal.val2),
+          this.getData();
       },
       deep: true,
       immediate: true,

src/views/farmlandProtection/indexNew.vue

@@ -23,7 +23,7 @@
         ptaye="gdbh"
         @contrast="goContrast"
       ></Gdzl>
-      <Jctb v-show="activeIndex == 2" ref="jctb"></Jctb>
+      <Jctb v-if="activeIndex == 2" ref="jctb"></Jctb>
       <Fzyp v-show="activeIndex == 3"></Fzyp>
     </div>
 
@@ -140,7 +140,7 @@ export default {
         this.$refs.gdzl.regionChange(this.xzqh);
       }
       if (val == 1) this.$refs.gdzl.regionChange(this.xzqh);
-      if (val !== 2) this.$refs.jctb.isShowTb = false;
+      if (val !== 2 && this.$refs.jctb) this.$refs.jctb.isShowTb = false;
     },
   },
   watch: {

src/views/farmlandProtection/jctb/index.vue

@@ -20,7 +20,7 @@
           </el-option>
         </el-select>
         <el-cascader
-          v-model="region1"
+          v-model="updateObj.region"
           :show-all-levels="false"
           :options="store.state.region_tree"
           @change="regionChange1"
@@ -59,15 +59,15 @@
             <Jclxqk
               @updateParent="changeData"
               ref="tbzl"
-              :region="region1"
-              :tab="tab"
-              :val0="val0"
-              :val1="val1"
-              :val2="val2"
+              :updateObj="updateObj"
             ></Jclxqk>
           </el-tab-pane>
           <el-tab-pane label="图斑清单" name="tbqd">
-            <Tbqd @updateParent="changeData" ref="tbqd"></Tbqd>
+            <Tbqd
+              @updateParent="changeData"
+              ref="tbqd"
+              :updateObj="updateObj"
+            ></Tbqd>
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -152,18 +152,22 @@ export default {
       imgList: [],
       imgIndex: -1,
 
-      region1: "4602",
       xzqTreeData: [], //申请范围
-      tab: 1,
+
       options: [],
       cityList: [],
       yearsOpt: [], //检测图斑时间季度
       monitorOpt: [],
       monitorVal: "",
       yearsVal: "",
-      val0: "",
-      val1: "",
-      val2: "",
+      updateObj: {
+        region: "4602",
+        tab: 1,
+
+        val0: "",
+        val1: "",
+        val2: "",
+      },
     };
   },
   mounted() {
@@ -178,12 +182,8 @@ export default {
       this.activeTabs = evt.name;
       this.isShowTb = false;
       this.imgIndex = -1;
-      console.log();
       if (this.activeTabs == "tbqd") {
         this.$refs.tbqd.init();
-        // console.log("哈哈哈",this.$refs.tbqd);
-      } else {
-        // console.log(33333,viewer);
       }
     },
     closeBox() {
@@ -219,36 +219,23 @@ export default {
     },
     aimScreen() {},
     GetInfo(val) {
-      this.tab = val;
-      this.$nextTick(() => {
-        this.$refs.tbzl.initEcharts();
-      });
-      // this.initEcharts();
+      this.updateObj.tab = val;
     },
-    async regionChange1(region) {
-      console.log(region, "region");
-      this.region1 = region;
-
-      await this.$refs.tbzl.getData();
+    regionChange1(region) {
+      this.updateObj.region = region;
     },
     typeChange(val) {
-      this.val2 = val;
-      // this.getzl();
+      this.updateObj.val2 = val;
     },
     //年份季度改变
-    async yearsChange(val) {
+    yearsChange(val) {
       // if (val) {
       console.log(val, "valval");
       val = JSON.parse(JSON.stringify(val));
-      this.val0 = val.startTime;
-      this.val1 = val.endTime;
+      this.updateObj.val0 = val.startTime;
+      this.updateObj.val1 = val.endTime;
       this.yearsVal = val.quarter;
-      this.$refs.tbzl.getData();
-      console.log(this.val0, this.val1, this.yearsVal);
-      // this.getzl();
-      // this.GetCityList();
-      // this.initEcharts();
-      // this.getData();
+      console.log(this.updateObj.val0, this.updateObj.val1, this.yearsVal);
     },
     getXzqTreeData() {
       GetXzqhTree().then((res) => {
@@ -265,8 +252,8 @@ export default {
 
       GetDateList().then((res) => {
         this.yearsOpt = res.data;
-        this.val0 = res.data[0].startTime;
-        this.val1 = res.data[0].endTime;
+        this.updateObj.val0 = res.data[0].startTime;
+        this.updateObj.val1 = res.data[0].endTime;
         this.yearsVal = res.data[0].quarter;
       });
       //检测类型分类