From dbf3c2abd4964bd05dc5920c5473d85315d9abc9 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Mon, 8 May 2023 11:44:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=91=E9=A9=AC=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/alarmHandling/index.vue             |   1 +
 src/views/cameraChannel/index.vue             |  35 ++++-
 src/views/components/carouselChart.vue        |   1 -
 .../components/setdevice.vue                  | 120 ++++++++++++------
 src/views/devicePhotoSchedule/index.vue       |   1 +
 src/views/imageSettings/index.vue             |   1 +
 .../monitoringEquipment/SIMCard/index.vue     |   1 +
 .../photographicDevice/index.vue              |   1 +
 .../userEquipment/lineInformation/index.vue   |   1 +
 .../userEquipment/towerInformation/index.vue  |  43 +++++--
 .../components/setschedule.vue                |  33 +++--
 11 files changed, 163 insertions(+), 75 deletions(-)

diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue
index dba75be..e4e6a0c 100644
--- a/src/views/alarmHandling/index.vue
+++ b/src/views/alarmHandling/index.vue
@@ -19,6 +19,7 @@
         <el-table
           ref="multipleTable"
           :data="tableData"
+          stripe
           border
           tooltip-effect="dark"
           style="width: 100%"
diff --git a/src/views/cameraChannel/index.vue b/src/views/cameraChannel/index.vue
index 0ec3d12..472753a 100644
--- a/src/views/cameraChannel/index.vue
+++ b/src/views/cameraChannel/index.vue
@@ -13,6 +13,7 @@
         <el-table
           ref="multipleTable"
           :data="deviceTableData"
+          stripe
           tooltip-effect="dark"
           style="width: 100%"
           height="calc(100% - 40px)"
@@ -21,17 +22,38 @@
         >
           <!-- <el-table-column type="index" width="55"> </el-table-column>
           <el-table-column type="selection" width="55"> </el-table-column> -->
-          <el-table-column label="通道名称" show-overflow-tooltip prop="channelname"></el-table-column>
-          <el-table-column label="分辨率高" show-overflow-tooltip prop="maxResolutionHeight"></el-table-column>
-          <el-table-column label="分辨率宽" show-overflow-tooltip prop="maxResolutionWidth"></el-table-column>
+          <el-table-column
+            label="通道名称"
+            show-overflow-tooltip
+            prop="channelname"
+          ></el-table-column>
+          <el-table-column
+            label="分辨率高"
+            show-overflow-tooltip
+            prop="maxResolutionHeight"
+          ></el-table-column>
+          <el-table-column
+            label="分辨率宽"
+            show-overflow-tooltip
+            prop="maxResolutionWidth"
+          ></el-table-column>
           <el-table-column label="状态" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-switch v-model="scope.row.status" :active-value="1" :inactive-value="0" disabled></el-switch>
+              <el-switch
+                v-model="scope.row.status"
+                :active-value="1"
+                :inactive-value="0"
+                disabled
+              ></el-switch>
             </template>
           </el-table-column>
           <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
-              <el-button @click.native.stop="handleResive(scope.row)" type="text" >修改</el-button>
+              <el-button
+                @click.native.stop="handleResive(scope.row)"
+                type="text"
+                >修改</el-button
+              >
               <!-- <el-button type="text" class="deleteText" @click.native.stop="handleDelete(scope.row)" >删除</el-button> -->
             </template>
           </el-table-column>
@@ -43,7 +65,8 @@
             :page-size="pageSize"
             layout=" prev, pager, next, jumper,total"
             :total="total"
-            background>
+            background
+          >
           </el-pagination>
         </div>
       </div>
diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue
index e5640a6..e48d027 100644
--- a/src/views/components/carouselChart.vue
+++ b/src/views/components/carouselChart.vue
@@ -51,7 +51,6 @@
           v-if="item.path.indexOf('nopic') == -1"
         />
         <img :src="item.path" alt="" v-else />
