ソースを参照

裂解炉炉管测压 - H110-H130进出口数值设定范围

wangggziwen 1 年間 前
コミット
50eaf52e16

+ 121 - 13
ui/src/views/production/pressure/h110.vue

@@ -251,7 +251,6 @@
         <el-form-item label="归属部门" prop="deptId">
           <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
         </el-form-item>
-      </el-form>
       <el-descriptions title="PASS1出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1213A">
@@ -263,6 +262,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+      <el-form-item label="备注" prop="remarks1">
+        <el-input v-model="form.remarks1" placeholder="请输入备注" />
+      </el-form-item>
       <el-descriptions title="PASS2出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1223A">
@@ -274,6 +276,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks2">
+          <el-input v-model="form.remarks2" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS3出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1233A">
@@ -285,6 +290,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks3">
+          <el-input v-model="form.remarks3" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS4出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1243A">
@@ -296,6 +304,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks4">
+          <el-input v-model="form.remarks4" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS5出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1253A">
@@ -307,6 +318,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks5">
+          <el-input v-model="form.remarks5" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS6出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1263A">
@@ -318,6 +332,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks6">
+          <el-input v-model="form.remarks6" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS7出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1273A">
@@ -329,6 +346,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks7">
+          <el-input v-model="form.remarks7" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS8出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1283A">
@@ -339,7 +359,11 @@
           <el-input v-model="pass8[index]"/>
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
-      </el-descriptions>
+      </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks8">
+          <el-input v-model="form.remarks8" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -956,9 +980,14 @@
         pass16:[],
         // 表单校验
         rules: {
-          id: [
-            { required: true, message: "主键id不能为空", trigger: "blur" }
-          ],
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: true, message: "备注不能为空", trigger: "blur" }],
         },
         // 状态字典
         statusOptions: [],
@@ -1388,8 +1417,95 @@
           this.title = "修改裂解炉炉管测压";
         });
       },
+      // 运行状态校验规则
+      setRulesRun(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 10) {
+            if (pass[i] < 200 || pass[i] > 310) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 140 || pass[i] > 260) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 烧焦状态校验规则
+      setRulesBurn(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 10) {
+            if (pass[i] < 50 || pass[i] > 120) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 40 || pass[i] > 80) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 重置校验规则
+      resetRules() {
+        this.rules = {
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+        };
+      },
       /** 提交按钮 */
       submitForm() {
+        this.resetRules();
+        let remarks1Required = false;
+        let remarks2Required = false;
+        let remarks3Required = false;
+        let remarks4Required = false;
+        let remarks5Required = false;
+        let remarks6Required = false;
+        let remarks7Required = false;
+        let remarks8Required = false;
+        if (this.form.status === '0') {//运行
+          remarks1Required = this.setRulesRun(this.pass1);
+          remarks2Required = this.setRulesRun(this.pass2);
+          remarks3Required = this.setRulesRun(this.pass3);
+          remarks4Required = this.setRulesRun(this.pass4);
+          remarks5Required = this.setRulesRun(this.pass5);
+          remarks6Required = this.setRulesRun(this.pass6);
+          remarks7Required = this.setRulesRun(this.pass7);
+          remarks8Required = this.setRulesRun(this.pass8);
+        } else if (this.form.status === '2') {//烧焦
+          remarks1Required = this.setRulesBurn(this.pass1);
+          remarks2Required = this.setRulesBurn(this.pass2);
+          remarks3Required = this.setRulesBurn(this.pass3);
+          remarks4Required = this.setRulesBurn(this.pass4);
+          remarks5Required = this.setRulesBurn(this.pass5);
+          remarks6Required = this.setRulesBurn(this.pass6);
+          remarks7Required = this.setRulesBurn(this.pass7);
+          remarks8Required = this.setRulesBurn(this.pass8);
+        }
+        this.rules = {
+          remarks1: [{ required: remarks1Required, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: remarks2Required, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: remarks3Required, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: remarks4Required, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: remarks5Required, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: remarks6Required, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: remarks7Required, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: remarks8Required, message: "备注不能为空", trigger: "blur" }],
+        };
         this.form.pass1 = this.pass1.join(",");
         this.form.pass2 = this.pass2.join(",");
         this.form.pass3 = this.pass3.join(",");
@@ -1398,14 +1514,6 @@
         this.form.pass6 = this.pass6.join(",");
         this.form.pass7 = this.pass7.join(",");
         this.form.pass8 = this.pass8.join(",");
-        this.form.pass9 = this.pass9.join(",");
-        this.form.pass10 = this.pass10.join(",");
-        this.form.pass11 = this.pass11.join(",");
-        this.form.pass12 = this.pass12.join(",");
-        this.form.pass13 = this.pass13.join(",");
-        this.form.pass14 = this.pass14.join(",");
-        this.form.pass15 = this.pass15.join(",");
-        this.form.pass16 = this.pass16.join(",");
         this.form.recordTime = this.recordTimeYmd + " " + this.recordTimeHms;
         this.$refs["form"].validate(valid => {
           if (valid) {

+ 120 - 14
ui/src/views/production/pressure/h111.vue

@@ -251,7 +251,6 @@
         <el-form-item label="归属部门" prop="deptId">
           <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
         </el-form-item>
-      </el-form>
       <el-descriptions title="PASS1出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1213B">
@@ -263,6 +262,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+      <el-form-item label="备注" prop="remarks1">
+        <el-input v-model="form.remarks1" placeholder="请输入备注" />
+      </el-form-item>
       <el-descriptions title="PASS2出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1223B">
@@ -274,6 +276,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks2">
+          <el-input v-model="form.remarks2" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS3出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1233B">
@@ -285,6 +290,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks3">
+          <el-input v-model="form.remarks3" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS4出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1243B">
@@ -296,6 +304,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks4">
+          <el-input v-model="form.remarks4" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS5出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1253B">
@@ -307,6 +318,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks5">
+          <el-input v-model="form.remarks5" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS6出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1263B">
@@ -318,6 +332,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks6">
+          <el-input v-model="form.remarks6" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS7出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1273B">
@@ -329,6 +346,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks7">
+          <el-input v-model="form.remarks7" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS8出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1283B">
@@ -339,7 +359,11 @@
           <el-input v-model="pass8[index]"/>
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
-      </el-descriptions>
+      </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks8">
+          <el-input v-model="form.remarks8" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -956,9 +980,14 @@
         pass16:[],
         // 表单校验
         rules: {
-          id: [
-            { required: true, message: "主键id不能为空", trigger: "blur" }
-          ],
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: true, message: "备注不能为空", trigger: "blur" }],
         },
         // 状态字典
         statusOptions: [],
@@ -1387,9 +1416,94 @@
           this.open = true;
           this.title = "修改裂解炉炉管测压";
         });
