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

src/views/system/KindergartenPhysicalTest/index.vue

@@ -46,7 +46,7 @@
 
     <!-- //批次 -->
     <el-dialog
-      width="500px"
+      width="590px"
       title="选择批次"
       :visible.sync="batchCodeshow"
       append-to-body
@@ -54,7 +54,7 @@
       :before-close="batchCodecancel"
     >
       <el-table :data="testScorelist" align="center" style="margin-top: 0px">
-        <el-table-column label="请选择" width="70" align="center">
+        <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
             <el-button
               type="primary"
@@ -74,13 +74,13 @@
         <el-table-column
           property="batchCode"
           label="批次编号"
-          width="190"
+          width="200"
           align="center"
         />
         <el-table-column
           property="batchName"
           label="批次名称"
-          width="190"
+          width="200"
           align="center"
         />
       </el-table>

src/views/system/action/index.vue

@@ -82,7 +82,7 @@
 
     <!-- //批次 -->
     <el-dialog
-      width="500px"
+      width="590px"
       title="选择批次"
       :visible.sync="batchCodeshow"
       append-to-body
@@ -90,7 +90,7 @@
       :before-close="batchCodecancel"
     >
       <el-table :data="testScorelist" align="center" style="margin-top: 0px">
-        <el-table-column label="请选择" width="70" align="center">
+        <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
             <el-button
               type="primary"
@@ -110,13 +110,13 @@
         <el-table-column
           property="batchCode"
           label="批次编号"
-          width="190"
+          width="200"
           align="center"
         />
         <el-table-column
           property="batchName"
           label="批次名称"
-          width="190"
+          width="200"
           align="center"
         />
       </el-table>

src/views/system/classconstitution/index.vue

@@ -67,7 +67,7 @@
 
     <!-- //批次 -->
     <el-dialog
-      width="500px"
+      width="590px"
       title="选择批次"
       :visible.sync="batchCodeshow"
       append-to-body
@@ -75,7 +75,7 @@
       :before-close="batchCodecancel"
     >
       <el-table :data="testScorelist" align="center" style="margin-top: 0px">
-        <el-table-column label="请选择" width="70" align="center">
+        <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
             <el-button
               type="primary"
@@ -95,13 +95,13 @@
         <el-table-column
           property="batchCode"
           label="批次编号"
-          width="190"
+          width="200"
           align="center"
         />
         <el-table-column
           property="batchName"
           label="批次名称"
-          width="190"
+          width="200"
           align="center"
         />
       </el-table>

src/views/system/comprehensive/index.vue

@@ -82,7 +82,7 @@
 
     <!-- //批次 -->
     <el-dialog
-      width="500px"
+      width="590px"
       title="选择批次"
       :visible.sync="batchCodeshow"
       append-to-body
@@ -90,7 +90,7 @@
       :before-close="batchCodecancel"
     >
       <el-table :data="testScorelist" align="center" style="margin-top: 0px">
-        <el-table-column label="请选择" width="70" align="center">
+        <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
             <el-button
               type="primary"
@@ -110,13 +110,13 @@
         <el-table-column
           property="batchCode"
           label="批次编号"
-          width="190"
+          width="200"
           align="center"
         />
         <el-table-column
           property="batchName"
           label="批次名称"
-          width="190"
+          width="200"
           align="center"
         />
       </el-table>

src/views/system/constitution/index.vue

@@ -82,7 +82,7 @@
 
     <!-- //批次 -->
     <el-dialog
-      width="500px"
+      width="590px"
       title="选择批次"
       :visible.sync="batchCodeshow"
       append-to-body
@@ -90,7 +90,7 @@
       :before-close="batchCodecancel"
     >
       <el-table :data="testScorelist" align="center" style="margin-top: 0px">
-        <el-table-column label="请选择" width="70" align="center">
+        <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
             <el-button
               type="primary"
@@ -110,13 +110,13 @@
         <el-table-column
           property="batchCode"
           label="批次编号"
