优化

src/views/photographicDevice/components/imageCapture.vue

@@ -91,7 +91,7 @@
           >查询</el-button
         >
         <p class="looktime" v-if="lookTime && showLookTime">
-          {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
+          {{ $moment(lookTime * 1000).format("YYYY-MM-DD HH:mm:ss") }}
         </p>
         <!-- <el-button
           class="searchImage"
@@ -721,6 +721,16 @@ export default {
           name: "",
         },
       ], //河南
+      nxratiolist: [
+        {
+          id: 7,
+          name: "1280X720",
+        },
+        {
+          id: 8,
+          name: "1920X1080",
+        },
+      ], //宁夏
       //
       selaccess: "", //选中的通道
       capturenr: {}, //查询后的内容
@@ -806,6 +816,10 @@ export default {
         case 65290:
           this.ratiolist = this.henanratiolist;
           break;
+        //宁夏
+        case 65298:
+          this.ratiolist = this.nxratiolist;
+          break;
       }
 
       if (val.protocol == 65281) {
@@ -941,7 +955,7 @@ export default {
           console.log(res);
           this.requestid = res.data.requestId;
           this.showLookTime = false;
-         // this.lookTime = res.data.date;
+          // this.lookTime = res.data.date;
           //this.getinfo1();
           clearInterval(this.timer);
           this.timer = window.setInterval(() => {
@@ -970,8 +984,8 @@ export default {
               message: "信息已更新",
               type: "success",
             });
-            this.lookTime =res.data.requestTime ;
-            
+            this.lookTime = res.data.requestTime;
+
             this.showLookTime = true;
           } else if (this.i > 9) {
             window.clearInterval(this.timer);

src/views/realTimeMonitor/components/carouselChart.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="thumb-example">
-    <div class="radioBox" v-if="roleUser == 1 || roleUser == 0">
+    <div class="radioBox" v-if="roleUser == 8 || roleUser == 0">
       {{ radioPx }} <span v-if="fileSize">({{ fileSize }})</span>
       <span v-if="protocolInfo == '65280'"> 国网I1 </span>
       <span v-if="protocolInfo == '65296'"> 陕西 </span>
@@ -60,6 +60,7 @@
         <i class="el-icon-arrow-left"></i>
       </div>
       <el-button
+        v-if="mediaType !== 1"
         class="downBtn"
         @click.stop="downLoadPic(currentPicPath, currentPicPath)"
         >下载图片</el-button

src/views/realTimeMonitor/components/setAppDialog.vue

@@ -62,6 +62,7 @@
             v-model="appForm.usbchecked"
           ></el-checkbox>
         </el-form-item> -->
+
         <el-form-item label="报文子包起始号">
           <el-select v-model="appForm.upgradePacketBase" placeholder="请选择">
             <el-option
@@ -102,6 +103,12 @@
         <el-form-item label="CMA服务器ip">
           <el-input v-model="appForm.server"></el-input>
         </el-form-item>
+        <el-form-item>
+          <el-checkbox
+            label="故障上报"
+            v-model="appForm.reportFault"
+          ></el-checkbox>
+        </el-form-item>
         <el-form-item label="CMA服务器端口" class="cmaClass">
           <el-input v-model="appForm.port"></el-input>
           <span class="infoSpan">(1025-65535)</span>
@@ -179,6 +186,7 @@ export default {
         bsManufacturer: "", // 生产厂家
         productionDate: "", // 生产日期
         workStatusTimes: 3,
+        reportFault: "", //故障上报
       },
       protocolOptions: [
         {
@@ -301,7 +309,7 @@ export default {
             },
             {
               name: "configs",
-              value: 17,
+              value: 18,
             },
             //装置通道数
             { name: "name1", value: "channels" },
@@ -374,9 +382,13 @@ export default {
             { name: "value16", value: this.appForm.upgradePacketBase },
             { name: "type16", value: 0 },
             //工作状态报周期
-            { name: "name1", value: "workStatusTimes" },
-            { name: "value1", value: this.appForm.workStatusTimes },
-            { name: "type1", value: 0 },
+            { name: "name17", value: "workStatusTimes" },
+            { name: "value17", value: this.appForm.workStatusTimes },
+            { name: "type17", value: 0 },
+            //工作状态报周期
+            { name: "name18", value: "reportFault" },
+            { name: "value18", value: this.appForm.reportFault ? 1 : 0 },
+            { name: "type18", value: 0 },
           ];
           this.setTermFn(params);
         } else {
@@ -535,6 +547,7 @@ export default {
               this.appForm.bsManufacturer = resultContent.bsManufacturer; // 生产厂家
               this.appForm.productionDate = resultContent.productionDate * 1000; // 生产日期
               this.appForm.workStatusTimes = resultContent.workStatusTimes; // 生产日期
+              this.appForm.reportFault = resultContent.reportFault; // 故障上报
             } else {
               this.appForm.channels = 4; //装置通道数,程序默认值为4
               this.appForm.packetSize = 2048; //图像数据分包大小
@@ -554,6 +567,7 @@ export default {
               this.appForm.bsManufacturer = ""; // 生产厂家
               this.appForm.productionDate = ""; // 生产日期
               this.appForm.productionDate = 3; // 工作状态报周期
+              this.appForm.reportFault = ""; // 故障上报
             }
 
             this.$message({
@@ -607,6 +621,7 @@ export default {
       this.appForm.bsManufacturer = ""; // 生产厂家
       this.appForm.productionDate = ""; // 生产日期
       this.appForm.productionDate = 3; // 工作状态报周期
+      this.appForm.reportFault = ""; // 故障上报
       window.clearInterval(this.searchTimer);
       this.searchTimer = null;
       this.searchNum = 0;

src/views/realTimeMonitor/components/setschedule.vue

@@ -967,8 +967,10 @@ export default {
       .searchTime {
         .channelBox {
           margin-bottom: 12px;
+          display: flex;
+          align-items: center;
           .clearButton {
-            margin-left: 24px;
+            margin-left: auto;
           }
         }
         .timeContain {