From 3fbd7af3cc3e5ff37f990f5369e7bf2c0953a597 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Sun, 28 Apr 2024 17:51:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sidebar.vue                    |  1 +
 src/views/homePage/index.vue                  | 20 ++++-
 src/views/photographicDevice/index.vue        | 58 ++++++-------
 .../components/setChannelDialog.vue           | 87 +++++++++++--------
 .../reportData/equipmentStatus/index.vue      | 64 ++++++++++++--
 src/views/reportData/index.vue                |  5 ++
 src/views/reportData/photostatis/index.vue    | 11 ++-
 7 files changed, 172 insertions(+), 74 deletions(-)

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 0f3532e..34ffb43 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -213,6 +213,7 @@ export default {
 
         if (
           [
+            "dyInformation",
             "lineInformation",
             "towerInformation",
             "cameraChannel",
diff --git a/src/views/homePage/index.vue b/src/views/homePage/index.vue
index 9efb97b..573391f 100644
--- a/src/views/homePage/index.vue
+++ b/src/views/homePage/index.vue
@@ -98,16 +98,30 @@
           tooltip-effect="dark"
           height="calc(100% - 54px)"
         >
-          <el-table-column prop="lineName" label="线路名称"></el-table-column>
-          <el-table-column prop="towerName" label="杆塔名称"></el-table-column>
-          <el-table-column prop="cmdId" label="装置ID"></el-table-column>
+          <el-table-column
+            prop="lineName"
+            label="线路名称"
+            min-width="120"
+          ></el-table-column>
+          <el-table-column
+            prop="towerName"
+            label="杆塔名称"
+            min-width="120"
+          ></el-table-column>
+          <el-table-column
+            prop="cmdId"
+            label="装置ID"
+            min-width="120"
+          ></el-table-column>
           <el-table-column
             prop="hearttime"
             label="最新心跳时间"
+            min-width="120"
           ></el-table-column>
           <el-table-column
             prop="pictime"
             label="最新图片拍照时间"
+            min-width="120"
           ></el-table-column>
           <el-table-column prop="isonline" label="是否在线"></el-table-column>
           <el-table-column prop="longitude" label="经度"></el-table-column>
diff --git a/src/views/photographicDevice/index.vue b/src/views/photographicDevice/index.vue
index e52b2eb..52fbe74 100644
--- a/src/views/photographicDevice/index.vue
+++ b/src/views/photographicDevice/index.vue
@@ -174,7 +174,7 @@
                 v-else-if="scope.row.onlinestatus == 0"
                 >离线</span
               >
-              <span style="color: #e6a23c" v-else>休眠</span>
+              <!-- <span style="color: #e6a23c" v-else>休眠</span> -->
             </template>
           </el-table-column>
           <el-table-column
@@ -234,7 +234,7 @@
           <el-table-column
             fixed="right"
             label="操作"
-            width="420"
+            width="320"
             v-if="roleUser != 2"
           >
             <template slot-scope="scope">
@@ -264,7 +264,7 @@
                   >
                 </el-dropdown-menu>
               </el-dropdown>
-              <el-button
+              <!-- <el-button
                 :disabled="
                   scope.row.onlinestatus == 0 || scope.row.onlinestatus != 1
                 "
@@ -279,7 +279,7 @@
                 @click.native.stop="handlehqSet(scope.row)"
                 type="text"
                 >唤起</el-button
-              >
+              > -->
               <el-button
                 @click.native.stop="handleParameterSet(scope.row)"
                 type="text"
@@ -456,31 +456,31 @@ export default {
     this.terminalList();
   },
   methods: {
-    //休眠
-    handlexmSet(row) {
-      console.log(row);
-      this.$message({
-        duration: 1000,
-        type: "success",
-        message: "休眠命令已下发...",
-        showClose: true,
-      });
-      setTimeout(() => {
-        row.onlinestatus = -1;
-      }, 1500);
-    },
-    //唤起
-    handlehqSet(row) {
-      this.$message({
-        duration: 1000,
-        type: "success",
-        message: "唤起命令已下发...",
-        showClose: true,
-      });
-      setTimeout(() => {
-        row.onlinestatus = 1;
-      }, 1500);
-    },
+    // //休眠
+    // handlexmSet(row) {
+    //   console.log(row);
+    //   this.$message({
+    //     duration: 1000,
+    //     type: "success",
+    //     message: "休眠命令已下发...",
+    //     showClose: true,
+    //   });
+    //   setTimeout(() => {
+    //     row.onlinestatus = -1;
+    //   }, 1500);
+    // },
+    // //唤起
+    // handlehqSet(row) {
+    //   this.$message({
+    //     duration: 1000,
+    //     type: "success",
+    //     message: "唤起命令已下发...",
+    //     showClose: true,
+    //   });
+    //   setTimeout(() => {
+    //     row.onlinestatus = 1;
+    //   }, 1500);
+    // },
     getRowKeys(row) {
       return row.id;
     },
diff --git a/src/views/realTimeMonitor/components/setChannelDialog.vue b/src/views/realTimeMonitor/components/setChannelDialog.vue
index 5d8d9b9..50718a4 100644
--- a/src/views/realTimeMonitor/components/setChannelDialog.vue
+++ b/src/views/realTimeMonitor/components/setChannelDialog.vue
@@ -37,10 +37,17 @@
             >
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="照片大小" class="photoSize">
-          <el-input v-model="channelForm.resolutionCX"></el-input>
-          <el-input v-model="channelForm.resolutionCY"></el-input>
-        </el-form-item>
+        <div class="photoinfo">
+          <el-form-item label="照片大小" class="photoSize">
+            <el-input v-model="channelForm.resolutionCX"></el-input>
+            <el-input v-model="channelForm.resolutionCY"></el-input>
+          </el-form-item>
+          <el-form-item label="压缩率">
+            <el-input v-model="channelForm.ysl"></el-input>
+            <span class="infoSpan">(0-100的整数)</span>
+          </el-form-item>
+        </div>
+
         <div class="picZoomClass">
           <el-form-item label="图片放大">
             <el-radio-group v-model="channelForm.isImageZoomEnabled">
@@ -80,10 +87,7 @@
             <span class="infoSpan">(秒)</span>
           </el-form-item>
         </div>
-        <el-form-item label="压缩率">
-          <el-input v-model="channelForm.ysl"></el-input>
-          <span class="infoSpan">(0-100的整数)</span>
-        </el-form-item>
+
         <el-form-item label="参数设置">
           <el-checkbox
             label="USB接口"
@@ -118,28 +122,31 @@
             v-model="channelForm.ywchecked"
           ></el-checkbox>
         </el-form-item>
-        <el-form-item label="旋转角度">
-          <el-select v-model="channelForm.roteval" placeholder="请选择">
-            <el-option
-              v-for="item in roteOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="AI识别">
-          <el-select v-model="channelForm.aival" placeholder="请选择">
-            <el-option
-              v-for="item in aiOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
+        <div class="roteAiBox">
+          <el-form-item label="旋转角度">
+            <el-select v-model="channelForm.roteval" placeholder="请选择">
+              <el-option
+                v-for="item in roteOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="AI识别">
+            <el-select v-model="channelForm.aival" placeholder="请选择">
+              <el-option
+                v-for="item in aiOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+
         <el-form-item label="左上OSD">
           <el-input v-model="channelForm.ltosd"></el-input>
           <span class="infoSpan">(多行使用\n换行)</span>
@@ -200,8 +207,8 @@ export default {
         videoDuration: 15,
         ysl: 80,
         usbchecked: "",
-        zzdjchecked: "",
-        zdbgchecked: "",
+        zzdjchecked: 1,
+        zdbgchecked: 1,
         bgsj: "",
         iso: "",
         hdrchecked: "",
@@ -804,8 +811,8 @@ export default {
       this.channelForm.zzbh = "";
       this.channelForm.ysl = 80;
       this.channelForm.usbchecked = "";
-      this.channelForm.zzdjchecked = "";
-      this.channelForm.zdbgchecked = "";
+      this.channelForm.zzdjchecked = 1;
+      this.channelForm.zdbgchecked = 1;
       this.channelForm.bgsj = "";
       this.channelForm.iso = "";
       this.channelForm.hdrchecked = "";
@@ -859,6 +866,18 @@ export default {
         }
       }
     }
+    .photoinfo {
+      display: flex;
+      .el-input {
+        width: 80px;
+      }
+    }
+    .roteAiBox {
+      display: flex;
+      .el-input {
+        width: 150px;
+      }
+    }
     .picZoomClass {
       display: flex;
 
diff --git a/src/views/reportData/equipmentStatus/index.vue b/src/views/reportData/equipmentStatus/index.vue
index 9c8c441..4d50357 100644
--- a/src/views/reportData/equipmentStatus/index.vue
+++ b/src/views/reportData/equipmentStatus/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="equipmentStatusBox">
-    <div class="searchBox" ref="searchref">
+  <div class="equipmentStatusBox" ref="statisRef">
+    <div class="searchBox" ref="searchref" v-if="drawerSearch">
       <el-form :inline="true" :model="formdata" class="demo-form-inline">
         <el-form-item label="电压等级" class="dyclass">
           <el-select v-model="formdata.dyid" @change="getSearchxl">
@@ -76,7 +76,7 @@
         tooltip-effect="dark"
         stripe
         style="width: 100%"
-        height="calc(100% - 0px)"
+        :height="tableheight"
         fit
       >
         <template slot="empty">
@@ -88,10 +88,10 @@
           </template>
         </el-table-column>
        
-        <el-table-column prop="dyName" label="电压等级" fixed> </el-table-column>
+        <el-table-column prop="dyName" label="电压等级" fixed show-overflow-tooltip> </el-table-column>
         <el-table-column prop="lineName" label="线路名称" min-width="180" fixed> </el-table-column>
         <el-table-column prop="towerName" label="杆塔名称" min-width="180" show-overflow-tooltip fixed> </el-table-column>
-        <el-table-column prop="displayName" label="设备名称" min-width="180" fixed> </el-table-column>
+        <!-- <el-table-column prop="displayName" label="设备名称" min-width="180" fixed> </el-table-column> -->
         <el-table-column prop="cmdid" label="装置id" min-width="180" fixed>
           <template slot-scope="scope">
               {{ scope.row.cmdid }}
@@ -100,7 +100,20 @@
         </el-table-column>
         <el-table-column prop="sim" label="SIM卡号" min-width="180"> </el-table-column>
         <el-table-column prop="netType" label="网络类型"> </el-table-column>
-        <el-table-column prop="onlinestatus" label="状态"> </el-table-column>
+        <el-table-column prop="onlinestatus" label="状态"> 
+          <template slot-scope="scope">
+             
+              <span style="color: #169e8c" v-if="scope.row.onlinestatus == 1"
+                >在线</span
+              >
+              <span
+                style="color: #f56c6c"
+                v-else-if="scope.row.onlinestatus == 0"
+                >离线</span
+              >
+             
+            </template>
+        </el-table-column>
         <el-table-column prop="model" label="装置型号" min-width="120"> </el-table-column>
         <el-table-column prop="bsManufacturer" label="装置厂家"> </el-table-column>
         <el-table-column prop="protocolName" label="规约版本" min-width="180"> </el-table-column>
@@ -222,6 +235,8 @@ export default {
       pageSize: 20, // 每页数量
       total: 0, //总条数
       termLoading: false,
+      drawerSearch: false,
+      tableheight: "100%",
     };
   },
   created() {},
@@ -331,6 +346,24 @@ export default {
     // handleShowIp(row) {
     //   this.$refs.ipDialogref.display(row);
     // },
+    showSearch() {
+      this.drawerSearch = !this.drawerSearch;
+      console.log(this.drawerSearch);
+
+      this.$nextTick(() => {
+        if (this.drawerSearch) {
+          // 如果抽屉现在是可见的，获取其高度
+          console.log(this.$refs.statisRef.offsetHeight);
+          const searchBoxHeight = this.$refs.searchref.offsetHeight;
+          console.log("搜索框的高度:", searchBoxHeight);
+          this.tableheight =
+            this.$refs.statisRef.offsetHeight - searchBoxHeight - 36;
+          console.log(this.tableheight);
+        } else {
+          this.tableheight = "100%";
+        }
+      });
+    },
   },
 };
 </script>
@@ -366,7 +399,7 @@ export default {
     }
   }
   .deviceTable {
-    height: calc(100% - 94px);
+    height: calc(100% - 32px);
     //background: #fcc;
     .el-table {
       .cell {
@@ -374,6 +407,23 @@ export default {
         vertical-align: middle; /* 如果需要垂直居中 */
       }
     }
+    .el-table {
+      color: #000;
+      thead {
+        color: #000;
+        font-weight: bold;
+      }
+      th.el-table__cell {
+        background: #dcdcdc !important;
+      }
+      td.el-table__cell,
+      th.el-table__cell.is-leaf {
+        border-bottom: 1px solid #dcdcdc;
+      }
+      .el-table__cell {
+        border-right: 1px solid #dcdcdc;
+      }
+    }
   }
 }
 </style>
diff --git a/src/views/reportData/index.vue b/src/views/reportData/index.vue
index 1f9dd2d..4b9a42c 100644
--- a/src/views/reportData/index.vue
+++ b/src/views/reportData/index.vue
@@ -18,6 +18,7 @@
         <span slot="label">
           设备状态列表
           <el-button
+            @click.stop="handlestatusSearch"
             v-if="statusFlag"
             type="primary"
             icon="el-icon-search"
@@ -76,6 +77,10 @@ export default {
       console.log("aaaaaaaaaaaa");
       this.$refs.photoStatisRef.showSearch();
     },
+    handlestatusSearch() {
+      console.log("bbbbbb");
+      this.$refs.equipmentStatusRef.showSearch();
+    },
   },
 };
 </script>
