Parcourir la source

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

YaolongHan il y a 4 ans
Parent
commit
c7c4b072d8

+ 3 - 3
package.json

@@ -12,10 +12,10 @@
     "dependencies": {
         "@mapbox/geojson-merge": "^1.1.1",
         "@saga-web/base": "2.1.25",
-        "@saga-web/big": "1.0.105",
+        "@saga-web/big": "1.0.107",
         "@saga-web/draw": "2.1.106",
-        "@saga-web/feng-map": "1.0.35",
-        "@saga-web/graph": "2.1.121",
+        "@saga-web/feng-map": "1.0.37",
+        "@saga-web/graph": "2.1.123",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
         "core-js": "^3.4.4",

+ 26 - 0
src/components/floorMap/index.vue

@@ -290,6 +290,9 @@ export default {
             if (floor == 'g80') {
                 // 屋顶
                 if (window.fengmapData.frImg) {
+                    // const pj = this.urlMsg.fmapID.split('_')[0]
+                    // // 单张图片
+                    // if (!ProjectRf[pj]) {
                         let imgItem = new SImageItem(null, `${this.mapServerURL}/webtheme/${this.fmapID}/${window.fengmapData.frImg}`)
                         imgItem.showType = SImageShowType.AutoFit
                         imgItem.connect('imgLoadOver', this, () => {
@@ -298,6 +301,29 @@ export default {
                         this.scene.addItem(imgItem)
                         this.view.scene = this.scene
                     // this.view.fitSceneToView()
+                    // } else {
+                    //   // 多张图
+                    //   try {
+                    //     // 初始化0
+                    //     this.count = 0;
+                    //     ProjectRf[pj].forEach(t => {
+                    //       const item = new SImageItem(
+                    //         null,
+                    //         `${this.mapServerURL}/webtheme/${this.urlMsg.fmapID}/${t.name}`
+                    //       );
+                    //       item.width = t.width
+                    //       item.height = t.height
+                    //       item.moveTo(t.x, t.y)
+                    //       item.connect("imgLoadOver", this, () => {
+                    //         this.countRf(ProjectRf[pj].length);
+                    //       });
+                    //       this.scene.addItem(item);
+                    //     })
+                    //     this.view.scene = this.scene;
+                    //   } catch(e) {
+                    //     console.log(e);
+                    //   }
+                    // }
                 } else {
                     // 屋顶图不为图片
                     this.readBaseMap(floor)

+ 4 - 4
src/utils/ganttChart/GanttChart_day.js

@@ -379,13 +379,13 @@ GanttChartDay.prototype.handleClick = function(task, flag, ev) {
  */
 GanttChartDay.prototype.statusColor = function(task) {
     switch (task.statusType) {
-        case 0:
-            return ['#e7e9ea', '#c3c7cb']
         case 1:
-            return ['#dee9fe', '#5b8ff9']
+            return ['#e7e9ea', '#c3c7cb']
         case 2:
-            return ['#fbce99', '#f58300']
+            return ['#dee9fe', '#5b8ff9']
         case 3:
+            return ['#fbce99', '#f58300']
+        case 4:
             return ['#fbb8b5', '#f54e45']
         default:
             return ['#f54e45', '#fbb8b5']

+ 4 - 4
src/utils/ganttChart/GanttChart_month.js

@@ -373,13 +373,13 @@ GanttChartMonth.prototype.handleClick = function(task, flag, ev) {
  */
 GanttChartMonth.prototype.statusColor = function(task) {
     switch (task.statusType) {
-        case 0:
-            return ['#e7e9ea', '#c3c7cb']
         case 1:
-            return ['#dee9fe', '#5b8ff9']
+            return ['#e7e9ea', '#c3c7cb']
         case 2:
-            return ['#fbce99', '#f58300']
+            return ['#dee9fe', '#5b8ff9']
         case 3:
+            return ['#fbce99', '#f58300']
+        case 4:
             return ['#fbb8b5', '#f54e45']
         default:
             return ['#fbb8b5', '#f54e45']

+ 4 - 4
src/views/analysis/GanttChart.vue

@@ -468,16 +468,16 @@ export default {
           } = data;
           let color;
           switch (statusType) {
-            case 0:
+            case 1:
               color = ['#c3c7cb', '#e7e9ea'];
               break
-            case 1:
+            case 2:
               color = ['#5b8ff9', '#5b8ff933'];
               break
-            case 2:
+            case 3:
               color = ['#f58300', '#fbce99'];
               break
-            case 3:
+            case 4:
               color = ['#f54e45', '#fbb8b5'];
               break
             default: