Merge branch 'develop' of http://39.106.8.246:3003/web/persagy_topo_editer into develop

src/components/editview/rightPropertyBar/BaseEquipment.vue

@@ -133,9 +133,6 @@ export default {
     // 折叠信息点操作
     clips(item) {
       item.showChildren = !item.showChildren;
-      Object.assign(item,{
-        equipId:this.EquipData.attachObjectIds[0],
-      })
     },
     handleClick(tab, event) {
       // 设置高度
@@ -152,6 +149,10 @@ export default {
     // 切换选中选项
     changeCheck(item) {
       item.checked = !item.checked;
+      // 添加设备信息点
+      Object.assign(item, {
+        equipId: this.EquipData.attachObjectIds[0],
+      });
       bus.$emit("changeEquipMsgPoint", item);
     },
     // 搜索回车操作

src/components/editview/rightPropertyBar/BaseEquipmentMsg.vue

@@ -9,7 +9,7 @@
           :width="220"
           v-model="equipId"
           placeholder="请输入全局编码"
-          @input="boxInput"
+          @input="boxInput('equipId')"
           name="persager"
           disabled
           class="msg-input"
@@ -23,7 +23,7 @@
           v-model="msgId"
           disabled
           placeholder="请输入信息点编码"
-          @input="boxInput"
+          @input="boxInput('id')"
           name="persager"
           :title="msgId"
           class="msg-input"
@@ -33,9 +33,9 @@
         <div class="msg-name">信息点名称</div>
         <Input
           :width="220"
-          v-model="msgName"
+          v-model="name"
           placeholder="请输入信息点名称"
-          @input="boxInput"
+          @input="boxInput('name')"
           name="persager"
           class="msg-input"
         />
@@ -44,9 +44,9 @@
         <div class="msg-name">数据格式</div>
         <Input
           :width="220"
-          v-model="inputVal"
+          v-model="dataFormat"
           placeholder="请输入数据格式"
-          @input="boxInput"
+          @input="boxInput('dataFormat')"
           name="persager"
           class="msg-input"
         />
@@ -55,9 +55,9 @@
         <div class="msg-name">实时值</div>
         <Input
           :width="220"
-          v-model="inputVal"
+          v-model="currentData"
           placeholder="请输入实时值"
-          @input="boxInput"
+          @input="boxInput('currentData')"
           name="persager"
           class="msg-input"
         />
@@ -68,7 +68,7 @@
           :width="220"
           v-model="unit"
           placeholder="请输入单位"
-          @input="boxInput"
+          @input="boxInput('unit')"
           name="persager"
           class="msg-input"
         />
@@ -81,24 +81,36 @@ export default {
   props: ["EquipMsgData"],
   data() {
     return {
-      inputVal: "",
       equipId: "", //全局id
-      msgId: "", // 信息点id
-      msgName: "", //信息点名称
+      id: "", // 信息点id
+      name: "", //信息点名称
       unit: "", // 信息点的单位
+      dataFormat: "", //数据格式
+      currentData: "", //实时值
     };
   },
   mounted() {},
   methods: {
-    boxInput() {},
+    boxInput() {
+      const EquipMsgData = {
+        equipId: this.equipId,
+        id: this.id,
+        name: this.name,
+        unit: this.unit,
+        currentData: this.currentData,
+        dataFormat: this.dataFormat,
+      };
+      this.$emit("changeEquipMsgData", EquipMsgData);
+    },
   },
   watch: {
     EquipMsgData(val) {
-      // this.equipId = val.currentEquipMsg.attachObjectIds[0];
-      // this.msgId = val.id;
-      // this.msgName = val.name;
-      // this.unit = val.unit ? val.unit : "";
-      console.log("EquipMsgData", val);
+      this.equipId = val.equipId;
+      this.id = val.id;
+      this.name = val.name;
+      this.unit = val.unit ? val.unit : "";
+      this.currentData = val.currentData ? val.currentData : "";
+      this.dataFormat = val.dataFormat ? val.dataFormat : "";
     },
   },
 };

src/components/editview/rightPropertyBar/property.vue

@@ -50,6 +50,7 @@
     <BaseEquipmentMsg
       v-show="itemType == 'BaseEquipmentMsg'"
       :EquipMsgData="EquipMsgData"
+      @changeEquipMsgData="changeEquipMsg"
     ></BaseEquipmentMsg>
   </div>
 </template>
@@ -107,6 +108,7 @@ export default {
       EquipData: {}, //设备 信息
       equipHeight: "", // 设备属性栏得高度
       EquipMsgData: {}, //设备信息点详情数据
+      EquipMsgItem: null, //设备信息点实例
     };
   },
   mounted() {
@@ -130,7 +132,7 @@ export default {
       }
       // 对设备做出判断 看是否点入的是设备相关信息点
       if (this.itemType == "BaseEquipment") {
-         this.EquipData = itemList[0].legendData;
+        this.EquipData = itemList[0].legendData;
         if (itemList[0].curTextItem) {
           this.itemType = "BaseEquipmentMsg";
         }
@@ -141,6 +143,7 @@ export default {
     // 同步样式
     linkStyle(itemList) {
       const item = itemList[0];
+      this.EquipMsgItem = null;
       if (this.itemType == "BaseArrow") {
         this.strokeColor = item.strokeColor.toRgba();
         this.lineStyle = lineStyle[item.lineStyle];
@@ -179,18 +182,24 @@ export default {
         this.fillColor = item.fillColor.toRgba();
         // 填充色
       } else if (this.itemType == "BaseEquipment") {
-          console.log('BaseEquipment',item)
         if (item.infoPointList && item.infoPointList.length) {
-          console.log('BaseEquipment',item)
           this.infoPointList = item.infoPointList;
         } else {
           this.infoPointList = [];
         }
       } else if (this.itemType == "BaseEquipmentMsg") {
-        // 获取信息点信息，同时拼接设备点信息
+        // 获取信息点详情信息
         this.EquipMsgData = item.curTextItem.propertyData;
+        this.EquipMsgItem = item.curTextItem;
       }
     },
+    // 修改设备信息点数据
+    changeEquipMsg(val) {
+      const obj = this.EquipMsgItem.propertyData;
+      let obj2 = Object.assign(obj, val);
+      this.EquipMsgItem.propertyData = obj2;
+      this.EquipMsgItem.text = val.name;
+    },
   },
 };
 </script>