diff --git a/src/views/reportData/photostatis/index.vue b/src/views/reportData/photostatis/index.vue
index 0d5ec67..292872d 100644
--- a/src/views/reportData/photostatis/index.vue
+++ b/src/views/reportData/photostatis/index.vue
@@ -106,7 +106,12 @@
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column prop="cmdid" label="装置id" min-width="140">
+        <el-table-column
+          prop="cmdid"
+          label="装置id"
+          min-width="140"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <el-link
               type="primary"
@@ -122,6 +127,7 @@
           prop="lastHeartbeat"
           label="最后心跳时间"
           min-width="130"
+          show-overflow-tooltip
         >
           <template slot-scope="scope">
             <el-link
@@ -142,6 +148,7 @@
           prop="firstPhotoTime"
           label="当天第一张照片时间"
           min-width="130"
+          show-overflow-tooltip
         >
           <template slot-scope="scope">
             {{ scope.row.photoInfo.firstPhotoTime }}
@@ -151,6 +158,7 @@
           prop="lastRecvTime"
           label="照片最后接收时间"
           min-width="130"
+          show-overflow-tooltip
         >
           <template slot-scope="scope">
             {{ scope.row.photoInfo.lastRecvTime }}
@@ -161,6 +169,7 @@
           prop="workingStatus.bootTime"
           label="最后重启时间"
           min-width="130"
+          show-overflow-tooltip
         >
           <template slot-scope="scope">
             {{