1

src/views/screen/engineering/main.vue

@@ -162,11 +162,12 @@
           v-if="showType === 1"
           @closeMonitor="onCloseMonitor"
           @chooseAllMonitor="onChooseAllMonitor"
+           @issue="onChooseIssue"
           :monitorInfo="this.monitorInfo"
         ></monitor-live>
         <monitor-live-list
           v-if="showType === 2"
-          @closeMonitor="onCloseMonitor"
+          @closeMonitor="onCloseMonitor1"
           @chooseMonitor="onChooseMonitor"
           :monitorInfo="this.monitorInfo"
           :monitorName="monitorName"
@@ -190,7 +191,7 @@
         <camera-screen
           v-if="showCameraScreen === 1"
           @leave="onCloseCameraScreen"
-          @issue="onChooseIssue">
+       >
         </camera-screen>
         <issue-list-dia
           v-if="showIssue === 1"
@@ -447,8 +448,8 @@ export default {
       this.showHealth = 1
     },
     onChooseUnit(){
-      this.showCenter = true;
-      this.showType = 2;
+      this.showC = true;
+      this.showProject = 1;
     },
     onCloseRes(){
       this.showC = false
@@ -464,8 +465,9 @@ export default {
     },
 
     onChooseProject(){
-      this.showCamera = 1;
-      this.showProject = 0;
+      this.showC = false
+      this.showCenter = true;
+      this.showType = 2;
     },
     onCloseProject(){
       this.showC = false;
@@ -488,7 +490,9 @@ export default {
     //入口
     onChooseIssue(){
       this.flag = 1
-      this.showCameraScreen = 0;
+      this.showType = 0;
+      this.showC = true;
+      this.showProject=0
       this.showIssueSub = 1;
     },
 
@@ -514,7 +518,9 @@ export default {
     onCloseIssueSub(){
       this.showIssueSub = 0
       if (this.flag === 1){
-        this.showCameraScreen = 1
+        this.showC = false
+        this.showCenter = false
+        // this.showIssueSub=0
       }
       else if (this.flag === 2){
         this.showIssue = 1
@@ -554,6 +560,12 @@ export default {
       this.showCenter = false;
       this.showType = 0;
     },
+  //关闭监控视频
+  onCloseMonitor1() {
+      this.showCenter = false;
+      this.showC = true;
+      this.showType = 0;
+    },
 
     //显示列表
     onChooseAllMonitor() {

src/views/screen/engineering/monitorLive.vue

@@ -92,7 +92,9 @@ export default {
       this.videoObj && this.videoObj.videoStop(this.winNum);
       this.$emit("closeMonitor")
     },
-
+    issue(){
+      this.$emit("issue");
+    },
     // 播放器加载完毕
     playVideo(obj) {
       console.log(obj, '================================')
@@ -120,11 +122,11 @@ export default {
       this.videoObj.videoControl({
       winNum: this.winNum,
       code: this.monitorInfo.code,
-      control: 0x0504, 
+      control: 0x0504,
     });
-    
+
   },
-    
+
     right() {
       this.direction=0x0501
       console.log(this.videoObj,'========================aaa');
@@ -135,7 +137,7 @@ export default {
       this.videoObj.videoControl({
       winNum: this.winNum,
       code: this.monitorInfo.code,
-      control: 0x0502, 
+      control: 0x0502,
       });
     },
     top() {
@@ -148,7 +150,7 @@ export default {
       this.videoObj.videoControl({
       winNum: this.winNum,
       code: this.monitorInfo.code,
-      control: 0x0402, 
+      control: 0x0402,
       });
     },
     bottom() {
@@ -161,7 +163,7 @@ export default {
       this.videoObj.videoControl({
       winNum: this.winNum,
       code: this.monitorInfo.code,
-      control: 0x0404, 
+      control: 0x0404,
       });
     },
 
@@ -176,7 +178,7 @@ export default {
       this.videoObj.videoControl({
       winNum: this.winNum,
       code: this.monitorInfo.code,
-      control:  this.direction, 
+      control:  this.direction,
       });
     },
 
@@ -190,6 +192,7 @@ export default {
         winNum: this.winNum,
         code: this.monitorInfo.code,
       });
+      this.issue()
     },
 
     amplify() {
@@ -201,7 +204,7 @@ export default {
       this.videoObj.videoControl({
       winNum: this.winNum,
       code: this.monitorInfo.code,
-      control: 0x0304, 
+      control: 0x0304,
       });
     },
 
@@ -214,7 +217,7 @@ export default {
       this.videoObj.videoControl({
       winNum: this.winNum,
       code: this.monitorInfo.code,
-      control: 0x0302, 
+      control: 0x0302,
       });
     },