소스 검색

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

YaolongHan 4 년 전
부모
커밋
649c06201e

+ 1 - 0
src/components/404.vue

@@ -29,6 +29,7 @@ export default {
     methods: {
         goLogin() {
             this.$store.commit('SETSSOTOKEN', null)
+            localStorage.removeItem('beforeunload')
             let ssoServer = ''
             if (window.location.host == 'http://glsms.wanda-dev.cn') {
                 ssoServer = 'http://oauth.wanda-dev.cn'

+ 10 - 4
src/components/floorMap/index.vue

@@ -92,10 +92,13 @@ 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;
+                    imgItem.connect('imgLoadOver',this,()=> {
+                        this.readGraph();
+                    })
+                    this.scene.addItem(imgItem)
                     this.view.scene = this.scene
-                    this.view.fitSceneToView()
+                    // this.view.fitSceneToView()
                 }
             } else {
                 if (window.fengmapData.gnameToGid[floor]) {
@@ -109,7 +112,7 @@ export default {
                         this.fParser.spaceList.forEach(t => {
                             this.scene.addItem(t)
                             t.nameSize = 12
-                            t.nameColor = '#646A73'
+                            t.nameColor = '#2a2a2a';
                             if (t.data.Name && this.bunkObj[t.data.Name]) {
                                 t.name = this.bunkObj[t.data.Name].brandname
                             } else {
@@ -123,12 +126,15 @@ export default {
                         this.fParser.columnList.forEach(t => this.scene.addItem(t))
                         this.fParser.casementList.forEach(t => this.scene.addItem(t))
                         this.view.scene = this.scene
-                        this.view.fitSceneToView()
+                        // this.view.fitSceneToView()
+                        this.readGraph()
                     })
                 } else {
                     console.log('楼层不正确')
                 }
             }
+        },
+        readGraph(){
             this.readGroup(this.floorid).then(data => {
                 this.loading = false
                 if (data.Result == 'failure') {

+ 6 - 6
src/lib/FloorScene.js

@@ -11,12 +11,12 @@ import {
 export class FloorScene extends SGraphScene {
   constructor() {
     super()
-    ItemColor.spaceColor = new SColor("#A4ABB22B")
-    ItemColor.wallColor = new SColor("#A7AEB3FF")
-    ItemColor.columnColor = new SColor("#A7AEB3FF")
-    ItemColor.virtualWallColor = new SColor("#A7AEB3FF")
-    ItemColor.selectColor = new SColor("#84A0BB2B")
-    ItemColor.spaceBorderColor = new SColor("#A7AEB3FF")
+    ItemColor.spaceColor = new SColor("#f0f0f0")
+    ItemColor.wallColor = new SColor("#d4d4d4")
+    ItemColor.columnColor = new SColor("#d4d4d4")
+    ItemColor.virtualWallColor = new SColor("#d4d4d4")
+    ItemColor.selectColor = new SColor("#f0f0f0")
+    ItemColor.spaceBorderColor = new SColor("#d4d4d4")
   }
 
   onDoubleClick() {

+ 6 - 7
src/router/index.js

@@ -89,13 +89,12 @@ router.beforeEach(async (to, from, next) => {
         __token = null
     beforeunload && (__token = JSON.parse(beforeunload).ssoToken)
     if (!ignore.includes(to.path)) {
-        let token = __token || query().token || store.getters['ssoToken']
-        // 开发环境模式token有模式值
-        if (process.env.NODE_ENV == 'aly' || process.env.NODE_ENV == 'serve') {
-            token = 'admin:chuyushu'
-        }
-        // console.log('token====', token)
-        if (token) {
+        // let token = __token || store.getters['ssoToken']
+        let token = store.getters['ssoToken']
+        if (query().token) {
+            store.commit('SETSSOTOKEN', query().token)
+            sessionStorage.setItem('SSOTOKEN', query().token)
+        } else if (token) {
             store.commit('SETSSOTOKEN', token)
             if (to.path == '/') {
                 next('/group')

+ 2 - 2
src/store/index.js

@@ -8,9 +8,9 @@ import router from '../router'
 Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
-        ssoToken: 'admin:chuyushu',
+        // ssoToken: 'admin:chuyushu',
         // ssoToken: '',
-        // ssoToken: null,
+        ssoToken: null,
         plazaName: '',
         isPreview: false,
         lastRoute: '',

+ 3 - 0
src/views/equipment/table/recordDialog.vue

@@ -118,6 +118,9 @@ export default {
     .el-dialog__header {
         background: #fff !important;
     }
+    .el-dialog__close {
+        color: #909399 !important;
+    }
     /deep/.el-dialog {
         margin-top: 7vh !important;
         overflow-y: scroll !important;

+ 3 - 3
src/views/room/detail.vue

@@ -248,9 +248,9 @@ export default {
                 manufacturer: this.row.manufacturer || '--',
                 sbxh: this.row.sbxh || '--',
                 brand: this.row.brand || '--',
-                location: '1572',
-                classstructureid: this.row.classstructureid,
-                type_code: this.row.type_code
+                location: this.row.classstructureid,
+                classstructureid: this.row.classstructureid
+                // type_code: this.row.type_code
             }
             // if (this.floorChange) {
             //     postParams.gname = this.floorChange

+ 1 - 0
src/views/room/room3.vue

@@ -73,6 +73,7 @@ export default {
             this.$emit('Index2Emit', page)
         },
         innerTable(row) {
+            console.log(row)
             this.row = row
             this.innerVisible = true
         }