From bfd8d39ecf8f2ad4a1619b121ee42a3999b3ae42 Mon Sep 17 00:00:00 2001
From: SunTao <328867980@qq.com>
Date: Tue, 3 Dec 2024 13:42:21 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=AF=BC=E5=87=BA=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E5=A4=A7=E5=B1=8F=E4=BF=AE=E6=94=B9=E8=B7=9F?=
 =?UTF-8?q?=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/xj/task.js                            | 12 +++++-
 src/components/map/fssm-map.vue               |  6 +--
 src/views/big-screen/index.vue                | 35 +++++++---------
 .../components/inspection-follow.vue          |  4 +-
 .../components/inspection-view.vue            | 42 +++++++++++++++++--
 .../overview-components/disease-current.vue   |  4 +-
 .../inspection-vehicles.vue                   | 10 +++--
 .../inspection-warn/warning-center/index.vue  |  7 ++--
 .../xj/inspection/task-management/index.vue   | 14 +++++--
 9 files changed, 94 insertions(+), 40 deletions(-)

diff --git a/src/api/xj/task.js b/src/api/xj/task.js
index d3b79fb..7514fd8 100644
--- a/src/api/xj/task.js
+++ b/src/api/xj/task.js
@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-10-14 10:04:12
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-12-02 16:39:01
+ * @LastEditTime: 2024-12-03 11:43:45
  * @FilePath: \znxjxt-ui\src\api\xj\task.js
  * @Description: 巡检任务管理接口
  */
@@ -63,3 +63,13 @@ export function getDefectList(params) {
     params,
   });
 }
+
+
+// 导出病害数据
+export function exportDefectData(params) {
+  return request({
+    url: "/xj/defect/exportNewDefectByTaskId",
+    method: "get",
+    params,
+  });
+}
diff --git a/src/components/map/fssm-map.vue b/src/components/map/fssm-map.vue
index f5b2453..af1779b 100644
--- a/src/components/map/fssm-map.vue
+++ b/src/components/map/fssm-map.vue
@@ -2,8 +2,8 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-10-14 10:46:23
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-11-14 16:58:34
- * @FilePath: \znxjxt-ui\src\views\xj\inspection\task-management\components\fssm-map.vue
+ * @LastEditTime: 2024-12-03 10:56:51
+ * @FilePath: \znxjxt-ui\src\components\map\fssm-map.vue
  * @Description: 公共地图
 -->
 
@@ -453,8 +453,6 @@ export default {
           this.drawend(e);
         });
         modify.on("modifyend", (e) => {
-          console.log(11111111);
-
           e.features.forEach((feature) => {
             this.drawMarkers = feature.getGeometry().getCoordinates().flat();
             this.$emit("endEoordinate", this.drawMarkers);
diff --git a/src/views/big-screen/index.vue b/src/views/big-screen/index.vue
index b19d343..353484f 100644
--- a/src/views/big-screen/index.vue
+++ b/src/views/big-screen/index.vue
@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-10-17 11:34:00
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-12-02 10:47:38
+ * @LastEditTime: 2024-12-03 13:03:48
  * @FilePath: \znxjxt-ui\src\views\big-screen\index.vue
  * @Description: 大屏首页
 -->
@@ -10,14 +10,14 @@
   <div class="screen-content">
     <div class="screen-header">
       <div class="header-weather">
-        <iframe
+        <!-- <iframe
           width="150"
           scrolling="no"
           height="45"
           frameborder="0"
           allowtransparency="true"
           src="https://i.tianqi.com?c=code&id=12&icon=1&color=%2389C5E8&py=shenyang&num=1&site=12"
-        ></iframe>
+        ></iframe> -->
       </div>
       <div class="header-time">
         <!-- 消息中心 -->
@@ -42,22 +42,22 @@
                     >
                       <div class="index">
                         <i
-                          v-if="item.status === '1'"
+                          v-if="item.title === '成功'"
                           style="color: #67c23a"
                           class="el-icon-success"
                         ></i>
                         <i
-                          v-if="item.status === '2'"
+                          v-if="item.title === '提醒'"
                           style="color: #e6a23c"
                           class="el-icon-info"
                         ></i>
                         <i
-                          v-if="item.status === '3'"
+                          v-if="item.title === '告警'"
                           style="color: #909399"
                           class="el-icon-warning"
                         ></i>
                         <i
-                          v-if="item.status === '4'"
+                          v-if="item.title === '错误'"
                           style="color: #f56c6c"
                           class="el-icon-error"
                         ></i>
@@ -305,14 +305,6 @@
 </template>
 
 <script>
-// websocket
-import {
-  connectWebsocket,
-  closeWebsocket,
-  sendMsg,
-} from "@/plugins/websocket.js";
-// 登陆人信息
-import { getToken } from "@/utils/auth.js";
 // 地图
 import FssmMap from "@/components/map/fssm-map.vue";
 import { Feature } from "ol";
@@ -564,19 +556,22 @@ export default {
       // });
       this.messageList = [
         {
-          status: "1",
+          title: "成功",
+          status: "SUCCESS",
           time: "2024/45/62",
           car: "辽jskdn",
           content: "骄傲的是否哈德half绝对符合卡的法拉第",
         },
         {
-          status: "2",
+          title: "告警",
+          status: "WARNING",
           time: "2024/45/62",
           car: "辽jskdn",
           content: "骄傲的是否哈德half绝对符合卡的法拉第",
         },
         {
-          status: "3",
+          title: "提醒",
+          status: "REMIND",
           time: "2024/45/62",
           car: "辽jskdn",
           content: "骄傲的是否哈德half绝对符合卡的法拉第",
@@ -591,7 +586,7 @@ export default {
     handleMessageItemClick(value) {
       this.$router.push({
         name: "Warning-center",
-        params: { status: value },
+        params: { title: value },
       });
     },
 
@@ -1264,7 +1259,7 @@ export default {
                     crossOrigin: "anonymous",
                     src: logo,
                     // 图标缩放比例
-                    scale: 0.03,
+                    scale: 0.04,
                     // 将角度转换为弧度,并除以180*π
                     rotation: (item.data.direction - 90) * (Math.PI / 180),
                   }),
diff --git a/src/views/big-screen/overview-components/components/inspection-follow.vue b/src/views/big-screen/overview-components/components/inspection-follow.vue
index edfdeef..f9b25e5 100644
--- a/src/views/big-screen/overview-components/components/inspection-follow.vue
+++ b/src/views/big-screen/overview-components/components/inspection-follow.vue
@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-11-15 13:14:03
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-12-02 10:46:24
+ * @LastEditTime: 2024-12-03 13:10:46
  * @FilePath: \znxjxt-ui\src\views\big-screen\overview-components\components\inspection-follow.vue
  * @Description: 总览大屏-巡检车辆-跟车弹窗
 -->
@@ -89,6 +89,8 @@ export default {
               ]);
             }, 10);
           }
+        } else if (item.type === "defect") {
+          console.log(item, "生成得病害");
         }
       });
     },
