From 66841e25778008be7ad88cc1fff05f9268c92e3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Tue, 30 Aug 2022 17:44:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/testItemScore.js               |  10 +
 src/views/assembly/kindergarten.vue           | 296 ++++++++
 src/views/assembly/student.vue                | 629 ++++++++++++++++
 src/views/system/action/index.vue             | 706 ++----------------
 src/views/system/classconstitution/index.vue  | 306 +-------
 src/views/system/classinfo/index.vue          |   7 +-
 src/views/system/comprehensive/index.vue      | 622 ++-------------
 src/views/system/constitution/index.vue       | 585 +--------------
 src/views/system/physique/index.vue           | 456 +++--------
 src/views/system/quality/index.vue            | 632 ++--------------
 src/views/system/shape/index.vue              | 571 +-------------
 src/views/system/survey/index.vue             | 531 +++++--------
 src/views/system/testItemCityScore/index.vue  |  66 +-
 .../system/testItemCountryScore/index.vue     | 283 ++++---
 src/views/system/testItemScore/index.vue      | 279 ++++---
 src/views/system/testScoreBatch/index.vue     |   1 +
 16 files changed, 1847 insertions(+), 4133 deletions(-)
 create mode 100644 src/views/assembly/kindergarten.vue
 create mode 100644 src/views/assembly/student.vue

diff --git a/src/api/system/testItemScore.js b/src/api/system/testItemScore.js
index dcb0b3a..9a899ff 100644
--- a/src/api/system/testItemScore.js
+++ b/src/api/system/testItemScore.js
@@ -9,6 +9,16 @@ export function listTestItemScore(query) {
     })
 }
 
+// 查询测试项目
+export function testItems(query) {
+    return request({
+        url: '/system/testItems/list',
+        method: 'get',
+        params: query
+    })
+}
+
+
 // 查询班级信息列表
 export function classInfo(query) {
     return request({
diff --git a/src/views/assembly/kindergarten.vue b/src/views/assembly/kindergarten.vue
new file mode 100644
index 0000000..83d0d47
--- /dev/null
+++ b/src/views/assembly/kindergarten.vue
@@ -0,0 +1,296 @@
+<template>
+  <div class="app-container">
+    <el-form
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="90px"
+    >
+      <el-form-item label="所属幼儿园" prop="categoryName">
+        <el-button
+          @click="kindergartenshow = true"
+          v-if="kindergartenName == '请选择幼儿园'"
+          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
+          >{{ kindergartenName }}</el-button
+        >
+        <el-button
+          @click="kindergartenshow = true"
+          style="width: 250px; text-align: left; height: 32px"
+          v-else
+          >{{ kindergartenName }}</el-button
+        >
+      </el-form-item>
+
+      <el-form-item label="所属批次" prop="categoryName" >
+        <el-button
+          @click="batchCodeshowclick"
+          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
+          v-if="batchCode == '请选择批次'"
+          >{{ batchCode }}</el-button
+        >
+        <el-button
+          @click="batchCodeshowclick"
+          style="width: 250px; text-align: left; height: 32px"
+          v-else
+          >{{ batchCode }}</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <!-- //批次 -->
+    <el-dialog
+      width="590px"
+      title="选择批次"
+      :visible.sync="batchCodeshow"
+      append-to-body
+      style="margin-top: 20px"
+      :before-close="batchCodecancel"
+    >
+      <el-table :data="testScorelist" align="center" style="margin-top: 0px">
+        <el-table-column label="请选择" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              style="width: 20px; height: 20px"
+              v-if="batchCodeId == scope.row.id"
+              circle
+              @click="batchCodeclick(scope.row)"
+            ></el-button>
+            <el-button
+              v-else
+              style="width: 15px; height: 15px"
+              circle
+              @click="batchCodeclick(scope.row)"
+            ></el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          property="batchCode"
+          label="批次编号"
+          width="200"
+          align="center"
+        />
+        <el-table-column
+          property="batchName"
+          label="批次名称"
+          width="200"
+          align="center"
+        />
+      </el-table>
+      <pagination
+        v-show="total4 > 0"
+        :total="total4"
+        :page.sync="testqueryParams.pageNum"
+        :limit.sync="testqueryParams.pageSize"
+        @pagination="testScore"
+      />
+    </el-dialog>
+
+    <!-- //幼儿园 -->
+    <el-dialog
+      width="850px"
+      title="选择所属幼儿园"
+      :visible.sync="kindergartenshow"
+      append-to-body
+      :before-close="kindergartencancel"
+    >
+      <el-table :data="kindergartenList">
+        <el-table-column label="请选择" width="70" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              style="width: 15px; height: 15px"
+              circle
+              @click="kindergartenNameclick(scope.row)"
+              v-if="kindergartenId == scope.row.id"
+            ></el-button>
+
+            <el-button
+              v-else
+              style="width: 15px; height: 15px"
+              circle
+              @click="kindergartenNameclick(scope.row)"
+            ></el-button>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          property="kindergartenName"
+          label="幼儿园名字"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="kindergartenAddress"
+          label="幼儿园地址"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          label="幼儿园所在组织"
+          align="center"
+          prop="organizeName"
+          width="150"
+        >
+        </el-table-column>
+        <el-table-column
+          property="contacts"
+          label="联系人"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="phone"
+          label="联系电话"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total1 > 0"
+        :total="total1"
+        :page.sync="kqueryParams.pageNum"
+        :limit.sync="kqueryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  listKindergartenInfo,
+  tKindergartenInfo,
+} from "@/api/system/kindergartenInfo";
+import { getRoleInfo, testScoreBatch } from "@/api/system/quality";
+
+export default {
+  name: "KindergartenPhysicalTest",
+  components: {},
+  data() {
+    return {
+      total1: 0,
+      total4: 0,
+      //遮罩层
+      kindergartenshow: false,
+      batchCodeshow: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 表单参数
+      form: {},
+      //幼儿园查询参数
+      kqueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        organizeId: null,
+        kindergartenName: null,
+        kindergartenAddress: null,
+        kindergartenType: null,
+        phone: null,
+        contacts: null,
+      },
+      //幼儿园list
+      kindergartenList: [],
+      //幼儿园名字
+      kindergartenName: "请选择幼儿园",
+      //幼儿园ID
+      kindergartenId: "",
+      //批次名称
+      batchCode: "请选择批次",
+      //批次ID
+      batchCodeId: "",
+      //批次list
+      testScorelist: [],
+      //批次编号
+      testqueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+    };
+  },
+  mounted() {},
+  created() {
+    this.getList();
+  },
+  methods: {
+    //点击批次左边
+    batchCodeclick(row) {
+      this.batchCodeId = row.id;
+      this.batchCode = row.batchCode;
+      this.batchCodeshow = false;
+      localStorage.setItem("batchCode2", this.batchCode);
+      if (this.kindergartenId != "") {
+        this.$emit("kinbatlist", this.kindergartenId, this.batchCode);
+      }
+    },
+    //点击批次
+    batchCodeshowclick() {
+      this.testScore();
+      this.batchCodeshow = true;
+    },
+    //批次
+    testScore() {
+      testScoreBatch(this.testqueryParams).then((res) => {
+        this.testScorelist = res.rows;
+        this.total4 = res.total;
+      });
+    },
+    //批次关闭
+    batchCodecancel() {
+      this.batchCodeshow = false;
+    },
+    //幼儿园关闭
+    kindergartencancel() {
+      this.kindergartenshow = false;
+    },
+    //幼儿园左侧点击
+    kindergartenNameclick(row) {
+      this.kindergartenName = row.kindergartenName;
+      this.kindergartenId = row.id;
+      this.kindergartenshow = false;
+      if (this.batchCode != "") {
+        this.$emit("kinbatlist", this.kindergartenId, this.batchCode);
+      }
+    },
+
+    getList() {
+      tKindergartenInfo(this.kindergartenType).then((res) => {
+        this.type = res.data[0];
+        this.type2 = res.data[1];
+      });
+      //用户权限
+      getRoleInfo().then((res) => {
+        var user = res.data.roleKeys;
+        console.log(user);
+        if (user.includes("enchou")) {
+          return;
+        } else if (user.includes("teacher")) {
+          return;
+        } else if (user.includes("parent")) {
+          return;
+        }
+      });
+      //获取幼儿园list
+      listKindergartenInfo(this.kqueryParams).then((response) => {
+        this.kindergartenList = response.rows;
+        this.total1 = response.total;
+        // console.log(this.kindergartenList);
+      });
+    },
+    // 表单重置
+    reset() {
+      this.form = {};
+      this.resetForm("form");
+    },
+  },
+};
+</script>
+<style scoped='scss'>
+::v-deep .el-card__header {
+  border: none;
+}
+</style>
diff --git a/src/views/assembly/student.vue b/src/views/assembly/student.vue
new file mode 100644
index 0000000..a89c59a
--- /dev/null
+++ b/src/views/assembly/student.vue
@@ -0,0 +1,629 @@
+<template>
+  <div class="app-container">
+    <el-form
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="90px"
+    >
+      <el-form-item label="学生" prop="categoryName" label-width="45px">
+        <el-button
+          @click="studentshowclick"
+          v-if="studentname == '请选择学生'"
+          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
+          >{{ studentname }}</el-button
+        >
+        <el-button
+          @click="studentshowclick"
+          style="width: 250px; text-align: left; height: 32px"
+          v-else
+          >{{ studentname }}</el-button
+        >
+      </el-form-item>
+      <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
+        >
+        <el-button
+          @click="batchCodeshowclick"
+          style="width: 250px; text-align: left; height: 32px"
+          v-else
+          >{{ batchCode }}</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <!-- //学生 -->
+    <el-dialog
+      width="880px"
+      title="选择学生"
+      :visible.sync="studentshow"
+      append-to-body
+      :before-close="studentcancel"
+      ><el-form
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="90px"
+      >
+        <el-form-item label="所属幼儿园" prop="categoryName">
+          <el-button
+            @click="kindergartenshow = true"
+            v-if="kindergartenName == '请选择幼儿园'"
+            style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
+            >{{ kindergartenName }}</el-button
+          >
+          <el-button
+            @click="kindergartenshow = true"
+            style="width: 250px; text-align: left; height: 32px"
+            v-else
+            >{{ kindergartenName }}</el-button
+          >
+        </el-form-item>
+
+        <el-form-item label="所属班级" prop="categoryName" label-width="70px">
+          <el-button
+            @click="classshowclick"
+            style="width: 250px; 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"
+            v-else
+            >{{ className }}</el-button
+          >
+        </el-form-item>
+      </el-form>
+      <el-table
+        :data="studentInfoList"
+        align="center"
+        style="margin-top: 10px"
+        @cell-dblclick="studentclick"
+      >
+        <el-table-column label="请选择" width="70" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              style="width: 20px; height: 20px"
+              circle
+              v-if="studentId == scope.row.id"
+              @click="studentclick(scope.row)"
+            ></el-button>
+            <el-button
+              v-else
+              style="width: 15px; height: 15px"
+              circle
+              @click="studentclick(scope.row)"
+            ></el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          property="className"
+          label="班级名称"
+          width="190"
+          align="center"
+        />
+        <el-table-column
+          property="studentName"
+          label="学生姓名"
+          width="190"
+          align="center"
+        />
+        <el-table-column
+          property="studentName"
+          label="性别"
+          width="190"
+          align="center"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.studentSex == "MALE" ? "男" : "女" }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          property="homeAddress"
+          label="住址"
+          width="190"
+          align="center"
+        />
+      </el-table>
+      <pagination
+        v-show="total3 > 0"
+        :total="total3"
+        :page.sync="studentqueryParams.pageNum"
+        :limit.sync="studentqueryParams.pageSize"
+        @pagination="studentlist"
+      />
+    </el-dialog>
+
+    <!-- //幼儿园 -->
+    <el-dialog
+      width="850px"
+      title="选择所属幼儿园"
+      :visible.sync="kindergartenshow"
+      append-to-body
+      :before-close="kindergartencancel"
+    >
+      <el-table :data="kindergartenList" @cell-dblclick="kindergartenNameclick">
+        <el-table-column label="请选择" width="70" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              style="width: 15px; height: 15px"
+              circle
+              @click="kindergartenNameclick(scope.row)"
+              v-if="kindergartenId == scope.row.id"
+            ></el-button>
+
+            <el-button
+              v-else
+              style="width: 15px; height: 15px"
+              circle
+              @click="kindergartenNameclick(scope.row)"
+            ></el-button>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          property="kindergartenName"
+          label="幼儿园名字"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="kindergartenAddress"
+          label="幼儿园地址"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          label="幼儿园所在组织"
+          align="center"
+          prop="organizeName"
+          width="150"
+        >
+        </el-table-column>
+        <el-table-column
+          property="contacts"
+          label="联系人"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="phone"
+          label="联系电话"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total1 > 0"
+        :total="total1"
+        :page.sync="kqueryParams.pageNum"
+        :limit.sync="kqueryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-dialog>
+
+    <!-- //班级 -->
+    <el-dialog
+      width="1000px"
+      title="选择所属班级"
+      :visible.sync="classshow"
+      append-to-body
+      :before-close="classcancel"
+    >
+      <el-table
+        :data="classinfoList"
+        align="center"
+        style="margin-top: 10px"
+        @cell-dblclick="classclick"
+      >
+        <el-table-column label="请选择" width="70" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              style="width: 20px; height: 20px"
+              circle
+              @click="classclick(scope.row)"
+              v-if="classId == scope.row.id"
+            ></el-button>
+            <el-button
+              v-else
+              style="width: 15px; height: 15px"
+              circle
+              @click="classclick(scope.row)"
+            ></el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          property="kindergartenName"
+          label="幼儿园名称"
+          width="190"
+          align="center"
+        />
+        <el-table-column
+          property="className"
+          label="班级名称"
+          width="180"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="classType"
+          label="班级类型"
+          width="160"
+          align="center"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.classType == dictValue1 ? "大班" : "" }}
+            {{ scope.row.classType == dictValue2 ? "中班" : "" }}
+            {{ scope.row.classType == dictValue3 ? "小班" : "" }}
+            {{ scope.row.classType == dictValue4 ? "毕业" : "" }}
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          property="classTeacher"
+          label="班主任姓名"
+          width="180"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="phone"
+          label="联系电话"
+          width="190"
+          align="center"
+        >
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total2 > 0"
+        :total="total2"
+        :page.sync="classqueryParams.pageNum"
+        :limit.sync="classqueryParams.pageSize"
+        @pagination="classinfo"
+      />
+    </el-dialog>
+
+    <!-- //批次 -->
+    <el-dialog
+      width="590px"
+      title="选择批次"
+      :visible.sync="batchCodeshow"
+      append-to-body
+      style="margin-top: 20px"
+      :before-close="batchCodecancel"
+    >
+      <el-table
+        :data="testScorelist"
+        align="center"
+        style="margin-top: 0px"
+        @cell-dblclick="batchCodeclick"
+      >
+        <el-table-column label="请选择" width="100" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              style="width: 20px; height: 20px"
+              v-if="batchCode == scope.row.batchCode"
+              circle
+              @click="batchCodeclick(scope.row)"
+            ></el-button>
+            <el-button
+              v-else
+              style="width: 15px; height: 15px"
+              circle
+              @click="batchCodeclick(scope.row)"
+            ></el-button>
+          </template>
+        </el-table-column>
+        <el-table-column
+          property="batchCode"
+          label="批次编号"
+          width="200"
+          align="center"
+        />
+        <el-table-column
+          property="batchName"
+          label="批次名称"
+          width="200"
+          align="center"
+        />
+      </el-table>
+      <pagination
+        v-show="total4 > 0"
+        :total="total4"
+        :page.sync="testqueryParams.pageNum"
+        :limit.sync="testqueryParams.pageSize"
+        @pagination="testScore"
+      />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listKindergartenInfo,
+  tKindergartenInfo,
+} from "@/api/system/kindergartenInfo";
+import { listStudentInfo } from "@/api/system/studentInfo";
+import { listClassinfo } from "@/api/system/classinfo";
+import { getRoleInfo, testScoreBatch } from "@/api/system/quality";
+export default {
+  name: "comprehensive",
+  data() {
+    return {
+      itemshow: false,
+      itemshow2: false,
+      total1: 0,
+      total2: 0,
+      total3: 0,
+      total4: 0,
+      //遮罩层
+      kindergartenshow: false,
+      classshow: false,
+      studentshow: false,
+      batchCodeshow: false,
+      //班级类型
+      dictValue1: "",
+      dictValue2: "",
+      dictValue3: "",
+      dictValue4: "",
+      ClassType: "class_type",
+      // 显示搜索条件
+      showSearch: true,
+      // 表单参数
+      form: {},
+      //学生查询
+      studentqueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        classId: "",
+        nationDictId: null,
+        studentName: null,
+        studentSex: null,
+        studentNumber: null,
+        birthDate: null,
+        cardNumber: null,
+        onceName: null,
+        homeAddress: null,
+      },
+      //班级查询
+      classqueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        kindergartenId: "",
+        className: null,
+        classType: null,
+      },
+      //幼儿园查询参数
+      kqueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        organizeId: null,
+        kindergartenName: null,
+        kindergartenAddress: null,
+        kindergartenType: null,
+        phone: null,
+        contacts: null,
+      },
+      //幼儿园list
+      kindergartenList: [],
+      //幼儿园名字
+      kindergartenName: "请选择幼儿园",
+      //幼儿园ID
+      kindergartenId: "",
+      //班级list
+      classinfoList: [],
+      //班级名字
+      className: "请选择班级",
+      //班级ID
+      classId: "",
+      //学生list
+      studentInfoList: [],
+      //学生名字
+      studentname: "请选择学生",
+      //学生ID
+      studentId: "",
+      //批次名称
+      batchCode: "请选择批次",
+      //批次list
+      testScorelist: [],
+      //学生基本信息
+      sythesizestudent: [],
+      //批次编号
+      testqueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+    };
+  },
+  created() {
+    this.getList();
+    this.class();
+    this.onshow();
+  },
+  methods: {
+    onshow() {
+      this.batchCode = localStorage.getItem("batchCode");
+      this.studentId = localStorage.getItem("studentId");
+      console.log(localStorage.getItem("studentname"));
+      if (localStorage.getItem("studentname") == null) {
+        this.studentname = "请选择学生";
+      } else {
+        this.studentname = localStorage.getItem("studentname");
+      }
+      if (
+        localStorage.getItem("batchCode") != null &&
+        localStorage.getItem("studentId") != null
+      ) {
+        this.$emit("itemlist", this.studentId, this.batchCode);
+      }
+      console.log(this.batchCode, this.studentId);
+    },
+    //点击批次
+    batchCodeshowclick() {
+      this.testScore();
+      this.batchCodeshow = true;
+    },
+    //点击批次左边
+    batchCodeclick(row) {
+      console.log(row);
+      this.batchCode = row.batchCode;
+      this.batchCodeshow = false;
+      localStorage.setItem("batchCode", this.batchCode);
+      if (this.studentId != "") {
+        this.$emit("itemlist", this.studentId, this.batchCode);
+      }
+    },
+    //批次
+    testScore() {
+      testScoreBatch(this.testqueryParams).then((res) => {
+        this.testScorelist = res.rows;
+        this.total4 = res.total;
+      });
+    },
+    // 点击学生按钮
+    studentshowclick() {
+      this.kindergartenName = "请选择幼儿园";
+      this.kindergartenId = "";
+      this.className = "请选择班级";
+      this.classId = "";
+      this.studentshow = true;
+      this.studentlist();
+    },
+    //学生左侧按钮
+    studentclick(row) {
+      this.studentname = row.studentName;
+      this.studentId = row.id;
+      this.studentshow = false;
+      localStorage.setItem("studentId", this.studentId);
+      localStorage.setItem("studentname", this.studentname);
+      if (this.batchCode != "") {
+        this.$emit("itemlist", this.studentId, this.batchCode);
+      }
+    },
+    //获取学生
+    studentlist() {
+      listStudentInfo(this.studentqueryParams).then((res) => {
+        this.studentInfoList = res.rows;
+        this.total3 = res.total;
+        // console.log(this.studentInfoList);
+      });
+    },
+    //点击所属班级
+    classshowclick() {
+      console.log(this.classqueryParams);
+      if (
+        this.classqueryParams.kindergartenId == "" ||
+        this.classqueryParams.kindergartenId == null
+      ) {
+        this.$message.error("请先选择幼儿园");
+      } else {
+        this.classshow = true;
+        this.classinfo();
+      }
+      //   console.log(this.classqueryParams);
+    },
+    //批次关闭
+    batchCodecancel() {
+      this.batchCodeshow = false;
+    },
+    //学生关闭
+    studentcancel() {
+      this.studentshow = false;
+    },
+    //幼儿园关闭
+    kindergartencancel() {
+      this.kindergartenshow = false;
+    },
+    //班级关闭
+    classcancel() {
+      this.classshow = false;
+    },
+    //班级左侧点击
+    classclick(row) {
+      //   console.log(row);
+      this.className = row.className;
+      this.classId = row.id;
+      this.studentqueryParams.classId = row.id;
+      this.classshow = false;
+      this.studentname = "请选择学生";
+      this.studentId = "";
+      this.studentlist();
+    },
+    //幼儿园左侧点击
+    kindergartenNameclick(row) {
+      this.classqueryParams.kindergartenId = row.id;
+      this.className = "请选择班级";
+      this.classId = "";
+      this.studentname = "请选择学生";
+      this.studentId = "";
+      this.kindergartenName = row.kindergartenName;
+      this.kindergartenId = row.id;
+      this.kindergartenshow = false;
+    },
+    //班级类型
+    class() {
+      tKindergartenInfo(this.ClassType).then((res) => {
+        this.dictValue1 = res.data[0].dictValue;
+        this.dictValue2 = res.data[1].dictValue;
+        this.dictValue3 = res.data[2].dictValue;
+        this.dictValue4 = res.data[3].dictValue;
+      });
+    },
+    //班级list
+    classinfo() {
+      listClassinfo(this.classqueryParams).then((response) => {
+        this.classinfoList = response.rows;
+        this.total2 = response.total;
+        // console.log(this.classinfoList);
+      });
+    },
+
+    getList() {
+      //用户权限
+      getRoleInfo().then((res) => {
+        console.log(res);
+        this.classqueryParams.kindergartenId = res.data.kindergartenId;
+        var user = res.data.roleKeys;
+        if (user.includes("enchou")) {
+          return;
+        } else if (user.includes("teacher")) {
+          return;
+        } else if (user.includes("parent")) {
+          return;
+        }
+      });
+      //获取幼儿园list
+      listKindergartenInfo(this.kqueryParams).then((response) => {
+        this.kindergartenList = response.rows;
+        this.total1 = response.total;
+        // console.log(this.kindergartenList);
+      });
+    },
+    //批次关闭
+    batchCodecancel() {
+      this.batchCodeshow = false;
+    },
+    // 表单重置
+    reset() {
+      this.form = {};
+      this.resetForm("form");
+    },
+  },
+};
+</script>
diff --git a/src/views/system/action/index.vue b/src/views/system/action/index.vue
index 9a11029..e8c3417 100644
--- a/src/views/system/action/index.vue
+++ b/src/views/system/action/index.vue
@@ -7,69 +7,18 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
-        <el-button
-          @click="kindergartenshow = true"
-          v-if="kindergartenName == '请选择幼儿园'"
-          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
-          >{{ kindergartenName }}</el-button
-        >
-        <el-button
-          @click="kindergartenshow = true"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ kindergartenName }}</el-button
-        >
-      </el-form-item>
+      <student
+        style="width: 500px; display: inline"
+        @itemlist="itemlists"
+      ></student>
 
