Browse Source

修改测试

plg 6 months ago
parent
commit
5adf04e811
3 changed files with 35 additions and 20 deletions
  1. 2 2
      src/utils/http.ts
  2. 13 1
      src/views/TestRecord.vue
  3. 20 17
      src/views/shapeIntuition_random.vue

+ 2 - 2
src/utils/http.ts

@@ -18,8 +18,8 @@ const menuStatus = menuStatusStore()
 //创建axios实例
 
 //创建基础访问路径
-const base_url = 'http://10.113.248.4:8089/'
-// const base_url = 'http://43.143.198.30:8089/'
+// const base_url = 'http://10.113.248.4:8089/'
+const base_url = 'http://43.143.198.30:8089/'
 
 //设置axios 默认访问路径
 axios.defaults.baseURL = base_url

+ 13 - 1
src/views/TestRecord.vue

@@ -7,7 +7,7 @@ import { menuStatusStore, userInfoStore } from '@/stores'
 // import router from '@/router';
 import { useRouter } from 'vue-router';
 import { getDataApi } from '@/api/plan';
-import { userPlanDetailApi } from '@/api/home';
+import { userPlanApi, userPlanDetailApi } from '@/api/home';
 const router = useRouter()
 const menuStatus = menuStatusStore();
 menuStatus.saveActiveIndex('5')
@@ -121,11 +121,23 @@ const initData = async () => {
 //如果等于的话--显示nomore
 //如果总条数大于 当前页面的总条数就显示loading
 
+const planNumGet = async () => {
+    if (userInfo.token) {
+        let userNo = ''
+        //登录的话
+        //判断当前是否有后台管理
 
+        userNo = userInfo.userInfo.userNo;
+        //调用根据用户查询计划的API
+        let res: any = await userPlanApi(userNo)
+        userInfo.savePlanCurrentNum(res.data.length)
+    }
+}
 //刚进入页面就将高度设置为页面需要的
 onMounted(() => {
     initData()
     //进到界面开始轮询
+    planNumGet()
 })
 //界面销毁函数
 

+ 20 - 17
src/views/shapeIntuition_random.vue

@@ -13,7 +13,7 @@
         </div> -->
         <el-progress class="main_progress" color="linear-gradient(to right, #ffd650, #ff8431)" :stroke-width="48"
           :text-inside="true" :format="format" :percentage="(imgIndex * 100) / 120" v-if="testTypeCode == 1"
-          style="width:50%"></el-progress>
+          style="width:50%;margin-top:10px"></el-progress>
       </div>
       <div class="glass">
         <p v-show="countDownShow" class="countdownStr">
@@ -32,12 +32,14 @@
 </template>
 <script>
 // import cognitiveAbilityTaskList from "@/assets/data/cognitiveAbilityData.js";
-import { preloader, requireImg } from "@/utils/utils";
+// import { preloader, requireImg } from "@/utils/utils";
+import { preloader } from "@/utils/utils";
 // import { preloader } from "@/utils/utils";
 // import screenfull from "screenfull";
 import { userInfoStore } from '@/stores';
 import { saveEggRecordApi } from '@/api/record'
 import { format as myFormat } from 'date-fns';
+import { userPlanDetailApi } from '@/api/home';
 const userInfo = userInfoStore()
 
 export default {
@@ -78,13 +80,14 @@ export default {
       startMilliSeconds: 0, //反应时
       userResponseRecords: [], //用户测试反应记录
       saveFalg: true,
-      requireImg: requireImg,
+      // requireImg: requireImg,
       planId: '',
       planName: '',
       flag: '',
       flagName: '',
       formalTest: '',
-      beginTime: ''
+      beginTime: '',
+      userPlanDetailApi: userPlanDetailApi
     };
   },
   // 页面初始化函数
@@ -112,6 +115,9 @@ export default {
     clearTimeout(this.timeTwo);
   },
   methods: {
+    requireImg(name) {
+      return new URL(`../assets/cognize/shapeIntuition/${name}.jpg`, import.meta.url).href
+    },
     init(val) {
       this.startTest(val);
     },
@@ -270,9 +276,10 @@ export default {
 
           //根据planId查询计划列表
           let params = {
-            planId: planList.value[i].id,
+            planId: this.planId,
             userNo: userInfo.userInfo.userNo
           }
+
           let temp = await userPlanDetailApi(params)
           let listT = temp.data;
           let listP = []
@@ -310,19 +317,17 @@ export default {
           for (let i = 0; i < imgIndexList.length; i++) {
             imgObj = {};
             if (i % 2 == 0) {
-              imgObj.imgUrl = requireImg("../assets/cognize/shapeIntuition/R_ELP_test_jitter" +
+              imgObj.imgUrl = this.requireImg("R_ELP_test_jitter" +
                 this.difficultList[j] +
                 "_s" +
-                imgIndexList[i] +
-                ".jpg");
+                imgIndexList[i]);
               imgObj.imgDirection = "R";
               imgObj.userClickDirection = "";
             } else {
-              imgObj.imgUrl = requireImg("../assets/cognize/shapeIntuition/ELP_test_jitter" +
+              imgObj.imgUrl = this.requireImg("ELP_test_jitter" +
                 this.difficultList[j] +
                 "_s" +
-                imgIndexList[i] +
-                ".jpg");
+                imgIndexList[i]);
               imgObj.imgDirection = "L";
               imgObj.userClickDirection = "";
             }
@@ -336,21 +341,19 @@ export default {
           var tempList = [];
           for (let i = 1; i < 11; i++) {
             imgObj = {};
-            imgObj.imgUrl = requireImg("../assets/cognize/shapeIntuition/R_ELP_test_jitter" +
+            imgObj.imgUrl = this.requireImg("R_ELP_test_jitter" +
               this.difficultList[j] +
               "_s" +
-              i +
-              ".jpg");
+              i);
             imgObj.imgDirection = "R";
             imgObj.userClickDirection = "";
             imgObj.diff = this.difficultList[j];
             tempList.push(imgObj);
             imgObj = {};
-            imgObj.imgUrl = requireImg("../assets/cognize/shapeIntuition/ELP_test_jitter" +
+            imgObj.imgUrl = this.requireImg("ELP_test_jitter" +
               this.difficultList[j] +
               "_s" +
-              i +
-              ".jpg");
+              i);
             imgObj.imgDirection = "L";
             imgObj.userClickDirection = "";
             imgObj.diff = this.difficultList[j];