新增联锁规则

src/views/module_interLock/InterlockSummary/modules/InterlockConditionForm.vue

@@ -130,45 +130,22 @@
               </a-form-model-item>
             </a-col>
             <a-col :span="24">
-              <a-form-model-item label="突变判断公式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upperLimit">
-                （ <a-auto-complete :data-source="['4095', '59577']" v-model="model.upperLimit" placeholder="请输入高限" style="width: 29%;"></a-auto-complete>
-                -
-                <a-auto-complete :data-source="['819', '11915']" v-model="model.lowerLimit" placeholder="请输入低限" style="width: 29%;"></a-auto-complete> ）* 
-                <a-auto-complete :data-source="['1']" v-model="model.thresholdValueN" placeholder="请输入阈值" style="width: 25%;"></a-auto-complete>
-                %
-                <!-- <a-input-group compact>
-                  <a-select default-value="TRICON" @change="changeTbcxDefaultType">
-                    <a-select-option value="TRICON">
-                      TRICON
-                    </a-select-option>
-                    <a-select-option value="TSXPLUS">
-                      TSXPLUS
-                    </a-select-option>
-                  </a-select>
-                  <a-input
-                    style=" width: 30px; border-right: 0; pointer-events: none; backgroundColor: #fff"
-                    placeholder="("
-                    disabled
-                  />
-                  <a-input v-model="model.upperLimit" placeholder="请输入高限" style="width: 20%;border-left: 0;"></a-input>
-                  <a-input
-                    style=" width: 30px; border-left: 0; pointer-events: none; backgroundColor: #fff"
-                    placeholder="-"
-                    disabled
-                  />
-                  <a-input v-model="model.lowerLimit" placeholder="请输入低限" style="width: 20%;border-left: 0;"></a-input>
-                  <a-input
-                    style=" width: 50px; border-left: 0; pointer-events: none; backgroundColor: #fff"
-                    placeholder=") * "
-                    disabled
-                  />
-                  <a-input v-model="model.thresholdValueN" placeholder="请输入阈值" style="width: 15%;border-left: 0;"></a-input>
-                  <a-input
-                    style=" width: 40px; border-left: 0; pointer-events: none; backgroundColor: #fff"
-                    placeholder="% "
-                    disabled
-                  />
-                </a-input-group> -->
+              <a-form-model-item label="突变判断公式" :labelCol="labelCol" :wrapperCol="wrapperCol"  required style="margin-bottom: 0;">
+                <div style="display: flex;">
+                  <div style="width: 30px;text-align: center;">( </div>
+                  <a-form-model-item prop="upperLimit">
+                    <a-auto-complete :data-source="['4095', '59577']" v-model="model.upperLimit" placeholder="请输入高限"></a-auto-complete>
+                  </a-form-model-item>
+                  <div style="width: 30px;text-align: center;"> - </div>
+                  <a-form-model-item prop="lowerLimit">
+                    <a-auto-complete :data-source="['819', '11915']" v-model="model.lowerLimit" placeholder="请输入低限"></a-auto-complete>
+                  </a-form-model-item>
+                  <div style="width: 60px;text-align: center;">）* </div>
+                  <a-form-model-item prop="thresholdValueN">
+                    <a-auto-complete :data-source="['1']" v-model="model.thresholdValueN" placeholder="请输入阈值"></a-auto-complete>
+                  </a-form-model-item>
+                  <div style="width: 30px;text-align: center;"> % </div>
+                </div>
               </a-form-model-item>
             </a-col>
             <!-- <a-col :span="24">
@@ -181,18 +158,18 @@
                 <a-input v-model="model.lowerLimit" placeholder="请输入低限"></a-input>
               </a-form-model-item>
             </a-col> -->
-            <a-col :span="24">
-              <a-form-model-item label="突变判断时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="thresholdTime">
-                <a-input v-model="model.thresholdTime" suffix="S" placeholder="请输入时间"></a-input>
-                <!-- suffix="S" -->
-              </a-form-model-item>
-            </a-col>
             <!-- <a-col :span="24"> -->
               <!-- <a-form-model-item label="阈值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="thresholdValueN">
                 <a-input v-model="model.thresholdValueN" suffix="%" placeholder="请输入阈值"></a-input> -->
                 <!-- addon-after="%" -->
               <!-- </a-form-model-item> -->
             <!-- </a-col> -->
+            <a-col :span="24">
+              <a-form-model-item label="突变判断时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="thresholdTime">
+                <a-input v-model="model.thresholdTime" suffix="S" placeholder="请输入时间"></a-input>
+                <!-- suffix="S" -->
+              </a-form-model-item>
+            </a-col>
           </template>
           <a-col :span="24">
             <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
@@ -264,7 +241,7 @@
           bypassNo: '0',
           upperLimit: null,
           lowerLimit: null,
-          thresholdTime: null,
+          thresholdValueN: null,
         },
         labelCol: {
           xs: { span: 24 },
@@ -296,6 +273,12 @@
             required: true, message: '请输入低限值!',
           }],
           // 突变超限
+          tbGongshi: [
+            // { required: true, message: '', },
+            { required: true, message: '请输入高限值!', },
+            { required: true, message: '请输入低限值!', },
+            { required: true, message: '请输入阈值!', },
+          ],
           thresholdTime: [{
             required: true, message: '请输入时间!',
           }],
@@ -333,11 +316,6 @@
           mpStatusData: [{
             required: true, message: '请选择MP状态位号!',
           }],
-          // interlockConditionData:{
-          //   rules: [{
-          //     required: true, message: '请选择!',
-          //   }],
-          // },
         },
         url: {
           interLockSelect: '/sys/dict/loadTreeData',