Sfoglia il codice sorgente

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

haojianlong 4 anni fa
parent
commit
f7216a35ba

+ 8 - 5
src/components/edit/attr_select.vue

@@ -68,7 +68,7 @@
     </div>
     <!--图片-->
     <div class="attr-select" v-if="type=='baseImage'">
-      <span class="grid-title">文字内容</span>
+      <span class="grid-title">图片</span>
       <section class="grid">
         <div class="grid-content">
           <a-upload-dragger
@@ -99,7 +99,7 @@
           />
         </div>
         <div class="color-choice">
-          <swatches v-model="color" popover-x="left" />
+          <swatches v-model="borderColor" popover-x="left" @close="changeBorderColor" />
         </div>
       </div>
     </div>
@@ -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>
@@ -508,7 +508,10 @@ export default {
           } else if (Item.lineStyle == SLineStyle.Dotted) {
             this.borderStyle = "dotted";
           }
-        } else if (
+        } else if (newval.itemType == "baseImage") {
+          this.lineWidth = Item.lineWidth;
+          this.borderColor = Item.strokeColor.value;
+        }else if (
           newval.itemType == "Zone" ||
           newval.itemType == "Line" ||
           newval.itemType == "Image"
@@ -628,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>

+ 1 - 1
src/lib/items/SFHFQZoneLegendItem.ts

@@ -126,7 +126,7 @@ export class SFHFQZoneLegendItem extends SPolygonItem {
             }
             // 设置线宽
             if (data.Properties.LineWidth) {
-                this.lineWidth = data.Properties.LineWidth
+                this.lineWidth = data.Properties.LineWidth;
             }
             if (data.Properties.StrokeColor) {
                 this.strokeColor = data.Properties.StrokeColor.includes('#') ? new SColor(data.Properties.StrokeColor) : new SColor(hexify(data.Properties.StrokeColor));

+ 10 - 1
src/lib/items/SImageMarkerItem.ts

@@ -1,6 +1,6 @@
 
 import { SGraphItem, SImageItem } from "@saga-web/graph/lib";
-import { SPainter } from "@saga-web/draw";
+import { SPainter, SColor } from "@saga-web/draw";
 import { Marker } from '../types/Marker';
 import { ItemOrder } from '@saga-web/big/lib';
 
@@ -23,6 +23,7 @@ export class SImageMarkerItem extends SImageItem {
         super(parent);
         this.zOrder = ItemOrder.imageOrder;
         this.isTransform = false;
+        this.url = "";
         this.data = data;
         this.id = data.ID;
         this.name = data.Name;
@@ -34,12 +35,20 @@ export class SImageMarkerItem extends SImageItem {
         if (data.Properties && data.Properties.Url) {
             this.url = data.Properties.Url;
         }
+        if (data.Properties.LineWidth) {
+            this.lineWidth = data.Properties.LineWidth;
+        }
+        if (data.Properties.StrokeColor) {
+            this.strokeColor = data.Properties.StrokeColor.includes('#') ? new SColor(data.Properties.StrokeColor) : new SColor(hexify(data.Properties.StrokeColor));
+        }
     } // Constructor
 
     toData(): Marker {
         this.data.Pos = {X: this.x, Y: this.y};
         this.data.Size = {Width: this.width, Height: this.height};
         this.data.Properties.Url = this.url;
+        this.data.Properties.StrokeColor = this.strokeColor.value;
+        this.data.Properties.LineWidth = this.lineWidth;
         return this.data;
     }
 } // Class SImageMarkerItem

+ 1 - 1
src/lib/items/SSCPZZoneLegendItem.ts

@@ -134,7 +134,7 @@ export class SSCPZZoneLegendItem extends SPolygonItem {
             }
             // 设置线宽
             if (data.Properties.LineWidth) {
-                this.lineWidth = data.Properties.LineWidth
+                this.lineWidth = data.Properties.LineWidth;
             }
             if (data.Properties.StrokeColor) {
                 this.strokeColor = data.Properties.StrokeColor.includes('#') ? new SColor(data.Properties.StrokeColor) : new SColor(hexify(data.Properties.StrokeColor));

+ 1 - 1
src/lib/items/SZoneLegendItem.ts

@@ -127,7 +127,7 @@ export class SZoneLegendItem extends SPolygonItem {
             }
             // 设置线宽
             if (data.Properties.LineWidth) {
-                this.lineWidth = data.Properties.LineWidth
+                this.lineWidth = data.Properties.LineWidth;
             }
             if (data.Properties.StrokeColor) {
                 this.strokeColor = data.Properties.StrokeColor.includes('#') ? new SColor(data.Properties.StrokeColor) : new SColor(hexify(data.Properties.StrokeColor));