Merge branch 'cf_dev' of http://192.168.101.4:3000/jiaxiaoqiang/JG-ADMIN-TEMP into cf_dev

src/views/base/excel/template/index.vue

@@ -153,13 +153,49 @@
                   <el-form-item label="同步坐标" prop="position">
                     <el-input :disabled="true" v-model="addForm.position" />
                   </el-form-item>
-                  <el-form-item label="上限值" prop="up">
+                  <el-form-item
+                    label="上限值"
+                    :rules="[
+                      {
+                        required:
+                          addForm.up || addForm.down || addForm.standard
+                            ? true
+                            : false,
+                        trigger: 'change',
+                      },
+                    ]"
+                    prop="up"
+                  >
                     <el-input v-model="addForm.up" />
                   </el-form-item>
-                  <el-form-item label="下限值" prop="down">
+                  <el-form-item
+                    label="下限值"
+                    :rules="[
+                      {
+                        required:
+                          addForm.up || addForm.down || addForm.standard
+                            ? true
+                            : false,
+                        trigger: 'change',
+                      },
+                    ]"
+                    prop="down"
+                  >
                     <el-input v-model="addForm.down" />
                   </el-form-item>
-                  <el-form-item label="标准值" prop="standard">
+                  <el-form-item
+                    label="标准值"
+                    :rules="[
+                      {
+                        required:
+                          addForm.up || addForm.down || addForm.standard
+                            ? true
+                            : false,
+                        trigger: 'change',
+                      },
+                    ]"
+                    prop="standard"
+                  >
                     <el-input v-model="addForm.standard" />
                   </el-form-item>
                   <el-form-item label="数据来源" prop="source">
@@ -699,24 +735,7 @@ const useAddFormHook = () => {
         trigger: "blur",
       },
     ],
-    up: [
-      {
-        required: false,
-        trigger: "blur",
-      },
-    ],
-    down: [
-      {
-        required: false,
-        trigger: "blur",
-      },
-    ],
-    standard: [
-      {
-        required: false,
-        trigger: "blur",
-      },
-    ],
+
     source: [
       {
         required: false,