-      <el-form-item
-        label="所属班级"
-        prop="categoryName"
-        label-width="70px"
-        v-if="showbj"
-      >
+      <el-form-item>
         <el-button
-          @click="classshowclick"
-          style="width: 250px; 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"
-          v-else
-          >{{ className }}</el-button
-        >
-      </el-form-item>
-
-      <el-form-item label="学生" prop="categoryName" label-width="45px">
-        <el-button
-          @click="studentshowclick"
-          v-if="studentname == '请选择学生'"
-          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
-          >{{ studentname }}</el-button
-        >
-        <el-button
-          @click="studentshowclick"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ studentname }}</el-button
-        >
-      </el-form-item>
-
-      <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="batchCodeName == '请选择批次'"
-          >{{ batchCodeName }}</el-button
-        >
-        <el-button
-          @click="batchCodeshowclick"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ batchCodeName }}</el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >查看</el-button
         >
       </el-form-item>
     </el-form>
@@ -79,360 +28,85 @@
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
-
-    <!-- //批次 -->
-    <el-dialog
-      width="590px"
-      title="选择批次"
-      :visible.sync="batchCodeshow"
-      append-to-body
-      style="margin-top: 20px"
-      :before-close="batchCodecancel"
-    >
-      <el-table :data="testScorelist" align="center" style="margin-top: 0px">
-        <el-table-column label="请选择" width="100" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 20px; height: 20px"
-              v-if="batchCodeId == scope.row.id"
-              circle
-              @click="batchCodeclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="batchCodeclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
+    <div v-if="itemshow" style="width:1361px;margin: 10px auto">
+      <el-table
+        :data="actionlist"
+        border
+        :span-method="arraySpanMethod"
+        style="width:100%"
+      >
         <el-table-column
-          property="batchCode"
-          label="批次编号"
-          width="200"
-          align="center"
-        />
-        <el-table-column
-          property="batchName"
-          label="批次名称"
-          width="200"
-          align="center"
-        />
-      </el-table>
-      <pagination
-        v-show="total4 > 0"
-        :total="total4"
-        :page.sync="testqueryParams.pageNum"
-        :limit.sync="testqueryParams.pageSize"
-        @pagination="testScore"
-      />
-    </el-dialog>
-
-    <!-- //学生 -->
-    <el-dialog
-      width="850px"
-      title="选择学生"
-      :visible.sync="studentshow"
-      append-to-body
-      style="margin-top: 70px"
-      :before-close="studentcancel"
-    >
-      <el-table :data="studentInfoList" align="center" style="margin-top: 10px">
-        <el-table-column label="请选择" width="70" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 20px; height: 20px"
-              circle
-              v-if="studentId == scope.row.id"
-              @click="studentclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="studentclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="className"
-          label="班级名称"
-          width="190"
-          align="center"
-        />
-        <el-table-column
-          property="studentName"
-          label="学生姓名"
-          width="190"
-          align="center"
-        />
-        <el-table-column
-          property="studentName"
-          label="性别"
-          width="190"
-          align="center"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.studentSex == "MALE" ? "男" : "女" }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="homeAddress"
-          label="住址"
-          width="190"
-          align="center"
-        />
-      </el-table>
-      <pagination
-        v-show="total3 > 0"
-        :total="total3"
-        :page.sync="studentqueryParams.pageNum"
-        :limit.sync="studentqueryParams.pageSize"
-        @pagination="studentlist"
-      />
-    </el-dialog>
-
-    <!-- //幼儿园 -->
-    <el-dialog
-      width="850px"
-      title="选择所属幼儿园"
-      :visible.sync="kindergartenshow"
-      append-to-body
-      :before-close="kindergartencancel"
-    >
-      <el-table :data="kindergartenList">
-        <el-table-column label="请选择" width="70" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 15px; height: 15px"
-              circle
-              @click="kindergartenNameclick(scope.row)"
-              v-if="kindergartenId == scope.row.id"
-            ></el-button>
-
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="kindergartenNameclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          property="kindergartenName"
-          label="幼儿园名字"
-          width="150"
+          prop="categoryName"
+          label="测试分类"
+          width="140"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          property="kindergartenAddress"
-          label="幼儿园地址"
-          width="150"
+          prop="itemName"
+          label="测试项目"
+          width="135"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          label="幼儿园所在组织"
-          align="center"
-          prop="organizeName"
-          width="150"
-        >
-        </el-table-column>
-        <el-table-column
-          property="contacts"
-          label="联系人"
-          width="150"
+          prop="itemFraction"
+          label="动作技能总分"
+          width="115"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          property="phone"
-          label="联系电话"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total1 > 0"
-        :total="total1"
-        :page.sync="kqueryParams.pageNum"
-        :limit.sync="kqueryParams.pageSize"
-        @pagination="getList"
-      />
-    </el-dialog>
-
-    <!-- //班级 -->
-    <el-dialog
-      width="1000px"
-      title="选择所属班级"
-      :visible.sync="classshow"
-      append-to-body
-      :before-close="classcancel"
-    >
-      <el-table :data="classinfoList" align="center" style="margin-top: 10px">
-        <el-table-column label="请选择" width="70" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 20px; height: 20px"
-              circle
-              @click="classclick(scope.row)"
-              v-if="classId == scope.row.id"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="classclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="kindergartenName"
-          label="幼儿园名称"
-          width="190"
-          align="center"
-        />
-        <el-table-column
-          property="className"
-          label="班级名称"
-          width="180"
+          prop="unifiedStandardScore"
+          label="统一最高得分"
+          width="115"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          property="classType"
-          label="班级类型"
+          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"
         >
-          <template slot-scope="scope">
-            {{ scope.row.classType == dictValue1 ? "大班" : "" }}
-            {{ scope.row.classType == dictValue2 ? "中班" : "" }}
-            {{ scope.row.classType == dictValue3 ? "小班" : "" }}
-            {{ scope.row.classType == dictValue4 ? "毕业" : "" }}
-          </template>
         </el-table-column>
-
         <el-table-column
-          property="classTeacher"
-          label="班主任姓名"
+          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-column
-          property="phone"
-          label="联系电话"
-          width="190"
-          align="center"
-        >
-        </el-table-column>
       </el-table>
-      <pagination
-        v-show="total2 > 0"
-        :total="total2"
-        :page.sync="classqueryParams.pageNum"
-        :limit.sync="classqueryParams.pageSize"
-        @pagination="classinfo"
-      />
-    </el-dialog>
-
-    <el-row v-show="itemshow">
-      <el-col :span="24" class="card-box" style="">
-        <!-- <el-card> -->
-        <div slot="header" style="text-align: center; font-size: 25px">
-          <span></span>
-        </div>
-        <div style="width: 100%; display: flex; flex-wrap: wrap">
-          <el-table
-            :data="actionlist"
-            border
-            :span-method="arraySpanMethod"
-            style="width: 100%; margin-top: 20px"
-          >
-            <el-table-column
-              prop="categoryName"
-              label="测试分类"
-              width="150"
-              align="center"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="itemName"
-              label="测试项目"
-              width="150"
-              align="center"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="itemFraction"
-              label="动作技能总分"
-              width="120"
-              align="center"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="unifiedStandardScore"
-              label="统一最高得分"
-              width="120"
-              align="center"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="smallStandardScore"
-              label="小班最高得分"
-              width="120"
-              align="center"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="middleStandardScore"
-              label="中班最高得分"
-              width="120"
-              align="center"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="largeStandardScore"
-              label="大班最高得分"
-              width="120"
-              align="center"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="itemScoreAll"
-              label="综合得分"
-              width="176"
-              align="center"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="syntheticalAssess"
-              label="综合评价"
-              width="180"
-              align="center"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="remark"
-              label="测试目的"
-              width="180"
-              align="center"
-            >
-            </el-table-column>
-          </el-table>
-        </div>
-        <!-- </el-card> -->
-      </el-col>
-    </el-row>
-
+    </div>
     <el-row :gutter="20" v-if="itemshow2">
       <el-col :span="24" :offset="0">
         <el-card>
@@ -448,106 +122,19 @@
   </div>
 </template>
 <script>
-import {
-  listKindergartenInfo,
-  tKindergartenInfo,
-} from "@/api/system/kindergartenInfo";
-import { listStudentInfo } from "@/api/system/studentInfo";
-import { listClassinfo } from "@/api/system/classinfo";
-import { getRoleInfo, testScoreBatch } from "@/api/system/quality";
+import student from "@/views/assembly/student.vue";
+import { getRoleInfo } from "@/api/system/quality";
 import { listAction } from "@/api/system/action";
 
 export default {
   name: "action",
-  components: {},
+  components: { student },
   data() {
     return {
       itemshow: false,
       itemshow2: false,
-      showyey: true,
-      showbj: true,
-      total1: 0,
-      total2: 0,
-      total3: 0,
-      total4: 0,
-      //遮罩层
-      kindergartenshow: false,
-      classshow: false,
-      studentshow: false,
-      batchCodeshow: false,
-      //班级类型
-      dictValue1: "",
-      dictValue2: "",
-      dictValue3: "",
-      dictValue4: "",
-      ClassType: "class_type",
       // 显示搜索条件
       showSearch: true,
-      // 表单参数
-      form: {},
-      //学生查询
-      studentqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        classId: "",
-        nationDictId: null,
-        studentName: null,
-        studentSex: null,
-        studentNumber: null,
-        birthDate: null,
-        cardNumber: null,
-        onceName: null,
-        homeAddress: null,
-      },
-      //班级查询
-      classqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        kindergartenId: "",
-        className: null,
-        classType: null,
-      },
-      //幼儿园查询参数
-      kqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        organizeId: null,
-        kindergartenName: null,
-        kindergartenAddress: null,
-        kindergartenType: null,
-        phone: null,
-        contacts: null,
-      },
-      //幼儿园list
-      kindergartenList: [],
-      //幼儿园名字
-      kindergartenName: "请选择幼儿园",
-      //幼儿园ID
-      kindergartenId: "",
-      //班级list
-      classinfoList: [],
-      //班级名字
-      className: "请选择班级",
-      //班级ID
-      classId: "",
-      //学生list
-      studentInfoList: [],
-      //学生名字
-      studentname: "请选择学生",
-      //学生ID
-      studentId: "",
-      //批次名称
-      batchCodeName: "请选择批次",
-      //批次ID
-      batchCodeId: "",
-      //批次list
-      testScorelist: [],
-      //批次编号
-      testqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-      },
-      //
       actionlist: [],
       spanArr: [],
       position: 0, // 标记位置
@@ -564,16 +151,8 @@ export default {
       },
     };
   },
