优化

src/views/photographicDevice/components/pictureTags.vue

@@ -46,7 +46,7 @@
               <el-option
                 v-for="item in picoptions"
                 :key="item.id"
-                :label="item.name"
+                :label="item.channelName"
                 :value="item.id"
               >
               </el-option>
@@ -147,8 +147,9 @@ export default {
       this.isShow = true;
       this.pictureData = val; //获取当前列表数据
       this.picoptions = val.list; //获取所有通道
+      console.log("asdasdadadad", this.picoptions);
       this.channelId = val.list[0].id;
-      this.picvalue = val.list[0].name; //获取第一个通道
+      this.picvalue = val.list[0].channelName; //获取第一个通道
       this.termId = val.id; //装置id
       this.getcanvansPic(val, this.channelId);
     },

src/views/photographicDevice/components/workStatus.vue

@@ -88,7 +88,7 @@
       ></el-table-column>
       <el-table-column
         prop="workingTime"
-        label="本次连续工作时间(小时)"
+        label="连续工作时间(小时)"
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column

src/views/realTimeMonitor/components/parameterArea.vue

@@ -94,6 +94,26 @@
 
         <setChannelButton v-if="roleUser == 0"></setChannelButton>
         <setAppButton v-if="roleUser == 0"></setAppButton>
+        <el-dropdown
+          class="dropgps"
+          trigger="click"
+          @command="
+            (command) => {
+              handleSearchCommand(command, areaData);
+            }
+          "
+        >
+          <el-button type="primary">
+            数据查询<i class="el-icon-arrow-down el-icon--right"></i>
+          </el-button>
+          <el-dropdown-menu slot="dropdown" class="picdropStyle">
+            <el-dropdown-item command="info">基本信息</el-dropdown-item>
+            <el-dropdown-item command="workStatus">工作状态</el-dropdown-item>
+            <el-dropdown-item command="runStatus">运行状态</el-dropdown-item>
+            <el-dropdown-item command="GPS">GPS位置</el-dropdown-item>
+            <el-dropdown-item command="faultInfo">故障信息报</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
         <!-- <el-button type="primary" @click="handleTakePic" :loading="picLoading"
           >主动拍照
         </el-button> -->
@@ -144,6 +164,12 @@
     </div>
     <parameterSetDialog ref="parameterSetref"></parameterSetDialog>
     <uploadpic ref="uploadpicref"></uploadpic>
+
+    <baseInfor ref="baseInfor_ref"></baseInfor>
+    <workStatus ref="workStatus_ref"></workStatus>
+    <runStatus ref="runStatus_ref"></runStatus>
+    <gpsSite ref="gpsSite_ref"></gpsSite>
+    <faultInfomation ref="fultInfo_ref"></faultInfomation>
   </div>
 </template>
 <script>
@@ -160,6 +186,12 @@ import gpsButton from "./gpsButton.vue";
 import uploadpic from "./uploadpic.vue";
 import parameterSetDialog from "../../photographicDevice/components/parameterSetDialog.vue";
 import setAppButton from "./setAppButton.vue";
+
+import baseInfor from "../../photographicDevice/components/baseInfor.vue";
+import workStatus from "../../photographicDevice/components/workStatus.vue";
+import runStatus from "../../photographicDevice/components/runStatus.vue";
+import gpsSite from "../../photographicDevice/components/gpsSite.vue";
+import faultInfomation from "../../photographicDevice/components/faultInfomation.vue";
 import {
   getChannelByTermidJoggle,
   updateTermCamera,
@@ -180,6 +212,11 @@ export default {
     uploadpic,
     setChannelButton,
     setAppButton,
+    baseInfor,
+    workStatus,
+    runStatus,
+    gpsSite,
+    faultInfomation,
   },
   data() {
     return {
@@ -373,6 +410,30 @@ export default {
       console.log(this.areaData);
       this.$refs.parameterSetref.display(this.areaData);
     },
+    //基本信息报
+    //数据查询
+    handleSearchCommand(command, row) {
+      console.log(command, row);
+      switch (command) {
+        case "info":
+          this.$refs.baseInfor_ref.display(row);
+          break;
+        case "workStatus":
+          this.$refs.workStatus_ref.display(row);
+          break;
+        case "runStatus":
+          this.$refs.runStatus_ref.display(row);
+          break;
+        case "GPS":
+          this.$refs.gpsSite_ref.display(row);
+          break;
+        case "faultInfo":
+          this.$refs.fultInfo_ref.display(row);
+          break;
+        default:
+          break;
+      }
+    },
     //焦距放大缩小
     amplify() {
       getTermStatus({ termId: this.areaData.id }).then((res) => {