瀏覽代碼

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

zhangyu 4 年之前
父節點
當前提交
23ad209b2d
共有 3 個文件被更改,包括 54 次插入26 次删除
  1. 5 3
      src/components/baseEditer.vue
  2. 39 17
      src/components/edit/left_toolbar.vue
  3. 10 6
      src/components/mapClass/EditScence.ts

+ 5 - 3
src/components/baseEditer.vue

@@ -396,7 +396,8 @@ export default {
                         color: '',  //字体颜色
                         GraphCategoryId: val.age.GraphCategoryId,
                         InfoSystemId: val.age.InfoSystemId?val.age.InfoSystemId:'',   //信息工程话分类ID分类
-                        FID: t.data.SourceId
+                        FID: t.data.SourceId,
+                        InfoTypeId:val.age.InfoTypeId.length? val.age.InfoTypeId :[]
                     },
                   };
                   const item = new SImageLegendItem(null, data)
@@ -433,7 +434,8 @@ export default {
                       font: 12,
                       color: "",
                       TextPos: { X: 0, Y: 0},
-                      FID: t.data.SourceId
+                      FID: t.data.SourceId,
+                      InfoTypeId:val.age.InfoTypeId.length? val.age.InfoTypeId :[]
                     },
                     Num: 1
                   };
@@ -451,7 +453,7 @@ export default {
           // undo/redo事件
           this.scene.AddListCommand(parserData.zoneLegendList);
           bus.$emit("elementDataChange", this.scene);
-        } 
+        }
       });
       // 设备图例样式对象
       bus.$on("setLenged", obj => {

+ 39 - 17
src/components/edit/left_toolbar.vue

@@ -84,19 +84,11 @@
           @close="onClose"
           :getContainer="false"
           :mask="false"
+          :wrapClassName="isExtract?'edit-drawer':''"
         >
           <a-spin :spinning="spinning">
             <div class="drawer-model-body" v-if="!isExtract">
               <div class="btn-list">
-<!--                <a-radio-group-->
-<!--                  v-show="showDrawerItem.type == 'Zone'"-->
-<!--                  default-value="draw"-->
-<!--                  button-style="solid"-->
-<!--                  @change="changeDrawType"-->
-<!--                >-->
-<!--                  <a-radio-button value="draw">绘制</a-radio-button>-->
-<!--                  <a-radio-button value="select">点选</a-radio-button>-->
-<!--                </a-radio-group>-->
                 <Tabs type="card"  v-show="showDrawerItem.type == 'Zone'" :data="tabData" v-model="tabActive"/>
               </div>
               <div class="list" v-for="(item,index) in itemList" :key="index">
@@ -124,7 +116,7 @@
                 <template slot="age" slot-scope="text, record, index">
                   <div>
                     <img
-                      :class="['item',`item-${text.Type}`]"
+                      :class="['item',`item-${text.Type}`, 'exportImg']"
                       :src="'/serve/topology-wanda/Picture/query/'+ text.Url"
                       alt
                       v-if="text.Url"
@@ -132,12 +124,9 @@
                     <span v-else>无对应图例</span>
                   </div>
                 </template>
-                <a-tag
-                  slot="address"
-                  slot-scope="text, record, index"
-                  :color="'geekblue'"
-                  @click="pickUp(text, record, index)"
-                >{{ text }}</a-tag>
+                <template slot="address" slot-scope="text, record, index">
+                  <div style="color:#0091FFFF;cursor:pointer;" @click="pickUp(text, record, index)">{{ text }}</div>
+                </template>
               </a-table>
             </div>
           </a-spin>
@@ -272,7 +261,7 @@ export default {
         {name: '绘制', id:'draw'},
         {name: '点选', id:'select' }
       ],
-      tabActive:'draw'
+      tabActive:'select'
     };
   },
   computed: {
@@ -351,6 +340,14 @@ export default {
       });
     },
     getexampleItem(item,indexs,index) {
+      if(this.showDrawerItem.type == 'Zone'){
+  //       if(item.SubType == "SCPZ" || item.SubType == "SCPZ" ){
+  //  {name: '绘制', id:'draw'},
+  //       {name: '点选', id:'select' }
+  //       }else{
+
+  //       }
+      }
       this.activeIndex = index;
       this.activeIndexs = indexs;
       this.$emit("toolActionClick", item);
@@ -674,11 +671,36 @@ export default {
         }
       }
     }
