From d3ea703444e8185685ad5fcfe135178f1e31249a Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Wed, 17 Jan 2024 15:59:44 +0800
Subject: [PATCH] =?UTF-8?q?wp=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                    | 10 ++---
 .../components/carouselChart.vue              |  4 +-
 .../components/parameterArea.vue              | 43 ++++++++++++-------
 .../realTimeMonitor/components/siderBar.vue   |  4 ++
 4 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index f7baa20..86812df 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -308,11 +308,11 @@ export default {
           index: "photoAlarm",
           title: "告警处理",
         },
-        {
-          icon: "el-icon-search",
-          index: "/realTimeSearch",
-          title: "历史图片",
-        },
+        // {
+        //   icon: "el-icon-search",
+        //   index: "/realTimeSearch",
+        //   title: "历史图片",
+        // },
       ],
 
       role: "",
diff --git a/src/views/realTimeMonitor/components/carouselChart.vue b/src/views/realTimeMonitor/components/carouselChart.vue
index a41d1fd..99d45df 100644
--- a/src/views/realTimeMonitor/components/carouselChart.vue
+++ b/src/views/realTimeMonitor/components/carouselChart.vue
@@ -393,11 +393,11 @@ export default {
 
       if (direction == "down") {
         this.$refs.scrollBox.scrollLeft +=
-          (this.$refs.scrollBox.offsetWidth / this.photoNum) * 3;
+          (this.$refs.scrollBox.offsetWidth / this.photoNum) * 1;
       }
       if (direction == "up") {
         this.$refs.scrollBox.scrollLeft -=
-          (this.$refs.scrollBox.offsetWidth / this.photoNum) * 3;
+          (this.$refs.scrollBox.offsetWidth / this.photoNum) * 1;
       }
     },
     //缩略图的左右箭头
diff --git a/src/views/realTimeMonitor/components/parameterArea.vue b/src/views/realTimeMonitor/components/parameterArea.vue
index 57e61bc..e768590 100644
--- a/src/views/realTimeMonitor/components/parameterArea.vue
+++ b/src/views/realTimeMonitor/components/parameterArea.vue
@@ -77,7 +77,11 @@
         <alarmButton></alarmButton>
         <cableButton></cableButton>
         <gpsButton></gpsButton>
-        <el-button type="primary" @click="handlehistoryPic">
+        <el-button
+          type="primary"
+          @click="handlehistoryPic"
+          v-if="roleUser != 4"
+        >
           历史图片</el-button
         >
         <el-button type="primary" @click="handleParams"> 参数配置</el-button>
@@ -233,20 +237,21 @@ export default {
     //点击收藏和取消收藏
     addCollectClick() {
       if (this.areaData.isfavor !== 1) {
-        this.$confirm("此操作将添加至收藏夹, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }).then(() => {
-          this.areaData.isfavor = 1;
-          addFavorList({ list: [this.areaData.id], type: 1 }).then((res) => {
-            EventBus.$emit("treelist");
-          });
-          this.$message({
-            type: "success",
-            message: "添加成功!",
-          });
+        this.areaData.isfavor = 1;
+        addFavorList({ list: [this.areaData.id], type: 1 }).then((res) => {
+          EventBus.$emit("treelist");
         });
+        this.$message({
+          type: "success",
+          message: "添加成功!",
+        });
+        // this.$confirm("此操作将添加至收藏夹, 是否继续?", "提示", {
+        //   confirmButtonText: "确定",
+        //   cancelButtonText: "取消",
+        //   type: "warning",
+        // }).then(() => {
+
+        // });
       } else {
         this.$confirm("此操作将取消收藏, 是否继续?", "提示", {
           confirmButtonText: "确定",
@@ -305,7 +310,7 @@ export default {
           );
           this.selectDyId = res.data.dyId;
           this.selectLineId = res.data.lineId;
-          this.selectTowerId = res.data.towerId;
+          //this.selectTowerId = res.data.towerId;
         })
         .catch((err) => {
           console.log(err); //代码错误、请求失败捕获
@@ -320,6 +325,12 @@ export default {
     //历史图片跳转
     handlehistoryPic() {
       console.log(this.areaData);
+      if (this.areaData.id == "13276") {
+        // "id": 13009,
+        //     "towerid": 3980,
+        this.$set(this.areaData, "id", 13009);
+        this.$set(this.areaData, "towerid", 3980);
+      }
       console.log(this.selectDyId, this.selectLineId, this.selectTowerId);
       // console.log(this.zzCmdid, this.selectChannelValue);
       if (typeof this.dateValue == "number") {
@@ -332,7 +343,7 @@ export default {
         query: {
           dyId: this.selectDyId,
           lineId: this.selectLineId,
-          towerId: this.selectTowerId,
+          towerId: this.areaData.towerid,
           termId: this.areaData.id,
           cmdId: this.areaData.cmdid,
           channelId: this.selectChannelValue,
diff --git a/src/views/realTimeMonitor/components/siderBar.vue b/src/views/realTimeMonitor/components/siderBar.vue
index af74cf9..3cd22de 100644
--- a/src/views/realTimeMonitor/components/siderBar.vue
+++ b/src/views/realTimeMonitor/components/siderBar.vue
@@ -259,9 +259,12 @@ export default {
       this.searchName = data.name + data.cmdid;
       //console.log(this.searchName);
       // 如果传入的value和data中的label相同，匹配成功
+
       if (this.searchName.indexOf(value) !== -1) {
         return true;
       }
+      let nowval = data[this.defaultProps.label].toUpperCase();
+      return nowval.indexOf(value.toUpperCase()) !== -1;
     },
     //获取树状图列表
     getLineTreeList() {
@@ -389,6 +392,7 @@ export default {
         //     "equipmentType": "",
         //     "isfavor": 0
         // }
+
         this.currentData = {
           id: 13276,
           towerid: 3981,