-  created() {
-    this.getList();
-    this.class();
-    // this.listActioninfo();
-  },
-  mounted() {
-    // 需求，也就是合并多少行，
-    // 对于被合并的单元格，rowspan和colspan都为零。而合并的单元格，他的colspan为1，因为它不跨列。
-    // 对表格数据进行以下处理。假设要合并的字段为a。相同的a单元格合并起来。
-  },
+  created() {},
+  mounted() {},
   methods: {
     actionforeach() {
       this.actionlist.forEach((item, index) => {
@@ -597,8 +176,10 @@ export default {
           }
 
           if (
+            this.actionlist[index].categoryName ==
+              this.actionlist[index - 1].categoryName &&
             this.actionlist[index].itemScoreAll ==
-            this.actionlist[index - 1].itemScoreAll
+              this.actionlist[index - 1].itemScoreAll
           ) {
             this.spanArr2[this.position] += 1;
             this.spanArr2.push(0); // 下一个位置 给 0
@@ -623,7 +204,8 @@ export default {
           rowspan: _row,
           colspan: _col,
         };
-      } else if (columnIndex == 7) {
+      }
+      if (columnIndex == 7) {
         // console.log(this.spanArr2);
         const _row = this.spanArr2[rowIndex];
         const _col = _row > 0 ? 1 : 0;
@@ -643,7 +225,6 @@ export default {
           //   res.rows.itemCategoryList.forEach((e) => {
           //     e.push(res.rows.categoryName);
           //   });
-
           this.actionlist = res.rows;
           this.actionforeach();
           this.itemshow = true;
@@ -652,136 +233,19 @@ export default {
         }
       });
     },
-    // 点击学生按钮
-    studentshowclick() {
-      if (this.studentqueryParams.classId == "") {
-        this.$message.error("请先选择班级");
-      } else {
-        this.studentshow = true;
-        this.studentlist();
-      }
+    itemlists(studentId, batchCode) {
+      console.log(studentId, batchCode);
+      this.queryParams.studentId = studentId;
+      this.queryParams.batchCode = batchCode;
     },
-    //点击批次
-    batchCodeshowclick() {
-      if (this.queryParams.studentId == "") {
-        this.$message.error("请先选择学生");
-      } else {
-        this.testScore();
-        this.batchCodeshow = true;
-      }
-    },
-    //点击批次左边
-    batchCodeclick(row) {
+    /** 查看按钮操作 */
+    handleQuery() {
       this.spanArr = [];
       this.position = 0; // 标记位置
       this.spanArr2 = [];
       this.position2 = 0; // 标记位置
-      console.log(row);
-      this.batchCodeName = row.batchName;
-      this.batchCodeId = row.id;
-      this.queryParams.batchCode = row.batchCode;
-      this.batchCodeshow = false;
       this.listActioninfo();
     },
-    //批次
-    testScore() {
-      testScoreBatch(this.testqueryParams).then((res) => {
-        this.testScorelist = res.rows;
-        this.total4 = res.total;
-      });
-    },
-    //获取学生
-    studentlist() {
-      listStudentInfo(this.studentqueryParams).then((res) => {
-        this.studentInfoList = res.rows;
-        this.total3 = res.total;
-        // console.log(this.studentInfoList);
-      });
-    },
-    //点击所属班级
-    classshowclick() {
-      if (
-        this.classqueryParams.kindergartenId == "" ||
-        this.classqueryParams.kindergartenId == null
-      ) {
-        this.$message.error("请先选择幼儿园");
-      } else {
-        this.classshow = true;
-        this.classinfo();
-      }
-      //   console.log(this.classqueryParams);
-    },
-    //批次关闭
-    batchCodecancel() {
-      this.batchCodeshow = false;
-    },
-    //学生关闭
-    studentcancel() {
-      this.studentshow = false;
-    },
-    //幼儿园关闭
-    kindergartencancel() {
-      this.kindergartenshow = false;
-    },
-    //班级关闭
-    classcancel() {
-      this.classshow = false;
-    }, //学生左侧按钮
-    studentclick(row) {
-      this.spanArr = [];
-      this.position = 0; // 标记位置
-      this.spanArr2 = [];
-      this.position2 = 0; // 标记位置
-      this.studentname = row.studentName;
-      this.studentId = row.id;
-      this.studentshow = false;
-      this.queryParams.studentId = row.id;
-      if (this.queryParams.batchCode != "") {
-        this.listActioninfo();
-      }
-    },
-    //班级左侧点击
-    classclick(row) {
-      //   console.log(row);
-      this.className = row.className;
-      this.classId = row.id;
-      this.studentqueryParams.classId = row.id;
-      this.studentname = "请选择学生";
-      this.studentId = "";
-      this.queryParams.studentId = "";
-      this.classshow = false;
-    },
-    //幼儿园左侧点击
-    kindergartenNameclick(row) {
-      this.classqueryParams.kindergartenId = row.id;
-      this.kindergartenName = row.kindergartenName;
-      this.kindergartenId = row.id;
-      this.kindergartenId = row.id;
-      this.className = "请选择班级";
-      this.classId = "";
-      this.studentname = "请选择学生";
-      this.studentId = "";
-      this.queryParams.studentId = "";
-      this.kindergartenshow = false;
-    },
-    //班级类型
-    class() {
-      tKindergartenInfo(this.ClassType).then((res) => {
-        this.dictValue1 = res.data[0].dictValue;
-        this.dictValue2 = res.data[1].dictValue;
-        this.dictValue3 = res.data[2].dictValue;
-        this.dictValue4 = res.data[3].dictValue;
-      });
-    },
-    //班级list
-    classinfo() {
-      listClassinfo(this.classqueryParams).then((response) => {
-        this.classinfoList = response.rows;
-        this.total2 = response.total;
-
-        // console.log(this.classinfoList);
-      });
-    },
 
     getList() {
       //用户权限
@@ -789,25 +253,14 @@ export default {
         console.log(res);
         this.classqueryParams.kindergartenId = res.data.kindergartenId;
         var user = res.data.roleKeys;
-        console.log(user);
         if (user.includes("enchou")) {
-          this.showyey = false;
           return;
         } else if (user.includes("teacher")) {
-          this.showyey = false;
           return;
         } else if (user.includes("parent")) {
-          this.showyey = false;
-          this.showbj = false;
           return;
         }
       });
-      //获取幼儿园list
-      listKindergartenInfo(this.kqueryParams).then((response) => {
-        this.kindergartenList = response.rows;
-        this.total1 = response.total;
-        // console.log(this.kindergartenList);
-      });
     },
     // 表单重置
     reset() {
@@ -821,4 +274,7 @@ export default {
 ::v-deep .el-card__header {
   border: none;
 }
+::v-deep .el-form {
+  display: inline;
+}
 </style>
diff --git a/src/views/system/classconstitution/index.vue b/src/views/system/classconstitution/index.vue
index 534869a..c4227bc 100644
--- a/src/views/system/classconstitution/index.vue
+++ b/src/views/system/classconstitution/index.vue
@@ -7,27 +7,11 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
-        <el-button
-          @click="kindergartenshow = true"
-          v-if="kindergartenName == '请选择幼儿园'"
-          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
-          >{{ kindergartenName }}</el-button
-        >
-        <el-button
-          @click="kindergartenshow = true"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ kindergartenName }}</el-button
-        >
-      </el-form-item>
-
-      <el-form-item
-        label="所属班级"
-        prop="categoryName"
-        label-width="70px"
-        v-if="showbj"
-      >
+      <kindergarten
+        @kinbatlist="kinbatlist"
+        style="width: 500px; display: inline"
+      ></kindergarten>
+      <el-form-item label="所属班级" prop="categoryName" label-width="70px">
         <el-button
           @click="classshowclick"
           style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
@@ -42,19 +26,13 @@
           >{{ className }}</el-button
         >
       </el-form-item>
-
-      <el-form-item label="批次成绩" prop="categoryName" label-width="70px">
+      <el-form-item>
         <el-button
-          @click="batchCodeshowclick"
-          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
-          v-if="batchCodeName == '请选择批次'"
-          >{{ batchCodeName }}</el-button
-        >
-        <el-button
-          @click="batchCodeshowclick"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ batchCodeName }}</el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >查看</el-button
         >
       </el-form-item>
     </el-form>
@@ -65,128 +43,6 @@
       ></right-toolbar>
     </el-row>
 
-    <!-- //批次 -->
-    <el-dialog
-      width="590px"
-      title="选择批次"
-      :visible.sync="batchCodeshow"
-      append-to-body
-      style="margin-top: 20px"
-      :before-close="batchCodecancel"
-    >
-      <el-table :data="testScorelist" align="center" style="margin-top: 0px">
-        <el-table-column label="请选择" width="100" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 20px; height: 20px"
-              v-if="batchCodeId == scope.row.id"
-              circle
-              @click="batchCodeclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="batchCodeclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="batchCode"
-          label="批次编号"
-          width="200"
-          align="center"
-        />
-        <el-table-column
-          property="batchName"
-          label="批次名称"
-          width="200"
-          align="center"
-        />
-      </el-table>
-      <pagination
-        v-show="total4 > 0"
-        :total="total4"
-        :page.sync="testqueryParams.pageNum"
-        :limit.sync="testqueryParams.pageSize"
-        @pagination="testScore"
-      />
-    </el-dialog>
-
-    <!-- //幼儿园 -->
-    <el-dialog
-      width="850px"
-      title="选择所属幼儿园"
-      :visible.sync="kindergartenshow"
-      append-to-body
-      :before-close="kindergartencancel"
-    >
-      <el-table :data="kindergartenList">
-        <el-table-column label="请选择" width="70" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 15px; height: 15px"
-              circle
-              @click="kindergartenNameclick(scope.row)"
-              v-if="kindergartenId == scope.row.id"
-            ></el-button>
-
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="kindergartenNameclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          property="kindergartenName"
-          label="幼儿园名字"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="kindergartenAddress"
-          label="幼儿园地址"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          label="幼儿园所在组织"
-          align="center"
-          prop="organizeName"
-          width="150"
-        >
-        </el-table-column>
-        <el-table-column
-          property="contacts"
-          label="联系人"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="phone"
-          label="联系电话"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total1 > 0"
-        :total="total1"
-        :page.sync="kqueryParams.pageNum"
-        :limit.sync="kqueryParams.pageSize"
-        @pagination="getList"
-      />
-    </el-dialog>
-
     <!-- //班级 -->
     <el-dialog
       width="1000px"
@@ -384,30 +240,20 @@
 
 <script>
 import * as echarts from "echarts";
-
-import {
-  listKindergartenInfo,
-  tKindergartenInfo,
-} from "@/api/system/kindergartenInfo";
+import { tKindergartenInfo } from "@/api/system/kindergartenInfo";
 import { listClassinfo } from "@/api/system/classinfo";
-import { getRoleInfo, testScoreBatch } from "@/api/system/quality";
+import { getRoleInfo } from "@/api/system/quality";
 import { ClassList } from "@/api/system/classconstitution";
+import kindergarten from "../../assembly/kindergarten.vue";
 export default {
+  components: { kindergarten },
   name: "classconstitution",
   data() {
     return {
       itemshow: false,
       itemshow2: false,
-      showyey: true,
-      showbj: true,
-      total1: 0,
-      total2: 0,
-      total4: 0,
-      //遮罩层
-      kindergartenshow: false,
       classshow: false,
-      studentshow: false,
-      batchCodeshow: false,
+      total2: 0,
       //班级类型
       dictValue1: "",
       dictValue2: "",
@@ -416,8 +262,6 @@ export default {
       ClassType: "class_type",
       // 显示搜索条件
       showSearch: true,
-      // 表单参数
-      form: {},
       //班级查询
       classqueryParams: {
         pageNum: 1,
@@ -426,52 +270,23 @@ export default {
         className: null,
         classType: null,
       },
-      //幼儿园查询参数
-      kqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        organizeId: null,
-        kindergartenName: null,
-        kindergartenAddress: null,
-        kindergartenType: null,
-        phone: null,
-        contacts: null,
-      },
-      //幼儿园list
-      kindergartenList: [],
-      //幼儿园名字
-      kindergartenName: "请选择幼儿园",
-      //幼儿园ID
-      kindergartenId: "",
       //班级list
       classinfoList: [],
       //班级名字
       className: "请选择班级",
       //班级ID
       classId: "",
-      //批次名称
-      batchCodeName: "请选择批次",
-      //批次ID
-      batchCodeId: "",
-      //批次list
-      testScorelist: [],
       // 查询参数
       ClassListlist: {
         batchCode: "",
         kindergartenId: "",
         classId: "",
-
         // batchCode: "PC202208030005",
         // kindergartenId: "18",
         // classId: "2",
         pageNum: 1,
         pageSize: 10,
       },
-      //批次编号
-      testqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-      },
       categoryTableNameList: [],
       categoryAgeFractionList: [],
       categoryScoreList: [],
@@ -486,6 +301,20 @@ export default {
     // this.ClassListinfo();
   },
   methods: {
+    handleQuery() {
+      this.ClassListinfo();
+    },
+    kinbatlist(kindergartenId, batchCode) {
+      console.log(kindergartenId, batchCode);
+      if (this.ClassListlist.kindergartenId != "") {
+        this.classqueryParams.kindergartenId = "";
+        this.className = "请选择班级";
+        this.classId = "";
+      }
+      this.ClassListlist.kindergartenId = kindergartenId;
+      this.ClassListlist.batchCode = batchCode;
+      this.classqueryParams.kindergartenId = kindergartenId;
+    },
     ClassListinfo() {
       ClassList(this.ClassListlist).then((res) => {
         console.log(res);
@@ -686,50 +515,10 @@ export default {
         }
       });
     },
-    //点击批次
-    batchCodeshowclick() {
-      if (this.ClassListlist.classId == "") {
-        this.$message.error("请先选择班级");
-      } else {
-        this.testScore();
-        this.batchCodeshow = true;
-      }
-    },
-    //点击批次左边
-    batchCodeclick(row) {
-      this.batchCodeName = row.batchName;
-      this.batchCodeId = row.id;
-      this.ClassListlist.batchCode = row.batchCode;
-      this.batchCodeshow = false;
-      this.ClassListinfo();
-    },
-    //批次
-    testScore() {
-      testScoreBatch(this.testqueryParams).then((res) => {
-        this.testScorelist = res.rows;
-        this.total4 = res.total;
-      });
-    },
     //点击所属班级
     classshowclick() {
-      if (
-        this.classqueryParams.kindergartenId == "" ||
-        this.classqueryParams.kindergartenId == null
-      ) {
-        this.$message.error("请先选择幼儿园");
-      } else {
-        this.classshow = true;
-        this.classinfo();
-      }
-      //   console.log(this.classqueryParams);
-    },
-    //批次关闭
-    batchCodecancel() {
-      this.batchCodeshow = false;
-    },
-    //幼儿园关闭
-    kindergartencancel() {
-      this.kindergartenshow = false;
+      this.classinfo();
+      this.classshow = true;
     },
     //班级关闭
     classcancel() {
@@ -742,20 +531,6 @@ export default {
       this.classId = row.id;
       this.ClassListlist.classId = row.id;
       this.classshow = false;
-      if (this.ClassListlist.batchCode != "") {
-        this.ClassListinfo();
-      }
-    },
-    //幼儿园左侧点击
-    kindergartenNameclick(row) {
-      this.classqueryParams.kindergartenId = row.id;
-      this.ClassListlist.kindergartenId = row.id;
-      this.kindergartenName = row.kindergartenName;
-      this.kindergartenId = row.id;
-      this.className = "请选择班级";
-      this.classId = "";
-      this.ClassListlist.classId = "";
-      this.kindergartenshow = false;
     },
     //班级类型
     class() {
@@ -771,7 +546,6 @@ export default {
       listClassinfo(this.classqueryParams).then((response) => {
         this.classinfoList = response.rows;
         this.total2 = response.total;
-        // console.log(this.classinfoList);
       });
     },
 
@@ -781,27 +555,16 @@ export default {
         console.log(res);
         this.ClassListlist.kindergartenId = res.data.kindergartenId;
         this.classqueryParams.kindergartenId = res.data.kindergartenId;
-
         var user = res.data.roleKeys;
         console.log(user);
         if (user.includes("enchou")) {
-          this.showyey = false;
           return;
         } else if (user.includes("teacher")) {
-          this.showyey = false;
           return;
         } else if (user.includes("parent")) {
-          this.showyey = false;
-          this.showbj = false;
           return;
         }
       });
-      //获取幼儿园list
-      listKindergartenInfo(this.kqueryParams).then((response) => {
-        this.kindergartenList = response.rows;
-        this.total1 = response.total;
-        // console.log(this.kindergartenList);
-      });
     },
     // 表单重置
     reset() {
@@ -811,3 +574,8 @@ export default {
   },
 };
 </script>
+<style scoped='scss'>
+::v-deep .el-form {
+  display: inline;
+}
+</style>
diff --git a/src/views/system/classinfo/index.vue b/src/views/system/classinfo/index.vue
index 7e7f822..60e5ee2 100644
--- a/src/views/system/classinfo/index.vue
+++ b/src/views/system/classinfo/index.vue
@@ -247,7 +247,9 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
 
-      <el-dialog
+      
+    </el-dialog>
+    <el-dialog
         width="850px"
         title="选择所属幼儿园"
         :visible.sync="innerVisible"
@@ -293,7 +295,7 @@
 
         <el-table
           :data="kindergartenInfoList"
-          @row-click="kindergartenNameclick"
+          @cell-dblclick="kindergartenNameclick"
         >
           <el-table-column label="请选择" width="70" align="center">
             <template slot-scope="scope">
@@ -359,7 +361,6 @@
           @pagination="getList"
         />
       </el-dialog>
-    </el-dialog>
   </div>
 </template>
 
diff --git a/src/views/system/comprehensive/index.vue b/src/views/system/comprehensive/index.vue
index 0cd6265..e8a38ec 100644
--- a/src/views/system/comprehensive/index.vue
+++ b/src/views/system/comprehensive/index.vue
@@ -7,72 +7,22 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
-        <el-button
-          @click="kindergartenshow = true"
-          v-if="kindergartenName == '请选择幼儿园'"
-          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
-          >{{ kindergartenName }}</el-button
-        >
-        <el-button
-          @click="kindergartenshow = true"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ kindergartenName }}</el-button
-        >
-      </el-form-item>
+      <student
+        style="width: 500px; display: inline"
+        @itemlist="itemlists"
+      ></student>
 
-      <el-form-item
-        label="所属班级"
-        prop="categoryName"
-        label-width="70px"
-        v-if="showbj"
-      >
+      <el-form-item>
         <el-button
-          @click="classshowclick"
-          style="width: 250px; 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"
-          v-else
-          >{{ className }}</el-button
-        >
-      </el-form-item>
-
-      <el-form-item label="学生" prop="categoryName" label-width="45px">
-        <el-button
-          @click="studentshowclick"
-          v-if="studentname == '请选择学生'"
-          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
-          >{{ studentname }}</el-button
-        >
-        <el-button
-          @click="studentshowclick"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ studentname }}</el-button
-        >
-      </el-form-item>
-
-      <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="batchCodeName == '请选择批次'"
-          >{{ batchCodeName }}</el-button
-        >
-        <el-button
-          @click="batchCodeshowclick"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ batchCodeName }}</el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >查看</el-button
         >
       </el-form-item>
     </el-form>
+
     <el-row :gutter="10" class="mb8">
       <right-toolbar
         :showSearch.sync="showSearch"
@@ -80,270 +30,6 @@
       ></right-toolbar>
     </el-row>
 
-    <!-- //批次 -->
-    <el-dialog
-      width="590px"
-      title="选择批次"
-      :visible.sync="batchCodeshow"
-      append-to-body
-      style="margin-top: 20px"
-      :before-close="batchCodecancel"
-    >
-      <el-table :data="testScorelist" align="center" style="margin-top: 0px">
-        <el-table-column label="请选择" width="100" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 20px; height: 20px"
-              v-if="batchCodeId == scope.row.id"
-              circle
-              @click="batchCodeclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="batchCodeclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="batchCode"
-          label="批次编号"
-          width="200"
-          align="center"
-        />
-        <el-table-column
-          property="batchName"
-          label="批次名称"
-          width="200"
-          align="center"
-        />
-      </el-table>
-      <pagination
-        v-show="total4 > 0"
-        :total="total4"
-        :page.sync="testqueryParams.pageNum"
-        :limit.sync="testqueryParams.pageSize"
-        @pagination="testScore"
-      />
-    </el-dialog>
-
-    <!-- //学生 -->
-    <el-dialog
-      width="850px"
-      title="选择学生"
-      :visible.sync="studentshow"
-      append-to-body
-      style="margin-top: 70px"
-      :before-close="studentcancel"
-    >
-      <el-table :data="studentInfoList" align="center" style="margin-top: 10px">
-        <el-table-column label="请选择" width="70" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 20px; height: 20px"
-              circle
-              v-if="studentId == scope.row.id"
-              @click="studentclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="studentclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="className"
-          label="班级名称"
-          width="190"
-          align="center"
-        />
-        <el-table-column
-          property="studentName"
-          label="学生姓名"
-          width="190"
-          align="center"
-        />
-        <el-table-column
-          property="studentName"
-          label="性别"
-          width="190"
-          align="center"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.studentSex == "MALE" ? "男" : "女" }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="homeAddress"
-          label="住址"
-          width="190"
-          align="center"
-        />
-      </el-table>
-      <pagination
-        v-show="total3 > 0"
-        :total="total3"
-        :page.sync="studentqueryParams.pageNum"
-        :limit.sync="studentqueryParams.pageSize"
-        @pagination="studentlist"
-      />
-    </el-dialog>
-
-    <!-- //幼儿园 -->
-    <el-dialog
-      width="850px"
-      title="选择所属幼儿园"
-      :visible.sync="kindergartenshow"
-      append-to-body
-      :before-close="kindergartencancel"
-    >
-      <el-table :data="kindergartenList">
-        <el-table-column label="请选择" width="70" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 15px; height: 15px"
-              circle
-              @click="kindergartenNameclick(scope.row)"
-              v-if="kindergartenId == scope.row.id"
-            ></el-button>
-
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="kindergartenNameclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          property="kindergartenName"
-          label="幼儿园名字"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="kindergartenAddress"
-          label="幼儿园地址"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          label="幼儿园所在组织"
-          align="center"
-          prop="organizeName"
-          width="150"
-        >
-        </el-table-column>
-        <el-table-column
-          property="contacts"
-          label="联系人"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="phone"
-          label="联系电话"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total1 > 0"
-        :total="total1"
-        :page.sync="kqueryParams.pageNum"
-        :limit.sync="kqueryParams.pageSize"
-        @pagination="getList"
-      />
-    </el-dialog>
-
-    <!-- //班级 -->
-    <el-dialog
-      width="1000px"
-      title="选择所属班级"
-      :visible.sync="classshow"
-      append-to-body
-      :before-close="classcancel"
-    >
-      <el-table :data="classinfoList" align="center" style="margin-top: 10px">
-        <el-table-column label="请选择" width="70" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 20px; height: 20px"
-              circle
-              @click="classclick(scope.row)"
-              v-if="classId == scope.row.id"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="classclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="kindergartenName"
-          label="幼儿园名称"
-          width="190"
-          align="center"
-        />
-        <el-table-column
-          property="className"
-          label="班级名称"
-          width="180"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="classType"
-          label="班级类型"
-          width="160"
-          align="center"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.classType == dictValue1 ? "大班" : "" }}
-            {{ scope.row.classType == dictValue2 ? "中班" : "" }}
-            {{ scope.row.classType == dictValue3 ? "小班" : "" }}
-            {{ scope.row.classType == dictValue4 ? "毕业" : "" }}
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          property="classTeacher"
-          label="班主任姓名"
-          width="180"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="phone"
-          label="联系电话"
-          width="190"
-          align="center"
-        >
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total2 > 0"
-        :total="total2"
-        :page.sync="classqueryParams.pageNum"
-        :limit.sync="classqueryParams.pageSize"
-        @pagination="classinfo"
-      />
-    </el-dialog>
-
     <el-row v-show="itemshow">
       <el-col :span="24" class="card-box">
         <el-card>
@@ -356,15 +42,10 @@
               margin-top: 10px;
               padding-bottom: 20px;
               border-bottom: 1px solid #f0f0f0;
+              padding-left: 20px;
             "
           >
-            <div
-              style="
-                display: flex;
-                justify-content: space-around;
-                text-align: center;
-              "
-            >
+            <div style="display: flex; justify-content: space-around">
               <div class="cell" style="width: 20%">
                 姓名:{{ sythesizestudent.studentName }}
               </div>
@@ -383,12 +64,12 @@
             </div>
 
             <div style="display: flex; margin-top: 20px">
-              <div class="cell" style="width: 60%; margin-left: 7.7%">
+              <div class="cell" style="width: 60%">
                 所属幼儿园:{{ sythesizestudent.kindergartenName }}
               </div>
               <div class="cell">班级:{{ sythesizestudent.className }}</div>
             </div>
-            <div style="margin-top: 20px; margin-left: 7.7%">
+            <div style="width: 60%; margin-top: 20px">
               <div class="cell">
                 地址:{{ sythesizestudent.kindergartenAddress }}
               </div>
@@ -397,17 +78,20 @@
         </el-card>
       </el-col>
       <el-col :span="24" class="card-box">
-        <el-card style="margin-top: 40px">
+        <el-card style="margin-top: 10px">
           <div
             class="el-table--enable-row-hover el-table--medium"
-            style="margin: 20px auto; height: 40px; text-align: center"
+            style="margin: 20px auto;height: 110px; text-align: center;border-bottom:1px solid #f0f0f0;line-height:40px"
           >
+           <div style="text-align: center; font-size: 18px; margin-bottom: 10px">
+            幼儿综合得分
+          </div>
             <div style="display: inline-block">
               <span
                 style="
                   position: relative;
                   display: inline-block;
-                  width: 80px;
+                  width: 160px;
                   text-align: center;
                 "
                 v-for="(item, index) in sythesizestudent.firstItemCategoryList"
@@ -416,19 +100,15 @@
                 <span :style="index == 0 ? '' : 'margin-right:20px'">{{
                   index == 0 ? null : "+"
                 }}</span>
+
                 <span>
-                  {{ item.categoryScore }}
+                  {{ item.categoryName }}( {{ item.categoryScore }})
                 </span>
-                <span
-                  :style="index != 0 ? 'left:18px' : ''"
-                  style="position: absolute; left: 0px; top: 20px; width: 80px"
-                  >{{ item.categoryName }}</span
-                >
               </span>
             </div>
             <div style="display: inline-block; position: relative">
               <span style="margin: 0 20px">= </span>
-              <span>{{ sythesizestudent.totalCategoryScore }}</span>
+              <span>综合得分({{ sythesizestudent.totalCategoryScore }})</span>
 
               <span
                 style="
@@ -438,19 +118,19 @@
                   width: 80px;
                   left: 29px;
                 "
-                >(综合得分)</span
-              >
+              ></span>
             </div>
           </div>
-          <div style="text-align: center; font-size: 25px; margin-top: 30px">
+          <div style="text-align: center; font-size: 18px; margin-top: 20px">
             获取徽章
           </div>
           <div
             style="
+              width: 70%;
               display: flex;
               text-align: center;
               justify-content: space-around;
-              margin-top: 20px;
+              margin: 20px auto 10px;
             "
           >
             <span
@@ -458,17 +138,17 @@
               :key="index"
             >
               <img
-                style="width: 80px; height: 80px"
+                style="width: 60px; height: 60px"
                 src="@/icons/金牌2.png"
                 alt=""
               />
-              <div style="margin-top: 10px">{{ item }}</div>
+              <div style="margin-top: 10px;font-size:14px">{{ item }}</div>
             </span>
           </div>
         </el-card>
       </el-col>
 
-      <el-col :span="24" class="card-box" style="margin-top: 40px">
+      <el-col :span="24" class="card-box" style="margin-top: 10px">
         <el-card>
           <div slot="header" style="text-align: center">
             <span>综合体质分析图</span>
@@ -501,122 +181,43 @@
 
 <script>
 import * as echarts from "echarts";
