Bläddra i källkod

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

haojianlong 4 år sedan
förälder
incheckning
fcaaf6e7b3

+ 4 - 4
package.json

@@ -9,10 +9,10 @@
   },
   "dependencies": {
     "@saga-web/base": "2.1.22",
-    "@saga-web/big": "1.0.82",
-    "@saga-web/draw": "2.1.101",
-    "@saga-web/feng-map": "1.0.24",
-    "@saga-web/graph": "2.1.110",
+    "@saga-web/big": "1.0.83",
+    "@saga-web/draw": "2.1.102",
+    "@saga-web/feng-map": "1.0.25",
+    "@saga-web/graph": "2.1.111",
     "ant-design-vue": "^1.6.0",
     "core-js": "^3.6.4",
     "element-ui": "^2.13.2",

+ 9 - 4
src/components/edit/attr_select.vue

@@ -117,13 +117,13 @@
           <div class="row-tit">显示名称</div>
           <a-button type="link" class="edit-option-btn" @click="OpenEditStatus">{{isEdit? "取消编辑" : editStatus[type]}}</a-button>
         </div>
-        <div class="row">
+        <div :class="['row' ,type == 'Line'?'disabled-textarea':'']">
           <a-textarea :disabled="type == 'Line' "
                   placeholder=""
                   v-model="lengedName"
                   allow-clear
                   @change="changeLengedName"
-                  :rows="2"
+                      :auto-size="{ minRows: 2}"
           />
 <!--          <a-input v-model="lengedName" @change="changeLengedName" />-->
         </div>
@@ -183,7 +183,7 @@
                     v-model="lengedName"
                     allow-clear
                     @change="changeLengedName"
-                    :rows="2"
+                    :auto-size="{ minRows: 2}"
             />
 <!--            <a-input v-model="lengedName" @change="changeLengedName" />-->
           </div>
@@ -253,7 +253,7 @@
                     v-model="lengedName"
                     allow-clear
                     @change="changeLengedName"
-                    :rows="2"
+                    :auto-size="{ minRows: 2}"
             />
 <!--            <a-input v-model="lengedName" @change="changeLengedName" />-->
           </div>
@@ -714,6 +714,11 @@ export default {
 </script>
 
 <style scoped lang="less">
+  .disabled-textarea{
+    /deep/ .ant-input{
+      resize: none;
+    }
+  }
 /deep/ .ant-spin-nested-loading {
   height: 100% !important;
   .ant-spin-container {

+ 67 - 1
src/components/edit/edit-dialog.vue

@@ -53,8 +53,11 @@
 
                     </div>
                 </div>
-                <div class="tree">
+                <div class="tree" >
+                    <a-spin :spinning="spinning">
+                    <a-input-search placeholder="请输入关键字" v-if="majorId||sysId" style="width: 235px;margin: 10px 10px;"  v-model="selectVal"  @search="onSearchTree" />
                     <Tree @change="getTreeId" :data="treeData"/>
+                    </a-spin>
                 </div>
                 <div class="checkbox">
                     <a-table :pagination="false" :row-key='typeEdit=="Zone"?"location":"assetnum"'
@@ -113,6 +116,7 @@
         },
         data() {
             return {
+                spinning:false,
                 loading: false,
                 visible: false,
                 model: 'test1',
@@ -181,6 +185,8 @@
                 arrList: [],
                 selectList: [],
                 typeEdit: '',
+                selectVal:'',
+                sysId:''
             }
         },
         watch: {
@@ -188,6 +194,17 @@
                 if (val == '') {
                     this.queryGlsmsasset();
                 }
+            },
+            selectVal(val){
+                if(val==''){
+                    if(this.sysId!=''){
+                        this.getQuerySmsxtBy(this.sysId, this.typeEdit)
+                    }else{
+                        this.getQuerySmsxtBy(this.majorId,'Image')
+                    }
+
+                }
+
             }
         },
         methods: {
@@ -245,8 +262,10 @@
             },
             handleChange(val) {
                 console.log(val);
+                this.selectVal='';
                 this.tableData = [];
                 this.typeEdit = val.type;
+                this.sysId = val.id;
                 this.getQuerySmsxtBy(val.id, val.type)
             },
             handleMajor(val) {
@@ -260,6 +279,43 @@
                 console.log(e)
             },
             //获取treeId --classstructureid
+            onSearchTree(val){
+                let arr = [];
+                const reg = new RegExp(val, 'g');
+                let flag= false;
+              if(this.typeEdit=='Zone'){
+                  this.treeData.map((item)=>{
+                      if(item.name.indexOf(val)!=-1){
+                          item.name=item.name.replace(reg, `<span style="color:#F96600">${val}</span>`);
+                          arr.push(item)
+                      }
+                  });
+
+              }
+                if(this.typeEdit=='Image'){
+                    console.log(this.treeData);
+                    this.treeData.map(item=>{
+                        if(item.name.indexOf(val)!=-1){
+                            item.name=item.name.replace(reg, `<span style="color:#F96600">${val}</span>`);
+                            arr.push(item)
+                        }else{
+                            item.children.map(item1=>{
+                                if(item1.name.indexOf(val)!=-1){
+                                    flag = true;
+                                    item.open=true;
+                                    item1.name=item1.name.replace(reg, `<span style="color:#F96600">${val}</span>`);
+                                }
+                            })
+                            if(flag){
+                                arr.push(item)
+                            }
+                        }
+
+                    })
+
+                }
+                this.treeData = arr;
+            },
             getTreeId(id) {
                 if (this.typeEdit == 'Image') {
                     this.classstructureid = id.id;
@@ -430,11 +486,14 @@
             },
             // 获取设备大类下的分类和位置大类下的分类
             getQuerySmsxtBy(smsxt, type) {
+
                 if (type == 'Image') {
                     const data = {
                         smsxt: smsxt
                     }
+                    this.spinning = true
                     getQuerySmsxtBy(data, {}).then(res => {
+                        this.spinning = false;
                         if (res.result == 'success') {
                             if (res.data) {
                                 const data = res.data;
@@ -475,12 +534,16 @@
                         } else {
                             this.$message.error('获取失败');
                         }
+                    }).catch(()=>{
+                        this.spinning = false;
                     })
                 } else if (type == 'Zone') {
                     const data = {
                         dl: smsxt
                     }
+                    this.spinning = true
                     queryWzflByDl(data, {}).then(res => {
+                        this.spinning = false;
                         if (res.result == 'success') {
                             if (res.data) {
                                 const data = res.data;
@@ -498,6 +561,8 @@
                         } else {
                             this.$message.error('获取失败');
                         }
+                    }).catch(()=>{
+                        this.spinning = false;
                     })
                 }
 
@@ -508,6 +573,7 @@
             //如果有专业就带过来
             console.log(this.getmajorId);
             if (this.getmajorId) {
+                this.typeEdit = 'Image';
                 this.getQuerySmsxtBy(this.getmajorId, 'Image')
             }
             if (this.attrCards.length) {

+ 0 - 7
src/components/mapClass/EditScence.ts

@@ -176,7 +176,6 @@ export class EditScence extends SGraphScene {
         }
         const item = new SLineMarkerItem(null, data);
         item.status = SItemStatus.Create;
-        item.zOrder = ItemOrder.lineOrder;
         item.selectable = true;
         this.addItem(item);
         // this.Markers.push(item);
@@ -200,7 +199,6 @@ export class EditScence extends SGraphScene {
         //设置状态
         item.selectable = true;
         item.status = SItemStatus.Create;
-        item.zOrder = ItemOrder.polylineOrder
         this.addItem(item);
         item.connect("finishCreated", this, this.finishCreated);
         this.grabItem = item;
@@ -237,7 +235,6 @@ export class EditScence extends SGraphScene {
         //设置状态
         item.selectable = true;
         item.status = SItemStatus.Create;
-        item.zOrder = ItemOrder.polylineOrder
         this.addItem(item);
         // this.Relations.push(item);
         item.connect("finishCreated", this, this.finishCreated);
@@ -294,7 +291,6 @@ export class EditScence extends SGraphScene {
         Polylines.selectable = true;
         //设置状态
         Polylines.status = SItemStatus.Create;
-        Polylines.zOrder = ItemOrder.polygonOrder;
         // Polylines.moveable = true;
         this.addItem(Polylines);
         Polylines.connect("finishCreated", this, this.finishCreated);
@@ -380,7 +376,6 @@ export class EditScence extends SGraphScene {
             }
         }
         const item = new SImageMarkerItem(null, data);
-        item.zOrder = ItemOrder.imageOrder;
         item.selectable = true;
         item.moveable = true;
         this.addItem(item);
@@ -417,7 +412,6 @@ export class EditScence extends SGraphScene {
         item.moveTo(event.x, event.y);
         item.selectable = true;
         item.moveable = true;
-        item.zOrder = ItemOrder.textOrder;
         this.addItem(item);
         this.Markers.push(item);
         this.grabItem = null;
@@ -463,7 +457,6 @@ export class EditScence extends SGraphScene {
         this.cmd = 'choice';
         item.selectable = true;
         item.moveable = true;
-        item.zOrder = ItemOrder.markOrder;
         this.addItem(item);
         this.Nodes.push(item);
         this.grabItem = null;

+ 3 - 2
src/lib/items/SFHFQZoneLegendItem.ts

@@ -1,5 +1,5 @@
 
-import { SGraphItem, SLineStyle } from "@saga-web/graph/lib";
+import { SGraphItem, SLineStyle, STextOrigin } from "@saga-web/graph/lib";
 import { Legend } from '../types/Legend';
 import { SPainter, SColor, SFont, SPoint, SLineCapStyle } from "@saga-web/draw";
 import { STextItem } from '@saga-web/graph/lib';
@@ -120,8 +120,9 @@ export class SFHFQZoneLegendItem extends SPolygonItem {
      */
     constructor(parent: SGraphItem | null, data: Legend) {
         super(parent);
+        this.textItem.originPosition = STextOrigin.Centrum;
         this.textItem.isTransform = false;
-        this.zOrder = ItemOrder.polygonOrder;
+        this.zOrder = ItemOrder.polygonOrder - 0.00005;
         this.data = data;
         this.id = data.ID;
         this.name = data.Name;

+ 4 - 2
src/lib/items/SSCPZZoneLegendItem.ts

@@ -1,5 +1,5 @@
 
-import { SGraphItem, SLineStyle } from "@saga-web/graph/lib";
+import { SGraphItem, SLineStyle, STextOrigin } from "@saga-web/graph/lib";
 import { Legend } from '../types/Legend';
 import { SPainter, SColor, SFont, SPoint, SLineCapStyle } from "@saga-web/draw";
 import { STextItem } from '@saga-web/graph/lib';
@@ -128,8 +128,9 @@ export class SSCPZZoneLegendItem extends SPolygonItem {
      */
     constructor(parent: SGraphItem | null, data: Legend) {
         super(parent);
+        this.textItem.originPosition = STextOrigin.Centrum;
         this.textItem.isTransform = false;
-        this.zOrder = ItemOrder.polygonOrder;
+        this.zOrder = ItemOrder.polygonOrder - 0.0005;
         this.data = data;
         this.id = data.ID;
         this.name = data.Name;
@@ -205,6 +206,7 @@ export class SSCPZZoneLegendItem extends SPolygonItem {
     toData(): any {
         this.data.Pos = { X: this.x, Y: this.y };
         this.data.Name = this.name;
+        console.log(this.zOrder);
         this.data.Properties.Zorder = this.zOrder;
         this.data.Properties.FillColor = this.fillColor.value;
         this.data.Properties.StrokeColor = this.strokeColor.value;

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

@@ -1,5 +1,5 @@
 
-import { SGraphItem, SLineStyle } from "@saga-web/graph/lib";
+import { SGraphItem, SLineStyle, STextOrigin } from "@saga-web/graph/lib";
 import { Legend } from '../types/Legend';
 import { SPainter, SColor, SFont, SPoint, SLineCapStyle } from "@saga-web/draw";
 import { STextItem } from '@saga-web/graph/lib';
@@ -120,6 +120,7 @@ export class SZoneLegendItem extends SPolygonItem {
      */
     constructor(parent: SGraphItem | null, data: Legend) {
         super(parent);
+        this.textItem.originPosition = STextOrigin.Centrum;
         this.textItem.isTransform = false;
         this.zOrder = ItemOrder.polygonOrder;
         this.data = data;

+ 1 - 1
vue.config.js

@@ -26,7 +26,7 @@ module.exports = {
             },
             '/data': {
                 // target: 'http://192.168.200.87:9003',
-                target: 'http://60.205.177.43:9903', //阿里云
+                target: 'http://60.205.177.43', //阿里云
                 changeOrigin: true,
                 secure: false,
                 pathRewrite: {