From 1365ef5e8ed3cdf23b76e7c7e59725ee39135da4 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Sat, 7 Jan 2023 20:30:30 +0800
Subject: [PATCH] 优化

---
 src/components/charts/pieChart.vue |  2 +-
 src/utils/index.js                 |  8 ++++----
 src/views/analysis/index.vue       | 65 +++++++++++++++++++++++++++++++++++++++++++++++++----------------
 src/views/card/index.vue           |  2 +-
 src/views/dataSync/index.vue       |  9 +++++----
 src/views/device/index.vue         | 34 +++++++++++++++++++++-------------
 src/views/examinationPaper/add.vue |  6 ++++--
 src/views/layout/layout.vue        |  6 ++++--
 src/views/login/index.vue          |  4 ++--
 src/views/setUp/account.vue        | 18 ++++++++++++++----
 src/views/setUp/student.vue        |  2 +-
 src/views/setUp/teacher.vue        |  2 +-
 src/views/test/index.vue           |  1 +
 13 files changed, 108 insertions(+), 51 deletions(-)

diff --git a/src/components/charts/pieChart.vue b/src/components/charts/pieChart.vue
index 180fa97..8fa82e3 100644
--- a/src/components/charts/pieChart.vue
+++ b/src/components/charts/pieChart.vue
@@ -66,7 +66,7 @@ export default {
               formatter(v) {
                 console.log(v)
                 let rate = v.data.rate*100
-                return v.name + rate + "%";
+                return v.name + rate.toFixed(2) + "%";
               },
             },
           },
diff --git a/src/utils/index.js b/src/utils/index.js
index c753202..33a70fa 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -689,7 +689,7 @@ export function formatGradeClass(data) {
         label: item.gradeName,
         children: [
           {
-            value: item.classCode,
+            value: item.id,
             label: item.className,
           },
         ],
@@ -702,7 +702,7 @@ export function formatGradeClass(data) {
         }
       });
       gradeNameArr[gradeIndex].children.push({
-        value: item.classCode,
+        value: item.id,
         label: item.className,
       });
     }
@@ -721,7 +721,7 @@ export function formatGradeNameClass(data) {
         grade: item.grade,
         children: [
           {
-            value: item.classCode,
+            value: item.id,
             label: item.className,
             leaf:true
           },
@@ -735,7 +735,7 @@ export function formatGradeNameClass(data) {
         }
       });
       gradeNameArr[gradeIndex].children.push({
-        value: item.classCode,
+        value: item.id,
         label: item.className,
         leaf:true
       });
diff --git a/src/views/analysis/index.vue b/src/views/analysis/index.vue
index 5590eb2..d734f8c 100644
--- a/src/views/analysis/index.vue
+++ b/src/views/analysis/index.vue
@@ -93,7 +93,7 @@
           style="width: 100%"
           show-summary
         >
-          <el-table-column align="center" label="科目" prop="subjectName">
+          <el-table-column align="center" fixed label="科目" prop="subjectName">
           </el-table-column>
           <el-table-column
             align="center"
@@ -105,22 +105,55 @@
                 : item.gradeName || item.className
             "
           >
-            <template>
+            <template v-if="role == 'ROLE_JITUAN'">
               <el-table-column
-                :prop="'periodCount' + index"
+                :prop="'periodCount' + type == 1 ? item.schoolId : item.grade"
                 label="课时数"
                 align="center"
-              ></el-table-column>
+                ><template slot-scope="scoped">{{
+                  scoped.row[
+                    "periodCount" + type == 1 ? item.schoolId : item.grade
+                  ] || "--"
+                }}</template></el-table-column
+              >
               <el-table-column
-                :prop="'examCount' + index"
+                :prop="'examCount' + type == 1 ? item.schoolId : item.grade"
                 label="测练数"
                 align="center"
-              ></el-table-column>
+                ><template slot-scope="scoped">{{
+                  scoped.row[
+                    "examCount" + type == 1 ? item.schoolId : item.grade
+                  ] || "--"
+                }}</template></el-table-column
+              >
+            </template>
+            <template v-else>
+              <el-table-column
+                :prop="'periodCount' + item.grade || item.classId"
+                label="课时数"
+                align="center"
+                ><template slot-scope="scoped">{{
+                  scoped.row["periodCount" + item.grade || item.classId] || "--"
+                }}</template></el-table-column
+              >
+              <el-table-column
+                :prop="'examCount' + item.grade || item.classId"
+                label="测练数"
+                align="center"
+                ><template slot-scope="scoped">{{
+                  scoped.row["examCount" + item.grade || item.classId] || "--"
+                }}</template></el-table-column
+              >
             </template>
           </el-table-column>
         </el-table>
