소스 검색

游戏bug修改

周玉佂 3 달 전
부모
커밋
fc3a85033c

+ 12 - 6
src/components/cognitiveTask/cognitiveTaskReport.vue

@@ -9,7 +9,7 @@
         />
         <div class="btn-area flex-row">
           <el-button
-            v-if="flag && flag !== 'PSY_CAPITAL'"
+            v-if="flag !== 'PSY_CAPITAL'"
             type="primary"
             plain
             round
@@ -65,11 +65,17 @@
           >
             <div class="total-score">
               <span>总分:</span>
-              <span class="lang-to fen">{{
-                  allData.totalScore[0].totalScore && allData.totalScore[0].totalScore.indexOf("%") !== -1
-                  ? allData.totalScore[0].totalScore.replace("%", "")
-                  : allData.totalScore[0].totalScore
-              }}</span>
+              <span
+                  v-if="data.userRecordEntity.name === '工作记忆能力测试(空间记忆)'"
+                  class="score"
+              >{{
+                  allData.totalScore[0].totalScore &&
+                  allData.totalScore[0].totalScore.indexOf("%") !== -1
+                      ? allData.totalScore[0].totalScore.replace("%", "")
+                      : allData.totalScore[0].totalScore
+                }}</span
+              >
+              <span v-else class="score">{{ allData.totalScore[0].totalScore }}</span>
               <span>分</span>
             </div>
             <div class="score-des">

+ 1 - 1
src/components/cognitiveTask/scoreInterpretation-item.vue

@@ -5,7 +5,7 @@
     </div>
     <div class="score-interpretation-right">
       <div class="score-interpretation-title">{{ data.name }}</div>
-      <div class="score-interpretation-subtitle">所获得分:{{Math.abs(data.score)}}</div>
+      <div class="score-interpretation-subtitle">所获得分:{{data.score}}</div>
       <div class="score-interpretation-des">
         {{ data.Describe }}
       </div>

+ 1 - 1
src/components/manage/main/UserRecords.vue

@@ -17,7 +17,7 @@
       </el-select>
       &nbsp;&nbsp;
       <el-input
-        placeholder="请输入用户名称或身份证号搜索"
+        placeholder="请输入用户名称或账号"
         v-model="searchKeyLin"
         class="input-with-select"
         style="width: 1.8rem"

+ 76 - 26
src/views/CognitiveAbilityTask/normal_AttentionCheck.vue

@@ -4,14 +4,18 @@
     <div class="content-outline" v-show="!testResultStr">
       <div class="left_part">
         <div id="left_top" class="flex-row">
-          <el-image class="setting" :src="require('@/assets/9551.png')" fit="cover" />
-          <div class="text"> 操作提示:</div>
+          <el-image
+            class="setting"
+            :src="require('@/assets/9551.png')"
+            fit="cover"
+          />
+          <div class="text">操作提示:</div>
         </div>
         <div class="left-desc-80" v-html="subjectInfo.testDescription"></div>
       </div>
       <div
-          class="right_part"
-          :style="{
+        class="right_part"
+        :style="{
           background:
             'url(' + require('./../../assets/page' + taskId + '.png') + ')',
           'background-size': '100% 100%',
@@ -21,16 +25,20 @@
           <span>{{ subjectInfo.name }}</span>
         </div>
         <div
-            style="
+          style="
             position: absolute;
             bottom: 0.156rem;
             left: 50%;
             transform: translateX(-50%);
           "
         >
-          <el-button type="primary" class="start" v-if="buttonShow" @click="startTest()">{{
-              buttonName
-            }}</el-button>
+          <el-button
+            type="primary"
+            class="start"
+            v-if="buttonShow"
+            @click="startTest()"
+            >{{ buttonName }}</el-button
+          >
         </div>
       </div>
     </div>
@@ -69,55 +77,96 @@
         >更多游戏</el-button
       >
     </div> -->
-    <div class="txt-center" v-if="testFlag" :class="{ testMainDiv: !testFlag, activeTask: testFlag }"
-      @click.left="userClick('L')" @click.right="userClick('R')" @contextmenu.prevent="">
-      <div :class="{ aa: testTypeCode !== 1 }" style="width: 50%; margin-left: 10%; margin-top: 24px">
-        <el-progress class="main_progress" :text-inside="true" :format="format" :stroke-width="24"
-          :percentage="(count / 145) * 100"></el-progress>
+    <div
+      class="txt-center"
+      v-if="testFlag"
+      :class="{ testMainDiv: !testFlag, activeTask: testFlag }"
+      @click.left="userClick('L')"
+      @click.right="userClick('R')"
+      @contextmenu.prevent=""
+    >
+      <div
+        :class="{ aa: testTypeCode !== 1 }"
+        style="width: 50%; margin-left: 10%; margin-top: 24px"
+      >
+        <el-progress
+          class="main_progress"
+          :text-inside="true"
+          :format="format"
+          :stroke-width="24"
+          :percentage="(count / 145) * 100"
+        ></el-progress>
       </div>
