优化

src/views/photographicDevice/components/parameterSetDialog.vue

@@ -20,8 +20,8 @@
         <span v-if="rowData.protocol == '65286'"> 河南郑州 </span>
         <span v-if="rowData.protocol == '65290'"> 河南统一视频v2020 </span>
         <span v-if="rowData.protocol == '65298'"> 宁夏 </span>
-      <span v-if="rowData.protocol == '2'"> 南网 </span>
+        <span v-if="rowData.protocol == '2'"> 南网 </span>
-        <span>{{rowData.protocol}}</span>
+        <span>{{ rowData.protocol }}</span>
       </span>
     </div>
     <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
@@ -78,7 +78,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-form-item>
           </el-form>
@@ -130,7 +130,9 @@
                       >查询</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-form-item>
                 </el-form>
@@ -211,7 +213,9 @@
                       >查询</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-form-item>
                 </el-form>
@@ -273,7 +277,9 @@
                       >查询</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-form-item>
                 </el-form>
@@ -310,7 +316,9 @@
                       >查询</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-form-item>
                 </el-form>
@@ -462,7 +470,9 @@
                       >查询</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-form-item>
                 </el-form>
@@ -597,7 +607,9 @@
                       >查询</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-form-item>
                 </el-form>
@@ -780,6 +792,7 @@
               :model="upgradationform"
               :rules="upgradationRules"
               ref="upgradationRuleForm"
+              label-width="80px"
             >
               <el-form-item label="文件名称" prop="upVal">
                 <el-select
@@ -800,6 +813,14 @@
                   </el-option>
                 </el-select>
               </el-form-item>
+              <el-form-item label="数据包" prop="packetVal">
+                <el-input-number
+                  :min="1"
+                  :max="32"
+                  v-model="upgradationform.packetVal"
+                ></el-input-number>
+                <span class="info">（数据包长度默认32K,[1,32768]）</span>
+              </el-form-item>
             </el-form>
             <el-button
               type="primary"
@@ -856,7 +877,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-form-item>
             </el-form>
@@ -1137,6 +1158,7 @@ export default {
       ugradLoading: false,
       upgradationform: {
         upVal: "",
+        packetVal: 32,
       },
       selectUpObj: {},
       upgradationRules: {
@@ -2140,10 +2162,9 @@ 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);
             this.timer = null;
@@ -2272,6 +2293,14 @@ export default {
               name: "name",
               value: this.selectUpObj.name,
             },
+            {
+              name: "packet",
+              value:
+                this.upgradationform.packetVal == "" ||
+                this.upgradationform.packetVal == 0
+                  ? 32 * 1024
+                  : this.upgradationform.packetVal * 1024,
+            },
           ];
           this.setTermFn(params);
         }
