Merge remote-tracking branch 'origin/dev' into dev

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;

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>

src/views/system/itemCategory/index.vue

@@ -128,7 +128,12 @@
       <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="分类排序" align="center" prop="sorting" />
-      <el-table-column label="备注信息" align="center" prop="remark" :show-overflow-tooltip="true"/>
+      <el-table-column
+        label="备注信息"
+        align="center"
+        prop="remark"
+        :show-overflow-tooltip="true"
+      />
       <!-- <el-table-column label="修改人" align="center" prop="updateBy" />
       <el-table-column label="修改时间" align="center" prop="updateTime" /> -->
       <el-table-column
@@ -142,6 +147,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            v-if="scope.row.id != 1"
             v-hasPermi="['system:itemCategory:edit']"
             >修改</el-button
           >
@@ -153,25 +159,15 @@
             v-hasPermi="['system:itemCategory:add']"
             >新增</el-button
           >
-          <!--
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:area:remove']"
-            v-if="scope.row.id != 1"
-            >删除</el-button
-          > -->
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:itemCategory:remove']"
+            v-if="scope.row.id != 1"
             >删除</el-button
           >
-          <!-- v-if="scope.row.categoryName != '跳不'" -->
         </template>
       </el-table-column>
     </el-table>
@@ -187,7 +183,11 @@
     <!-- 添加或修改测试项目分类对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-        <el-form-item label="所属上级分类" prop="parentId"  v-if="itemCategoryList.length != 0 && form.parentId != 0">
+        <el-form-item
+          label="所属上级分类"
+          prop="parentId"
+          v-if="itemCategoryList.length != 0 && form.parentId != 0"
+        >
           <treeselect
             :normalizer="normalizer"
             :options="itemCategoryList"
@@ -200,7 +200,11 @@
           <el-input v-model="form.parentId" placeholder="请输入父级id" />
         </el-form-item>  -->
         <el-form-item label="分类名称" prop="categoryName">
-          <el-input v-model="form.categoryName" placeholder="请输入分类名称" maxlength="80" />
+          <el-input
+            v-model="form.categoryName"
+            placeholder="请输入分类名称"
+            maxlength="80"
+          />
         </el-form-item>
         <el-form-item label="分类名称简写" prop="categoryNameAbbreviate">
           <el-input
@@ -219,15 +223,18 @@
             <el-input
               v-model="item.levelName"
               placeholder="得分描述"
+              maxlength="15"
               style="width: 90px; margin-right: 20px"
             />
             <el-input
               v-model.number="item.levelMinScore"
               placeholder="最低分"
+              maxlength="5"
               style="width: 75px; margin-right: 10px"
             /><el-input
               v-model.number="item.levelMaxScore"
               placeholder="最高分"
+              maxlength="5"
               style="width: 75px; margin-right: 9px"
             />
             <el-button
@@ -252,12 +259,17 @@
 
         <el-form-item label="分类排序" prop="sorting">
           <el-input
-            v-model.number="form.sorting"
+            v-model="form.sorting"
             placeholder="请输入分类排序"
+            maxlength="8"
           />
         </el-form-item>
         <el-form-item label="备注信息" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注信息" maxlength="200"/>
