From 51a2a92c2b9e55e144b6dff76cba43d8b5805ec1 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Tue, 31 Oct 2023 16:54:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9C=E8=A7=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sidebar.vue                    | 66 +++++++++----------
 src/components/header.vue                     |  8 +--
 src/main.js                                   | 30 +++++----
 src/views/homePage/index.vue                  |  6 +-
 src/views/photographicDevice/index.vue        | 19 ++----
 .../components/carouselChart.vue              | 25 +++++--
 .../components/parameterArea.vue              |  4 +-
 7 files changed, 83 insertions(+), 75 deletions(-)

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 8ea5b1c..3c0d646 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -64,16 +64,16 @@ export default {
           title: "实时监控",
         },
 
-        {
-          icon: "el-icon-film",
-          index: "/pictureRotation",
-          title: "图片轮巡",
-        },
-        {
-          icon: "el-icon-bell",
-          index: "/photoAlarm",
-          title: "告警处理",
-        },
+        // {
+        //   icon: "el-icon-film",
+        //   index: "/pictureRotation",
+        //   title: "图片轮巡",
+        // },
+        // {
+        //   icon: "el-icon-bell",
+        //   index: "/photoAlarm",
+        //   title: "告警处理",
+        // },
 
         {
           icon: "el-icon-search",
@@ -106,14 +106,14 @@ export default {
               index: "/devicePhotoSchedule",
               title: "拍照时间表设置",
             },
-            {
-              index: "/deviceReport",
-              title: "装置报表",
-            },
-            {
-              index: "/waterMark",
-              title: "水印下发",
-            },
+            // {
+            //   index: "/deviceReport",
+            //   title: "装置报表",
+            // },
+            // {
+            //   index: "/waterMark",
+            //   title: "水印下发",
+            // },
             // {
             //   index: "/deviceUpgrade",
             //   title: "装置升级",
@@ -125,21 +125,21 @@ export default {
             // },
           ],
         },
