Procházet zdrojové kódy

Merge branch 'master' of http://192.168.0.115:3000/shaogen1995/ShouBo into master

shaogen1995 před 3 roky
rodič
revize
89ed62769e

+ 4 - 11
web/src/main.js

@@ -7,18 +7,11 @@ import 'element-ui/lib/theme-chalk/index.css';
 import './assets/css/base.css'
 import './assets/css/base.css'
 Vue.use(ElementUI);
 Vue.use(ElementUI);
 
 
-// 封装一个mixin,用来为所有dom添加一个 accessible 的类
-const addClass = {
-  mounted() {
-    let nodes = document.all;
-    for (let i = 0; i < nodes.length; i++) {
-      let o = nodes[i];
-      o.classList.add('accessible')
-    }
-  }
-}
-Vue.mixin(addClass)
+Vue.mixin({
+})
 
 
+// 不能通过location去判断
+Vue.prototype.$homePageUrl = 'http://192.168.0.81:8081/main'
 
 
 Vue.config.productionTip = false
 Vue.config.productionTip = false
 new Vue({
 new Vue({

+ 2 - 2
web/src/views/About/index.vue

@@ -88,7 +88,7 @@
       />
       />
     </div>
     </div>
     <div class="contact">
     <div class="contact">
-      <p>Official website of Capital Museum: <span>首页(地址待定)</span></p>
+      <p>Official website of Capital Museum: <a :href="$homePageUrl">{{$homePageUrl}}</a></p>
       <p>
       <p>
         Telephone reservation (individual visitors):
         Telephone reservation (individual visitors):
         <span>+86 (10) 63393339</span>
         <span>+86 (10) 63393339</span>
@@ -288,7 +288,7 @@ export default {
     & > p {
     & > p {
       padding: 10px 0;
       padding: 10px 0;
       font-size: 14px;
       font-size: 14px;
-      & > span {
+      & > span, a {
         color: rgb(255, 0, 0);
         color: rgb(255, 0, 0);
       }
       }
     }
     }

+ 3 - 3
web/src/views/Visit/Visit2.vue

@@ -67,9 +67,9 @@
                   text-decoration: none;
                   text-decoration: none;
                 "
                 "
                 ><a
                 ><a
-                  href="/"
+                  :href="$homePageUrl"
                   style="color: rgb(255, 0, 0)"
                   style="color: rgb(255, 0, 0)"
-                  >首页(地址待定)</a
+                  >{{$homePageUrl}}</a
                 ></span
                 ></span
               >
               >
               <span
               <span
@@ -519,7 +519,7 @@
                     font-family: arial, helvetica, sans-serif;
                     font-family: arial, helvetica, sans-serif;
                     color: rgb(255, 0, 0);
                     color: rgb(255, 0, 0);
                   "
                   "
-                  >首页(地址待定)</span
+                  >{{$homePageUrl}}</span
                 >&nbsp; &nbsp; &nbsp; &nbsp;Phone:
                 >&nbsp; &nbsp; &nbsp; &nbsp;Phone:
                 <span
                 <span
                   style="
                   style="

+ 3 - 3
web/src/views/Visit/Visit7.vue

@@ -20,7 +20,7 @@
     </div>
     </div>
     <div class="thank">Thank you for your cooperation.</div>
     <div class="thank">Thank you for your cooperation.</div>
     <div class="bottom">
     <div class="bottom">
-      <p>Official website of Capital Museum <span>首页(地址待定)</span></p>
+      <p>Official website of Capital Museum <a :href="$homePageUrl">{{$homePageUrl}}</a></p>
       <p>Telephone reservation (individual visitors) <span>+86 (10) 63393339</span></p>
       <p>Telephone reservation (individual visitors) <span>+86 (10) 63393339</span></p>
       <p>Telephone reservation (group visitors) <span>+86 (10) 63370458</span></p>
       <p>Telephone reservation (group visitors) <span>+86 (10) 63370458</span></p>
       <p>Inquiry Hotline <span>+86 (10) 63370491</span></p>
       <p>Inquiry Hotline <span>+86 (10) 63370491</span></p>
@@ -127,8 +127,8 @@ activated() {}, //如果页面有keep-alive缓存功能,这个函数会触发
         text-align: center;
         text-align: center;
         font-size: 14px;
         font-size: 14px;
         margin: 20px;
         margin: 20px;
-        &>span{
-      color: rgb(255, 0, 0);
+        &>span, a{
+          color: rgb(255, 0, 0);
         }
         }
       }
       }
     }
     }

+ 9 - 8
web/src/views/accessibility.vue

@@ -348,13 +348,9 @@ import "/src/assets/css/ariaGlobalStyle.less"
 import assetUrls from '/src/assets/images/accessibility/index.js'
 import assetUrls from '/src/assets/images/accessibility/index.js'
 
 
 const speechRateFactors = [
 const speechRateFactors = [
-  0.7,
-  0.8,
-  0.9,
+  0.75,
   1,
   1,
-  1.1,
-  1.2,
-  1.3,
+  1.25,
 ]
 ]
 
 
 const themeList = [
 const themeList = [
@@ -372,13 +368,18 @@ const zoomFactors = [
   1.3,
   1.3,
   1.4,
   1.4,
   1.5,
   1.5,
+  1.6,
+  1.7,
+  1.8,
+  1.9,
+  2,
 ]
 ]
 
 
 const defaultAriaSettings = {
 const defaultAriaSettings = {
   isCompActive: false, //是否显示无障碍功能菜单
   isCompActive: false, //是否显示无障碍功能菜单
   menuMode: 'old', // 'old', 'blind'
   menuMode: 'old', // 'old', 'blind'
   isMuted: false,
   isMuted: false,
-  speechRateLevel: 3,
+  speechRateLevel: 1,
   readMode: 'point', // 'point'指读, 'continue'连读
   readMode: 'point', // 'point'指读, 'continue'连读
   themeIdx: 0,
   themeIdx: 0,
   zoomLevel: 0,
   zoomLevel: 0,
@@ -409,7 +410,7 @@ export default {
         Prop3=19,2
         Prop3=19,2
         [InternetShortcut]
         [InternetShortcut]
         IDList=
         IDList=
-        URL=${location.origin}/main/index.html
+        URL=${this.$homePageUrl}
       `),
       `),
 
 
       audioPlayer: null,
       audioPlayer: null,

+ 2 - 2
web/src/views/bottom/Use.vue

@@ -47,13 +47,13 @@
             <p>
             <p>
               (1) For non-commercial, non-profit and non-advertising uses,
               (1) For non-commercial, non-profit and non-advertising uses,
               author's name and source of the used article or picture,
               author's name and source of the used article or picture,
-              "首都博物馆网站" or "首页(地址待定)", should be attached.
+              "首都博物馆网站" or "{{$homePageUrl}}", should be attached.
             </p>
             </p>
             <p>
             <p>
               (2) For business, profit-making and advertising use, you should
               (2) For business, profit-making and advertising use, you should
               obtain consent of the original author, and attach the name of that
               obtain consent of the original author, and attach the name of that
               author, limits of authority and the source, "首都博物馆网站"or
               author, limits of authority and the source, "首都博物馆网站"or
-              "首页(地址待定)".
+              "{{$homePageUrl}}".
             </p>
             </p>
             <p>
             <p>
               (3) Any modification and cancellation of any articles or pictures
               (3) Any modification and cancellation of any articles or pictures