From 7219bdfe8b9531537ed814fdee29cd812ffc8a54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 26 Aug 2022 11:41:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/physique/index.vue           |  38 ++-
 .../system/testItemCountryScore/index.vue     |   4 +
 src/views/system/testItemScore/index.vue      | 257 +-----------------
 3 files changed, 38 insertions(+), 261 deletions(-)

diff --git a/src/views/system/physique/index.vue b/src/views/system/physique/index.vue
index 8010a6d..e481797 100644
--- a/src/views/system/physique/index.vue
+++ b/src/views/system/physique/index.vue
@@ -268,7 +268,7 @@
           <div></div>
         </div>
       </el-col>
-      <el-col :span="24" :offset="0" style="margin-top:30px">
+      <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"
@@ -478,11 +478,37 @@ export default {
               if (el.avgCategoryName == null) {
                 el.avgCategoryName = "暂无";
               }
-              yindicator.push({
-                name:
-                  el.categoryName + " " + "(" + el.avgCategoryName + "" + ")",
-                max: el.maxFraction,
-              });
+              if (this.categoryScoreList.length == 1) {
+                yindicator.push({
+                  name:
+                    el.categoryName + " " + "(" + el.avgCategoryName + "" + ")",
+                  max: el.maxFraction,
+                });
+                yindicator.push({
+                  name: "暂无数据",
+                  max: 100,
+                });
+                yindicator.push({
+                  name: "暂无数据",
+                  max: 100,
+                });
+              } else if (this.categoryScoreList.length == 2) {
+                yindicator.push({
+                  name:
+                    el.categoryName + " " + "(" + el.avgCategoryName + "" + ")",
+                  max: el.maxFraction,
+                });
+                yindicator.push({
+                  name: "暂无数据",
+                  max: 100,
+                });
+              } else {
+                yindicator.push({
+                  name:
+                    el.categoryName + " " + "(" + el.avgCategoryName + "" + ")",
+                  max: el.maxFraction,
+                });
+              }
             });
 
             var myChart = echarts.init(document.getElementById("chart"));
diff --git a/src/views/system/testItemCountryScore/index.vue b/src/views/system/testItemCountryScore/index.vue
index 5084903..33f1b07 100644
--- a/src/views/system/testItemCountryScore/index.vue
+++ b/src/views/system/testItemCountryScore/index.vue
@@ -869,6 +869,10 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.queryParams3 = {
+        itemId: null,
+        sex: null,
+      };
       this.reset();
       this.open = true;
       this.title = "添加全国平均成绩";
diff --git a/src/views/system/testItemScore/index.vue b/src/views/system/testItemScore/index.vue
index 706eae3..ecd8826 100644
--- a/src/views/system/testItemScore/index.vue
+++ b/src/views/system/testItemScore/index.vue
@@ -430,11 +430,9 @@
           >
         </el-form-item>
 
-
         <el-form-item label="测试项目名称" prop="testItemId">
-          <div
-            style="margin-bottom: 10px"
-          >项目名称:
+          <div style="margin-bottom: 10px">
+            项目名称:
             <el-input
               placeholder="级别名"
               style="width: 75px; margin-right: 10px"
@@ -463,38 +461,6 @@
           </div>
         </el-form-item>
 
-        <el-form-item label="测试项目名称" prop="testItemId">
-          <el-button
-            this.testname="row.itemName;"
-            type=""
-            v-if="testname == '请选择测试项目名称'"
-            @click="innerVisible3 = true"
-            style="
-              width: 360px;
-              text-align: left;
-              height: 36px;
-              color: #c0c4cc;
-              padding-left: -10px;
-            "
-            >{{ testname }}</el-button
-          >
-
-          <el-button
-            this.testname="row.itemName;"
-            type=""
-            @click="innerVisible3 = true"
-            v-else
-            style="
-              width: 360px;
-              text-align: left;
-              height: 36px;
-              padding-left: -10px;
-            "
-            >{{ testname }}</el-button
-          >
-        </el-form-item>
-
-
         <el-form-item
           label="个人成绩"
           prop="scoreDictValue"
@@ -923,192 +889,6 @@
       />
     </el-dialog>
 
