From fed0c963fc07de24370f7c2477a5a37658a2f057 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Thu, 5 Sep 2024 17:54:30 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=BD=A6=E8=BE=86=E5=9E=8B?=
 =?UTF-8?q?=E5=8F=B7=E4=B8=8D=E5=AF=B9=E7=9A=84=E6=AD=BB=E5=BE=AA=E7=8E=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/device/index.vue | 44 +++++++++++++++++++------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue
index 2d3701d..f1a8fd9 100644
--- a/src/views/system/device/index.vue
+++ b/src/views/system/device/index.vue
@@ -936,6 +936,7 @@ export default {
     return {
       userName: undefined,
       activeIndex: "1",
+      isUpdating: false, // 标志位
       // 遮罩层
       loading: true,
       loading2: true,
@@ -1072,13 +1073,19 @@ export default {
   },
   watch: {
     "form.modelId": function (newVal) {
-      this.fetchData(newVal);
+      if (!this.isUpdating) {
+        this.fetchData(newVal);
+      }
     },
     "form.deptId": function (newVal) {
-      this.fetchData2(newVal);
+      if (!this.isUpdating) {
+        this.fetchData2(newVal);
+      }
     },
     "form.areaId": function (newVal) {
-      this.fetchData3(newVal);
+      if (!this.isUpdating) {
+        this.fetchData3(newVal);
+      }
     },
     "form.hardwareVersionId": function (hardwareVersionId) {
       if (hardwareVersionId) {
@@ -1156,8 +1163,8 @@ export default {
     /** 当选择车型时调用 */
     fetchData(modelId) {
       if (modelId) {
+        this.isUpdating = true; // 设置标志位
         getModel(modelId).then((response) => {
-          // console.log("根据车型id查询运营商=========",response.data)
           this.areaOptions = response.data.areaList;
           let areaOptions = response.data.areaList;
           if (response.data.operator) {
@@ -1168,6 +1175,8 @@ export default {
           areaOptions.length > 0
             ? (this.form.areaId = areaOptions[0].areaId)
             : (this.form.areaId = null);
+        }).finally(() => {
+          this.isUpdating = false; // 清除标志位
         });
       } else {
         this.reset2();
@@ -1176,8 +1185,8 @@ export default {
     /** 当选择运营商时  根据运营商id，获取运营区和型号 */
     fetchData2(deptId) {
       if (deptId) {
+        this.isUpdating = true; // 设置标志位
         selectAreaListByDeptId(deptId).then((response) => {
-          console.log("根据运营商id，获取运营区和型号=========", response.data);
           this.areaOptions = response.data.areaList;
           let areaOptions = response.data.areaList;
           areaOptions.length > 0
@@ -1188,6 +1197,8 @@ export default {
           modelOptions.length > 0
             ? (this.form.modelId = modelOptions[0].modelId)
             : (this.form.modelId = null);
+        }).finally(() => {
+          this.isUpdating = false; // 清除标志位
         });
       } else {
         this.reset2();
@@ -1198,18 +1209,17 @@ export default {
     /** 当选择运营区时  根据运营区id，获取运营商和型号 */
     fetchData3(areaId) {
       if (areaId) {
-        selectDeptByAreaId(areaId).then((response) => {
-          console.log("根据运营商id，获取运营区和型号=========", response.data);
-          this.form.deptId = response.data.sysDept.deptId;
-          // this.areaOptions = response.data.areaList;
-          // let areaOptions = response.data.areaList;
-          // areaOptions.length > 0 ? this.form.areaId = areaOptions[0].areaId : this.form.areaId = null;
-          this.modelOptions = response.data.modelList;
-          let modelOptions = response.data.modelList;
-          modelOptions.length > 0
-            ? (this.form.modelId = modelOptions[0].modelId)
-            : (this.form.modelId = null);
-        });
+          this.isUpdating = true; // 设置标志位
+          selectDeptByAreaId(areaId).then((response) => {
+            this.form.deptId = response.data.sysDept.deptId;
+            this.modelOptions = response.data.modelList;
+            let modelOptions = response.data.modelList;
+            modelOptions.length > 0
+              ? (this.form.modelId = modelOptions[0].modelId)
+              : (this.form.modelId = null);
+          }).finally(() => {
+            this.isUpdating = false; // 清除标志位
+          });
       } else {
         this.reset2();
       }