|  | @@ -20,18 +20,39 @@
 | 
	
		
			
				|  |  |      >
 | 
	
		
			
				|  |  |        <div class="wall"></div>
 | 
	
		
			
				|  |  |        <div class="showBtnList">
 | 
	
		
			
				|  |  | -        <a class="newPageBtn" type="text" @click="gotoIns">新窗口打开</a>
 | 
	
		
			
				|  |  | -        <i
 | 
	
		
			
				|  |  | -          class="icon iconfont icon-fullscreen fullscreen"
 | 
	
		
			
				|  |  | -          @click="fullPageBook"
 | 
	
		
			
				|  |  | -          v-if="!fullscreen"
 | 
	
		
			
				|  |  | -        ></i>
 | 
	
		
			
				|  |  | -        <i
 | 
	
		
			
				|  |  | -          class="icon iconfont icon-tubiao-huanyuan huanyuan"
 | 
	
		
			
				|  |  | -          @click="resetBook"
 | 
	
		
			
				|  |  | -          v-else
 | 
	
		
			
				|  |  | -        ></i>
 | 
	
		
			
				|  |  | -        <i class="icon el-icon-close" @click="showInstructions"></i>
 | 
	
		
			
				|  |  | +        <el-popover placement="bottom" trigger="hover">
 | 
	
		
			
				|  |  | +          <div class="popover-container" style="text-align: center">
 | 
	
		
			
				|  |  | +            新窗口打开
 | 
	
		
			
				|  |  | +          </div>
 | 
	
		
			
				|  |  | +          <i
 | 
	
		
			
				|  |  | +            slot="reference"
 | 
	
		
			
				|  |  | +            class="icon iconfont icon-jia add"
 | 
	
		
			
				|  |  | +            @click="gotoIns"
 | 
	
		
			
				|  |  | +            @mouseenter="enter($event)"
 | 
	
		
			
				|  |  | +            @mouseleave="leave($event)"
 | 
	
		
			
				|  |  | +          ></i>
 | 
	
		
			
				|  |  | +        </el-popover>
 | 
	
		
			
				|  |  | +        <el-popover placement="bottom" trigger="hover" v-if="!fullscreen">
 | 
	
		
			
				|  |  | +          <div class="popover-container" style="text-align: center">最大化</div>
 | 
	
		
			
				|  |  | +          <i
 | 
	
		
			
				|  |  | +            slot="reference"
 | 
	
		
			
				|  |  | +            class="icon iconfont icon-fullscreen fullscreen"
 | 
	
		
			
				|  |  | +            @click="fullPageBook"
 | 
	
		
			
				|  |  | +          ></i>
 | 
	
		
			
				|  |  | +        </el-popover>
 | 
	
		
			
				|  |  | +        <el-popover placement="bottom" trigger="hover" v-else>
 | 
	
		
			
				|  |  | +          <div class="popover-container" style="text-align: center">还原</div>
 | 
	
		
			
				|  |  | +          <i
 | 
	
		
			
				|  |  | +            slot="reference"
 | 
	
		
			
				|  |  | +            class="icon iconfont icon-huanyuan huanyuan"
 | 
	
		
			
				|  |  | +            @click="resetBook"
 | 
	
		
			
				|  |  | +          ></i>
 | 
	
		
			
				|  |  | +        </el-popover>
 | 
	
		
			
				|  |  | +        <el-popover placement="bottom" trigger="hover">
 | 
	
		
			
				|  |  | +          <div class="popover-container" style="text-align: center">关闭</div>
 | 
	
		
			
				|  |  | +          <i slot="reference" class="icon el-icon-close" @click="showInstructions"></i>
 | 
	
		
			
				|  |  | +        </el-popover>
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |          <!--  -->
 | 
	
		
			
				|  |  |          <!-- <i class="iconfont icon-tubiao-huanyuan"></i> -->
 | 
	
		
			
				|  |  |        </div>
 | 
	
	
		
			
				|  | @@ -49,7 +70,17 @@
 | 
	
		
			
				|  |  |        >
 | 
	
		
			
				|  |  |        </iframe>
 | 
	
		
			
				|  |  |      </vue-drag-resize>
 | 
	
		
			
				|  |  | -    <videoView v-if="showVideo" :docY="docY" @isResizing="(val)=>{this.isResizing = val}" @closeVideo="showVideo = false" :videoSrc="src"></videoView>
 | 
	
		
			
				|  |  | +    <videoView
 | 
	
		
			
				|  |  | +      v-if="showVideo"
 | 
	
		
			
				|  |  | +      :docY="docY"
 | 
	
		
			
				|  |  | +      @isResizing="
 | 
	
		
			
				|  |  | +        (val) => {
 | 
	
		
			
				|  |  | +          this.isResizing = val;
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +      "
 | 
	
		
			
				|  |  | +      @closeVideo="showVideo = false"
 | 
	
		
			
				|  |  | +      :videoSrc="src"
 | 
	
		
			
				|  |  | +    ></videoView>
 | 
	
		
			
				|  |  |    </div>
 | 
	
		
			
				|  |  |  </template>
 | 
	
		
			
				|  |  |  <script>
 | 
	
	
		
			
				|  | @@ -88,6 +119,13 @@ export default {
 | 
	
		
			
				|  |  |    },
 | 
	
		
			
				|  |  |    beforeDestroy() {},
 | 
	
		
			
				|  |  |    methods: {
 | 
	
		
			
				|  |  | +    enter($event) {
 | 
	
		
			
				|  |  | +      $event.currentTarget.className =
 | 
	
		
			
				|  |  | +        "icon iconfont icon-jia-tianchong addPuls";
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  | +    leave($event) {
 | 
	
		
			
				|  |  | +      $event.currentTarget.className = "icon iconfont icon-jia add";
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  |      resizeWindow() {
 | 
	
		
			
				|  |  |        if (this.isShow) {
 | 
	
		
			
				|  |  |          this.isShow = false;
 | 
	
	
		
			
				|  | @@ -182,7 +220,7 @@ export default {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |            if (!to.query.tabrouter) {
 | 
	
		
			
				|  |  |              let some = Object.keys(obj)[0];
 | 
	
		
			
				|  |  | -            this.url = `/html/index.html#g=1&p=${obj[some]}`;
 | 
	
		
			
				|  |  | +            this.url = `/html/index.html#g=1&p=${obj[some]}&c=1`;
 | 
	
		
			
				|  |  |              this.str = obj[some];
 | 
	
		
			
				|  |  |            } else {
 | 
	
		
			
				|  |  |              this.str = obj[to.query.tabrouter];
 | 
	
	
		
			
				|  | @@ -203,7 +241,7 @@ export default {
 | 
	
		
			
				|  |  |              // }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |              if (obj[to.query.tabrouter]) {
 | 
	
		
			
				|  |  | -              this.url = `/html/index.html#g=1&p=${this.str}`;
 | 
	
		
			
				|  |  | +              this.url = `/html/index.html#g=1&p=${this.str}&c=1`;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |                // 判断一下  如果是乐团详情  就判断
 | 
	
		
			
				|  |  |              } else {
 | 
	
	
		
			
				|  | @@ -212,9 +250,9 @@ export default {
 | 
	
		
			
				|  |  |            }
 | 
	
		
			
				|  |  |          } else {
 | 
	
		
			
				|  |  |            // 字符串
 | 
	
		
			
				|  |  | -          this.url = `/html/index.html#g=1&p=${instructionList[to.path]}`;
 | 
	
		
			
				|  |  | +          this.url = `/html/index.html#g=1&p=${instructionList[to.path]}&c=1`;
 | 
	
		
			
				|  |  |            this.str = instructionList[to.path];
 | 
	
		
			
				|  |  | -          console.log(this.str,this.url)
 | 
	
		
			
				|  |  | +          console.log(this.str, this.url);
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |        } else {
 | 
	
		
			
				|  |  |          this.isShowBtn = false;
 | 
	
	
		
			
				|  | @@ -225,9 +263,11 @@ export default {
 | 
	
		
			
				|  |  |      showFullPage() {},
 | 
	
		
			
				|  |  |      resetVideo() {},
 | 
	
		
			
				|  |  |      gotoIns() {
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +      let str = this.url.replace('&c=1','')
 | 
	
		
			
				|  |  |        this.$router.push({
 | 
	
		
			
				|  |  |          path: "/instructions/instructions",
 | 
	
		
			
				|  |  | -        query: { url: this.url },
 | 
	
		
			
				|  |  | +        query: { url: str },
 | 
	
		
			
				|  |  |        });
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |    },
 | 
	
	
		
			
				|  | @@ -284,7 +324,6 @@ export default {
 | 
	
		
			
				|  |  |                  let path = (e.composedPath && e.composedPath()) || e.path || [];
 | 
	
		
			
				|  |  |                  if (path.length > 0) {
 | 
	
		
			
				|  |  |                    for (let i in path) {
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |                      if (path[i]?.getAttribute("title")) {
 | 
	
		
			
				|  |  |                        console.log(
 | 
	
		
			
				|  |  |                          "打开视频链接",
 | 
	
	
		
			
				|  | @@ -360,6 +399,17 @@ export default {
 | 
	
		
			
				|  |  |    padding: 0 5px;
 | 
	
		
			
				|  |  |    font-size: 20px;
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  | +.add {
 | 
	
		
			
				|  |  | +  padding: 0 5px;
 | 
	
		
			
				|  |  | +  font-size: 20px;
 | 
	
		
			
				|  |  | +  font-weight: bold;
 | 
	
		
			
				|  |  | +  color: #707070;
 | 
	
		
			
				|  |  | +}
 | 
	
		
			
				|  |  | +.addPuls {
 | 
	
		
			
				|  |  | +  padding: 0 5px;
 | 
	
		
			
				|  |  | +  font-size: 20px;
 | 
	
		
			
				|  |  | +  color: #707070;
 | 
	
		
			
				|  |  | +}
 | 
	
		
			
				|  |  |  .huanyuan {
 | 
	
		
			
				|  |  |    padding: 0 5px;
 | 
	
		
			
				|  |  |    font-size: 22px;
 | 
	
	
		
			
				|  | @@ -389,7 +439,7 @@ export default {
 | 
	
		
			
				|  |  |  #instructions {
 | 
	
		
			
				|  |  |    background-color: #fff;
 | 
	
		
			
				|  |  |    position: fixed;
 | 
	
		
			
				|  |  | -  z-index: 9998!important;
 | 
	
		
			
				|  |  | +  z-index: 9998 !important;
 | 
	
		
			
				|  |  |    border: 1px solid #ccc;
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  .vdr-stick {
 | 
	
	
		
			
				|  | @@ -411,8 +461,12 @@ export default {
 | 
	
		
			
				|  |  |    top: 4px !important;
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  .vdr {
 | 
	
		
			
				|  |  | -  &:before{
 | 
	
		
			
				|  |  | -    outline: 0px dashed #d6d6d6!important
 | 
	
		
			
				|  |  | +  &:before {
 | 
	
		
			
				|  |  | +    outline: 0px dashed #d6d6d6 !important;
 | 
	
		
			
				|  |  |    }
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  | +.icon {
 | 
	
		
			
				|  |  | +  cursor: pointer;
 | 
	
		
			
				|  |  | +    color: #707070;
 | 
	
		
			
				|  |  | +}
 | 
	
		
			
				|  |  |  </style>
 |