+      },// 运行状态校验规则
+      setRulesRun(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 10) {
+            if (pass[i] < 200 || pass[i] > 310) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 140 || pass[i] > 260) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 烧焦状态校验规则
+      setRulesBurn(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 10) {
+            if (pass[i] < 50 || pass[i] > 120) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 40 || pass[i] > 80) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 重置校验规则
+      resetRules() {
+        this.rules = {
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+        };
       },
       /** 提交按钮 */
-      submitForm() {
+      submitForm() {this.resetRules();
+        let remarks1Required = false;
+        let remarks2Required = false;
+        let remarks3Required = false;
+        let remarks4Required = false;
+        let remarks5Required = false;
+        let remarks6Required = false;
+        let remarks7Required = false;
+        let remarks8Required = false;
+        if (this.form.status === '0') {//运行
+          remarks1Required = this.setRulesRun(this.pass1);
+          remarks2Required = this.setRulesRun(this.pass2);
+          remarks3Required = this.setRulesRun(this.pass3);
+          remarks4Required = this.setRulesRun(this.pass4);
+          remarks5Required = this.setRulesRun(this.pass5);
+          remarks6Required = this.setRulesRun(this.pass6);
+          remarks7Required = this.setRulesRun(this.pass7);
+          remarks8Required = this.setRulesRun(this.pass8);
+        } else if (this.form.status === '2') {//烧焦
+          remarks1Required = this.setRulesBurn(this.pass1);
+          remarks2Required = this.setRulesBurn(this.pass2);
+          remarks3Required = this.setRulesBurn(this.pass3);
+          remarks4Required = this.setRulesBurn(this.pass4);
+          remarks5Required = this.setRulesBurn(this.pass5);
+          remarks6Required = this.setRulesBurn(this.pass6);
+          remarks7Required = this.setRulesBurn(this.pass7);
+          remarks8Required = this.setRulesBurn(this.pass8);
+        }
+        this.rules = {
+          remarks1: [{ required: remarks1Required, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: remarks2Required, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: remarks3Required, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: remarks4Required, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: remarks5Required, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: remarks6Required, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: remarks7Required, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: remarks8Required, message: "备注不能为空", trigger: "blur" }],
+        };
         this.form.pass1 = this.pass1.join(",");
         this.form.pass2 = this.pass2.join(",");
         this.form.pass3 = this.pass3.join(",");
@@ -1398,14 +1512,6 @@
         this.form.pass6 = this.pass6.join(",");
         this.form.pass7 = this.pass7.join(",");
         this.form.pass8 = this.pass8.join(",");
-        this.form.pass9 = this.pass9.join(",");
-        this.form.pass10 = this.pass10.join(",");
-        this.form.pass11 = this.pass11.join(",");
-        this.form.pass12 = this.pass12.join(",");
-        this.form.pass13 = this.pass13.join(",");
-        this.form.pass14 = this.pass14.join(",");
-        this.form.pass15 = this.pass15.join(",");
-        this.form.pass16 = this.pass16.join(",");
         this.form.recordTime = this.recordTimeYmd + " " + this.recordTimeHms;
         this.$refs["form"].validate(valid => {
           if (valid) {

+ 120 - 14
ui/src/views/production/pressure/h112.vue

@@ -251,7 +251,6 @@
         <el-form-item label="归属部门" prop="deptId">
           <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
         </el-form-item>
-      </el-form>
       <el-descriptions title="PASS1出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1213C">
@@ -263,6 +262,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks1">
+          <el-input v-model="form.remarks1" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS2出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1223C">
@@ -274,6 +276,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks2">
+          <el-input v-model="form.remarks2" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS3出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1233C">
@@ -285,6 +290,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks3">
+          <el-input v-model="form.remarks3" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS4出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1243C">
@@ -296,6 +304,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks4">
+          <el-input v-model="form.remarks4" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS5出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1253C">
@@ -307,6 +318,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks5">
+          <el-input v-model="form.remarks5" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS6出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1263C">
@@ -318,6 +332,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks6">
+          <el-input v-model="form.remarks6" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS7出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1273C">
@@ -329,6 +346,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks7">
+          <el-input v-model="form.remarks7" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS8出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1283C">
@@ -339,7 +359,11 @@
           <el-input v-model="pass8[index]"/>
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
-      </el-descriptions>
+      </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks8">
+          <el-input v-model="form.remarks8" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -956,9 +980,14 @@
         pass16:[],
         // 表单校验
         rules: {
-          id: [
-            { required: true, message: "主键id不能为空", trigger: "blur" }
-          ],
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: true, message: "备注不能为空", trigger: "blur" }],
         },
         // 状态字典
         statusOptions: [],
@@ -1387,9 +1416,94 @@
           this.open = true;
           this.title = "修改裂解炉炉管测压";
         });
+      },// 运行状态校验规则
+      setRulesRun(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 10) {
+            if (pass[i] < 200 || pass[i] > 310) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 140 || pass[i] > 260) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 烧焦状态校验规则
+      setRulesBurn(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 10) {
+            if (pass[i] < 50 || pass[i] > 120) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 40 || pass[i] > 80) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 重置校验规则
+      resetRules() {
+        this.rules = {
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+        };
       },
       /** 提交按钮 */