-
-import {
-  listKindergartenInfo,
-  tKindergartenInfo,
-} from "@/api/system/kindergartenInfo";
-import { listStudentInfo } from "@/api/system/studentInfo";
-import { listClassinfo } from "@/api/system/classinfo";
-import { getRoleInfo, testScoreBatch } from "@/api/system/quality";
+import student from "@/views/assembly/student.vue";
+import { getRoleInfo } from "@/api/system/quality";
 import { synthesize } from "@/api/system/comprehensive";
 export default {
   name: "comprehensive",
+  components: { student },
   data() {
     return {
       itemshow: false,
       itemshow2: false,
-      showyey: true,
-      showbj: true,
-      total1: 0,
-      total2: 0,
-      total3: 0,
-      total4: 0,
-      //遮罩层
-      kindergartenshow: false,
-      classshow: false,
-      studentshow: false,
-      batchCodeshow: false,
-      //班级类型
-      dictValue1: "",
-      dictValue2: "",
-      dictValue3: "",
-      dictValue4: "",
-      ClassType: "class_type",
       // 显示搜索条件
       showSearch: true,
-      // 表单参数
-      form: {},
-      //学生查询
-      studentqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        classId: "",
-        nationDictId: null,
-        studentName: null,
-        studentSex: null,
-        studentNumber: null,
-        birthDate: null,
-        cardNumber: null,
-        onceName: null,
-        homeAddress: null,
-      },
-      //班级查询
-      classqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        kindergartenId: "",
-        className: null,
-        classType: null,
-      },
-      //幼儿园查询参数
-      kqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        organizeId: null,
-        kindergartenName: null,
-        kindergartenAddress: null,
-        kindergartenType: null,
-        phone: null,
-        contacts: null,
-      },
-      //幼儿园list
-      kindergartenList: [],
-      //幼儿园名字
-      kindergartenName: "请选择幼儿园",
-      //幼儿园ID
-      kindergartenId: "",
-      //班级list
-      classinfoList: [],
-      //班级名字
-      className: "请选择班级",
-      //班级ID
-      classId: "",
-      //学生list
-      studentInfoList: [],
-      //学生名字
-      studentname: "请选择学生",
-      //学生ID
-      studentId: "",
-      //批次名称
-      batchCodeName: "请选择批次",
-      //批次ID
-      batchCodeId: "",
-      //批次list
-      testScorelist: [],
       //学生基本信息
       sythesizestudent: [],
       // 综合体质分析查询参数
       synthesizelist: {
         studentId: "",
         batchCode: "",
-        // studentId: "10",
-        // batchCode: "PC202208030005",
-      },
-      //批次编号
-      testqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
+        studentId: "27",
+        batchCode: "PC202208230011",
       },
     };
   },
 
   created() {
-    this.getList();
-    this.class();
-    // this.synthesizeinfo();
+    this.synthesizeinfo();
   },
   methods: {
+    itemlists(studentId, batchCode) {
+      console.log(studentId, batchCode);
+      this.synthesizelist.studentId = studentId;
+      this.synthesizelist.batchCode = batchCode;
+    },
+    /** 查看按钮操作 */
+    handleQuery() {
+      this.synthesizeinfo();
+    },
     //综合体质分析素质
     synthesizeinfo() {
       synthesize(this.synthesizelist).then((res) => {
@@ -777,126 +378,6 @@ export default {
         // option && myChart.setOption(option);
       });
     },
-    // 点击学生按钮
-    studentshowclick() {
-      if (this.studentqueryParams.classId == "") {
-        this.$message.error("请先选择班级");
-      } else {
-        this.studentshow = true;
-        this.studentlist();
-      }
-    },
-    //点击批次
-    batchCodeshowclick() {
-      if (this.synthesizelist.studentId == "") {
-        this.$message.error("请先选择学生");
-      } else {
-        this.testScore();
-        this.batchCodeshow = true;
-      }
-    },
-    //点击批次左边
-    batchCodeclick(row) {
-      this.batchCodeName = row.batchName;
-      this.batchCodeId = row.id;
-      this.synthesizelist.batchCode = row.batchCode;
-      this.batchCodeshow = false;
-      this.synthesizeinfo();
-    },
-    //批次
-    testScore() {
-      testScoreBatch(this.testqueryParams).then((res) => {
-        this.testScorelist = res.rows;
-        this.total4 = res.total;
-      });
-    },
-    //学生左侧按钮
-    studentclick(row) {
-      this.studentname = row.studentName;
-      this.studentId = row.id;
-      this.studentshow = false;
-      this.synthesizelist.studentId = row.id;
-      if (this.synthesizelist.batchCode != "") {
-        this.synthesizeinfo();
-      }
-    },
-    //获取学生
-    studentlist() {
-      listStudentInfo(this.studentqueryParams).then((res) => {
-        this.studentInfoList = res.rows;
-        this.total3 = res.total;
-        // console.log(this.studentInfoList);
-      });
-    },
-    //点击所属班级
-    classshowclick() {
-      console.log(this.classqueryParams)
-      if (this.classqueryParams.kindergartenId == ""||this.classqueryParams.kindergartenId ==null) {
-        this.$message.error("请先选择幼儿园");
-      } else {
-        this.classshow = true;
-        this.classinfo();
-      }
-      //   console.log(this.classqueryParams);
-    },
-    //批次关闭
-    batchCodecancel() {
-      this.batchCodeshow = false;
-    },
-    //学生关闭
-    studentcancel() {
-      this.studentshow = false;
-    },
-    //幼儿园关闭
-    kindergartencancel() {
-      this.kindergartenshow = false;
-    },
-    //班级关闭
-    classcancel() {
-      this.classshow = false;
-    },
-    //班级左侧点击
-    classclick(row) {
-      //   console.log(row);
-      this.className = row.className;
-      this.classId = row.id;
-      this.studentqueryParams.classId = row.id;
-      this.classshow = false;
-      this.studentname = "请选择学生";
-      this.studentId = "";
-      this.synthesizelist.studentId = "";
-    },
-    //幼儿园左侧点击
-    kindergartenNameclick(row) {
-      this.classqueryParams.kindergartenId = row.id;
-      this.className = "请选择班级";
-      this.classId = "";
-      this.studentname = "请选择学生";
-      this.studentId = "";
-      this.synthesizelist.studentId = "";
-      this.kindergartenName = row.kindergartenName;
-      this.kindergartenId = row.id;
-      this.kindergartenshow = false;
-      // this.synthesizeinfo();
-    },
-    //班级类型
-    class() {
-      tKindergartenInfo(this.ClassType).then((res) => {
-        this.dictValue1 = res.data[0].dictValue;
-        this.dictValue2 = res.data[1].dictValue;
-        this.dictValue3 = res.data[2].dictValue;
-        this.dictValue4 = res.data[3].dictValue;
-      });
-    },
-    //班级list
-    classinfo() {
-      listClassinfo(this.classqueryParams).then((response) => {
-        this.classinfoList = response.rows;
-        this.total2 = response.total;
-        // console.log(this.classinfoList);
-      });
-    },
-
     getList() {
       //用户权限
       getRoleInfo().then((res) => {
@@ -915,12 +396,6 @@ export default {
           return;
         }
       });
-      //获取幼儿园list
-      listKindergartenInfo(this.kqueryParams).then((response) => {
-        this.kindergartenList = response.rows;
-        this.total1 = response.total;
-        // console.log(this.kindergartenList);
-      });
     },
     // 表单重置
     reset() {
@@ -930,3 +405,8 @@ export default {
   },
 };
 </script>
+<style scoped='scss'>
+::v-deep .el-form {
+  display: inline;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/system/constitution/index.vue b/src/views/system/constitution/index.vue
index d4ea718..3d0d1e7 100644
--- a/src/views/system/constitution/index.vue
+++ b/src/views/system/constitution/index.vue
@@ -7,69 +7,17 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
+      <student
+        style="width: 500px; display: inline"
+        @itemlist="itemlists"
+      ></student>
+      <el-form-item>
         <el-button
-          @click="kindergartenshow = true"
-          v-if="kindergartenName == '请选择幼儿园'"
-          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
-          >{{ kindergartenName }}</el-button
-        >
-        <el-button
-          @click="kindergartenshow = true"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ kindergartenName }}</el-button
-        >
-      </el-form-item>
-
-      <el-form-item
-        label="所属班级"
-        prop="categoryName"
-        label-width="70px"
-        v-if="showbj"
-      >
-        <el-button
-          @click="classshowclick"
-          style="width: 250px; 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"
-          v-else
-          >{{ className }}</el-button
-        >
-      </el-form-item>
-
-      <el-form-item label="学生" prop="categoryName" label-width="45px">
-        <el-button
-          @click="studentshowclick"
-          v-if="studentname == '请选择学生'"
-          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
-          >{{ studentname }}</el-button
-        >
-        <el-button
-          @click="studentshowclick"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ studentname }}</el-button
-        >
-      </el-form-item>
-
-      <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="batchCodeName == '请选择批次'"
-          >{{ batchCodeName }}</el-button
-        >
-        <el-button
-          @click="batchCodeshowclick"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ batchCodeName }}</el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >查看</el-button
         >
       </el-form-item>
     </el-form>
@@ -80,270 +28,6 @@
       ></right-toolbar>
     </el-row>
 
-    <!-- //批次 -->
-    <el-dialog
-      width="590px"
-      title="选择批次"
-      :visible.sync="batchCodeshow"
-      append-to-body
-      style="margin-top: 20px"
-      :before-close="batchCodecancel"
-    >
-      <el-table :data="testScorelist" align="center" style="margin-top: 0px">
-        <el-table-column label="请选择" width="100" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 20px; height: 20px"
-              v-if="batchCodeId == scope.row.id"
-              circle
-              @click="batchCodeclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="batchCodeclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="batchCode"
-          label="批次编号"
-          width="200"
-          align="center"
-        />
-        <el-table-column
-          property="batchName"
-          label="批次名称"
-          width="200"
-          align="center"
-        />
-      </el-table>
-      <pagination
-        v-show="total4 > 0"
-        :total="total4"
-        :page.sync="testqueryParams.pageNum"
-        :limit.sync="testqueryParams.pageSize"
-        @pagination="testScore"
-      />
-    </el-dialog>
-
-    <!-- //学生 -->
-    <el-dialog
-      width="850px"
-      title="选择学生"
-      :visible.sync="studentshow"
-      append-to-body
-      style="margin-top: 70px"
-      :before-close="studentcancel"
-    >
-      <el-table :data="studentInfoList" align="center" style="margin-top: 10px">
-        <el-table-column label="请选择" width="70" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 20px; height: 20px"
-              circle
-              v-if="studentId == scope.row.id"
-              @click="studentclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="studentclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="className"
-          label="班级名称"
-          width="190"
-          align="center"
-        />
-        <el-table-column
-          property="studentName"
-          label="学生姓名"
-          width="190"
-          align="center"
-        />
-        <el-table-column
-          property="studentName"
-          label="性别"
-          width="190"
-          align="center"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.studentSex == "MALE" ? "男" : "女" }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="homeAddress"
-          label="住址"
-          width="190"
-          align="center"
-        />
-      </el-table>
-      <pagination
-        v-show="total3 > 0"
-        :total="total3"
-        :page.sync="studentqueryParams.pageNum"
-        :limit.sync="studentqueryParams.pageSize"
-        @pagination="studentlist"
-      />
-    </el-dialog>
-
-    <!-- //幼儿园 -->
-    <el-dialog
-      width="850px"
-      title="选择所属幼儿园"
-      :visible.sync="kindergartenshow"
-      append-to-body
-      :before-close="kindergartencancel"
-    >
-      <el-table :data="kindergartenList">
-        <el-table-column label="请选择" width="70" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 15px; height: 15px"
-              circle
-              @click="kindergartenNameclick(scope.row)"
-              v-if="kindergartenId == scope.row.id"
-            ></el-button>
-
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="kindergartenNameclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          property="kindergartenName"
-          label="幼儿园名字"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="kindergartenAddress"
-          label="幼儿园地址"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          label="幼儿园所在组织"
-          align="center"
-          prop="organizeName"
-          width="150"
-        >
-        </el-table-column>
-        <el-table-column
-          property="contacts"
-          label="联系人"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="phone"
-          label="联系电话"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total1 > 0"
-        :total="total1"
-        :page.sync="kqueryParams.pageNum"
-        :limit.sync="kqueryParams.pageSize"
-        @pagination="getList"
-      />
-    </el-dialog>
-
-    <!-- //班级 -->
-    <el-dialog
-      width="1000px"
-      title="选择所属班级"
-      :visible.sync="classshow"
-      append-to-body
-      :before-close="classcancel"
-    >
-      <el-table :data="classinfoList" align="center" style="margin-top: 10px">
-        <el-table-column label="请选择" width="70" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 20px; height: 20px"
-              circle
-              @click="classclick(scope.row)"
-              v-if="classId == scope.row.id"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="classclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="kindergartenName"
-          label="幼儿园名称"
-          width="190"
-          align="center"
-        />
-        <el-table-column
-          property="className"
-          label="班级名称"
-          width="180"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="classType"
-          label="班级类型"
-          width="160"
-          align="center"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.classType == dictValue1 ? "大班" : "" }}
-            {{ scope.row.classType == dictValue2 ? "中班" : "" }}
-            {{ scope.row.classType == dictValue3 ? "小班" : "" }}
-            {{ scope.row.classType == dictValue4 ? "毕业" : "" }}
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          property="classTeacher"
-          label="班主任姓名"
-          width="180"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="phone"
-          label="联系电话"
-          width="190"
-          align="center"
-        >
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total2 > 0"
-        :total="total2"
-        :page.sync="classqueryParams.pageNum"
-        :limit.sync="classqueryParams.pageSize"
-        @pagination="classinfo"
-      />
-    </el-dialog>
-
     <el-row v-show="itemshow">
       <el-col :span="24" class="card-box" style="">
         <el-card>
@@ -394,122 +78,41 @@
 </template>
 <script>
 import * as echarts from "echarts";
-import {
-  listKindergartenInfo,
-  tKindergartenInfo,
-} from "@/api/system/kindergartenInfo";
-import { listStudentInfo } from "@/api/system/studentInfo";
-import { listClassinfo } from "@/api/system/classinfo";
-import { getRoleInfo, testScoreBatch } from "@/api/system/quality";
+import student from "@/views/assembly/student.vue";
+import { getRoleInfo } from "@/api/system/quality";
 import { analysis } from "@/api/system/constitution";
 export default {
   name: "constitution",
-  components: {},
+  components: {
+    student,
+  },
   data() {
     return {
       itemshow: false,
       itemshow2: false,
-      showyey: true,
-      showbj: true,
-      total1: 0,
-      total2: 0,
-      total3: 0,
-      total4: 0,
-      //遮罩层
-      kindergartenshow: false,
-      classshow: false,
-      studentshow: false,
-      batchCodeshow: false,
-      //班级类型
-      dictValue1: "",
-      dictValue2: "",
-      dictValue3: "",
-      dictValue4: "",
-      ClassType: "class_type",
       // 显示搜索条件
       showSearch: true,
-      // 表单参数
-      form: {},
-      //学生查询
-      studentqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        classId: "",
-        nationDictId: null,
-        studentName: null,
-        studentSex: null,
-        studentNumber: null,
-        birthDate: null,
-        cardNumber: null,
-        onceName: null,
-        homeAddress: null,
-      },
-      //班级查询
-      classqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        kindergartenId: "",
-        className: null,
-        classType: null,
-      },
-      //幼儿园查询参数
-      kqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        organizeId: null,
-        kindergartenName: null,
-        kindergartenAddress: null,
-        kindergartenType: null,
-        phone: null,
-        contacts: null,
-      },
-      //幼儿园list
-      kindergartenList: [],
-      //幼儿园名字
-      kindergartenName: "请选择幼儿园",
-      //幼儿园ID
-      kindergartenId: "",
-      //班级list
-      classinfoList: [],
-      //班级名字
-      className: "请选择班级",
-      //班级ID
-      classId: "",
-      //学生list
-      studentInfoList: [],
-      //学生名字
-      studentname: "请选择学生",
-      //学生ID
-      studentId: "",
-      //批次名称
-      batchCodeName: "请选择批次",
-      //批次ID
-      batchCodeId: "",
-      //批次list
-      testScorelist: [],
-      //批次编号
-      testqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-      },
       //analysislist
       analysislist: [],
       //查询传值
       analysisqueryParams: {
-        // studentId: "10",
-        // batchCode: "PC202208030005",
         studentId: "",
         batchCode: "",
       },
     };
   },
   mounted() {},
-  created() {
-    this.getList();
-    this.class();
-    // this.analysislists();
-  },
+  created() {},
   methods: {
+    itemlists(studentId, batchCode) {
+      console.log(studentId, batchCode);
+      this.analysisqueryParams.studentId = studentId;
+      this.analysisqueryParams.batchCode = batchCode;
+    },
+    /** 查看按钮操作 */
+    handleQuery() {
+      this.analysislists();
+    },
     options() {
       var myEchart = document.getElementsByClassName("bar");
       // var myEchart = document.querySelectorAll(".bar");
@@ -575,6 +178,7 @@ export default {
               type: "bar",
               stack: "Total",
               // center: ["50%", "50%"],
+              barWidth: 35,
               label: {
                 show: true,
                 position: "inside",
@@ -626,154 +230,20 @@ export default {
         }
       });
     },
-    // 点击学生按钮
-    studentshowclick() {
-      if (this.studentqueryParams.classId == "") {
-        this.$message.error("请先选择班级");
-      } else {
-        this.studentshow = true;
-        this.studentlist();
-      }
-    },
-    //点击批次
-    batchCodeshowclick() {
-      if (this.analysisqueryParams.studentId == "") {
-        this.$message.error("请先选择学生");
-      } else {
-        this.testScore();
-        this.batchCodeshow = true;
-      }
-    },
-    //点击批次左边
-    batchCodeclick(row) {
-      this.batchCodeName = row.batchName;
-      this.batchCodeId = row.id;
-      this.analysisqueryParams.batchCode = row.batchCode;
-      this.batchCodeshow = false;
-      this.analysislists();
-    },
-    //批次
-    testScore() {
-      testScoreBatch(this.testqueryParams).then((res) => {
-        this.testScorelist = res.rows;
-        this.total4 = res.total;
-      });
-    },
-
-    //获取学生
-    studentlist() {
-      listStudentInfo(this.studentqueryParams).then((res) => {
-        this.studentInfoList = res.rows;
-        this.total3 = res.total;
-        // console.log(this.studentInfoList);
-      });
-    },
-    //点击所属班级
-    classshowclick() {
-      if (
-        this.classqueryParams.kindergartenId == "" ||
-        this.classqueryParams.kindergartenId == null
-      ) {
-        this.$message.error("请先选择幼儿园");
-      } else {
-        this.classshow = true;
-        this.classinfo();
-      }
-      //   console.log(this.classqueryParams);
-    },
-    //批次关闭
-    batchCodecancel() {
-      this.batchCodeshow = false;
-    },
-    //学生关闭
-    studentcancel() {
-      this.studentshow = false;
-    },
-    //幼儿园关闭
-    kindergartencancel() {
-      this.kindergartenshow = false;
-    },
-    //班级关闭
-    classcancel() {
-      this.classshow = false;
-    },
-    //学生左侧按钮
-    studentclick(row) {
-      this.studentname = row.studentName;
-      this.studentId = row.id;
-      this.studentshow = false;
-      this.analysisqueryParams.studentId = row.id;
-      if (this.analysisqueryParams.batchCode != "") {
-        this.analysislists();
-      }
-    },
-    //班级左侧点击
-    classclick(row) {
-      //   console.log(row);
-      this.className = row.className;
-      this.classId = row.id;
-      this.studentqueryParams.classId = row.id;
-      this.studentname = "请选择学生";
-      this.studentId = "";
-      this.analysisqueryParams.studentId = "";
-      this.classshow = false;
-    },
-    //幼儿园左侧点击
-    kindergartenNameclick(row) {
-      this.classqueryParams.kindergartenId = row.id;
-      this.kindergartenName = row.kindergartenName;
-      this.kindergartenId = row.id;
-      this.className = "请选择班级";
-      this.classId = "";
-      this.studentname = "请选择学生";
-      this.studentId = "";
-      this.analysisqueryParams.studentId = "";
-      this.kindergartenshow = false;
-    },
-    //班级类型
-    class() {
-      tKindergartenInfo(this.ClassType).then((res) => {
-        this.dictValue1 = res.data[0].dictValue;
-        this.dictValue2 = res.data[1].dictValue;
-        this.dictValue3 = res.data[2].dictValue;
-        this.dictValue4 = res.data[3].dictValue;
-      });
-    },
-    //班级list
-    classinfo() {
-      listClassinfo(this.classqueryParams).then((response) => {
-        this.classinfoList = response.rows;
-        this.total2 = response.total;
-
-        // console.log(this.classinfoList);
-      });
-    },
-
     getList() {
       //用户权限
       getRoleInfo().then((res) => {
         console.log(res);
         this.classqueryParams.kindergartenId = res.data.kindergartenId;
         var user = res.data.roleKeys;
-        console.log(user);
         if (user.includes("enchou")) {
-          this.showyey = false;
           return;
         } else if (user.includes("teacher")) {
-          this.showyey = false;
           return;
         } else if (user.includes("parent")) {
-          this.showyey = false;
-          this.showbj = false;
           return;
         }
       });
-      //获取幼儿园list
-      listKindergartenInfo(this.kqueryParams).then((response) => {
-        this.kindergartenList = response.rows;
-        this.total1 = response.total;
-        // console.log(this.kindergartenList);
-      });
     },
     // 表单重置
     reset() {
@@ -787,4 +257,7 @@ export default {
 ::v-deep .el-card__header {
   border: none;
 }
+::v-deep .el-form {
+  display: inline;
+}
 </style>
diff --git a/src/views/system/physique/index.vue b/src/views/system/physique/index.vue
index 3b95472..a9bb642 100644
--- a/src/views/system/physique/index.vue
+++ b/src/views/system/physique/index.vue
@@ -7,20 +7,11 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
-        <el-button
-          @click="kindergartenshow = true"
-          v-if="kindergartenName == '请选择幼儿园'"
-          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
-          >{{ kindergartenName }}</el-button
-        >
-        <el-button
-          @click="kindergartenshow = true"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ kindergartenName }}</el-button
-        >
-      </el-form-item>
+      <kindergarten
+        @kinbatlist="kinbatlist"
+        style="width: 500px; display: inline"
+      ></kindergarten>
+
       <el-form-item label="学生性别" prop="studentSex" label-width="70px">
         <el-select
           v-model="analysisqueryParams.studentSex"
@@ -32,23 +23,17 @@
             :key="item.value"
             :label="item.label"
             :value="item.value"
-            @click.native="sexclick"
           >
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="所属批次" prop="batchCodeId" label-width="70px">
+      <el-form-item>
         <el-button
-          @click="batchCodeshowclick"
-          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
-          v-if="batchCodeName == '请选择批次'"
-          >{{ batchCodeName }}</el-button
-        >
-        <el-button
-          @click="batchCodeshowclick"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ batchCodeName }}</el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >查看</el-button
         >
       </el-form-item>
     </el-form>
