提交一下

1

src/layout/components/Navbar.vue

@@ -214,7 +214,7 @@
         <el-button type="primary" @click="submitResetPassWord">确 定</el-button>
       </div>
     </el-dialog>
-    <instructions ref="instructions" @checkShow='checkShow'/>
+    <instructions  ref="instructions" @checkShow='checkShow'/>
   </div>
 </template>
 
@@ -420,8 +420,10 @@ export default {
   height: 90px;
   overflow: hidden;
   position: relative;
+  z-index: 2000;
   background: #14928a;
   box-shadow: 0px 8px 20px 0px rgba(0, 0, 0, 0.1);
+
   h2 {
     font-size: 18px;
     line-height: 90px;

src/layout/components/fullPageIns.vue

@@ -38,13 +38,15 @@ export default {
       docY: "",
       isShow: false,
       showVideo: false,
-      isResizing:false
+      isResizing:false,
+      src:""
     };
   },
   mounted() {
     this.initSize();
     // this.y = 130;
     window.addEventListener("resize", this.resizeWindow);
+    this.url = this.$route.query.url;
     this.isShow = true;
   },
   methods: {
@@ -79,7 +81,7 @@ export default {
       return this.h - 30 + "px";
     },
     videoSrc(){
-      return  this.$route.query.url
+      return  this.src
     }
   },
   watch: {
@@ -88,6 +90,7 @@ export default {
         this.$nextTick((res) => {
           let outFrame = this.$refs.iframe;
           let outFrameWindow = this.$refs.iframe.contentWindow;
+          console.log(outFrame)
           setTimeout((res) => {
             let rightFrame = outFrameWindow.document.querySelector(
               "#mainFrame"
@@ -108,10 +111,6 @@ export default {
                       );
                       this.src = e.path[i].getAttribute("title");
                       this.showVideo = true;
-                      this.$nextTick((res) => {
-                        this.isShow = false;
-                      });
-
                       // this.isShow = false;
                       break;
                     }

src/layout/components/insVideo.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="background:#fff">
+  <div class="videoBox">
     <vue-drag-resize
       :w="videoW"
       :h="videoH"
@@ -8,12 +8,12 @@
       :isActive="true"
       :parentH="docY"
       :preventActiveBehavior="true"
-      class="videoWrap"
       :AspectRatio="true"
       @resizing="onResizingVideo"
       @dragging="onResizing"
       @resizestop="resizeVideostop"
       @dragstop="resizeVideostop"
+      class="videoWrap"
     >
       <!--        -->
       <div class="videowall"></div>
@@ -91,26 +91,30 @@ export default {
   height: 30px;
   background-color: #ccc;
 }
-.showBtnList {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-around;
-  font-size: 20px;
-  position: absolute;
-  right: 5px;
-  top: 0;
-  background-color: #ccc;
-  height: 30px;
-
-  .icon {
-    line-height: 30px;
+.content-container {
+  // position: relative;
+  // z-index: 2000;
+  .showBtnList {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-around;
+    font-size: 20px;
+    position: absolute;
+    right: 5px;
+    top: 0;
+    background-color: #ccc;
+    height: 30px;
+    // z-index: 2000;
+    .icon {
+      line-height: 30px;
+    }
   }
 }
 .videoWrap {
-  z-index: 10000 !important;
+  z-index: 3000 !important;
   background-color: #fff;
-  position: fixed;
+  position: absolute;
 
   border: 1px solid #ccc;
 }

src/layout/components/instructions.vue

@@ -1,13 +1,5 @@
 <template>
-  <div>
-    <!-- <el-button
-      v-if="isShowBtn"
-      class="instructionBtn"
-      @click="showInstructions"
-      type="danger"
-      plain
-      >操作手册</el-button
-    > -->
+  <div class="instructionWrap">
     <!-- :w="w" -->
     <vue-drag-resize
       v-if="isShow"
@@ -57,7 +49,7 @@
       >
       </iframe>
     </vue-drag-resize>
-    <videoView class="videoWrap" v-if="showVideo" :docY="docY" @isResizing="(val)=>{this.isResizing = val}"></videoView>
+    <videoView v-if="showVideo" :docY="docY" @isResizing="(val)=>{this.isResizing = val}" @closeVideo="showVideo = false" :videoSrc="src"></videoView>
   </div>
 </template>
 <script>
@@ -329,19 +321,13 @@ export default {
   width: 100%;
   height: 100%;
   position: absolute;
-  z-index: 1111;
+  z-index: 2000;
   filter: alpha(opacity=0);
   opacity: 0;
   background: transparent;
   /*display: none;*/
 }
-.videoWrap {
-  z-index: 10000 !important;
-  background-color: #fff;
-  position: fixed;
 
-  border: 1px solid #ccc;
-}
 .content-container {
   .showBtnList {
     display: flex;
@@ -354,7 +340,7 @@ export default {
     top: 0;
     background-color: #ccc;
     height: 30px;
-
+    z-index: 2000;
     .icon {
       line-height: 30px;
     }
@@ -386,6 +372,10 @@ export default {
 }
 </style>
 <style lang="scss">
+.instructionWrap{
+  position: absolute;
+  z-index: 2000;
+}
 .instructionBtn {
   position: fixed;
   right: 30px;
@@ -398,7 +388,7 @@ export default {
 #instructions {
   background-color: #fff;
   position: fixed;
-  z-index: 9998;
+  z-index: 9998!important;
   border: 1px solid #ccc;
 }
 .vdr-stick {