新增联锁需求修改（一部分）

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

@@ -106,6 +106,15 @@
               </a-form-model-item>
             </a-col>
             <a-col :span="24">
+              <a-form-model-item label="可参考默认值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="defaultValueType">
+                <a-radio-group name="radioGroup" v-model="model.defaultValueType" @change="changeGdxDefaultType">
+                  <!--  :default-value="model.ifBypass" -->
+                  <a-radio :value="'TRICON'"> TRICON </a-radio>
+                  <a-radio :value="'TSXPLUS'"> TSXPLUS </a-radio>
+                </a-radio-group>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="24">
               <a-form-model-item label="高限值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upperLimit">
                 <a-input v-model="model.upperLimit" placeholder="请输入高限"></a-input>
               </a-form-model-item>
@@ -130,17 +139,45 @@
               </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 label="可参考默认值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="defaultValueType">
+                <a-radio-group name="radioGroup" v-model="model.defaultValueType" @change="changeTbcxDefaultType">
+                  <!--  :default-value="model.ifBypass" -->
+                  <a-radio :value="'TRICON'"> TRICON </a-radio>
+                  <a-radio :value="'TSXPLUS'"> TSXPLUS </a-radio>
+                </a-radio-group>
               </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 label="突变判断公式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upperLimit">
+                （ <a-input v-model="model.upperLimit" placeholder="请输入高限" style="width: 29%;"></a-input>
+                -
+                <a-input v-model="model.lowerLimit" placeholder="请输入低限" style="width: 29%;"></a-input> ）* 
+                <a-input v-model="model.thresholdValueN" placeholder="请输入阈值" style="width: 25%;"></a-input>
+                %
+              </a-form-model-item>
+            </a-col>
+            <!-- <a-col :span="24">
+              <a-form-model-item label="高限值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="upperLimit">
+                <a-input v-model="model.upperLimit" placeholder="请输入高限"></a-input>
+            </a-form-model-item>
+            </a-col>
+            <a-col :span="24">
+              <a-form-model-item label="低限值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lowerLimit">
+                <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> -->
           </template>
           <a-col :span="24">
             <a-form-model-item label="描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description">
@@ -152,7 +189,7 @@
           <!-- 是否旁路 -->
           <a-divider orientation="left"> <span style="font-size: 12px;">旁路状态</span> </a-divider>
           <a-col :span="24">
-            <a-form-model-item label="是否旁路" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ifBypass">
+            <a-form-model-item label="是否有旁路位号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ifBypass">
               <a-radio-group name="radioGroup" v-model="model.ifBypass">
                 <!--  :default-value="model.ifBypass" -->
                 <a-radio :value="'1'"> 是 </a-radio>
@@ -176,8 +213,12 @@
           <template v-if="model.ifBypass === '0'">
             <a-col :span="24">
               <a-form-model-item label="旁路状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bypassNo">
-                <a-input v-model="model.bypassNo"></a-input>
+                <!-- <a-input v-model="model.bypassNo"></a-input> -->
                 <!-- placeholder="无旁路" :default-value="bypassNo" -->
+                <a-select v-model="model.bypassNo">
+                  <a-select-option value="0"> 0 </a-select-option>
+                  <a-select-option value="1"> 1 </a-select-option>
+                </a-select>
               </a-form-model-item>
             </a-col>
           </template>
@@ -205,7 +246,7 @@
         model:{
           instrumentStatusJuge: '0',
           ifBypass: '1',
-          bypassNo: '无旁路',
+          bypassNo: '0',
         },
         labelCol: {
           xs: { span: 24 },
@@ -260,7 +301,7 @@
             required: true, message: '请选择旁路位号!',
           }],
           bypassNo: [{
-            required: true, message: '请输入旁路状态!',
+            required: true, message: '请选择旁路状态!',
           }],
           inputStatusData: [{
             required: true, message: '请选择!',
@@ -320,6 +361,31 @@
       instrumentStatusJugeChange(e){
         console.log(e)
       },
+      // 默认值选择改变时
+      changeGdxDefaultType(e){
+        console.log(e.target.value)
+        if(e.target.value === 'TRICON'){
+          this.model.upperLimit = 4258
+          this.model.lowerLimit = 737
+        }
+        if(e.target.value === 'TSXPLUS'){
+          this.model.upperLimit = 61948
+          this.model.lowerLimit = 10722
+        }
+      },
+      changeTbcxDefaultType(e){
+        console.log(e.target.value)
+        if(e.target.value === 'TRICON'){
+          this.model.upperLimit = 4095
+          this.model.lowerLimit = 819
+          this.model.thresholdValueN = 1
+        }
+        if(e.target.value === 'TSXPLUS'){
+          this.model.upperLimit = 59577
+          this.model.lowerLimit = 11915
+          this.model.thresholdValueN = 1
+        }
+      },
       add () {  
         // this.edit(this.modelDefault);
       },
@@ -349,7 +415,7 @@
           this.model.bypassNo = record.bypass
         }
         if(record.ifBypass === '1'){
-          this.model.bypassNo = '无旁路'
+          this.model.bypassNo = '0'
           this.model.bypassData = [record.bypassDeviceId, record.bypassModuleName, record.bypassTag+'&'+record.bypass]
         }
         // 输入卡件状态

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

@@ -50,7 +50,8 @@
           <a-row>
             <a-col :span="12">
               <a-form-model-item label="逻辑关系" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ljgx">
-                <a-input v-model="model.ljgx" placeholder="请输入逻辑关系"></a-input>
+                <!-- <a-input v-model="model.ljgx" placeholder="请输入逻辑关系"></a-input> -->
+                <j-dict-select-tag v-model="model.ljgx"  placeholder="请选择操作类型" dictCode="ljgx"/>
               </a-form-model-item>
             </a-col>
           </a-row>