+          <el-input
+            v-model="form.remark"
+            placeholder="请输入备注信息"
+            maxlength="200"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -283,6 +295,17 @@ export default {
   name: "ItemCategory",
   components: { Treeselect },
   data() {
+    var roleMoeny = (rule, value, callback) => {
+      var str = this.form.sorting;
+
+      if (Number.isNaN(Number.parseFloat(str))) {
+        callback(new Error("请输入分类排序"));
+      } else if (str.length == 0) {
+        callback(new Error("请输入分类排序")); // 限制最大额度
+      } else {
+        callback();
+      }
+    };
     let testItemLevelList = (rule, value, callback) => {
       let min = value
         .map((e) => {
@@ -297,13 +320,11 @@ export default {
       console.log(min, max);
 
       if (Number(max) < Number(min)) {
-        if(max && min && max < min){
+        if (max && min && max < min) {
           callback(new Error("最高分必须大于最低分,请重新填写！"));
-        }else{
+        } else {
           console.log(min, max);
         }
-
-
       }
       if (
         value.map((e) => {
@@ -374,8 +395,12 @@ export default {
           // { type: "number", message: "区域编码必须为数字值", trigger: "blur" },
         ],
         sorting: [
-          { required: true, message: "排序不能为空", trigger: "blur" },
+          {
-          { type: "number", message: "排序必须为数字值", trigger: "blur" },
+            required: true,
+            validator: roleMoeny,
+            message: "",
+            trigger: "blur",
+          },
         ],
         remark: [
           { required: true, message: "备注信息不能为空", trigger: "blur" },

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

src/views/system/teacherInfo/index.vue

@@ -1011,7 +1011,7 @@ export default {
         this.kindergartenInfoList = response.rows;
         this.total3 = response.total;
       });
-      listTeacherInfo(this.queryParams2).then((response) => {
+      listTeacherInfo(this.queryParams).then((response) => {
         this.teacherInfoList = response.rows;
         this.total = response.total;
         this.loading = false;

src/views/system/testItemCityScore/index.vue

@@ -116,7 +116,12 @@
           {{ scope.row.sex == "FEMALE" ? "女" : "" }}
         </template>
       </el-table-column>
-      <el-table-column label="平均得分" align="center" prop="itemAvgScore" :show-overflow-tooltip="true">
+      <el-table-column
+        label="平均得分"
+        align="center"
+        prop="itemAvgScore"
+        :show-overflow-tooltip="true"
+      >
         <template slot-scope="scope">
           {{ scope.row.dictValue == "number" ? scope.row.itemAvgScore : "" }}
           {{ scope.row.dictValue == "text" ? scope.row.itemAvgText : "" }}
@@ -212,7 +217,11 @@
           :required="true"
           v-if="form.resultDictType == ''"
         >
-          <el-input v-model="value" placeholder="请输入平均得分" />
+          <el-input
+            v-model="value"
+            placeholder="请输入平均得分"
+            maxlength="10"
+          />
         </el-form-item>
 
         <el-form-item
@@ -221,7 +230,11 @@
           key="itemAvgScore"
           prop="itemAvgScore"
         >
-          <el-input v-model="form.itemAvgScore" placeholder="请输入平均得分" />
+          <el-input
+            v-model="form.itemAvgScore"
+            placeholder="请输入平均得分"
+            maxlength="10"
+          />
         </el-form-item>
 
         <el-form-item
@@ -230,7 +243,11 @@
           key="itemAvgText"
           prop="itemAvgText"
         >
-          <el-input v-model="form.itemAvgText" placeholder="请输入平均得分" />
+          <el-input
+            v-model="form.itemAvgText"
+            placeholder="请输入平均得分"
+            maxlength="100"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -302,14 +319,22 @@
           prop="itemAvgScore"
           v-if="form.dictValue == 'number'"
         >
-          <el-input v-model="form.itemAvgScore" placeholder="请输入平均得分" />
+          <el-input
+            v-model="form.itemAvgScore"
+            placeholder="请输入平均得分"
+            maxlength="10"
+          />
         </el-form-item>
         <el-form-item
           label="平均得分"
           prop="itemAvgText"
           v-if="form.dictValue == 'text'"
         >
-          <el-input v-model="form.itemAvgText" placeholder="请输入平均得分" />
+          <el-input
+            v-model="form.itemAvgText"
+            placeholder="请输入平均得分"
+            maxlength="100"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/system/testItemCountryScore/index.vue

@@ -211,6 +211,7 @@
             v-model="form.itemAvgScore"
             style="width: 360px"
             placeholder="请输入平均得分"
+            maxlength="10"
           />
         </el-form-item>
         <el-form-item
@@ -222,6 +223,7 @@
             v-model="form.itemAvgText"
             placeholder="请输入平均得分"
             style="width: 360px"
+            maxlength="100"
           />
         </el-form-item>
       </el-form>
@@ -301,6 +303,7 @@
             v-model="value"
             placeholder="请输入平均得分"
             style="width: 360px"
+            maxlength="10"
           />
         </el-form-item>
 
@@ -313,6 +316,7 @@
             v-model="form2.itemAvgScore"
             placeholder="请输入平均得分"
             style="width: 360px"
+            maxlength="10"
           />
         </el-form-item>
 
@@ -325,6 +329,7 @@
             v-model="form2.itemAvgText"
             placeholder="请输入平均得分"
             style="width: 360px"
+            maxlength="100"
           />
         </el-form-item>
       </el-form>
@@ -879,7 +884,7 @@ export default {
       const id = row.id || this.ids;
       getTestItemCountryScore(id).then((response) => {
         this.form = response.data;
-        console.log(this.form)
+        console.log(this.form);
 
         this.xmname = response.data.itemName;
         this.open2 = true;

src/views/system/testItems/index.vue

@@ -239,6 +239,7 @@
           <el-input
             v-model="form.sorting"
             placeholder="请输入排序"
+            maxlength="10"
             style="width: 300px"
           />
         </el-form-item>
@@ -278,6 +279,7 @@
           <el-input
             v-model="form.minScore"
             type="text"
+            maxlength="10"
             style="width: 300px"
             placeholder="请输入最低得分"
           />
@@ -286,6 +288,7 @@
           <el-input
             v-model="form.maxScore"
             type="text"
+            maxlength="10"
             placeholder="请输入最高得分"
             style="width: 300px"
           />
@@ -314,6 +317,7 @@
         >
           <el-input
             v-model="form.largeStandardScore"
+            maxlength="10"
             type="text"
             placeholder="请输入大班标准最高得分"
             style="width: 300px"
@@ -327,6 +331,7 @@
           <el-input
             v-model="form.middleStandardScore"
             type="text"
+            maxlength="10"
             placeholder="请输入中班标准最高得分"
             style="width: 300px"
           />
@@ -340,6 +345,7 @@
             v-model="form.smallStandardScore"
             type="text"
             style="width: 300px"
+            maxlength="10"
             placeholder="请输入小班标准最高得分"
           />
         </el-form-item>
@@ -352,6 +358,7 @@
             style="width: 300px"
             v-model="form.unifiedStandardScore"
             type="text"
+            maxlength="10"
             placeholder="请输入统一标准最高得分"
           />
         </el-form-item>
@@ -361,6 +368,7 @@
             style="width: 300px"
             v-model="form.levelDescription"
             placeholder="请输入级别描述"
+            maxlength="50"
           />
         </el-form-item>
         <el-form-item label="测试目的" prop="remark">
@@ -380,15 +388,18 @@
             <el-input
               v-model="item.levelName"
               placeholder="级别名"
+              maxlength="10"
               style="width: 75px; margin-right: 10px"
             />
             <el-input
               v-model.number="item.levelMinScore"
               placeholder="最低分"
+              maxlength="10"
               style="width: 75px; margin-right: 5px"
             /><el-input
               v-model.number="item.levelMaxScore"
               placeholder="最高分"
+              maxlength="10"
               style="width: 75px; margin-right: 5px"
             />
 

src/views/system/testScoreBatch/index.vue

@@ -160,7 +160,7 @@
             style="width: 250px"
             v-model="form.batchName"
             placeholder="请输入批次名称"
-            maxlength="40"
+            maxlength="30"
           />
         </el-form-item>
         <el-form-item label="备注信息" prop="remark">
@@ -168,7 +168,7 @@
             v-model="form.remark"
             placeholder="请输入备注信息"
             style="width: 250px"
-            maxlength="200"
+            maxlength="100"
           />
         </el-form-item>