-      submitForm() {
+      submitForm() {this.resetRules();
+        let remarks1Required = false;
+        let remarks2Required = false;
+        let remarks3Required = false;
+        let remarks4Required = false;
+        let remarks5Required = false;
+        let remarks6Required = false;
+        let remarks7Required = false;
+        let remarks8Required = false;
+        if (this.form.status === '0') {//运行
+          remarks1Required = this.setRulesRun(this.pass1);
+          remarks2Required = this.setRulesRun(this.pass2);
+          remarks3Required = this.setRulesRun(this.pass3);
+          remarks4Required = this.setRulesRun(this.pass4);
+          remarks5Required = this.setRulesRun(this.pass5);
+          remarks6Required = this.setRulesRun(this.pass6);
+          remarks7Required = this.setRulesRun(this.pass7);
+          remarks8Required = this.setRulesRun(this.pass8);
+        } else if (this.form.status === '2') {//烧焦
+          remarks1Required = this.setRulesBurn(this.pass1);
+          remarks2Required = this.setRulesBurn(this.pass2);
+          remarks3Required = this.setRulesBurn(this.pass3);
+          remarks4Required = this.setRulesBurn(this.pass4);
+          remarks5Required = this.setRulesBurn(this.pass5);
+          remarks6Required = this.setRulesBurn(this.pass6);
+          remarks7Required = this.setRulesBurn(this.pass7);
+          remarks8Required = this.setRulesBurn(this.pass8);
+        }
+        this.rules = {
+          remarks1: [{ required: remarks1Required, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: remarks2Required, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: remarks3Required, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: remarks4Required, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: remarks5Required, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: remarks6Required, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: remarks7Required, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: remarks8Required, message: "备注不能为空", trigger: "blur" }],
+        };
         this.form.pass1 = this.pass1.join(",");
         this.form.pass2 = this.pass2.join(",");
         this.form.pass3 = this.pass3.join(",");
@@ -1398,14 +1512,6 @@
         this.form.pass6 = this.pass6.join(",");
         this.form.pass7 = this.pass7.join(",");
         this.form.pass8 = this.pass8.join(",");
-        this.form.pass9 = this.pass9.join(",");
-        this.form.pass10 = this.pass10.join(",");
-        this.form.pass11 = this.pass11.join(",");
-        this.form.pass12 = this.pass12.join(",");
-        this.form.pass13 = this.pass13.join(",");
-        this.form.pass14 = this.pass14.join(",");
-        this.form.pass15 = this.pass15.join(",");
-        this.form.pass16 = this.pass16.join(",");
         this.form.recordTime = this.recordTimeYmd + " " + this.recordTimeHms;
         this.$refs["form"].validate(valid => {
           if (valid) {

+ 120 - 14
ui/src/views/production/pressure/h113.vue

@@ -251,7 +251,6 @@
         <el-form-item label="归属部门" prop="deptId">
           <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
         </el-form-item>
-      </el-form>
       <el-descriptions title="PASS1出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1213D">
@@ -263,6 +262,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks1">
+          <el-input v-model="form.remarks1" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS2出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1223D">
@@ -274,6 +276,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks2">
+          <el-input v-model="form.remarks2" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS3出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1233D">
@@ -285,6 +290,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks3">
+          <el-input v-model="form.remarks3" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS4出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1243D">
@@ -296,6 +304,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks4">
+          <el-input v-model="form.remarks4" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS5出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1253D">
@@ -307,6 +318,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks5">
+          <el-input v-model="form.remarks5" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS6出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1263D">
@@ -318,6 +332,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks6">
+          <el-input v-model="form.remarks6" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS7出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1273D">
@@ -329,6 +346,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks7">
+          <el-input v-model="form.remarks7" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS8出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1283D">
@@ -339,7 +359,11 @@
           <el-input v-model="pass8[index]"/>
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
-      </el-descriptions>
+      </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks8">
+          <el-input v-model="form.remarks8" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -956,9 +980,14 @@
         pass16:[],
         // 表单校验
         rules: {
-          id: [
-            { required: true, message: "主键id不能为空", trigger: "blur" }
-          ],
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: true, message: "备注不能为空", trigger: "blur" }],
         },
         // 状态字典
         statusOptions: [],
@@ -1387,9 +1416,94 @@
           this.open = true;
           this.title = "修改裂解炉炉管测压";
         });
+      },// 运行状态校验规则
+      setRulesRun(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 10) {
+            if (pass[i] < 200 || pass[i] > 310) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 140 || pass[i] > 260) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 烧焦状态校验规则
+      setRulesBurn(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 10) {
+            if (pass[i] < 50 || pass[i] > 120) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 40 || pass[i] > 80) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 重置校验规则
+      resetRules() {
+        this.rules = {
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+        };
       },
       /** 提交按钮 */
