Merge remote-tracking branch 'origin/V1.0.11' into V1.0.11

src/views/iot/diagnoseMission/dialog.bindMission.vue

@@ -55,7 +55,7 @@ export default {
       isShow: false,
       formData: this.reset(),
       formDataRules: {
-        bindMissionId: [{ required: true, message: "请选择任务名称" }]
+        bindMissionId: [{ required: true, message: "请选择任务名称",trigger:'blur' }]
       },
       // 查询参数
       queryParams: {
@@ -80,24 +80,6 @@ export default {
   },
   methods: {
     ...mapMutations([]),
-    initDeviceTypeList(){
-          missionTypeList()
-            .then((r) => {
-              // 使用 map 而不是 filter 进行数据转换
-              const transformedList = r.map((item) => ({
-                value: item.value,
-                label: item.label,
-                type: item.type,
-              }));
-
-              // 将转换后的数据推送到 this.deviceTypeList
-              this.deviceTypes.push(...transformedList);
-            })
-            .catch((error) => {
-              // 处理错误
-              console.error('Error fetching device type list:', error);
-            });
-    },
     reset() {
       return {
         bindMissionId:null,
@@ -105,7 +87,14 @@ export default {
     },
     async show(queryParams, deviceTypes) {
       this.queryParams = queryParams;
-      this.deviceTypes.push(deviceTypes);
+      // 使用 map 而不是 filter 进行数据转换
+      this.deviceTypes = [];
+      const transformedList = deviceTypes.map((item) => ({
+        value: item.value,
+        label: item.label,
+        type: item.type,
+      }));
+      this.deviceTypes.push(...transformedList);
       this.isShow = true;
     },
     // 事件
@@ -137,7 +126,6 @@ export default {
     },
   },
   created() {
-      this.initDeviceTypeList();
   },
   mounted() {},
   components: { },

src/views/iot/diagnoseThreshold/dialog.bindThreshold.vue

@@ -56,7 +56,7 @@ export default {
       isShow: false,
       formData: this.reset(),
       formDataRules: {
-        bindThresholdCodes: [{ required: true, message: "请选择阈值名称" }]
+        bindThresholdCodes: [{ required: true, message: "请选择阈值名称",trigger:'blur' }]
       },
       // 查询参数
       queryParams: {
@@ -81,24 +81,6 @@ export default {
   },
   methods: {
     ...mapMutations([]),
-    initDeviceTypeList(){
-          thresholdTypeList()
-            .then((r) => {
-              // 使用 map 而不是 filter 进行数据转换
-              const transformedList = r.map((item) => ({
-                value: item.value,
-                label: item.label,
-                type: item.type,
-              }));
-
-              // 将转换后的数据推送到 this.deviceTypeList
-              this.deviceTypes.push(...transformedList);
-            })
-            .catch((error) => {
-              // 处理错误
-              console.error('Error fetching device type list:', error);
-            });
-    },
     reset() {
       return {
         bindThresholdCodes:null,
@@ -106,7 +88,14 @@ export default {
     },
     async show(queryParams, deviceTypes) {
       this.queryParams = queryParams;
-      this.deviceTypes.push(deviceTypes);
+      // 使用 map 而不是 filter 进行数据转换
+      this.deviceTypes = [];
+      const transformedList = deviceTypes.map((item) => ({
+        value: item.value,
+        label: item.label,
+        type: item.type,
+      }));
+      this.deviceTypes.push(...transformedList);
       this.isShow = true;
     },
     // 事件
@@ -138,7 +127,6 @@ export default {
     },
   },
   created() {
-      this.initDeviceTypeList();
   },
   mounted() {},
   components: { },

src/views/iot/diagnoseThreshold/dialog.unbindThreshold.vue

@@ -56,7 +56,7 @@ export default {
       isShow: false,
       formData: this.reset(),
       formDataRules: {
-        bindThresholdCodes: [{ required: true, message: "请选择阈值名称" }]
+        bindThresholdCodes: [{ required: true, message: "请选择阈值名称",trigger:'blur' }]
       },
       // 查询参数
       queryParams: {
@@ -81,24 +81,6 @@ export default {
   },
   methods: {
     ...mapMutations([]),
-    initDeviceTypeList(){
-          thresholdTypeList()
-            .then((r) => {
-              // 使用 map 而不是 filter 进行数据转换
-              const transformedList = r.map((item) => ({
-                value: item.value,
-                label: item.label,
-                type: item.type,
-              }));
-
-              // 将转换后的数据推送到 this.deviceTypeList
-              this.deviceTypes.push(...transformedList);
-            })
-            .catch((error) => {
-              // 处理错误
-              console.error('Error fetching device type list:', error);
-            });
-    },
     reset() {
       return {
         bindThresholdCodes:null,
@@ -106,7 +88,14 @@ export default {
     },
     async show(queryParams, deviceTypes) {
       this.queryParams = queryParams;
-      this.deviceTypes.push(deviceTypes);
+      // 使用 map 而不是 filter 进行数据转换
+      this.deviceTypes = [];
+      const transformedList = deviceTypes.map((item) => ({
+        value: item.value,
+        label: item.label,
+        type: item.type,
+      }));
+      this.deviceTypes.push(...transformedList);
       this.isShow = true;
     },
     // 事件
@@ -137,7 +126,6 @@ export default {
     },
   },
   created() {
-      this.initDeviceTypeList();
   },
   mounted() {},
   components: { },

src/views/iot/videoChannelPlan/index.vue

@@ -84,9 +84,24 @@
             {{ getPlanTypeDesc(scope.row) }}
           </template>
         </el-table-column>
-        <el-table-column label="录像检测模板" align="center" prop="templateName" show-overflow-tooltip/>
-        <el-table-column label="前端设备起始时间" align="center" prop="minTime" min-width="100"/>
-        <el-table-column label="前端设备结束时间" align="center" prop="maxTime" min-width="100"/>
+        <el-table-column label="录像检测模板" align="center" prop="templateName" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="scope.row.planType === -2 || scope.row.planType === -3" style="color: red">未绑定</span>
+            <span v-else>{{scope.row.templateName}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="前端设备起始时间" align="center" prop="minTime" min-width="100">
+          <template slot-scope="scope">
+            <span v-if="scope.row.planType === -2 || scope.row.planType === -3">-</span>
+            <span v-else>{{scope.row.minTime}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="前端设备结束时间" align="center" prop="maxTime" min-width="100">
+          <template slot-scope="scope">
+            <span v-if="scope.row.planType === -2 || scope.row.planType === -3">-</span>
+            <span v-else>{{scope.row.maxTime}}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="更新时间" align="center" prop="planUpdateTime" show-overflow-tooltip/>
         <el-table-column label="异常原因" align="center" prop="failRemark">
           <template slot-scope="scope">
@@ -196,6 +211,18 @@ export default {
         return "全天移动侦测";
       } else if (val === 3) {
         return "混合录像计划";
+      } else if (val === -2) {
+        return "设备不支持";
+      }else if (val === -3) {
+        return "通讯失败";
+      }
+    },
+    getPlanNameDesc(row) {
+      let val = row.planType;
+      if (val === -2 || val === -3) {
+        return '<span style="color: red">未绑定</span>';
+      } else {
+        return row.templateName;
       }
     },
     onOrgSelect(node) {