Ver Fonte

提交一下

1
mo há 4 anos atrás
pai
commit
3c6aaee3dd

+ 15 - 7
src/assets/icon/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2559792 */
-  src: url('iconfont.woff2?t=1621478134964') format('woff2'),
-       url('iconfont.woff?t=1621478134964') format('woff'),
-       url('iconfont.ttf?t=1621478134964') format('truetype');
+  src: url('iconfont.woff2?t=1622171855249') format('woff2'),
+       url('iconfont.woff?t=1622171855249') format('woff'),
+       url('iconfont.ttf?t=1622171855249') format('truetype');
 }
 
 .iconfont {
@@ -13,11 +13,19 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-fullscreen:before {
-  content: "\e623";
+.icon-jia-tianchong:before {
+  content: "\e691";
+}
+
+.icon-jia:before {
+  content: "\e715";
 }
 
-.icon-tubiao-huanyuan:before {
-  content: "\e60c";
+.icon-huanyuan:before {
+  content: "\e7ae";
+}
+
+.icon-fullscreen:before {
+  content: "\e623";
 }
 

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
src/assets/icon/iconfont.js


+ 21 - 7
src/assets/icon/iconfont.json

@@ -6,18 +6,32 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "2570216",
+      "name": "加",
+      "font_class": "jia-tianchong",
+      "unicode": "e691",
+      "unicode_decimal": 59025
+    },
+    {
+      "icon_id": "4266163",
+      "name": "加",
+      "font_class": "jia",
+      "unicode": "e715",
+      "unicode_decimal": 59157
+    },
+    {
+      "icon_id": "5358777",
+      "name": "还原",
+      "font_class": "huanyuan",
+      "unicode": "e7ae",
+      "unicode_decimal": 59310
+    },
+    {
       "icon_id": "9512566",
       "name": "全屏",
       "font_class": "fullscreen",
       "unicode": "e623",
       "unicode_decimal": 58915
-    },
-    {
-      "icon_id": "11700988",
-      "name": "还原",
-      "font_class": "tubiao-huanyuan",
-      "unicode": "e60c",
-      "unicode_decimal": 58892
     }
   ]
 }

BIN
src/assets/icon/iconfont.ttf


BIN
src/assets/icon/iconfont.woff


BIN
src/assets/icon/iconfont.woff2


BIN
src/assets/images/base/base-bell.png


BIN
src/assets/images/base/base-home.png


BIN
src/assets/images/base/instruction-icon.png


+ 9 - 9
src/layout/components/Navbar.vue

@@ -51,11 +51,11 @@
               justify-content: center;
               height: 89px;
             "
-            class="msginfo ins"
+            class="msginfo"
             @click="openIns"
             slot="reference"
           >
-            <img src="@/assets/images/base/instruction-icon.png" />
+            <img src="@/assets/images/base/instruction-icon.png" width="24px" height="24px" />
             <!-- <div class="active"></div> -->
           </div>
         </el-popover>
@@ -77,7 +77,7 @@
           @click="gotoRecode"
           slot="reference"
         >
-          <img src="@/assets/images/base/base-bell.svg" />
+          <img src="@/assets/images/base/base-bell.png" width="24px" height="24px"/>
           <!-- <div class="active"></div> -->
         </div>
       </el-popover>
@@ -100,17 +100,17 @@
           </div>
           <span
             slot="reference"
+            class="msginfo"
             style="
               display: flex;
               align-items: center;
               justify-content: center;
               height: 89px;
-              padding: 0 5px;
             "
           >
             <!-- {{ organName.length > 10 ? organName.substr(0, 10) + "..." : organName }} -->
             <!-- <i class="el-icon-s-home" style="font-size: 23px; color: #1A1A1A;"></i> -->
-            <img src="@/assets/images/base/base-home.svg" style="width: 23px" />
+            <img src="@/assets/images/base/base-home.png" width="24px" height="24px" />
           </span>
         </el-popover>
       </div>
@@ -454,7 +454,7 @@ export default {
   }
   .left-menu {
     line-height: 90px;
-    padding-right: 22px;
+    // padding-right: 22px;
     font-size: 16px;
     color: #fff;
     .topIcon {
@@ -484,12 +484,12 @@ export default {
       flex-direction: row;
       justify-content: flex-start;
       align-items: center;
-      padding: 0 5px;
+     padding-right: 25px;
       position: relative;
       cursor: pointer;
       img {
-        width: 23px;
-        height: 30px;
+        width: 24px;
+        height: 24px;
       }
       .active {
         position: absolute;

+ 76 - 22
src/layout/components/instructions.vue

@@ -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>

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff