Merge branch 'fly' into xy-ly

src/utils/api/index.js

@@ -521,8 +521,14 @@ export function updateCoordinate(data) {
     url: "/api/updateCoordinate",
     method: "post",
     data,
-    // headers: {
-    //   "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
-    // },
+  });
+}
+
+//根据requestid查询时间表下发状态
+export function getCmaSchelduleUpload(data) {
+  return request({
+    url: "/api/getCmaSchelduleUpload",
+    method: "post",
+    data,
   });
 }

src/views/devicePhotoSchedule/components/setdevice.vue

@@ -40,10 +40,19 @@
           :default-expand-all="true"
           @check="getCheckedNodes"
         >
-          <span v-if="!data.list" class="custom-tree-node" slot-scope="{ data }">
+          <span
+            v-if="!data.list"
+            class="custom-tree-node"
+            slot-scope="{ data }"
+          >
             <span class="mr10">{{ data.name }}</span>
-            <el-tag size="mini" >装置下发中</el-tag>
-            <el-tag size="mini" type="danger" >装置下发失败</el-tag>
+            <el-tag size="mini" type="success" v-if="zzsuccess"
+              >装置下发中</el-tag
+            >
+            <el-tag size="mini" v-if="zzpending">装置下发中</el-tag>
+            <el-tag size="mini" type="danger" v-if="zzerror"
+              >装置下发失败</el-tag
+            >
           </span>
           <span v-else class="custom-tree-node" slot-scope="{ data }">
             <span>{{ data.name }}</span>
@@ -66,6 +75,7 @@ import {
   setScheduleRulel,
   getScheduleRulelAccessList,
   getTermListByChannelJoggle,
+  getCmaSchelduleUpload,
 } from "@/utils/api/index";
 export default {
   props: {
@@ -98,6 +108,13 @@ export default {
       isIndeterminate: true, //全选设置默认选中
       timer: null,
       termidArrNum: -1,
+      requestList: [],
+
+      timer: null,
+      i: 0,
+      zzsuccess: false,
+      zzpending: false,
+      zzerror: false,
     };
   },
   mounted() {},
@@ -218,6 +235,13 @@ export default {
       })
         .then((res) => {
           console.log(res);
+          this.requestList = res.data.list;
+          console.log("0000000000000000");
+          this.requestTime();
+          this.timer = window.setInterval(() => {
+            this.requestTime();
+            this.i++;
+          }, 10000);
           //  this.$message({
           //   showClose: true,
           //   message: '添加成功',type: 'success'
@@ -231,6 +255,36 @@ export default {
           });
         });
     },
+    //根据requestid查询时间表下发状态
+    requestTime() {
+      getCmaSchelduleUpload({
+        list: this.requestList,
+      })
+        .then((res) => {
+          console.log("1111111111111111111111111111111");
+          console.log("1111111111111111111111111111111");
+          console.log("1111111111111111111111111111111");
+          console.log("1111111111111111111111111111111");
+          console.log(res);
+
+          if (res.data.list.length > 0) {
+            for (var j = 0; j < res.data.list.length; j++) {
+              if (res.data.list[j].status == 1) {
+                this.zzsuccess = true;
+              } else {
+                this.zzerror = true;
+              }
+            }
+            clearInterval(this.timer);
+            this.timer = null;
+          } else if (this.i > 9) {
+            this.$message.warning("暂无响应，请稍后再试！");
+            clearInterval(this.timer);
+            this.timer = null;
+          }
+        })
+        .catch((err) => {});
+    },
     display() {
       this.isShow = true;
     },
@@ -256,7 +310,7 @@ export default {
     border: 1px solid #eee;
     padding: 16px;
     border-radius: 4px;
-    .mr10{
+    .mr10 {
       margin-right: 10px;
     }
     .dybox {

src/views/management/monitoringEquipment/photographicDevice/components/imageCapture.vue

@@ -93,20 +93,6 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="对比度" prop="contrast">
-            <el-input-number
-              v-model="setForm.contrast"
-              :min="1"
-              :max="100"
-            ></el-input-number>
-          </el-form-item>
-          <el-form-item label="亮度" prop="luminance">
-            <el-input-number
-              v-model="setForm.luminance"
-              :min="1"
-              :max="100"
-            ></el-input-number>
-          </el-form-item>
           <el-form-item label="图像分辨率" prop="resolution">
             <el-select
               v-model="setForm.resolution"
@@ -121,6 +107,21 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="亮度" prop="luminance">
+            <el-input-number
+              v-model="setForm.luminance"
+              :min="1"
+              :max="100"
+            ></el-input-number>
+          </el-form-item>
+          <el-form-item label="对比度" prop="contrast">
+            <el-input-number
+              v-model="setForm.contrast"
+              :min="1"
+              :max="100"
+            ></el-input-number>
+          </el-form-item>
+
           <el-form-item label="饱和度" prop="saturation">
             <el-input-number
               v-model="setForm.saturation"
@@ -253,7 +254,7 @@ export default {
               this.$message.success("查询已更新");
               clearInterval(this.timer);
               this.timer = null;
-            } else if(this.i > 9) {
+            } else if (this.i > 9) {
               this.$message.warning("暂无响应，请稍后再试！");
               clearInterval(this.timer);
               this.timer = null;