guoxiaohuan 4 년 전
부모
커밋
00d7b3eee9
4개의 변경된 파일12개의 추가작업 그리고 11개의 파일을 삭제
  1. 5 5
      package.json
  2. 2 1
      src/components/floorMap/index.vue
  3. 4 4
      src/views/equipment/eqDialog.vue
  4. 1 1
      src/views/equipment/fenbuPic.vue

+ 5 - 5
package.json

@@ -11,11 +11,11 @@
     },
     "dependencies": {
         "@mapbox/geojson-merge": "^1.1.1",
-        "@saga-web/base": "2.1.22",
-        "@saga-web/big": "1.0.86",
-        "@saga-web/draw": "2.1.102",
-        "@saga-web/feng-map": "1.0.25",
-        "@saga-web/graph": "2.1.112",
+        "@saga-web/base": "2.1.24",
+        "@saga-web/big": "1.0.90",
+        "@saga-web/draw": "2.1.104",
+        "@saga-web/feng-map": "1.0.26",
+        "@saga-web/graph": "2.1.115",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
         "core-js": "^3.4.4",

+ 2 - 1
src/components/floorMap/index.vue

@@ -21,7 +21,7 @@ import { readGroup, queryStatis } from '@/api/public'
 import { queryShops } from '@/api/equipmentList.js'
 import { STopologyParser } from '@/lib/parsers/STopologyParser'
 import { mapGetters, mapActions } from 'vuex'
-import { SImageItem } from '@saga-web/graph/lib'
+import { SImageItem, SImageShowType } from '@saga-web/graph/lib'
 import bus from '@/utils/bus.js'
 
 // import { uuid } from "@/components/mapClass/until";
@@ -90,6 +90,7 @@ export default {
                 if (window.fengmapData.frImg) {
                     let imgItem = new SImageItem(null, `${this.mapServerURL}/webtheme/${this.fmapID}/${window.fengmapData.frImg}`)
                     this.scene.addItem(imgItem)
+                    imgItem.showType = SImageShowType.AutoFit;
                     this.view.scene = this.scene
                     this.view.fitSceneToView()
                 }

+ 4 - 4
src/views/equipment/eqDialog.vue

@@ -350,6 +350,10 @@ export default {
             height: 100% !important;
         }
     }
+    .is-active {
+        color: #025baa !important;
+        border-color: #025baa !important;
+    }
     .el-tabs__item {
         padding: 5px 16px;
         height: 30px;
@@ -373,10 +377,6 @@ export default {
     .el-tabs__active-bar {
         background-color: transparent !important;
     }
-    .is-active {
-        color: #025baa;
-        border-color: #025baa;
-    }
     //动画
     .el-dialog__wrapper {
         transition-duration: 0.3s;

+ 1 - 1
src/views/equipment/fenbuPic.vue

@@ -3,8 +3,8 @@
         <!-- 图例 -->
         <div class='legend-boxs'>
             <Legend :innerLeng='1' :floors='floors' type='0' :categoryId='`${typecode=="FBT1"?"FZQZL":"XFBFYCFL"}`'></Legend>
+            <floor-list v-if='floors.length>0' :changeDataFlag='false' :floorsArr='floors' @emitFloor='emitFloor' :id='"floor"'></floor-list>
         </div>
-        <floor-list v-if='floors.length>0' :changeDataFlag='false' :floorsArr='floors' @emitFloor='emitFloor' :id='"floor"'></floor-list>
         <div v-show='floors.length>0' class='canvas-box'>
             <floorMap ref='floorMap' :modalHeight='modalHeight' :loadName='""' :categoryId='`${typecode=="FBT1"?"FZQZL":"XFBFYCFL"}`' :type='"floor"'></floorMap>
         </div>