diff --git a/src/views/big-screen/overview-components/components/inspection-view.vue b/src/views/big-screen/overview-components/components/inspection-view.vue
index 9843c36..8b7a244 100644
--- a/src/views/big-screen/overview-components/components/inspection-view.vue
+++ b/src/views/big-screen/overview-components/components/inspection-view.vue
@@ -2,13 +2,22 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-11-15 14:23:21
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-11-15 15:06:55
+ * @LastEditTime: 2024-12-03 13:35:29
  * @FilePath: \znxjxt-ui\src\views\big-screen\overview-components\components\inspection-view.vue
  * @Description: 总览大屏-巡检车辆-视频查看弹窗
 -->
 
 <template>
-  <div class="view-content"></div>
+  <div class="view-content">
+    <video
+      id="mmiid"
+      class="video-js vjs-big-play-centered vjs-fluid"
+      controls
+      preload="auto"
+      width="100%"
+      height="100%"
+    ></video>
+  </div>
 </template>
 
 <script>
@@ -33,12 +42,39 @@ export default {
   methods: {
     /* 获取视频url地址 */
     getVideo() {
-      console.log(this.dialogItem);
+      // 获取视频流地址
       getVideoUrl({ id: this.dialogItem.clientId }).then(({ code, data }) => {
         if (code === 200) {
+          // 判断视频流地址是否存在
+          if (!data) {
+            this.$message.error('获取视频流失败');
+            return;
+          }
+          
+          // 创建 flv.js 播放器
+          if (flvjs.isSupported()) {
+            const flvPlayer = flvjs.createPlayer({
+              type: 'flv',
+              url: "http://1011.hlsplay.aodianyun.com/demo/game.flv",
+              isLive: true,
+              hasAudio: true,
+              hasVideo: true
+            });
             
+            flvPlayer.attachMediaElement(document.querySelector("#mmiid"));
+            flvPlayer.load();
+            flvPlayer.play();
+          } else {
+            this.$message.error('当前浏览器不支持FLV播放');
+          }
         }
       });
+      
+      // getVideoUrl({ id: this.dialogItem.clientId }).then(({ code, data }) => {
+      //   if (code === 200) {
+      //     console.log(data, "data");
+      //   }
+      // });
     },
   },
 };
diff --git a/src/views/big-screen/overview-components/disease-current.vue b/src/views/big-screen/overview-components/disease-current.vue
index 36318d8..7b9c6b6 100644
--- a/src/views/big-screen/overview-components/disease-current.vue
+++ b/src/views/big-screen/overview-components/disease-current.vue
@@ -2,8 +2,8 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-10-18 10:19:56
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-11-12 16:18:03
- * @FilePath: \znxjxt-ui\src\views\big-screen\disease-components\disease-current.vue
+ * @LastEditTime: 2024-12-03 11:41:07
+ * @FilePath: \znxjxt-ui\src\views\big-screen\overview-components\disease-current.vue
  * @Description: 总览大屏-病害三维饼图
 -->
 
