Browse Source

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-editer into develop

zhangyu 4 năm trước cách đây
mục cha
commit
044c3070a2

+ 2 - 2
src/components/edit/attr_select.vue

@@ -256,7 +256,7 @@
         <a-button type="link" class="edit-option-btn" @click="handleEdit">选择编辑</a-button>
       </div>
 
-        <div class="grid-content">
+        <div class="grid-content" style="margin-top: 12px;">
           <a-card class="attr-card" v-for="(item,index) in attrCards" :key="index">{{item.sbjc ||item.wzjc}}</a-card>
         </div>
       </a-spin>
@@ -631,7 +631,7 @@ export default {
   }
 
   .grid-content {
-     margin-top: 12px;
+     /*margin-top: 12px;*/
     position: relative;
   }
 

+ 5 - 0
src/components/edit/edit-dialog.vue

@@ -243,6 +243,9 @@
             },
           //获取表格数据
           queryGlsmsasset(){
+              if(!this.classstructureid && !this.locfl){
+                return
+              }
             const data = {
               plazaId: getUrlMsg().projectId,//广场id 必填
               page: this.page,//页数
@@ -356,6 +359,7 @@
                 const data = res.data;
                 data.map(item=>{
                   item.id = item.gname;
+                  item.name = item.code;
                 })
                 this.dataFloor  = data;
               }
@@ -450,6 +454,7 @@
           }
         },
         created() {
+          this.floorId = getUrlMsg().FloorID;
           if(this.attrCards.length){
             this.attrCards.map(item=>{
               this.selectedRowKeys.push(item.location||item.assetnum)

+ 3 - 0
src/components/edit/leftbar_components/itemTree.vue

@@ -163,6 +163,9 @@ export default {
   .tree-body {
     height: 420px;
     overflow-y: auto;
+    /deep/ .p-tree-node-content{
+      padding-left: 0 !important;
+    }
   }
 }
 </style>

+ 6 - 3
src/components/mapClass/EditScence.ts

@@ -884,7 +884,7 @@ export class EditScence extends SGraphScene {
     //  以下为鼠标键盘操作事件
     onMouseDown(event: SMouseEvent): any {
         if (!this.isEditStatus) {
-            return super.onMouseDown(event);
+            return true
         }
         // 判断是否开启吸附,并且有吸附的点
         if (
@@ -936,7 +936,7 @@ export class EditScence extends SGraphScene {
 
     onMouseMove(event: SMouseEvent): boolean {
         if (!this.isEditStatus) {
-            return super.onMouseMove(event);
+            return true
         }
         if (this.isAbsorbing) {
             if (!this.highLight) {
@@ -950,6 +950,9 @@ export class EditScence extends SGraphScene {
     }
 
     onMouseUp(event: SMouseEvent): boolean {
+        if (!this.isEditStatus) {
+            return true
+        }
         if (this.grabItem) {
             if (this.grabItem instanceof SLineMarkerItem && this.grabItem.status == SItemStatus.Edit) {
                 this.setLineItem(event)
@@ -971,7 +974,7 @@ export class EditScence extends SGraphScene {
      */
     onKeyDown(event: KeyboardEvent): any {
         if (!this.isEditStatus) {
-            return super.onKeyDown(event);
+            return true
         }
         if (this.grabItem) {
             this.grabItem.onKeyDown(event);

+ 1 - 0
src/views/drafts.vue

@@ -470,6 +470,7 @@ export default {
     // 切换草稿箱楼层
     checkFloor(floorid) {
       this.scene = new EditScence();
+      this.scene.isEditStatus = false
       this.clearGraphy();
       const loadings = Loading.service({
         lock: true,