Merge branch 'fly' into xy-ly

src/components/common/Sidebar.vue

@@ -106,10 +106,10 @@ export default {
               index: "/devicePhotoSchedule",
               title: "拍照时间表设置",
             },
-            {
+            // {
-              index: "/deviceUpgrade",
+            //   index: "/deviceUpgrade",
-              title: "装置升级",
+            //   title: "装置升级",
-            },
+            // },
             // {
             //   icon: "el-icon-picture-outline",
             //   index: "imageSettings",

src/views/deviceUpgrade/components/upgradeDialog.vue

@@ -14,8 +14,8 @@
         ref="dataForm"
         label-width="90px"
       >
-        <el-form-item label="版本号：" prop="version">
+        <el-form-item label="版本号" prop="version">
-          <el-input v-model="formData.version" placeholder="审批人"></el-input>
+          <el-input v-model="formData.version" placeholder="版本号"></el-input>
         </el-form-item>
         <el-form-item label="上传Apk" prop="file">
           <el-input v-model="apkname" disabled></el-input>

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

@@ -94,7 +94,7 @@ export default {
       imgpic: null,
       drawingSurfaceImageData: "",
       color: "#00ff00",
-      num: 5,
+      num: 2,
       flag: false,
       x: 0,
       y: 0,

src/views/realTimeMonitor/index.vue

@@ -99,7 +99,11 @@
             <h3>操作项</h3>
             <div class="buttonGroup">
               <el-dropdown trigger="click" @command="handleCommandpic">
-                <el-button type="primary" :loading="btnpicloading">
+                <el-button
+                  type="primary"
+                  :loading="btnpicloading"
+                  :disabled="zzstatus == 0"
+                >
                   主动拍照<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
                 <el-dropdown-menu slot="dropdown" class="picdropStyle">
@@ -112,7 +116,11 @@
                 </el-dropdown-menu>
               </el-dropdown>
               <el-dropdown trigger="click" @command="handleCommandvideo">
-                <el-button type="primary" :loading="btnvideoloading">
+                <el-button
+                  type="primary"
+                  :loading="btnvideoloading"
+                  :disabled="zzstatus == 0"
+                >
                   主动录像<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
                 <el-dropdown-menu slot="dropdown" class="videodropStyle">
@@ -125,10 +133,17 @@
                 </el-dropdown-menu>
               </el-dropdown>
 
-              <el-button type="primary" @click="handleShowInfo">
+              <el-button
+                type="primary"
+                @click="handleShowInfo"
+                :disabled="zzstatus == 0"
+              >
                 装置信息</el-button
               >
-              <el-button type="primary" @click.native.stop="handleSetSchedule()"
+              <el-button
+                type="primary"
+                @click.native.stop="handleSetSchedule()"
+                :disabled="zzstatus == 0"
                 >拍照时间表</el-button
               >
               <!-- <el-dropdown
@@ -149,7 +164,7 @@
                 trigger="click"
                 @command="handleCommandWarn"
               >
-                <el-button type="primary">
+                <el-button type="primary" :disabled="zzstatus == 0">
                   声光报警<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
                 <el-dropdown-menu slot="dropdown" class="gpsdropStyle">
@@ -242,14 +257,17 @@ export default {
       treenum: 0,
       i: 0,
       newTermId: "",
+      zzstatus: "",
     };
   },
-  watch: {
+  // watch: {
-    lineTreeData: function (newVal, oldVal) {
+  //   lineTreeData: {
-      console.log("11111111111111111");
+  //     handler() {
-      console.log(newVal, oldVal);
+  //       console.log("count改变");
-    },
+  //     },
-  },
+  //     immediate: true, // 加此属性
+  //   },
+  // },
   computed: {
     ...mapState(["channelid", "termid"]),
     channelid() {
@@ -265,11 +283,11 @@ export default {
   mounted() {},
   created() {
     this.getLineTreeList();
-    // this.treetimer = window.setInterval(() => {
-    //   setTimeout(this.getLineTreeList(), 0);
-    // }, 3000);
     this.getDateTime();
     console.log(this.dateValue);
+    // this.treetimer = window.setInterval(() => {
+    //   setTimeout(this.getLineTreeStatus(), 0);
+    // }, 3000);
     //this.getLineTreeStatus();
   },
   methods: {
@@ -295,12 +313,12 @@ export default {
     //         console.log(res);
     //         this.treeStatus = res.data.list;
     //         this.lineTreeData = this.treeStatus;
-    //         console.log(this.treeStatus);
+    //         // console.log(this.treeStatus);
     //       })
     //       .catch((err) => {
     //         console.log(err); //代码错误、请求失败捕获
     //       });
-    //   }, 300000);
+    //   }, 10000);
     // },
     //获取左侧树结构
     getLineTreeList() {
@@ -316,7 +334,8 @@ export default {
             this.newTermId = this.lineTreeData[0].list[0].list[0].id;
 
             this.cmdid = this.lineTreeData[0].list[0].list[0].cmdid;
-
+            this.zzstatus = this.lineTreeData[0].list[0].list[0].onlinestatus;
+            console.log(this.zzstatus);
             this.$nextTick(() => {
               this.$refs.tree.setCurrentKey(this.currentNodekey); //一定要加这个选中了否则样式没有出来
               this.channelId = this.currentNodekey;
@@ -335,7 +354,8 @@ export default {
       if (data.list) {
         this.$refs.tree.setCurrentKey(data.list[0].id);
       }
-
+      this.zzstatus = data.onlinestatus;
+      console.log(this.zzstatus);
       this.channelId = data.id; //获取当前点击的id
       this.cmdid = data.cmdid;
       this.newTermId = data.id; //获取当前点击的id

src/views/realTimeSearch/index.vue

@@ -86,7 +86,12 @@
 
               <div class="caption">
                 <p class="infoTop">
-                  {{ item.linename }} / {{ item.displayname }}
+                  {{ item.linename }} /
+                  {{
+                    item.displayname !== null && item.displayname !== ""
+                      ? item.displayname
+                      : item.cmdid
+                  }}
                 </p>
                 <p class="infoBottom">
                   拍照时间：{{
@@ -109,7 +114,12 @@
               ></video>
               <div class="caption">
                 <p class="infoTop">
-                  {{ item.linename }} / {{ item.displayname }}
+                  {{ item.linename }} /
+                  {{
+                    item.displayname !== null && item.displayname !== ""
+                      ? item.displayname
+                      : item.cmdid
+                  }}
                 </p>
                 <p class="infoBottom">
                   拍照时间：{{
@@ -175,7 +185,7 @@ export default {
       },
       picList: [],
       page: 1, // 当前页数
-      pageSize: 10, // 每页数量
+      pageSize: 20, // 每页数量
       total: 0, //总条数
       loading: false,
       signtype: 0, //0第一次查询