From cc5d7bef99d0972fa6fab5e8a44686ad98563675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Thu, 15 Sep 2022 18:30:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/area.js                        |   7 +
 src/views/assembly/kindergarten.vue           |  12 +-
 src/views/assembly/student.vue                | 170 +++++++-
 src/views/system/action/index.vue             | 133 +++---
 src/views/system/classconstitution/index.vue  |  36 +-
 src/views/system/physique/index.vue           |  45 +-
 src/views/system/quality/index.vue            |  42 +-
 src/views/system/studentInfo/index.vue        |   9 +-
 src/views/system/testItemCityScore/index.vue  |  21 +-
 .../system/testItemCountryScore/index.vue     |   1 -
 src/views/system/testItemScore/index.vue      | 388 +++++++++++++++---
 src/views/system/testItems/index.vue          | 140 ++++---
 12 files changed, 733 insertions(+), 271 deletions(-)

diff --git a/src/api/system/area.js b/src/api/system/area.js
index f18bb18..050004f 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -9,6 +9,13 @@ export function listArea(query) {
     })
 }
 
+export function listCityInfo() {
+    return request({
+        url: '/system/area/listCityInfo',
+        method: 'get'
+    })
+}
+
 // 查询区域管理详细
 export function getArea(id) {
     return request({
diff --git a/src/views/assembly/kindergarten.vue b/src/views/assembly/kindergarten.vue
index e23d11f..d86038f 100644
--- a/src/views/assembly/kindergarten.vue
+++ b/src/views/assembly/kindergarten.vue
@@ -26,14 +26,14 @@
         <el-button
           @click="batchCodeshowclick"
           style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
-          v-if="batchCode == '请选择批次'"
-          >{{ batchCode }}</el-button
+          v-if="batchName == '请选择批次'"
+          >{{ batchName }}</el-button
         >
         <el-button
           @click="batchCodeshowclick"
           style="width: 250px; text-align: left; height: 32px"
           v-else
-          >{{ batchCode }}</el-button
+          >{{ batchName }}</el-button
         >
       </el-form-item>
     </el-form>
@@ -205,7 +205,8 @@ export default {
       //幼儿园ID
       kindergartenId: "",
       //批次名称
-      batchCode: "请选择批次",
+      batchCode: "",
+      batchName:'请选择批次',
       //批次list
       testScorelist: [],
       //批次编号
@@ -223,6 +224,7 @@ export default {
   methods: {
     onshow() {
       this.batchCode = localStorage.getItem("batchCode2");
+      this.batchName = localStorage.getItem("batchName2");
       this.kindergartenId = localStorage.getItem("kindergartenId");
       if (localStorage.getItem("kindergartenName") == null) {
         this.kindergartenName = "请选择幼儿园";
@@ -251,8 +253,10 @@ export default {
     //点击批次左边
     batchCodeclick(row) {
       this.batchCode = row.batchCode;
+      this.batchName = row.batchName;
       this.batchCodeshow = false;
       localStorage.setItem("batchCode2", this.batchCode);
+      localStorage.setItem("batchName2", this.batchName);
       if (this.kindergartenId != "") {
         this.$emit("kinbatlist", this.kindergartenId, this.batchCode, 2);
       }
diff --git a/src/views/assembly/student.vue b/src/views/assembly/student.vue
index bc0ff2b..932bc26 100644
--- a/src/views/assembly/student.vue
+++ b/src/views/assembly/student.vue
@@ -21,30 +21,31 @@
           >{{ studentname }}</el-button
         >
       </el-form-item>
-      <el-form-item label="批次成绩" prop="categoryName" label-width="70px">
+      <el-form-item label="所属批次" prop="categoryName" label-width="70px">
         <el-button
           @click="batchCodeshowclick"
           style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
-          v-if="batchCode == '请选择批次'"
-          >{{ batchCode }}</el-button
+          v-if="batchName == '请选择批次'"
+          >{{ batchName }}</el-button
         >
         <el-button
           @click="batchCodeshowclick"
           style="width: 250px; text-align: left; height: 32px"
           v-else
-          >{{ batchCode }}</el-button
+          >{{ batchName }}</el-button
         >
       </el-form-item>
     </el-form>
 
     <!-- //学生 -->
     <el-dialog
-      width="880px"
+      width="950px"
       title="选择学生"
       :visible.sync="studentshow"
       append-to-body
       :before-close="studentcancel"
-      ><el-form
+    >
+      <el-form
         ref="queryForm"
         size="small"
         :inline="true"
@@ -55,32 +56,53 @@
           <el-button
             @click="kindergartenshow = true"
             v-if="kindergartenName == '请选择幼儿园'"
-            style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
+            style="width: 200px; text-align: left; height: 32px; color: #c0c4cc"
             >{{ kindergartenName }}</el-button
           >
           <el-button
             @click="kindergartenshow = true"
-            style="width: 250px; text-align: left; height: 32px"
+            style="width: 200px; text-align: left; height: 32px"
             v-else
             >{{ kindergartenName }}</el-button
           >
         </el-form-item>
 
-        <el-form-item label="所属班级" prop="categoryName" label-width="70px">
+        <el-form-item label="所属班级" prop="categoryName" label-width="80px">
           <el-button
             @click="classshowclick"
-            style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
+            style="width: 200px; text-align: left; height: 32px; color: #c0c4cc"
             v-if="className == '请选择班级'"
             >{{ className }}</el-button
           >
 
           <el-button
             @click="classshowclick"
-            style="width: 250px; text-align: left; height: 32px"
+            style="width: 200px; text-align: left; height: 32px"
             v-else
             >{{ className }}</el-button
           >
         </el-form-item>
+
+        <el-form-item label="学生姓名" prop="studentName" label-width="80px">
+          <el-input
+            style="width: 200px"
+            v-model="studentqueryParams.studentName"
+            placeholder="请输入学生姓名"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+          >
+        </el-form-item>
       </el-form>
       <el-table
         :data="studentInfoList"
@@ -151,7 +173,35 @@
       append-to-body
       :before-close="kindergartencancel"
     >
-      <el-table :data="kindergartenList" @cell-dblclick="kindergartenNameclick" >
+      <el-form
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="110px"
+      >
+        <el-form-item label="幼儿园名称" prop="kindergartenName">
+          <el-input
+            style="width: 200px"
+            v-model="kqueryParams.kindergartenName"
+            placeholder="请输入幼儿园名称"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="kinhandleQuery"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="kinresetQuery"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <el-table :data="kindergartenList" @cell-dblclick="kindergartenNameclick">
         <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
@@ -224,6 +274,34 @@
       append-to-body
       :before-close="classcancel"
     >
+      <el-form
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="110px"
+      >
+        <el-form-item label="班级名称" prop="className">
+          <el-input
+            style="width: 200px"
+            v-model="classqueryParams.className"
+            placeholder="请输入班级名称"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="classhandleQuery"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="classresetQuery"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
       <el-table
         :data="classinfoList"
         align="center"
@@ -440,7 +518,8 @@ export default {
       //学生ID
       studentId: "",
       //批次名称
-      batchCode: "请选择批次",
+      batchCode: "",
+      batchName: "请选择批次",
       //批次list
       testScorelist: [],
       //学生基本信息
@@ -458,13 +537,72 @@ export default {
     this.onshow();
   },
   methods: {
+    //班级
+    classresetQuery() {
+      this.classqueryParams.className = "";
+      this.classinfo();
+    },
+    classhandleQuery() {
+      this.classinfo();
+    },
+
+    //幼儿园
+    kinresetQuery() {
+      this.kqueryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        organizeId: null,
+        kindergartenName: null,
+        kindergartenAddress: null,
+        kindergartenType: null,
+        phone: null,
+        contacts: null,
+      };
+      this.kinhandleQuery();
+    },
+    kinhandleQuery() {
+      listKindergartenInfo(this.kqueryParams).then((response) => {
+        this.kindergartenList = response.rows;
+        this.total1 = response.total;
+        // console.log(this.kindergartenList);
+      });
+    },
+    //重置学生搜素
+    resetQuery() {
+      this.kindergartenName = "请选择幼儿园";
+      this.kindergartenId = "";
+      this.className = "请选择班级";
+      this.classId = "";
+      this.studentname = "请选择学生";
+      this.studentId = "";
+      this.studentqueryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        classId: "",
+        nationDictId: null,
+        studentName: null,
+        studentSex: null,
+        studentNumber: null,
+        birthDate: null,
+        cardNumber: null,
+        onceName: null,
+        homeAddress: null,
+        kindergartenId: null,
+      };
+      this.studentlist();
+    },
+    //学生搜索
+    handleQuery() {
+      this.studentlist();
+    },
     onshow() {
       this.batchCode = localStorage.getItem("batchCode");
       this.studentId = localStorage.getItem("studentId");
+      this.batchName = localStorage.getItem("batchName");
       console.log(localStorage.getItem("studentname"));
 
       if (localStorage.getItem("batchCode") == null) {
-        this.batchCode = "请选择批次";
+        this.batchName = "请选择批次";
       } else {
         this.batchCode = localStorage.getItem("batchCode");
       }
@@ -491,8 +629,10 @@ export default {
     batchCodeclick(row) {
       console.log(row);
       this.batchCode = row.batchCode;
+      this.batchName = row.batchName;
       this.batchCodeshow = false;
       localStorage.setItem("batchCode", this.batchCode);
+      localStorage.setItem("batchName", this.batchName);
       if (this.studentId != "") {
         this.$emit("itemlist", this.studentId, this.batchCode);
       }
@@ -571,7 +711,6 @@ export default {
       this.classshow = false;
       this.studentname = "请选择学生";
       this.studentId = "";
-      this.studentlist();
     },
     //幼儿园左侧点击
     kindergartenNameclick(row) {
@@ -618,7 +757,6 @@ export default {
           console.log(1, this.kindergartenName);
           return;
         } else if (user.includes("parent")) {
-          
           return;
         }
       });
diff --git a/src/views/system/action/index.vue b/src/views/system/action/index.vue
index e8c3417..bb17384 100644
--- a/src/views/system/action/index.vue
+++ b/src/views/system/action/index.vue
@@ -28,85 +28,62 @@
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
-    <div v-if="itemshow" style="width:1361px;margin: 10px auto">
-      <el-table
-        :data="actionlist"
-        border
-        :span-method="arraySpanMethod"
-        style="width:100%"
-      >
-        <el-table-column
-          prop="categoryName"
-          label="测试分类"
-          width="140"
-          align="center"
+    <el-row :gutter="24">
+      <div v-if="itemshow" style="margin: 10px auto; width: 100%">
+        <el-table
+          :data="actionlist"
+          border
+          :span-method="arraySpanMethod"
+          style="width: 95%; margin: 0 auto"
         >
-        </el-table-column>
-        <el-table-column
-          prop="itemName"
-          label="测试项目"
-          width="135"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="itemFraction"
-          label="动作技能总分"
-          width="115"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="unifiedStandardScore"
-          label="统一最高得分"
-          width="115"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="smallStandardScore"
-          label="小班最高得分"
-          width="115"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="middleStandardScore"
-          label="中班最高得分"
-          width="115"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="largeStandardScore"
-          label="大班最高得分"
-          width="115"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="itemScoreAll"
-          label="综合得分"
-          width="160"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="syntheticalAssess"
-          label="综合评价"
-          width="170"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="remark"
-          label="测试目的"
-          width="180"
-          align="center"
-        >
-        </el-table-column>
-      </el-table>
-    </div>
+          <el-table-column prop="categoryName" label="测试分类" align="center">
+          </el-table-column>
+          <el-table-column prop="itemName" label="测试项目" align="center">
+          </el-table-column>
+          <el-table-column
+            prop="itemFraction"
+            label="动作技能总分"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="unifiedStandardScore"
+            label="统一最高得分"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="smallStandardScore"
+            label="小班最高得分"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="middleStandardScore"
+            label="中班最高得分"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="largeStandardScore"
+            label="大班最高得分"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column prop="itemScoreAll" label="综合得分" align="center">
+          </el-table-column>
+          <el-table-column
+            prop="syntheticalAssess"
+            label="综合评价"
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column prop="remark" label="测试目的" align="center">
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-row>
+
     <el-row :gutter="20" v-if="itemshow2">
       <el-col :span="24" :offset="0">
         <el-card>
diff --git a/src/views/system/classconstitution/index.vue b/src/views/system/classconstitution/index.vue
index f88cc3e..79ac7df 100644
--- a/src/views/system/classconstitution/index.vue
+++ b/src/views/system/classconstitution/index.vue
@@ -127,21 +127,22 @@
 
     <el-row v-show="itemshow">
       <el-col :span="24" :offset="0">
-        <div style="margin: 0 auto">
+        <div style="margin: 0 autu; font-size: 14px">
           <div
             style="
+              line-height: 60px;
               display: flex;
               text-align: center;
               justify-content: center;
-              color: #fff;
+              color: black;
+              font-weight:550;
             "
           >
             <div
               style="
                 width: 120px;
-                line-height: 60px;
                 border: 1px solid #f0f0f0;
-                background: #3c9299;
+                background: #F5F7FA;
               "
             >
               年龄
@@ -149,9 +150,8 @@
             <div
               style="
                 width: 120px;
-                line-height: 60px;
                 border: 1px solid #f0f0f0;
-                background: #3c9299;
+                background: #F5F7FA;
               "
             >
               平均总分
@@ -162,7 +162,7 @@
                   text-align: center;
                   line-height: 30px;
                   border: 1px solid #f0f0f0;
-                  background: #3c9299;
+                  background: #F5F7FA;
                 "
               >
                 {{ item.parentName }}
@@ -172,8 +172,8 @@
                   display: flex;
                   line-height: 30px;
                   border: 1px solid #f0f0f0;
-                  background: #3c9299;
-                  font-size: 14px;
+                  background: #F5F7FA;
+                  font-size: 12px;
                 "
               >
                 <div
@@ -186,28 +186,26 @@
               </div>
             </div>
           </div>
-          <div style="font-size:15px">
+          <div style="font-size: 14px">
             <div
-              style="text-align: center; display: flex; justify-content: center"
+              style="
+                text-align: center;
+                display: flex;
+                justify-content: center;
+                line-height: 50px;
+              "
               v-for="item in categoryScoreList"
               :key="item.prentId"
             >
               <div
                 style="
                   width: 120px;
-                  line-height: 60px;
                   border: 1px solid #f0f0f0;
                 "
               >
                 {{ item.className }}
               </div>
-              <div
-                style="
-                  width: 120px;
-                  line-height: 60px;
-                  border: 1px solid #f0f0f0;
-                "
-              >
+              <div style="width: 120px; border: 1px solid #f0f0f0">
                 {{ item.totalAvScore }}
               </div>
               <div>
diff --git a/src/views/system/physique/index.vue b/src/views/system/physique/index.vue
index dacc89f..4552c5a 100644
--- a/src/views/system/physique/index.vue
+++ b/src/views/system/physique/index.vue
@@ -1,4 +1,4 @@
-    <template>
+<template>
   <div class="app-container">
     <el-form
       ref="queryForm"
@@ -109,22 +109,26 @@
           <div
             ref="chart"
             id="chart"
-            style="width: 1000px; height: 600px; margin: 0 auto"
+            style="width: 600px; height: 600px; margin: 0 auto"
           ></div>
         </div>
       </el-col>
       <el-col :span="24" :offset="0">
         <div style="margin: 0 auto">
           <div
-            style="display: flex; text-align: center; justify-content: center"
+            style="
+              display: flex;
+              text-align: center;
+              justify-content: center;
+              color: black;
+            "
           >
             <div
               style="
                 width: 120px;
                 line-height: 60px;
                 border: 1px solid #f0f0f0;
-                background: #27848b;
-                color: #fff;
+                background: #f5f7fa;
               "
             >
               年龄
@@ -134,8 +138,8 @@
                 width: 120px;
                 line-height: 60px;
                 border: 1px solid #f0f0f0;
-                background: #27848b;
-                color: #fff;
+                background: #f5f7fa;
+                color: black;
               "
             >
               平均总分
@@ -146,8 +150,8 @@
                   text-align: center;
                   line-height: 30px;
                   border: 1px solid #f0f0f0;
-                  background: #27848b;
-                  color: #fff;
+                  background: #f5f7fa;
+                  color: black;
                 "
               >
                 {{ item.parentName }}
@@ -157,8 +161,8 @@
                   display: flex;
                   line-height: 30px;
                   border: 1px solid #f0f0f0;
-                  background: #27848b;
-                  color: #fff;
+                  background: #f5f7fa;
+                  color: black;
                 "
               >
                 <div
@@ -173,14 +177,19 @@
           </div>
           <div>
             <div
-              style="text-align: center; display: flex; justify-content: center"
+              style="
+                text-align: center;
+                display: flex;
+                justify-content: center;
+                font-size: 14px;
+              "
               v-for="item in categoryAgeFractionList"
               :key="item.prentId"
             >
               <div
                 style="
                   width: 120px;
-                  line-height: 60px;
+                  line-height: 50px;
                   border: 1px solid #f0f0f0;
                 "
               >
@@ -189,14 +198,14 @@
               <div
                 style="
                   width: 120px;
-                  line-height: 60px;
+                  line-height: 50px;
                   border: 1px solid #f0f0f0;
                 "
               >
                 {{ item.totalAvgFraction }}
               </div>
               <div>
-                <div style="display: flex; line-height: 60px">
+                <div style="display: flex; line-height: 50px">
                   <div
                     v-for="uitem in item.list"
                     :key="uitem.categoryId"
@@ -280,10 +289,10 @@ export default {
     kinbatlist(kin, batchCode) {
       console.log(kin);
       var a = kin;
-      console.log(a)
+      console.log(a);
       this.analysisqueryParams.kindergartenId = a;
       this.analysisqueryParams.batchCode = batchCode;
-      console.log(this.analysisqueryParams)
+      console.log(this.analysisqueryParams);
     },
 
     analysisinfo() {
@@ -442,7 +451,7 @@ export default {
   /* width: 70%; */
   margin: 0 auto;
   /* background-color: #f0f0f0; */
-  color: #27848B;
+  color: #27848b;
 }
 ::v-deep .el-form {
   display: inline;
diff --git a/src/views/system/quality/index.vue b/src/views/system/quality/index.vue
index abea337..38d5d85 100644
--- a/src/views/system/quality/index.vue
+++ b/src/views/system/quality/index.vue
@@ -32,9 +32,7 @@
       class="box-card"
       style="width: 95%; margin: 0 auto"
     >
-      <div slot="header" style="text-align: center; ">
-        身体素质测试
-      </div>
+      <div slot="header" style="text-align: center">身体素质测试</div>
       <el-row style="text-align: center">
         <el-col
           :span="5"
@@ -141,10 +139,15 @@
                 left: 75%;
                 line-height: 20px;
                 overflow: hidden;
-                width: 32px;
+                width: 40px;
               "
             >
-              {{ ((item.maxScore - item.minScore) / 5) * 4 + item.minScore }}
+              {{
+                (
+                  ((item.maxScore - item.minScore) / 5) * 4 +
+                  item.minScore
+                ).toFixed(1)
+              }}
             </div>
             <div
               style="
@@ -163,10 +166,15 @@
                 left: 55%;
                 overflow: hidden;
                 line-height: 20px;
-                width: 32px;
+                width: 40px;
               "
             >
-              {{ ((item.maxScore - item.minScore) / 5) * 3 + item.minScore }}
+              {{
+                (
+                  ((item.maxScore - item.minScore) / 5) * 3 +
+                  item.minScore
+                ).toFixed(1)
+              }}
             </div>
             <div
               style="
@@ -185,10 +193,15 @@
                 left: 35%;
                 line-height: 20px;
                 overflow: hidden;
-                width: 32px;
+                width: 40px;
               "
             >
-              {{ ((item.maxScore - item.minScore) / 5) * 2 + item.minScore }}
+              {{
+                (
+                  ((item.maxScore - item.minScore) / 5) * 2 +
+                  item.minScore
+                ).toFixed(1)
+              }}
             </div>
             <div
               style="
@@ -208,10 +221,15 @@
                 left: 15%;
                 line-height: 20px;
                 overflow: hidden;
-                width: 32px;
+                width: 40px;
               "
             >
-              {{ ((item.maxScore - item.minScore) / 5) * 1 + item.minScore }}
+              {{
+                (
+                  ((item.maxScore - item.minScore) / 5) * 1 +
+                  item.minScore
+                ).toFixed(1)
+              }}
             </div>
             <div
               style="
@@ -421,7 +439,7 @@ export default {
 </script>
 <style scoped='scss'>
 .text {
-  font-size:14px
+  font-size: 14px;
 }
 .toptitle {
   height: 50px;
diff --git a/src/views/system/studentInfo/index.vue b/src/views/system/studentInfo/index.vue
index cac5d91..6abed97 100644
--- a/src/views/system/studentInfo/index.vue
+++ b/src/views/system/studentInfo/index.vue
@@ -1295,7 +1295,8 @@ 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) {
@@ -1304,7 +1305,6 @@ 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,7 +1330,6 @@ export default {
           this.parent1 = this.parentlist[0].id;
           this.parent2 = this.parentlist[1].id;
         }
-
         if (this.tags.length == 0) {
           this.parentInfoName = "请选择学生家长";
           this.parentInfoId = "";
@@ -1340,7 +1339,6 @@ 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 = "";
@@ -1381,7 +1379,6 @@ export default {
         // console.log(this.parent1, this.parent2);
         console.log(this.form);
         console.log(this.form2);
-
         this.open = true;
         this.title = "修改学生信息";
       });
@@ -1720,6 +1717,8 @@ export default {
               this.getList();
               this.parent1 = "";
               this.parent2 = "";
+              this.kindergartenName='请选择所在幼儿园'
+              this.kindergartenid=''
               this.parentlist = [];
               this.tags = [];
             });
diff --git a/src/views/system/testItemCityScore/index.vue b/src/views/system/testItemCityScore/index.vue
index ddba69c..ebdfa35 100644
--- a/src/views/system/testItemCityScore/index.vue
+++ b/src/views/system/testItemCityScore/index.vue
@@ -489,10 +489,10 @@
       </el-table>
 
       <pagination
-        v-show="total > 0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
+        v-show="total2 > 0"
+        :total="total2"
+        :page.sync="queryParams2.pageNum"
+        :limit.sync="queryParams2.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 { listArea } from "@/api/system/area.js";
+import { listCityInfo } from "@/api/system/area.js";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
@@ -630,6 +630,7 @@ export default {
       itemResultType: "item_result_type",
       // 总条数
       total: 0,
+      total2: 0,
       // 全市平均成绩表格数据
       testItemCityScoreList: [],
       //区域列表
@@ -663,6 +664,7 @@ export default {
         itemName: null,
         itemCode: null,
       },
+      queryParams3: {},
       getItemCityScorelist: {
         areaId: null,
         itemId: null,
@@ -721,10 +723,10 @@ export default {
     getItemCityScore() {
       getItemCityScoreInfo(this.getItemCityScorelist).then((res) => {
         if (res.data) {
-          if (res.data.itemAvgScore == null) {
+          if (res.data.itemAvgScore == null||res.data.itemAvgScore == '') {
             this.form.itemAvgText = res.data.itemAvgText;
             this.form.itemAvgScore = null;
-          } else if (res.data.itemAvgText == null) {
+          } else if (res.data.itemAvgText == null||res.data.itemAvgText == '') {
             this.form.itemAvgScore = res.data.itemAvgScore;
             this.form.itemAvgText = null;
           }
@@ -732,7 +734,6 @@ export default {
           this.form.itemAvgScore = null;
           this.form.itemAvgText = null;
         }
-
         console.log(this.form);
       });
     },
@@ -791,7 +792,8 @@ export default {
     /** 查询全市平均成绩列表 */
     getList() {
       this.loading = true;
-      listArea(this.queryParams2).then((response) => {
+      listCityInfo().then((response) => {
+        console.log(response);
         // this.areaList = response.data.forEach((e) => {
         //   e.code = Number(e.code);
         // });
@@ -807,6 +809,7 @@ 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) => {
diff --git a/src/views/system/testItemCountryScore/index.vue b/src/views/system/testItemCountryScore/index.vue
index b2b9a67..bee31c2 100644
--- a/src/views/system/testItemCountryScore/index.vue
+++ b/src/views/system/testItemCountryScore/index.vue
@@ -885,7 +885,6 @@ export default {
       getTestItemCountryScore(id).then((response) => {
         this.form = response.data;
         console.log(this.form);
-
         this.xmname = response.data.itemName;
         this.open2 = true;
         this.title = "修改全国平均成绩";
diff --git a/src/views/system/testItemScore/index.vue b/src/views/system/testItemScore/index.vue
index a761952..8895239 100644
--- a/src/views/system/testItemScore/index.vue
+++ b/src/views/system/testItemScore/index.vue
@@ -32,10 +32,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="批次编号" prop="batchCode">
+      <el-form-item label="批次名称" prop="batchCode">
         <el-input
-          v-model="queryParams.batchCode"
-          placeholder="请输入批次编号"
+          v-model="queryParams.batchName"
+          placeholder="请输入批次名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -74,7 +74,7 @@
           icon="el-icon-edit"
           size="mini"
           :disabled="single"
-          @click="handleUpdate"
+          @click="handleUpdate2"
           v-hasPermi="['system:testItemScore:edit']"
           >修改</el-button
         >
@@ -112,7 +112,6 @@
       v-loading="loading"
       :data="testItemScoreList"
       @selection-change="handleSelectionChange"
-      @row-dblclick="seepraent"
       ref="table"
     >
       <el-table-column type="selection" width="50" align="center" />
@@ -176,7 +175,7 @@
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="1000px"
+      width="1300px"
       append-to-body
       :before-close="cancel"
     >
@@ -184,7 +183,7 @@
         ref="form"
         :model="form"
         :rules="rules"
-        label-width="110px"
+        label-width="105px"
         :inline="true"
       >
         <el-form-item label="所属幼儿园" prop="classId" v-if="form.id == ''">
@@ -211,12 +210,20 @@
               text-align: left;
               height: 36px;
               padding-left: -10px;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
             "
             >{{ kindergartenName }}</el-button
           >
         </el-form-item>
 
-        <el-form-item label="所属班级" prop="classId" v-if="form.id == ''">
+        <el-form-item
+          label="所属班级"
+          prop="classId"
+          v-if="form.id == ''"
+          label-width="90px"
+        >
           <el-button
             type=""
             @click="handleQuery2"
@@ -240,11 +247,19 @@
               text-align: left;
               height: 36px;
               padding-left: -10px;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
             "
             >{{ xmname }}</el-button
           >
         </el-form-item>
-        <el-form-item label="学生姓名" prop="studentId" v-if="form.id == null">
+        <el-form-item
+          label="学生姓名"
+          prop="studentId"
+          v-if="form.id == null"
+          label-width="90px"
+        >
           <el-button
             disabled
             type=""
@@ -257,7 +272,12 @@
             >{{ stname }}</el-button
           >
         </el-form-item>
-        <el-form-item label="学生姓名" prop="studentId" v-else>
+        <el-form-item
+          label="学生姓名"
+          prop="studentId"
+          v-else
+          label-width="90px"
+        >
           <el-button
             this.stname="row.studentName;"
             type=""
@@ -286,7 +306,12 @@
             >{{ stname }}</el-button
           >
         </el-form-item>
-        <el-form-item label="批次编号" prop="batchCode" v-if="form.id == null">
+        <el-form-item
+          label="所属批次"
+          prop="batchCode"
+          v-if="form.id == null"
+          label-width="90px"
+        >
           <el-button
             type=""
             disabled
@@ -299,7 +324,12 @@
             >{{ itemNumbername }}</el-button
           >
         </el-form-item>
-        <el-form-item label="批次编号" prop="batchCode" v-else>
+        <el-form-item
+          label="所属批次"
+          prop="batchCode"
+          v-else
+          label-width="90px"
+        >
           <el-button
             this.itemNumbername="row.batchCode;"
             type=""
@@ -318,6 +348,146 @@
             type=""
             @click="testclick"
             v-else
+            style="
+              width: 200px;
+              text-align: left;
+              height: 36px;
+              padding-left: -10px;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+            "
+            >{{ itemNumbername }}</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <el-table
+        ref="singleTable"
+        :data="form.itemScoreList"
+        style="width: 93%; margin: 20px auto"
+      >
+        <el-table-column
+          property="itemCode"
+          label="项目编号"
+          width="230"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="itemName"
+          label="项目名称"
+          width="230"
+          align="center"
+        >
+        </el-table-column>
+        <!-- <el-table-column
+          property="scoreDictId"
+          label="字典类型"
+          align="center"
+          width="120"
+        >
+          <template slot-scope="scope">
+            {{
+              scope.row.scoreDictId == ResultType1.dictCode
+                ? ResultType1.dictLabel
+                : ""
+            }}{{
+              scope.row.scoreDictId == ResultType2.dictCode
+                ? ResultType2.dictLabel
+                : ""
+            }}</template
+          >
+        </el-table-column> -->
+        <el-table-column
+          property="itemScore"
+          label="个人成绩"
+          width="230"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <el-input
+              type="number"
+              v-model="scope.row.itemScore"
+              v-if="
+                scope.row.itemScore != null ||
+                scope.row.scoreDictId == ResultType1.dictCode
+              "
+            ></el-input>
+            <el-input
+              v-model="scope.row.scoreDictValue"
+              v-if="
+                scope.row.scoreDictValue != null ||
+                scope.row.scoreDictId == ResultType2.dictCode
+              "
+            ></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column
+          property="itemFraction"
+          label="个人成绩得分"
+          width="230"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <el-input type="number" v-model="scope.row.itemFraction"></el-input>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          property="syntheticalAssess"
+          label="综合评价"
+          width="230"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.syntheticalAssess"></el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- //修改 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open2"
+      width="1000px"
+      append-to-body
+      :before-close="cancel"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="105px"
+        :inline="true"
+      >
+        <el-form-item label="学生姓名" prop="studentId" label-width="90px">
+          <el-button
+            disabled
+            type=""
+            style="
+              width: 200px;
+              text-align: left;
+              height: 36px;
+              padding-left: -10px;
+            "
+            >{{ stname }}</el-button
+          >
+        </el-form-item>
+
+        <el-form-item
+          label="所属批次"
+          prop="batchCode"
+          v-if="form.id == null"
+          label-width="90px"
+        >
+          <el-button
+            type=""
+            disabled
             style="
               width: 200px;
               text-align: left;
@@ -417,7 +587,6 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
     <!-- //幼儿园 -->
     <el-dialog
       width="850px"
@@ -426,8 +595,37 @@
       append-to-body
       :before-close="kindergartencancel"
     >
-      <el-table :data="kindergartenList"
-      @cell-dblclick="kindergartenNameclick">
+      <el-form
+        :model="kqueryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="100px"
+      >
+        <el-form-item label="幼儿园名称" prop="className">
+          <el-input
+            v-model="kqueryParams.kindergartenName"
+            placeholder="请输入幼儿园名称"
+            clearable
+            @keyup.enter.native="kinhandleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="kinhandleQuery"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="kinresetQuery"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+
+      <el-table :data="kindergartenList" @cell-dblclick="kindergartenNameclick">
         <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
@@ -488,7 +686,7 @@
         :total="total6"
         :page.sync="kqueryParams.pageNum"
         :limit.sync="kqueryParams.pageSize"
-        @pagination="getList"
+        @pagination="kininfo"
       />
     </el-dialog>
 
@@ -511,9 +709,9 @@
         <el-form-item label="班级名称" prop="className">
           <el-input
             v-model="queryParams2.className"
-            placeholder="请输入项目名称"
+            placeholder="请输入班级名称"
             clearable
-            @keyup.enter.native="handleQuery"
+            @keyup.enter.native="handleQuery2"
           />
         </el-form-item>
         <el-form-item>
@@ -524,12 +722,12 @@
             @click="handleQuery2"
             >搜索</el-button
           >
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          <el-button icon="el-icon-refresh" size="mini" @click="classresetQuery"
             >重置</el-button
           >
         </el-form-item>
       </el-form>
-      <el-table :data="classInfos">
+      <el-table :data="classInfos" @cell-dblclick="xmclick">
         <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
@@ -625,7 +823,7 @@
         :total="total2"
         :page.sync="queryParams2.pageNum"
         :limit.sync="queryParams2.pageSize"
-        @pagination="getList"
+        @pagination="classinfo"
       />
     </el-dialog>
 
@@ -665,7 +863,7 @@
           >
         </el-form-item>
       </el-form>
-      <el-table :data="studentInfos">
+      <el-table :data="studentInfos" @cell-dblclick="studentclick">
         <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
@@ -781,7 +979,7 @@
         :total="total3"
         :page.sync="queryParams3.pageNum"
         :limit.sync="queryParams3.pageSize"
-        @pagination="getList"
+        @pagination="studentinfo"
       />
     </el-dialog>
 
@@ -789,7 +987,7 @@
 
     <el-dialog
       width="850px"
-      title="选择批次编号"
+      title="选择所属批次"
       :visible.sync="innerVisible4"
       append-to-body
     >
@@ -809,6 +1007,14 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
+        <el-form-item label="批次名称" prop="batchCode">
+          <el-input
+            v-model="queryParams5.batchName"
+            placeholder="请输入批次编号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button
             type="primary"
@@ -822,7 +1028,7 @@
           >
         </el-form-item>
       </el-form>
-      <el-table :data="testScoreBatchs">
+      <el-table :data="testScoreBatchs" @cell-dblclick="batchCodeclick">
         <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
@@ -1086,6 +1292,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      open2: false,
       itemId2: "",
       itemId3: "",
       // 查询参数
@@ -1117,6 +1324,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         batchCode: null,
+        batchName: "",
       },
       addqueryParams: {
         studentId: "",
@@ -1145,6 +1353,7 @@ export default {
         ],
       },
       testitems: [],
+      selection2: {},
     };
   },
   created() {
@@ -1160,7 +1369,7 @@ export default {
     seepraent(row) {
       this.reset();
       getAllTestItemScoreInfo(row).then((res) => {
-        console.log(res)
+        console.log(res);
         this.getAllTestItemScore = res.data;
         console.log(this.getAllTestItemScore);
         this.innerVisible5 = true;
@@ -1198,6 +1407,9 @@ export default {
       this.itemId2 = "";
       this.itemId3 = "";
       this.form.classId = null;
+      this.queryParams3.classId = "";
+      this.addqueryParams.studentId = "";
+      console.log(this.queryParams3);
       this.form.studentId = null;
     },
     //幼儿园关闭
@@ -1216,7 +1428,9 @@ export default {
       this.queryParams3.classId = row.id;
       this.stname = "请选择学生姓名";
       this.itemId3 = "";
+      this.addqueryParams.studentId = "";
       this.form.studentId = null;
+      console.log(this.addqueryParams);
     },
     //打开选择学生页面
     studentinfoclick() {
@@ -1290,6 +1504,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.open2 = false;
       this.reset();
       this.kindergartenName = "请选择幼儿园";
       this.kindergartenId = "";
@@ -1309,8 +1524,8 @@ export default {
         studentId: null,
         batchCode: null,
         itemScoreList: [],
-        batchId:null,
-        batchCode:null,
+        batchId: null,
+        batchCode: null,
       };
       this.resetForm("form");
     },
@@ -1321,49 +1536,110 @@ export default {
       if (this.queryParams2.kindergartenId == "") {
         this.$message.error("请先选择幼儿园");
       } else {
-        classInfo(this.queryParams2).then((response) => {
-          this.classInfos = response.rows;
-          this.total = response.total;
-          this.loading = false;
-          this.innerVisible = true;
-        });
+        this.classinfo();
+        this.innerVisible = true;
+        this.loading = false;
       }
     },
     // 学生姓名
+    studentinfo() {
+      studentInfo(this.queryParams3).then((response) => {
+        this.studentInfos = response.rows;
+        this.total3 = response.total;
+      });
+    },
     handleQuery3() {
       this.queryParams3.pageNum = 1;
-      studentInfo(this.queryParams).then((response) => {
-        this.studentInfo = response.rows;
-        this.total = response.total;
-        this.loading = false;
-        this.getList();
-      });
+      this.studentinfo();
+      this.loading = false;
     },
     // 批次编号
     handleQuery5() {
       this.queryParams5.pageNum = 1;
-      testScoreBatch(this.queryParams).then((response) => {
-        this.testScoreBatch = response.rows;
-        this.total = response.total;
+      testScoreBatch(this.queryParams5).then((response) => {
+        this.testScoreBatchs = response.rows;
+        this.total5 = response.total;
         this.loading = false;
-        this.getList();
       });
     },
+    kinhandleQuery() {
+      listKindergartenInfo(this.kqueryParams).then((response) => {
+        this.kindergartenList = response.rows;
+        this.total6 = response.total;
+      });
+    },
+
     handleQuery() {
       this.queryParams.pageNum = 1;
-      this.getList();
+      listTestItemScore(this.queryParams).then((response) => {
+        this.testItemScoreList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
     },
     /** 重置按钮操作 */
+    classinfo() {
+      classInfo(this.queryParams2).then((response) => {
+        this.classInfos = response.rows;
+        this.total2 = response.total;
+        this.queryParams3.studentName = null;
+      });
+    },
+    classresetQuery() {
+      this.queryParams2.className = null;
+      this.queryParams3.classId == "";
+      this.classinfo();
+    },
+    kininfo() {
+      listKindergartenInfo(this.kqueryParams).then((response) => {
+        this.kindergartenList = response.rows;
+        this.total6 = response.total;
+      });
+    },
+    kinresetQuery() {
+      this.kqueryParams.kindergartenName = "";
+      this.queryParams2.kindergartenId = "";
+    },
     resetQuery() {
       this.resetForm("queryForm");
+      this.kqueryParams.kindergartenName = "";
+      // 班级
+      this.queryParams2.className = null;
+      // 学生姓名
+      this.queryParams5 = {
+        pageNum: 1,
+        pageSize: 10,
+        batchCode: null,
+        batchName: "",
+      };
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        className: null,
+        studentName: null,
+        itemName: null,
+        batchCode: null,
+      };
       this.handleQuery();
-      this.queryParams.className = "";
+
+      studentInfo(this.queryParams3).then((response) => {
+        this.studentInfos = response.rows;
+        this.total3 = response.total;
+      });
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
+      if (selection.length == 1) {
+        console.log(selection.studentId);
+        selection.forEach((e) => {
+          this.selection2.studentId = e.studentId;
+          this.selection2.batchCode = e.batchCode;
+        });
+      }
+      console.log(this.selection2);
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -1374,6 +1650,21 @@ export default {
       this.title = "添加个人成绩录入管理";
     },
     /** 修改按钮操作 */
+    handleUpdate2() {
+      this.reset();
+      getTestItemScore(this.selection2).then((response) => {
+        console.log();
+        this.form = response.data;
+        this.open2 = true;
+        this.queryParams3.classId = response.data.classId;
+        this.stname = response.data.studentName;
+        this.itemId3 = response.data.studentId;
+        this.addqueryParams.studentId = response.data.studentId;
+        this.itemNumbername = response.data.batchCode;
+        console.log(this.form);
+      });
+    },
+
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
@@ -1382,10 +1673,11 @@ export default {
         batchCode: row.batchCode,
       };
       this.form.itemScoreList = [];
+      console.log(list);
       getTestItemScore(list).then((response) => {
         console.log();
         this.form = response.data;
-        this.open = true;
+        this.open2 = true;
         this.queryParams3.classId = response.data.classId;
         this.stname = response.data.studentName;
         this.itemId3 = response.data.studentId;
@@ -1401,7 +1693,7 @@ export default {
           if (this.form.id == null) {
             updateTestItemScore(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
-              this.open = false;
+              this.open2 = false;
               this.getList();
               this.xmname = "请选择所属班级";
               this.stname = "请选择学生姓名";
diff --git a/src/views/system/testItems/index.vue b/src/views/system/testItems/index.vue
index bb678eb..7fa42cf 100644
--- a/src/views/system/testItems/index.vue
+++ b/src/views/system/testItems/index.vue
@@ -210,31 +210,77 @@
         label-width="160px"
         :inline="true"
       >
-        <el-form-item label="所属分类" prop="itemCategoryId">
-          <treeselect
-            :normalizer="normalizer"
-            :options="itemCategoryList"
-            placeholder="请选择所属项目分类"
-            v-model="form.itemCategoryId"
-            style="width: 300px"
-          />
-        </el-form-item>
-        <el-form-item label="项目名称" prop="itemName">
-          <el-input
-            style="width: 300px"
-            v-model="form.itemName"
-            placeholder="请输入项目名称"
-            maxlength="40"
-          />
-        </el-form-item>
-        <el-form-item label="项目编号" prop="itemCode">
-          <el-input
-            v-model="form.itemCode"
-            maxlength="20"
-            placeholder="请输入测试项目编号"
-            style="width: 300px"
-          />
-        </el-form-item>
+        <div style="border-bottom: 1px solid #f1f1f1; margin-bottom: 20px">
+          <el-form-item label="所属分类" prop="itemCategoryId">
+            <treeselect
+              :normalizer="normalizer"
+              :options="itemCategoryList"
+              placeholder="请选择所属项目分类"
+              v-model="form.itemCategoryId"
+              style="width: 300px"
+            />
+          </el-form-item>
+        </div>
+        <div style="border-bottom: 1px solid #f1f1f1; margin-bottom: 20px">
+          <el-form-item label="项目名称" prop="itemName">
+            <el-input
+              style="width: 300px"
+              v-model="form.itemName"
+              placeholder="请输入项目名称"
+              maxlength="40"
+            />
+          </el-form-item>
+          <el-form-item label="项目编号" prop="itemCode">
+            <el-input
+              v-model="form.itemCode"
+              maxlength="20"
+              placeholder="请输入测试项目编号"
+              style="width: 300px"
+            />
+          </el-form-item>
+          <el-form-item label="测试项目成绩类型" prop="resultDictType">
+            <el-select
+              v-model="form.resultDictType"
+              clearable
+              placeholder="请选择字典类型"
+              style="width: 300px"
+            >
+              <el-option
+                v-for="item in itemResultTypelist"
+                :key="item.value"
+                :label="item.dictLabel"
+                :value="item.dictCode"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="项目概述" prop="remark">
+            <el-input
+              v-model="form.remark"
+              placeholder="请输入项目概述"
+              style="width: 300px"
+              maxlength="200"
+            />
+          </el-form-item>
+          <el-form-item label="项目内容" prop="itemContent">
+            <el-input
+              type="textarea"
+              :autosize="{ minRows: 6, maxRows: 8 }"
+              v-model.number="form.itemContent"
+              placeholder="项目内容"
+              maxlength="200"
+              style="width: 500px"
+            />
+
+            <!-- <editor
+            v-model="form.itemContent"
+            :min-height="190"
+            style="margin-left: 80px"
+            maxlength="200"
+          /> -->
+          </el-form-item>
+        </div>
+
         <el-form-item label="排序" prop="sorting">
           <el-input
             v-model="form.sorting"
@@ -243,22 +289,7 @@
             style="width: 300px"
           />
         </el-form-item>
-        <el-form-item label="测试项目成绩类型" prop="resultDictType">
-          <el-select
-            v-model="form.resultDictType"
-            clearable
-            placeholder="请选择字典类型"
-            style="width: 300px"
-          >
-            <el-option
-              v-for="item in itemResultTypelist"
-              :key="item.value"
-              :label="item.dictLabel"
-              :value="item.dictCode"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
+
         <el-form-item label="度量单位" prop="measureUnit">
           <el-select
             v-model="form.measureUnit"
@@ -293,9 +324,12 @@
             style="width: 300px"
           />
         </el-form-item>
-
         <el-form-item label="标准最高得分类型" prop="standardType">
-          <el-select
+          <el-radio-group v-model="form.standardType" style="width: 300px">
+            <el-radio :label="ty">统一指标</el-radio>
+            <el-radio :label="fty">非统一指标</el-radio>
+          </el-radio-group>
+          <!-- <el-select
             v-model="form.standardType"
             clearable
             placeholder="请选择指标类型"
@@ -308,7 +342,7 @@
               :value="item.dictValue"
             >
             </el-option>
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <el-form-item
           label="大班标准最高得分"
@@ -371,15 +405,7 @@
             maxlength="50"
           />
         </el-form-item>
-        <el-form-item label="测试目的" prop="remark">
-          <el-input
-            v-model="form.remark"
-            placeholder="请输入项目概述"
-            style="width: 300px"
-            maxlength="200"
-          />
-        </el-form-item>
-        <el-form-item label="项目成绩级别" prop="itemLevelList">
+        <el-form-item label="成绩级别" prop="itemLevelList">
           <div
             v-for="(item, index) in form.itemLevelList"
             :key="item.id"
@@ -436,14 +462,6 @@
             ></el-button>
           </div>
         </el-form-item>
-        <el-form-item label="项目内容" prop="itemContent">
-          <editor
-            v-model="form.itemContent"
-            :min-height="190"
-            style="margin-left: 80px"
-            maxlength="200"
-          />
-        </el-form-item>
       </el-form>
 
       <div slot="footer" class="dialog-footer" style="margin-right: 80px">