diff --git a/src/views/big-screen/overview-components/inspection-vehicles.vue b/src/views/big-screen/overview-components/inspection-vehicles.vue
index 084b956..95fa72d 100644
--- a/src/views/big-screen/overview-components/inspection-vehicles.vue
+++ b/src/views/big-screen/overview-components/inspection-vehicles.vue
@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-11-08 09:40:18
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-11-20 16:32:29
+ * @LastEditTime: 2024-12-03 13:19:02
  * @FilePath: \znxjxt-ui\src\views\big-screen\overview-components\inspection-vehicles.vue
  * @Description: 总览大屏-巡检车辆
 -->
@@ -59,7 +59,7 @@
                 </div>
                 <div>
                   <span class="name">设备编号:</span>
-                  <span class="value">{{ scope.row.appid }}</span>
+                  <span class="value">{{ scope.row.extId }}</span>
                 </div>
                 <div>
                   <span class="name">车辆状态:</span>
@@ -67,7 +67,7 @@
                 </div>
                 <div>
                   <span class="name">网络状态:</span>
-                  <span class="value">{{ scope.row.status }}</span>
+                  <span class="value">{{ scope.row.serverStatus }}</span>
                 </div>
                 <div>
                   <span class="name">设备状态:</span>
@@ -236,7 +236,9 @@ export default {
       this.followTitle = "跟车详情";
       this.showCarVisible = true;
       const carData = { type: "carLocation", status: true };
+      const defectData = { type: "defect", status: true };
       this.$ws.send(carData);
+      this.$ws.send(defectData);
     },
 
     /**
@@ -261,7 +263,9 @@ export default {
       this.dialogItem = {};
       // 停止接收病害信息
       const carData = { type: "carLocation", status: false };
+      const defectData = { type: "defect", status: false };
       this.$ws.send(carData);
+      this.$ws.send(defectData);
     },
 
     /**
diff --git a/src/views/xj/inspection-warn/warning-center/index.vue b/src/views/xj/inspection-warn/warning-center/index.vue
index a1cf726..f4c565c 100644
--- a/src/views/xj/inspection-warn/warning-center/index.vue
+++ b/src/views/xj/inspection-warn/warning-center/index.vue
@@ -4,7 +4,7 @@
  * @LastEditors: SunTao 328867980@qq.com
  * @LastEditTime: 2024-11-20 15:49:28
  * @FilePath: \znxjxt-ui\src\views\xj\inspection-warn\warning-center\index.vue
- * @Description: 巡检预警中心
+ * @Description: 预警中心-信息中心
 -->
 
 <template>
@@ -236,8 +236,8 @@ export default {
   watch: {
     $route: {
       handler(val) {
-        if (val.params.status) {
-          this.activeName = val.params.status;
+        if (val.params.title) {
+          this.activeName = val.params.title;
         }
       },
       deep: true,
@@ -329,6 +329,7 @@ export default {
         markNoticeRead(val.id).then(({ code }) => {
           if (code === 200) {
             this.getList();
+            this.getNav();
           }
         });
       }
diff --git a/src/views/xj/inspection/task-management/index.vue b/src/views/xj/inspection/task-management/index.vue
index 30b7d24..648a387 100644
--- a/src/views/xj/inspection/task-management/index.vue
+++ b/src/views/xj/inspection/task-management/index.vue
@@ -2,7 +2,7 @@
  * @Author: SunTao 328867980@qq.com
  * @Date: 2024-10-14 09:48:43
  * @LastEditors: SunTao 328867980@qq.com
- * @LastEditTime: 2024-12-02 16:41:53
+ * @LastEditTime: 2024-12-03 11:44:24
  * @FilePath: \znxjxt-ui\src\views\xj\inspection\task-management\index.vue
  * @Description: 巡检管理-巡检任务
 -->
@@ -195,6 +195,7 @@ import {
   getRoadType,
   getTaskIdList,
   getDefectList,
+  exportDefectData,
 } from "@/api/xj/task";
 
 export default {
@@ -255,7 +256,7 @@ export default {
     /**
      * @description: 获取病害类型下拉数据
      * @return {*}
-     */ 
+     */
     getDefectCascaderList() {
       getDefectList().then(({ code, data }) => {
         if (code === 200) {
@@ -396,7 +397,14 @@ export default {
      * @param {*} item
      * @return {*}
      */
-    handleExport(item) {},
+    handleExport(item) {
+      exportDefectData({ taskId: item.extId }).then(({ code, data }) => {
+          if(code===200){
+            console.log(data,'ddd');
+            
+          }
+        });
+    },
 
     /**
      * @description: 切换分页