@@ -59,129 +44,75 @@
       ></right-toolbar>
     </el-row>
 
-    <!-- //批次 -->
-    <el-dialog
-      width="590px"
-      title="选择批次"
-      :visible.sync="batchCodeshow"
-      append-to-body
-      style="margin-top: 20px"
-      :before-close="batchCodecancel"
-    >
-      <el-table :data="testScorelist" align="center" style="margin-top: 0px">
-        <el-table-column label="请选择" width="100" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 20px; height: 20px"
-              v-if="batchCodeId == scope.row.id"
-              circle
-              @click="batchCodeclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="batchCodeclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="batchCode"
-          label="批次编号"
-          width="200"
-          align="center"
-        />
-        <el-table-column
-          property="batchName"
-          label="批次名称"
-          width="200"
-          align="center"
-        />
-      </el-table>
-      <pagination
-        v-show="total4 > 0"
-        :total="total4"
-        :page.sync="testqueryParams.pageNum"
-        :limit.sync="testqueryParams.pageSize"
-        @pagination="testScore"
-      />
-    </el-dialog>
-
-    <!-- //幼儿园 -->
-    <el-dialog
-      width="850px"
-      title="选择所属幼儿园"
-      :visible.sync="kindergartenshow"
-      append-to-body
-      :before-close="kindergartencancel"
-    >
-      <el-table :data="kindergartenList">
-        <el-table-column label="请选择" width="70" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 15px; height: 15px"
-              circle
-              @click="kindergartenNameclick(scope.row)"
-              v-if="kindergartenId == scope.row.id"
-            ></el-button>
-
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="kindergartenNameclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          property="kindergartenName"
-          label="幼儿园名字"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="kindergartenAddress"
-          label="幼儿园地址"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          label="幼儿园所在组织"
-          align="center"
-          prop="organizeName"
-          width="150"
-        >
-        </el-table-column>
-        <el-table-column
-          property="contacts"
-          label="联系人"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="phone"
-          label="联系电话"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total1 > 0"
-        :total="total1"
-        :page.sync="kqueryParams.pageNum"
-        :limit.sync="kqueryParams.pageSize"
-        @pagination="getList"
-      />
-    </el-dialog>
-
     <el-row v-show="itemshow">
+      <el-col
+        :span="24"
+        :offset="0"
+        style="
+          margin-bottom: 40px;
+          font-size: 15px;
+          border-bottom: 1px solid #8fd6d9;
+        "
+      >
+        <div class="test" style="height: 90px">
+          <div style="text-align: center; line-height: 40px">
+            <span>本园幼儿综合体质评估综合得分</span>
+          </div>
+          <div
+            class="el-table--enable-row-hover el-table--medium"
+            style="margin: 0 auto; line-height: 40px; text-align: center"
+          >
+            <div style="display: inline-block">
+              <span
+                style="
+                  position: relative;
+                  display: inline-block;
+                  width: 150px;
+                  text-align: center;
+                "
+                v-for="(item, index) in firstCategoryScoreList"
+                :key="index"
+              >
+                <span :style="index == 0 ? '' : 'margin-right:20px'">{{
+                  index == 0 ? null : "+"
+                }}</span>
+                <span>
+                  {{ item.categoryName }} ({{ item.avgCategoryFraction }})
+                </span>
+              </span>
+            </div>
+            <div style="display: inline-block; position: relative">
+              <span style="margin: 0 20px">= </span>
+              <span style="display: inline-block; width: 120px"
+                >综合得分({{ totalAvgFraction }})</span
+              >
+
+              <span
+                style="
+                  display: inline-block;
+                  position: absolute;
+                  top: 20px;
+                  width: 100px;
+                  left: 40px;
+                  margin: 0 20px;
+                "
+              ></span>
+            </div>
+          </div>
+        </div>
+      </el-col>
+      <el-col :span="24" :offset="0">
+        <div style="text-align: center">
+          <span>幼儿园综合体质分析图</span>
+        </div>
+        <div class="">
+          <div
+            ref="chart"
+            id="chart"
+            style="width: 1000px; height: 600px; margin: 0 auto"
+          ></div>
+        </div>
+      </el-col>
       <el-col :span="24" :offset="0">
         <div style="margin: 0 auto">
           <div
@@ -246,10 +177,22 @@
               v-for="item in categoryAgeFractionList"
               :key="item.prentId"
             >
-              <div style="width: 120px; line-height: 60px">
+              <div
+                style="
+                  width: 120px;
+                  line-height: 60px;
+                  border: 1px solid #f0f0f0;
+                "
+              >
                 {{ item.studentAge }}
               </div>
-              <div style="width: 120px; line-height: 60px">
+              <div
+                style="
+                  width: 120px;
+                  line-height: 60px;
+                  border: 1px solid #f0f0f0;
+                "
+              >
                 {{ item.totalAvgFraction }}
               </div>
               <div>
@@ -257,7 +200,7 @@
                   <div
                     v-for="uitem in item.list"
                     :key="uitem.categoryId"
-                    style="width: 120px"
+                    style="width: 120px; border: 0.5px solid #f0f0f0"
                   >
                     {{ uitem }}
                   </div>
@@ -268,70 +211,6 @@
           <div></div>
         </div>
       </el-col>
-      <el-col :span="24" :offset="0" style="margin-top: 30px">
-        <div style="text-align: center; height: 100px">
-          <div
-            class="el-table--enable-row-hover el-table--medium"
-            style="margin: 20px auto; height: 40px; text-align: center"
-          >
-            <div style="display: inline-block">
-              <span
-                style="
-                  position: relative;
-                  display: inline-block;
-                  width: 120px;
-                  text-align: center;
-                "
-                v-for="(item, index) in firstCategoryScoreList"
-                :key="index"
-              >
-                <span :style="index == 0 ? '' : 'margin-right:20px'">{{
-                  index == 0 ? null : "+"
-                }}</span>
-                <span>
-                  {{ item.avgCategoryFraction }}
-                </span>
-                <span
-                  :style="index != 0 ? 'left:18px' : ''"
-                  style="position: absolute; left: 0px; top: 20px; width: 120px"
-                  >{{ item.categoryName }}</span
-                >
-              </span>
-            </div>
-            <div style="display: inline-block; position: relative">
-              <span style="margin: 0 20px">= </span>
-              <span style="display: inline-block; width: 100px">{{
-                totalAvgFraction
-              }}</span>
-
-              <span
-                style="
-                  display: inline-block;
-                  position: absolute;
-                  top: 20px;
-                  width: 100px;
-                  left: 40px;
-                  margin: 0 20px;
-                "
-                >(综合得分)</span
-              >
-            </div>
-          </div>
-        </div>
-      </el-col>
-
-      <el-col :span="24" :offset="0">
-        <div style="text-align: center">
-          <span>园所幼儿综合体质分析图</span>
-        </div>
-        <div class="el-table el-table--enable-row-hover el-table--medium">
-          <div
-            ref="chart"
-            id="chart"
-            style="width: 1000px; height: 600px; margin: 0 auto"
-          ></div>
-        </div>
-      </el-col>
     </el-row>
 
     <el-row :gutter="20" v-if="itemshow2">
@@ -350,16 +229,13 @@
 </template>
 <script>
 import * as echarts from "echarts";
-import {
-  listKindergartenInfo,
-  tKindergartenInfo,
-} from "@/api/system/kindergartenInfo";
-import { getRoleInfo, testScoreBatch } from "@/api/system/quality";
+import { getRoleInfo } from "@/api/system/quality";
 import { analysis } from "@/api/system/physique";
+import Kindergarten from "../../assembly/kindergarten.vue";
 
 export default {
   name: "KindergartenPhysicalTest",
-  components: {},
+  components: { Kindergarten },
   data() {
     return {
       sexs: [
@@ -374,48 +250,12 @@ export default {
       ],
       itemshow: false,
       itemshow2: false,
-      showyey: true,
-      total1: 0,
-      total4: 0,
-      //遮罩层
-      kindergartenshow: false,
-      batchCodeshow: false,
       // 显示搜索条件
       showSearch: true,
-      // 表单参数
-      form: {},
-      //幼儿园查询参数
-      kqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        organizeId: null,
-        kindergartenName: null,
-        kindergartenAddress: null,
-        kindergartenType: null,
-        phone: null,
-        contacts: null,
-      },
-      //幼儿园list
-      kindergartenList: [],
-      //幼儿园名字
-      kindergartenName: "请选择幼儿园",
-      //幼儿园ID
-      kindergartenId: "",
-      //批次名称
-      batchCodeName: "请选择批次",
-      //批次ID
-      batchCodeId: "",
-      //批次list
-      testScorelist: [],
-      //批次编号
-      testqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-      },
       //查询传值
       analysisqueryParams: {
-        // kindergartenId: "18",
-        // batchCode: "PC202208030005",
+        // kindergartenId: "2",
+        // batchCode: "PC202208290002",
         // studentSex: "FEMALE",
         kindergartenId: "",
         batchCode: "",
@@ -434,6 +274,15 @@ export default {
     // this.analysisinfo();
   },
   methods: {
+    handleQuery() {
+      this.analysisinfo();
+    },
+    kinbatlist(kindergartenId, batchCode) {
+      console.log(kindergartenId, batchCode);
+      this.analysisqueryParams.kindergartenId = kindergartenId;
+      this.analysisqueryParams.batchCode = batchCode;
+    },
+
     analysisinfo() {
       analysis(this.analysisqueryParams).then((res) => {
         if (res.data == [] || !res.data) {
@@ -515,7 +364,7 @@ export default {
 
             let option = {
               //配置维度的最大值
-              color: "blue",
+              color: "#D9A508",
               radar: {
                 name: {
                   show: true,
@@ -531,7 +380,7 @@ export default {
                   type: "radar",
                   label: {
                     show: true,
-                    color: "blue", //显示数值
+                    color: "#D9A508", //显示数值
                   },
                   areaStyle: {}, //每个雷达图形成一个阴影的面积
                   data: [
@@ -543,11 +392,11 @@ export default {
                   areaStyle: {
                     color: new echarts.graphic.RadialGradient(0.1, 0.6, 1, [
                       {
-                        color: "rgba(50, 50, 255, 0.1)",
+                        color: "rgba(255,192,0, 0.8)",
                         offset: 0,
                       },
                       {
-                        color: "rgba(50, 50, 200, 0.9)",
+                        color: "rgba(255,192,0, 0.9)",
                         offset: 1,
                       },
                     ]),
@@ -563,70 +412,7 @@ export default {
         }
       });
     },
-    //点击批次左边
-    batchCodeclick(row) {
-      this.batchCodeName = row.batchName;
-      this.batchCodeId = row.id;
-      this.analysisqueryParams.batchCode = row.batchCode;
-      this.batchCodeshow = false;
-      this.analysisinfo();
-    },
-    //点击批次
-    batchCodeshowclick() {
-      if (
-        this.analysisqueryParams.kindergartenId == "" ||
-        this.analysisqueryParams.kindergartenId == null
-      ) {
-        this.$message.error("请先选择幼儿园");
-      } else {
-        this.testScore();
-        this.batchCodeshow = true;
-      }
-    },
-    //批次
-    testScore() {
-      testScoreBatch(this.testqueryParams).then((res) => {
-        this.testScorelist = res.rows;
-        this.total4 = res.total;
-      });
-    },
-    //批次关闭
-    batchCodecancel() {
-      this.batchCodeshow = false;
-    },
-    //幼儿园关闭
-    kindergartencancel() {
-      this.kindergartenshow = false;
-    },
-    //选择性别
-    sexclick() {
-      console.log(this.analysisqueryParams);
-      if (
-        this.analysisqueryParams.kindergartenId != null &&
-        this.analysisqueryParams.batchCode != ""
-      ) {
-        this.analysisinfo();
-      }
-    },
-    //幼儿园左侧点击
-    kindergartenNameclick(row) {
-      this.analysisqueryParams.kindergartenId = row.id;
-      this.kindergartenName = row.kindergartenName;
-      this.kindergartenId = row.id;
-      this.kindergartenshow = false;
-      if (
-        this.analysisqueryParams.batchCode != "" &&
-        this.analysisqueryParams.studentSex != ""
-      ) {
-        this.analysisinfo();
-      }
-    },
-
     getList() {
-      tKindergartenInfo(this.kindergartenType).then((res) => {
-        this.type = res.data[0];
-        this.type2 = res.data[1];
-      });
       //用户权限
       getRoleInfo().then((res) => {
         console.log(res);
@@ -634,22 +420,13 @@ export default {
         var user = res.data.roleKeys;
         console.log(user);
         if (user.includes("enchou")) {
-          this.showyey = false;
           return;
         } else if (user.includes("teacher")) {
-          this.showyey = false;
           return;
         } else if (user.includes("parent")) {
-          this.showyey = false;
           return;
         }
       });
-      //获取幼儿园list
-      listKindergartenInfo(this.kqueryParams).then((response) => {
-        this.kindergartenList = response.rows;
-        this.total1 = response.total;
-        // console.log(this.kindergartenList);
-      });
     },
     // 表单重置
     reset() {
@@ -660,4 +437,13 @@ export default {
 };
 </script>
 <style scoped='scss'>
+.test {
+  /* width: 70%; */
+  margin: 0 auto;
+  /* background-color: #f0f0f0; */
+  color: #27848B;
+}
+::v-deep .el-form {
+  display: inline;
+}
 </style>
diff --git a/src/views/system/quality/index.vue b/src/views/system/quality/index.vue
index c860454..4d05b11 100644
--- a/src/views/system/quality/index.vue
+++ b/src/views/system/quality/index.vue
@@ -7,69 +7,17 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
+      <student
+        style="width: 500px; display: inline"
+        @itemlist="itemlists"
+      ></student>
+      <el-form-item>
         <el-button
-          @click="kindergartenshow = true"
-          v-if="kindergartenName == '请选择幼儿园'"
-          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
-          >{{ kindergartenName }}</el-button
-        >
-        <el-button
-          @click="kindergartenshow = true"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ kindergartenName }}</el-button
-        >
-      </el-form-item>
-
-      <el-form-item
-        label="所属班级"
-        prop="categoryName"
-        label-width="70px"
-        v-if="showbj"
-      >
-        <el-button
-          @click="classshowclick"
-          style="width: 250px; 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"
-          v-else
-          >{{ className }}</el-button
-        >
-      </el-form-item>
-
-      <el-form-item label="学生" prop="categoryName" label-width="45px">
-        <el-button
-          @click="studentshowclick"
-          v-if="studentname == '请选择学生'"
-          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
-          >{{ studentname }}</el-button
-        >
-        <el-button
-          @click="studentshowclick"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ studentname }}</el-button
-        >
-      </el-form-item>
-
-      <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="batchCodeName == '请选择批次'"
-          >{{ batchCodeName }}</el-button
-        >
-        <el-button
-          @click="batchCodeshowclick"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ batchCodeName }}</el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >查看</el-button
         >
       </el-form-item>
     </el-form>
@@ -79,284 +27,19 @@
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
-
-    <!-- //批次 -->
-    <el-dialog
-      width="590px"
-      title="选择批次"
-      :visible.sync="batchCodeshow"
-      append-to-body
-      style="margin-top: 20px"
-      :before-close="batchCodecancel"
-    >
-      <el-table :data="testScorelist" align="center" style="margin-top: 0px">
-        <el-table-column label="请选择" width="100" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 20px; height: 20px"
-              v-if="batchCodeId == scope.row.id"
-              circle
-              @click="batchCodeclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="batchCodeclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="batchCode"
-          label="批次编号"
-          width="200"
-          align="center"
-        />
-        <el-table-column
-          property="batchName"
-          label="批次名称"
-          width="200"
-          align="center"
-        />
-      </el-table>
-      <pagination
-        v-show="total4 > 0"
-        :total="total4"
-        :page.sync="testqueryParams.pageNum"
-        :limit.sync="testqueryParams.pageSize"
-        @pagination="testScore"
-      />
-    </el-dialog>
-
-    <!-- //学生 -->
-    <el-dialog
-      width="850px"
-      title="选择学生"
-      :visible.sync="studentshow"
-      append-to-body
-      style="margin-top: 70px"
-      :before-close="studentcancel"
-    >
-      <el-table :data="studentInfoList" align="center" style="margin-top: 10px">
-        <el-table-column label="请选择" width="70" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 20px; height: 20px"
-              circle
-              v-if="studentId == scope.row.id"
-              @click="studentclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="studentclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="className"
-          label="班级名称"
-          width="190"
-          align="center"
-        />
-        <el-table-column
-          property="studentName"
-          label="学生姓名"
-          width="190"
-          align="center"
-        />
-        <el-table-column
-          property="studentName"
-          label="性别"
-          width="190"
-          align="center"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.studentSex == "MALE" ? "男" : "女" }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="homeAddress"
-          label="住址"
-          width="190"
-          align="center"
-        />
-      </el-table>
-      <pagination
-        v-show="total3 > 0"
-        :total="total3"
-        :page.sync="studentqueryParams.pageNum"
-        :limit.sync="studentqueryParams.pageSize"
-        @pagination="studentlist"
-      />
-    </el-dialog>
-
-    <!-- //幼儿园 -->
-    <el-dialog
-      width="850px"
-      title="选择所属幼儿园"
-      :visible.sync="kindergartenshow"
-      append-to-body
-      :before-close="kindergartencancel"
-    >
-      <el-table :data="kindergartenList">
-        <el-table-column label="请选择" width="70" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 15px; height: 15px"
-              circle
-              @click="kindergartenNameclick(scope.row)"
-              v-if="kindergartenId == scope.row.id"
-            ></el-button>
-
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="kindergartenNameclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="kindergartenName"
-          label="幼儿园名字"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="kindergartenAddress"
-          label="幼儿园地址"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          label="幼儿园所在组织"
-          align="center"
-          prop="organizeName"
-          width="150"
-        >
-        </el-table-column>
-        <el-table-column
-          property="contacts"
-          label="联系人"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="phone"
-          label="联系电话"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total1 > 0"
-        :total="total1"
-        :page.sync="kqueryParams.pageNum"
-        :limit.sync="kqueryParams.pageSize"
-        @pagination="getList"
-      />
-    </el-dialog>
-
-    <!-- //班级 -->
-    <el-dialog
-      width="1000px"
-      title="选择所属班级"
-      :visible.sync="classshow"
-      append-to-body
-      :before-close="classcancel"
-    >
-      <el-table :data="classinfoList" align="center" style="margin-top: 10px">
-        <el-table-column label="请选择" width="70" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 20px; height: 20px"
-              circle
-              @click="classclick(scope.row)"
-              v-if="classId == scope.row.id"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="classclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="kindergartenName"
-          label="幼儿园名称"
-          width="190"
-          align="center"
-        />
-        <el-table-column
-          property="className"
-          label="班级名称"
-          width="180"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="classType"
-          label="班级类型"
-          width="160"
-          align="center"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.classType == dictValue1 ? "大班" : "" }}
-            {{ scope.row.classType == dictValue2 ? "中班" : "" }}
-            {{ scope.row.classType == dictValue3 ? "小班" : "" }}
-            {{ scope.row.classType == dictValue4 ? "毕业" : "" }}
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          property="classTeacher"
-          label="班主任姓名"
-          width="180"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="phone"
-          label="联系电话"
-          width="190"
-          align="center"
-        >
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total2 > 0"
-        :total="total2"
-        :page.sync="classqueryParams.pageNum"
-        :limit.sync="classqueryParams.pageSize"
-        @pagination="classinfo"
-      />
-    </el-dialog>
-
     <el-card
       v-show="itemshow"
       class="box-card"
       style="width: 95%; margin: 0 auto"
     >
-      <div slot="header" style="text-align: center; margin-bottom: 30px">
+      <div slot="header" style="text-align: center; ">
         身体素质测试
       </div>
       <el-row style="text-align: center">
         <el-col
           :span="5"
+          class="toptitle"
           style="
-            height: 60px;
-            line-height: 60px;
             border-right: 1px solid #ededed;
             border-bottom: 1px solid #ededed;
           "
@@ -364,9 +47,8 @@
         >
         <el-col
           :span="5"
+          class="toptitle"
           style="
-            height: 60px;
-            line-height: 60px;
             border-right: 1px solid #ededed;
             border-bottom: 1px solid #ededed;
           "
@@ -374,9 +56,8 @@
         >
         <el-col
           :span="9"
+          class="toptitle"
           style="
-            height: 60px;
-            line-height: 60px;
             border-right: 1px solid #ededed;
             border-bottom: 1px solid #ededed;
           "
@@ -384,11 +65,8 @@
         >
         <el-col
           :span="5"
-          style="
-            height: 60px;
-            line-height: 60px;
-            border-bottom: 1px solid #ededed;
-          "
+          class="toptitle"
+          style="border-bottom: 1px solid #ededed"
           >综合评价</el-col
         >
       </el-row>
@@ -399,6 +77,7 @@
       >
         <el-col
           :span="5"
+          class="text"
           style="
             height: 100px;
             line-height: 100px;
@@ -409,6 +88,7 @@
           {{ item.itemName }}
         </el-col>
         <el-col
+          class="text"
           :span="5"
           style="
             height: 100px;
@@ -423,6 +103,7 @@
         </el-col>
 
         <el-col
+          class="text"
           v-if="item.itemScore"
           :span="9"
           style="
@@ -457,7 +138,7 @@
               style="
                 position: absolute;
                 top: 1px;
-                left: 79%;
+                left: 75%;
                 line-height: 20px;
                 overflow: hidden;
                 width: 32px;
@@ -479,7 +160,7 @@
               style="
                 position: absolute;
                 top: 1px;
-                left: 59%;
+                left: 55%;
                 overflow: hidden;
                 line-height: 20px;
                 width: 32px;
@@ -501,7 +182,7 @@
               style="
                 position: absolute;
                 top: 1px;
-                left: 39%;
+                left: 35%;
                 line-height: 20px;
                 overflow: hidden;
                 width: 32px;
@@ -524,7 +205,7 @@
               style="
                 position: absolute;
                 top: 1px;
-                left: 19%;
+                left: 15%;
                 line-height: 20px;
                 overflow: hidden;
                 width: 32px;
@@ -546,7 +227,7 @@
               style="
                 position: absolute;
                 top: 1px;
-                left: -1%;
+                left: -5%;
                 line-height: 20px;
                 overflow: hidden;
                 width: 32px;
@@ -569,7 +250,7 @@
               style="
                 position: absolute;
                 top: 1px;
-                right: -1%;
+                right: -3%;
                 line-height: 20px;
                 overflow: hidden;
                 width: 32px;
@@ -605,6 +286,7 @@
           </div>
         </el-col>
         <el-col
+          class="text"
           v-else
           :span="9"
           style="
@@ -628,6 +310,7 @@
           </div>
         </el-col>
         <el-col
+          class="text"
           :span="5"
           style="
             height: 100px;
@@ -653,103 +336,20 @@
   </div>
 </template>
 <script>
-import {
-  listKindergartenInfo,
-  tKindergartenInfo,
-} from "@/api/system/kindergartenInfo";
-import { listStudentInfo } from "@/api/system/studentInfo";
-import { listClassinfo } from "@/api/system/classinfo";
-import {
-  getRoleInfo,
-  testBodyScoreInfo,
-  testScoreBatch,
-} from "@/api/system/quality";
+import student from "@/views/assembly/student.vue";
+import { getRoleInfo, testBodyScoreInfo } from "@/api/system/quality";
 
 export default {
   name: "quality",
-  components: {},
+  components: {
+    student,
+  },
   data() {
     return {
       itemshow: false,
       itemshow2: false,
-      showyey: true,
-      showbj: true,
-      total1: 0,
-      total2: 0,
-      total3: 0,
-      total4: 0,
-      //遮罩层
-      kindergartenshow: false,
-      classshow: false,
-      studentshow: false,
-      batchCodeshow: false,
-      //班级类型
-      dictValue1: "",
-      dictValue2: "",
-      dictValue3: "",
-      dictValue4: "",
-      ClassType: "class_type",
       // 显示搜索条件
       showSearch: true,
-      // 表单参数
-      form: {},
-      //学生查询
-      studentqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        classId: "",
-        nationDictId: null,
-        studentName: null,
-        studentSex: null,
-        studentNumber: null,
-        birthDate: null,
-        cardNumber: null,
-        onceName: null,
-        homeAddress: null,
-      },
-      //班级查询
-      classqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        kindergartenId: "",
-        className: null,
-        classType: null,
-      },
-      //幼儿园查询参数
-      kqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        organizeId: null,
-        kindergartenName: null,
-        kindergartenAddress: null,
-        kindergartenType: null,
-        phone: null,
-        contacts: null,
-      },
-      //幼儿园list
-      kindergartenList: [],
-      //幼儿园名字
-      kindergartenName: "请选择幼儿园",
-      //幼儿园ID
-      kindergartenId: "",
-      //班级list
-      classinfoList: [],
-      //班级名字
-      className: "请选择班级",
-      //班级ID
-      classId: "",
-      //学生list
-      studentInfoList: [],
-      //学生名字
-      studentname: "请选择学生",
-      //学生ID
-      studentId: "",
-      //批次名称
-      batchCodeName: "请选择批次",
-      //批次ID
-      batchCodeId: "",
-      //批次list
-      testScorelist: [],
       //学生成绩
       studentscorelist: [],
       // 成绩查询参数
@@ -765,20 +365,20 @@ export default {
         // studentId: "9",
         // batchCode: "PC202208030004",
       },
-      //批次编号
-      testqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-      },
     };
   },
 
-  created() {
-    this.getList();
-    this.class();
-    // this.studenttext();
-  },
+  created() {},
   methods: {
+    itemlists(studentId, batchCode) {
+      console.log(studentId, batchCode);
+      this.studentscore.studentId = studentId;
+      this.studentscore.batchCode = batchCode;
+    },
+    /** 查看按钮操作 */
+    handleQuery() {
+      this.studenttext();
+    },
     //学生身体素质
     studenttext() {
       testBodyScoreInfo(this.studentscore).then((res) => {
@@ -796,155 +396,20 @@ export default {
         }
       });
     },
-    // 点击学生按钮
-    studentshowclick() {
-      if (this.studentqueryParams.classId == "") {
-        this.$message.error("请先选择班级");
-      } else {
-        this.studentshow = true;
-        this.studentlist();
-      }
-    },
-    //点击批次
-    batchCodeshowclick() {
-      if (this.studentscore.studentId == "") {
-        this.$message.error("请先选择学生");
-      } else {
-        this.testScore();
-        this.batchCodeshow = true;
-      }
-    },
-    //点击批次左边
-    batchCodeclick(row) {
-      this.batchCodeName = row.batchName;
-      this.batchCodeId = row.id;
-      this.studentscore.batchCode = row.batchCode;
-      this.batchCodeshow = false;
-      this.studenttext();
-    },
-    //批次
-    testScore() {
-      testScoreBatch(this.testqueryParams).then((res) => {
-        this.testScorelist = res.rows;
-        this.total4 = res.total;
-      });
-    },
-    //学生左侧按钮
-    studentclick(row) {
-      this.studentname = row.studentName;
-      this.studentId = row.id;
-      this.studentshow = false;
-      this.studentscore.studentId = row.id;
-      if (this.studentscore.batchCode != "") {
-        this.studenttext();
-      }
-    },
-
-    //获取学生
-    studentlist() {
-      listStudentInfo(this.studentqueryParams).then((res) => {
-        this.studentInfoList = res.rows;
-        this.total3 = res.total;
-
-        // console.log(this.studentInfoList);
-      });
-    },
-    //点击所属班级
-    classshowclick() {
-      if (
-        this.classqueryParams.kindergartenId == "" ||
-        this.classqueryParams.kindergartenId == null
-      ) {
-        this.$message.error("请先选择幼儿园");
-      } else {
-        this.classshow = true;
-        this.classinfo();
-      }
-      //   console.log(this.classqueryParams);
-    },
-    //批次关闭
-    batchCodecancel() {
-      this.batchCodeshow = false;
-    },
-    //学生关闭
-    studentcancel() {
-      this.studentshow = false;
-    },
-    //幼儿园关闭
-    kindergartencancel() {
-      this.kindergartenshow = false;
-    },
-    //班级关闭
-    classcancel() {
-      this.classshow = false;
-    },
-    //班级左侧点击
-    classclick(row) {
-      //   console.log(row);
-      this.className = row.className;
-      this.classId = row.id;
-      this.studentqueryParams.classId = row.id;
-      this.studentname = "请选择学生";
-      this.studentId = "";
-      this.studentscore.studentId = "";
-      this.classshow = false;
-    },
-    //幼儿园左侧点击
-    kindergartenNameclick(row) {
-      this.classqueryParams.kindergartenId = row.id;
-      this.kindergartenName = row.kindergartenName;
-      this.kindergartenId = row.id;
-      this.className = "请选择班级";
-      this.classId = "";
-      this.studentname = "请选择学生";
-      this.studentId = "";
-      this.studentscore.studentId = "";
-      this.kindergartenshow = false;
-    },
-    //班级类型
-    class() {
-      tKindergartenInfo(this.ClassType).then((res) => {
-        this.dictValue1 = res.data[0].dictValue;
-        this.dictValue2 = res.data[1].dictValue;
-        this.dictValue3 = res.data[2].dictValue;
-        this.dictValue4 = res.data[3].dictValue;
-      });
-    },
-    //班级list
-    classinfo() {
-      listClassinfo(this.classqueryParams).then((response) => {
-        this.classinfoList = response.rows;
-        this.total2 = response.total;
-        // console.log(this.classinfoList);
-      });
-    },
-
     getList() {
       //用户权限
       getRoleInfo().then((res) => {
         console.log(res);
         this.classqueryParams.kindergartenId = res.data.kindergartenId;
         var user = res.data.roleKeys;
-        console.log(user);
         if (user.includes("enchou")) {
-          this.showyey = false;
           return;
         } else if (user.includes("teacher")) {
-          this.showyey = false;
           return;
         } else if (user.includes("parent")) {
-          this.showyey = false;
-          this.showbj = false;
           return;
         }
       });
-      //获取幼儿园list
-      listKindergartenInfo(this.kqueryParams).then((response) => {
-        this.kindergartenList = response.rows;
-        this.total1 = response.total;
-
-        // console.log(this.kindergartenList);
-      });
     },
     // 表单重置
     reset() {
@@ -955,6 +420,16 @@ export default {
 };
 </script>
 <style scoped='scss'>
+.text {
+  font-size:14px
+}
+.toptitle {
+  height: 50px;
+  line-height: 50px;
+  background-color: #f8f8f9;
+  font-size: 15px;
+  font-weight: 600;
+}
 ::v-deep .el-card__header {
   border: none;
 }
@@ -966,4 +441,7 @@ export default {
   position: absolute;
   top: 40px;
 }
+::v-deep .el-form {
+  display: inline;
+}
 </style>
diff --git a/src/views/system/shape/index.vue b/src/views/system/shape/index.vue
index a4a33f3..dea22a3 100644
--- a/src/views/system/shape/index.vue
+++ b/src/views/system/shape/index.vue
@@ -7,69 +7,17 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
+      <student
+        style="width: 500px; display: inline"
+        @itemlist="itemlists"
+      ></student>
+      <el-form-item>
         <el-button
-          @click="kindergartenshow = true"
-          v-if="kindergartenName == '请选择幼儿园'"
-          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
-          >{{ kindergartenName }}</el-button
-        >
-        <el-button
-          @click="kindergartenshow = true"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ kindergartenName }}</el-button
-        >
-      </el-form-item>
-
-      <el-form-item
-        label="所属班级"
-        prop="categoryName"
-        label-width="70px"
-        v-if="showbj"
-      >
-        <el-button
-          @click="classshowclick"
-          style="width: 250px; 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"
-          v-else
-          >{{ className }}</el-button
-        >
-      </el-form-item>
-
-      <el-form-item label="学生" prop="categoryName" label-width="45px">
-        <el-button
-          @click="studentshowclick"
-          v-if="studentname == '请选择学生'"
-          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
-          >{{ studentname }}</el-button
-        >
-        <el-button
-          @click="studentshowclick"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ studentname }}</el-button
-        >
-      </el-form-item>
-
-      <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="batchCodeName == '请选择批次'"
-          >{{ batchCodeName }}</el-button
-        >
-        <el-button
-          @click="batchCodeshowclick"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ batchCodeName }}</el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >查看</el-button
         >
       </el-form-item>
     </el-form>