-
         <p class="timeInfo" v-if="item.path.indexOf('nopic') == -1">
           {{ $moment(item.photoTime).format("HH:mm:ss") }}({{
             $moment(item.recvTime).format("HH:mm:ss")
diff --git a/src/views/devicePhotoSchedule/components/setdevice.vue b/src/views/devicePhotoSchedule/components/setdevice.vue
index 60768ac..74c1125 100644
--- a/src/views/devicePhotoSchedule/components/setdevice.vue
+++ b/src/views/devicePhotoSchedule/components/setdevice.vue
@@ -4,7 +4,7 @@
     title="设置"
     :visible.sync="isShow"
     :close-on-click-modal="false"
-    width="680px"
+    width="720px"
   >
     <!-- <div class="flexnr">
       <div class="w50">通道:</div>
@@ -18,20 +18,43 @@
       ></el-tree>
     </div> -->
     <div class="setTimeTd">
+      <h3>时间表规则</h3>
       <el-descriptions title="" :column="3" border>
-        <el-descriptions-item label="名称">名称</el-descriptions-item>
-        <el-descriptions-item label="时间表类型">按时间段</el-descriptions-item>
         <el-descriptions-item label="开始时间"> 12:00:07</el-descriptions-item>
         <el-descriptions-item label="结束时间"> 16:00:07</el-descriptions-item>
         <el-descriptions-item label="时间间隔（分）">
           <el-tag size="small">60</el-tag>
         </el-descriptions-item>
-        <el-descriptions-item label="备注信息"
-          >这是备注信息</el-descriptions-item
-        >
       </el-descriptions>
       <h3>设置通道</h3>
-      <div class="setCheckbox">
+      <div class="chooseTDBox">
+        <label>选择通道</label>
+        <div class="checkBox">
+          <el-checkbox-group v-model="checkList">
+            <el-checkbox label="通道1" border></el-checkbox>
+            <el-checkbox label="通道2" border></el-checkbox>
+            <el-checkbox label="通道3" border></el-checkbox>
+            <el-checkbox label="通道4" border></el-checkbox>
+          </el-checkbox-group>
+        </div>
+      </div>
+      <div class="treeTable">
+        <el-table
+          :data="tableData"
+          style="width: 100%; margin-bottom: 20px"
+          row-key="id"
+          border
+          stripe
+          default-expand-all
+          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        >
+          <el-table-column type="selection" width="55"> </el-table-column>
+          <el-table-column prop="date" label="电压"> </el-table-column>
+          <el-table-column prop="name" label="线路11"> </el-table-column>
+          <el-table-column prop="address" label="装置"> </el-table-column>
+        </el-table>
+      </div>
+      <!-- <div class="setCheckbox">
         <el-table
           ref="multipleTable"
           :data="tableData"
@@ -53,7 +76,7 @@
           >
             <template> XY-SIMULATOR-0001 </template>
           </el-table-column>
-          <!-- <el-table-column type="selection" width="100px"></el-table-column> -->
+         
           <el-table-column label="全选">
             <template>
               <el-checkbox v-model="checked">通道1</el-checkbox></template
@@ -65,7 +88,7 @@
             >
           </el-table-column>
         </el-table>
-      </div>
+      </div> -->
     </div>
     <div slot="footer" class="dialog-footer">
       <!-- <el-button @click="getCheckedNodes">获取</el-button> -->
@@ -101,42 +124,49 @@ export default {
 
       tableData: [
         {
-          date: "2016-05-03",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-        {
-          date: "2016-05-04",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
+          id: 2,
+          date: "220kv",
+          name: "线路11",
+          address: "asdadadadad",
+          children: [
+            {
+              id: 31,
+              date: "220kv",
+              name: "线路11",
+              address: "asdadadadad",
+            },
+            {
+              id: 32,
+              date: "220kv",
+              name: "线路11",
+              address: "asdadadadad",
+            },
+          ],
         },
         {
-          date: "2016-05-01",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-        {
-          date: "2016-05-08",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-        {
-          date: "2016-05-06",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-        {
-          date: "2016-05-07",
-          name: "王小虎",
-          address: "上海市普陀区金沙江路 1518 弄",
+          id: 3,
+          date: "220kv",
+          name: "线路11",
+          address: "asdadadadad",
+          children: [
+            {
+              id: 31,
+              date: "220kv",
+              name: "线路11",
+              address: "asdadadadad",
+            },
+            {
+              id: 32,
+              date: "220kv",
+              name: "线路11",
+              address: "asdadadadad",
+            },
+          ],
         },
       ],
       multipleSelection: [],
+
+      checkList: [],
     };
   },
   mounted() {},
@@ -256,5 +286,15 @@ export default {
       }
     }
   }
+  .chooseTDBox {
+    display: flex;
+    align-items: center;
+    label {
+      margin-right: 8px;
+    }
+  }
+  .treeTable {
+    margin-top: 16px;
+  }
 }
 </style>
diff --git a/src/views/devicePhotoSchedule/index.vue b/src/views/devicePhotoSchedule/index.vue
index 0b0fecc..e162521 100644
--- a/src/views/devicePhotoSchedule/index.vue
+++ b/src/views/devicePhotoSchedule/index.vue
@@ -13,6 +13,7 @@
         <el-table
           ref="multipleTable"
           :data="deviceTableData"
+          stripe
           tooltip-effect="dark"
           style="width: 100%"
           height="calc(100% - 40px)"
diff --git a/src/views/imageSettings/index.vue b/src/views/imageSettings/index.vue
index b7c60f2..ca11976 100644
--- a/src/views/imageSettings/index.vue
+++ b/src/views/imageSettings/index.vue
@@ -8,6 +8,7 @@
         <el-table
           ref="multipleTable"
           :data="imageTableData"
+          stripe
           tooltip-effect="dark"
           style="width: 100%"
           height="calc(100% - 40px)"
diff --git a/src/views/management/monitoringEquipment/SIMCard/index.vue b/src/views/management/monitoringEquipment/SIMCard/index.vue
index d85e39e..2f8202a 100644
--- a/src/views/management/monitoringEquipment/SIMCard/index.vue
+++ b/src/views/management/monitoringEquipment/SIMCard/index.vue
@@ -42,6 +42,7 @@
       <el-table
         ref="multipleTable"
         :data="tableData"
+        stripe
         tooltip-effect="dark"
         style="width: 100%"
         @selection-change="handleSelectionChange"
diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index 868158d..ac2cb9b 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -10,6 +10,7 @@
         <el-table
           ref="multipleTable"
           :data="terminalTableData"
+          stripe
           tooltip-effect="dark"
           style="width: 100%"
           height="calc(100% - 40px)"
diff --git a/src/views/management/userEquipment/lineInformation/index.vue b/src/views/management/userEquipment/lineInformation/index.vue
index 1539a66..7c14010 100644
--- a/src/views/management/userEquipment/lineInformation/index.vue
+++ b/src/views/management/userEquipment/lineInformation/index.vue
@@ -10,6 +10,7 @@
         <el-table
           ref="multipleTable"
           :data="lineTableData"
+          stripe
           tooltip-effect="dark"
           style="width: 100%"
           height="calc(100% - 40px)"
diff --git a/src/views/management/userEquipment/towerInformation/index.vue b/src/views/management/userEquipment/towerInformation/index.vue
index 6b93e21..ecb6b9f 100644
--- a/src/views/management/userEquipment/towerInformation/index.vue
+++ b/src/views/management/userEquipment/towerInformation/index.vue
@@ -14,6 +14,7 @@
           ref="multipleTable"
           :data="tableDate"
           tooltip-effect="dark"
+          stripe
           style="width: 100%"
           height="calc(100% - 40px)"
           @selection-change="handleSelectionChange"
@@ -22,14 +23,39 @@
         >
           <!-- <el-table-column type="index" width="55"> </el-table-column>
           <el-table-column type="selection" width="55"> </el-table-column> -->
-          <el-table-column prop="id" label="杆塔编号" show-overflow-tooltip ></el-table-column>
-          <el-table-column prop="name" label="杆塔名称" show-overflow-tooltip ></el-table-column>
-          <el-table-column prop="lineId" label="线路编号" show-overflow-tooltip ></el-table-column>
-          <el-table-column prop="lineName" label="线路名称" show-overflow-tooltip ></el-table-column>
+          <el-table-column
+            prop="id"
+            label="杆塔编号"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            prop="name"
+            label="杆塔名称"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            prop="lineId"
+            label="线路编号"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            prop="lineName"
+            label="线路名称"
+            show-overflow-tooltip
+          ></el-table-column>
           <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
-              <el-button @click.native.stop="handleResive(scope.row)" type="text" >修改</el-button>
-              <el-button type="text" class="deleteText" @click.native.stop="handleDelete(scope.row)" >删除</el-button>
+              <el-button
+                @click.native.stop="handleResive(scope.row)"
+                type="text"
+                >修改</el-button
+              >
+              <el-button
+                type="text"
+                class="deleteText"
+                @click.native.stop="handleDelete(scope.row)"
+                >删除</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -51,10 +77,7 @@
   </div>
 </template>
 <script>
-import {
-  getTowerListApi,
-  delTowerApi,
-} from "@/utils/api/index";
+import { getTowerListApi, delTowerApi } from "@/utils/api/index";
 import addDialog from "./components/addDialog.vue";
 
 export default {
diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue
index c5a43ac..2ad844e 100644
--- a/src/views/realTimeMonitor/components/setschedule.vue
+++ b/src/views/realTimeMonitor/components/setschedule.vue
@@ -39,6 +39,7 @@
             ref="multipleTable"
             :data="deviceTableData"
             tooltip-effect="dark"
+            stripe
             style="width: 100%"
             height="calc(100% - 40px)"
           >
@@ -111,24 +112,7 @@
             </el-form-item>
           </el-form> -->
           <div class="setTimeTd">
-            <el-descriptions title="" :column="3" border>
-              <el-descriptions-item label="时间表类型"
-                >按时间段</el-descriptions-item
-              >
-              <el-descriptions-item label="开始时间">
-                12:00:07</el-descriptions-item
-              >
-              <el-descriptions-item label="结束时间">
-                16:00:07</el-descriptions-item
-              >
-              <el-descriptions-item label="时间间隔（分）">
-                <el-tag size="small">60</el-tag>
-              </el-descriptions-item>
-              <el-descriptions-item label="备注信息"
-                >这是备注信息</el-descriptions-item
-              >
-            </el-descriptions>
-            <h3>设置通道</h3>
+            <h3>装置信息</h3>
             <div class="tdSetBox">
               <el-descriptions title="" :column="3" border>
                 <el-descriptions-item label="电压等级"
@@ -141,6 +125,19 @@
                   XYIGQ10C230300104</el-descriptions-item
                 >
               </el-descriptions>
+              <h3>时间表规则</h3>
+              <el-descriptions title="" :column="3" border>
+                <el-descriptions-item label="开始时间">
+                  12:00:07</el-descriptions-item
+                >
+                <el-descriptions-item label="结束时间">
+                  16:00:07</el-descriptions-item
+                >
+                <el-descriptions-item label="时间间隔（分）">
+                  <el-tag size="small">60</el-tag>
+                </el-descriptions-item>
+              </el-descriptions>
+
               <h3>选择通道</h3>
               <div class="checkBox">
                 <el-checkbox-group v-model="checkList">