From 30d8498fcba6bfbb70c56edff6a0844778f01309 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Mon, 6 Nov 2023 09:39:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homePage/index.vue                  | 190 +-----------------
 .../components/pictureTags.vue                |   4 +-
 .../components/carouselChart.vue              |   8 +-
 .../components/carouselChartOld.vue           |   4 +-
 .../components/previewContain.vue             |   4 +-
 src/views/realTimeSearch/index.vue            |   2 +-
 vue.config.js                                 |   5 +-
 7 files changed, 16 insertions(+), 201 deletions(-)

diff --git a/src/views/homePage/index.vue b/src/views/homePage/index.vue
index af961fb..c9b0125 100644
--- a/src/views/homePage/index.vue
+++ b/src/views/homePage/index.vue
@@ -120,8 +120,6 @@
 <script>
 import {
   getTermStatistics,
-  getWeekAlarmStatistics,
-  getTodayAlarmStatistics,
   getOnlineTerminalList,
   getOnlineTerminalListExcel,
 } from "@/utils/api/index";
@@ -159,8 +157,6 @@ export default {
   mounted() {
     this.getDateTime(); //获取当前时间
     this.getTermData();
-    this.getWeekAlarmStatistics();
-    this.getTodayAlarmStatistics();
   },
   watch: {
     "$store.state.collapse"(val) {
@@ -169,8 +165,6 @@ export default {
         //echarts得重绘方法
         this.myChart1.resize();
         this.myChart2.resize();
-        this.myChart3.resize();
-        this.myChart4.resize();
       }, 300);
     },
   },
@@ -197,18 +191,7 @@ export default {
       console.log(val);
       window.location.href = "/api/api/getOnlineTerminalListExcel?type=" + val;
     },
-    // 隐患数量统计
-    changedate() {
-      console.log(this.dateValue.getTime());
-      this.dateValue = this.dateValue.getTime();
-      this.getWeekAlarmStatistics();
-    },
-    // 隐患分类统计
-    changedate2() {
-      console.log(this.dateValue2.getTime());
-      this.dateValue2 = this.dateValue2.getTime();
-      this.getTodayAlarmStatistics();
-    },
+
     //获取当前时间
     getDateTime() {
       console.log(new Date());
@@ -231,30 +214,7 @@ export default {
         })
         .catch((err) => {});
     },
-    //获取7天告警统计
-    getWeekAlarmStatistics() {
-      this.barloading = true;
-      getWeekAlarmStatistics({ starttime: this.dateValue })
-        .then((res) => {
-          console.log(res);
-          this.weekData = res.data.list;
-          this.barloading = false;
-          this.getEchart3();
-        })
-        .catch((err) => {});
-    },
-    //获取当天告警分类统计
-    getTodayAlarmStatistics() {
-      this.pie2loading = true;
-      getTodayAlarmStatistics({ starttime: this.dateValue2 })
-        .then((res) => {
-          console.log(res);
-          this.todayAlarm = res.data.list;
-          this.pie2loading = false;
-          this.getEchart4();
-        })
-        .catch((err) => {});
-    },
+
     //装置数量统计
     getEchart2() {
       this.$nextTick(() => {
@@ -326,152 +286,6 @@ export default {
         });
       });
     },