-          width="190"
+          width="200"
           align="center"
         />
         <el-table-column
           property="batchName"
           label="批次名称"
-          width="190"
+          width="200"
           align="center"
         />
       </el-table>

src/views/system/development/index.vue

@@ -73,7 +73,7 @@
 
     <!-- //批次 -->
     <el-dialog
-      width="500px"
+      width="590px"
       title="选择批次"
       :visible.sync="batchCodeshow"
       append-to-body
@@ -81,7 +81,7 @@
       :before-close="batchCodecancel"
     >
       <el-table :data="testScorelist" align="center" style="margin-top: 0px">
-        <el-table-column label="请选择" width="70" align="center">
+        <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
             <el-button
               type="primary"
@@ -101,13 +101,13 @@
         <el-table-column
           property="batchCode"
           label="批次编号"
-          width="190"
+          width="200"
           align="center"
         />
         <el-table-column
           property="batchName"
           label="批次名称"
-          width="190"
+          width="200"
           align="center"
         />
       </el-table>

src/views/system/heightAndWeight/index.vue

@@ -46,7 +46,7 @@
 
     <!-- //批次 -->
     <el-dialog
-      width="500px"
+      width="590px"
       title="选择批次"
       :visible.sync="batchCodeshow"
       append-to-body
@@ -54,7 +54,7 @@
       :before-close="batchCodecancel"
     >
       <el-table :data="testScorelist" align="center" style="margin-top: 0px">
-        <el-table-column label="请选择" width="70" align="center">
+        <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
             <el-button
               type="primary"
@@ -74,13 +74,13 @@
         <el-table-column
           property="batchCode"
           label="批次编号"
-          width="190"
+          width="200"
           align="center"
         />
         <el-table-column
           property="batchName"
           label="批次名称"
-          width="190"
+          width="200"
           align="center"
         />
       </el-table>

src/views/system/physique/index.vue

@@ -61,7 +61,7 @@
 
     <!-- //批次 -->
     <el-dialog
-      width="500px"
+      width="590px"
       title="选择批次"
       :visible.sync="batchCodeshow"
       append-to-body
@@ -69,7 +69,7 @@
       :before-close="batchCodecancel"
     >
       <el-table :data="testScorelist" align="center" style="margin-top: 0px">
-        <el-table-column label="请选择" width="70" align="center">
+        <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
             <el-button
               type="primary"
@@ -89,13 +89,13 @@
         <el-table-column
           property="batchCode"
           label="批次编号"
-          width="190"
+          width="200"
           align="center"
         />
         <el-table-column
           property="batchName"
           label="批次名称"
-          width="190"
+          width="200"
           align="center"
         />
       </el-table>

src/views/system/quality/index.vue

@@ -82,7 +82,7 @@
 
     <!-- //批次 -->
     <el-dialog
-      width="500px"
+      width="590px"
       title="选择批次"
       :visible.sync="batchCodeshow"
       append-to-body
@@ -90,7 +90,7 @@
       :before-close="batchCodecancel"
     >
       <el-table :data="testScorelist" align="center" style="margin-top: 0px">
-        <el-table-column label="请选择" width="70" align="center">
+        <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
             <el-button
               type="primary"
@@ -110,13 +110,13 @@
         <el-table-column
           property="batchCode"
           label="批次编号"
-          width="190"
+          width="200"
           align="center"
         />
         <el-table-column
           property="batchName"
           label="批次名称"
-          width="190"
+          width="200"
           align="center"
         />
       </el-table>

src/views/system/shape/index.vue

@@ -82,7 +82,7 @@
 
     <!-- //批次 -->
     <el-dialog
-      width="500px"
+      width="590px"
       title="选择批次"
       :visible.sync="batchCodeshow"
       append-to-body
@@ -90,7 +90,7 @@
       :before-close="batchCodecancel"
     >
       <el-table :data="testScorelist" align="center" style="margin-top: 0px">
-        <el-table-column label="请选择" width="70" align="center">
+        <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
             <el-button
               type="primary"
@@ -110,13 +110,13 @@
         <el-table-column
           property="batchCode"
           label="批次编号"
