Ver código fonte

fix:整合无障碍导致的bug

任一存 3 anos atrás
pai
commit
208b14e53e
3 arquivos alterados com 81 adições e 78 exclusões
  1. 1 0
      web/src/help.js
  2. 6 6
      web/src/views/accessibility.vue
  3. 74 72
      web/src/views/layout/index.vue

+ 1 - 0
web/src/help.js

@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import Help from './Help.vue'
+import './assets/css/base.css'
 
 Vue.config.productionTip = false
 

+ 6 - 6
web/src/views/accessibility.vue

@@ -175,7 +175,7 @@
         <a
           ref="shortcutBtnRef"
           href="."
-          download="首都博物馆.html"
+          download="首都博物馆"
         >
           <img
             :src="assetUrls.shotcut"
@@ -366,13 +366,12 @@ const themeList = [
 ]
 
 const zoomFactors = [
-  0.7,
-  0.8,
-  0.9,
   1,
   1.1,
   1.2,
   1.3,
+  1.4,
+  1.5,
 ]
 
 const defaultAriaSettings = {
@@ -382,7 +381,7 @@ const defaultAriaSettings = {
   speechRateLevel: 3,
   readMode: 'point', // 'point'指读, 'continue'连读
   themeIdx: 0,
-  zoomLevel: 3,
+  zoomLevel: 0,
   isBigCursor: false,
   isCursorCrosshair: false,
   isMagnifying: false,
@@ -837,6 +836,7 @@ li {
 button {
   border: none;
   background: transparent;
+  padding: 0;
   &:focus {
     outline: 3px solid red;
   }
@@ -859,7 +859,7 @@ a {
   position: fixed;
   top: 0;
   width: 100%;
-  z-index: 1;
+  z-index: 999;
   .crosshair-h {
     position: fixed;
     width: 100%;

+ 74 - 72
web/src/views/layout/index.vue

@@ -1,84 +1,86 @@
 <template>
   <div class="Layout">
     <Accessibility ref="accessibility" @hide="onAccessibilityMenuHide"/>
-    <!-- 公共头部 -->
-    <div class="topNav">
-      <div class="mainbav_wrap">
-        <h1 class="logo">
-          <img src="@/assets/images/logo.png" alt="" />
-        </h1>
-        <ul class="mainbav">
-          <li
-            @click="skipOne(item.url)"
-            :class="{ active: $route.meta.myName === item.name }"
-            v-for="item in topData"
-            :key="item.id"
+    <div class="aria-control-target">
+      <!-- 公共头部 -->
+      <div class="topNav">
+        <div class="mainbav_wrap">
+          <h1 class="logo">
+            <img src="@/assets/images/logo.png" alt="" />
+          </h1>
+          <ul class="mainbav">
+            <li
+              @click="skipOne(item.url)"
+              :class="{ active: $route.meta.myName === item.name }"
+              v-for="item in topData"
+              :key="item.id"
+            >
+              <span>{{ item.name }}</span>
+              <ul class="mainbav_sub">
+                <li
+                  :class="{ active2: menaInd === val.url }"
+                  v-for="(val, index) in item.children"
+                  :key="index"
+                  @click.stop="skipTow(val.url, item.about)"
+                >
+                  {{ val.name }}
+                </li>
+              </ul>
+            </li>
+            <!-- 中文网 -->
+            <li class="language">
+              <a href="http://www.capitalmuseum.org.cn/" target="_blank">中文</a>
+            </li>
+            <!-- 爱心模式 -->
+            <li class="love">
+              <span>Caring Mode</span>&nbsp;
+              <el-switch v-model="loveFlag" active-color="#AB3434"> </el-switch>
+            </li>
+          </ul>
+        </div>
+        <!-- 右侧的输入框 -->
+        <div class="search" @keyup.enter="search" v-if="!menaInd.includes('Search')">
+          <el-input
+            placeholder="search..."
+            suffix-icon="el-icon-search"
+            v-model="searchTxt"
           >
-            <span>{{ item.name }}</span>
-            <ul class="mainbav_sub">
-              <li
-                :class="{ active2: menaInd === val.url }"
-                v-for="(val, index) in item.children"
-                :key="index"
-                @click.stop="skipTow(val.url, item.about)"
-              >
-                {{ val.name }}
-              </li>
-            </ul>
-          </li>
-          <!-- 中文网 -->
-          <li class="language">
-            <a href="http://www.capitalmuseum.org.cn/" target="_blank">中文</a>
+          </el-input>
+          <div class="btnn" @click="search"></div>
+        </div>
+      </div>
+      <!-- 固定的二维码和游戏 -->
+      <div class="rightNav">
+        <ul class="rightIco">
+          <li title="game">
+            <img src="@/assets/images/game.png" alt="" />
           </li>
-          <!-- 爱心模式 -->
-          <li class="love">
-            <span>Caring Mode</span>&nbsp;
-            <el-switch v-model="loveFlag" active-color="#AB3434"> </el-switch>
+          <li>
+            <img src="@/assets/images/code.png" alt="" />
+            <div>
+              <img src="@/assets/images/index_ewm1.png" alt="" />
+              <img src="@/assets/images/index_ewm.jpg" alt="" />
+            </div>
           </li>
         </ul>
       </div>
-      <!-- 右侧的输入框 -->
-      <div class="search" @keyup.enter="search" v-if="!menaInd.includes('Search')">
-        <el-input
-          placeholder="search..."
-          suffix-icon="el-icon-search"
-          v-model="searchTxt"
-        >
-        </el-input>
-        <div class="btnn" @click="search"></div>
-      </div>
-    </div>
-    <!-- 固定的二维码和游戏 -->
-    <div class="rightNav">
-      <ul class="rightIco">
-        <li title="game">
-          <img src="@/assets/images/game.png" alt="" />
-        </li>
-        <li>
-          <img src="@/assets/images/code.png" alt="" />
-          <div>
-            <img src="@/assets/images/index_ewm1.png" alt="" />
-            <img src="@/assets/images/index_ewm.jpg" alt="" />
-          </div>
-        </li>
-      </ul>
-    </div>
-    <!-- 嵌套路由 -->
-    <Router-view />
-    <!-- 底部固定栏 -->
-    <div class="footer">
-      <div>
-        <span
-          @click="footTo(item.path)"
-          v-for="item in footerData"
-          :key="item.name"
-          v-html="item.name"
-        ></span>
+      <!-- 嵌套路由 -->
+      <Router-view />
+      <!-- 底部固定栏 -->
+      <div class="footer">
+        <div>
+          <span
+            @click="footTo(item.path)"
+            v-for="item in footerData"
+            :key="item.name"
+            v-html="item.name"
+          ></span>
+        </div>
+        <p>
+          Capital Museum. China 16 Fuxingmenwai Street, Xicheng District, Beijing
+          100045, P.R.China.
+        </p>
       </div>
-      <p>
-        Capital Museum. China 16 Fuxingmenwai Street, Xicheng District, Beijing
-        100045, P.R.China.
-      </p>
     </div>
   </div>
 </template>