-      submitForm() {
+      submitForm() {this.resetRules();
+        let remarks1Required = false;
+        let remarks2Required = false;
+        let remarks3Required = false;
+        let remarks4Required = false;
+        let remarks5Required = false;
+        let remarks6Required = false;
+        let remarks7Required = false;
+        let remarks8Required = false;
+        if (this.form.status === '0') {//运行
+          remarks1Required = this.setRulesRun(this.pass1);
+          remarks2Required = this.setRulesRun(this.pass2);
+          remarks3Required = this.setRulesRun(this.pass3);
+          remarks4Required = this.setRulesRun(this.pass4);
+          remarks5Required = this.setRulesRun(this.pass5);
+          remarks6Required = this.setRulesRun(this.pass6);
+          remarks7Required = this.setRulesRun(this.pass7);
+          remarks8Required = this.setRulesRun(this.pass8);
+        } else if (this.form.status === '2') {//烧焦
+          remarks1Required = this.setRulesBurn(this.pass1);
+          remarks2Required = this.setRulesBurn(this.pass2);
+          remarks3Required = this.setRulesBurn(this.pass3);
+          remarks4Required = this.setRulesBurn(this.pass4);
+          remarks5Required = this.setRulesBurn(this.pass5);
+          remarks6Required = this.setRulesBurn(this.pass6);
+          remarks7Required = this.setRulesBurn(this.pass7);
+          remarks8Required = this.setRulesBurn(this.pass8);
+        }
+        this.rules = {
+          remarks1: [{ required: remarks1Required, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: remarks2Required, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: remarks3Required, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: remarks4Required, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: remarks5Required, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: remarks6Required, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: remarks7Required, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: remarks8Required, message: "备注不能为空", trigger: "blur" }],
+        };
         this.form.pass1 = this.pass1.join(",");
         this.form.pass2 = this.pass2.join(",");
         this.form.pass3 = this.pass3.join(",");
@@ -1398,14 +1512,6 @@
         this.form.pass6 = this.pass6.join(",");
         this.form.pass7 = this.pass7.join(",");
         this.form.pass8 = this.pass8.join(",");
-        this.form.pass9 = this.pass9.join(",");
-        this.form.pass10 = this.pass10.join(",");
-        this.form.pass11 = this.pass11.join(",");
-        this.form.pass12 = this.pass12.join(",");
-        this.form.pass13 = this.pass13.join(",");
-        this.form.pass14 = this.pass14.join(",");
-        this.form.pass15 = this.pass15.join(",");
-        this.form.pass16 = this.pass16.join(",");
         this.form.recordTime = this.recordTimeYmd + " " + this.recordTimeHms;
         this.$refs["form"].validate(valid => {
           if (valid) {

+ 120 - 14
ui/src/views/production/pressure/h114.vue

@@ -251,7 +251,6 @@
         <el-form-item label="归属部门" prop="deptId">
           <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
         </el-form-item>
-      </el-form>
       <el-descriptions title="PASS1出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1213E">
@@ -263,6 +262,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks1">
+          <el-input v-model="form.remarks1" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS2出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1223E">
@@ -274,6 +276,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks2">
+          <el-input v-model="form.remarks2" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS3出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1233E">
@@ -285,6 +290,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks3">
+          <el-input v-model="form.remarks3" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS4出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1243E">
@@ -296,6 +304,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks4">
+          <el-input v-model="form.remarks4" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS5出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1253E">
@@ -307,6 +318,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks5">
+          <el-input v-model="form.remarks5" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS6出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1263E">
@@ -318,6 +332,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks6">
+          <el-input v-model="form.remarks6" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS7出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1273E">
@@ -329,6 +346,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks7">
+          <el-input v-model="form.remarks7" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS8出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1283E">
@@ -339,7 +359,11 @@
           <el-input v-model="pass8[index]"/>
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
-      </el-descriptions>
+      </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks8">
+          <el-input v-model="form.remarks8" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -956,9 +980,14 @@
         pass16:[],
         // 表单校验
         rules: {
-          id: [
-            { required: true, message: "主键id不能为空", trigger: "blur" }
-          ],
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: true, message: "备注不能为空", trigger: "blur" }],
         },
         // 状态字典
         statusOptions: [],
@@ -1387,9 +1416,94 @@
           this.open = true;
           this.title = "修改裂解炉炉管测压";
         });
+      },// 运行状态校验规则
+      setRulesRun(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 10) {
+            if (pass[i] < 200 || pass[i] > 310) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 140 || pass[i] > 260) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 烧焦状态校验规则
+      setRulesBurn(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 10) {
+            if (pass[i] < 50 || pass[i] > 120) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 40 || pass[i] > 80) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 重置校验规则
+      resetRules() {
+        this.rules = {
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+        };
       },
       /** 提交按钮 */
-      submitForm() {
+      submitForm() {this.resetRules();
+        let remarks1Required = false;
+        let remarks2Required = false;
+        let remarks3Required = false;
+        let remarks4Required = false;
+        let remarks5Required = false;
+        let remarks6Required = false;
+        let remarks7Required = false;
+        let remarks8Required = false;
+        if (this.form.status === '0') {//运行
+          remarks1Required = this.setRulesRun(this.pass1);
+          remarks2Required = this.setRulesRun(this.pass2);
+          remarks3Required = this.setRulesRun(this.pass3);
+          remarks4Required = this.setRulesRun(this.pass4);
+          remarks5Required = this.setRulesRun(this.pass5);
+          remarks6Required = this.setRulesRun(this.pass6);
+          remarks7Required = this.setRulesRun(this.pass7);
+          remarks8Required = this.setRulesRun(this.pass8);
+        } else if (this.form.status === '2') {//烧焦
+          remarks1Required = this.setRulesBurn(this.pass1);
+          remarks2Required = this.setRulesBurn(this.pass2);
+          remarks3Required = this.setRulesBurn(this.pass3);
+          remarks4Required = this.setRulesBurn(this.pass4);
+          remarks5Required = this.setRulesBurn(this.pass5);
+          remarks6Required = this.setRulesBurn(this.pass6);
+          remarks7Required = this.setRulesBurn(this.pass7);
+          remarks8Required = this.setRulesBurn(this.pass8);
+        }
+        this.rules = {
+          remarks1: [{ required: remarks1Required, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: remarks2Required, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: remarks3Required, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: remarks4Required, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: remarks5Required, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: remarks6Required, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: remarks7Required, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: remarks8Required, message: "备注不能为空", trigger: "blur" }],
+        };
         this.form.pass1 = this.pass1.join(",");
         this.form.pass2 = this.pass2.join(",");
         this.form.pass3 = this.pass3.join(",");
@@ -1398,14 +1512,6 @@
         this.form.pass6 = this.pass6.join(",");
         this.form.pass7 = this.pass7.join(",");
         this.form.pass8 = this.pass8.join(",");
-        this.form.pass9 = this.pass9.join(",");
-        this.form.pass10 = this.pass10.join(",");
-        this.form.pass11 = this.pass11.join(",");
-        this.form.pass12 = this.pass12.join(",");
-        this.form.pass13 = this.pass13.join(",");
-        this.form.pass14 = this.pass14.join(",");
-        this.form.pass15 = this.pass15.join(",");
-        this.form.pass16 = this.pass16.join(",");
         this.form.recordTime = this.recordTimeYmd + " " + this.recordTimeHms;
         this.$refs["form"].validate(valid => {
           if (valid) {

+ 120 - 14
ui/src/views/production/pressure/h115.vue

@@ -251,7 +251,6 @@
         <el-form-item label="归属部门" prop="deptId">
           <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
         </el-form-item>
-      </el-form>
       <el-descriptions title="PASS1出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1213F">
@@ -263,6 +262,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks1">
+          <el-input v-model="form.remarks1" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS2出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1223F">
@@ -274,6 +276,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks2">
+          <el-input v-model="form.remarks2" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS3出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1233F">
@@ -285,6 +290,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks3">
+          <el-input v-model="form.remarks3" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS4出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1243F">
@@ -296,6 +304,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks4">
+          <el-input v-model="form.remarks4" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS5出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1253F">
@@ -307,6 +318,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks5">
+          <el-input v-model="form.remarks5" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS6出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1263F">
@@ -318,6 +332,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks6">
+          <el-input v-model="form.remarks6" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS7出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1273F">
@@ -329,6 +346,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks7">
+          <el-input v-model="form.remarks7" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS8出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1283F">
@@ -339,7 +359,11 @@
           <el-input v-model="pass8[index]"/>
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
-      </el-descriptions>
+      </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks8">
+          <el-input v-model="form.remarks8" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -956,9 +980,14 @@
         pass16:[],
         // 表单校验
         rules: {
-          id: [
-            { required: true, message: "主键id不能为空", trigger: "blur" }
-          ],
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: true, message: "备注不能为空", trigger: "blur" }],
         },
         // 状态字典
         statusOptions: [],
@@ -1387,9 +1416,94 @@
           this.open = true;
           this.title = "修改裂解炉炉管测压";
         });
+      },// 运行状态校验规则
+      setRulesRun(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 10) {
+            if (pass[i] < 200 || pass[i] > 310) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 140 || pass[i] > 260) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 烧焦状态校验规则
+      setRulesBurn(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 10) {
+            if (pass[i] < 50 || pass[i] > 120) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 40 || pass[i] > 80) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 重置校验规则
+      resetRules() {
+        this.rules = {
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+        };
       },
       /** 提交按钮 */
