opc优化

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

@@ -213,6 +213,88 @@
               v-decorator="['result', {rules: [{required: false, message: '实时数值不能为空'}]}]"/>
           </a-form-item>
         </row-item>-->
+        <row-item>
+
+          <a-form-item
+            label="x轴位置"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input
+              v-decorator="['imgXposition', {initialValue:50, rules: [{required: true, message: '图片x轴位置不能为空'}]}]"/>
+          </a-form-item>
+        </row-item>
+        <row-item>
+
+          <a-form-item
+            label="y轴位置"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input
+              v-decorator="['imgYposition', {initialValue:50, rules: [{required: true, message: '图片y轴位置不能为空'}]}]"/>
+          </a-form-item>
+        </row-item>
+        <row-item>
+
+          <a-form-item
+            label="最低阈值"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input-number
+              style="width: 100%"
+              :min="0.01"
+              :formatter="BaseTool.Amount.formatter"
+              :parser="BaseTool.Amount.parser"
+              v-decorator="['warnFirst', {initialValue:100,rules: [{required: false, message: '最低阈值不能为空'}]}]"/>
+          </a-form-item>
+        </row-item>
+        <row-item>
+
+          <a-form-item
+            label="低阈值"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input-number
+              style="width: 100%"
+              :min="0.01"
+              :formatter="BaseTool.Amount.formatter"
+              :parser="BaseTool.Amount.parser"
+              v-decorator="['warnSecond', {initialValue:0,rules: [{required: false, message: '低阈值不能为空'}]}]"/>
+          </a-form-item>
+        </row-item>
+        <row-item>
+
+          <a-form-item
+            label="高阈值"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input-number
+              style="width: 100%"
+              :min="0.01"
+              :formatter="BaseTool.Amount.formatter"
+              :parser="BaseTool.Amount.parser"
+              v-decorator="['warnThird', {initialValue:100,rules: [{required: false, message: '高阈值不能为空'}]}]"/>
+          </a-form-item>
+        </row-item>
+        <row-item>
+
+          <a-form-item
+            label="最高阈值"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input-number
+              style="width: 100%"
+              :min="0.01"
+              :formatter="BaseTool.Amount.formatter"
+              :parser="BaseTool.Amount.parser"
+              v-decorator="['warnFour', {initialValue:0,rules: [{required: false, message: '最高阈值不能为空'}]}]"/>
+          </a-form-item>
+        </row-item>
         <row-item>
 
           <a-form-item
@@ -357,6 +439,8 @@ export default {
           'high',
           'xposition',
           'yposition',
+          'imgXPosition',
+          'imgYPosition',
           'width',
           'height',
           'unit',

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

@@ -29,10 +29,16 @@
       <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.warnSecond }}</detail-list-item>
+      <detail-list-item term="高阈值">{{ model.warnThird }}</detail-list-item>
+      <detail-list-item term="最高阈值">{{ model.warnFour }}</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>
       <detail-list-item term="y轴位置">{{ model.yPosition }}</detail-list-item>
+      <detail-list-item term="图片x轴位置">{{ model.imgXPosition }}</detail-list-item>
+      <detail-list-item term="图片y轴位置">{{ model.imgYPosition }}</detail-list-item>
       <detail-list-item term="位置宽度">{{ model.width }}</detail-list-item>
       <detail-list-item term="位置高度">{{ model.height }}</detail-list-item>
       <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
@@ -74,6 +80,8 @@ export default {
         'ratio': null,
         'xPosition': null,
         'yPosition': null,
+        'imgXPosition': null,
+        'imgYPosition': null,
         'width': null,
         'height': null,
         'low': null,