From 876ca6e53307f4d08310397a78038a02f7a0e519 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Wed, 21 Jun 2023 11:11:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=B4=E8=B7=9D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/alarmHandling/index.vue             |  12 +-
 src/views/cameraChannel/index.vue             |  10 +-
 src/views/devicePhotoSchedule/index.vue       |  10 +-
 src/views/deviceUpgrade/index.vue             |  10 +-
 .../components/addPhotoDialog.vue             |   2 +-
 .../photographicDevice/index.vue              |  10 +-
 .../userEquipment/lineInformation/index.vue   |  10 +-
 .../userEquipment/towerInformation/index.vue  |  10 +-
 src/views/pictureRotation/index.vue           | 165 ++++++++++--------
 src/views/realTimeSearch/index.vue            |  10 +-
 src/views/system/globalTools/index.vue        |  10 +-
 src/views/system/userManagement.vue           |  10 +-
 12 files changed, 140 insertions(+), 129 deletions(-)

diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue
index ffb3853..92a4a4a 100644
--- a/src/views/alarmHandling/index.vue
+++ b/src/views/alarmHandling/index.vue
@@ -519,9 +519,9 @@ export default {
 </script>
 <style lang="less">
 .alarmHandBox {
-  width: calc(100% - 32px);
-  height: calc(100% - 32px);
-  padding: 16px 16px;
+  width: calc(100% - 24px);
+  height: calc(100% - 24px);
+  padding: 12px 12px;
   background: #ffffff;
   .showPic {
     position: fixed;
@@ -572,9 +572,9 @@ export default {
   }
   .searchMain {
     border: 1px solid #dddddd;
-    height: calc(100% - 34px);
-    max-height: calc(100% - 34px);
-    padding: 16px;
+    height: calc(100% - 22px);
+    max-height: calc(100% - 22px);
+    padding: 12px;
     border-radius: 4px;
     .searchBox {
       .ml10 {
diff --git a/src/views/cameraChannel/index.vue b/src/views/cameraChannel/index.vue
index 581f8f0..4036338 100644
--- a/src/views/cameraChannel/index.vue
+++ b/src/views/cameraChannel/index.vue
@@ -187,15 +187,15 @@ export default {
 </script>
 <style lang="less">
 .camerChannel {
-  width: calc(100% - 32px);
-  height: calc(100% - 32px);
-  padding: 16px 16px;
+  width: calc(100% - 24px);
+  height: calc(100% - 24px);
+  padding: 12px 12px;
   background: @color-white;
 
   .deviceBox {
     border: 1px solid #dddddd;
-    height: calc(100% - 32px);
-    padding: 16px;
+    height: calc(100% - 24px);
+    padding: 12px;
     border-radius: 4px;
   }
   .deviceBtnGroup {
diff --git a/src/views/devicePhotoSchedule/index.vue b/src/views/devicePhotoSchedule/index.vue
index 8f803d7..5d22e37 100644
--- a/src/views/devicePhotoSchedule/index.vue
+++ b/src/views/devicePhotoSchedule/index.vue
@@ -224,15 +224,15 @@ export default {
 </script>
 <style lang="less">
 .deviceInformation {
-  width: calc(100% - 32px);
-  height: calc(100% - 32px);
-  padding: 16px 16px;
+  width: calc(100% - 24px);
+  height: calc(100% - 24px);
+  padding: 12px 12px;
   background: @color-white;
 
   .deviceBox {
     border: 1px solid #dddddd;
-    height: calc(100% - 32px);
-    padding: 16px;
+    height: calc(100% - 24px);
+    padding: 12px;
     border-radius: 4px;
   }
   .deviceBtnGroup {
diff --git a/src/views/deviceUpgrade/index.vue b/src/views/deviceUpgrade/index.vue
index f455ab0..3a2b26d 100644
--- a/src/views/deviceUpgrade/index.vue
+++ b/src/views/deviceUpgrade/index.vue
@@ -109,14 +109,14 @@ export default {
 </script>
 <style lang="less">
 .deviceUpgrade {
-  width: calc(100% - 32px);
-  height: calc(100% - 32px);
-  padding: 16px 16px;
+  width: calc(100% - 24px);
+  height: calc(100% - 24px);
+  padding: 12px 12px;
   background: #ffffff;
   .upgradeBox {
     border: 1px solid #dddddd;
-    height: calc(100% - 32px);
-    padding: 16px;
+    height: calc(100% - 24px);
+    padding: 12px;
     border-radius: 4px;
     .upBtnGroup {
       display: flex;
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
index 3e03f5b..6eb25f4 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
@@ -30,7 +30,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="杆塔名称：" prop="towerId">
-        <el-select v-model="formInfo.towerId" placeholder="请选择">
+        <el-select v-model="formInfo.towerId" placeholder="请选择" filterable>
           <el-option
             v-for="item in toweridOptions"
             :key="item.id"
diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index 18179f3..d61300c 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -683,14 +683,14 @@ export default {
 </script>
 <style lang="less">
 .photoGraphicDevice {
-  width: calc(100% - 32px);
-  height: calc(100% - 32px);
-  padding: 16px 16px;
+  width: calc(100% - 24px);
+  height: calc(100% - 24px);
+  padding: 12px 12px;
   background: @color-white;
   .photoBox {
     border: 1px solid #dddddd;
-    height: calc(100% - 32px);
-    padding: 16px;
+    height: calc(100% - 24px);
+    padding: 12px;
     border-radius: 4px;
     .searchBox {
       .ml10 {
diff --git a/src/views/management/userEquipment/lineInformation/index.vue b/src/views/management/userEquipment/lineInformation/index.vue
index 809231f..5aa9267 100644
--- a/src/views/management/userEquipment/lineInformation/index.vue
+++ b/src/views/management/userEquipment/lineInformation/index.vue
@@ -204,14 +204,14 @@ export default {
 </script>
 <style lang="less">
 .lineInformation {
-  width: calc(100% - 32px);
-  height: calc(100% - 32px);
-  padding: 16px 16px;
+  width: calc(100% - 24px);
+  height: calc(100% - 24px);
+  padding: 12px 12px;
   background: @color-white;
   .lineBox {
     border: 1px solid #dddddd;
-    height: calc(100% - 32px);
-    padding: 16px;
+    height: calc(100% - 24px);
+    padding: 12px;
     border-radius: 4px;
   }
   .lineBtnGroup {
diff --git a/src/views/management/userEquipment/towerInformation/index.vue b/src/views/management/userEquipment/towerInformation/index.vue
index 19abada..e830601 100644
--- a/src/views/management/userEquipment/towerInformation/index.vue
+++ b/src/views/management/userEquipment/towerInformation/index.vue
@@ -191,15 +191,15 @@ export default {
 </script>
 <style lang="less">
 .deviceInformation {
-  width: calc(100% - 32px);
-  height: calc(100% - 32px);
-  padding: 16px 16px;
+  width: calc(100% - 24px);
+  height: calc(100% - 24px);
+  padding: 12px 12px;
   background: @color-white;
 
   .deviceBox {
     border: 1px solid #dddddd;
-    height: calc(100% - 32px);
-    padding: 16px;
+    height: calc(100% - 24px);
+    padding: 12px;
     border-radius: 4px;
   }
   .deviceBtnGroup {
diff --git a/src/views/pictureRotation/index.vue b/src/views/pictureRotation/index.vue
index 9376664..e96d75c 100644
--- a/src/views/pictureRotation/index.vue
+++ b/src/views/pictureRotation/index.vue
@@ -1,82 +1,86 @@
 <template>
   <div class="picRotation">
-    <div class="picHead">
-      <div class="pageNation">
-        <el-pagination
-          @current-change="handleCurrentChange"
-          :current-page="page"
-          :page-size="pageSize"
-          layout=" prev, pager, next, jumper,total"
-          :total="total"
-        >
-        </el-pagination>
-      </div>
-      <div class="buttonGroup">
-        <span class="info">
-          <b> {{ isRuning ? remainingTime : "已暂停" }} </b>
-        </span>
-        <el-button type="primary" @click="toggleCountdown">{{
-          isRuning ? "暂停轮巡" : "开始轮巡"
-        }}</el-button>
-        <el-button type="primary" @click="setbtn">设置</el-button>
+    <div class="rotationBox">
+      <div class="picHead">
+        <div class="pageNation">
+          <el-pagination
+            @current-change="handleCurrentChange"
+            :current-page="page"
+            :page-size="pageSize"
+            layout=" prev, pager, next, jumper,total"
+            :total="total"
+          >
+          </el-pagination>
+        </div>
+        <div class="buttonGroup">
+          <span class="info">
+            <b> {{ isRuning ? remainingTime : "已暂停" }} </b>
+          </span>
+          <el-button type="primary" @click="toggleCountdown">{{
+            isRuning ? "暂停轮巡" : "开始轮巡"
+          }}</el-button>
+          <el-button type="primary" @click="setbtn">设置</el-button>
+        </div>
       </div>
-    </div>
-    <div class="imageCenter" v-loading="loading" v-cloak>
-      <el-row
-        v-for="i in rowNum"
-        :key="'row-' + i"
-        :style="{ height: 100 / rowNum + '%' }"
-      >
-        <el-col
-          :span="24 / colNum"
-          v-for="(item, index) in picList"
-          v-if="index < colNum * i && index >= colNum * (i - 1)"
-          :key="'col-' + index"
+      <div class="imageCenter" v-loading="loading" v-cloak>
+        <el-row
+          v-for="i in rowNum"
+          :key="'row-' + i"
+          :style="{ height: 100 / rowNum + '%' }"
         >
-          <div class="imgList">
-            <viewer
-              :options="OptionssalseImg"
-              v-if="item.path !== null && item.path.indexOf('videos') == -1"
-              class="bigpic"
-              :style="
-                item.path ? 'backgroundImage:url(' + item.path + '!128x72)' : ''
-              "
-            >
-              <img :src="item.path + '!1280x720'" />
-            </viewer>
-            <div
-              class="bigpic"
-              v-else-if="
-                item.path !== null && item.path.indexOf('videos') !== -1
-              "
-            >
-              <video
-                width="100%"
-                height="100%"
-                :src="item.path"
-                controls="controls"
-              ></video>
-            </div>
-            <div class="bigpic" v-else>
-              <img src="../../assets/img/nopic.jpg" />
+          <el-col
+            :span="24 / colNum"
+            v-for="(item, index) in picList"
+            v-if="index < colNum * i && index >= colNum * (i - 1)"
+            :key="'col-' + index"
+          >
+            <div class="imgList">
+              <viewer
+                :options="OptionssalseImg"
+                v-if="item.path !== null && item.path.indexOf('videos') == -1"
+                class="bigpic"
+                :style="
+                  item.path
+                    ? 'backgroundImage:url(' + item.path + '!128x72)'
+                    : ''
+                "
+              >
+                <img :src="item.path + '!1280x720'" />
+              </viewer>
+              <div
+                class="bigpic"
+                v-else-if="
+                  item.path !== null && item.path.indexOf('videos') !== -1
+                "
+              >
+                <video
+                  width="100%"
+                  height="100%"
+                  :src="item.path"
+                  controls="controls"
+                ></video>
+              </div>
+              <div class="bigpic" v-else>
+                <img src="../../assets/img/nopic.jpg" />
+              </div>
+              <p class="infoTop">
+                {{ item.linename }}-{{
+                  item.displayname !== null && item.displayname !== ""
+                    ? item.displayname
+                    : item.cmdid
+                }}-{{
+                  item.alias !== null && item.alias !== ""
+                    ? item.alias
+                    : item.channnelname
+                }}
+              </p>
+              <p class="infoBottom" v-if="item.photoTime !== null">
+                {{ $moment(item.photoTime).format("yy-MM-DD HH:mm:ss") }} 
+              </p>
             </div>
-            <p class="infoTop">
-              {{ item.linename }}-{{
-                item.displayname !== null && item.displayname !== ""
-                  ? item.displayname
-                  : item.cmdid
-              }}-{{
-                item.alias !== null && item.alias !== ""
-                  ? item.alias
-                  : item.channnelname
-              }}
-            </p>
-            <p class="infoBottom" v-if="item.photoTime !== null">
-              {{ $moment(item.photoTime).format("yy-MM-DD HH:mm:ss") }} 
-            </p>
-          </div>
-        </el-col>
-      </el-row>
+          </el-col>
+        </el-row>
+      </div>
     </div>
     <el-dialog
       title="设置"
@@ -339,10 +343,17 @@ export default {
 </script>
 <style lang="less">
 .picRotation {
-  width: calc(100% - 32px);
-  height: calc(100% - 32px);
-  padding: 16px 16px;
+  width: calc(100% - 24px);
+  height: calc(100% - 24px);
+  padding: 12px 12px;
   background: #ffffff;
+  .rotationBox {
+    border: 1px solid #dddddd;
+    height: calc(100% - 22px);
+    max-height: calc(100% - 22px);
+    padding: 12px;
+    border-radius: 4px;
+  }
   .picHead {
     display: flex;
     align-items: center;
diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue
index fd5cdc3..fcd2490 100644
--- a/src/views/realTimeSearch/index.vue
+++ b/src/views/realTimeSearch/index.vue
@@ -351,14 +351,14 @@ export default {
 </script>
 <style lang="less">
 .realTimeSearch {
-  width: calc(100% - 32px);
-  height: calc(100% - 32px);
-  padding: 16px 16px;
+  width: calc(100% - 24px);
+  height: calc(100% - 24px);
+  padding: 12px 12px;
   background: #fff;
   .searchMain {
     border: 1px solid #dddddd;
-    height: calc(100% - 32px);
-    padding: 16px;
+    height: calc(100% - 22px);
+    padding: 12px;
     border-radius: 4px;
     .ml10 {
       margin-left: 10px;
diff --git a/src/views/system/globalTools/index.vue b/src/views/system/globalTools/index.vue
index 75b9beb..efc0f7e 100644
--- a/src/views/system/globalTools/index.vue
+++ b/src/views/system/globalTools/index.vue
@@ -118,14 +118,14 @@ export default {
 </script>
 <style lang="less">
 .globalBox {
-  width: calc(100% - 32px);
-  height: calc(100% - 32px);
-  padding: 16px 16px;
+  width: calc(100% - 24px);
+  height: calc(100% - 24px);
+  padding: 12px 12px;
   background: #fff;
   .setBox {
     border: 1px solid #dddddd;
-    height: calc(100% - 32px);
-    padding: 16px;
+    height: calc(100% - 24px);
+    padding: 12px;
     border-radius: 4px;
     display: flex;
     .globalDrawLine {
diff --git a/src/views/system/userManagement.vue b/src/views/system/userManagement.vue
index 071a687..7ddb683 100644
--- a/src/views/system/userManagement.vue
+++ b/src/views/system/userManagement.vue
@@ -171,15 +171,15 @@ export default {
 </script>
 <style lang="less">
 .camerChannel {
-  width: calc(100% - 32px);
-  height: calc(100% - 32px);
-  padding: 16px 16px;
+  width: calc(100% - 24px);
+  height: calc(100% - 24px);
+  padding: 12px 12px;
   background: @color-white;
 
   .deviceBox {
     border: 1px solid #dddddd;
-    height: calc(100% - 32px);
-    padding: 16px;
+    height: calc(100% - 24x);
+    padding: 12px;
     border-radius: 4px;
   }
   .deviceBtnGroup {