-    <!-- 测试项目弹窗 -->
-
-    <el-dialog
-      width="850px"
-      title="选择测试项目名称"
-      :visible.sync="innerVisible3"
-      append-to-body
-    >
-      <el-form
-        :model="queryParams4"
-        ref="queryForm"
-        size="small"
-        :inline="true"
-        v-show="showSearch"
-        label-width="90px"
-      >
-        <el-form-item label="项目名称" prop="itemName">
-          <el-input
-            v-model="queryParams4.itemName"
-            placeholder="请输入项目名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleQuery4"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-            >重置</el-button
-          >
-        </el-form-item>
-      </el-form>
-      <el-table :data="testItemss">
-        <el-table-column label="请选择" width="70" align="center">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              style="width: 15px; height: 15px"
-              v-if="itemId4 == scope.row.id"
-              circle
-              @click="testclick(scope.row)"
-            ></el-button>
-            <el-button
-              v-else
-              style="width: 15px; height: 15px"
-              circle
-              @click="testclick(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="classType"
-            label="班级类型"
-            width="150"
-            align="center"
-          >
-
-          </el-table-column> -->
-        <el-table-column
-          property="measureUnit"
-          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="creatBy"
-          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="total4 > 0"
-        :total="total4"
-        :page.sync="queryParams4.pageNum"
-        :limit.sync="queryParams4.pageSize"
-        @pagination="getList"
-      />
-    </el-dialog>
-
     <!-- 批次编号 -->
 
     <el-dialog
@@ -1452,8 +1232,6 @@ export default {
       stname: "请选择学生姓名",
       innerVisible2: false,
       testItemss: [],
-      innerVisible3: false,
-      testname: "请选择测试项目名称",
       testScoreBatchs: [],
       innerVisible4: false,
       itemNumbername: "请选择批次编号",
@@ -1526,12 +1304,6 @@ export default {
         studentName: null,
         classId: "",
       },
-      // 测试项目
-      queryParams4: {
-        pageNum: 1,
-        pageSize: 10,
-        itemName: null,
-      },
       // 批次编号
       queryParams5: {
         pageNum: 1,
@@ -1713,11 +1485,9 @@ export default {
       console.log(this.form);
       console.log(this.form2);
       console.log(row);
-      this.testname = row.itemName;
       this.itemId4 = row.id;
       this.form.testItemId = row.id;
       this.form2.testItemId = row.id;
-      this.innerVisible3 = false;
       this.form.itemName = row.itemName;
       this.addqueryParams.testItemId = row.id;
       // if (row.resultDictType == this.ResultType1.dictCode) {
@@ -1753,13 +1523,6 @@ export default {
     getList() {
       //查询班级信息
       this.loading = true;
-
-      // 查询测试项目
-      testItems(this.queryParams4).then((res) => {
-        this.testItemss = res.rows;
-        this.total4 = res.total;
-        this.loading = false;
-      });
       //获取幼儿园list
       listKindergartenInfo(this.kqueryParams).then((response) => {
         this.kindergartenList = response.rows;
@@ -1793,7 +1556,6 @@ export default {
       this.kindergartenId = "";
       this.xmname = "请选择所属班级";
       this.stname = "请选择学生姓名";
-      this.testname = "请选择测试项目名称";
       this.itemNumbername = "请选择批次编号";
       this.itemId2 = "";
       this.itemId3 = "";
@@ -1875,16 +1637,6 @@ export default {
         this.getList();
       });
     },
-    // 测试项目
-    handleQuery4() {
-      this.queryParams4.pageNum = 1;
-      testItems(this.queryParams).then((response) => {
-        this.testItems = response.rows;
-        this.total = response.total;
-        this.loading = false;
-        this.getList();
-      });
-    },
     // 批次编号
     handleQuery5() {
       this.queryParams5.pageNum = 1;
@@ -1926,10 +1678,6 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getTestItemScore(id).then((response) => {
-        // this.xmname = row.className;
-        // this.stname = row.studentName;
-        // this.testname=row.itemName;
-        // this.itemNumbername = row.batchCode;
         if (response.data.itemScore == "" || response.data.itemScore == null) {
           response.data.dictvalue = "text";
         } else if (
@@ -1964,7 +1712,6 @@ export default {
               this.getList();
               this.xmname = "请选择所属班级";
               this.stname = "请选择学生姓名";
-              this.testname = "请选择测试项目名称";
               this.itemNumbername = "请选择批次编号";
               this.itemId2 = "";
               this.itemId3 = "";