From 5e38d5e48aea3b589b87b180f7932306be562f05 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Fri, 9 Jun 2023 18:17:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/Home.vue                |  6 +--
 src/utils/api/index.js                        | 20 ++++++++
 .../alarmHandling/components/historyimg.vue   | 50 ++++++++++++------
 src/views/alarmHandling/index.vue             | 51 +++++++++++--------
 src/views/components/carouselChart.vue        | 33 ++++++++++--
 .../userEquipment/towerInformation/index.vue  |  6 ++-
 src/views/system/globalTools/index.vue        | 30 ++++++++++-
 vue.config.js                                 |  2 +-
 8 files changed, 148 insertions(+), 50 deletions(-)

diff --git a/src/components/common/Home.vue b/src/components/common/Home.vue
index 0c1d3ea..87173be 100644
--- a/src/components/common/Home.vue
+++ b/src/components/common/Home.vue
@@ -5,9 +5,9 @@
     <div class="content-box">
       <div class="content">
         <transition name="move" mode="out-in">
-          <keep-alive>
-            <router-view></router-view>
-          </keep-alive>
+          <!-- <keep-alive> -->
+          <router-view></router-view>
+          <!-- </keep-alive> -->
         </transition>
       </div>
     </div>
diff --git a/src/utils/api/index.js b/src/utils/api/index.js
index e4e6ded..d816fa9 100644
--- a/src/utils/api/index.js
+++ b/src/utils/api/index.js
@@ -664,3 +664,23 @@ export function issueApk(data) {
     data,
   });
 }
+
+//全局设置线缆绘制
+export function getMarkEnableStatus(data) {
+  return request({
+    url: "/api/getMarkEnableStatus",
+    method: "post",
+    data,
+  });
+}
+//全局更新设置线缆绘制
+export function updateMarkEnableStatus(data) {
+  return request({
+    url: "/api/updateMarkEnableStatus",
+    method: "post",
+    data,
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8",
+    },
+  });
+}
diff --git a/src/views/alarmHandling/components/historyimg.vue b/src/views/alarmHandling/components/historyimg.vue
index c0b9839..38deb96 100644
--- a/src/views/alarmHandling/components/historyimg.vue
+++ b/src/views/alarmHandling/components/historyimg.vue
@@ -2,19 +2,22 @@
   <el-dialog
     title="历史图片"
     :visible.sync="isShow"
-    :close-on-click-modal="false"
-    width="80%"
+    class="historyPic"
+    width="1192px"
+    @close="handleclose"
   >
-    <el-carousel
-      :loop="false"
-      :autoplay="false"
-      height="600px"
-      indicator-position="none"
-    >
-      <el-carousel-item v-for="(item, index) in imglist" :key="index">
-        <el-image :src="item.path" fit="contain"></el-image>
-      </el-carousel-item>
-    </el-carousel>
+    <div v-loading="loading">
+      <el-carousel
+        :loop="false"
+        :autoplay="false"
+        height="650px"
+        indicator-position="none"
+      >
+        <el-carousel-item v-for="(item, index) in imglist" :key="index">
+          <el-image :src="item.path" fit="contain"></el-image>
+        </el-carousel-item>
+      </el-carousel>
+    </div>
   </el-dialog>
 </template>
 <script>
@@ -28,6 +31,7 @@ export default {
       pageSize: 10, // 每页数量
       total: 0, //总条数
       selectnr: "", //获取当前数据内容
+      loadingpic: true,
     };
   },
   mounted() {},
@@ -35,12 +39,14 @@ export default {
     //获取图片数据
     getdataform(val) {
       this.selectnr = val;
+      this.loadingpic = true;
       getHistoryList({
         channelId: this.selectnr.channelId,
         termId: this.selectnr.termId,
         pageindex: this.page,
         pagesize: this.pageSize,
       }).then((res) => {
+        this.loadingpic = false;
         this.imglist = res.data.list;
         this.total = res.data.total;
       });
@@ -58,7 +64,7 @@ export default {
         }).then((res) => {
           this.imglist.push(res.data.list);
           this.total = res.data.total;
-          console.log(this.imglist)
+          console.log(this.imglist);
           console.log(e);
         });
       }
@@ -68,12 +74,24 @@ export default {
     },
     hide() {
       this.isShow = false;
+      this.imglist = [];
+    },
+    handleclose() {
+      this.isShow = false;
+      this.imglist = [];
     },
   },
 };
 </script>
