From e297a300ed3f400e5202a295a4c1b062f7f9e3bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Wed, 31 Aug 2022 16:28:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/area/index.vue              | 26 +++++++++++++++++---
 src/views/system/classconstitution/index.vue | 20 ++++++++++++---
 src/views/system/studentInfo/index.vue       |  1 +
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue
index af6dd98..d3fd36c 100644
--- a/src/views/system/area/index.vue
+++ b/src/views/system/area/index.vue
@@ -156,7 +156,11 @@
           />
         </el-form-item>
         <el-form-item label="排序" prop="sort">
-          <el-input v-model.number="form.sort" placeholder="请输入排序" maxlength="10"/>
+          <el-input
+            v-model.number="form.sort"
+            placeholder="请输入排序"
+            maxlength="10"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -181,6 +185,17 @@ export default {
   components: { Treeselect },
   name: "areas",
   data() {
+    var roleMoeny = (rule, value, callback) => {
+      var str = this.form.code;
+
+      if (Number.isNaN(Number.parseFloat(str))) {
+        callback(new Error("请输入区域编码"));
+      } else if (str.length == 0) {
+        callback(new Error("请输入区域编码")); // 限制最大额度
+      } else {
+        callback();
+      }
+    };
     return {
       // 遮罩层
       loading: true,
@@ -224,8 +239,12 @@ export default {
           { type: "number", message: "排序必须为数字值", trigger: "blur" },
         ],
         code: [
-          { required: true, message: "区域编码不能为空" },
-          { type: "number", message: "区域编码必须为数字值", trigger: "blur" },
+          {
+            required: true,
+            validator: roleMoeny,
+            message: "",
+            trigger: "blur",
+          },
         ],
         parentId: [
           { required: true, message: "请选择所属上级区域", trigger: "blur" },
@@ -329,7 +348,6 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.form.code = Number(this.form.code);
       this.form2.name = this.form.name;
       this.form2.code = this.form.code;
       this.form2.sort = this.form.sort;
diff --git a/src/views/system/classconstitution/index.vue b/src/views/system/classconstitution/index.vue
index 241be04..f88cc3e 100644
--- a/src/views/system/classconstitution/index.vue
+++ b/src/views/system/classconstitution/index.vue
@@ -186,16 +186,28 @@
               </div>
             </div>
           </div>
-          <div>
+          <div style="font-size:15px">
             <div
               style="text-align: center; display: flex; justify-content: center"
               v-for="item in categoryScoreList"
               :key="item.prentId"
             >
-              <div style="width: 120px; line-height: 60px">
+              <div
+                style="
+                  width: 120px;
+                  line-height: 60px;
+                  border: 1px solid #f0f0f0;
+                "
+              >
                 {{ item.className }}
               </div>
-              <div style="width: 120px; line-height: 60px">
+              <div
+                style="
+                  width: 120px;
+                  line-height: 60px;
+                  border: 1px solid #f0f0f0;
+                "
+              >
                 {{ item.totalAvScore }}
               </div>
               <div>
@@ -203,7 +215,7 @@
                   <div
                     v-for="uitem in item.list"
                     :key="uitem.categoryId"
-                    style="width: 120px"
+                    style="width: 120px; border: 0.5px solid #f0f0f0"
                   >
                     {{ uitem }}
                   </div>
diff --git a/src/views/system/studentInfo/index.vue b/src/views/system/studentInfo/index.vue
index c1f79f9..cac5d91 100644
--- a/src/views/system/studentInfo/index.vue
+++ b/src/views/system/studentInfo/index.vue
@@ -149,6 +149,7 @@
       v-loading="loading"
       :data="studentInfoList"
       @selection-change="handleSelectionChange"
+      @cell-dblclick="seepraent"
     >
       <el-table-column type="selection" width="50" align="center" />
       <el-table-column