问题修改

src/views/system/studentInfo/index.vue

@@ -58,6 +58,7 @@
       <el-form-item label="身份证号" prop="cardNumber">
         <el-input
           v-model="queryParams.cardNumber"
+          maxlength="18"
           placeholder="请输入身份证号"
           clearable
           @keyup.enter.native="handleQuery"
@@ -390,6 +391,7 @@
         <el-form-item label="身份证号" prop="cardNumber">
           <el-input
             style="width: 380px"
+            maxlength="18"
             v-model="form.cardNumber"
             placeholder="请输入身份证号"
           />
@@ -1088,6 +1090,11 @@ export default {
             message: "",
           },
         ],
+        homeAddress:[
+          {
+            required: true, message: "请输入家庭住址", trigger: "blur"
+          }
+        ],
         birthDate: [
           { required: true, message: "请选择日期", trigger: "change" },
         ],
@@ -1280,6 +1287,7 @@ export default {
       this.parentInfoId = "";
       this.classinfoName = "请选择所属班级";
       this.classinfoId = "";
+      this.kindergartenName="请选择所在幼儿园";
       this.open = true;
       this.title = "添加学生信息";
     },
@@ -1295,8 +1303,7 @@ export default {
         this.classinfoName = this.form.className;
         this.classinfoId = this.form.classId;
         console.log(this.form);
-        this.kindergartenName=response.data.kindergartenName
+
-        this.kindergartenid=response.data.kindergartenId
         if (this.form.parentStudentInfoList == null) {
         } else if (this.form.parentStudentInfoList.length == 0) {
         } else if (this.form.parentStudentInfoList.length == 1) {
@@ -1305,6 +1312,7 @@ export default {
           this.parentlist.push(this.form.parentStudentInfoList[0]);
           this.parentlist.push(this.form.parentStudentInfoList[1]);
         }
+
         if (this.parentlist.length == 0) {
           this.parentInfoName = "请选择学生家长";
           this.parentInfoId = "";
@@ -1330,6 +1338,7 @@ export default {
           this.parent1 = this.parentlist[0].id;
           this.parent2 = this.parentlist[1].id;
         }
+
         if (this.tags.length == 0) {
           this.parentInfoName = "请选择学生家长";
           this.parentInfoId = "";
@@ -1339,6 +1348,7 @@ export default {
         console.log(this.tags);
         console.log(this.form);
         console.log(this.parent1, this.parent2);
+
         // if (this.form.parentStudentInfoList.length == 0) {
         //   this.parentInfoName = "请选择学生家长";
         //   this.parentInfoId = "";
@@ -1367,6 +1377,7 @@ export default {
 
         this.form2.nationDictId = this.form.nationDictId;
         this.form2.studentName = this.form.studentName;
+        this.form2.kindergartenId = this.form.kindergartenId;
         this.form2.studentSex = this.form.studentSex;
         this.form2.studentNumber = this.form.studentNumber;
         this.form2.birthDate = this.form.birthDate;
@@ -1379,6 +1390,7 @@ export default {
         // console.log(this.parent1, this.parent2);
         console.log(this.form);
         console.log(this.form2);
+
         this.open = true;
         this.title = "修改学生信息";
       });
@@ -1562,7 +1574,7 @@ export default {
       this.parent2 = "";
       this.classinfoName = "请选择所属班级";
       this.classinfoId = "";
-      this.kindergartenid = "";
+      this.kindergartenName = "";
       this.kindergartenName = "请选择所在幼儿园";
       this.tags = [];
       console.log(this.tags);
@@ -1717,10 +1729,9 @@ export default {
               this.getList();
               this.parent1 = "";
               this.parent2 = "";
-              this.kindergartenName='请选择所在幼儿园'
-              this.kindergartenid=''
               this.parentlist = [];
               this.tags = [];
+          
             });
           }
         }

src/views/system/testItemCityScore/index.vue

@@ -390,7 +390,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="排序" prop="sorting">
+        <!-- <el-form-item label="排序" prop="sorting">
           <el-input
             style="width: 180px"
             v-model="queryParams2.sorting"
@@ -398,7 +398,7 @@
             clearable
             @keyup.enter.native="handleQuery"
           />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
           <el-button
             type="primary"
@@ -459,7 +459,7 @@
         <el-table-column label="项目名称" align="center" prop="itemName" />
         <el-table-column label="项目编号" align="center" prop="itemCode" />
         <el-table-column label="项目内容" align="center" prop="itemContent" />
-        <el-table-column label="项目概述" align="center" prop="remark" />
+        <!-- <el-table-column label="项目概述" align="center" prop="remark" />
         <el-table-column
           label="项目度量单位"
           align="center"
@@ -485,14 +485,14 @@
           align="center"
           prop="unifiedStandardScore"
         />
-        <el-table-column label="排序" align="center" prop="sorting" />
+        <el-table-column label="排序" align="center" prop="sorting" /> -->
       </el-table>
 
       <pagination
-        v-show="total2 > 0"
+        v-show="total > 0"
-        :total="total2"
+        :total="total"
-        :page.sync="queryParams2.pageNum"
+        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams2.pageSize"
+        :limit.sync="queryParams.pageSize"
         @pagination="getList"
       />
     </el-dialog>
@@ -511,7 +511,7 @@ import {
 import { tKindergartenInfo } from "@/api/system/kindergartenInfo";
 import { listItemCategory } from "@/api/system/itemCategory";
 import { listTestItems } from "@/api/system/testItems";
-import { listCityInfo } from "@/api/system/area.js";
+import { listArea } from "@/api/system/area.js";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
@@ -630,7 +630,6 @@ export default {
       itemResultType: "item_result_type",
       // 总条数
       total: 0,
-      total2: 0,
       // 全市平均成绩表格数据
       testItemCityScoreList: [],
       //区域列表
@@ -664,7 +663,6 @@ export default {
         itemName: null,
         itemCode: null,
       },
-      queryParams3: {},
       getItemCityScorelist: {
         areaId: null,
         itemId: null,
@@ -723,10 +721,10 @@ export default {
     getItemCityScore() {
       getItemCityScoreInfo(this.getItemCityScorelist).then((res) => {
         if (res.data) {
-          if (res.data.itemAvgScore == null||res.data.itemAvgScore == '') {
+          if (res.data.itemAvgScore == null) {
             this.form.itemAvgText = res.data.itemAvgText;
             this.form.itemAvgScore = null;
-          } else if (res.data.itemAvgText == null||res.data.itemAvgText == '') {
+          } else if (res.data.itemAvgText == null) {
             this.form.itemAvgScore = res.data.itemAvgScore;
             this.form.itemAvgText = null;
           }
@@ -734,6 +732,7 @@ export default {
           this.form.itemAvgScore = null;
           this.form.itemAvgText = null;
         }
+
         console.log(this.form);
       });
     },
@@ -792,8 +791,7 @@ export default {
     /** 查询全市平均成绩列表 */
     getList() {
       this.loading = true;
-      listCityInfo().then((response) => {
+      listArea(this.queryParams2).then((response) => {
-        console.log(response);
         // this.areaList = response.data.forEach((e) => {
         //   e.code = Number(e.code);
         // });
@@ -809,7 +807,6 @@ export default {
       listTestItems(this.queryParams2).then((response) => {
         this.testItemsList = response.rows;
         this.testItemsList2 = this.handleTree(response.rows);
-        this.total2=response.total
         // console.log(this.testItemsList);
       });
       listItemCategory(this.queryParams2).then((response) => {

src/views/system/testItemCountryScore/index.vue

@@ -362,6 +362,14 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
+        <el-form-item label="测试项目编号" prop="itemCode" label-width="90">
+          <el-input
+            v-model="queryParams2.itemCode"
+            placeholder="请输入测试项目编号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button
             type="primary"
@@ -885,6 +893,7 @@ export default {
       getTestItemCountryScore(id).then((response) => {
         this.form = response.data;
         console.log(this.form);
+
         this.xmname = response.data.itemName;
         this.open2 = true;
         this.title = "修改全国平均成绩";

src/views/system/testScoreBatch/index.vue

@@ -284,19 +284,19 @@
         </el-form-item>
       </el-form>
       <el-table :data="testItemss">
-        <el-table-column label="请选择" width="70" align="center">
+        <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
             <el-button
               type="primary"
-              style="width: 15px; height: 15px"
+              style="width: 20px; height: 20px; padding: 0px"
-              circle
+       
               v-if="items.find((e) => e.itemId == scope.row.id)"
               @click="deltestitem(scope.row)"
             ></el-button>
             <el-button
               v-else
-              style="width: 15px; height: 15px"
+              style="width: 20px; height: 20px; padding: 0px"
-              circle
+            
               @click="addtestitem(scope.row)"
             ></el-button>
           </template>