From 943612d894bbad00f0aefae674b084dbd617acb5 Mon Sep 17 00:00:00 2001
From: dhy1725534722 <1725534722@qq.com>
Date: Mon, 23 Oct 2023 17:19:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=AF=A5=E6=98=BE=E7=A4=BA=E5=B1=82?=
 =?UTF-8?q?=E7=BA=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/commandControl/index.vue       | 22 +++++++++++++++++--
 .../sentiment/components/componentRight.vue   |  4 ++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/views/privateOrder/sentiment/components/commandControl/index.vue b/src/views/privateOrder/sentiment/components/commandControl/index.vue
index 5fa7287..5402c8c 100644
--- a/src/views/privateOrder/sentiment/components/commandControl/index.vue
+++ b/src/views/privateOrder/sentiment/components/commandControl/index.vue
@@ -59,7 +59,7 @@
         left: 42px;
         z-index: 9999;
       "
-      @click="openPatrolPopup = !openPatrolPopup"
+      @click="openXc"
       >巡查内容</el-button
     >
     <el-button
@@ -71,7 +71,7 @@
         left: 42px;
         z-index: 9999;
       "
-      @click="openWorkPopup = !openWorkPopup"
+      @click="openLc"
       >工作流程</el-button
     >
     <div v-if="UAVvideoPop" class="popup-video">
@@ -266,6 +266,9 @@ export default {
 
       this.multiVideo.title = "视频监控";
       this.multiVideo.show = true;
+      this.UAVvideoPop = false;
+      this.openWorkPopup = false;
+      this.openPatrolPopup = false;
       this.multiVideo.layout = "3x3";
       this.multiVideo.cameraCodes = videoList.map((e) => e.CODE);
     },
@@ -302,6 +305,9 @@ export default {
     openUAVvideoPop() {
       const _this = this;
       this.UAVvideoPop = true;
+      this.openWorkPopup = false;
+      this.openPatrolPopup = false;
+      this.multiVideo.show = false;
       this.$nextTick(() => {
         _this.flv_load_mds(_this.$refs.refWrjVideo, _this.videoURL);
       });
@@ -332,6 +338,18 @@ export default {
     closeUAVvideoPop() {
       this.UAVvideoPop = false;
     },
+    openLc() {
+      this.multiVideo.show = false;
+      this.UAVvideoPop = false;
+      this.openWorkPopup = true;
+      this.openPatrolPopup = false;
+    },
+    openXc() {
+      this.multiVideo.show = false;
+      this.UAVvideoPop = false;
+      this.openWorkPopup = false;
+      this.openPatrolPopup = true;
+    },
   },
 };
 </script>
diff --git a/src/views/privateOrder/sentiment/components/componentRight.vue b/src/views/privateOrder/sentiment/components/componentRight.vue
index 5b99d95..e43ed74 100644
--- a/src/views/privateOrder/sentiment/components/componentRight.vue
+++ b/src/views/privateOrder/sentiment/components/componentRight.vue
@@ -534,7 +534,7 @@ export default {
       let str1 = str[0].split(".");
       this.fileExtension = str1[1];
       if (this.fileExtension == "pdf") {
-        this.getNumPages(process.env.VUE_APP_BASE_API2 + str[0]);
+        this.getNumPages(str[0]);
         this.dialogDetails = true;
       } else if (
         this.fileExtension === "docx" ||
@@ -543,7 +543,7 @@ export default {
         axios({
           method: "get",
           responseType: "blob", // 设置响应文件格式
-          url: process.env.VUE_APP_BASE_API2 + str[0],
+          url:  str[0],
         }).then(({ data }) => {
           if (data) {
             this.dialogDetails = true;