-    //获取7天告警统计
-    getEchart3() {
-      this.$nextTick(() => {
-        this.$echarts.init(document.getElementById("echart3")).dispose();
-        this.myChart3 = this.$echarts.init(document.getElementById("echart3"));
-        let option = {
-          // title: {
-          //   text: "隐患分类统计",
-          // },
-          color: ["#169e8c"],
-          tooltip: {
-            trigger: "axis",
-            axisPointer: {
-              type: "shadow",
-            },
-          },
-          grid: {
-            //与绝对定位相似，top，left，right，bottom 设定是根据上级盒子宽高来计算
-            top: "10%",
-            left: "10%",
-            right: "10%",
-            bottom: "10%",
-          },
-          xAxis: {
-            type: "category",
-            data: this.weekData.map((x) => {
-              return this.$moment(x.date).format("MM-DD");
-            }),
-            axisTick: {
-              alignWithLabel: true,
-            },
-          },
-          yAxis: { type: "value" },
-          series: [
-            {
-              name: "告警数量",
-              data: this.weekData.map((x) => {
-                return x.num;
-              }),
-              type: "bar",
-              showBackground: true,
-              backgroundStyle: { color: "rgba(180, 180, 180, 0.2)" },
-            },
-          ],
-        };
-        this.myChart3.setOption(option);
-        window.addEventListener("resize", () => {
-          this.myChart3.resize();
-        });
-      });
-    },
-    //获取当天告警分类统计
-    getEchart4() {
-      this.$nextTick(() => {
-        this.$echarts.init(document.getElementById("echart4")).dispose();
-        this.myChart4 = this.$echarts.init(document.getElementById("echart4"));
-        let arr = [];
-        this.todayAlarm.forEach((element) => {
-          arr.push({
-            value: element.num, //将数组的num值赋给value
-            name: element.enname, //将数组的name值赋给name
-          });
-        });
-        let option = {
-          // title: {
-          //   text: "隐患分类统计",
-          // },
-          // tooltip: {
-          //   trigger: "axis",
-          //   axisPointer: {
-          //     type: "shadow",
-          //   },
-          // },
-          // xAxis: {
-          //   type: "category",
-          //   data: this.todayAlarm.map((item) => {
-          //     return item.enname;
-          //   }),
-          //   axisTick: {
-          //     alignWithLabel: true,
-          //   },
-          // },
-          // yAxis: { type: "value" },
-          // series: [
-          //   {
-          //     name: "告警数量",
-          //     data: this.todayAlarm.map((item) => {
-          //       return item.num;
-          //     }),
-          //     type: "bar",
-          //     showBackground: true,
-          //     backgroundStyle: { color: "rgba(180, 180, 180, 0.2)" },
-          //   },
-          // ],
-
-          // title: {
-          //   text: "装置在线统计",
-          // },
-          tooltip: {
-            trigger: "item",
-          },
-          legend: {
-            type: "scroll",
-            orient: "vertical",
-            right: 10,
-            top: 20,
-            bottom: 20,
-          },
-          series: [
-            {
-              type: "pie",
-              radius: ["40%", "70%"],
-              avoidLabelOverlap: false,
-
-              itemStyle: {
-                borderRadius: 10,
-                borderColor: "#fff",
-                borderWidth: 2,
-              },
-              label: {
-                show: true,
-                fontSize: 16,
-                fontWeight: "bold",
-                formatter: "{b}\n{d}%",
-              },
-              emphasis: {
-                label: {
-                  show: true,
-                  fontSize: 26,
-                  fontWeight: "bold",
-                  formatter: "{b}\n{d}%",
-                },
-              },
-              labelLine: {
-                show: true,
-              },
-              data: arr,
-            },
-          ],
-        };
-        this.myChart4.setOption(option);
-        window.addEventListener("resize", () => {
-          this.myChart4.resize();
-        });
-      });
-    },
   },
 };
 </script>
diff --git a/src/views/photographicDevice/components/pictureTags.vue b/src/views/photographicDevice/components/pictureTags.vue
index c5423cb..67ba8ec 100644
--- a/src/views/photographicDevice/components/pictureTags.vue
+++ b/src/views/photographicDevice/components/pictureTags.vue
@@ -129,7 +129,7 @@ export default {
       this.channelId = obj.id;
       this.photoId = obj.photoId;
       this.restCanvas();
-      this.getcanvansPic(this.pictureData, this.channelId);
+      //this.getcanvansPic(this.pictureData, this.channelId);
       // console.log(this.picsrc);
     },
     //获取线宽