-      submitForm() {
+      submitForm() {this.resetRules();
+        let remarks1Required = false;
+        let remarks2Required = false;
+        let remarks3Required = false;
+        let remarks4Required = false;
+        let remarks5Required = false;
+        let remarks6Required = false;
+        let remarks7Required = false;
+        let remarks8Required = false;
+        if (this.form.status === '0') {//运行
+          remarks1Required = this.setRulesRun(this.pass1);
+          remarks2Required = this.setRulesRun(this.pass2);
+          remarks3Required = this.setRulesRun(this.pass3);
+          remarks4Required = this.setRulesRun(this.pass4);
+          remarks5Required = this.setRulesRun(this.pass5);
+          remarks6Required = this.setRulesRun(this.pass6);
+          remarks7Required = this.setRulesRun(this.pass7);
+          remarks8Required = this.setRulesRun(this.pass8);
+        } else if (this.form.status === '2') {//烧焦
+          remarks1Required = this.setRulesBurn(this.pass1);
+          remarks2Required = this.setRulesBurn(this.pass2);
+          remarks3Required = this.setRulesBurn(this.pass3);
+          remarks4Required = this.setRulesBurn(this.pass4);
+          remarks5Required = this.setRulesBurn(this.pass5);
+          remarks6Required = this.setRulesBurn(this.pass6);
+          remarks7Required = this.setRulesBurn(this.pass7);
+          remarks8Required = this.setRulesBurn(this.pass8);
+        }
+        this.rules = {
+          remarks1: [{ required: remarks1Required, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: remarks2Required, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: remarks3Required, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: remarks4Required, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: remarks5Required, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: remarks6Required, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: remarks7Required, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: remarks8Required, message: "备注不能为空", trigger: "blur" }],
+        };
         this.form.pass1 = this.pass1.join(",");
         this.form.pass2 = this.pass2.join(",");
         this.form.pass3 = this.pass3.join(",");
@@ -1398,14 +1512,6 @@
         this.form.pass6 = this.pass6.join(",");
         this.form.pass7 = this.pass7.join(",");
         this.form.pass8 = this.pass8.join(",");
-        this.form.pass9 = this.pass9.join(",");
-        this.form.pass10 = this.pass10.join(",");
-        this.form.pass11 = this.pass11.join(",");
-        this.form.pass12 = this.pass12.join(",");
-        this.form.pass13 = this.pass13.join(",");
-        this.form.pass14 = this.pass14.join(",");
-        this.form.pass15 = this.pass15.join(",");
-        this.form.pass16 = this.pass16.join(",");
         this.form.recordTime = this.recordTimeYmd + " " + this.recordTimeHms;
         this.$refs["form"].validate(valid => {
           if (valid) {

+ 119 - 13
ui/src/views/production/pressure/h116.vue

@@ -251,7 +251,6 @@
         <el-form-item label="归属部门" prop="deptId">
           <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
         </el-form-item>
-      </el-form>
       <el-descriptions title="PASS1出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1213G">
@@ -263,6 +262,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks1">
+          <el-input v-model="form.remarks1" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS2出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1223G">
@@ -274,6 +276,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks2">
+          <el-input v-model="form.remarks2" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS3出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1233G">
@@ -285,6 +290,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks3">
+          <el-input v-model="form.remarks3" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS4出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1243G">
@@ -296,6 +304,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks4">
+          <el-input v-model="form.remarks4" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS5出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1253G">
@@ -307,6 +318,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks5">
+          <el-input v-model="form.remarks5" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS6出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1263G">
@@ -318,6 +332,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks6">
+          <el-input v-model="form.remarks6" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS7出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1273G">
@@ -329,6 +346,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks7">
+          <el-input v-model="form.remarks7" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS8出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1283G">
@@ -340,6 +360,10 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions>
+      </el-form><br/>
+      <el-form-item label="备注" prop="remarks8">
+        <el-input v-model="form.remarks8" placeholder="请输入备注" />
+      </el-form-item>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -956,9 +980,14 @@
         pass16:[],
         // 表单校验
         rules: {
-          id: [
-            { required: true, message: "主键id不能为空", trigger: "blur" }
-          ],
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: true, message: "备注不能为空", trigger: "blur" }],
         },
         // 状态字典
         statusOptions: [],
@@ -1387,9 +1416,94 @@
           this.open = true;
           this.title = "修改裂解炉炉管测压";
         });
+      },// 运行状态校验规则
+      setRulesRun(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 10) {
+            if (pass[i] < 200 || pass[i] > 310) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 140 || pass[i] > 260) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 烧焦状态校验规则
+      setRulesBurn(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 10) {
+            if (pass[i] < 50 || pass[i] > 120) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 40 || pass[i] > 80) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 重置校验规则
+      resetRules() {
+        this.rules = {
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+        };
       },
       /** 提交按钮 */
