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

src/views/assembly/kindergarten.vue

@@ -22,7 +22,7 @@
         >
       </el-form-item>
 
-      <el-form-item label="所属批次" prop="categoryName" >
+      <el-form-item label="所属批次" prop="categoryName">
         <el-button
           @click="batchCodeshowclick"
           style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
@@ -47,7 +47,12 @@
       style="margin-top: 20px"
       :before-close="batchCodecancel"
     >
-      <el-table :data="testScorelist" align="center" style="margin-top: 0px">
+      <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
@@ -95,7 +100,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
@@ -169,7 +174,7 @@ import {
 import { getRoleInfo, testScoreBatch } from "@/api/system/quality";
 
 export default {
-  name: "KindergartenPhysicalTest",
+  name: "",
   components: {},
   data() {
     return {
@@ -252,9 +257,7 @@ export default {
       this.kindergartenName = row.kindergartenName;
       this.kindergartenId = row.id;
       this.kindergartenshow = false;
-      if (this.batchCode != "") {
+      this.$emit("kinbatlist", this.kindergartenId, this.batchCode);
-        this.$emit("kinbatlist", this.kindergartenId, this.batchCode);
-      }
     },
 
     getList() {

src/views/system/KindergartenPhysicalTest/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"
+          type="primary"
-          v-if="kindergartenName == '请选择幼儿园'"
+          icon="el-icon-search"
-          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
+          size="mini"
-          >{{ kindergartenName }}</el-button
+          @click="handleQuery"
-        >
+          >查看</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
         >
       </el-form-item>
     </el-form>
@@ -43,134 +27,11 @@
         @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">
       <el-col :span="24" class="card-box" style="">
         <el-card>
           <div slot="header" style="text-align: center; font-size: 20px">
-            <span>基本信息</span>
+            <span>体测达标分析</span>
           </div>
           <div style="margin-left: 50px; text-align: center; margin-top: 20px">
             <span>幼儿园名称:</span
@@ -196,7 +57,7 @@
                 slot="header"
                 style="width: 50%; text-align: center; font-size: 18px"
               >
-                <span>本园参加体测各年龄阶段人数分部</span>
+                <span class="title">本园参加体测各年龄阶段人数分部</span>
                 <div
                   id="main"
                   style="
@@ -217,7 +78,7 @@
                   position: relative;
                 "
               >
-                <span>本园体测成绩达标率(%)</span>
+                <span class="title">本园体测成绩达标率(%)</span>
                 <span>
                   <span
                     style="
@@ -270,62 +131,23 @@
 </template>
 <script>
 import * as echarts from "echarts";
-import {
+import { tKindergartenInfo } from "@/api/system/kindergartenInfo";
-  listKindergartenInfo,
+import { getRoleInfo } from "@/api/system/quality";
-  tKindergartenInfo,
-} from "@/api/system/kindergartenInfo";
-import { getRoleInfo, testScoreBatch } from "@/api/system/quality";
 import { analysis } from "@/api/system/KindergartenPhysicalTest";
+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,
-      },
       analysislist: [],
       //查询传值
       analysisqueryParams: {
@@ -339,9 +161,20 @@ export default {
   mounted() {},
   created() {
     this.getList();
-    // this.analysisinfo();
   },
   methods: {
+    handleQuery() {
+      this.analysisinfo();
+    },
+    kinbatlist(kindergartenId, batchCode) {
+      console.log(kindergartenId, batchCode);
+      this.analysisqueryParams.kindergartenId = kindergartenId;
+      this.analysisqueryParams.batchCode = batchCode;
+      if (batchCode == "请选择批次") {
+        this.analysisqueryParams.batchCode = "";
+      }
+    },
+
     analysisinfo() {
       analysis(this.analysisqueryParams).then((res) => {
         if (res.data == [] || !res.data) {
@@ -575,52 +408,6 @@ export default {
 
       option2 && myChart.setOption(option2);
     },
-    //点击批次左边
-    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;
-    },
-    //幼儿园左侧点击
-    kindergartenNameclick(row) {
-      this.analysisqueryParams.kindergartenId = row.id;
-      this.kindergartenName = row.kindergartenName;
-      this.kindergartenId = row.id;
-      if (this.analysisqueryParams.batchCode != "") {
-        this.analysisinfo();
-      }
-      this.kindergartenshow = false;
-    },
-
     getList() {
       tKindergartenInfo(this.kindergartenType).then((res) => {
         this.type = res.data[0];
@@ -629,29 +416,17 @@ export default {
       //用户权限
       getRoleInfo().then((res) => {
         console.log(res);
-
         this.analysisqueryParams.kindergartenId = res.data.kindergartenId;
-        console.log(this.analysisqueryParams);
-
         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() {
@@ -665,4 +440,17 @@ export default {
 ::v-deep .el-card__header {
   border: none;
 }
+::v-deep .el-form {
+  display: inline;
+}
+.title {
+  display: block;
+  width: 350px;
+  margin: 0 auto;
+  line-height: 35px;
+  background-color: #60c5f1;
+  color: #fff;
+  font-size: 15px;
+  border-radius: 20px;
+}
 </style>

src/views/system/classconstitution/index.vue

@@ -311,6 +311,11 @@ export default {
         this.className = "请选择班级";
         this.classId = "";
       }
+      if (this.classId != "") {
+        this.classqueryParams.kindergartenId = "";
+        this.className = "请选择班级";
+        this.classId = "";
+      }
       this.ClassListlist.kindergartenId = kindergartenId;
       this.ClassListlist.batchCode = batchCode;
       this.classqueryParams.kindergartenId = kindergartenId;

src/views/system/development/index.vue

@@ -7,36 +7,12 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
+      <kindergarten
-        <el-button
+        @kinbatlist="kinbatlist"
-          @click="kindergartenshow = true"
+        style="width: 500px; display: inline"
-          v-if="kindergartenName == '请选择幼儿园'"
+      ></kindergarten>
-          style="width: 208px; text-align: left; height: 32px; color: #c0c4cc"
-          >{{ kindergartenName }}</el-button
-        >
-        <el-button
-          @click="kindergartenshow = true"
-          style="width: 208px; text-align: left; height: 32px"
-          v-else
-          >{{ kindergartenName }}</el-button
-        >
-      </el-form-item>
-
       <el-form-item label="班级类型" prop="categoryName" label-width="70px">
         <el-select
-          v-if="
-            analysislist.kindergartenId == '' ||
-            this.analysislist.kindergartenId == null
-          "
-          placeholder="请选择"
-          disabled
-          @click.native="selecetclick"
-          v-model="analysislist.classType"
-        >
-        </el-select>
-
-        <el-select
-          v-else
           v-model="analysislist.classType"
           clearable
           placeholder="请选择"
@@ -46,24 +22,17 @@
             :key="item.name"
             :label="item.name"
             :value="item.type"
-            @click.native="classTypeclick"
           >
           </el-option>
         </el-select>
       </el-form-item>
-
+      <el-form-item>
-      <el-form-item label="批次成绩" prop="categoryName" label-width="70px">
         <el-button
-          @click="batchCodeshowclick"
+          type="primary"
-          style="width: 208px; text-align: left; height: 32px; color: #c0c4cc"
+          icon="el-icon-search"
-          v-if="batchCodeName == '请选择批次'"
+          size="mini"
-          >{{ batchCodeName }}</el-button
+          @click="handleQuery"
-        >
+          >查看</el-button
-        <el-button
-          @click="batchCodeshowclick"
-          style="width: 208px; text-align: left; height: 32px"
-          v-else
-          >{{ batchCodeName }}</el-button
         >
       </el-form-item>
     </el-form>
@@ -74,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-row v-show="itemshow">
       <el-table
         :data="physicalActionList"
@@ -295,55 +142,21 @@
 </template>
 
 <script>
-import * as echarts from "echarts";
+import { tKindergartenInfo } from "@/api/system/kindergartenInfo";
-
+import { getRoleInfo } from "@/api/system/quality";
-import {
-  listKindergartenInfo,
-  tKindergartenInfo,
-} from "@/api/system/kindergartenInfo";
-import { getRoleInfo, testScoreBatch } from "@/api/system/quality";
 import { analysis } from "@/api/system/development";
+import kindergarten from "../../assembly/kindergarten.vue";
 export default {
+  components: { kindergarten },
   name: "classconstitution",
   data() {
     return {
       itemshow: false,
       itemshow2: false,
-      showyey: true,
-      total1: 0,
-      total4: 0,
-      //遮罩层
-      kindergartenshow: false,
-      batchCodeshow: false,
       //班级类型
       ClassType: "class_type",
       // 显示搜索条件
       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: [],
       // 查询参数
       analysislist: {
         kindergartenId: "",
@@ -353,11 +166,6 @@ export default {
         // classType: "SMALL_CLASS",
         // batchCode: "PC202208030005",
       },
-      //批次编号
-      testqueryParams: {
-        pageNum: 1,
-        pageSize: 10,
-      },
       dictValues: [],
       classTypeName: "",
       physicalActionList: [],
@@ -370,13 +178,15 @@ export default {
     // this.analysisinfo();
   },
   methods: {
-    selecetclick() {
+    handleQuery() {
-      if (
+      this.analysisinfo();
-        this.analysislist.kindergartenId == "" ||
+    },
-        this.analysislist.kindergartenId == null
+    kinbatlist(kindergartenId, batchCode) {
-      ) {
+      console.log(kindergartenId, batchCode);
-        this.$message.error("请先选择幼儿园");
+      this.analysislist.kindergartenId = kindergartenId;
-      } else {
+      this.analysislist.batchCode = batchCode;
+      if (batchCode == "请选择批次") {
+        this.analysislist.batchCode = "";
       }
     },
     //动作发展状况
@@ -394,45 +204,6 @@ export default {
         }
       });
     },
-    //点击批次左边
-    batchCodeclick(row) {
-      this.batchCodeName = row.batchName;
-      this.batchCodeId = row.id;
-      this.analysislist.batchCode = row.batchCode;
-      this.batchCodeshow = false;
-      this.physicalActionList = [];
-      this.analysisinfo();
-    },
-    //点击批次
-    batchCodeshowclick() {
-      if (this.analysislist.classType == "") {
-        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;
-    },
-    //classTypeclick
-    classTypeclick() {
-      if (this.analysislist.batchCode != "") {
-        this.analysisinfo();
-      }
-    },
     //幼儿园左侧点击
     kindergartenNameclick(row) {
       this.analysislist.kindergartenId = row.id;
@@ -458,27 +229,16 @@ export default {
       getRoleInfo().then((res) => {
         console.log(res);
         this.analysislist.kindergartenId = res.data.kindergartenId;
-        console.log(this.analysislist);
-
         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() {
@@ -488,3 +248,8 @@ export default {
   },
 };
 </script>
+<style scoped='scss'>
+::v-deep .el-form {
+  display: inline;
+}
+</style>

src/views/system/heightAndWeight/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"
+          type="primary"
-          v-if="kindergartenName == '请选择幼儿园'"
+          icon="el-icon-search"
-          style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
+          size="mini"
-          >{{ kindergartenName }}</el-button
+          @click="handleQuery"
-        >
+          >查看</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
         >
       </el-form-item>
     </el-form>
@@ -44,128 +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="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" class="card-box" style="">
         <el-card>
@@ -221,62 +83,19 @@
 </template>
 <script>
 import * as echarts from "echarts";
-import {
+import { getRoleInfo } from "@/api/system/quality";
-  listKindergartenInfo,
-  tKindergartenInfo,
-} from "@/api/system/kindergartenInfo";
-import { getRoleInfo, testScoreBatch } from "@/api/system/quality";
 import { analysis } from "@/api/system/heightAndWeight";
+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,
-      },
       analysislist: [],
       //查询传值
       analysisqueryParams: {
@@ -285,41 +104,25 @@ export default {
         // kindergartenId: "18",
         // batchCode: "PC202208030005",
       },
-
-      // weightAndHeightAvgScoreList: [
-      //   {
-      //     studentSex: "FEMALE",
-      //     measureUnit: "cm",
-      //     itemCode: "H001",
-      //     averageScore: 0,
-      //   },
-      //   {
-      //     studentSex: "FEMALE",
-      //     measureUnit: "kg",
-      //     itemCode: "W001",
-      //     averageScore: 0,
-      //   },
-      //   {
-      //     studentSex: "MALE",
-      //     measureUnit: "cm",
-      //     itemCode: "H001",
-      //     averageScore: 0,
-      //   },
-      //   {
-      //     studentSex: "MALE",
-      //     measureUnit: "kg",
-      //     itemCode: "W001",
-      //     averageScore: 0,
-      //   },
-      // ],
     };
   },
   mounted() {},
   created() {
     this.getList();
-    // this.analysisinfo();
   },
   methods: {
+    handleQuery() {
+      this.analysisinfo();
+    },
+    kinbatlist(kindergartenId, batchCode) {
+      console.log(kindergartenId, batchCode);
+      this.analysisqueryParams.kindergartenId = kindergartenId;
+      this.analysisqueryParams.batchCode = batchCode;
+      if (batchCode == "请选择批次") {
+        this.analysisqueryParams.batchCode = "";
+      }
+    },
+
     analysisinfo() {
       analysis(this.analysisqueryParams).then((res) => {
         if (!res.data) {
@@ -560,82 +363,22 @@ 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;
-    },
-    //幼儿园左侧点击
-    kindergartenNameclick(row) {
-      this.analysisqueryParams.kindergartenId = row.id;
-      this.kindergartenName = row.kindergartenName;
-      this.kindergartenId = row.id;
-      this.kindergartenshow = false;
-      if (this.analysisqueryParams.batchCode != "") {
-        this.analysisinfo();
-      }
-    },
 
     getList() {
-      tKindergartenInfo(this.kindergartenType).then((res) => {
-        this.type = res.data[0];
-        this.type2 = res.data[1];
-      });
       //用户权限
       getRoleInfo().then((res) => {
         console.log(res);
         this.analysisqueryParams.kindergartenId = res.data.kindergartenId;
-        console.log(this.analysisqueryParams);
-
         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() {
@@ -649,4 +392,7 @@ export default {
 ::v-deep .el-card__header {
   border: none;
 }
+::v-deep .el-form {
+  display: inline;
+}
 </style>

src/views/system/testItemScore/index.vue

@@ -139,7 +139,6 @@
     <el-table
       v-loading="loading"
       :data="testItemScoreList"
-      @selection-change="handleSelectionChange"
       @row-dblclick="handledbClick"
       ref="table"
     >
@@ -164,14 +163,6 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-search"
-            @click="seepraent(scope.row)"
-            v-hasPermi="['system:testItemScore:edit']"
-            >查看</el-button
-          >
           <el-button
             size="mini"
             type="text"
@@ -212,7 +203,7 @@
         ref="form"
         :model="form"
         :rules="rules"
-        label-width="110px"
+        label-width="100px"
         :inline="true"
       >
         <el-form-item label="学生姓名" prop="studentId" v-if="form.id == null">
@@ -463,7 +454,6 @@
     </el-dialog>
 
     <!--所属班级 弹窗 -->
-
     <el-dialog
       width="850px"
       title="选择所属班级"
@@ -813,7 +803,7 @@
         :page.sync="queryParams3.pageNum"
         :limit.sync="queryParams3.pageSize"
         @pagination="studentinfoclick"
-
+      />
     </el-dialog>
 
     <!-- 批次编号 -->
@@ -932,101 +922,6 @@
         @pagination="getList"
       />
     </el-dialog>
-
-    <!-- //查看个人成绩 -->
-    <el-dialog
-      title="查看个人成绩"
-      :visible.sync="innerVisible5"
-      append-to-body
-      style="margin-top: 5%"
-      width="1000px"
-    >
-      <el-table
-        ref="singleTable"
-        :data="getAllTestItemScore"
-        style="width: 95%; margin: 20px auto"
-      >
-        <el-table-column
-          property="itemCode"
-          label="项目编号"
-          width="185"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          property="itemName"
-          label="项目名称"
-          width="185"
-          align="center"
-        >
-        </el-table-column>
-        <!-- <el-table-column
-          property="scoreDictId"
-          label="字典类型"
-          align="center"
-          width="120"
-        >
-          <template slot-scope="scope">
-            {{
-              scope.row.scoreDictId == ResultType1.dictCode
-                ? ResultType1.dictLabel
-                : ""
-            }}{{
-              scope.row.scoreDictId == ResultType2.dictCode
-                ? ResultType2.dictLabel
-                : ""
-            }}</template
-          >
-        </el-table-column> -->
-        <el-table-column
-          property="itemScore"
-          label="个人成绩"
-          width="180"
-          align="center"
-        >
-          <!-- <template slot-scope="scope">
-            <el-input
-            readonly
-              type="number"
-              v-model="scope.row.itemScore"
-              v-if="
-                scope.row.itemScore != null ||
-                scope.row.scoreDictId == ResultType1.dictCode
-              "
-            ></el-input>
-            <el-input
-            readonly
-              v-model="scope.row.scoreDictValue"
-              v-if="
-                scope.row.scoreDictValue != null ||
-                scope.row.scoreDictId == ResultType2.dictCode
-              "
-            ></el-input>
-          </template> -->
-        </el-table-column>
-        <el-table-column
-          property="itemFraction"
-          label="个人成绩得分"
-          width="180"
-          align="center"
-        >
-          <!-- <template slot-scope="scope">
-            <el-input type="number" v-model="scope.row.itemFraction" readonly></el-input>
-          </template> -->
-        </el-table-column>
-
-        <el-table-column
-          property="syntheticalAssess"
-          label="综合评价"
-          width="180"
-          align="center"
-        >
-          <!-- <template slot-scope="scope">
-            <el-input v-model="scope.row.syntheticalAssess" readonly></el-input>
-          </template> -->
-        </el-table-column>
-      </el-table>
-    </el-dialog>
   </div>
 </template>
 
@@ -1077,7 +972,6 @@ export default {
       testItemss: [],
       testScoreBatchs: [],
       innerVisible4: false,
-      innerVisible5: false,
       itemNumbername: "请选择批次编号",
       //幼儿园查询参数
       kqueryParams: {
@@ -1115,8 +1009,6 @@ export default {
       classInfos: [],
       // 个人成绩录入管理表格数据
       testItemScoreList: [],
-      //个人成绩查看
-      getAllTestItemScore: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -1187,16 +1079,12 @@ export default {
   },
 
   methods: {
-    // 查看个人信息
+     handledbClick(row, event, column) {
-    seepraent(row) {
+          // alert("我被双击了");
-      this.reset();
+      this.$refs.table.toggleRowSelection(row);
-      // const row = row.id || this.ids;
+
-      getAllTestItemScoreInfo(row).then((res) => {
+          console.log(row, event, column);
-        this.getAllTestItemScore = res.data;
+        },
-        // console.log(this.getAllTestItemScore);
-        this.innerVisible5 = true;
-      });
-    },
     testclick() {
       this.innerVisible4 = true;
     },
@@ -1280,6 +1168,8 @@ export default {
     getList() {
       //查询班级信息
       this.loading = true;
+      console.log(this.queryParams);
+
       //获取幼儿园list
       listKindergartenInfo(this.kqueryParams).then((response) => {
         this.kindergartenList = response.rows;
@@ -1328,7 +1218,6 @@ export default {
         studentId: null,
         batchCode: null,
         itemScoreList: [],
-        batchId:null,
       };
       this.resetForm("form");
     },
@@ -1405,12 +1294,50 @@ export default {
       this.xmname = "请选择所属班级";
       this.itemId2 = "";
       this.studentinfoclick();
+      this.handleQuery();
+      this.queryParams.className ="";
+    this.getList();
     },
-    // 多选框选中数据
+    /** 重置按钮操作 */
-    handleSelectionChange(selection) {
+    resetQuery() {
-      this.ids = selection.map((item) => item.id);
+      this.resetForm("queryForm");
-      this.single = selection.length !== 1;
+      this.kindergartenName = "请选择幼儿园";
-      this.multiple = !selection.length;
+      //幼儿园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();
+      this.queryParams.className = ""
     },
     /** 新增按钮操作 */
     handleAdd() {