From 4a62b106c66069f59157967ffd904a8496a62fe5 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Tue, 4 Jul 2023 10:50:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E7=BD=AE=E6=B7=BB=E5=8A=A0=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/baseInfor.vue                  |  93 +++++++++++----
 .../photographicDevice/components/gpsSite.vue |  72 +++++++++---
 .../components/parameterSetDialog.vue         |   2 +
 .../components/runStatus.vue                  |  79 +++++++++----
 .../components/workStatus.vue                 | 108 ++++++++++++++----
 .../photographicDevice/index.vue              |  57 +++------
 6 files changed, 283 insertions(+), 128 deletions(-)

diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue b/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue
index ea6218d..cfd2620 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/baseInfor.vue
@@ -1,5 +1,11 @@
 <template>
-  <el-dialog class="setimgDialog" title="基本信息" :visible.sync="isShow" :close-on-click-modal="false" width="70%">
+  <el-dialog
+    class="baseInforDialog"
+    title="基本信息"
+    :visible.sync="isShow"
+    :close-on-click-modal="false"
+    width="70%"
+  >
     <el-form :inline="true" :model="formdata" class="demo-form-inline">
       <el-form-item label="开始日期">
         <el-date-picker
@@ -39,15 +45,60 @@
           <span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="name" label="采集时间" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="设备名称" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="设备编号" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="装置名称" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="装置型号" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="装置版本号" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="生产厂家" min-width="100" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="生产日期" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="出厂编号" min-width="100" show-overflow-tooltip></el-table-column>
+      <el-table-column
+        prop="name"
+        label="采集时间"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="设备名称"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="设备编号"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="装置名称"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="装置型号"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="装置版本号"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="生产厂家"
+        min-width="100"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="生产日期"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="出厂编号"
+        min-width="100"
+        show-overflow-tooltip
+      ></el-table-column>
     </el-table>
     <div class="pageNation">
       <el-pagination
@@ -64,9 +115,7 @@
   </el-dialog>
 </template>
 <script>
-import {
-  getLineListJoggle
-} from "@/utils/api/index";
+import { getLineListJoggle } from "@/utils/api/index";
 export default {
   data() {
     return {
@@ -105,12 +154,11 @@ export default {
       getLineListJoggle({
         pageindex: this.page,
         pagesize: this.pageSize,
-      })
-        .then((res) => {
-          this.listData = res.data.list;
-          this.total = res.data.total;
-          this.loading = false;
-        })
+      }).then((res) => {
+        this.listData = res.data.list;
+        this.total = res.data.total;
+        this.loading = false;
+      });
     },
     //点击分页
     handleCurrentChange(val) {
@@ -127,10 +175,11 @@ export default {
     },
     hide() {
       this.isShow = false;
-    }
+    },
   },
 };
 </script>
-<style lang="less" scoped>
-
+<style lang="less">
+.baseInforDialog {
+}
 </style>
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue b/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue
index a05680e..42f1c45 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/gpsSite.vue
@@ -1,5 +1,11 @@
 <template>
-  <el-dialog class="setimgDialog" title="GPS位置数据" :visible.sync="isShow" :close-on-click-modal="false" width="70%">
+  <el-dialog
+    class="gpsSiteDialog"
+    title="GPS位置数据"
+    :visible.sync="isShow"
+    :close-on-click-modal="false"
+    width="70%"
+  >
     <el-form :inline="true" :model="formdata" class="demo-form-inline">
       <el-form-item label="开始日期">
         <el-date-picker
@@ -39,12 +45,42 @@
           <span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="name" label="采集时间" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="设备名称" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="设备编号" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="半径" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="维度" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="经度" min-width="80" show-overflow-tooltip></el-table-column>
+      <el-table-column
+        prop="name"
+        label="采集时间"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="设备名称"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="设备编号"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="半径"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="维度"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="经度"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
     </el-table>
     <div class="pageNation">
       <el-pagination
@@ -61,9 +97,7 @@
   </el-dialog>
 </template>
 <script>
