修改bug

.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = 幼儿园体质检测管理系统
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.16.64:8080'
+VUE_APP_BASE_API = 'http://192.168.16.62:8089'
 #'/dev-api'
 
 # 路由懒加载

src/api/system/quality.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 //查询用户权限
 export function getRoleInfo() {
     return request({
-        url: 'common/getRoleInfo',
+        url: '/common/getRoleInfo',
         method: 'get'
     })
 }

src/views/system/action/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName">
+      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
         <el-button
           @click="kindergartenshow = true"
           v-if="kindergartenName == '请选择幼儿园'"
@@ -22,7 +22,12 @@
         >
       </el-form-item>
 
-      <el-form-item label="所属班级" prop="categoryName" label-width="70px">
+      <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"
@@ -459,6 +464,8 @@ export default {
     return {
       itemshow: false,
       itemshow2: false,
+      showyey: true,
+      showbj: true,
       total1: 0,
       total2: 0,
       total3: 0,
@@ -763,6 +770,20 @@ export default {
       //用户权限
       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) => {

src/views/system/classconstitution/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName">
+      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
         <el-button
           @click="kindergartenshow = true"
           v-if="kindergartenName == '请选择幼儿园'"
@@ -22,7 +22,12 @@
         >
       </el-form-item>
 
-      <el-form-item label="所属班级" prop="categoryName" label-width="70px">
+      <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"
@@ -393,6 +398,8 @@ export default {
     return {
       itemshow: false,
       itemshow2: false,
+      showyey: true,
+      showbj: true,
       total1: 0,
       total2: 0,
       total4: 0,
@@ -672,6 +679,8 @@ export default {
           };
 
           option && myChart.setOption(option);
+          this.itemshow2 = false;
+          this.itemshow = true;
         }
       });
     },
@@ -759,6 +768,22 @@ export default {
       //用户权限
       getRoleInfo().then((res) => {
         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) => {

src/views/system/classinfo/index.vue

@@ -212,7 +212,7 @@
         </el-form-item>
         <el-form-item label="联系电话" prop="phone">
           <el-input
-            v-model.number="form.phone"
+            v-model="form.phone"
             placeholder="请输入联系电话"
             maxlength="13"
           />
@@ -359,6 +359,8 @@ export default {
   data() {
     // 验证手机号的规则
     var checkMobile = (rule, value, cb) => {
+      console.log(value);
+      console.log(value.length);
       // 验证手机号的正则表达式
       const regMobile =
         /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/;

src/views/system/comprehensive/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName">
+      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
         <el-button
           @click="kindergartenshow = true"
           v-if="kindergartenName == '请选择幼儿园'"
@@ -22,7 +22,12 @@
         >
       </el-form-item>
 
-      <el-form-item label="所属班级" prop="categoryName" label-width="70px">
+      <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"
@@ -511,6 +516,8 @@ export default {
     return {
       itemshow: false,
       itemshow2: false,
+      showyey: true,
+      showbj: true,
       total1: 0,
       total2: 0,
       total3: 0,
@@ -624,8 +631,8 @@ export default {
           res.data.physiqueCategoryList.forEach((el) => {
             // console.log(el.categoryScore);
             seriesData.push(el.categoryScore);
-            if(el.levelName==null){
+            if (el.levelName == null) {
-              el.levelName='暂无'
+              el.levelName = "暂无";
             }
             yindicator.push({
               name: el.categoryName + " " + "(" + el.levelName + "" + ")",
@@ -881,7 +888,20 @@ export default {
     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) => {

src/views/system/constitution/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName">
+      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
         <el-button
           @click="kindergartenshow = true"
           v-if="kindergartenName == '请选择幼儿园'"
@@ -22,7 +22,12 @@
         >
       </el-form-item>
 
-      <el-form-item label="所属班级" prop="categoryName" label-width="70px">
+      <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"
@@ -404,6 +409,8 @@ export default {
     return {
       itemshow: false,
       itemshow2: false,
+      showyey: true,
+      showbj: true,
       total1: 0,
       total2: 0,
       total3: 0,
@@ -731,6 +738,20 @@ export default {
       //用户权限
       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) => {

src/views/system/motionInfo/index.vue

@@ -16,7 +16,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      
+
       <el-form-item label="适用人群等级" prop="applyCrowd" label-width="240">
         <el-select v-model="queryParams.applyCrowd" placeholder="请选择">
           <el-option
@@ -111,7 +111,8 @@
       <el-table-column label="处方内容" align="center" prop="motionContent" />
       <el-table-column label="适用人群" align="center" prop="applyCrowd">
         <template slot-scope="scope">
-          {{ scope.row.applyCrowd == 0 ? "普通" : "会员" }}
+          {{ scope.row.applyCrowd == 0 ? "普通" : "" }}
+          {{ scope.row.applyCrowd == 1 ? "会员" : "" }}
         </template>
       </el-table-column>
       <el-table-column label="创建人" align="center" prop="createBy" />
@@ -167,8 +168,8 @@
           label-width="230px"
         >
           <el-radio-group v-model="form.applyCrowd">
-            <el-radio label="0">普通</el-radio>
+            <el-radio :label="applyCrowd1">普通</el-radio>
-            <el-radio label="1">会员</el-radio>
+            <el-radio :label="applyCrowd2">会员</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -211,13 +212,15 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      applyCrowd1: 0,
+      applyCrowd2: 1,
       options: [
         {
-          applyCrowd: "0",
+          applyCrowd: 0,
           label: "普通",
         },
         {
-          applyCrowd: "1",
+          applyCrowd: 1,
           label: "会员",
         },
       ],
@@ -242,7 +245,7 @@ export default {
   methods: {
     /** 查询运动处方字典列表 */
     getList() {
-      console.log(this.queryParams)
+      console.log(this.queryParams);
       this.loading = true;
       listMotionInfo(this.queryParams).then((response) => {
         this.motionInfoList = response.rows;

src/views/system/parentInfo/index.vue

@@ -235,6 +235,14 @@ export default {
   created() {
     this.getList();
   },
+  watch: {
+    $route(to, from) {
+      console.log(to.path, from.path);
+      if (to.path == "/baseInfo/parentInfo") {
+        this.getList();
+      }
+    },
+  },
   methods: {
     /** 查询家长信息列表 */
     getList() {

src/views/system/physique/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName">
+      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
         <el-button
           @click="kindergartenshow = true"
           v-if="kindergartenName == '请选择幼儿园'"
@@ -366,6 +366,7 @@ export default {
       ],
       itemshow: false,
       itemshow2: false,
+      showyey: true,
       total1: 0,
       total4: 0,
       //遮罩层
@@ -576,6 +577,19 @@ export default {
       //用户权限
       getRoleInfo().then((res) => {
         console.log(res);
+        this.analysisqueryParams.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;
+          return;
+        }
       });
       //获取幼儿园list
       listKindergartenInfo(this.kqueryParams).then((response) => {

src/views/system/quality/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName">
+      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
         <el-button
           @click="kindergartenshow = true"
           v-if="kindergartenName == '请选择幼儿园'"
@@ -22,7 +22,12 @@
         >
       </el-form-item>
 
-      <el-form-item label="所属班级" prop="categoryName" label-width="70px">
+      <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"
@@ -216,7 +221,6 @@
             ></el-button>
           </template>
         </el-table-column>
-
         <el-table-column
           property="kindergartenName"
           label="幼儿园名字"
@@ -434,16 +438,18 @@
               item.measureUnit == "s" || item.measureUnit == "h" ? "时间" : ""
             }}{{
               item.measureUnit == "cm" || item.measureUnit == "m" ? "距离" : ""
-            }}({{ item.measureUnit }})</span
+            }}
-          >
+            {{ item.measureUnit == "kg" ? "千克" : "" }}
+            {{ item.measureUnit == "g" ? "克" : "" }}({{ item.measureUnit }})
+          </span>
 
           <span style="position: absolute; left: 6%; top: 70%">评价</span>
           <div
             style="
-              width: 70%;
+              width: 65%;
               margin: 0 auto;
               margin-top: 10px;
-              margin-left: 20%;
+              margin-left: 25%;
               position: relative;
             "
           >
@@ -457,13 +463,7 @@
                 width: 32px;
               "
             >
-              {{
+              {{ ((item.maxScore - item.minScore) / 5) * 4 + item.minScore }}
-                ((((item.maxScore - item.minScore) / item.minScore) *
-                  item.minScore) /
-                  5) *
-                  4 +
-                item.minScore
-              }}
             </div>
             <div
               style="
@@ -485,13 +485,7 @@
                 width: 32px;
               "
             >
-              {{
+              {{ ((item.maxScore - item.minScore) / 5) * 3 + item.minScore }}
-                ((((item.maxScore - item.minScore) / item.minScore) *
-                  item.minScore) /
-                  5) *
-                  3 +
-                item.minScore
-              }}
             </div>
             <div
               style="
@@ -513,13 +507,7 @@
                 width: 32px;
               "
             >
-              {{
+              {{ ((item.maxScore - item.minScore) / 5) * 2 + item.minScore }}
-                ((((item.maxScore - item.minScore) / item.minScore) *
-                  item.minScore) /
-                  5) *
-                  2 +
-                item.minScore
-              }}
             </div>
             <div
               style="
@@ -542,13 +530,7 @@
                 width: 32px;
               "
             >
-              {{
+              {{ ((item.maxScore - item.minScore) / 5) * 1 + item.minScore }}
-                ((((item.maxScore - item.minScore) / item.minScore) *
-                  item.minScore) /
-                  5) *
-                  1 +
-                item.minScore
-              }}
             </div>
             <div
               style="
@@ -690,6 +672,8 @@ export default {
     return {
       itemshow: false,
       itemshow2: false,
+      showyey: true,
+      showbj: true,
       total1: 0,
       total2: 0,
       total3: 0,
@@ -774,8 +758,8 @@ export default {
         pageSize: 10,
         studentId: "",
         batchCode: "",
-        // studentId: "12",
+        studentId: "27",
-        // batchCode: "PC202208030005",
+        batchCode: "PC202208230011",
         // studentId: "14",
         // batchCode: "PC202208030005",
         // studentId: "9",
@@ -792,7 +776,7 @@ export default {
   created() {
     this.getList();
     this.class();
-    // this.studenttext();
+    this.studenttext();
   },
   methods: {
     //学生身体素质
@@ -925,6 +909,20 @@ export default {
       //用户权限
       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) => {

src/views/system/shape/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName">
+      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
         <el-button
           @click="kindergartenshow = true"
           v-if="kindergartenName == '请选择幼儿园'"
@@ -22,7 +22,12 @@
         >
       </el-form-item>
 
-      <el-form-item label="所属班级" prop="categoryName" label-width="70px">
+      <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"
@@ -798,7 +803,7 @@
             <div
               ref="chart"
               id="chart"
-              style="width: 450px; height: 320px;margin:0 auto"
+              style="width: 450px; height: 320px; margin: 0 auto"
             ></div>
 
             <div
@@ -951,6 +956,8 @@ export default {
     return {
       itemshow: false,
       itemshow2: false,
+      showyey: true,
+      showbj: true,
       total1: 0,
       total2: 0,
       total3: 0,
@@ -1239,6 +1246,20 @@ export default {
       //用户权限
       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) => {

src/views/system/survey/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item label="所属幼儿园" prop="categoryName">
+      <el-form-item label="所属幼儿园" prop="categoryName" v-if="showyey">
         <el-button
           @click="kindergartenshow = true"
           v-if="kindergartenName == '请选择幼儿园'"
@@ -225,7 +225,7 @@
           <div slot="header" style="text-align: center">
             <img style="width: 40px" src="@/icons/笑脸.png" alt="" />
 
-            <div><!-- card title -->该学生此批次暂没数据</div>
+            <div><!-- card title -->该批次暂无数据</div>
           </div>
           <!-- card body -->
         </el-card>
@@ -249,6 +249,7 @@ export default {
     return {
       itemshow: false,
       itemshow2: false,
+      showyey: true,
       total1: 0,
       total4: 0,
 
@@ -294,20 +295,20 @@ export default {
       studentlist: [],
       //查询传值
       classqueryParams: {
-        // kindergartenId: "",
+        kindergartenId: "",
-        // batchCode: "",
+        batchCode: "",
         pageNum: 1,
         pageSize: 10,
-        kindergartenId: "12",
+        // kindergartenId: "12",
-        batchCode: "PC202208030005",
+        // batchCode: "PC202208030005",
       },
       studentlistqueryParams: {
-        // kindergartenId: "",
+        kindergartenId: "",
-        // batchCode: "",
+        batchCode: "",
         pageNum: 1,
         pageSize: 10,
-        kindergartenId: "1",
+        // kindergartenId: "1",
-        batchCode: "PC202208030005",
+        // batchCode: "PC202208030005",
       },
       LARGECLASS: "LARGE_CLASS",
       MIDDLECLASS: "MIDDLE_CLASS",
@@ -320,258 +321,270 @@ export default {
   mounted() {},
   created() {
     this.getList();
-    this.StudentListinfo();
+    // this.StudentListinfo();
-    this.ClassListinfo();
+    // this.ClassListinfo();
   },
   methods: {
     ClassListinfo() {
       ClassList(this.classqueryParams).then((res) => {
-        var classscore1 = [];
+        if (res.rows == [] || !res.rows) {
-        var classscore2 = [];
+          this.itemshow2 = true;
-        var classscore3 = [];
+          this.itemshow = false;
-        res.rows.forEach((e) => {
+        } else {
-          if (e.classType == this.LARGECLASS) {
+          var classscore1 = [];
-            this.yclassname1.push(e.className);
+          var classscore2 = [];
-            if (
+          var classscore3 = [];
-              e.itemScoreAll == "" ||
+          res.rows.forEach((e) => {
-              !e.itemScoreAll ||
+            if (e.classType == this.LARGECLASS) {
-              e.itemScoreAll == null
+              this.yclassname1.push(e.className);
-            ) {
+              if (
-              classscore1.push(0);
+                e.itemScoreAll == "" ||
-            } else {
+                !e.itemScoreAll ||
-              classscore1.push(e.itemScoreAll);
+                e.itemScoreAll == null
+              ) {
+                classscore1.push(0);
+              } else {
+                classscore1.push(e.itemScoreAll);
+              }
+            } else if (e.classType == this.MIDDLECLASS) {
+              this.yclassname2.push(e.className);
+              if (
+                e.itemScoreAll == "" ||
+                !e.itemScoreAll ||
+                e.itemScoreAll == null
+              ) {
+                classscore2.push(0);
+              } else {
+                classscore2.push(e.itemScoreAll);
+              }
+            } else if (e.classType == this.SMALLCLASS) {
+              this.yclassname3.push(e.className);
+              if (
+                e.itemScoreAll == "" ||
+                !e.itemScoreAll ||
+                e.itemScoreAll == null
+              ) {
+                classscore3.push(0);
+              } else {
+                classscore3.push(e.itemScoreAll);
+              }
             }
-          } else if (e.classType == this.MIDDLECLASS) {
+          });
-            this.yclassname2.push(e.className);
+          var app = {};
-            if (
+          var myChart = echarts.init(document.getElementById("main"));
-              e.itemScoreAll == "" ||
+          var myChart2 = echarts.init(document.getElementById("main2"));
-              !e.itemScoreAll ||
+          var myChart3 = echarts.init(document.getElementById("main3"));
-              e.itemScoreAll == null
+          var option;
-            ) {
+          var option2;
-              classscore2.push(0);
+          var option3;
-            } else {
+          const posList = [
-              classscore2.push(e.itemScoreAll);
+            "left",
-            }
+            "right",
-          } else if (e.classType == this.SMALLCLASS) {
+            "top",
-            this.yclassname3.push(e.className);
+            "bottom",
-            if (
+            "inside",
-              e.itemScoreAll == "" ||
+            "insideTop",
-              !e.itemScoreAll ||
+            "insideLeft",
-              e.itemScoreAll == null
+            "insideRight",
-            ) {
+            "insideBottom",
-              classscore3.push(0);
+            "insideTopLeft",
-            } else {
+            "insideTopRight",
-              classscore3.push(e.itemScoreAll);
+            "insideBottomLeft",
-            }
+            "insideBottomRight",
-          }
+          ];
-        });
+          app.configParameters = {
-        var app = {};
+            rotate: {
-        var myChart = echarts.init(document.getElementById("main"));
+              min: 0,
-        var myChart2 = echarts.init(document.getElementById("main2"));
+              max: 90,
-        var myChart3 = echarts.init(document.getElementById("main3"));
-        var option;
-        var option2;
-        var option3;
-        const posList = [
-          "left",
-          "right",
-          "top",
-          "bottom",
-          "inside",
-          "insideTop",
-          "insideLeft",
-          "insideRight",
-          "insideBottom",
-          "insideTopLeft",
-          "insideTopRight",
-          "insideBottomLeft",
-          "insideBottomRight",
-        ];
-        app.configParameters = {
-          rotate: {
-            min: 0,
-            max: 90,
-          },
-          align: {
-            options: {
-              left: "left",
-              center: "center",
-              right: "right",
             },
-          },
+            align: {
-          verticalAlign: {
+              options: {
-            options: {
+                left: "left",
-              top: "top",
+                center: "center",
-              middle: "middle",
+                right: "right",
-              bottom: "bottom",
-            },
-          },
-          position: {
-            options: posList.reduce(function (map, pos) {
-              map[pos] = pos;
-              return map;
-            }, {}),
-          },
-          distance: {
-            min: 0,
-            max: 100,
-          },
-        };
-        app.config = {
-          rotate: 0,
-          align: "center",
-          verticalAlign: "middle",
-          position: "top",
-          distance: 15,
-          onChange: function () {
-            const labelOption = {
-              rotate: app.config.rotate,
-              align: app.config.align,
-              verticalAlign: app.config.verticalAlign,
-              position: app.config.position,
-              distance: app.config.distance,
-            };
-            myChart.setOption({
-              series: [
-                {
-                  label: labelOption,
-                },
-                {
-                  label: labelOption,
-                },
-                {
-                  label: labelOption,
-                },
-                {
-                  label: labelOption,
-                },
-              ],
-            });
-          },
-        };
-        const labelOption = {
-          show: true,
-          position: app.config.position,
-          distance: app.config.distance,
-          align: app.config.align,
-          verticalAlign: app.config.verticalAlign,
-          rotate: app.config.rotate,
-          formatter: "{c}",
-          fontSize: 16,
-          rich: {
-            name: {},
-          },
-        };
-        option = {
-          tooltip: {
-            trigger: "axis",
-            axisPointer: {
-              type: "shadow",
-            },
-          },
-          legend: {},
-          xAxis: [
-            {
-              type: "category",
-              axisTick: { show: false },
-              data: this.yclassname1,
-            },
-          ],
-          yAxis: [
-            {
-              type: "value",
-            },
-          ],
-          series: [
-            {
-              type: "bar",
-              barGap: 0,
-              color: "#00B050",
-              label: labelOption,
-              emphasis: {
-                focus: "series",
               },
-              data: classscore1,
             },
-          ],
+            verticalAlign: {
-        };
+              options: {
-        option2 = {
+                top: "top",
-          tooltip: {
+                middle: "middle",
-            trigger: "axis",
+                bottom: "bottom",
-            axisPointer: {
-              type: "shadow",
-            },
-          },
-          legend: {},
-          xAxis: [
-            {
-              type: "category",
-              axisTick: { show: false },
-              data: this.yclassname2,
-            },
-          ],
-          yAxis: [
-            {
-              type: "value",
-            },
-          ],
-          series: [
-            {
-              type: "bar",
-              barGap: 0,
-              color: "#00B050",
-              label: labelOption,
-              emphasis: {
-                focus: "series",
               },
-              data: classscore2,
             },
-          ],
+            position: {
-        };
+              options: posList.reduce(function (map, pos) {
-        option3 = {
+                map[pos] = pos;
-          tooltip: {
+                return map;
-            trigger: "axis",
+              }, {}),
-            axisPointer: {
-              type: "shadow",
             },
-          },
+            distance: {
-          legend: {},
+              min: 0,
-          xAxis: [
+              max: 100,
-            {
-              type: "category",
-              axisTick: { show: false },
-              data: this.yclassname3,
             },
-          ],
+          };
-          yAxis: [
+          app.config = {
-            {
+            rotate: 0,
-              type: "value",
+            align: "center",
+            verticalAlign: "middle",
+            position: "top",
+            distance: 15,
+            onChange: function () {
+              const labelOption = {
+                rotate: app.config.rotate,
+                align: app.config.align,
+                verticalAlign: app.config.verticalAlign,
+                position: app.config.position,
+                distance: app.config.distance,
+              };
+              myChart.setOption({
+                series: [
+                  {
+                    label: labelOption,
+                  },
+                  {
+                    label: labelOption,
+                  },
+                  {
+                    label: labelOption,
+                  },
+                  {
+                    label: labelOption,
+                  },
+                ],
+              });
             },
-          ],
+          };
-          series: [
+          const labelOption = {
-            {
+            show: true,
-              type: "bar",
+            position: app.config.position,
-              barGap: 0,
+            distance: app.config.distance,
-              color: "#00B050",
+            align: app.config.align,
-              label: labelOption,
+            verticalAlign: app.config.verticalAlign,
-              emphasis: {
+            rotate: app.config.rotate,
-                focus: "series",
+            formatter: "{c}",
+            fontSize: 16,
+            rich: {
+              name: {},
+            },
+          };
+          option = {
+            tooltip: {
+              trigger: "axis",
+              axisPointer: {
+                type: "shadow",
               },
-              data: classscore3,
             },
-          ],
+            legend: {},
-        };
+            xAxis: [
+              {
+                type: "category",
+                axisTick: { show: false },
+                data: this.yclassname1,
+              },
+            ],
+            yAxis: [
+              {
+                type: "value",
+              },
+            ],
+            series: [
+              {
+                type: "bar",
+                barGap: 0,
+                color: "#00B050",
+                label: labelOption,
+                emphasis: {
+                  focus: "series",
+                },
+                data: classscore1,
+              },
+            ],
+          };
+          option2 = {
+            tooltip: {
+              trigger: "axis",
+              axisPointer: {
+                type: "shadow",
+              },
+            },
+            legend: {},
+            xAxis: [
+              {
+                type: "category",
+                axisTick: { show: false },
+                data: this.yclassname2,
+              },
+            ],
+            yAxis: [
+              {
+                type: "value",
+              },
+            ],
+            series: [
+              {
+                type: "bar",
+                barGap: 0,
+                color: "#00B050",
+                label: labelOption,
+                emphasis: {
+                  focus: "series",
+                },
+                data: classscore2,
+              },
+            ],
+          };
+          option3 = {
+            tooltip: {
+              trigger: "axis",
+              axisPointer: {
+                type: "shadow",
+              },
+            },
+            legend: {},
+            xAxis: [
+              {
+                type: "category",
+                axisTick: { show: false },
+                data: this.yclassname3,
+              },
+            ],
+            yAxis: [
+              {
+                type: "value",
+              },
+            ],
+            series: [
+              {
+                type: "bar",
+                barGap: 0,
+                color: "#00B050",
+                label: labelOption,
+                emphasis: {
+                  focus: "series",
+                },
+                data: classscore3,
+              },
+            ],
+          };
 
-        option && myChart.setOption(option);
+          option && myChart.setOption(option);
-        option2 && myChart2.setOption(option2);
+          option2 && myChart2.setOption(option2);
-        option3 && myChart3.setOption(option3);
+          option3 && myChart3.setOption(option3);
-        this.itemshow = true;
+          this.itemshow = true;
-        this.itemshow2 = false;
+          this.itemshow2 = false;
+        }
       });
     },
     StudentListinfo() {
       StudentList(this.studentlistqueryParams).then((res) => {
-        this.studentlist = res.rows;
+        if (res.rows == [] || !res.rows) {
+          this.itemshow2 = true;
+          this.itemshow = false;
+        } else {
+          this.studentlist = res.rows;
+          this.itemshow2 = false;
+          this.itemshow = true;
+        }
       });
     },
     //点击批次左边
@@ -579,7 +592,9 @@ export default {
       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();
     },
     //点击批次
@@ -609,6 +624,7 @@ export default {
     //幼儿园左侧点击
     kindergartenNameclick(row) {
       this.classqueryParams.kindergartenId = row.id;
+      this.studentlistqueryParams.kindergartenId = row.id;
       this.kindergartenName = row.kindergartenName;
       this.kindergartenId = row.id;
       this.kindergartenshow = false;
@@ -622,6 +638,21 @@ export default {
       //用户权限
       getRoleInfo().then((res) => {
         console.log(res);
+        this.studentlistqueryParams.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;
+          return;
+        }
       });
       //获取幼儿园list
       listKindergartenInfo(this.kqueryParams).then((response) => {

src/views/system/testItemCityScore/index.vue

@@ -26,7 +26,7 @@
           style="width: 228px"
         />
       </el-form-item>
-   
+
       <el-form-item label="平均得分" prop="itemAvgScore">
         <el-input
           v-model="queryParams.itemAvgScore"
@@ -110,12 +110,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="所属区域" align="center" prop="name" />
       <el-table-column label="所属项目" align="center" prop="itemName" />
-            <el-table-column label="性别" align="center" prop="sex" >
+      <el-table-column label="性别" align="center" prop="sex">
         <template slot-scope="scope">
-          {{ scope.row.sex == "MALE" ? "男":"" }}
+          {{ scope.row.sex == "MALE" ? "男" : "" }}
-          {{ scope.row.sex == "FEMALE" ? "女" :"" }}
+          {{ scope.row.sex == "FEMALE" ? "女" : "" }}
         </template>
-        </el-table-column>
+      </el-table-column>
       <el-table-column label="平均得分" align="center" prop="itemAvgScore">
         <template slot-scope="scope">
           {{ scope.row.dictValue == "number" ? scope.row.itemAvgScore : "" }}
@@ -195,7 +195,7 @@
           :required="true"
           v-if="form.resultDictType == ''"
         >
-          <el-input placeholder="请输入平均得分" />
+          <el-input v-model="value" placeholder="请输入平均得分" />
         </el-form-item>
 
         <el-form-item
@@ -204,11 +204,7 @@
           key="itemAvgScore"
           prop="itemAvgScore"
         >
-          <el-input
+          <el-input v-model="form.itemAvgScore" placeholder="请输入平均得分" />
-            v-model="form.itemAvgScore"
-             @input="NumberCheck()"
-            placeholder="请输入平均得分"
-          />
         </el-form-item>
 
         <el-form-item
@@ -227,7 +223,7 @@
         >
           <el-input v-model="form.itemAvgText" placeholder="请输入平均得分" />
         </el-form-item>
-           <el-form-item label="学生性别" prop="sex">
+        <el-form-item label="学生性别" prop="sex">
           <el-radio-group v-model="form.sex">
             <el-radio :label="male">男</el-radio>
             <el-radio :label="female">女</el-radio>
@@ -280,11 +276,7 @@
           prop="itemAvgScore"
           v-if="form.dictValue == 'number'"
         >
-          <el-input
+          <el-input v-model="form.itemAvgScore" placeholder="请输入平均得分" />
-            v-model="form.itemAvgScore"
-             @input="NumberCheck()"
-            placeholder="请输入平均得分"
-          />
         </el-form-item>
         <el-form-item
           label="平均得分"
@@ -292,9 +284,9 @@
           v-if="form.dictValue == 'text'"
         >
           <el-input v-model="form.itemAvgText" placeholder="请输入平均得分" />
-</el-form-item>
+        </el-form-item>
-            
+
-           <el-form-item label="学生性别" prop="sex">
+        <el-form-item label="学生性别" prop="sex">
           <el-radio-group v-model="form.sex">
             <el-radio :label="male">男</el-radio>
             <el-radio :label="female">女</el-radio>
@@ -477,21 +469,53 @@ import { listArea } from "@/api/system/area.js";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
-    name: "TestItemCityScore",
+  name: "TestItemCityScore",
-     components: { Treeselect },
+  components: { Treeselect },
   data() {
     var roleMoeny = (rule, value, callback) => {
-      if (Number.isNaN(Number.parseFloat(value))) {
+      var str = this.form.itemAvgScore;
-        callback(new Error("请输入数字"));
+      console.log(str);
-      } else  if (!this.form.itemAvgScore) {
+      var str_ = "";
-        callback(new Error("不能为空"));
+      var str2 = "";
-      } else if (this.form.itemAvgScore * 1 > 99999999) {
+      str_ = str.substr(str.indexOf(".")).length;
-        callback(new Error("最大99999999")); // 限制最大额度
+      if (value.includes(".")) {
+        str2 = str.substr(0, str.indexOf(".")).length;
+        console.log(str2);
+        if (Number.isNaN(Number.parseFloat(str))) {
+          callback(new Error("请输入数字"));
+        } else if (!this.form.itemAvgScore) {
+          callback(new Error("不能为空"));
+        } else if (this.form.itemAvgScore * 1 > 99999999) {
+          callback(new Error("最大99999999")); // 限制最大额度
+        } else if (this.form.itemAvgScore == "0") {
+          callback(new Error("请输入成绩")); // 限制最大额度
+        } else if (str_ > 3) {
+          callback(new Error("小数点后两位")); // 限制最大额度
+        } else if (str2 > 3) {
+          callback(new Error("整数为三位")); // 限制最大额度
+        } else {
+          callback();
+        }
       } else {
-        callback();
+        str2 = str.length;
+        console.log(str2);
+        if (Number.isNaN(Number.parseFloat(value))) {
+          callback(new Error("请输入数字"));
+        } else if (!this.form.itemAvgScore) {
+          callback(new Error("不能为空"));
+        } else if (this.form.itemAvgScore * 1 > 99999999) {
+          callback(new Error("最大99999999")); // 限制最大额度
+        } else if (this.form.itemAvgScore == "0") {
+          callback(new Error("请输入成绩")); // 限制最大额度
+        } else if (str2 > 3) {
+          callback(new Error("整数为三位")); // 限制最大额度
+        } else {
+          callback();
+        }
       }
     };
     return {
+      value: "",
       // 遮罩层
       loading: true,
       innerVisible: false,
@@ -505,7 +529,7 @@ export default {
       ResultType2: "",
       // 非单个禁用
       single: true,
-       //性别
+      //性别
       male: "MALE",
       female: "FEMALE",
       // 非多个禁用
@@ -553,16 +577,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        // itemAvgScore: [
+        itemAvgScore: [{ required: true, validator: roleMoeny, message: "" }],
-          // {
-          //   required: true,
-          //   type: "number",
-          //   message: "必须填入数字",
-          //   trigger: "blur",
-          // },
-            itemAvgScore: [
-          { required: true, validator: roleMoeny, message: "" },
-        ],
         itemAvgText: [
           { required: true, message: "请输入全市平均成绩", trigger: "blur" },
         ],
@@ -573,35 +588,12 @@ export default {
           { required: true, message: "请选择所属项目", trigger: "blur" },
         ],
       },
-          realVal:'',
     };
   },
   created() {
     this.getList();
   },
   methods: {
-        NumberCheck(num) {
-      let str = this.form.itemAvgScore;
-      //  console.log(str)
-      if (Number.isNaN(Number.parseFloat(str))) {
-      } else {
-        //限制只能输入一个小数点
-        if (str.indexOf(".") != -1) {
-          var str_ = str.substr(str.indexOf(".") + 1);
-          if (str_.indexOf(".") != -1) {
-            str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1);
-          }
-        }
-        //正则替换，保留数字和小数点
-        // str = str.replace(/[^\d^\.]+/g, "");
-        // console.log(str)
-        // this.form2.itemAvgScore = str;
-
-          str = parseFloat(str).toFixed(3)
-     this.realVal = str.substring(0, str.length - 1)
-      }
-    },
-
     normalizer3(node) {
       if (node.children && !node.children.length) {
         delete node.children;
@@ -762,7 +754,6 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.form.itemAvgScore = this.realVal;
       if (this.form.resultDictType == this.ResultType1.dictValue) {
         console.log(this.ResultType1.dictValue);
         this.form.itemAvgText = "";

src/views/system/testItemCountryScore/index.vue

@@ -99,7 +99,6 @@
         </template>
       </el-table-column>
       <el-table-column label="平均得分" align="center" prop="itemAvgScore">
-       
         <template slot-scope="scope">
           {{ scope.row.dictValue == "number" ? scope.row.itemAvgScore : "" }}
           {{ scope.row.dictValue == "text" ? scope.row.itemAvgText : "" }}
@@ -190,7 +189,6 @@
         >
           <el-input
             v-model="form.itemAvgScore"
-            @input="NumberCheck2()"
             style="width: 360px"
             placeholder="请输入平均得分"
           />
@@ -268,8 +266,11 @@
           prop="itemAvgScore"
           v-if="form2.resultDictType == ''"
         >
-          <el-input placeholder="请输入平均得分" style="width: 360px" />
+          <el-input
-        
+            v-model="value"
+            placeholder="请输入平均得分"
+            style="width: 360px"
+          />
         </el-form-item>
 
         <el-form-item
@@ -279,13 +280,10 @@
         >
           <el-input
             v-model="form2.itemAvgScore"
-            @input="NumberCheck()"
             placeholder="请输入平均得分"
             style="width: 360px"
           />
-            
         </el-form-item>
-        
 
         <el-form-item
           label="平均得分"
@@ -509,37 +507,102 @@ import { tKindergartenInfo } from "@/api/system/kindergartenInfo";
 export default {
   name: "TestItemCountryScore",
   data() {
-    
     var roleMoeny = (rule, value, callback) => {
-// value=String(value).split(".")[0] + "." + value.split(".")[1].slice(0, 2)
+      var str = value;
-//  console.log(arr)
+      var str_ = "";
-      if (Number.isNaN(Number.parseFloat(value))) {
+      var str2 = "";
-        callback(new Error("请输入数字"));
+      str_ = str.substr(str.indexOf(".")).length;
-      } else if (!this.form2.itemAvgScore) {
+      if (value.includes(".")) {
-        callback(new Error("不能为空"));
+        str2 = str.substr(0, str.indexOf(".")).length;
-      } else if (this.form2.itemAvgScore * 1 > 99999999) {
+        console.log(str2);
-        callback(new Error("最大99999999")); // 限制最大额度
+        if (Number.isNaN(Number.parseFloat(value))) {
-      } else if (this.form2.itemAvgScore == "0") {
+          callback(new Error("请输入数字"));
-        callback(new Error("请输入成绩")); // 限制最大额度
+        } else if (!this.form2.itemAvgScore) {
+          callback(new Error("不能为空"));
+        } else if (this.form2.itemAvgScore * 1 > 99999999) {
+          callback(new Error("最大99999999")); // 限制最大额度
+        } else if (this.form2.itemAvgScore == "0") {
+          callback(new Error("请输入成绩")); // 限制最大额度
+        } else if (str_ > 3) {
+          callback(new Error("小数点后两位")); // 限制最大额度
+        } else if (str2 > 3) {
+          callback(new Error("整数为三位")); // 限制最大额度
+        } else {
+          callback();
+        }
       } else {
-        callback();
+        str2 = str.length;
-
+        console.log(str2);
+        if (Number.isNaN(Number.parseFloat(value))) {
+          callback(new Error("请输入数字"));
+        } else if (!this.form2.itemAvgScore) {
+          callback(new Error("不能为空"));
+        } else if (this.form2.itemAvgScore * 1 > 99999999) {
+          callback(new Error("最大99999999")); // 限制最大额度
+        } else if (this.form2.itemAvgScore == "0") {
+          callback(new Error("请输入成绩")); // 限制最大额度
+        } else if (str2 > 3) {
+          callback(new Error("整数为三位")); // 限制最大额度
+        } else {
+          callback();
+        }
       }
     };
     var roleMoeny2 = (rule, value, callback) => {
-      console.log(value);
+      var str = this.form.itemAvgScore;
-      if (Number.isNaN(Number.parseFloat(value))) {
+      console.log(str);
-        callback(new Error("请输入数字"));
+      var str_ = "";
-      } else if (!this.form.itemAvgScore) {
+      var str2 = "";
-        callback(new Error("不能为空"));
+      str_ = str.substr(str.indexOf(".")).length;
-      } else if (this.form.itemAvgScore * 1 > 99999999) {
+      if (value.includes(".")) {
-        callback(new Error("最大99999999")); // 限制最大额度
+        str2 = str.substr(0, str.indexOf(".")).length;
+        console.log(str2);
+        if (Number.isNaN(Number.parseFloat(str))) {
+          callback(new Error("请输入数字"));
+        } else if (!this.form.itemAvgScore) {
+          callback(new Error("不能为空"));
+        } else if (this.form.itemAvgScore * 1 > 99999999) {
+          callback(new Error("最大99999999")); // 限制最大额度
+        } else if (this.form.itemAvgScore == "0") {
+          callback(new Error("请输入成绩")); // 限制最大额度
+        } else if (str_ > 3) {
+          callback(new Error("小数点后两位")); // 限制最大额度
+        } else if (str2 > 3) {
+          callback(new Error("整数为三位")); // 限制最大额度
+        } else {
+          callback();
+        }
       } else {
-        callback();
+        str2 = str.length;
+        console.log(str2);
+        if (Number.isNaN(Number.parseFloat(value))) {
+          callback(new Error("请输入数字"));
+        } else if (!this.form.itemAvgScore) {
+          callback(new Error("不能为空"));
+        } else if (this.form.itemAvgScore * 1 > 99999999) {
+          callback(new Error("最大99999999")); // 限制最大额度
+        } else if (this.form.itemAvgScore == "0") {
+          callback(new Error("请输入成绩")); // 限制最大额度
+        } else if (str2 > 3) {
+          callback(new Error("整数为三位")); // 限制最大额度
+        } else {
+          callback();
+        }
       }
+
+      // if (Number.isNaN(Number.parseFloat(value))) {
+      //   callback(new Error("请输入数字"));
+      // } else if (!this.form.itemAvgScore) {
+      //   callback(new Error("不能为空"));
+      // } else if (this.form.itemAvgScore * 1 > 99999999) {
+      //   callback(new Error("最大99999999")); // 限制最大额度
+      // } else {
+      //   callback();
+      // }
     };
 
     return {
+      value: "",
       //项目测试类型
       itemResultType: "item_result_type",
       //字典类型
@@ -575,7 +638,6 @@ export default {
       // 是否显示弹出层
       open: false,
       open2: false,
-
       // 查询参数
       itemId2: "",
       itemId: "",
@@ -629,61 +691,13 @@ export default {
           { required: true, message: "请输入平均得分", trigger: "blur" },
         ],
       },
-      realVal:'',
+      realVal: "",
     };
   },
   created() {
     this.getList();
   },
-  methods: 
+  methods: {
-    {
-      
-    //添加的只能保留一个小数点
-    NumberCheck(num) {
-      let str = this.form2.itemAvgScore;
-      //  console.log(str)
-      if (Number.isNaN(Number.parseFloat(str))) {
-      } else {
-        //限制只能输入一个小数点
-        if (str.indexOf(".") != -1) {
-          var str_ = str.substr(str.indexOf(".") + 1);
-          if (str_.indexOf(".") != -1) {
-            str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1);
-          }
-        }
-        //正则替换，保留数字和小数点
-        // str = str.replace(/[^\d^\.]+/g, "");
-        // console.log(str)
-        // this.form2.itemAvgScore = str;
-
-          str = parseFloat(str).toFixed(3)
-     this.realVal = str.substring(0, str.length - 1)
-      }
-    },
-    NumberCheck2(num) {
-      let str = this.form.itemAvgScore;
-      if (Number.isNaN(Number.parseFloat(str))) {
-      } else {
-        //限制只能输入一个小数点
-        if (str.indexOf(".") != -1) {
-          var str_ = str.substr(str.indexOf(".") +1);
-          if (str_.indexOf(".") != -1) {
-            str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1);
-          }
-        }
-        //正则替换，保留数字和小数点
-         str = parseFloat(str).toFixed(3)
-     this.realVal = str.substring(0, str.length - 1)
-
-
-        // str = str.replace(/[^\d^\.]+/g, "");
-        // this.form.itemAvgScore = str;
-        console.log(this.realVal)
-      }
-    },
-    //   // fun(val) {
-    //   //   return Number(val).toFixed(2);
-    //   },
     xmclick(row) {
       console.log(row);
       this.xmname = row.itemName;
@@ -814,9 +828,6 @@ export default {
 
     /** 提交按钮 */
     submitForm() {
-        this.form.itemAvgScore = this.realVal;
-        this.form2.itemAvgScore = this.realVal;
-
       if (this.form.dictValue == this.ResultType1.dictValue) {
         console.log(this.ResultType1.dictValue);
         this.form.itemAvgText = "";
@@ -835,7 +846,7 @@ export default {
             updateTestItemCountryScore(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open2 = false;
-           
+
               this.getList();
             });
             this.itemId2 = "";
@@ -846,15 +857,14 @@ export default {
       } else {
         this.$refs["form2"].validate((valid) => {
           if (valid) {
-            this.form2.itemAvgScore = Number(this.form2.itemAvgScore)
+            this.form2.itemAvgScore = Number(this.form2.itemAvgScore);
             addTestItemCountryScore(this.form2).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
-                //  console.log(this.form2)
+              //  console.log(this.form2)
               this.getList();
               //  this.form.itemId = "";
 
-
               this.itemId2 = "";
               this.xmname = "";
               this.xmname = "请选择所属项目";

src/views/system/testItemScore/index.vue

@@ -250,7 +250,6 @@
             "
           />
         </el-form-item>
-
         <el-form-item
           label="个人成绩"
           prop="itemScore"
@@ -258,7 +257,6 @@
         >
           <el-input
             v-model="form.itemScore"
-            @input="NumberCheck3()"
             placeholder="请输入个人成绩"
             style="width: 360px"
           />
@@ -274,29 +272,13 @@
             style="width: 360px"
           />
         </el-form-item>
-
         <el-form-item label="个人成绩得分" prop="itemFraction">
           <el-input
             v-model="form.itemFraction"
-            @input="NumberCheck4()"
             placeholder="请输入个人成绩得分"
             style="width: 360px"
           />
         </el-form-item>
-
-        <!--
-        <el-form-item label="测试成绩" prop="itemScore">
-          <el-input
-            v-model="form.itemScore"
-            placeholder="请输入测试成绩"
-            style="
-              width: 360px;
-              text-align: left;
-              height: 36px;
-              padding-left: -10px;
-            "
-          />
-        </el-form-item> -->
         <el-form-item label="综合评价" prop="syntheticalAssess">
           <el-input
             v-model="form.syntheticalAssess"
@@ -475,10 +457,14 @@
 
         <el-form-item
           label="个人成绩"
-          prop="itemScore"
+          prop="scoreDictValue"
           v-if="form2.scoreDictId == '' || form2.scoreDictId == null"
         >
-          <el-input placeholder="请输入个人成绩" style="width: 360px" />
+          <el-input
+            v-model="value"
+            placeholder="请输入个人成绩"
+            style="width: 360px"
+          />
         </el-form-item>
 
         <el-form-item
@@ -500,24 +486,13 @@
         >
           <el-input
             v-model="form2.itemScore"
-            @input="NumberCheck()"
             placeholder="请输入个人成绩"
             style="width: 360px"
           />
         </el-form-item>
-        <!-- <el-form-item
-          label="个人成绩得分"
-          prop="itemFraction"
-
-          v-if="form3.scoreDictId == '' || form3.scoreDictId == null"
-        >
-          <el-input placeholder="请输入个人成绩得分" style="width: 360px" />
-        </el-form-item> -->
-
         <el-form-item label="个人成绩得分" prop="itemFraction">
           <el-input
             v-model="form2.itemFraction"
-            @input="NumberCheck2()"
             placeholder="请输入个人成绩得分"
             style="width: 360px"
           />
@@ -689,6 +664,7 @@
             {{ scope.row.classType == "LARGE_CLASS" ? "大班" : "" }}
             {{ scope.row.classType == "MIDDLE_CLASS" ? "中班" : "" }}
             {{ scope.row.classType == "SMALL_CLASS" ? "小班" : "" }}
+            {{ scope.row.classType == "GRADUATE" ? "毕业" : "" }}
           </template>
         </el-table-column>
         <el-table-column
@@ -1235,52 +1211,176 @@ export default {
   components: { Treeselect },
   data() {
     var roleMoeny = (rule, value, callback) => {
-      if (Number.isNaN(Number.parseFloat(value))) {
+      var str = value;
-        callback(new Error("请输入数字"));
+      var str_ = "";
-      } else if (!this.form2.itemScore) {
+      var str2 = "";
-        callback(new Error("不能为空"));
+      str_ = str.substr(str.indexOf(".")).length;
-      } else if (this.form2.itemScore * 1 > 99999999) {
+      if (value.includes(".")) {
-        callback(new Error("最大99999999")); // 限制最大额度
+        str2 = str.substr(0, str.indexOf(".")).length;
+        console.log(str2);
+        if (Number.isNaN(Number.parseFloat(value))) {
+          callback(new Error("请输入数字"));
+        } else if (!this.form2.itemScore) {
+          callback(new Error("不能为空"));
+        } else if (this.form2.itemScore * 1 > 99999999) {
+          callback(new Error("最大99999999")); // 限制最大额度
+        } else if (this.form2.itemScore == "0") {
+          callback(new Error("请输入成绩")); // 限制最大额度
+        } else if (str_ > 3) {
+          callback(new Error("小数点后两位")); // 限制最大额度
+        } else if (str2 > 3) {
+          callback(new Error("整数为三位")); // 限制最大额度
+        } else {
+          callback();
+        }
       } else {
-        callback();
+        str2 = str.length;
+        console.log(str2);
+        if (Number.isNaN(Number.parseFloat(value))) {
+          callback(new Error("请输入数字"));
+        } else if (!this.form2.itemScore) {
+          callback(new Error("不能为空"));
+        } else if (this.form2.itemScore * 1 > 99999999) {
+          callback(new Error("最大99999999")); // 限制最大额度
+        } else if (this.form2.itemScore == "0") {
+          callback(new Error("请输入成绩")); // 限制最大额度
+        } else if (str2 > 3) {
+          callback(new Error("整数为三位")); // 限制最大额度
+        } else {
+          callback();
+        }
       }
     };
     var roleMoeny2 = (rule, value, callback) => {
-      if (Number.isNaN(Number.parseFloat(value))) {
+      var str = value;
-        callback(new Error("请输入数字"));
+      console.log(str);
-      } else if (!this.form2.itemFraction) {
+      var str_ = "";
-        callback(new Error("不能为空"));
+      var str2 = "";
-      } else if (this.form2.itemFraction * 1 > 99999999) {
+      str_ = str.substr(str.indexOf(".")).length;
-        callback(new Error("最大99999999")); // 限制最大额度
+      if (value.includes(".")) {
+        str2 = str.substr(0, str.indexOf(".")).length;
+        console.log(str2);
+        if (Number.isNaN(Number.parseFloat(value))) {
+          callback(new Error("请输入数字"));
+        } else if (!this.form2.itemFraction) {
+          callback(new Error("不能为空"));
+        } else if (this.form2.itemFraction * 1 > 99999999) {
+          callback(new Error("最大99999999")); // 限制最大额度
+        } else if (this.form2.itemFraction == "0") {
+          callback(new Error("请输入成绩")); // 限制最大额度
+        } else if (str_ > 3) {
+          callback(new Error("小数点后两位")); // 限制最大额度
+        } else if (str2 > 3) {
+          callback(new Error("整数为三位")); // 限制最大额度
+        } else {
+          callback();
+        }
       } else {
-        callback();
+        str2 = str.length;
+        console.log(str2);
+        if (Number.isNaN(Number.parseFloat(value))) {
+          callback(new Error("请输入数字"));
+        } else if (!this.form2.itemFraction) {
+          callback(new Error("不能为空"));
+        } else if (this.form2.itemFraction * 1 > 99999999) {
+          callback(new Error("最大99999999")); // 限制最大额度
+        } else if (this.form2.itemFraction == "0") {
+          callback(new Error("请输入成绩")); // 限制最大额度
+        } else if (str2 > 3) {
+          callback(new Error("整数为三位")); // 限制最大额度
+        } else {
+          callback();
+        }
       }
     };
 
     var roleMoeny3 = (rule, value, callback) => {
-      if (Number.isNaN(Number.parseFloat(value))) {
+      var str = this.form.itemScore;
-        callback(new Error("请输入数字"));
+      console.log(str);
-      } else if (!this.form.itemFraction) {
+      var str_ = "";
-        callback(new Error("不能为空"));
+      var str2 = "";
-      } else if (this.form.itemFraction * 1 > 99999999) {
+      str_ = str.substr(str.indexOf(".")).length;
-        callback(new Error("最大99999999")); // 限制最大额度
+      if (value.includes(".")) {
+        str2 = str.substr(0, str.indexOf(".")).length;
+        console.log(str2);
+        if (Number.isNaN(Number.parseFloat(value))) {
+          callback(new Error("请输入数字"));
+        } else if (!this.form.itemScore) {
+          callback(new Error("不能为空"));
+        } else if (this.form.itemScore * 1 > 99999999) {
+          callback(new Error("最大99999999")); // 限制最大额度
+        } else if (this.form.itemScore == "0") {
+          callback(new Error("请输入成绩")); // 限制最大额度
+        } else if (str_ > 3) {
+          callback(new Error("小数点后两位")); // 限制最大额度
+        } else if (str2 > 3) {
+          callback(new Error("整数为三位")); // 限制最大额度
+        } else {
+          callback();
+        }
       } else {
-        callback();
+        str2 = str.length;
+        console.log(str2);
+        if (Number.isNaN(Number.parseFloat(value))) {
+          callback(new Error("请输入数字"));
+        } else if (!this.form.itemScore) {
+          callback(new Error("不能为空"));
+        } else if (this.form.itemScore * 1 > 99999999) {
+          callback(new Error("最大99999999")); // 限制最大额度
+        } else if (this.form.itemScore == "0") {
+          callback(new Error("请输入成绩")); // 限制最大额度
+        } else if (str2 > 3) {
+          callback(new Error("整数为三位")); // 限制最大额度
+        } else {
+          callback();
+        }
       }
     };
     var roleMoeny4 = (rule, value, callback) => {
-      if (Number.isNaN(Number.parseFloat(value))) {
+      var str = this.form.itemFraction;
-        callback(new Error("请输入数字"));
+      console.log(str);
-      } else if (!this.form.itemFraction) {
+      var str_ = "";
-        callback(new Error("不能为空"));
+      var str2 = "";
-      } else if (this.form.itemFraction * 1 > 99999999) {
+      str_ = str.substr(str.indexOf(".")).length;
-        callback(new Error("最大99999999")); // 限制最大额度
+      if (value.includes(".")) {
+        str2 = str.substr(0, str.indexOf(".")).length;
+        console.log(str2);
+        if (Number.isNaN(Number.parseFloat(value))) {
+          callback(new Error("请输入数字"));
+        } else if (!this.form.itemFraction) {
+          callback(new Error("不能为空"));
+        } else if (this.form.itemFraction * 1 > 99999999) {
+          callback(new Error("最大99999999")); // 限制最大额度
+        } else if (this.form.itemFraction == "0") {
+          callback(new Error("请输入成绩")); // 限制最大额度
+        } else if (str_ > 3) {
+          callback(new Error("小数点后两位")); // 限制最大额度
+        } else if (str2 > 3) {
+          callback(new Error("整数为三位")); // 限制最大额度
+        } else {
+          callback();
+        }
       } else {
-        callback();
+        str2 = str.length;
+        console.log(str2);
+        if (Number.isNaN(Number.parseFloat(value))) {
+          callback(new Error("请输入数字"));
+        } else if (!this.form.itemFraction) {
+          callback(new Error("不能为空"));
+        } else if (this.form.itemFraction * 1 > 99999999) {
+          callback(new Error("最大99999999")); // 限制最大额度
+        } else if (this.form.itemFraction == "0") {
+          callback(new Error("请输入成绩")); // 限制最大额度
+        } else if (str2 > 3) {
+          callback(new Error("整数为三位")); // 限制最大额度
+        } else {
+          callback();
+        }
       }
     };
 
     return {
+      value: "",
       //项目测试类型
       itemResultType: "item_result_type",
       //字典类型
@@ -1294,16 +1394,13 @@ export default {
       yryinnerVisible: false,
       testItemScoreLists: [],
       xmname: "请选择所属班级",
-
       studentInfos: [],
       innerVisible: false,
       stname: "请选择学生姓名",
       innerVisible2: false,
-
       testItemss: [],
       innerVisible3: false,
       testname: "请选择测试项目名称",
-
       testScoreBatchs: [],
       innerVisible4: false,
       itemNumbername: "请选择批次编号",
@@ -1326,7 +1423,6 @@ export default {
       kindergartenId: "",
       // 选中数组
       ids: [],
-
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -1353,7 +1449,6 @@ export default {
       itemId3: "",
       itemId4: "",
       itemId5: "",
-
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -1474,12 +1569,12 @@ export default {
             trigger: "blur",
           },
         ],
-
         syntheticalAssess: [
           { required: true, message: "综合评价不能为空", trigger: "blur" },
         ],
       },
       realVal: "",
+      realVal2: "",
     };
   },
   created() {
@@ -1499,83 +1594,6 @@ export default {
     kindergartencancel() {
       this.yryinnerVisible = false;
     },
-    //只能输入一位小数点
-    NumberCheck(num) {
-      let str = this.form2.itemScore;
-      //限制只能输入一个小数点
-      if (Number.isNaN(Number.parseFloat(str))) {
-      } else {
-        //限制只能输入一个小数点
-        if (str.indexOf(".") != -1) {
-          var str_ = str.substr(str.indexOf(".") + 1);
-          if (str_.indexOf(".") != -1) {
-            str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1);
-          }
-        }
-
-        str = parseFloat(str).toFixed(3);
-        this.realVal = str.substring(0, str.length - 1);
-      }
-    },
-    //个人成绩得分只能输入一个小数点
-    NumberCheck2(num) {
-      let str = this.form2.itemFraction;
-      //限制只能输入一个小数点
-      if (Number.isNaN(Number.parseFloat(str))) {
-      } else {
-        //限制只能输入一个小数点
-        if (str.indexOf(".") != -1) {
-          var str_ = str.substr(str.indexOf(".") + 1);
-          if (str_.indexOf(".") != -1) {
-            str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1);
-          }
-        }
-
-        str = parseFloat(str).toFixed(3);
-        this.realVal = str.substring(0, str.length - 1);
-      }
-    },
-    NumberCheck3(num) {
-      let str = this.form.itemScore;
-      //限制只能输入一个小数点
-      if (Number.isNaN(Number.parseFloat(str))) {
-      } else {
-        //限制只能输入一个小数点
-        if (str.indexOf(".") != -1) {
-          var str_ = str.substr(str.indexOf(".") + 1);
-          if (str_.indexOf(".") != -1) {
-            str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1);
-          }
-        }
-        //正则替换，保留数字和小数点
-        str = parseFloat(str).toFixed(3);
-        this.realVal = str.substring(0, str.length - 1);
-
-        // str = str.replace(/[^\d^\.]+/g, "");
-        // this.form.itemAvgScore = str;
-        console.log(this.realVal);
-      }
-    },
-    NumberCheck4(num) {
-      let str = this.form.itemFraction;
-      //限制只能输入一个小数点
-      if (Number.isNaN(Number.parseFloat(str))) {
-      } else {
-        //限制只能输入一个小数点
-        if (str.indexOf(".") != -1) {
-          var str_ = str.substr(str.indexOf(".") + 1);
-          if (str_.indexOf(".") != -1) {
-            str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1);
-          }
-        }
-        //正则替换，保留数字和小数点
-        str = parseFloat(str).toFixed(3);
-        this.realVal = str.substring(0, str.length - 1);
-
-        // str = str.replace(/[^\d^\.]+/g, "");
-        // this.form.itemAvgScore = str;
-      }
-    },
     // 班级信息
     xmclick(row) {
       console.log(row);
@@ -1858,10 +1876,6 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.form2.itemScore = this.realVal;
-      this.form.itemFraction = this.realVal;
-      this.form.itemScore = this.realVal;
-      this.form2.itemFraction = this.realVal;
       console.log(this.form2);
       this.$refs["form"].validate((valid) => {
         if (valid) {
@@ -1884,6 +1898,9 @@ export default {
               this.itemId3 = "";
               this.itemId4 = "";
               this.itemId5 = "";
+              this.kindergartenName = "请选择幼儿园";
+              this.kindergartenId = "";
+              this.queryParams2.kindergartenId = "";
             });
           }
         }

src/views/system/testItems/index.vue

@@ -372,23 +372,23 @@
             <el-input
               v-model="item.levelName"
               placeholder="级别名"
-              style="width: 75px; margin-right: 20px"
+              style="width: 75px; margin-right: 10px"
             />
             <el-input
               v-model.number="item.levelMinScore"
               placeholder="最低分"
-              style="width: 75px; margin-right: 10px"
+              style="width: 75px; margin-right: 5px"
             /><el-input
               v-model.number="item.levelMaxScore"
               placeholder="最高分"
-              style="width: 75px; margin-right: 9px"
+              style="width: 75px; margin-right: 5px"
             />
 
             <el-select
               v-model="item.standardFlag"
               clearable
               placeholder="请选择是否达标"
-              style="width: 150px"
+              style="width: 145px; margin-right: 8px"
             >
               <el-option
                 v-for="item in list"

src/views/system/testScoreBatch/index.vue

@@ -114,7 +114,7 @@
           <el-input v-model.number="form.batchCode" placeholder="请输入批次编号" />
         </el-form-item> -->
         <el-form-item label="批次名称" prop="batchName">
-          <el-input v-model="form.batchName" placeholder="请输入批次名称" />
+          <el-input v-model="form.batchName" placeholder="请输入批次名称" maxlength="30" />
         </el-form-item>
         <el-form-item label="备注信息" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注信息" />