完善液位高度和宽度

src/utils/dict.js

@@ -170,6 +170,7 @@ DictCache.TYPE = {
   REMOTE_MEASURE: 'REMOTE_MEASURE', // 设备遥测
   REMOTE_DEGREE: 'REMOTE_DEGREE', // 设备电度
   REMOTE_OPC: 'REMOTE_OPC', // OPC
+  REMOTE_OPC_IMG_POSITION: 'REMOTE_OPC_IMG_POSITION', // 图片方向
   FILL_GATHER_TASK_STATUS: 'FILL_GATHER_TASK_STATUS', // 巡检任务状态
   FILL_UPDATE_TYPE: 'FILL_UPDATE_TYPE', // 巡检操作类型
   /* 审批单 */

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

@@ -280,6 +280,22 @@
               v-decorator="['imgWidth', {initialValue:100, rules: [{required: true, message: '图片宽度不能为空'}]}]"/>
           </a-form-item>
         </row-item>
+        <row-item>
+          <a-form-item
+            label="图片方向"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select v-decorator="['imgPosition', {initialValue:1, rules: [{required: false, message: '图片方向不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="(label,value) in positionMap"
+                :key="value"
+                :label="label"
+                :value="parseInt(value)">{{ label }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </row-item>
         <row-item>
 
           <a-form-item
@@ -453,6 +469,7 @@ export default {
       map: {},
       treeData: [],
       yesNoMap: {},
+      positionMap: {},
       form: this.$form.createForm(this),
       visible: false,
       type: 1,
@@ -472,6 +489,7 @@ export default {
     // 下拉框map
     this.map = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REMOTE_OPC)
     this.yesNoMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
+    this.positionMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REMOTE_OPC_IMG_POSITION)
     getSbPositionTree({ opcFlag: 1 }).then(res => {
       this.treeData = res.data
     })
@@ -559,6 +577,7 @@ export default {
           'yposition',
           'imgXPosition',
           'imgYPosition',
+          'imgPosition',
           'width',
           'height',
           'unit',

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

@@ -41,12 +41,13 @@
       <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="位置宽度">{{ model.width }}</detail-list-item>
+      <detail-list-item term="位置高度">{{ model.height }}</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.imgHeight}}</detail-list-item>
+      <detail-list-item term="图片高度">{{ model.imgHeight }}</detail-list-item>
       <detail-list-item term="图片宽度">{{ model.imgWidth }}</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="图片方向">{{ BaseTool.Object.getField(positionMap,model.imgPosition) }}</detail-list-item>
       <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
       <detail-list-item term="创建人">{{ model.createdUserId }}</detail-list-item>
       <detail-list-item term="更新人">{{ model.updateUserId }}</detail-list-item>
@@ -71,6 +72,7 @@ export default {
       mdl: {},
       map: {},
       yesNoMap: {},
+      positionMap: {},
       modalTitle: null,
       visible: false,
       // 下拉框map
@@ -98,6 +100,7 @@ export default {
         'imgYPosition': null,
         'imgHeight': null,
         'imgWidth': null,
+        'imgPosition': null,
         'width': null,
         'height': null,
         'low': null,
@@ -119,6 +122,7 @@ export default {
     // 下拉框map
     this.map = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REMOTE_OPC)
     this.yesNoMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
+    this.positionMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REMOTE_OPC_IMG_POSITION)
   },
   methods: {
     base (record) {