-        {
-          icon: "el-icon-monitor",
-          index: "/system",
-          title: "系统管理",
-          subs: [
-            {
-              index: "/userManagement",
-              title: "用户管理",
-            },
-            {
-              index: "/globalTools",
-              title: "全局设置",
-            },
-          ],
-        },
+        // {
+        //   icon: "el-icon-monitor",
+        //   index: "/system",
+        //   title: "系统管理",
+        //   subs: [
+        //     {
+        //       index: "/userManagement",
+        //       title: "用户管理",
+        //     },
+        //     {
+        //       index: "/globalTools",
+        //       title: "全局设置",
+        //     },
+        //   ],
+        // },
       ],
       items1: [
         {
diff --git a/src/components/header.vue b/src/components/header.vue
index 77b0c8e..3b73ebe 100644
--- a/src/components/header.vue
+++ b/src/components/header.vue
@@ -3,13 +3,13 @@
     <div class="logoTitle">视频监控可视化平台</div>
     <div class="menuBox">
       <vSidebar></vSidebar>
-      <div class="userInfo">
+      <!-- <div class="userInfo">
         <div class="header-user-con">
-          <!-- 用户头像 -->
+        
           <div class="user-avator">
             <img src="../assets/img/user.jpeg" />
           </div>
-          <!-- 用户名下拉菜单 -->
+         
           <el-dropdown
             class="user-name"
             trigger="click"
@@ -25,7 +25,7 @@
             </el-dropdown-menu>
           </el-dropdown>
         </div>
-      </div>
+      </div> -->
     </div>
     <password-dialog ref="passwordref"></password-dialog>
   </div>
diff --git a/src/main.js b/src/main.js
index 3af820b..0092435 100644
--- a/src/main.js
+++ b/src/main.js
@@ -53,22 +53,24 @@ Vue.directive("noMoreClick", {
 
 //使用钩子函数对路由进行权限跳转
 router.beforeEach((to, from, next) => {
-  document.title = `${to.meta.title} | 视频监控可视化平台`;
-  const role = localStorage.getItem("role");
-  const token = localStorage.getItem("token");
-  console.log(role, token);
-  if (to.path == "/echarts") {
-    console.log("asdasdasdasd");
-    // 在免登录白名单，直接进入
-    next();
-  } else if (!token && to.path !== "/login") {
-    //next("/login");
-    next({
-      path: "/login",
-    });
+  if (to.meta.title == "") {
+    document.title = ` 视频监控可视化平台`;
   } else {
-    next();
+    document.title = `${to.meta.title} | 视频监控可视化平台`;
   }
+
+  // const role = localStorage.getItem("role");
+  // const token = localStorage.getItem("token");
+  // console.log(role, token);
+  // if (!token && to.path !== "/login") {
+  //   //next("/login");
+  //   next({
+  //     path: "/login",
+  //   });
+  // } else {
+  //   next();
+  // }
+  next();
 });
 new Vue({
   router,
diff --git a/src/views/homePage/index.vue b/src/views/homePage/index.vue
index 5372873..af961fb 100644
--- a/src/views/homePage/index.vue
+++ b/src/views/homePage/index.vue
@@ -46,7 +46,7 @@
         <div id="echart2" class="chartClass" v-loading="pieloading"></div>
       </el-card>
     </div>
-    <div class="echart-top">
+    <!-- <div class="echart-top">
       <el-card class="box-card" v-loading="barloading">
         <h3>7天告警数量统计</h3>
         <div class="dateBox">
@@ -78,7 +78,7 @@
         </div>
         <div id="echart4" class="chartClass"></div>
       </el-card>
-    </div>
+    </div> -->
     <el-dialog
       class="exportDialog"
       title="装置列表"
@@ -481,7 +481,7 @@ export default {
   padding: 16px;
   display: flex;
   flex-direction: column;
-  justify-content: space-around;
+  //justify-content: space-around;
   .echart-top {
     display: flex;
     height: 48%;
diff --git a/src/views/photographicDevice/index.vue b/src/views/photographicDevice/index.vue
index fe24f73..7b42c48 100644
--- a/src/views/photographicDevice/index.vue
+++ b/src/views/photographicDevice/index.vue
@@ -206,14 +206,9 @@
               {{ scope.row.status == 1 ? "运行中" : "已删除" }}
             </template>
           </el-table-column>
-          <el-table-column
-            fixed="right"
-            label="操作"
-            width="340"
-            v-if="roleUser != 2"
-          >
+          <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
-              <el-dropdown
+              <!-- <el-dropdown
                 class="dropgps"
                 trigger="click"
                 @command="
@@ -235,7 +230,7 @@
                   >
                   <el-dropdown-item command="GPS">GPS位置</el-dropdown-item>
                 </el-dropdown-menu>
-              </el-dropdown>
+              </el-dropdown> -->
               <el-button
                 @click.native.stop="handleParameterSet(scope.row)"
                 type="text"
@@ -246,11 +241,11 @@
                 type="text"
                 >修改</el-button
               >
-              <el-button
+              <!-- <el-button
                 type="text"
                 @click.native.stop="handlepicture(scope.row)"
                 >图片标记</el-button
-              >
+              > -->
               <el-button
                 type="text"
                 class="deleteText"
@@ -267,7 +262,7 @@
               >
             </template>
           </el-table-column>
-          <el-table-column fixed="right" label="操作" width="180" v-else>
+          <!-- <el-table-column fixed="right" label="操作" width="180" v-else>
             <template slot-scope="scope">
               <el-button
                 @click.native.stop="handleRevisePhoto(scope.row)"
@@ -286,7 +281,7 @@
                 >删除</el-button
               >
             </template>
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
         <div class="pageNation">
           <el-pagination
diff --git a/src/views/realTimeMonitor/components/carouselChart.vue b/src/views/realTimeMonitor/components/carouselChart.vue
index f1e217f..212bbb6 100644
--- a/src/views/realTimeMonitor/components/carouselChart.vue
+++ b/src/views/realTimeMonitor/components/carouselChart.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="thumb-example">
-    <div class="radioBox" v-if="roleUser != 2">{{ radioPx }}</div>
+    <div class="radioBox" v-if="roleUser != 2">
+      {{ radioPx }}
+    </div>
     <div class="topPic">
       <div
         class="bigPic"
@@ -59,14 +61,16 @@
           class="el-car-item"
           ref="scrollBox"
           v-on:wheel="handleScroll"
-          :class="terminalPhoto.length < 5 ? 'littlePic' : ''"
+          :class="terminalPhoto.length < photoNum ? 'littlePic' : ''"
         >
           <div
             class="smallPic"
             v-for="(item, index2) in terminalPhoto"
             :key="index2"
             @click="changeBigPic(item, index2)"
-            :class="activeSmall === index2 ? 'borderActive' : ''"
+            :class="`${activeSmall === index2 ? 'borderActive ' : ''}${
+              photoNum === 10 ? 'moreSmallPic' : ''
+            }`"
           >
             <div
               class="picBox"
@@ -327,13 +331,17 @@ export default {
     },
     //点击大图左右按钮
     leftClick() {
+      console.log(this.photoNum);
       this.activeSmall--;
-      this.$refs.scrollBox.scrollLeft -= this.$refs.scrollBox.offsetWidth / 5;
+      this.$refs.scrollBox.scrollLeft -=
+        this.$refs.scrollBox.offsetWidth / this.photoNum;
       this.changeBigPic(this.terminalPhoto[this.activeSmall], this.activeSmall);
     },
     rightClick() {
+      console.log(this.photoNum);
       this.activeSmall++;
-      this.$refs.scrollBox.scrollLeft += this.$refs.scrollBox.offsetWidth / 5;
+      this.$refs.scrollBox.scrollLeft +=
+        this.$refs.scrollBox.offsetWidth / this.photoNum;
       this.changeBigPic(this.terminalPhoto[this.activeSmall], this.activeSmall);
     },
     //获取第一张大图
@@ -367,11 +375,11 @@ export default {
 
       if (direction == "down") {
         this.$refs.scrollBox.scrollLeft +=
-          (this.$refs.scrollBox.offsetWidth / 5) * 3;
+          (this.$refs.scrollBox.offsetWidth / this.photoNum) * 3;
       }
       if (direction == "up") {
         this.$refs.scrollBox.scrollLeft -=
-          (this.$refs.scrollBox.offsetWidth / 5) * 3;
+          (this.$refs.scrollBox.offsetWidth / this.photoNum) * 3;
       }
     },
     //缩略图的左右箭头
@@ -568,6 +576,9 @@ export default {
           }
         }
       }
+      .moreSmallPic {
+        width: 9.8%;
+      }
       .borderActive {
         .timeInfo {
           color: #fff;
diff --git a/src/views/realTimeMonitor/components/parameterArea.vue b/src/views/realTimeMonitor/components/parameterArea.vue
index 904b6a1..1400d1f 100644
--- a/src/views/realTimeMonitor/components/parameterArea.vue
+++ b/src/views/realTimeMonitor/components/parameterArea.vue
@@ -63,8 +63,8 @@
         <deviceInfoButton></deviceInfoButton>
 
         <scheduleButton></scheduleButton>
-        <alarmButton></alarmButton>
-        <cableButton></cableButton>
+        <!-- <alarmButton></alarmButton>
+        <cableButton></cableButton> -->
         <gpsButton></gpsButton>
         <el-button type="primary" @click="handlehistoryPic">
           历史图片</el-button