-          width="190"
+          width="200"
           align="center"
         />
         <el-table-column
           property="batchName"
           label="批次名称"
-          width="190"
+          width="200"
           align="center"
         />
       </el-table>

src/views/system/survey/index.vue

@@ -46,7 +46,7 @@
 
     <!-- //批次 -->
     <el-dialog
-      width="500px"
+      width="590px"
       title="选择批次"
       :visible.sync="batchCodeshow"
       append-to-body
@@ -54,7 +54,7 @@
       :before-close="batchCodecancel"
     >
       <el-table :data="testScorelist" align="center" style="margin-top: 0px">
-        <el-table-column label="请选择" width="70" align="center">
+        <el-table-column label="请选择" width="100" align="center">
           <template slot-scope="scope">
             <el-button
               type="primary"
@@ -74,13 +74,13 @@
         <el-table-column
           property="batchCode"
           label="批次编号"
-          width="190"
+          width="200"
           align="center"
         />
         <el-table-column
           property="batchName"
           label="批次名称"
-          width="190"
+          width="200"
           align="center"
         />
       </el-table>
@@ -227,7 +227,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>

src/views/system/testItemCityScore/index.vue

@@ -212,7 +212,11 @@
           :required="true"
           v-if="form.resultDictType == ''"
         >
-          <el-input v-model="value" placeholder="请输入平均得分" />
+          <el-input 
+          v-model="value" 
+          placeholder="请输入平均得分" 
+          
+          />
         </el-form-item>
 
         <el-form-item
@@ -230,7 +234,8 @@
           key="itemAvgText"
           prop="itemAvgText"
         >
-          <el-input v-model="form.itemAvgText" placeholder="请输入平均得分" />
+         <el-input v-model="form.itemAvgText" placeholder="请输入平均得分"
+         @input="change($event)" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -533,6 +538,40 @@ export default {
           callback();
         }
       }
+    };
+     var roleMoeny1 = (rule, value, callback) => {
+      var str = String(this.form.itemAvgText);
+      console.log(str);
+      var str_ = "";
+      var str2 = "";
+      if (str.includes(".")) {
+        str_ = str.substr(str.indexOf(".")).length;
+        str2 = str.substr(0, str.indexOf(".")).length;
+        console.log(str2);
+          if (!this.form.itemAvgText) {
+          callback(new Error("不能为空"));
+        } else if (this.form.itemAvgText * 1 > 99999999) {
+          callback(new Error("最大99999999")); // 限制最大额度
+        } else if (this.form.itemAvgText == "0") {
+          callback(new Error("请输入成绩")); // 限制最大额度
+        } else if (str_ > 3) {
+          callback(new Error("小数点后两位")); // 限制最大额度
+        } else {
+          callback();
+        }
+      } else {
+        str2 = str.length;
+        console.log(str2);
+        if (!this.form.itemAvgText) {
+          callback(new Error("不能为空"));
+        } else if (this.form.itemAvgText * 1 > 99999999) {
+          callback(new Error("最大99999999")); // 限制最大额度
+        } else if (this.form.itemAvgText == "0") {
+          callback(new Error("请输入成绩")); // 限制最大额度
+        }  else {
+          callback();
+        }
+      }
     };
     return {
       //男女选择
@@ -616,7 +655,7 @@ export default {
         sex: [{ required: true, message: "请选择性别", trigger: "blur" }],
         itemAvgScore: [{ required: true, validator: roleMoeny, message: "" }],
         itemAvgText: [
-          { required: true, message: "请输入全市平均成绩", trigger: "blur" },
+          { required: true, validator: roleMoeny1,message: "", trigger: "blur" },
         ],
         areaId: [
           { required: true, message: "请选择所属区域", trigger: "blur" },
@@ -631,6 +670,9 @@ export default {
     this.getList();
   },
   methods: {
+    change (e) {
+    this.$forceUpdate()
+},
     inputChange() {
       this.getItemCityScorelist.areaId = this.form.areaId;
       if (