up

hot/src/views/Home.vue

@@ -202,9 +202,9 @@ export default {
       dom.show()
     },
     imgSrc(val) {
-      if (typeof val === "number") return `/data/${this.m}/img/${val}.png`;
+      // if (typeof val === "number") return `/data/${this.m}/img/${val}.png`;
       //线下调试
-      // if (typeof val === "number") return `/erhai/data/${this.m}/img/${val}.png`; //打包
+      if (typeof val === "number") return `/erhai/data/${this.m}/img/${val}.png`; //打包
       else return val;
     },
     // 追加的图片地址过滤

web/public/index.html

@@ -48,7 +48,7 @@
     <script src="<%= VUE_APP_STATIC_DIR %>/js/main_2020_show.js"></script>
     <script src="<%= VUE_APP_STATIC_DIR %>/js/lib/OBJLoader.js"></script>
     <script src="<%= VUE_APP_STATIC_DIR %>/js/CAD/bundle.js"></script>
-    <!-- <script src="<%= VUE_APP_STATIC_DIR %>/js/loadCAD.js"></script> -->
+    <script src="<%= VUE_APP_STATIC_DIR %>/js/loadCAD.js"></script>
 </body>
 
 </html>

web/public/static/css/css/oldVer/main0.css

@@ -30,7 +30,6 @@ iframe{
 
 
 #popup {
-	z-index: 20;
 	text-align: center;
 	padding: 0;
 	position: relative;
@@ -38,7 +37,7 @@ iframe{
 	height: 100%;
 	/* margin: 80px auto; */
 	display: none;
-	z-index: 101;
+	z-index: 1001;
 	background:  rgba(0,0,0,0.6);
 }
 .popup-content{

web/public/static/css/oldVer/main0.css

@@ -30,7 +30,6 @@ iframe{
 
 
 #popup {
-	z-index: 20;
 	text-align: center;
 	padding: 0;
 	position: relative;
@@ -38,7 +37,7 @@ iframe{
 	height: 100%;
 	/* margin: 80px auto; */
 	display: none;
-	z-index: 101;
+	z-index: 1001;
 	background:  rgba(0,0,0,0.6);
 }
 .popup-content{

web/src/views/gui/component/issue.vue

@@ -37,9 +37,7 @@
       <div class="topic" v-if="flag === 'tow'">
         <div class="conBox">
           <p class="topicTxt">
-            {{ topicInd + 1 }}.{{ topic[topicInd].title }}---{{
-              topic[topicInd].correct
-            }}
+            {{ topicInd + 1 }}.{{ topic[topicInd].title }}
           </p>
           <!-- 答对或答错之后的页面颜色变化 -->
           <ul class="topic_con" v-if="caseErr">
@@ -134,7 +132,7 @@
 
 <script>
 //引入题目
-import { questions } from "./data.js";
+import { questions,questionsEn } from "./data.js";
 export default {
   name: "issue",
   components: {},
@@ -210,9 +208,15 @@ export default {
         return Math.random() - 0.5;
       });
       arr.length = 20; //改写长度
-      arr.forEach((v) => {
-        this.topic.push(questions[v]);
-      });
+      if(this.Mylangue){
+        arr.forEach((v) => {
+          this.topic.push(questions[v]);
+        });
+      }else {
+        arr.forEach((v) => {
+          this.topic.push(questionsEn[v]);
+        });
+      }
       // console.log(999, this.topic); //控制台会输出20个不同的数
     },
   },