-import {
-  getLineListJoggle
-} from "@/utils/api/index";
+import { getLineListJoggle } from "@/utils/api/index";
 export default {
   data() {
     return {
@@ -102,12 +136,11 @@ export default {
       getLineListJoggle({
         pageindex: this.page,
         pagesize: this.pageSize,
-      })
-        .then((res) => {
-          this.listData = res.data.list;
-          this.total = res.data.total;
-          this.loading = false;
-        })
+      }).then((res) => {
+        this.listData = res.data.list;
+        this.total = res.data.total;
+        this.loading = false;
+      });
     },
     //点击分页
     handleCurrentChange(val) {
@@ -124,10 +157,11 @@ export default {
     },
     hide() {
       this.isShow = false;
-    }
+    },
   },
 };
 </script>
-<style lang="less" scoped>
-
+<style lang="less">
+.gpsSiteDialog {
+}
 </style>
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue
index e4997a5..4fa8214 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/parameterSetDialog.vue
@@ -400,6 +400,8 @@ export default {
     },
     handleclose() {
       this.isShow = false;
+      this.activeName = "1";
+      this.tabsActive = "first";
     },
   },
 };
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue b/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
index c28f3af..9ec7b1c 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/runStatus.vue
@@ -1,5 +1,11 @@
 <template>
-  <el-dialog class="setimgDialog" title="装置运行状态" :visible.sync="isShow" :close-on-click-modal="false" width="70%">
+  <el-dialog
+    class="runStatusDialog"
+    title="装置运行状态"
+    :visible.sync="isShow"
+    :close-on-click-modal="false"
+    width="70%"
+  >
     <el-form :inline="true" :model="formdata" class="demo-form-inline">
       <el-form-item label="开始日期">
         <el-date-picker
@@ -39,13 +45,48 @@
           <span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="name" label="采集时间" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="设备名称" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="设备编号" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="4G信号强度" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="2G信号强度" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="剩余运行内存" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="剩余存储内存" min-width="100" show-overflow-tooltip></el-table-column>
+      <el-table-column
+        prop="name"
+        label="采集时间"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="设备名称"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="设备编号"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="4G信号强度"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="2G信号强度"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="剩余运行内存"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="剩余存储内存"
+        min-width="100"
+        show-overflow-tooltip
+      ></el-table-column>
     </el-table>
     <div class="pageNation">
       <el-pagination
@@ -62,9 +103,7 @@
   </el-dialog>
 </template>
 <script>
-import {
-  getLineListJoggle
-} from "@/utils/api/index";
+import { getLineListJoggle } from "@/utils/api/index";
 export default {
   data() {
     return {
@@ -103,12 +142,11 @@ export default {
       getLineListJoggle({
         pageindex: this.page,
         pagesize: this.pageSize,
-      })
-        .then((res) => {
-          this.listData = res.data.list;
-          this.total = res.data.total;
-          this.loading = false;
-        })
+      }).then((res) => {
+        this.listData = res.data.list;
+        this.total = res.data.total;
+        this.loading = false;
+      });
     },
     //点击分页
     handleCurrentChange(val) {
@@ -125,10 +163,11 @@ export default {
     },
     hide() {
       this.isShow = false;
-    }
+    },
   },
 };
 </script>
-<style lang="less" scoped>
-
+<style lang="less">
+.runStatusDialog {
+}
 </style>
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue b/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue
index ff408c6..c4508a7 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/workStatus.vue
@@ -1,5 +1,11 @@
 <template>
-  <el-dialog class="setimgDialog" title="工作状态" :visible.sync="isShow" :close-on-click-modal="false" width="70%">
+  <el-dialog
+    class="workStatus"
+    title="工作状态"
+    :visible.sync="isShow"
+    :close-on-click-modal="false"
+    width="70%"
+  >
     <el-form :inline="true" :model="formdata" class="demo-form-inline">
       <el-form-item label="开始日期">
         <el-date-picker
@@ -39,19 +45,73 @@
           <span>{{ (page - 1) * pageSize + scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="name" label="采集时间" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="设备名称" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="设备编号" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="电源电压" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="工作温度" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="电池电量" min-width="80" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="浮充状态" min-width="100" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.name == 0 ? '充电' : '放电'  }}</template>
+      <el-table-column
+        prop="name"
+        label="采集时间"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="设备名称"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="设备编号"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="电源电压"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="工作温度"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="电池电量"
+        min-width="80"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="浮充状态"
+        min-width="100"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">{{
+          scope.row.name == 0 ? "充电" : "放电"
+        }}</template>
       </el-table-column>
