Procházet zdrojové kódy

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

haojianlong před 4 roky
rodič
revize
0581a755e4

binární
src/assets/images/dashedLine.png


binární
src/assets/images/dotLine.png


binární
src/assets/images/solidLine.png


+ 1 - 1
src/components/baseEditer.vue

@@ -90,7 +90,7 @@ export default {
     // 自动保存(时间差为一分钟)
     this.autoSave = setInterval(() => {
       this.saveMsgNoMessage();
-    }, 60000);
+    }, 6000);
   },
   methods: {
     init() {

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

@@ -32,7 +32,7 @@
             :label="item.src"
             :value="item.id"
           >
-            <img :src="item.src" alt />
+            <img :src="item.src" alt width='180' />
           </a-select-option>
         </a-select>
       </div>
@@ -78,6 +78,7 @@
         <div class="grid-content">
           <a-upload-dragger
             name="file"
+            accept="image/*"
             :customRequest="customRequest"
             :showUploadList="false"
             action="https://jsonplaceholder.typicode.com/posts/"
@@ -345,15 +346,15 @@ export default {
       borderLineOption: [
         {
           id: "solid",
-          src: require("@/assets/images/1pxline.jpg")
+          src: require("@/assets/images/solidLine.png")
         },
         {
           id: "dashed",
-          src: require("@/assets/images/dashedLine.jpg")
+          src: require("@/assets/images/dashedLine.png")
         },
         {
           id: "dotted",
-          src: require("@/assets/images/dotLine.jpg")
+          src: require("@/assets/images/dotLine.png")
         }
       ],
       linepxOption: [
@@ -680,10 +681,12 @@ export default {
     align-items: center;
     margin-top: 12px;
     .color-choice {
+      width: 26px;
+      height: 26px;
       & /deep/ .vue-swatches__trigger {
         width: 26px !important;
         height: 26px !important;
-        border-radius: 0px !important;
+        border-radius: 2px !important;
       }
     }
     .row-tit {

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

@@ -178,7 +178,7 @@ export class EditScence extends SGraphScene {
         item.zOrder = ItemOrder.lineOrder;
         item.selectable = true;
         this.addItem(item);
-        this.Markers.push(item);
+        // this.Markers.push(item);
         item.connect("finishCreated", this, this.finishCreated);
         this.grabItem = item;
         this.focusItem = item;
@@ -239,7 +239,7 @@ export class EditScence extends SGraphScene {
         item.status = SItemStatus.Create;
         item.zOrder = ItemOrder.polylineOrder
         this.addItem(item);
-        this.Relations.push(item);
+        // this.Relations.push(item);
         item.connect("finishCreated", this, this.finishCreated);
         this.grabItem = item;
         this.focusItem = item;
@@ -298,7 +298,6 @@ export class EditScence extends SGraphScene {
         Polylines.zOrder = ItemOrder.polygonOrder;
         // Polylines.moveable = true;
         this.addItem(Polylines);
-        this.Nodes.push(Polylines);
         Polylines.connect("finishCreated", this, this.finishCreated);
         this.grabItem = Polylines;
         this.focusItem = Polylines;
@@ -904,15 +903,24 @@ export class EditScence extends SGraphScene {
     finishCreated(item: any) {
         let arrList = []
         if (this.cmd == 'baseLine') {
-            arrList = this.Markers
+            arrList = this.Markers;
+            this.Markers.push(item);
         }
         this.cmd = 'choice';
         this.selectContainer.clear()
         this.selectContainer.toggleItem(item)
         setTimeout(() => {
             this.focusItem = item;
-        })
-        this.undoStack.push(new SGraphAddCommand(this, item, arrList));
+        });
+
+       if(item instanceof SZoneLegendItem || item instanceof SFHFQZoneLegendItem || item instanceof SSCPZZoneLegendItem){
+            this.Nodes.push(item); //完成后,方可扔到Node节点
+       }
+       //    管道完成后方可保存
+       if(item instanceof TipelineItem ){
+           this.Relations.push(item);
+       }
+       this.undoStack.push(new SGraphAddCommand(this, item, arrList));
     }
     ////////////////////////
     //  以下为鼠标键盘操作事件