-      submitForm() {
+      submitForm() {this.resetRules();
+        let remarks1Required = false;
+        let remarks2Required = false;
+        let remarks3Required = false;
+        let remarks4Required = false;
+        let remarks5Required = false;
+        let remarks6Required = false;
+        let remarks7Required = false;
+        let remarks8Required = false;
+        if (this.form.status === '0') {//运行
+          remarks1Required = this.setRulesRun(this.pass1);
+          remarks2Required = this.setRulesRun(this.pass2);
+          remarks3Required = this.setRulesRun(this.pass3);
+          remarks4Required = this.setRulesRun(this.pass4);
+          remarks5Required = this.setRulesRun(this.pass5);
+          remarks6Required = this.setRulesRun(this.pass6);
+          remarks7Required = this.setRulesRun(this.pass7);
+          remarks8Required = this.setRulesRun(this.pass8);
+        } else if (this.form.status === '2') {//烧焦
+          remarks1Required = this.setRulesBurn(this.pass1);
+          remarks2Required = this.setRulesBurn(this.pass2);
+          remarks3Required = this.setRulesBurn(this.pass3);
+          remarks4Required = this.setRulesBurn(this.pass4);
+          remarks5Required = this.setRulesBurn(this.pass5);
+          remarks6Required = this.setRulesBurn(this.pass6);
+          remarks7Required = this.setRulesBurn(this.pass7);
+          remarks8Required = this.setRulesBurn(this.pass8);
+        }
+        this.rules = {
+          remarks1: [{ required: remarks1Required, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: remarks2Required, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: remarks3Required, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: remarks4Required, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: remarks5Required, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: remarks6Required, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: remarks7Required, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: remarks8Required, message: "备注不能为空", trigger: "blur" }],
+        };
         this.form.pass1 = this.pass1.join(",");
         this.form.pass2 = this.pass2.join(",");
         this.form.pass3 = this.pass3.join(",");
@@ -1398,14 +1512,6 @@
         this.form.pass6 = this.pass6.join(",");
         this.form.pass7 = this.pass7.join(",");
         this.form.pass8 = this.pass8.join(",");
-        this.form.pass9 = this.pass9.join(",");
-        this.form.pass10 = this.pass10.join(",");
-        this.form.pass11 = this.pass11.join(",");
-        this.form.pass12 = this.pass12.join(",");
-        this.form.pass13 = this.pass13.join(",");
-        this.form.pass14 = this.pass14.join(",");
-        this.form.pass15 = this.pass15.join(",");
-        this.form.pass16 = this.pass16.join(",");
         this.form.recordTime = this.recordTimeYmd + " " + this.recordTimeHms;
         this.$refs["form"].validate(valid => {
           if (valid) {

+ 120 - 14
ui/src/views/production/pressure/h117.vue

@@ -251,7 +251,6 @@
         <el-form-item label="归属部门" prop="deptId">
           <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
         </el-form-item>
-      </el-form>
       <el-descriptions title="PASS1出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1213H">
@@ -263,6 +262,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks1">
+          <el-input v-model="form.remarks1" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS2出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1223H">
@@ -274,6 +276,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks2">
+          <el-input v-model="form.remarks2" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS3出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1233H">
@@ -285,6 +290,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks3">
+          <el-input v-model="form.remarks3" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS4出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1243H">
@@ -296,6 +304,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks4">
+          <el-input v-model="form.remarks4" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS5出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1253H">
@@ -307,6 +318,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks5">
+          <el-input v-model="form.remarks5" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS6出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1263H">
@@ -318,6 +332,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks6">
+          <el-input v-model="form.remarks6" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS7出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1273H">
@@ -329,6 +346,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks7">
+          <el-input v-model="form.remarks7" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS8出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1283H">
@@ -339,7 +359,11 @@
           <el-input v-model="pass8[index]"/>
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
-      </el-descriptions>
+      </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks8">
+          <el-input v-model="form.remarks8" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -956,9 +980,14 @@
         pass16:[],
         // 表单校验
         rules: {
-          id: [
-            { required: true, message: "主键id不能为空", trigger: "blur" }
-          ],
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: true, message: "备注不能为空", trigger: "blur" }],
         },
         // 状态字典
         statusOptions: [],
@@ -1387,9 +1416,94 @@
           this.open = true;
           this.title = "修改裂解炉炉管测压";
         });
+      },// 运行状态校验规则
+      setRulesRun(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 10) {
+            if (pass[i] < 200 || pass[i] > 310) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 140 || pass[i] > 260) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 烧焦状态校验规则
+      setRulesBurn(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 10) {
+            if (pass[i] < 50 || pass[i] > 120) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 40 || pass[i] > 80) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 重置校验规则
+      resetRules() {
+        this.rules = {
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+        };
       },
       /** 提交按钮 */