@@ -80,270 +28,6 @@
       ></right-toolbar>
     </el-row>
 
-    <!-- //批次 -->
-    <el-dialog
-      width="590px"
-      title="选择批次"
-      :visible.sync="batchCodeshow"
-      append-to-body
-      style="margin-top: 20px"
-      :before-close="batchCodecancel"
-    >
-      <el-table :data="testScorelist" align="center" style="margin-top: 0px">
-        <el-table-column label="请选择" width="100" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 20px; height: 20px"
-              v-if="batchCodeId == scope.row.id"
-              circle
-              @click="batchCodeclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="batchCodeclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="batchCode"
-          label="批次编号"
-          width="200"
-          align="center"
-        />
-        <el-table-column
-          property="batchName"
-          label="批次名称"
-          width="200"
-          align="center"
-        />
-      </el-table>
-      <pagination
-        v-show="total4 > 0"
-        :total="total4"
-        :page.sync="testqueryParams.pageNum"
-        :limit.sync="testqueryParams.pageSize"
-        @pagination="testScore"
-      />
-    </el-dialog>
-
-    <!-- //学生 -->
-    <el-dialog
-      width="850px"
-      title="选择学生"
-      :visible.sync="studentshow"
-      append-to-body
-      style="margin-top: 70px"
-      :before-close="studentcancel"
-    >
-      <el-table :data="studentInfoList" align="center" style="margin-top: 10px">
-        <el-table-column label="请选择" width="70" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 20px; height: 20px"
-              circle
-              v-if="studentId == scope.row.id"
-              @click="studentclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="studentclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="className"
-          label="班级名称"
-          width="190"
-          align="center"
-        />
-        <el-table-column
-          property="studentName"
-          label="学生姓名"
-          width="190"
-          align="center"
-        />
-        <el-table-column
-          property="studentName"
-          label="性别"
-          width="190"
-          align="center"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.studentSex == "MALE" ? "男" : "女" }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="homeAddress"
-          label="住址"
-          width="190"
-          align="center"
-        />
-      </el-table>
-      <pagination
-        v-show="total3 > 0"
-        :total="total3"
-        :page.sync="studentqueryParams.pageNum"
-        :limit.sync="studentqueryParams.pageSize"
-        @pagination="studentlist"
-      />
-    </el-dialog>
-
-    <!-- //幼儿园 -->
-    <el-dialog
-      width="850px"
-      title="选择所属幼儿园"
-      :visible.sync="kindergartenshow"
-      append-to-body
-      :before-close="kindergartencancel"
-    >
-      <el-table :data="kindergartenList">
-        <el-table-column label="请选择" width="70" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 15px; height: 15px"
-              circle
-              @click="kindergartenNameclick(scope.row)"
-              v-if="kindergartenId == scope.row.id"
-            ></el-button>
-
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="kindergartenNameclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          property="kindergartenName"
-          label="幼儿园名字"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="kindergartenAddress"
-          label="幼儿园地址"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          label="幼儿园所在组织"
-          align="center"
-          prop="organizeName"
-          width="150"
-        >
-        </el-table-column>
-        <el-table-column
-          property="contacts"
-          label="联系人"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="phone"
-          label="联系电话"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total1 > 0"
-        :total="total1"
-        :page.sync="kqueryParams.pageNum"
-        :limit.sync="kqueryParams.pageSize"
-        @pagination="getList"
-      />
-    </el-dialog>
-
-    <!-- //班级 -->
-    <el-dialog
-      width="1000px"
-      title="选择所属班级"
-      :visible.sync="classshow"
-      append-to-body
-      :before-close="classcancel"
-    >
-      <el-table :data="classinfoList" align="center" style="margin-top: 10px">
-        <el-table-column label="请选择" width="70" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 20px; height: 20px"
-              circle
-              @click="classclick(scope.row)"
-              v-if="classId == scope.row.id"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="classclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="kindergartenName"
-          label="幼儿园名称"
-          width="190"
-          align="center"
-        />
-        <el-table-column
-          property="className"
-          label="班级名称"
-          width="180"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="classType"
-          label="班级类型"
-          width="160"
-          align="center"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.classType == dictValue1 ? "大班" : "" }}
-            {{ scope.row.classType == dictValue2 ? "中班" : "" }}
-            {{ scope.row.classType == dictValue3 ? "小班" : "" }}
-            {{ scope.row.classType == dictValue4 ? "毕业" : "" }}
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          property="classTeacher"
-          label="班主任姓名"
-          width="180"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="phone"
-          label="联系电话"
-          width="190"
-          align="center"
-        >
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total2 > 0"
-        :total="total2"
-        :page.sync="classqueryParams.pageNum"
-        :limit.sync="classqueryParams.pageSize"
-        @pagination="classinfo"
-      />
-    </el-dialog>
-
     <el-row v-show="itemshow">
       <el-col
         :span="11"
@@ -954,17 +638,12 @@
 </template>
 <script>
 import * as echarts from "echarts";
