Browse Source

合并冲突

haojianlong 4 years ago
parent
commit
193f186b78

+ 33 - 34
src/components/editview/basePlanEditer.vue

@@ -15,9 +15,8 @@
 </template>
 <script>
 import { SFloorParser, getJsonz } from "@persagy-web/big";
-import { SImageItem, SImageShowType } from "@persagy-web/graph";
+import { SImageItem, SImageShowType, SGraphPropertyCommand } from "@persagy-web/graph";
 import { SPlanView, SPlanParser, SPlanScene, SPlanDecorator, SPlanEquipment, SPlanZone } from "@/lib";
-import { SGraphPropertyCommand } from "@persagy-web/graph";
 import planTooltip from "./planTooltip.vue";
 import { mapState, mapMutations } from "vuex";
 import base64ToFile from "@/utils/base64ToFile";
@@ -221,38 +220,38 @@ export default {
                 t.selectable = false;
                 this.scene.addItem(t);
             });
-            parser.virtualWallList.forEach((t) => {
-                // 是否显示
-                // t.visible = this.isShowVirtualWall;
-                t.visible = showBaseMap;
-                // 是否可选
-                t.selectable = false;
-                this.scene.addItem(t);
-            });
-            parser.doorList.forEach((t) => {
-                // 是否显示
-                // t.visible = this.isShowDoor;
-                t.visible = showBaseMap;
-                // 是否可选
-                t.selectable = false;
-                this.scene.addItem(t);
-            });
-            parser.columnList.forEach((t) => {
-                // 是否显示
-                // t.visible = this.isShowColumn;
-                t.visible = showBaseMap;
-                // 是否可选
-                t.selectable = false;
-                this.scene.addItem(t);
-            });
-            parser.casementList.forEach((t) => {
-                // 是否显示
-                // t.visible = this.isShowWindow;
-                t.visible = showBaseMap;
-                // 是否可选
-                t.selectable = false;
-                this.scene.addItem(t);
-            });
+            // parser.virtualWallList.forEach((t) => {
+            //     // 是否显示
+            //     // t.visible = this.isShowVirtualWall;
+            //     t.visible = showBaseMap;
+            //     // 是否可选
+            //     t.selectable = false;
+            //     this.scene.addItem(t);
+            // });
+            // parser.doorList.forEach((t) => {
+            //     // 是否显示
+            //     // t.visible = this.isShowDoor;
+            //     t.visible = showBaseMap;
+            //     // 是否可选
+            //     t.selectable = false;
+            //     this.scene.addItem(t);
+            // });
+            // parser.columnList.forEach((t) => {
+            //     // 是否显示
+            //     // t.visible = this.isShowColumn;
+            //     t.visible = showBaseMap;
+            //     // 是否可选
+            //     t.selectable = false;
+            //     this.scene.addItem(t);
+            // });
+            // parser.casementList.forEach((t) => {
+            //     // 是否显示
+            //     // t.visible = this.isShowWindow;
+            //     t.visible = showBaseMap;
+            //     // 是否可选
+            //     t.selectable = false;
+            //     this.scene.addItem(t);
+            // });
             // 画板是否可拖动
             this.view.DragMove = true;
             this.view.fitSceneToView();

+ 0 - 1
src/components/editview/leftToolBar/addSpaceDialog.vue

@@ -340,7 +340,6 @@ export default {
          * 编辑信息点
          */
         editInfo(data) {
-            console.log(data);
             this.currentInfo = data;
             this.showEditInfoPoint = true;
         },

+ 1 - 1
src/components/homeView/planImageCard.vue

@@ -14,7 +14,7 @@
                 <span class="title" :title="data.name">{{ data.name }}</span>
                 <div class="func">
                     <el-popover placement="top" width="220" trigger="hover" popper-class="customPop">
-                        <p>版本 : {{ data.version }}</p>
+                        <p>版本 : {{ 'v '+ data.version }}</p>
                         <p>更新时间 : {{ data.lastUpdate }}</p>
                         <!-- <p>更新人 : {{data.putUser || '张三'}}</p> -->
                         <span slot="reference"><img :src="require('@/assets/images/tips.png')" style="width: 20px; height: 20px" /></span>

+ 1 - 1
src/lib/item/SPlanEquipment.ts

@@ -245,7 +245,7 @@ export class SPlanEquipment extends SBaseIconTextEdit {
             painter.pen.color = this.lineColor;
             painter.pen.lineWidth = 1
             painter.drawLine(0, 0, bimX, bimY);
-            
+
             painter.pen.color = SColor.Transparent;
             painter.brush.color = bimColor;
             painter.drawCircle(bimX, bimY, 5);

+ 8 - 4
vue.config.js

@@ -10,22 +10,26 @@ module.exports = {
         open: true,
         proxy: {
             "/labsl": {
-                target: "http://60.205.177.43:28888",
+                // target: "http://60.205.177.43:28888",
+                target: "http://192.168.64.17:28888",
                 changeOrigin: true,
                 secure: false,
             },
             "/meiku": {
-                target: "http://60.205.177.43:28888",
+                // target: "http://60.205.177.43:28888",
+                target: "http://192.168.64.17:28888",
                 changeOrigin: true,
                 secure: false,
             },
             "/datacenter": {
-                target: "http://60.205.177.43:28888",
+                // target: "http://60.205.177.43:28888",
+                target: "http://192.168.64.17:28888",
                 changeOrigin: true,
                 secure: false,
             },
             "/equip-component": {
-                target: "http://60.205.177.43:28888",
+                // target: "http://60.205.177.43:28888",
+                target: "http://192.168.64.17:28888",
                 changeOrigin: true,
                 secure: false,
             },