+    /deep/ .edit-drawer .ant-drawer-body{
+      padding: 0;
+      .ant-table-small{
+        border-left: none;
+        border-right: none;
+        border-radius: 0;
+      }
+      .ant-table-small > .ant-table-content > .ant-table-body{
+        margin: 0;
+        .ant-table-thead{
+          font-size: 12px;
+        }
+      }
+    }
     .drawer-model-body-extract {
       padding: 0;
       position: absolute;
       left: 0;
       right: 0;
+      /deep/ .ant-table-thead tr th{
+        background: #f8f9fa;
+      }
+      .exportImg.item-Zone{
+        width: 28px;
+        height: 16px;
+      }
+      .exportImg.item-Image{
+        width: 20px;
+        height: 20px;
+      }
       .ant-table-small {
         border: none !important;
       }

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

@@ -1,6 +1,6 @@
 import { SMouseEvent, SUndoStack } from "@saga-web/base";
 import { SGraphScene, SGraphLayoutType, SAnchorItem } from '@saga-web/graph/lib';
-import { SFloorParser, SLineItem, SPolylineItem, SItemStatus, ItemOrder, STooltipItem, ItemColor } from "@saga-web/big";
+import { SFloorParser, SLineItem, SPolylineItem, SItemStatus, ItemOrder, STooltipItem, ItemColor,Transparency } from "@saga-web/big";
 import { SGraphItem, SLineStyle, SGraphPropertyCommand, SImageItem, STextItem, SGraphPointListInsert, SGraphPointListDelete, SGraphPointListUpdate, SGraphAddCommand } from "@saga-web/graph/lib";
 import { SGraphAddListCommand } from "./SGraphAddListCommand"
 import { SGraphDeleteCommand } from "./SGraphDeleteCommand"
@@ -278,7 +278,8 @@ export class EditScence extends SGraphScene {
                 LineWidth: this._legend.LineWidth,
                 font: 0,
                 color: '',
-                TextPos: { X: 0, Y: 0 }
+                TextPos: { X: 0, Y: 0 },
+                InfoTypeId:this._legend.InfoTypeId.length? this._legend.InfoTypeId :[]
             },
         }
         let Polylines = null;
@@ -333,7 +334,8 @@ export class EditScence extends SGraphScene {
                     font: 12,
                     color: '',
                     FID: item.data.SourceId,
-                    TextPos: { X: item.data.Location.Points[0].X, Y: -item.data.Location.Points[0].Y }
+                    TextPos: { X: item.data.Location.Points[0].X, Y: -item.data.Location.Points[0].Y },
+                    InfoTypeId:this._legend.InfoTypeId.length? this._legend.InfoTypeId :[]
                 },
             }
             let Polylines = null;
@@ -451,7 +453,8 @@ export class EditScence extends SGraphScene {
                 font: 12,    //font
                 color: '',  //字体颜色
                 GraphCategoryId: this._legend.GraphCategoryId,
-                InfoSystemId: InfoSystemId   //信息工程话分类ID分类
+                InfoSystemId: InfoSystemId,   //信息工程话分类ID分类
+                InfoTypeId:this._legend.InfoTypeId.length? this._legend.InfoTypeId :[]// 铺位可视化Typeid(用于编辑工程信息化时默认问题)
             },
         }
         const item = new SImageLegendItem(null, LegendData);
@@ -680,9 +683,10 @@ export class EditScence extends SGraphScene {
      */
     upadatfillColor(fillColor: string): void {
         if (this.focusItem && this.focusItem.fillColor) {
-            const newMsg = new SColor(fillColor);
+            const fillColorT = fillColor+Transparency[20];
+            const newMsg = new SColor(fillColorT);
             const oldMsg = this.focusItem.fillColor;
-            this.focusItem.fillColor = new SColor(fillColor);
+            this.focusItem.fillColor = new SColor(fillColorT);
             this.undoStack.push(new SGraphPropertyCommand(this, this.focusItem, "num", oldMsg, newMsg));
         }
     }