-        <p class="down" v-if="role != 'ROLE_JITUAN'">
-          <el-button @click="downExc" type="primary" plain round icon="fa fa-cloud-download"
+        <p class="down" v-if="role != 'ROLE_JITUAN' && tableData.length">
+          <el-button
+            @click="downExc"
+            type="primary"
+            plain
+            round
+            icon="fa fa-cloud-download"
             >导出报表</el-button
           >
         </p>
@@ -341,25 +374,25 @@ export default {
               if (this.role == "ROLE_JITUAN") {
                 if (this.type == 1) {
                   if (items.schoolId == ids) {
-                    params["examCount" + index] = items.examCount;
-                    params["periodCount" + index] = items.periodCount;
+                    params["examCount" + items.schoolId] = items.examCount;
+                    params["periodCount" + items.schoolId] = items.periodCount;
                   }
                 } else if (this.type == 2) {
                   if (items.grade == ids) {
-                    params["examCount" + index] = items.examCount;
-                    params["periodCount" + index] = items.periodCount;
+                    params["examCount" + items.grade] = items.examCount;
+                    params["periodCount" + items.grade] = items.periodCount;
                   }
                 }
               } else {
                 if (this.query.gradeName == "全部") {
                   if (items.grade == ids) {
-                    params["examCount" + index] = items.examCount;
-                    params["periodCount" + index] = items.periodCount;
+                    params["examCount" + items.grade] = items.examCount;
+                    params["periodCount" + items.grade] = items.periodCount;
                   }
                 } else if (this.query.gradeName) {
                   if (items.classId == ids) {
-                    params["examCount" + index] = items.examCount;
-                    params["periodCount" + index] = items.periodCount;
+                    params["examCount" + items.classId] = items.examCount;
+                    params["periodCount" + items.classId] = items.periodCount;
                   }
                 }
               }
diff --git a/src/views/card/index.vue b/src/views/card/index.vue
index 16a63ac..0da3cc7 100644
--- a/src/views/card/index.vue
+++ b/src/views/card/index.vue
@@ -128,7 +128,7 @@ export default {
               gradeList.children =
                 item.classList?.map((items) => {
                   return {
-                    value: items.classCode,
+                    value: items.id,
                     label: items.className,
                   };
                 }) || [];
diff --git a/src/views/dataSync/index.vue b/src/views/dataSync/index.vue
index c907002..404eef5 100644
--- a/src/views/dataSync/index.vue
+++ b/src/views/dataSync/index.vue
@@ -91,17 +91,18 @@ export default {
       // }
     },
     upSuccess(res) {
-      if (res && res.code == 0 && res.success) {
+      debugger
+      if (res && res.status == 0 ) {
         this.$message.success("上传成功");
         this.$emit("upSuccess");
       } else {
-        this.$message.error(res.message);
+        this.$message.error(res.info);
       }
     },
     upError(res) {
+      debugger
       if (res && res.status == 0) {
-        this.$message.success("上传成功");
-        this.$emit("upSuccess");
+        this.$message.error("上传失败");
       } else {
         this.$message.error(res.message);
       }
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 26ed3f1..b942702 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div ref="main"  class="page-content">
     <back-box>
       <template slot="title">
         <span>设备管理</span>
@@ -19,7 +19,7 @@
             @click="diaUp = true"
           ></el-button>
         </el-tooltip> -->
-        <el-tooltip effect="dark" content="添加基站" placement="bottom">
+        <!-- <el-tooltip effect="dark" content="添加基站" placement="bottom">
           <el-button
             type="primary"
             icon="el-icon-receiving"
@@ -28,10 +28,10 @@
             circle
             @click="diaAnswerEqu = true"
           ></el-button>
-        </el-tooltip>
+        </el-tooltip> -->
       </template>
     </back-box>
-    <div class="page-content">
+    <div>
       <div class="tab-box">
         <el-radio-group v-model="type">
           <el-radio-button :label="1">基站管理</el-radio-button>
@@ -401,12 +401,12 @@
     </el-dialog>
     <el-dialog title="修改基站" :visible.sync="diaAnswerEqu" width="400">
       <el-form ref="forms" :model="form" :rules="formRules" label-width="140px">
-        <el-form-item label="设备编码：" prop="deviceId">
+        <el-form-item label="设备编码：" prop="sn">
           <el-col :span="16"
             ><el-input
               type="text"
               placeholder="输入设备编码"
-              v-model.trim="form.deviceId"
+              v-model.trim="form.sn"
               maxlength="30"
               size="45"
               show-word-limit
@@ -538,13 +538,14 @@ export default {
       ],
       form: {
         deviceId: "",
+        sn: "",
         frequency: "",
         pairingCode: "",
         classIds: [],
         roomName: "",
       },
       formRules: {
-        deviceId: [
+        sn: [
           { required: true, message: "请输入设备编码", trigger: "blur" },
         ],
         frequency: [{ required: true, message: "请输入频点", trigger: "blur" }],
@@ -621,6 +622,7 @@ export default {
           this.form[key] = obj[key];
         }
       }
+      this.form.deviceId = obj.id
       this.diaAnswerEqu = true;
     },
     linkTo(obj, type) {
@@ -765,6 +767,7 @@ export default {
           console.log(status);
           if (status === 0) {
             this.diaAnswerEqu = false;
+            this.$message.success(info);
             this._QueryData();
           } else {
             this.$message.error(info);
@@ -794,7 +797,7 @@ export default {
                 gradeList.children =
                   item.classList?.map((items) => {
                     return {
-                      value: Number(items.classCode),
+                      value: Number(items.id),
                       label: items.className,
                     };
                   }) || [];
@@ -912,15 +915,15 @@ export default {
                 ? query.regionIds.remove(item[0])
                 : "";
             } else if (item.length == 3) {
+              if (!query.schoolIds.includes(item[1])) {
+                query.schoolIds.push(item[1]);
+              }
               if (!query.gradeNames.includes(item[2])) {
                 query.gradeNames.push(item[2]);
               }
               query.regionIds.includes(item[0])
                 ? query.regionIds.remove(item[0])
                 : "";
-              query.schoolIds.includes(item[1])
-                ? query.schoolIds.remove(item[1])
-                : "";
             } else if (item.length == 4) {
               if (!query.classIds.includes(item[3])) {
                 query.classIds.push(item[3]);
@@ -987,6 +990,9 @@ export default {
             })) ||
           [];
         this.total = data.count;
+        this.$nextTick(function(){
+          this.$refs.main.scrollTop = 0
+        })
       } else {
         this.$message.error(info);
       }
@@ -997,10 +1003,12 @@ export default {
 
 <style lang="scss" scoped>
 .page-content {
-  padding: 20px 20px 0;
+  padding: 0 20px;
+  height: 100%;
+  overflow-y: auto;
 }
 .tab-box {
-  margin-bottom: 12px;
+  padding:20px 0 12px
 }
 .sel {
   width: 100%;
diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index 0078601..c7a6b41 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -303,6 +303,7 @@
         <el-dialog
           title="添加大题"
           :visible.sync="addQuestionVisible"
+          :close-on-click-modal="false"
           width="600px"
         >
           <div class="dia-content">
@@ -363,6 +364,7 @@
                 <el-input-number
                   v-model="questionForm.score"
                   :min="1"
+                  :max="100"
                   :precision="2"
                   :step="1"
                   label="label"
@@ -437,7 +439,7 @@
                     class="number-ipt"
                     size="medium"
                     :min="1"
-                    :max="200"
+                    :max="100"
                     :precision="2"
                     v-model="subQuestions.score"
                     label="单题分值"
@@ -840,7 +842,7 @@ export default {
 
           console.log(this.formAns.answerList.split(",")[subNum - i]);
         } else if (this.formAns.qusType == 4) {
-          correctAnswer = this.formAns.answerList[subNum - i] == "✓" ? 1 : 2;
+          correctAnswer = this.formAns.answerList[subNum - i] == "✓" ? 1 :this.formAns.answerList[subNum - i] == "✗" ? 2:"";
         }
         this.form.questionList[this.formAns.listIndex].subQuestions[
           EndIndex - i
diff --git a/src/views/layout/layout.vue b/src/views/layout/layout.vue
index 4848f49..a7cfd16 100644
--- a/src/views/layout/layout.vue
+++ b/src/views/layout/layout.vue
@@ -6,7 +6,9 @@
         <layoutHeader></layoutHeader>
         <el-main id="elmain">
           <transition name="main" mode="out-in">
-            <router-view></router-view>
+            <keep-alive>
+              <router-view></router-view>
+            </keep-alive>
           </transition>
         </el-main>
         <el-footer height="28px">
@@ -109,7 +111,7 @@ ul.el-menu {
 #elmain {
   background-color: #fff;
   padding: 0;
-  min-height:calc(100% - 78px);
+  min-height: calc(100% - 78px);
 }
 
 .avatar-uploader .el-upload {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 28aae79..e93f95e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -95,8 +95,8 @@ export default {
       loginForm: {
         // username: "15911715665",
         // password: "715665",
-        // username: "18087527793",
-        // password: "Pw527793#",
+        // username: "18314340313",
+        // password: "Pw340313#",
         // username: "18687826606",
         // password: "Pw826606#",
         // username: "18893712576",
diff --git a/src/views/setUp/account.vue b/src/views/setUp/account.vue
index f999ea7..3c09f2f 100644
--- a/src/views/setUp/account.vue
+++ b/src/views/setUp/account.vue
@@ -71,6 +71,8 @@
           "
           v-model="query.loginName"
           class="input-with-select"
+          type="number"
+          oninput="if(value.length > 11) value = value.slice(0,11)"
           @keyup.enter.native="(page = 1), _QueryData(2)"
         >
           <el-button
@@ -82,6 +84,7 @@
         <el-input
           v-if="role != 'ROLE_JITUAN'"
           placeholder="请输入老师姓名"
+          maxlength="30"
           v-model="query.realName"
           class="input-with-select"
           @keyup.enter.native="(page = 1), _QueryData(3)"
@@ -242,7 +245,8 @@
             <el-input
               placeholder="请输入联系电话"
               v-model.trim="formAddCount.phone"
-              maxlength="11"
+              type="number"
+              oninput="if(value.length > 11) value = value.slice(0,11)"
             >
             </el-input>
           </el-col>
@@ -323,7 +327,12 @@
       </div>
     </el-dialog>
     <el-dialog title="导入账号名单" :visible.sync="diaUp" width="600">
-      <up-load id="downTeacher" :url="url"  @upSuccess="upSuccess" fileName="教师名单">
+      <up-load
+        id="downTeacher"
+        :url="url"
+        @upSuccess="upSuccess"
+        fileName="教师名单"
+      >
         <p class="down-txt" slot="down">
           通过Excel名单导入账号名单，点击
           <el-link type="danger" @click="downExcel">模板下载</el-link> 。
@@ -418,8 +427,9 @@ export default {
     this._QueryData(4);
   },
   methods: {
-    upSuccess(){//导入成功
-    this.diaUp = false
+    upSuccess() {
+      //导入成功
+      this.diaUp = false;
       this._QueryData(4);
     },
     async downExcel() {
diff --git a/src/views/setUp/student.vue b/src/views/setUp/student.vue
index ef36ac8..058a8e1 100644
--- a/src/views/setUp/student.vue
+++ b/src/views/setUp/student.vue
@@ -40,7 +40,7 @@
             <li
               class="stu-item"
               v-for="item in classList"
-              :key="item.classCode"
+              :key="item.id"
               :class="query.classId == item.id ? 'active' : ''"
               @click="classDetail(item)"
             >
diff --git a/src/views/setUp/teacher.vue b/src/views/setUp/teacher.vue
index 2070540..798e02f 100644
--- a/src/views/setUp/teacher.vue
+++ b/src/views/setUp/teacher.vue
@@ -737,7 +737,7 @@ export default {
         this.classList =
           data.list.map((item) => {
             return {
-              value: item.classCode,
+              value: item.id,
               label: item.className,
               grade: item.grade,
               children: this.subjectList.map((sub) => {
diff --git a/src/views/test/index.vue b/src/views/test/index.vue
index a504e01..96fe8c1 100644
--- a/src/views/test/index.vue
+++ b/src/views/test/index.vue
@@ -105,6 +105,7 @@
           <el-table-column
             prop="title"
             label="试卷名称"
+            fixed
             align="center"
           ></el-table-column>
           <el-table-column
--
libgit2 0.21.4