-      <img @click="screenState()" src="../../assets/small-big.png" alt="" style="
+      <img
+        @click="screenState()"
+        src="../../assets/small-big.png"
+        alt=""
+        style="
           height: 48px;
           width: 48px;
           position: fixed;
           top: 24px;
           right: 22px;
           cursor: pointer;
-        " />
+        "
+      />
 
       <div class="glass">
         <div class="glassPad">
           <p v-show="countDownShow" class="countdownStr">
             {{ countDownStr }}
           </p>
-          <p v-show="!countDownShow" style="
+          <p
+            v-show="!countDownShow"
+            style="
               font-size: 20px;
               text-align: center;
               margin-bottom: 40px;
               height: 50px;
               line-height: 50px;
-            " v-html="pic3_0"></p>
+            "
+            v-html="pic3_0"
+          ></p>
           <!-- <p
           style="font-size: 30px; height: 50px; line-height: 50px"
           v-html="pic3_1"
         >
 
         </p> -->
-          <p v-show="pic3_1 !== '+' && !countDownShow" style="font-size: 30px; height: 50px; line-height: 50px">
+          <p
+            v-show="pic3_1 !== '+' && !countDownShow"
+            style="font-size: 30px; height: 50px; line-height: 50px"
+          >
           </p>
-          <p v-show="pic3_1 == '+' && !countDownShow" style="font-size: 30px; height: 50px; line-height: 50px">
-            <img src="../../assets/congnitiveAblitity/whiteFlag-new.png" alt="" style="width: 71px; height: 71px" />
+          <p
+            v-show="pic3_1 == '+' && !countDownShow"
+            style="font-size: 30px; height: 50px; line-height: 50px"
+          >
+            <img
+              src="../../assets/congnitiveAblitity/whiteFlag-new.png"
+              alt=""
+              style="width: 71px; height: 71px"
+            />
           </p>
 
-          <p v-show="!countDownShow" style="
+          <p
+            v-show="!countDownShow"
+            style="
               font-size: 20px;
               text-align: center;
               margin-top: 40px;
               height: 50px;
               line-height: 50px;
-            " v-html="pic3_2"></p>
+            "
+            v-html="pic3_2"
+          ></p>
         </div>
-        <div class="correctRate" v-show="crIsShow && testTypeCode != 1" style="font-size: 22px; color: blue">
+        <div
+          class="correctRate"
+          v-show="crIsShow && testTypeCode != 1"
+          style="font-size: 22px; color: blue"
+        >
           <p v-show="hasResponse && perIsTrue" style="color: blue">
             正确率:{{ this.correctRate.toFixed(2) }}%,本次正确,反应时间:{{
               this.responseTime
@@ -271,9 +320,9 @@ export default {
     //当时第二阶段时参数为2
     //当是第三阶段时参数为3
     //当是第四阶段时参数为4
-    countdownFunction() { },
+    countdownFunction() {},
     //当测试阶段通过时,需要调用//再调用他自身然后传不同的参数  5
-    startGame() { },
+    startGame() {},
 
     screenState() {
       if (screenfull.isFullscreen) {
@@ -631,7 +680,7 @@ export default {
           this.testState = false;
           //this.picList = [];
           this.correctRate = (this.numTrue / this.numAll).toFixed(2) * 100;
-          //console.log("data:"+this.result.data)
+          console.log("data:"+this.result.data)
           var resData = this.computeData(this.result.data);
           this.result.result = resData;
           this.testResultStr =
@@ -650,6 +699,7 @@ export default {
           //this.result.totalResponseTime = this.totalResponseTime;
           this.result.totalResponseTime = this.result.result.responseTimeAll;
           this.result.testPlanId = this.$route.query.testPlanId || "";
+          console.log(this.result,'提交数据')
           screenfull.exit();
           this.$http.post(
             // http://49.232.26.44:8081/

+ 1 - 1
src/views/Welcome.vue

@@ -79,7 +79,7 @@
                   v-model="userRuleForm.phone"
                   @change="onCardNoChange"
                   readonly
-                  placeholder="请输入身份证号"
+                  placeholder="请输入号"
               />
             </el-form-item>
           </el-col>