-<style lang="less" scoped>
-.imgnr {
-  height: 600px;
+<style lang="less">
+.historyPic {
+  .el-image {
+    width: 1152px;
+    height: 648px;
+    img {
+      width: 1152px;
+      height: 648px;
+    }
+  }
 }
 </style>
diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue
index e11fab1..b9393ca 100644
--- a/src/views/alarmHandling/index.vue
+++ b/src/views/alarmHandling/index.vue
@@ -165,13 +165,18 @@
         </div>
         <div class="alarmPic">
           <div class="imgshow" @click="handleBigPicbox(selectRow)">
+            <div
+              class="picshow"
+              v-if="selectRow.path !== '' && tableData.length !== 0"
+            >
+              <img ref="picJpg" :src="photoPic" />
+              <canvas id="myCanvas" class="myCanvas" ref="myCanvas"></canvas>
+            </div>
             <img
               ref="picJpg"
-              :src="photoPic"
-              v-if="selectRow.path !== '' && tableData.length !== 0"
+              src="../../assets/img/nopic.jpg"
+              v-if="selectRow.path == '' || tableData.length == 0"
             />
-            <img ref="picJpg" src="../../assets/img/nopic.jpg" v-else />
-            <canvas id="myCanvas" class="myCanvas" ref="myCanvas"></canvas>
           </div>
           <div class="editorBtn">
             <el-button
@@ -225,10 +230,10 @@ export default {
       gtOptions: [{ id: 0, name: "全部" }], //杆塔数据
       gjOptions: [{ id: 0, label: -1, name: "全部" }], //告警数据
       formdata: {
-        dyId: "",
-        lineId: "",
-        towerId: "",
-        label: "",
+        dyId: 0,
+        lineId: 0,
+        towerId: 0,
+        label: -1,
         timeVal: "",
       },
       photoPic: "",
@@ -253,8 +258,9 @@ export default {
       new Date(new Date().toLocaleDateString()).getTime(),
       new Date().getTime(),
     ]);
-    // this.getTableList();
+
     this.getSearchdy();
+    this.getTableList();
   },
   methods: {
     handleBigPicbox(val) {
@@ -311,17 +317,12 @@ export default {
           console.log(this.gjOptions);
           this.formdata.label = this.gjOptions[0].label;
           console.log(this.formdata.label);
-          this.getTableList();
         })
         .catch((err) => {});
     },
     //获取数据
     getTableList() {
       this.loading = true;
-      // this.$set(this.formdata, "dyId", this.page);
-      // this.$set(this.formdata, "label", this.page);
-      // this.$set(this.formdata, "lineId", this.page);
-      // this.$set(this.formdata, "towerId", this.page);
       this.$set(this.formdata, "pageindex", this.page);
       this.$set(this.formdata, "pagesize", this.pageSize);
       this.$set(this.formdata, "starttime", this.formdata.timeVal[0]);
@@ -334,12 +335,10 @@ export default {
           this.photoPic = res.data.list[0].path;
           this.selectRow = res.data.list[0];
           console.log(this.selectRow);
-          this.drawline(this.selectRow);
-          this.$nextTick(() => {
-            // 别忘了标签上定义ref  这里的 myTable就说获取的标签上的ref命的名
-            this.$refs.multipleTable.setCurrentRow(this.selectRow);
-            this.handleRowClick(this.selectRow);
-          });
+
+          // 别忘了标签上定义ref  这里的 myTable就说获取的标签上的ref命的名
+          this.$refs.multipleTable.setCurrentRow(this.selectRow);
+          this.handleRowClick(this.selectRow);
         })
         .catch((err) => {
           console.log(err);
@@ -416,7 +415,9 @@ export default {
             });
         }, 300);
       }
-      this.drawline(row);
+      this.$nextTick(() => {
+        this.drawline(row);
+      });
     },
     //手动拍照
     handleCommandpic() {
@@ -484,7 +485,7 @@ export default {
   },
 };
 </script>