@@ -150,7 +150,7 @@ export default {
       this.channelId = val.list[0].id;
       this.picvalue = val.list[0].name; //获取第一个通道
       this.termId = val.id; //装置id
-      this.getcanvansPic(val, this.channelId);
+      //this.getcanvansPic(val, this.channelId);
     },
     hide() {
       this.isShow = false;
diff --git a/src/views/realTimeMonitor/components/carouselChart.vue b/src/views/realTimeMonitor/components/carouselChart.vue
index 212bbb6..78fb0ba 100644
--- a/src/views/realTimeMonitor/components/carouselChart.vue
+++ b/src/views/realTimeMonitor/components/carouselChart.vue
@@ -16,7 +16,7 @@
         v-loading="picLoading"
       >
         <el-image
-          :src="currentPicPath + '!1366x768'"
+          :src="currentPicPath + ''"
           :preview-src-list="srcList"
           @load="loadImage"
           @error="setDefaultImage"
@@ -80,7 +80,7 @@
               "
             >
               <!-- <el-image v-lazy="item.path + '!260x160'"></el-image> -->
-              <img v-lazy="item.path + '!260x160'" />
+              <img v-lazy="item.path + ''" />
 
               <p class="timeInfo">
                 <el-tooltip
@@ -113,7 +113,7 @@
             </div>
             <div class="picBox" v-else-if="item.mediaType == 1">
               <!-- <el-image :src="item.thumb + '!260x160'"></el-image> -->
-              <img v-lazy="item.thumb + '!260x160'" />
+              <img v-lazy="item.thumb + ''" />
               <p class="timeInfo">
                 <i class="el-icon-video-camera"></i>
                 <el-tooltip
@@ -359,7 +359,7 @@ export default {
       } else {
         this.radioPx = "";
       }
-      this.getPointList(data);
+      //this.getPointList(data);
     },
     loadImage() {
       console.log("loading");
diff --git a/src/views/realTimeMonitor/components/carouselChartOld.vue b/src/views/realTimeMonitor/components/carouselChartOld.vue
index 67da73e..fd505a9 100644
--- a/src/views/realTimeMonitor/components/carouselChartOld.vue
+++ b/src/views/realTimeMonitor/components/carouselChartOld.vue
@@ -14,7 +14,7 @@
         v-loading="picLoading"
       >
         <el-image
-          :src="currentPicPath + '!1366x768'"
+          :src="currentPicPath + ''"
           :preview-src-list="srcList"
           @load="loadImage"
           ref="picJpg"
@@ -368,7 +368,7 @@ export default {
       } else {
         this.radioPx = "";
       }
-      this.getPointList(data);
+      // this.getPointList(data);
     },
     loadImage() {
       this.picLoading = false;
diff --git a/src/views/realTimeMonitor/components/previewContain.vue b/src/views/realTimeMonitor/components/previewContain.vue
index f08e6d6..d437c66 100644
--- a/src/views/realTimeMonitor/components/previewContain.vue
+++ b/src/views/realTimeMonitor/components/previewContain.vue
@@ -15,14 +15,14 @@
           <div class="imgcloum" @click="handleTowerPic(item)">
             <!-- 首先判断是否是图片mediatype=0,并且path不为空  展示图片 -->
             <img
-              :src="item.path + '!1366x768'"
+              :src="item.path + ''"
               v-if="item.mediatype == 0 && item.path !== null"
               @error="setDefaultImage"
             />
             <!-- 判断是否是视频mediatype=1,并且path不为空  展示图片 -->
             <img
               v-else-if="item.mediatype == 1 && item.thumb !== null"
-              :src="item.thumb + '!1366x768'"
+              :src="item.thumb + ''"
             />
             <!-- 判断是否是视频mediatype=bull,并且path为空  展示暂无图片 -->
             <img
diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue
index 1f7e079..64826bf 100644
--- a/src/views/realTimeSearch/index.vue
+++ b/src/views/realTimeSearch/index.vue
@@ -121,7 +121,7 @@
             <div class="bigpic" v-if="item.path.indexOf('videos') == -1">
               <el-image
                 lazy
-                :src="item.path + '!1366x768'"
+                :src="item.path + ''"
                 :preview-src-list="[item.path]"
               >
                 <template slot="error">
diff --git a/vue.config.js b/vue.config.js
index a1e43d3..1ba0e09 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -21,11 +21,12 @@ module.exports = defineConfig({
     proxy: {
       "/api": {
         //表示拦截以/api开头的请求路径
-        target: "http://47.96.238.157:8093", //阿里云服务器环境
+        //target: "http://47.96.238.157:8093", //阿里云服务器环境
         //target: "http://180.166.218.222:40080", //dell
+        target: "http://192.168.50.42:81", //dell
         changOrigin: true, //是否开启跨域
         pathRewrite: {
-          "^/api": "", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
+          "^/api": "/api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的
         },
       },
     },