@@ -2394,13 +2423,26 @@ export default {
       // display: flex;
       // flex-direction: column;
       // align-items: center;
+      .el-form {
+        .el-form-item__label {
+          text-align: right;
+        }
+      }
       .el-select {
         .el-input {
           width: 316px;
         }
       }
+      .el-input {
+        width: 136px;
+      }
+      .info {
+        font-size: 12px;
+      }
       .el-button--primary {
-        margin-left: 76px;
+        margin: auto;
+        display: flex;
+        justify-content: center;
       }
     }
     .el-input.is-disabled .el-input__inner {

src/views/photographicDevice/components/workStatus.vue

@@ -18,7 +18,7 @@
       <span v-if="rowInfo.protocol == '65290'"> 河南统一视频v2020 </span>
       <span v-if="rowInfo.protocol == '65298'"> 宁夏 </span>
       <span v-if="rowInfo.protocol == '2'"> 南网 </span>
-        <span>{{rowInfo.protocol}}</span>
+      <span>{{ rowInfo.protocol }}</span>
     </div>
     <el-form :inline="true" :model="formdata" class="demo-form-inline">
       <el-form-item label="开始日期">
@@ -111,7 +111,7 @@
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        prop="connectionStr"
+        prop="gprsStr"
         label="GPRS信号强度"
         show-overflow-tooltip
       ></el-table-column>
@@ -131,11 +131,11 @@
         label="通信协议版本"
         show-overflow-tooltip
       ></el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="protocolVersion"
         label="GPRS信号强度"
         show-overflow-tooltip
-      ></el-table-column>
+      ></el-table-column> -->
     </el-table>
     <div class="pageNation">
       <el-pagination

src/views/realTimeMonitor/components/carouselChart.vue

@@ -13,7 +13,7 @@
       <span v-if="protocolInfo == '65290'"> 河南统一视频v2020 </span>
       <span v-if="protocolInfo == '65298'"> 宁夏 </span>
       <span v-if="protocolInfo == '2'"> 南网 </span>
-      <span>{{protocolInfo}}</span>
+      <span>{{ protocolInfo }}</span>
       <!-- <span>(共{{ terminalPhoto.length }}张)</span> -->
     </div>
     <div class="topPic">

src/views/realTimeMonitor/components/setAppDialog.vue

@@ -48,7 +48,14 @@
           <el-input v-model="appForm.heartbeat"></el-input>
           <span class="infoSpan">(分)</span>
         </el-form-item>
-
+        <el-form-item label="工作状态报周期" class="workClass">
+          <el-input-number
+            :min="1"
+            :max="1024"
+            v-model="appForm.workStatusTimes"
+          ></el-input-number>
+          <span class="infoSpan">(次)[1,1024]</span>
+        </el-form-item>
         <!-- <el-form-item label="参数设置">
           <el-checkbox
             label="报文子包起始号"
@@ -171,6 +178,7 @@ export default {
         equipName: "", // 装置名称
         bsManufacturer: "", // 生产厂家
         productionDate: "", // 生产日期
+        workStatusTimes: 3,
       },
       protocolOptions: [
         {
@@ -213,6 +221,10 @@ export default {
           id: 2,
           name: "南网",
         },
+        {
+          id: 65290,
+          name: "河南统一视频v2020",
+        },
       ],
       PacketBaseOptions: [
         {
@@ -289,7 +301,7 @@ export default {
             },
             {
               name: "configs",
-              value: 16,
+              value: 17,
             },
             //装置通道数
             { name: "name1", value: "channels" },
@@ -361,6 +373,10 @@ export default {
             { name: "name16", value: "upgradePacketBase" },
             { name: "value16", value: this.appForm.upgradePacketBase },
             { name: "type16", value: 0 },
+            //工作状态报周期
+            { name: "name1", value: "workStatusTimes" },
+            { name: "value1", value: this.appForm.workStatusTimes },
+            { name: "type1", value: 0 },
           ];
           this.setTermFn(params);
         } else {
@@ -517,6 +533,8 @@ export default {
             this.appForm.equipName = resultContent.equipName; // 装置名称
             this.appForm.bsManufacturer = resultContent.bsManufacturer; // 生产厂家
             this.appForm.productionDate = resultContent.productionDate * 1000; // 生产日期
+            this.appForm.workStatusTimes = resultContent.workStatusTimes; // 生产日期
+
             this.$message({
               duration: 1500,
               showClose: true,
@@ -567,6 +585,7 @@ export default {
       this.appForm.equipName = ""; // 装置名称
       this.appForm.bsManufacturer = ""; // 生产厂家
       this.appForm.productionDate = ""; // 生产日期
+      this.appForm.productionDate = 3; // 工作状态报周期
       window.clearInterval(this.searchTimer);
       this.searchTimer = null;
       this.searchNum = 0;
@@ -605,6 +624,13 @@ export default {
         width: 190px;
       }
     }
+    .workClass {
+      .el-input {
+        width: 100%;
+      }
+      span {
+      }
+    }
     .cmaClass {
       .el-input {
         width: 180px;

src/views/realTimeMonitor/components/siderBar.vue

@@ -152,6 +152,8 @@ export default {
     this.getRadio(); //获取列表在线离线全部
     this.getLineTreeList(); //获取树状图
     this.treeStatustimer = setInterval(this.getLineTreeStatus, 60000); // 每60秒刷新数据
+    this.$route.meta.intervalId = this.treeStatustimer;
+    console.log(this.$route.meta.intervalId, "aaaaaaaaaaaaaaaaa");
     EventBus.$on("treelist", this.getLineTreeStatus);
   },
   methods: {
@@ -329,7 +331,7 @@ export default {
       this.$store.commit("protocol", this.currentData.protocol); //将currentData保存在vuex中
       this.$store.commit("cmdId", this.currentData.cmdid); //将currentData保存在vuex中
       this.$parent.getCurrentData();
-      
+
       //this.$refs.tree.scrollTo(data);
       // localStorage.setItem("currentData", JSON.stringify(this.currentData));
     },
@@ -347,7 +349,25 @@ export default {
       }
     },
   },
+  beforeRouteLeave(to, from, next) {
+    if (to.name !== "realTimeMonitor") {
+      // 在离开当前路由时清除轮询
+      console.log("清除轮巡saaaaaaaaaaaaaaaaaaaaa");
+      clearInterval(this.treeStatustimer);
+      this.treeStatustimer = null;
+    }
+    next();
+  },
+  deactivated() {
+    console.log("清除轮巡");
+    console.log("deactivated", this.treeStatustimer);
+    //清除定时器
+    clearInterval(this.treeStatustimer);
+    this.treeStatustimer = null;
+  },
   beforeDestroy() {
+    console.log("清除轮巡");
+    console.log(this.treeStatustimer);
     //清除定时器
     clearInterval(this.treeStatustimer);
     this.treeStatustimer = null;