完善opc

src/views/remote/opc/modules/BaseForm.vue

@@ -256,10 +256,11 @@
               v-decorator="['high', {initialValue:100,rules: [{required: false, message: '量程上限不能为空'}]}]"/>
           </a-form-item>
         </row-item>
+
         <row-item>
 
           <a-form-item
-            label="最低阈值"
+            label="报警高高限"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
@@ -268,8 +269,8 @@
               :min="0.01"
               :formatter="BaseTool.Amount.formatter"
               :parser="BaseTool.Amount.parser"
-              v-decorator="['warnFirst', {rules: [{required: false, message: '最低阈值不能为空'}]}]"/>
-            <a-tag style="line-height:30px;margin-left: 10px;" :color="colors.warnFirstColor" @click="handleSelectColor('warnFirstColor')">
+              v-decorator="['warnFour', {rules: [{required: false, message: '高高限不能为空'}]}]"/>
+            <a-tag style="line-height:30px;margin-left: 10px;" :color="colors.warnFourColor" @click="handleSelectColor('warnFourColor')">
               选择颜色
             </a-tag>
           </a-form-item>
@@ -277,7 +278,7 @@
         <row-item>
 
           <a-form-item
-            label="低阈值"
+            label="报警高限值"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
@@ -286,8 +287,8 @@
               :min="0.01"
               :formatter="BaseTool.Amount.formatter"
               :parser="BaseTool.Amount.parser"
-              v-decorator="['warnSecond', {rules: [{required: false, message: '低阈值不能为空'}]}]"/>
-            <a-tag style="line-height:30px;margin-left: 10px;" :color="colors.warnSecondColor" @click="handleSelectColor('warnSecondColor')">
+              v-decorator="['warnThird', {rules: [{required: false, message: '高限不能为空'}]}]"/>
+            <a-tag style="line-height:30px;margin-left: 10px;" :color="colors.warnThirdColor" @click="handleSelectColor('warnThirdColor')">
               选择颜色
             </a-tag>
           </a-form-item>
@@ -295,7 +296,7 @@
         <row-item>
 
           <a-form-item
-            label="高阈值"
+            label="报警低限"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
@@ -304,8 +305,8 @@
               :min="0.01"
               :formatter="BaseTool.Amount.formatter"
               :parser="BaseTool.Amount.parser"
-              v-decorator="['warnThird', {rules: [{required: false, message: '高阈值不能为空'}]}]"/>
-            <a-tag style="line-height:30px;margin-left: 10px;" :color="colors.warnThirdColor" @click="handleSelectColor('warnThirdColor')">
+              v-decorator="['warnSecond', {rules: [{required: false, message: '低限不能为空'}]}]"/>
+            <a-tag style="line-height:30px;margin-left: 10px;" :color="colors.warnSecondColor" @click="handleSelectColor('warnSecondColor')">
               选择颜色
             </a-tag>
           </a-form-item>
@@ -313,7 +314,7 @@
         <row-item>
 
           <a-form-item
-            label="最高阈值"
+            label="报警低低限"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
@@ -322,12 +323,13 @@
               :min="0.01"
               :formatter="BaseTool.Amount.formatter"
               :parser="BaseTool.Amount.parser"
-              v-decorator="['warnFour', {rules: [{required: false, message: '最高阈值不能为空'}]}]"/>
-            <a-tag style="line-height:30px;margin-left: 10px;" :color="colors.warnFourColor" @click="handleSelectColor('warnFourColor')">
+              v-decorator="['warnFirst', {rules: [{required: false, message: '低低限不能为空'}]}]"/>
+            <a-tag style="line-height:30px;margin-left: 10px;" :color="colors.warnFirstColor" @click="handleSelectColor('warnFirstColor')">
               选择颜色
             </a-tag>
           </a-form-item>
         </row-item>
+
         <row-item>
 
           <a-form-item

src/views/remote/opc/modules/Detail.vue

@@ -29,14 +29,14 @@
       <detail-list-item term="实时数值">{{ model.result }}</detail-list-item>
       <detail-list-item term="量程下限">{{ model.low }}</detail-list-item>
       <detail-list-item term="量程上限">{{ model.high }}</detail-list-item>
-      <detail-list-item term="最低阈值">{{ model.warnFirst }}</detail-list-item>
-      <detail-list-item term="最低阈值颜色">{{ model.warnFirstColor }}</detail-list-item>
-      <detail-list-item term="低阈值">{{ model.warnSecond }}</detail-list-item>
-      <detail-list-item term="低阈值颜色">{{ model.warnSecondColor }}</detail-list-item>
-      <detail-list-item term="高阈值">{{ model.warnThird }}</detail-list-item>
-      <detail-list-item term="高阈值颜色">{{ model.warnThirdColor }}</detail-list-item>
-      <detail-list-item term="最高阈值">{{ model.warnFour }}</detail-list-item>
-      <detail-list-item term="最高阈值颜色">{{ model.warnFourColor }}</detail-list-item>
+      <detail-list-item term="低低限">{{ model.warnFirst }}</detail-list-item>
+      <detail-list-item term="低低限颜色">{{ model.warnFirstColor }}</detail-list-item>
+      <detail-list-item term="低限">{{ model.warnSecond }}</detail-list-item>
+      <detail-list-item term="低限颜色">{{ model.warnSecondColor }}</detail-list-item>
+      <detail-list-item term="高限">{{ model.warnThird }}</detail-list-item>
+      <detail-list-item term="高限颜色">{{ model.warnThirdColor }}</detail-list-item>
+      <detail-list-item term="高高限">{{ model.warnFour }}</detail-list-item>
+      <detail-list-item term="高高限颜色">{{ model.warnFourColor }}</detail-list-item>
       <detail-list-item term="系数">{{ model.ratio }}</detail-list-item>
       <detail-list-item term="单位">{{ model.unit }}</detail-list-item>
       <detail-list-item term="x轴位置">{{ model.xPosition }}</detail-list-item>