zhangjie 1 年之前
父节点
当前提交
298bd0138f

二进制
src/assets/images/admin-logo.png


+ 1 - 1
src/modules/course/components/SetBlueDialog.vue

@@ -227,7 +227,7 @@ export default {
         if (!scoreData[targetId]) scoreData[targetId] = 0;
         scoreData[targetId] += item.score;
       });
-      const totalScore = calcSum(Object.values(scoreData));
+      const totalScore = calcSum(this.dataList.map((item) => item.score));
 
       const targetRates = {};
       this.treeData.forEach((target) => {

+ 6 - 2
src/modules/login/views/Login.vue

@@ -3,8 +3,12 @@
     <div class="login-theme"><h2>知学知考</h2></div>
     <div class="login-body" @keyup.enter="submit('loginForm')">
       <div class="login-title">
-        <img v-if="schoolLogo" :src="schoolLogo" alt="学校logo" />
-        <h1 v-else>知学知考</h1>
+        <template v-if="loginModel.schoolCode === 'admin'">
+          <img src="@/assets/images/admin-logo.png" alt="admin logo" />
+        </template>
+        <template v-else>
+          <img v-if="schoolLogo" :src="schoolLogo" alt="学校logo" />
+        </template>
       </div>
       <div class="login-form">
         <el-form

+ 54 - 0
src/modules/mark/components/ScoreCheckDetail.vue

@@ -91,6 +91,56 @@
           >
           </el-input-number>
         </el-form-item>
+        <el-form-item label="客观题总分">
+          <el-input-number
+            v-model="filter.objectiveStartScore"
+            placeholder="客观题总分"
+            :min="0"
+            :max="9999"
+            :step="0.01"
+            step-strictly
+            :controls="false"
+            clearable
+          >
+          </el-input-number>
+          <span class="mlr-1">-</span>
+          <el-input-number
+            v-model="filter.objectiveEndScore"
+            placeholder="客观题总分"
+            :min="0"
+            :max="9999"
+            :step="0.01"
+            step-strictly
+            :controls="false"
+            clearable
+          >
+          </el-input-number>
+        </el-form-item>
+        <el-form-item label="主观题总分">
+          <el-input-number
+            v-model="filter.subjectiveStartScore"
+            placeholder="主观题总分"
+            :min="0"
+            :max="9999"
+            :step="0.01"
+            step-strictly
+            :controls="false"
+            clearable
+          >
+          </el-input-number>
+          <span class="mlr-1">-</span>
+          <el-input-number
+            v-model="filter.subjectiveEndScore"
+            placeholder="主观题总分"
+            :min="0"
+            :max="9999"
+            :step="0.01"
+            step-strictly
+            :controls="false"
+            clearable
+          >
+          </el-input-number>
+        </el-form-item>
         <el-form-item label="小题得分">
           <el-input-number
             v-model="filter.subScore"
@@ -337,6 +387,10 @@ export default {
         breach: null,
         startScore: undefined,
         endScore: undefined,
+        objectiveStartScore: undefined,
+        objectiveEndScore: undefined,
+        subjectiveStartScore: undefined,
+        subjectiveEndScore: undefined,
         subScore: undefined,
         objectiveScoreRateLt: undefined,
         studentName: "",