-      submitForm() {
+      submitForm() {this.resetRules();
+        let remarks1Required = false;
+        let remarks2Required = false;
+        let remarks3Required = false;
+        let remarks4Required = false;
+        let remarks5Required = false;
+        let remarks6Required = false;
+        let remarks7Required = false;
+        let remarks8Required = false;
+        if (this.form.status === '0') {//运行
+          remarks1Required = this.setRulesRun(this.pass1);
+          remarks2Required = this.setRulesRun(this.pass2);
+          remarks3Required = this.setRulesRun(this.pass3);
+          remarks4Required = this.setRulesRun(this.pass4);
+          remarks5Required = this.setRulesRun(this.pass5);
+          remarks6Required = this.setRulesRun(this.pass6);
+          remarks7Required = this.setRulesRun(this.pass7);
+          remarks8Required = this.setRulesRun(this.pass8);
+        } else if (this.form.status === '2') {//烧焦
+          remarks1Required = this.setRulesBurn(this.pass1);
+          remarks2Required = this.setRulesBurn(this.pass2);
+          remarks3Required = this.setRulesBurn(this.pass3);
+          remarks4Required = this.setRulesBurn(this.pass4);
+          remarks5Required = this.setRulesBurn(this.pass5);
+          remarks6Required = this.setRulesBurn(this.pass6);
+          remarks7Required = this.setRulesBurn(this.pass7);
+          remarks8Required = this.setRulesBurn(this.pass8);
+        }
+        this.rules = {
+          remarks1: [{ required: remarks1Required, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: remarks2Required, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: remarks3Required, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: remarks4Required, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: remarks5Required, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: remarks6Required, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: remarks7Required, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: remarks8Required, message: "备注不能为空", trigger: "blur" }],
+        };
         this.form.pass1 = this.pass1.join(",");
         this.form.pass2 = this.pass2.join(",");
         this.form.pass3 = this.pass3.join(",");
@@ -1398,14 +1512,6 @@
         this.form.pass6 = this.pass6.join(",");
         this.form.pass7 = this.pass7.join(",");
         this.form.pass8 = this.pass8.join(",");
-        this.form.pass9 = this.pass9.join(",");
-        this.form.pass10 = this.pass10.join(",");
-        this.form.pass11 = this.pass11.join(",");
-        this.form.pass12 = this.pass12.join(",");
-        this.form.pass13 = this.pass13.join(",");
-        this.form.pass14 = this.pass14.join(",");
-        this.form.pass15 = this.pass15.join(",");
-        this.form.pass16 = this.pass16.join(",");
         this.form.recordTime = this.recordTimeYmd + " " + this.recordTimeHms;
         this.$refs["form"].validate(valid => {
           if (valid) {

+ 120 - 14
ui/src/views/production/pressure/h118.vue

@@ -251,7 +251,6 @@
         <el-form-item label="归属部门" prop="deptId">
           <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
         </el-form-item>
-      </el-form>
       <el-descriptions title="PASS1出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1213I">
@@ -263,6 +262,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks1">
+          <el-input v-model="form.remarks1" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS2出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1223I">
@@ -274,6 +276,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks2">
+          <el-input v-model="form.remarks2" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS3出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1233I">
@@ -285,6 +290,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks3">
+          <el-input v-model="form.remarks3" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS4出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1243I">
@@ -296,6 +304,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks4">
+          <el-input v-model="form.remarks4" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS5出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1253I">
@@ -307,6 +318,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks5">
+          <el-input v-model="form.remarks5" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS6出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1263I">
@@ -318,6 +332,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks6">
+          <el-input v-model="form.remarks6" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS7出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1273I">
@@ -329,6 +346,9 @@
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks7">
+          <el-input v-model="form.remarks7" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS8出口" direction="vertical" :column="6" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1283I">
@@ -339,7 +359,11 @@
           <el-input v-model="pass8[index]"/>
         </el-descriptions-item>
         <el-descriptions-item label=""></el-descriptions-item>
-      </el-descriptions>
+      </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks8">
+          <el-input v-model="form.remarks8" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -956,9 +980,14 @@
         pass16:[],
         // 表单校验
         rules: {
-          id: [
-            { required: true, message: "主键id不能为空", trigger: "blur" }
-          ],
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: true, message: "备注不能为空", trigger: "blur" }],
         },
         // 状态字典
         statusOptions: [],
@@ -1387,9 +1416,94 @@
           this.open = true;
           this.title = "修改裂解炉炉管测压";
         });
+      },// 运行状态校验规则
+      setRulesRun(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 10) {
+            if (pass[i] < 200 || pass[i] > 310) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 140 || pass[i] > 260) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 烧焦状态校验规则
+      setRulesBurn(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 10) {
+            if (pass[i] < 50 || pass[i] > 120) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 40 || pass[i] > 80) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 重置校验规则
+      resetRules() {
+        this.rules = {
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+        };
       },
       /** 提交按钮 */