-<style lang="less" scoped>
+<style lang="less">
 .alarmHandBox {
   width: calc(100% - 32px);
   height: calc(100% - 32px);
@@ -597,6 +598,12 @@ export default {
         width: 100%;
         height: 100%;
         position: relative;
+
+        .picshow {
+          width: 100%;
+          height: 100%;
+          position: relative;
+        }
         img {
           width: 100%;
           height: 100%;
diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue
index edc7c0b..cb5df2f 100644
--- a/src/views/components/carouselChart.vue
+++ b/src/views/components/carouselChart.vue
@@ -166,7 +166,7 @@
 </template>
 
 <script>
-import { getCoordinate } from "@/utils/api/index";
+import { getCoordinate, updateMarkEnableStatus } from "@/utils/api/index";
 export default {
   components: {},
   props: {
@@ -206,6 +206,7 @@ export default {
       num: "",
       showBigpic: false,
       flagline: true,
+      markEnable: "",
     };
   },
   mounted() {
@@ -226,7 +227,10 @@ export default {
         this.localPoints = res.data.list;
         this.color = res.data.color;
         this.num = res.data.boderWidth;
-        this.drawline();
+        this.markEnable = res.data.markEnable;
+        if (this.markEnable === 1) {
+          this.drawline();
+        }
       })
       .catch((err) => {});
   },
@@ -248,6 +252,11 @@ export default {
     openline() {
       this.flagline = true;
       console.log("11111111111111111111111111", this.flagline);
+      updateMarkEnableStatus({
+        status: 1,
+      }).then((res) => {
+        console.log(res);
+      });
       this.drawline();
     },
     drawline() {
@@ -288,6 +297,11 @@ export default {
     handelClear() {
       this.ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
       this.flagline = false;
+      updateMarkEnableStatus({
+        status: 0,
+      }).then((res) => {
+        console.log(res);
+      });
     },
     getphotoList() {
       this.fiveList = this.terminalPhoto.slice(
@@ -358,7 +372,10 @@ export default {
         .then((res) => {
           console.log(res);
           this.localPoints = res.data.list;
-          this.drawline();
+          if (this.markEnable === 1) {
+            this.drawline();
+          }
+          // this.drawline();
         })
         .catch((err) => {});
     },
@@ -384,7 +401,10 @@ export default {
         .then((res) => {
           console.log(res);
           this.localPoints = res.data.list;
-          this.drawline();
+          if (this.markEnable === 1) {
+            this.drawline();
+          }
+          // this.drawline();
         })
         .catch((err) => {});
     },
@@ -405,7 +425,10 @@ export default {
         .then((res) => {
           console.log(res);
           this.localPoints = res.data.list;
-          this.drawline();
+          if (this.markEnable === 1) {
+            this.drawline();
+          }
+          // this.drawline();
         })
         .catch((err) => {});
     },
diff --git a/src/views/management/userEquipment/towerInformation/index.vue b/src/views/management/userEquipment/towerInformation/index.vue
index c5ae35d..992e19b 100644
--- a/src/views/management/userEquipment/towerInformation/index.vue
+++ b/src/views/management/userEquipment/towerInformation/index.vue
@@ -41,7 +41,11 @@
             show-overflow-tooltip
           ></el-table-column>
 
-          <el-table-column prop="order" label="排序号"></el-table-column>
+          <el-table-column prop="order" label="排序号">
+            <template slot-scope="scope">
+              {{ scope.row.order == null ? 0 : scope.row.order }}
+            </template>
+          </el-table-column>
 
           <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
diff --git a/src/views/system/globalTools/index.vue b/src/views/system/globalTools/index.vue
index e1dab21..496616b 100644
--- a/src/views/system/globalTools/index.vue
+++ b/src/views/system/globalTools/index.vue
@@ -38,7 +38,12 @@
   </div>
 </template>
 <script>
-import { getAlarmTypeList, updateAlarmTypeList } from "@/utils/api/index";
+import {
+  getAlarmTypeList,
+  updateAlarmTypeList,
+  getMarkEnableStatus,
+  updateMarkEnableStatus,
+} from "@/utils/api/index";
 
 export default {
   components: {},
@@ -51,8 +56,22 @@ export default {
   },
   created() {
     this.getalarmList();
+    this.getmark();
   },
   methods: {
+    //获取图片绘制状态
+    getmark() {
+      getMarkEnableStatus()
+        .then((res) => {
+          console.log(res);
+          if (res.data === 1) {
+            this.lineValue = true;
+          } else {
+            this.lineValue = false;
+          }
+        })
+        .catch((err) => {});
+    },
     //控制线缆绘制开关
     showLine(val) {
       if (val) {
@@ -60,9 +79,16 @@ export default {
       } else {
         this.lineNum = 0;
       }
+      updateMarkEnableStatus({
+        status: this.lineNum,
+      })
+        .then((res) => {
+          console.log(res);
+        })
+        .catch((err) => {});
       console.log(val, this.lineNum, "开关");
     },
-
+    //获取装置可信度值
     getalarmList() {
       getAlarmTypeList().then((res) => {
         console.log(res);
diff --git a/vue.config.js b/vue.config.js
index 51f9db9..e3ab0d5 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -29,7 +29,7 @@ module.exports = defineConfig({
       "/api": {
         //表示拦截以/api开头的请求路径
         target: "http://47.96.238.157:8093", //阿里云服务器环境
-        // target: "http://180.166.218.222:40080", //dell
+        //target: "http://180.166.218.222:40080", //dell
         changOrigin: true, //是否开启跨域
         pathRewrite: {
           "^/api": "", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的