分数设置修改,

梁保满
1 parent 50c1482f
Showing 6 changed files with 129 additions and 46 deletions
src/views/basic/ask/components/answerQustion.vue
src/views/basic/device/index.vue
src/views/basic/setUp/archived.vue
src/views/basic/setUp/student.vue
src/views/basic/test/components/scoreSet.vue
vue.config.js
@@ -35,27 +35,31 @@
           label="参与度"
           sortable
           align="center"
-          ><template slot-scope="scoped"
-            >{{ scoped.row.participationRate }}%</template
-          ></el-table-column
+          ><template slot-scope="scoped">{{
+            `${scoped.row.participationRate}${
+              scoped.row.participationRate ? "%" : ""
+            }`
+          }}</template></el-table-column
         >
         <el-table-column
           prop="correctRate"
           label="正确率"
           sortable
           align="center"
-          ><template slot-scope="scoped"
-            >{{ scoped.row.correctRate }}%</template
-          ></el-table-column
+          ><template slot-scope="scoped">{{
+            `${scoped.row.correctRate}${scoped.row.correctRate ? "%" : ""}`
+          }}</template></el-table-column
         >
         <el-table-column
           prop="answerCorrectRate"
           label="已答正确率"
           sortable
           align="center"
-          ><template slot-scope="scoped"
-            >{{ scoped.row.answerCorrectRate }}%</template
-          ></el-table-column
+          ><template slot-scope="scoped">{{
+            `${scoped.row.answerCorrectRate}${
+              scoped.row.answerCorrectRate ? "%" : ""
+            }`
+          }}</template></el-table-column
         >
         <el-table-column
           v-for="(item, index) in optionsList"
@@ -84,9 +88,11 @@
           prop="participationRate"
           label="总参与度"
           align="center"
-          ><template slot-scope="scoped"
-            >{{ scoped.row.participationRate }}%</template
-          ></el-table-column
+          ><template slot-scope="scoped">{{
+            `${scoped.row.participationRate}${
+              scoped.row.participationRate ? "%" : ""
+            }`
+          }}</template></el-table-column
         >
         <el-table-column
@@ -95,9 +101,9 @@
           align="center"
         ></el-table-column>
         <el-table-column prop="correctRate" label="总正确率" align="center"
-          ><template slot-scope="scoped"
-            >{{ scoped.row.correctRate }}%</template
-          ></el-table-column
+          ><template slot-scope="scoped">{{
+            `${scoped.row.correctRate}${scoped.row.correctRate ? "%" : ""}`
+          }}</template></el-table-column
         >
         <el-table-column
           prop="correctRateRank"
@@ -109,9 +115,11 @@
           prop="answerCorrectRate"
           label="已答正确率"
           align="center"
-          ><template slot-scope="scoped"
-            >{{ scoped.row.answerCorrectRate }}%</template
-          ></el-table-column
+          ><template slot-scope="scoped">{{
+            `${scoped.row.answerCorrectRate}${
+              scoped.row.answerCorrectRate ? "%" : ""
+            }`
+          }}</template></el-table-column
         >
         <el-table-column label="查看折线图" align="center">
           <template slot-scope="scoped">
@@ -149,16 +157,27 @@
             :label="index == 0 ? '总参与度' : '参与度'"
             :prop="'participationRate' + item"
             ><template slot-scope="scoped"
-              >{{ scoped.row["participationRate" + item] }}%</template
-            >
+              >{{
+                `${
+                  scoped.row["participationRate" + item]
+                    ? scoped.row["participationRate" + item] + "%"
+                    : ""
+                }
+              `
+              }}{{
+            }}</template>
           </el-table-column>
           <el-table-column
             align="center"
             :label="index == 0 ? '总正确率' : '正确率'"
             :prop="'correctRate' + item"
-            ><template slot-scope="scoped"
-              >{{ scoped.row["correctRate" + item] }}%</template
-            >
+            ><template slot-scope="scoped">{{
+              `${
+                scoped.row["correctRate" + item]
+                  ? scoped.row["correctRate" + item] + "%"
+                  : ""
+              }`
+            }}</template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="查看雷达图" align="center">
@@ -188,7 +207,12 @@
           :xAxis="xAxis"
           :tooltipFormatter="true"
         />
-        <RadarChart v-if="types == 3" id="askRadarChart" :params="chartData" :tooltipFormatter="true"/>
+        <RadarChart
+          v-if="types == 3"
+          id="askRadarChart"
+          :params="chartData"
+          :tooltipFormatter="true"
+        />
       </div>
     </el-dialog>
   </div>
@@ -654,7 +654,7 @@
         </div>
       </div>
       <div class="dialog-footer" slot="footer">
-        <el-button @click="diaUp = false">取 消</el-button>
+        <el-button @click="diaLog = false">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -25,12 +25,12 @@
             <span class="s-txt">确定班级：</span>
             <i class="el-icon-loading" v-show="loadingClass"></i>
             <div class="check-box" v-if="classList.length && !loadingClass">
-              <p class="all-check">
+              <!-- <p class="all-check">
                 <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
                   @change="handleCheckAllChange">全选</el-checkbox>