-      submitForm() {
+      submitForm() {this.resetRules();
+        let remarks1Required = false;
+        let remarks2Required = false;
+        let remarks3Required = false;
+        let remarks4Required = false;
+        let remarks5Required = false;
+        let remarks6Required = false;
+        let remarks7Required = false;
+        let remarks8Required = false;
+        if (this.form.status === '0') {//运行
+          remarks1Required = this.setRulesRun(this.pass1);
+          remarks2Required = this.setRulesRun(this.pass2);
+          remarks3Required = this.setRulesRun(this.pass3);
+          remarks4Required = this.setRulesRun(this.pass4);
+          remarks5Required = this.setRulesRun(this.pass5);
+          remarks6Required = this.setRulesRun(this.pass6);
+          remarks7Required = this.setRulesRun(this.pass7);
+          remarks8Required = this.setRulesRun(this.pass8);
+        } else if (this.form.status === '2') {//烧焦
+          remarks1Required = this.setRulesBurn(this.pass1);
+          remarks2Required = this.setRulesBurn(this.pass2);
+          remarks3Required = this.setRulesBurn(this.pass3);
+          remarks4Required = this.setRulesBurn(this.pass4);
+          remarks5Required = this.setRulesBurn(this.pass5);
+          remarks6Required = this.setRulesBurn(this.pass6);
+          remarks7Required = this.setRulesBurn(this.pass7);
+          remarks8Required = this.setRulesBurn(this.pass8);
+        }
+        this.rules = {
+          remarks1: [{ required: remarks1Required, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: remarks2Required, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: remarks3Required, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: remarks4Required, message: "备注不能为空", trigger: "blur" }],
+          remarks5: [{ required: remarks5Required, message: "备注不能为空", trigger: "blur" }],
+          remarks6: [{ required: remarks6Required, message: "备注不能为空", trigger: "blur" }],
+          remarks7: [{ required: remarks7Required, message: "备注不能为空", trigger: "blur" }],
+          remarks8: [{ required: remarks8Required, message: "备注不能为空", trigger: "blur" }],
+        };
         this.form.pass1 = this.pass1.join(",");
         this.form.pass2 = this.pass2.join(",");
         this.form.pass3 = this.pass3.join(",");
@@ -1398,14 +1512,6 @@
         this.form.pass6 = this.pass6.join(",");
         this.form.pass7 = this.pass7.join(",");
         this.form.pass8 = this.pass8.join(",");
-        this.form.pass9 = this.pass9.join(",");
-        this.form.pass10 = this.pass10.join(",");
-        this.form.pass11 = this.pass11.join(",");
-        this.form.pass12 = this.pass12.join(",");
-        this.form.pass13 = this.pass13.join(",");
-        this.form.pass14 = this.pass14.join(",");
-        this.form.pass15 = this.pass15.join(",");
-        this.form.pass16 = this.pass16.join(",");
         this.form.recordTime = this.recordTimeYmd + " " + this.recordTimeHms;
         this.$refs["form"].validate(valid => {
           if (valid) {

+ 84 - 22
ui/src/views/production/pressure/h130.vue

@@ -315,7 +315,6 @@
         <el-form-item label="归属部门" prop="deptId">
           <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
         </el-form-item>
-      </el-form>
       <el-descriptions title="PASS1出口" direction="vertical" :column="4" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1710A">
@@ -348,6 +347,9 @@
         <el-descriptions-item label="">
         </el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks1">
+          <el-input v-model="form.remarks1" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS2出口" direction="vertical" :column="4" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1720A">
@@ -380,6 +382,9 @@
         <el-descriptions-item label="">
         </el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks2">
+          <el-input v-model="form.remarks2" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS3出口" direction="vertical" :column="4" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1730A">
@@ -412,6 +417,9 @@
         <el-descriptions-item label="">
         </el-descriptions-item>
       </el-descriptions><br/>
+        <el-form-item label="备注" prop="remarks3">
+          <el-input v-model="form.remarks3" placeholder="请输入备注" />
+        </el-form-item>
       <el-descriptions title="PASS4出口" direction="vertical" :column="4" border>
         <!--<el-descriptions-item label="入口">-->
         <el-descriptions-item label="PG1740A">
@@ -442,8 +450,12 @@
           <el-input v-model="pass4[5]"/>
         </el-descriptions-item>
         <el-descriptions-item label="">
-        </el-descriptions-item>
+        </el-descriptions-item><br/>
+        <el-form-item label="备注" prop="remarks4">
+          <el-input v-model="form.remarks4" placeholder="请输入备注" />
+        </el-form-item>
       </el-descriptions>
+      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -833,9 +845,10 @@
         pass16:[],
         // 表单校验
         rules: {
-          id: [
-            { required: true, message: "主键id不能为空", trigger: "blur" }
-          ],
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
         },
         // 状态字典
         statusOptions: [],
@@ -1201,32 +1214,81 @@
           if (response.data.pass2 == null) { this.pass2 = []; } else { this.pass2 = response.data.pass2.split(','); }
           if (response.data.pass3 == null) { this.pass3 = []; } else { this.pass3 = response.data.pass3.split(','); }
           if (response.data.pass4 == null) { this.pass4 = []; } else { this.pass4 = response.data.pass4.split(','); }
-          if (response.data.pass5 == null) { this.pass5 = []; } else { this.pass5 = response.data.pass5.split(','); }
-          if (response.data.pass6 == null) { this.pass6 = []; } else { this.pass6 = response.data.pass6.split(','); }
-          if (response.data.pass7 == null) { this.pass7 = []; } else { this.pass7 = response.data.pass7.split(','); }
-          if (response.data.pass8 == null) { this.pass8 = []; } else { this.pass8 = response.data.pass8.split(','); }
           this.open = true;
           this.title = "修改裂解炉炉管测压";
         });
+      },// 运行状态校验规则
+      setRulesRun(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 6) {
+            if (pass[i] < 250 || pass[i] > 350) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 160 || pass[i] > 300) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 烧焦状态校验规则
+      setRulesBurn(pass) {
+        let flag = false;
+        for (let i = 0; i < pass.length; i++) {
+          if (i == 6) {
+            if (pass[i] < 50 || pass[i] > 120) {
+              flag = true;
+              break;
+            }
+          } else {
+            if (pass[i] < 40 || pass[i] > 80) {
+              flag = true;
+              break;
+            }
+          }
+        }
+        return flag;
+      },
+      // 重置校验规则
+      resetRules() {
+        this.rules = {
+          remarks1: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+        };
       },
       /** 提交按钮 */
-      submitForm() {
+      submitForm() {this.resetRules();
+        let remarks1Required = false;
+        let remarks2Required = false;
+        let remarks3Required = false;
+        let remarks4Required = false;
+        if (this.form.status === '0') {//运行
+          remarks1Required = this.setRulesRun(this.pass1);
+          remarks2Required = this.setRulesRun(this.pass2);
+          remarks3Required = this.setRulesRun(this.pass3);
+          remarks4Required = this.setRulesRun(this.pass4);
+        } else if (this.form.status === '2') {//烧焦
+          remarks1Required = this.setRulesBurn(this.pass1);
+          remarks2Required = this.setRulesBurn(this.pass2);
+          remarks3Required = this.setRulesBurn(this.pass3);
+          remarks4Required = this.setRulesBurn(this.pass4);
+        }
+        this.rules = {
+          remarks1: [{ required: remarks1Required, message: "备注不能为空", trigger: "blur" }],
+          remarks2: [{ required: remarks2Required, message: "备注不能为空", trigger: "blur" }],
+          remarks3: [{ required: remarks3Required, message: "备注不能为空", trigger: "blur" }],
+          remarks4: [{ required: remarks4Required, message: "备注不能为空", trigger: "blur" }],
+        };
         this.form.pass1 = this.pass1.join(",");
         this.form.pass2 = this.pass2.join(",");
         this.form.pass3 = this.pass3.join(",");
         this.form.pass4 = this.pass4.join(",");
-        this.form.pass5 = this.pass5.join(",");
-        this.form.pass6 = this.pass6.join(",");
-        this.form.pass7 = this.pass7.join(",");
-        this.form.pass8 = this.pass8.join(",");
-        this.form.pass9 = this.pass9.join(",");
-        this.form.pass10 = this.pass10.join(",");
-        this.form.pass11 = this.pass11.join(",");
-        this.form.pass12 = this.pass12.join(",");
-        this.form.pass13 = this.pass13.join(",");
-        this.form.pass14 = this.pass14.join(",");
-        this.form.pass15 = this.pass15.join(",");
-        this.form.pass16 = this.pass16.join(",");
         this.form.recordTime = this.recordTimeYmd + " " + this.recordTimeHms;
         this.$refs["form"].validate(valid => {
           if (valid) {