-      <el-table-column prop="name" label="工作总时间" min-width="120" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="连续工作时间" min-width="100" show-overflow-tooltip></el-table-column>
-      <el-table-column prop="name" label="网络连接状态" min-width="100" show-overflow-tooltip>
-        <template slot-scope="scope">{{ scope.row.name == 0 ? '已连接' : '未连接'  }}</template>
+      <el-table-column
+        prop="name"
+        label="工作总时间"
+        min-width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="连续工作时间"
+        min-width="100"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="网络连接状态"
+        min-width="100"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">{{
+          scope.row.name == 0 ? "已连接" : "未连接"
+        }}</template>
       </el-table-column>
     </el-table>
     <div class="pageNation">
@@ -69,9 +129,7 @@
   </el-dialog>
 </template>
 <script>
-import {
-  getLineListJoggle
-} from "@/utils/api/index";
+import { getLineListJoggle } from "@/utils/api/index";
 export default {
   data() {
     return {
@@ -110,12 +168,11 @@ export default {
       getLineListJoggle({
         pageindex: this.page,
         pagesize: this.pageSize,
-      })
-        .then((res) => {
-          this.listData = res.data.list;
-          this.total = res.data.total;
-          this.loading = false;
-        })
+      }).then((res) => {
+        this.listData = res.data.list;
+        this.total = res.data.total;
+        this.loading = false;
+      });
     },
     //点击分页
     handleCurrentChange(val) {
@@ -132,10 +189,11 @@ export default {
     },
     hide() {
       this.isShow = false;
-    }
+    },
   },
 };
 </script>
-<style lang="less" scoped>
-
+<style lang="less">
+.workStatus {
+}
 </style>
diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index 75d78a0..9ed3997 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -67,14 +67,15 @@
           @row-click="handleRowClick"
           v-loading="loading"
         >
-          <!-- <el-table-column
-            prop="cmdid"
+          <el-table-column
+            fixed
+            prop="dyValueName"
             label="电压等级"
             show-overflow-tooltip
-            
           >
-          </el-table-column> -->
+          </el-table-column>
           <el-table-column
+            fixed
             prop="lineName"
             label="线路名称"
             show-overflow-tooltip
@@ -82,6 +83,7 @@
           >
           </el-table-column>
           <el-table-column
+            fixed
             prop="towerName"
             label="杆塔名称"
             show-overflow-tooltip
@@ -89,6 +91,7 @@
           >
           </el-table-column>
           <el-table-column
+            fixed
             prop="equipName"
             label="设备名称"
             show-overflow-tooltip
@@ -96,62 +99,32 @@
           >
           </el-table-column>
           <el-table-column
+            fixed
             prop="cmdId"
             label="设备编号"
             show-overflow-tooltip
             min-width="150"
           >
           </el-table-column>
-          <!-- <el-table-column
-            prop="cmdid"
-            label="SIM卡号"
-            show-overflow-tooltip
-            
-          >
+          <el-table-column prop="cmdid" label="SIM卡号" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="cmdid"
-            label="网络类型"
-            show-overflow-tooltip
-            
-          >
+          <el-table-column prop="cmdid" label="网络类型" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="cmdid"
-            label="状态"
-            show-overflow-tooltip
-            
-          >
+          <el-table-column prop="cmdid" label="状态" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="cmdid"
-            label="装置型号"
-            show-overflow-tooltip
-            
-          >
+          <el-table-column prop="cmdid" label="装置型号" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="cmdid"
-            label="装置厂家"
-            show-overflow-tooltip
-            
-          >
+          <el-table-column prop="cmdid" label="装置厂家" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column
-            prop="cmdid"
-            label="规约版本"
-            show-overflow-tooltip
-            
-          >
+          <el-table-column prop="cmdid" label="规约版本" show-overflow-tooltip>
           </el-table-column>
           <el-table-column
             prop="cmdid"
             label="投运日期"
             show-overflow-tooltip
-            
             :formatter="dateFormat"
           >
-          </el-table-column> -->
+          </el-table-column>
           <el-table-column
             prop="lastHeartbeat"
             label="最后一次心跳时间"