-              </p>
+              </p> -->
               <el-checkbox-group v-model="classIds" @change="handleCheckedChange">
-                <el-checkbox v-for="item in classList" :key="item.id" :label="item.id">{{
+                <el-checkbox disabled v-for="item in classList" :key="item.id" :label="item.id">{{
                   item.className
                 }}</el-checkbox>
               </el-checkbox-group>
@@ -604,10 +604,14 @@ export default {
       }
     },
     async removeStu(obj, index, $event) {
+      let query = {};
+      if (obj.classList.length) {
+        query.classId = obj.classList[0].id;
+      }
       const { data, status, info } = await this.$request.delStudent({
         type: this.query.classType,
         studentId: obj.id,
-        classId: this.query.classId,
+        ...query,
       });
       if (status === 0) {
         this.$message.success("删除成功");
@@ -43,26 +43,32 @@
         <el-table-column prop="score" label="总得分" align="center" fixed
           ><template slot-scope="scoped">
             <el-input
+              v-if="isSetScore"
               type="number"
               :min="0"
               v-model="scoped.row.all"
-            ></el-input> </template
-        ></el-table-column>
+            ></el-input>
+            <template v-else>{{ scoped.row.all }}</template>
+          </template></el-table-column
+        >
         <el-table-column prop="objectiveScore" label="客观题分" align="center"
           ><template slot-scope="scoped">
-            <el-input
+            <!-- <el-input
               type="number"
               :min="0"
               v-model="scoped.row.object"
-            ></el-input> </template
-        ></el-table-column>
+            ></el-input> -->
+            {{ scoped.row.object }}
+          </template></el-table-column
+        >
         <el-table-column prop="subjectiveScore" label="主观题分" align="center">
           <template slot-scope="scoped">
-            <el-input
+            <!-- <el-input
               type="number"
               :min="0"
               v-model="scoped.row.subject"
-            ></el-input>
+            ></el-input> -->
+            {{ scoped.row.subject }}
           </template>
         </el-table-column>
         <!-- <el-table-column v-for="(item, index) in questionList" :key="index" :label="'第' + cNum[index] + '大题'" -->
@@ -82,7 +88,8 @@
                   $event,
                   question.questionScore,
                   scoped.row.scoreMap,
-                  question.questionId
+                  question.questionId,
+                  scoped.row
                 )
               "
               v-model="scoped.row.scoreMap[question.questionId]"
@@ -145,22 +152,73 @@ export default {
       questionList: [],
       cNum: cNum,
       tableMaxHeight: 300,
+      isSetScore: true,
     };
   },
   watch: {
     diaScoreSet: {
       handler: function (nVal) {
         if (nVal) {
+          this.isSetScore = true;
           this._QueryData();
         }
       },
     },
   },
   methods: {
-    setScore(val, max, obj, questionId) {
+    setScore(val, max, obj, questionId, rowData) {
       if (max && Number(val) > Number(max)) {
         obj[questionId] = max;
       }
+      if (!this.isSetScore) {
+        let { score, object, subject } = this.getScore(rowData);
+        rowData.all = score;
+        rowData.object = object;
+        rowData.subject = subject;
+      }
+    },
+    //计算总分
+    setAllScore(obj) {
+      let { score } = this.getScore(obj);
+      return score;
+    },
+    //计算客观总分
+    setObjectScore(obj) {
+      let { object } = this.getScore(obj);
+      return object;
+    },
+    //计算主观总分
+    setSubjectScore(obj) {
+      let { subject } = this.getScore(obj);
+      return subject;
+    },
+    getScore(obj) {
+      let score = 0;
+      let subject = 0;
+      let object = 0;
+      this.questionList.map((question) => {
+        let keys = question.questionId;
+        if (!obj.scoreMap[keys]) {
+          if (obj.scoreMap[keys] == 0) {
+            obj.scoreMap[keys] = 0;
+          } else {
+            obj.scoreMap[keys] = "";
+          }
+        } else {
+          let num = Number(obj.scoreMap[keys]);
+          obj.scoreMap[keys] = num;
+          if (num > 0) {
+            this.isSetScore = false;
+          }
+          score += num;
+          if (question.questionType == 5) {
+            subject += num;
+          } else {
+            object += num;
+          }
+        }
+      });
+      return { score, subject, object };
     },
     closeScoreSet() {
       this.$emit("closeScoreSet");
@@ -205,12 +263,9 @@ export default {
               } else {
                 let num = Number(item.scoreMap[keys]);
                 item.scoreMap[keys] = num;
-                // item.score += num
-                // if (question.questionType == 5) {
-                //   item.subjectiveScore += num
-                // } else {
-                //   item.objectiveScore += num
-                // }
+                if (num > 0) {
+                  this.isSetScore = false;
+                }
               }
             });
@@ -23,8 +23,8 @@ module.exports = {
     proxy: {
       "/": {
         // target:"http://ezquiz.sunvotecloud.cn",
-        // target:"http://121.40.127.171",
-        target:"http://192.168.3.221:8080",
+        // target:"http://192.168.3.221:8080",
+        target:"http://121.40.127.171",
         changeOrigin: true,
         ws:true,
       },