-import {
-  listKindergartenInfo,
-  tKindergartenInfo,
-} from "@/api/system/kindergartenInfo";
-import { listStudentInfo } from "@/api/system/studentInfo";
-import { listClassinfo } from "@/api/system/classinfo";
-import { getRoleInfo, testScoreBatch } from "@/api/system/quality";
+import student from "@/views/assembly/student.vue";
+import { getRoleInfo } from "@/api/system/quality";
 import { analysis } from "@/api/system/shape";
 export default {
   name: "shape",
-  components: {},
+  components: { student },
   data() {
     return {
       itemshow: false,
@@ -972,99 +651,18 @@ export default {
       itemshow3: true,
       weightshow: true,
       heightshow: true,
-      showyey: true,
-      showbj: true,
-      total1: 0,
-      total2: 0,
-      total3: 0,
-      total4: 0,
       itemweight: "",
       weightMax: 70,
       weightMin: 10,
       itemheight: "",
       heightMax: 150,
       heightMin: 30,
-      //遮罩层
-      kindergartenshow: false,
-      classshow: false,
-      studentshow: false,
-      batchCodeshow: false,
-      //班级类型
-      dictValue1: "",
-      dictValue2: "",
-      dictValue3: "",
-      dictValue4: "",
-      ClassType: "class_type",
       // 显示搜索条件
       showSearch: true,
-      // 表单参数
-      form: {},
-      //学生查询
-      studentqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        classId: "",
-        nationDictId: null,
-        studentName: null,
-        studentSex: null,
-        studentNumber: null,
-        birthDate: null,
-        cardNumber: null,
-        onceName: null,
-        homeAddress: null,
-      },
-      //班级查询
-      classqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        kindergartenId: "",
-        className: null,
-        classType: null,
-      },
-      //幼儿园查询参数
-      kqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        organizeId: null,
-        kindergartenName: null,
-        kindergartenAddress: null,
-        kindergartenType: null,
-        phone: null,
-        contacts: null,
-      },
-      //幼儿园list
-      kindergartenList: [],
-      //幼儿园名字
-      kindergartenName: "请选择幼儿园",
-      //幼儿园ID
-      kindergartenId: "",
-      //班级list
-      classinfoList: [],
-      //班级名字
-      className: "请选择班级",
-      //班级ID
-      classId: "",
-      //学生list
-      studentInfoList: [],
-      //学生名字
-      studentname: "请选择学生",
-      //学生ID
-      studentId: "",
-      //批次名称
-      batchCodeName: "请选择批次",
-      //批次ID
-      batchCodeId: "",
-      //批次list
-      testScorelist: [],
       //身体形态list
       analysislist: [],
       //bmi
       bmiItemLevel: [],
-      //批次编号
-      testqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-      },
       //身体形态传值
       analysisstudent: {
         // studentId: "10",
@@ -1076,11 +674,18 @@ export default {
   },
   mounted() {},
   created() {
-    this.getList();
-    this.class();
     // this.studentanalysis();
   },
   methods: {
+    itemlists(studentId, batchCode) {
+      console.log(studentId, batchCode);
+      this.analysisstudent.studentId = studentId;
+      this.analysisstudent.batchCode = batchCode;
+    },
+    /** 查看按钮操作 */
+    handleQuery() {
+      this.studentanalysis();
+    },
     //学生身体形态
     studentanalysis() {
       analysis(this.analysisstudent).then((res) => {
@@ -1178,125 +783,6 @@ export default {
         }
       });
     },
-    // 点击学生按钮
-    studentshowclick() {
-      if (this.studentqueryParams.classId == "") {
-        this.$message.error("请先选择班级");
-      } else {
-        this.studentshow = true;
-        this.studentlist();
-      }
-    },
-    //点击批次
-    batchCodeshowclick() {
-      if (this.analysisstudent.studentId == "") {
-        this.$message.error("请先选择学生");
-      } else {
-        this.testScore();
-        this.batchCodeshow = true;
-      }
-    },
-    //点击批次左边
-    batchCodeclick(row) {
-      this.batchCodeName = row.batchName;
-      this.batchCodeId = row.id;
-      this.analysisstudent.batchCode = row.batchCode;
-      this.batchCodeshow = false;
-      this.studentanalysis();
-    },
-    //批次
-    testScore() {
-      testScoreBatch(this.testqueryParams).then((res) => {
-        this.testScorelist = res.rows;
-        this.total4 = res.total;
-      });
-    },
-    //学生左侧按钮
-    studentclick(row) {
-      this.studentname = row.studentName;
-      this.studentId = row.id;
-      this.studentshow = false;
-      this.analysisstudent.studentId = row.id;
-       if (this.analysisstudent.batchCode != "") {
-        this.studentanalysis();
-      }
-    },
-    //获取学生
-    studentlist() {
-      listStudentInfo(this.studentqueryParams).then((res) => {
-        this.studentInfoList = res.rows;
-        this.total3 = res.total;
-        // console.log(this.studentInfoList);
-      });
-    },
-    //点击所属班级
-    classshowclick() {
-      if (this.classqueryParams.kindergartenId == ""||this.classqueryParams.kindergartenId == null) {
-        this.$message.error("请先选择幼儿园");
-      } else {
-        this.classshow = true;
-        this.classinfo();
-      }
-      //   console.log(this.classqueryParams);
-    },
-    //批次关闭
-    batchCodecancel() {
-      this.batchCodeshow = false;
-    },
-    //学生关闭
-    studentcancel() {
-      this.studentshow = false;
-    },
-    //幼儿园关闭
-    kindergartencancel() {
-      this.kindergartenshow = false;
-    },
-    //班级关闭
-    classcancel() {
-      this.classshow = false;
-    },
-    //班级左侧点击
-    classclick(row) {
-      //   console.log(row);
-      this.className = row.className;
-      this.classId = row.id;
-      this.studentqueryParams.classId = row.id;
-      this.studentname = "请选择学生";
-      this.studentId = "";
-      this.analysisstudent.studentId = "";
-      this.classshow = false;
-    },
-    //幼儿园左侧点击
-    kindergartenNameclick(row) {
-      this.classqueryParams.kindergartenId = row.id;
-      this.kindergartenName = row.kindergartenName;
-      this.kindergartenId = row.id;
-      this.className = "请选择班级";
-      this.classId = "";
-      this.studentname = "请选择学生";
-      this.studentId = "";
-      this.analysisstudent.studentId = "";
-      this.kindergartenshow = false;
-    },
-    //班级类型
-    class() {
-      tKindergartenInfo(this.ClassType).then((res) => {
-        this.dictValue1 = res.data[0].dictValue;
-        this.dictValue2 = res.data[1].dictValue;
-        this.dictValue3 = res.data[2].dictValue;
-        this.dictValue4 = res.data[3].dictValue;
-      });
-    },
-    //班级list
-    classinfo() {
-      listClassinfo(this.classqueryParams).then((response) => {
-        this.classinfoList = response.rows;
-        this.total2 = response.total;
-
-        // console.log(this.classinfoList);
-      });
-    },
-
     getList() {
       //用户权限
       getRoleInfo().then((res) => {
@@ -1305,23 +791,13 @@ export default {
         var user = res.data.roleKeys;
         console.log(user);
         if (user.includes("enchou")) {
-          this.showyey = false;
           return;
         } else if (user.includes("teacher")) {
-          this.showyey = false;
           return;
         } else if (user.includes("parent")) {
-          this.showyey = false;
-          this.showbj = false;
           return;
         }
       });
-      //获取幼儿园list
-      listKindergartenInfo(this.kqueryParams).then((response) => {
-        this.kindergartenList = response.rows;
-        this.total1 = response.total;
-        // console.log(this.kindergartenList);
-      });
     },
     // 表单重置
     reset() {
@@ -1343,4 +819,7 @@ export default {
   position: absolute;
   top: 40px;
 }
+::v-deep .el-form {
+  display: inline;
+}
 </style>
diff --git a/src/views/system/survey/index.vue b/src/views/system/survey/index.vue
index 67b658b..a6202b3 100644
--- a/src/views/system/survey/index.vue
+++ b/src/views/system/survey/index.vue
@@ -7,33 +7,17 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
+      <kindergarten
+        @kinbatlist="kinbatlist"
+        style="width: 500px; display: inline"
+      ></kindergarten>
+      <el-form-item>
         <el-button
-          @click="kindergartenshow = true"
-          v-if="kindergartenName == '请选择幼儿园'"
-          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
-          >{{ kindergartenName }}</el-button
-        >
-        <el-button
-          @click="kindergartenshow = true"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ kindergartenName }}</el-button
-        >
-      </el-form-item>
-
-      <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="batchCodeName == '请选择批次'"
-          >{{ batchCodeName }}</el-button
-        >
-        <el-button
-          @click="batchCodeshowclick"
-          style="width: 250px; text-align: left; height: 32px"
-          v-else
-          >{{ batchCodeName }}</el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >查看</el-button
         >
       </el-form-item>
     </el-form>
@@ -43,181 +27,75 @@
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
-
-    <!-- //批次 -->
-    <el-dialog
-      width="590px"
-      title="选择批次"
-      :visible.sync="batchCodeshow"
-      append-to-body
-      style="margin-top: 20px"
-      :before-close="batchCodecancel"
-    >
-      <el-table :data="testScorelist" align="center" style="margin-top: 0px">
-        <el-table-column label="请选择" width="100" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 20px; height: 20px"
-              v-if="batchCodeId == scope.row.id"
-              circle
-              @click="batchCodeclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="batchCodeclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          property="batchCode"
-          label="批次编号"
-          width="200"
-          align="center"
-        />
-        <el-table-column
-          property="batchName"
-          label="批次名称"
-          width="200"
-          align="center"
-        />
-      </el-table>
-      <pagination
-        v-show="total4 > 0"
-        :total="total4"
-        :page.sync="testqueryParams.pageNum"
-        :limit.sync="testqueryParams.pageSize"
-        @pagination="testScore"
-      />
-    </el-dialog>
-
-    <!-- //幼儿园 -->
-    <el-dialog
-      width="850px"
-      title="选择所属幼儿园"
-      :visible.sync="kindergartenshow"
-      append-to-body
-      :before-close="kindergartencancel"
-    >
-      <el-table :data="kindergartenList">
-        <el-table-column label="请选择" width="70" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 15px; height: 15px"
-              circle
-              @click="kindergartenNameclick(scope.row)"
-              v-if="kindergartenId == scope.row.id"
-            ></el-button>
-
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="kindergartenNameclick(scope.row)"
-            ></el-button>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          property="kindergartenName"
-          label="幼儿园名字"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="kindergartenAddress"
-          label="幼儿园地址"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          label="幼儿园所在组织"
-          align="center"
-          prop="organizeName"
-          width="150"
-        >
-        </el-table-column>
-        <el-table-column
-          property="contacts"
-          label="联系人"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="phone"
-          label="联系电话"
-          width="150"
-          align="center"
-        >
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total1 > 0"
-        :total="total1"
-        :page.sync="kqueryParams.pageNum"
-        :limit.sync="kqueryParams.pageSize"
-        @pagination="getList"
-      />
-    </el-dialog>
-
     <el-row v-show="itemshow">
-      <div style="display: flex">
-        <div style="width: 50%">
-          <div
-            id="main"
-            style="width: 500px; height: 300px; margin: 0 auto"
-          ></div>
-          <div
-            id="main2"
-            style="width: 500px; height: 300px; margin: 0 auto"
-          ></div>
-          <div
-            id="main3"
-            style="width: 500px; height: 300px; margin: 0 auto"
-          ></div>
-        </div>
-        <div style="width: 50%; margin-top: 50px">
-          <el-table
-            ref="singleTable"
-            :data="studentlist"
-            highlight-current-row
-            style="margin: 0 auto; width: 530px"
-          >
-            <el-table-column
-              type="index"
-              width="130"
-              label="排名"
-              align="center"
+      <div>
+        <div style="display: flex; margin-top: 20px">
+          <div style="width: 50%">
+            <div slot="header" class="header">
+              <span>班级综合体测成绩排名</span>
+            </div>
+            <div v-if="yclassname1.length != 0" style="position: relative">
+              <div class="title">大班</div>
+              <div
+                id="main"
+                style="width: 500px; height: 300px; margin: 0 auto"
+              ></div>
+            </div>
+            <div v-if="yclassname2.length != 0" style="position: relative">
+              <div class="title">中班</div>
+              <div
+                id="main2"
+                style="width: 500px; height: 300px; margin: 0 auto"
+              ></div>
+            </div>
+            <div v-if="yclassname3.length != 0" style="position: relative">
+              <div class="title">小班</div>
+              <div
+                id="main3"
+                style="width: 500px; height: 300px; margin: 0 auto"
+              ></div>
+            </div>
+          </div>
+          <div style="width: 50%">
+            <div slot="header" class="header" style="margin-bottom: 40px">
+              <span>全国优秀幼儿榜(TOP10)</span>
+            </div>
+            <el-table
+              ref="singleTable"
+              :data="studentlist"
+              highlight-current-row
+              style="margin: 0 auto; width: 530px"
             >
-            </el-table-column>
-            <el-table-column
-              property="studentName"
-              label="姓名"
-              width="130"
-              align="center"
-            >
-            </el-table-column>
-            <el-table-column
-              property="className"
-              label="班级"
-              width="130"
-              align="center"
-            >
-            </el-table-column>
-            <el-table-column
-              property="itemFraction"
-              label="分数"
-              width="140"
-              align="center"
-            >
-            </el-table-column>
-          </el-table>
+              <el-table-column
+                type="index"
+                width="130"
+                label="排名"
+                align="center"
+              >
+              </el-table-column>
+              <el-table-column
+                property="studentName"
+                label="姓名"
+                width="130"
+                align="center"
+              >
+              </el-table-column>
+              <el-table-column
+                property="className"
+                label="班级"
+                width="130"
+                align="center"
+              >
+              </el-table-column>
+              <el-table-column
+                property="itemFraction"
+                label="分数"
+                width="140"
+                align="center"
+              >
+              </el-table-column>
+            </el-table>
+          </div>
         </div>
       </div>
     </el-row>
@@ -237,63 +115,18 @@
 </template>
 <script>
 import * as echarts from "echarts";
-import {
-  listKindergartenInfo,
-  tKindergartenInfo,
-} from "@/api/system/kindergartenInfo";
-import { getRoleInfo, testScoreBatch } from "@/api/system/quality";
+import { getRoleInfo } from "@/api/system/quality";
 import { StudentList, ClassList } from "@/api/system/survey";
-
+import Kindergarten from "../../assembly/kindergarten.vue";
 export default {
   name: "KindergartenPhysicalTest",
-  components: {},
+  components: { Kindergarten },
   data() {
     return {
       itemshow: false,
       itemshow2: false,
-      showyey: true,
-      total1: 0,
-      total4: 0,
-
-      //遮罩层
-      kindergartenshow: false,
-      batchCodeshow: false,
       // 显示搜索条件
       showSearch: true,
-      // 表单参数
-      form: {},
-      //班级类型
-      kindergartenType: "kindergarten_type",
-      type: {},
-      type2: {},
-      //幼儿园查询参数
-      kqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        organizeId: null,
-        kindergartenName: null,
-        kindergartenAddress: null,
-        kindergartenType: null,
-        phone: null,
-        contacts: null,
-      },
-      //幼儿园list
-      kindergartenList: [],
-      //幼儿园名字
-      kindergartenName: "请选择幼儿园",
-      //幼儿园ID
-      kindergartenId: "",
-      //批次名称
-      batchCodeName: "请选择批次",
-      //批次ID
-      batchCodeId: "",
-      //批次list
-      testScorelist: [],
-      //批次编号
-      testqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-      },
       studentlist: [],
       //查询传值
       classqueryParams: {
@@ -325,62 +158,71 @@ export default {
   },
   mounted() {},
   created() {
-    this.getList();
     // this.StudentListinfo();
     // this.ClassListinfo();
   },
   methods: {
+    handleQuery() {
+      this.StudentListinfo();
+      this.ClassListinfo();
+    },
+    kinbatlist(kindergartenId, batchCode) {
+      console.log(kindergartenId, batchCode);
+      this.studentlistqueryParams.kindergartenId = kindergartenId;
+      this.studentlistqueryParams.batchCode = batchCode;
+      this.classqueryParams.kindergartenId = kindergartenId;
+      this.classqueryParams.batchCode = batchCode;
+    },
     ClassListinfo() {
       ClassList(this.classqueryParams).then((res) => {
         if (res.rows.length == 0) {
           this.itemshow2 = true;
           this.itemshow = false;
         } else {
-          this.$nextTick((e) => {
-            this.yclassname1 = [];
-            this.yclassname2 = [];
-            this.yclassname3 = [];
-            this.classscore1 = [];
-            this.classscore2 = [];
-            this.classscore3 = [];
-            res.rows.forEach((e) => {
-              if (e.classType == this.LARGECLASS) {
-                this.yclassname1.push(e.className);
-                if (
-                  e.itemScoreAll == "" ||
-                  !e.itemScoreAll ||
-                  e.itemScoreAll == null
-                ) {
-                  this.classscore1.push(0);
-                } else {
-                  this.classscore1.push(e.itemScoreAll);
-                }
-              } else if (e.classType == this.MIDDLECLASS) {
-                this.yclassname2.push(e.className);
-                if (
-                  e.itemScoreAll == "" ||
-                  !e.itemScoreAll ||
-                  e.itemScoreAll == null
-                ) {
-                  this.classscore2.push(0);
-                } else {
-                  this.classscore2.push(e.itemScoreAll);
-                }
-              } else if (e.classType == this.SMALLCLASS) {
-                s;
-                this.yclassname3.push(e.className);
-                if (
-                  e.itemScoreAll == "" ||
-                  !e.itemScoreAll ||
-                  e.itemScoreAll == null
-                ) {
-                  this.classscore3.push(0);
-                } else {
-                  this.classscore3.push(e.itemScoreAll);
-                }
+          this.yclassname1 = [];
+          this.yclassname2 = [];
+          this.yclassname3 = [];
+          this.classscore1 = [];
+          this.classscore2 = [];
+          this.classscore3 = [];
+          res.rows.forEach((e) => {
+            if (e.classType == this.LARGECLASS) {
+              this.yclassname1.push(e.className);
+              if (
+                e.itemScoreAll == "" ||
+                !e.itemScoreAll ||
+                e.itemScoreAll == null
+              ) {
+                this.classscore1.push(0);
+              } else {
+                this.classscore1.push(e.itemScoreAll);
               }
-            });
-            console.log(this.yclassname3, this.yclassname2);
+            } else if (e.classType == this.MIDDLECLASS) {
+              this.yclassname2.push(e.className);
+              if (
+                e.itemScoreAll == "" ||
+                !e.itemScoreAll ||
+                e.itemScoreAll == null
+              ) {
+                this.classscore2.push(0);
+              } else {
+                this.classscore2.push(e.itemScoreAll);
+              }
+            } else if (e.classType == this.SMALLCLASS) {
+              this.yclassname3.push(e.className);
+              if (
+                e.itemScoreAll == "" ||
+                !e.itemScoreAll ||
+                e.itemScoreAll == null
+              ) {
+                this.classscore3.push(0);
+              } else {
+                this.classscore3.push(e.itemScoreAll);
+              }
+            }
+          });
+          console.log(this.yclassname3, this.yclassname2);
+          this.$nextTick((e) => {
             if (this.yclassname1.length != 0) {
               var myChart = echarts.init(document.getElementById("main"));
             }
@@ -390,9 +232,9 @@ export default {
             if (this.yclassname3.length != 0) {
               var myChart3 = echarts.init(document.getElementById("main3"));
             }
-            var myChart = echarts.init(document.getElementById("main"));
-            var myChart2 = echarts.init(document.getElementById("main2"));
-            var myChart3 = echarts.init(document.getElementById("main3"));
+            // var myChart = echarts.init(document.getElementById("main"));
+            // var myChart2 = echarts.init(document.getElementById("main2"));
+            // var myChart3 = echarts.init(document.getElementById("main3"));
             var app = {};
 
             var option;
@@ -511,6 +353,7 @@ export default {
               series: [
                 {
                   type: "bar",
+                  barWidth: 35,
                   barGap: 0,
                   color: "#00B050",
                   label: labelOption,
@@ -545,6 +388,8 @@ export default {
                 {
                   type: "bar",
                   barGap: 0,
+                  barWidth: 35,
+
                   color: "#00B050",
                   label: labelOption,
                   emphasis: {
@@ -578,6 +423,7 @@ export default {
                 {
                   type: "bar",
                   barGap: 0,
+                  barWidth: 35,
                   color: "#00B050",
                   label: labelOption,
                   emphasis: {
@@ -619,90 +465,21 @@ export default {
         }
       });
     },
-    //点击批次左边
-    batchCodeclick(row) {
-      this.batchCodeName = row.batchName;
-      this.batchCodeId = row.id;
-      this.classqueryParams.batchCode = row.batchCode;
-      this.studentlistqueryParams.batchCode = row.batchCode;
-      this.batchCodeshow = false;
-      this.StudentListinfo();
-      this.ClassListinfo();
-    },
-    //点击批次
-    batchCodeshowclick() {
-      console.log(this.classqueryParams);
-      if (
-        this.classqueryParams.kindergartenId == "" ||
-        this.classqueryParams.kindergartenId == null
-      ) {
-        this.$message.error("请先选择幼儿园");
-      } else {
-        this.testScore();
-        this.batchCodeshow = true;
-      }
-    },
-    //批次
-    testScore() {
-      testScoreBatch(this.testqueryParams).then((res) => {
-        this.testScorelist = res.rows;
-        this.total4 = res.total;
-      });
-    },
-    //批次关闭
-    batchCodecancel() {
-      this.batchCodeshow = false;
-    },
-    //幼儿园关闭
-    kindergartencancel() {
-      this.kindergartenshow = false;
-    },
-    //幼儿园左侧点击
-    kindergartenNameclick(row) {
-      this.classqueryParams.kindergartenId = row.id;
-      this.studentlistqueryParams.kindergartenId = row.id;
-      this.kindergartenName = row.kindergartenName;
-      this.kindergartenId = row.id;
-      if (
-        this.studentlistqueryParams.batchCode != "" &&
-        this.classqueryParams.batchCode != ""
-      ) {
-        this.StudentListinfo();
-        this.ClassListinfo();
-      }
-      this.kindergartenshow = false;
-    },
-
     getList() {
-      tKindergartenInfo(this.kindergartenType).then((res) => {
-        this.type = res.data[0];
-        this.type2 = res.data[1];
-      });
       //用户权限
       getRoleInfo().then((res) => {
         this.studentlistqueryParams.kindergartenId = res.data.kindergartenId;
         this.classqueryParams.kindergartenId = res.data.kindergartenId;
-        console.log(this.classqueryParams);
-
         var user = res.data.roleKeys;
         console.log(user);
         if (user.includes("enchou")) {
-          this.showyey = false;
           return;
         } else if (user.includes("teacher")) {
-          this.showyey = false;
           return;
         } else if (user.includes("parent")) {
-          this.showyey = false;
           return;
         }
       });
-      //获取幼儿园list
-      listKindergartenInfo(this.kqueryParams).then((response) => {
-        this.kindergartenList = response.rows;
-        this.total1 = response.total;
-        // console.log(this.kindergartenList);
-      });
     },
     // 表单重置
     reset() {
@@ -713,7 +490,33 @@ export default {
 };
 </script>
 <style scoped='scss'>
+.header {
+  text-align: center;
+  font-size: 18px;
+  width: 380px;
+  height: 45px;
+  line-height: 45px;
+  margin: 0 auto;
+  background-color: #f0f0f0;
+  border-radius: 25px;
+}
+.title {
+  width: 70px;
+  background-color: #00d1da;
+  color: #fff;
+  line-height: 25px;
+  height: 25px;
+  font-size: 14px;
+  text-align: center;
+  border-radius: 15px;
+  position: absolute;
+  left: 14%;
+  top: 5%;
+}
 ::v-deep .el-card__header {
   border: none;
 }
+::v-deep .el-form {
+  display: inline;
+}
 </style>
diff --git a/src/views/system/testItemCityScore/index.vue b/src/views/system/testItemCityScore/index.vue
index f0b2b5a..a76f121 100644
--- a/src/views/system/testItemCityScore/index.vue
+++ b/src/views/system/testItemCityScore/index.vue
@@ -212,11 +212,7 @@
           :required="true"
           v-if="form.resultDictType == ''"
         >
-          <el-input 
-          v-model="value" 
-          placeholder="请输入平均得分" 
-          
-          />
+          <el-input v-model="value" placeholder="请输入平均得分" />
         </el-form-item>
 
         <el-form-item
@@ -230,12 +226,11 @@
 
         <el-form-item
           label="平均得分"
-          v-else-if="form.dictValue == ResultType2.dictValue"
+          v-else-if="form.resultDictType == ResultType2.dictValue"
           key="itemAvgText"
           prop="itemAvgText"
         >
-         <el-input v-model="form.itemAvgText" placeholder="请输入平均得分"
-         @input="change($event)" />
+          <el-input v-model="form.itemAvgText" placeholder="请输入平均得分" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -397,6 +392,7 @@
         v-loading="loading"
         :data="testItemsList"
         @selection-change="handleSelectionChange"
+        @cell-dblclick="xmclick"
       >
         <el-table-column width="60" align="center" label="请选择">
           <template slot-scope="scope">
@@ -539,16 +535,16 @@ export default {
         }
       }
     };
-     var roleMoeny1 = (rule, value, callback) => {
+    var roleMoeny1 = (rule, value, callback) => {
       var str = String(this.form.itemAvgText);
-      console.log(str);
+      console.log(value);
+      console.log(this.form);
       var str_ = "";
       var str2 = "";
       if (str.includes(".")) {
         str_ = str.substr(str.indexOf(".")).length;
         str2 = str.substr(0, str.indexOf(".")).length;
-        console.log(str2);
-          if (!this.form.itemAvgText) {
+        if (!this.form.itemAvgText) {
           callback(new Error("不能为空"));
         } else if (this.form.itemAvgText * 1 > 99999999) {
           callback(new Error("最大99999999")); // 限制最大额度
@@ -561,14 +557,13 @@ export default {
         }
       } else {
         str2 = str.length;
-        console.log(str2);
         if (!this.form.itemAvgText) {
           callback(new Error("不能为空"));
         } else if (this.form.itemAvgText * 1 > 99999999) {
           callback(new Error("最大99999999")); // 限制最大额度
         } else if (this.form.itemAvgText == "0") {
           callback(new Error("请输入成绩")); // 限制最大额度
-        }  else {
+        } else {
           callback();
         }
       }
@@ -649,13 +644,22 @@ export default {
         sex: null,
       },
       // 表单参数
-      form: {},
+      form: {
+        resultDictType: "",
+        itemAvgScore: "123",
+        itemAvgText: "456",
+      },
       // 表单校验
       rules: {
         sex: [{ required: true, message: "请选择性别", trigger: "blur" }],
         itemAvgScore: [{ required: true, validator: roleMoeny, message: "" }],
         itemAvgText: [
-          { required: true, validator: roleMoeny1,message: "", trigger: "blur" },
+          {
+            required: true,
+            validator: roleMoeny1,
+            message: "",
+            trigger: "blur",
+          },
         ],
         areaId: [
           { required: true, message: "请选择所属区域", trigger: "blur" },
@@ -670,9 +674,6 @@ export default {
     this.getList();
   },
   methods: {
-    change (e) {
-    this.$forceUpdate()
-},
     inputChange() {
       this.getItemCityScorelist.areaId = this.form.areaId;
       if (
@@ -692,24 +693,26 @@ export default {
         this.getItemCityScore();
       }
     },
-
     getItemCityScore() {
       getItemCityScoreInfo(this.getItemCityScorelist).then((res) => {
         if (res.data) {
-          this.form.itemAvgScore = res.data.itemAvgScore;
-          this.form.itemAvgText = res.data.itemAvgText;
+          if (res.data.itemAvgScore == null) {
+            this.form.itemAvgText = res.data.itemAvgText;
+            this.form.itemAvgScore = null;
+          } else if (res.data.itemAvgText == null) {
+            this.form.itemAvgScore = res.data.itemAvgScore;
+            this.form.itemAvgText = null;
+          }
         } else {
-          this.form.itemAvgScore = "";
-          this.form.itemAvgText = "";
+          this.form.itemAvgScore = null;
+          this.form.itemAvgText = null;
         }
+
+        console.log(this.form);
       });
     },
     innerVisiblexm() {
-      if (this.form.areaId == null) {
-        return this.$message.error("请先选择所属区域");
-      } else {
-        this.innerVisible = true;
-      }
+      this.innerVisible = true;
     },
     normalizer3(node) {
       if (node.children && !node.children.length) {
@@ -757,6 +760,7 @@ export default {
       ) {
         this.getItemCityScore();
       }
+      console.log(this.ResultType1, this.ResultType2);
       console.log(this.form);
     },
     /** 查询全市平均成绩列表 */
@@ -818,8 +822,9 @@ export default {
         id: null,
         areaId: null,
         itemId: null,
-        itemAvgScore: null,
         resultDictType: "",
+        itemAvgScore: "",
+        itemAvgText: "",
       };
     },
     /** 搜索按钮操作 */
@@ -845,6 +850,7 @@ export default {
         areaId: null,
         itemId: null,
         itemAvgScore: null,
+        itemAvgText: null,
       };
       this.handleQuery();
     },
diff --git a/src/views/system/testItemCountryScore/index.vue b/src/views/system/testItemCountryScore/index.vue
index 33f1b07..6628cf7 100644
--- a/src/views/system/testItemCountryScore/index.vue
+++ b/src/views/system/testItemCountryScore/index.vue
@@ -369,151 +369,146 @@
             >重置</el-button
           >
         </el-form-item>
-
-        <el-table :data="testItemslists">
-          <el-table-column label="请选择" width="70" align="center">
-            <template slot-scope="scope">
-              <el-button
-                type="primary"
-                v-if="itemId2 == scope.row.id"
-                style="width: 15px; height: 15px"
-                circle
-                @click="xmclick(scope.row)"
-              ></el-button>
-
-              <el-button
-                v-else
-                style="width: 15px; height: 15px"
-                circle
-                @click="xmclick(scope.row)"
-              ></el-button>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            property="itemName"
-            label="项目名称"
-            width="150"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            label="字典类型"
-            align="center"
-            prop="resultDictType"
-          >
-            <template slot-scope="scope">
-              {{
-                scope.row.resultDictType == ResultType1.dictCode
-                  ? ResultType1.dictLabel
-                  : ""
-              }}{{
-                scope.row.resultDictType == ResultType2.dictCode
-                  ? ResultType2.dictLabel
-                  : ""
-              }}</template
-            >
-          </el-table-column>
-          <el-table-column
-            property="itemCode"
-            label="测试项目编号"
-            width="150"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            property="itemContent"
-            label="项目内容"
-            width="150"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            property="mesureUnit"
-            label="项目度量单位"
-            width="150"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            property="largeStandardScore"
-            label="大班标准最高得分"
-            width="150"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            property="middleStandardScore"
-            label="中班标准最高得分"
-            width="150"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            property="smallStandardScore"
-            label="小班标准最高得分"
-            width="150"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            property="unifiedStandardScore"
-            label="统一标准最高得分"
-            width="150"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            property="sorting"
-            label="排序"
-            width="150"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            property="remark"
-            label="项目概述"
-            width="150"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            property="createBy"
-            label="创建人"
-            width="150"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            property="createTime"
-            label="创建时间"
-            width="150"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            property="updateBy"
-            label="修改人"
-            width="150"
-            align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            property="updateTime"
-            label="修改时间"
-            width="150"
-            align="center"
-          >
-          </el-table-column>
-        </el-table>
-        <pagination
-          v-show="total2 > 0"
-          :total="total2"
-          :page.sync="queryParams2.pageNum"
-          :limit.sync="queryParams2.pageSize"
-          @pagination="getList"
-        />
       </el-form>
+      <el-table :data="testItemslists" @cell-dblclick="xmclick">
+        <el-table-column label="请选择" width="70" align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="primary"
+              v-if="itemId2 == scope.row.id"
+              style="width: 15px; height: 15px"
+              circle
+              @click="xmclick(scope.row)"
+            ></el-button>
+
+            <el-button
+              v-else
+              style="width: 15px; height: 15px"
+              circle
+              @click="xmclick(scope.row)"
+            ></el-button>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          property="itemName"
+          label="项目名称"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column label="字典类型" align="center" prop="resultDictType">
+          <template slot-scope="scope">
+            {{
+              scope.row.resultDictType == ResultType1.dictCode
+                ? ResultType1.dictLabel
+                : ""
+            }}{{
+              scope.row.resultDictType == ResultType2.dictCode
+                ? ResultType2.dictLabel
+                : ""
+            }}</template
+          >
+        </el-table-column>
+        <el-table-column
+          property="itemCode"
+          label="测试项目编号"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="itemContent"
+          label="项目内容"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="mesureUnit"
+          label="项目度量单位"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="largeStandardScore"
+          label="大班标准最高得分"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="middleStandardScore"
+          label="中班标准最高得分"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="smallStandardScore"
+          label="小班标准最高得分"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="unifiedStandardScore"
+          label="统一标准最高得分"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="sorting"
+          label="排序"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="remark"
+          label="项目概述"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="createBy"
+          label="创建人"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="createTime"
+          label="创建时间"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="updateBy"
+          label="修改人"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          property="updateTime"
+          label="修改时间"
+          width="150"
+          align="center"
+        >
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total2 > 0"
+        :total="total2"
+        :page.sync="queryParams2.pageNum"
+        :limit.sync="queryParams2.pageSize"
+        @pagination="getList"
+      />
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/system/testItemScore/index.vue b/src/views/system/testItemScore/index.vue
index 29ce9a5..a56a68c 100644
--- a/src/views/system/testItemScore/index.vue
+++ b/src/views/system/testItemScore/index.vue
@@ -6,8 +6,36 @@
       size="small"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      label-width="90px"
     >
+      <el-form-item label="所属幼儿园" prop="classId">
+        <el-button
+          type=""
+          @click="yryinnerVisible = true"
+          v-if="kindergartenName == '请选择幼儿园'"
+          style="
+            width: 208.33px;
+            text-align: left;
+            height: 36px;
+            color: #c0c4cc;
+            padding-left: -10px;
+          "
+          >{{ kindergartenName }}</el-button
+        >
+
+        <el-button
+          type=""
+          @click="yryinnerVisible = true"
+          v-else
+          style="
+            width: 208.33px;
+            text-align: left;
+            height: 36px;
+            padding-left: -10px;
+          "
+          >{{ kindergartenName }}</el-button
+        >
+      </el-form-item>
       <el-form-item label="所属班级" prop="className">
         <el-input
           v-model="queryParams.className"
@@ -126,8 +154,6 @@
 
       <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
-      <el-table-column label="修改人" align="center" prop="updateBy" />
-      <el-table-column label="修改时间" align="center" prop="updateTime" />
       <el-table-column
         label="操作"
         align="center"
@@ -174,66 +200,9 @@
         ref="form"
         :model="form"
         :rules="rules"
-        label-width="110px"
+        label-width="100px"
         :inline="true"
       >
-        <el-form-item label="所属幼儿园" prop="classId" v-if="form.id == ''">
-          <el-button
-            type=""
-            @click="yryinnerVisible = true"
-            v-if="kindergartenName == '请选择幼儿园'"
-            style="
-              width: 240px;
-              text-align: left;
-              height: 36px;
-              color: #c0c4cc;
-              padding-left: -10px;
-            "
-            >{{ kindergartenName }}</el-button
-          >
-
-          <el-button
-            type=""
-            @click="yryinnerVisible = true"
-            v-else
-            style="
-              width: 240px;
-              text-align: left;
-              height: 36px;
-              padding-left: -10px;
-            "
-            >{{ kindergartenName }}</el-button
-          >
-        </el-form-item>
-
-        <el-form-item label="所属班级" prop="classId" v-if="form.id == ''">
-          <el-button
-            type=""
-            @click="handleQuery2"
-            v-if="xmname == '请选择所属班级'"
-            style="
-              width: 200px;
-              text-align: left;
-              height: 36px;
-              color: #c0c4cc;
-              padding-left: -10px;
-            "
-            >{{ xmname }}</el-button
-          >
-
-          <el-button
-            type=""
-            @click="handleQuery2"
-            v-else
-            style="
-              width: 200px;
-              text-align: left;
-              height: 36px;
-              padding-left: -10px;
-            "
-            >{{ xmname }}</el-button
-          >
-        </el-form-item>
         <el-form-item label="学生姓名" prop="studentId" v-if="form.id == null">
           <el-button
             disabled
@@ -416,7 +385,7 @@
       append-to-body
       :before-close="kindergartencancel"
     >
-      <el-table :data="kindergartenList">
+      <el-table :data="kindergartenList" @cell-dblclick="kindergartenNameclick">
         <el-table-column label="请选择" width="70" align="center">
           <template slot-scope="scope">
             <el-button
@@ -482,7 +451,6 @@
     </el-dialog>
 
     <!--所属班级 弹窗 -->
-
     <el-dialog
       width="850px"
       title="选择所属班级"
@@ -500,7 +468,7 @@
         <el-form-item label="班级名称" prop="className">
           <el-input
             v-model="queryParams2.className"
-            placeholder="请输入项目名称"
+            placeholder="请输入班级名称"
             clearable
             @keyup.enter.native="handleQuery"
           />
@@ -513,12 +481,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
@@ -614,13 +582,13 @@
         :total="total2"
         :page.sync="queryParams2.pageNum"
         :limit.sync="queryParams2.pageSize"
-        @pagination="getList"
+        @pagination="classresetQuery"
       />
     </el-dialog>
 
     <!-- 学生姓名弹窗 -->
     <el-dialog
-      width="850px"
+      width="1050px"
       title="选择学生姓名"
       :visible.sync="innerVisible2"
       append-to-body
@@ -633,6 +601,64 @@
         v-show="showSearch"
         label-width="90px"
       >
+        <el-form-item label="所属幼儿园" prop="classId" v-if="form.id == ''">
+          <el-button
+            type=""
+            @click="yryinnerVisible = true"
+            v-if="kindergartenName == '请选择幼儿园'"
+            style="
+              width: 200px;
+              text-align: left;
+              height: 36px;
+              color: #c0c4cc;
+              padding-left: -10px;
+            "
+            >{{ kindergartenName }}</el-button
+          >
+
+          <el-button
+            type=""
+            @click="yryinnerVisible = true"
+            v-else
+            style="
+              width: 200px;
+              text-align: left;
+              height: 36px;
+              padding-left: -10px;
+            "
+            >{{ kindergartenName }}</el-button
+          >
+        </el-form-item>
+
+        <el-form-item label="所属班级" prop="classId" v-if="form.id == ''">
+          <el-button
+            type=""
+            @click="handleQuery2"
+            v-if="xmname == '请选择所属班级'"
+            style="
+              width: 200px;
+              text-align: left;
+              height: 36px;
+              color: #c0c4cc;
+              padding-left: -10px;
+            "
+            >{{ xmname }}</el-button
+          >
+
+          <el-button
+            type=""
+            @click="handleQuery2"
+            v-else
+            style="
+              width: 200px;
+              text-align: left;
+              height: 36px;
+              padding-left: -10px;
+            "
+            >{{ xmname }}</el-button
+          >
+        </el-form-item>
+
         <el-form-item label="学生姓名" prop="studentName">
           <el-input
             v-model="queryParams3.studentName"
@@ -649,12 +675,15 @@
             @click="handleQuery3"
             >搜索</el-button
           >
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          <el-button
+            icon="el-icon-refresh"
+            size="mini"
+            @click="studentresetQuery"
             >重置</el-button
           >
         </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
@@ -676,7 +705,7 @@
         <el-table-column
           property="studentName"
           label="学生姓名"
-          width="150"
+          width="120"
           align="center"
         >
         </el-table-column>
@@ -684,7 +713,7 @@
         <el-table-column
           property="studentSex"
           label="学生性别"
-          width="150"
+          width="100"
           align="center"
         >
           <template slot-scope="scope">
@@ -724,7 +753,7 @@
         <el-table-column
           property="onceName"
           label="曾用名"
-          width="150"
+          width="100"
           align="center"
         >
         </el-table-column>
@@ -736,7 +765,7 @@
         >
         </el-table-column>
 
-        <el-table-column
+        <!-- <el-table-column
           property="creatBy"
           label="创建人"
           width="150"
@@ -763,14 +792,14 @@
           width="150"
           align="center"
         >
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <pagination
         v-show="total3 > 0"
         :total="total3"
         :page.sync="queryParams3.pageNum"
         :limit.sync="queryParams3.pageSize"
-        @pagination="getList"
+        @pagination="studentinfoclick"
       />
     </el-dialog>
 
@@ -910,9 +939,13 @@ import {
   listKindergartenInfo,
 } from "@/api/system/kindergartenInfo";
 import Treeselect from "@riophae/vue-treeselect";
+
+import student from "@/views/assembly/student.vue";
+
 export default {
   name: "TestItemScore",
-  components: { Treeselect },
+  components: { Treeselect, student },
+
   data() {
     return {
       value: "",
@@ -1044,11 +1077,7 @@ export default {
 
   methods: {
     testclick() {
-      if (this.addqueryParams.studentId == "") {
-        this.$message.error("请先选择学生");
-      } else {
-        this.innerVisible4 = true;
-      }
+      this.innerVisible4 = true;
     },
     delitem(item) {
       console.log(item);
@@ -1067,15 +1096,13 @@ export default {
     //幼儿园左侧点击
     kindergartenNameclick(row) {
       this.queryParams2.kindergartenId = row.id;
+      this.queryParams.kindergartenId = row.id;
       this.kindergartenName = row.kindergartenName;
       this.kindergartenId = row.id;
+      this.queryParams3.kindergartenId = row.id;
       this.yryinnerVisible = false;
       this.xmname = "请选择所属班级";
-      this.stname = "请选择学生姓名";
       this.itemId2 = "";
-      this.itemId3 = "";
-      this.form.classId = null;
-      this.form.studentId = null;
     },
     //幼儿园关闭
     kindergartencancel() {
@@ -1083,38 +1110,30 @@ export default {
     },
     // 班级信息
     xmclick(row) {
-      console.log(row);
       this.xmname = row.className;
       this.itemId2 = row.id;
-      this.form.classId = row.id;
-      console.log(this.form);
       this.innerVisible = false;
-      this.form.className = row.className;
       this.queryParams3.classId = row.id;
-      this.stname = "请选择学生姓名";
-      this.itemId3 = "";
-      this.form.studentId = null;
     },
     //打开选择学生页面
     studentinfoclick() {
-      if (this.queryParams3.classId == "" || !this.queryParams3.classId) {
-        this.$message.error("请先选择班级");
-      } else {
-        //查询学生信息
-        studentInfo(this.queryParams3).then((res) => {
-          this.studentInfos = res.rows;
-          this.total3 = res.total;
-          this.innerVisible2 = true;
-          this.itemId2 = this.queryParams3.classId;
-        });
-      }
+      //查询学生信息
+      studentInfo(this.queryParams3).then((res) => {
+        this.studentInfos = res.rows;
+        this.total3 = res.total;
+        this.innerVisible2 = true;
+        this.itemId2 = this.queryParams3.classId;
+      });
     },
     // 学生信息
     studentclick(row) {
+      console.log(row);
       this.stname = row.studentName;
       this.itemId3 = row.id;
       this.form.studentId = row.id;
+      this.form.className = row.className;
       this.addqueryParams.studentId = row.id;
+      this.form.classId = row.id;
       this.innerVisible2 = false;
       this.form.studentName = row.studentName;
       if (this.form.batchCode != null) {
@@ -1131,13 +1150,17 @@ export default {
       console.log(this.addqueryParams);
       this.innerVisible4 = false;
       this.form.batchCode = row.batchCode;
-      this.getAllTestItemScore();
+      if (this.addqueryParams.studentId != "") {
+        this.getAllTestItemScore();
+      }
     },
     /** 查询个人成绩录入管理列表 */
 
     getList() {
       //查询班级信息
       this.loading = true;
+      console.log(this.queryParams);
+
       //获取幼儿园list
       listKindergartenInfo(this.kqueryParams).then((response) => {
         this.kindergartenList = response.rows;
@@ -1198,7 +1221,7 @@ export default {
       } else {
         classInfo(this.queryParams2).then((response) => {
           this.classInfos = response.rows;
-          this.total = response.total;
+          this.total2 = response.total;
           this.loading = false;
           this.innerVisible = true;
         });
@@ -1207,12 +1230,7 @@ export default {
     // 学生姓名
     handleQuery3() {
       this.queryParams3.pageNum = 1;
-      studentInfo(this.queryParams).then((response) => {
-        this.studentInfo = response.rows;
-        this.total = response.total;
-        this.loading = false;
-        this.getList();
-      });
+      this.studentinfoclick();
     },
     // 批次编号
     handleQuery5() {
@@ -1231,8 +1249,42 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.handleQuery();
+      this.kindergartenName = "请选择幼儿园";
+      //幼儿园ID
+      this.kindergartenId = "";
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        className: null,
+        studentName: null,
+        itemName: null,
+        kindergartenId: null,
+        batchCode: null,
+      };
       this.queryParams.className = "";
+      this.handleQuery();
+    },
+    classresetQuery() {
+      this.queryParams2.className = null;
+      classInfo(this.queryParams2).then((response) => {
+        this.classInfos = response.rows;
+        this.total2 = response.total;
+        this.loading = false;
+        this.innerVisible = true;
+      });
+    },
+    studentresetQuery() {
+      this.queryParams3 = {
+        pageNum: 1,
+        pageSize: 10,
+        studentName: null,
+        classId: "",
+      };
+      this.kindergartenName = "请选择幼儿园";
+      this.kindergartenId = "";
+      this.xmname = "请选择所属班级";
+      this.itemId2 = "";
+      this.studentinfoclick();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -1271,6 +1323,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
+      console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id == null) {
diff --git a/src/views/system/testScoreBatch/index.vue b/src/views/system/testScoreBatch/index.vue
index 9cddb1d..ebe7a84 100644
--- a/src/views/system/testScoreBatch/index.vue
+++ b/src/views/system/testScoreBatch/index.vue
@@ -637,6 +637,7 @@ export default {
       });
       // 查询测试项目
       testItems(this.queryParams4).then((res) => {
+        // console.log(res)
         this.testItemss = res.rows;
         this.total4 = res.total;
         this.loading = false;