zhangjie 1 an în urmă
părinte
comite
9e487850ea

+ 9 - 0
src/assets/styles/pages.scss

@@ -50,6 +50,15 @@
     height: 172px;
     flex-grow: 0;
     flex-shrink: 0;
+    text-align: center;
+
+    .el-progress {
+      margin: 16px auto;
+    }
+    .el-progress__text {
+      font-size: 20px !important;
+      color: #262626 !important;
+    }
   }
   .task-infos {
     flex-grow: 2;

+ 1 - 1
src/components/SecSelect.vue

@@ -29,7 +29,7 @@
         v-model.trim="filter.courseCode"
         :filter-data="{ semesterId: filter.semesterId, examId: filter.examId }"
         placeholder="课程(代码)"
-        clearable
+        :clearable="!defaultSelectCourse"
         :default-select="defaultSelectCourse"
         @default-selected="courseDefaultSelect"
         @change="courseChange"

+ 17 - 2
src/modules/client/views/Scan.vue

@@ -29,7 +29,15 @@
             <h3>试卷扫描</h3>
           </div>
           <div class="task-part-body box-justify">
-            <div class="task-chart"></div>
+            <div class="task-chart">
+              <el-progress
+                type="circle"
+                :percentage="percentage"
+                :width="140"
+                :stroke-width="20"
+                color="#165dff"
+              ></el-progress>
+            </div>
             <div class="task-infos">
               <div class="task-info-item">
                 <div class="task-info-title">
@@ -119,13 +127,20 @@ export default {
   },
   computed: {
     unScanStudentCount() {
-      return (this.task.scanCount || 0) - (this.task.scanStudentCount || 0);
+      return (this.task.studentCount || 0) - (this.task.scanStudentCount || 0);
     },
     searchEnable() {
       return (
         this.filter.semesterId && this.filter.examId && this.filter.courseCode
       );
     },
+    percentage() {
+      const studentCount = this.task.studentCount || 0;
+      const scanStudentCount = 8;
+      // const scanStudentCount = this.task.scanStudentCount || 0;
+      if (!studentCount) return 0;
+      return ((scanStudentCount * 100) / studentCount).toFixed(2) * 1;
+    },
   },
   mounted() {
     this.$store.commit("setBreadcrumbs", [{ url: "Scan", name: "扫描" }]);

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

@@ -83,8 +83,8 @@ export default {
       loginModel: {
         schoolCode: "",
         type: "ACCOUNT",
-        loginName: "sm",
-        password: "123456",
+        loginName: "",
+        password: "",
       },
       loginRules: {
         loginName: [