|
@@ -13,6 +13,7 @@ import { SFloorParser } from "@saga-web/big";
|
|
|
import { FloorView } from "./../lib/FloorView";
|
|
|
import { EditScence } from "./mapClass/EditScence";
|
|
|
import bus from "@/bus";
|
|
|
+import bus2 from "@/bus2";
|
|
|
import {
|
|
|
saveGroup,
|
|
|
readGroup,
|
|
@@ -296,8 +297,8 @@ export default {
|
|
|
this.initScale = this.view.scale;
|
|
|
this.view.maxScale = this.initScale * 10;
|
|
|
this.view.minScale = this.initScale / 10;
|
|
|
- bus.$emit("initScale", this.view.scale);
|
|
|
- bus.$emit("elementDataChange", this.scene);
|
|
|
+ bus2.$emit("initScale", this.view.scale);
|
|
|
+ bus2.$emit("elementDataChange", this.scene);
|
|
|
this.loadings.close()
|
|
|
});
|
|
|
},
|
|
@@ -305,11 +306,11 @@ export default {
|
|
|
emitChange(itemMsg) {
|
|
|
this.chiceItemList = itemMsg.itemList;
|
|
|
this.$emit("changeFocusItem", itemMsg);
|
|
|
- bus.$emit("FocusItemChanged", itemMsg);
|
|
|
+ bus2.$emit("FocusItemChanged", itemMsg);
|
|
|
},
|
|
|
// 监听场景元素数据变化
|
|
|
scenceUpdate(scence) {
|
|
|
- bus.$emit("elementDataChange", scence);
|
|
|
+ bus2.$emit("elementDataChange", scence);
|
|
|
},
|
|
|
clearGraphy() {
|
|
|
if (this.view) {
|
|
@@ -390,7 +391,7 @@ export default {
|
|
|
address: "提取"
|
|
|
});
|
|
|
}
|
|
|
- bus.$emit("exportItem", data);
|
|
|
+ bus2.$emit("exportItem", data);
|
|
|
});
|
|
|
bus.$on("saveMsgItem", () => {
|
|
|
const loading = Message({
|
|
@@ -428,8 +429,10 @@ export default {
|
|
|
IconUrl: '/serve/topology-wanda/Picture/query/' + val.age.Url,
|
|
|
Url: '/serve/topology-wanda/Picture/query/' + val.age.Url,
|
|
|
Num: 1, // 此num与信息工程化得num无关
|
|
|
- sWidth: 32, //icon 的宽
|
|
|
- sHeight: 32, //icon 的高
|
|
|
+ Size: {
|
|
|
+ Width: val.age.Size?val.age.Size.Width?val.age.Size.Width:32:32, //icon 的宽
|
|
|
+ Height: val.age.Size?val.age.Size.Height?val.age.Size.Height:32:32, //icon 的高
|
|
|
+ },
|
|
|
font: 14, //font
|
|
|
color: "#1F2429", //字体颜色
|
|
|
GraphCategoryId: val.age.GraphCategoryId,
|
|
@@ -449,7 +452,7 @@ export default {
|
|
|
}
|
|
|
}).filter(item => item);
|
|
|
this.scene.AddListCommand(list);
|
|
|
- bus.$emit("elementDataChange", this.scene);
|
|
|
+ bus2.$emit("elementDataChange", this.scene);
|
|
|
} else if (val.type == "Zone") {
|
|
|
const list = this.fParser.spaceList
|
|
|
.map(t => {
|
|
@@ -493,7 +496,7 @@ export default {
|
|
|
});
|
|
|
// undo/redo事件
|
|
|
this.scene.AddListCommand(parserData.zoneLegendList);
|
|
|
- bus.$emit("elementDataChange", this.scene);
|
|
|
+ bus2.$emit("elementDataChange", this.scene);
|
|
|
}
|
|
|
});
|
|
|
// 设备图例样式对象
|
|
@@ -765,7 +768,7 @@ export default {
|
|
|
handler(scale) {
|
|
|
// 滚轮触发的缩放
|
|
|
if (!this.changeScaleByClick) {
|
|
|
- bus.$emit("mouseScale", scale / this.initScale);
|
|
|
+ bus2.$emit("mouseScale", scale / this.initScale);
|
|
|
}
|
|
|
}
|
|
|
}
|