Browse Source

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

zhulizhen1111 4 years ago
parent
commit
907b506ae4

+ 2 - 2
src/components/404.vue

@@ -29,7 +29,7 @@ export default {
     methods: {
         goLogin() {
             this.$store.commit('SETSSOTOKEN', null)
-            localStorage.removeItem('beforeunload')
+            sessionStorage.setItem('SSOTOKEN', '')
             let ssoServer = ''
             if (window.location.host == 'http://glsms.wanda-dev.cn') {
                 ssoServer = 'http://oauth.wanda-dev.cn'
@@ -40,7 +40,7 @@ export default {
                 signal = new Date().getTime(),
                 version = '1.0.0'
             window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
-            window.open(`${window.location.href}`, true)
+            // window.open(`${window.location.href}`, true)
         }
     }
 }

+ 4 - 0
src/components/menuList.vue

@@ -252,7 +252,11 @@ export default {
             margin: 0 8px;
             cursor: pointer;
             transition: all 0.2s;
+            &:first-child {
+                display: none;
+            }
         }
+
         .is-active {
             color: #025baa;
             font-weight: bolder;

+ 41 - 41
src/store/index.js

@@ -1,46 +1,46 @@
-import Vue from "vue"
-import Vuex from "vuex"
-import { login, queryFloor, queryfmapID } from "@/api/login.js"
-import { queryBrand } from "@/api/public.js"
-import axios from "axios"
-import router from "../router"
+import Vue from 'vue'
+import Vuex from 'vuex'
+import { login, queryFloor, queryfmapID } from '@/api/login.js'
+import { queryBrand } from '@/api/public.js'
+import axios from 'axios'
+import router from '../router'
 
 Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
-        ssoToken: "admin:chuyushu",
+        ssoToken: 'admin:chuyushu',
         // ssoToken: '',
         // ssoToken: null,
-        plazaName: "",
+        plazaName: '',
         isPreview: false,
-        lastRoute: "",
+        lastRoute: '',
         isrequestAuth: null, // 是否请求登录校验接口
         permissions: [], //权限信息 "GLSMS_VIEW":"说明书查看"、"GLSMS_SYMBOL_MANAGE": "图例库管理"、 "GLSMS_PLANARGRAPH_MANAGE":"平面图维护"
         plazas: [], //项目列表
         userInfo: {
-            employeename: "", //用户名称:艾宇;
-            orgCode: "",
-            username: "lengqiang", //账户名称
+            employeename: '', //用户名称:艾宇;
+            orgCode: '',
+            username: 'lengqiang', //账户名称
         },
-        plazaId: "", //项目Id
-        projectName: "", //全局项目名称
+        plazaId: '', //项目Id
+        projectName: '', //全局项目名称
         floorsArr: [], //楼层数组
         floorSelect: [], //楼层下拉框
-        fmapID: "",
+        fmapID: '',
         haveFengMap: -1, //是否有蜂鸟地图的数据 -1为等待 0 为失败 1 为成功
         isMessage: true, //是否有发布的图
         scpzTable: [], //土建装饰图例展示
         legendTable: [], //除土建装饰图例展示
-        remarksText: "", //备注
+        remarksText: '', //备注
         // defaultComment: '',
         bunkObj: {}, // 铺位名称
         currentFloor: {}, //当前选中的楼层信息
         accessLevel: -1, // 权限级别
         showView: 1,
-        categoryId: "GDXT", //当前选中的系统
+        categoryId: 'GDXT', //当前选中的系统
         isGetmap: false, //是否可以请求底图(在项目中方可请求)
-        planNum: "", //主要设备房 展示备注需要
-        typeNum: "", //图例数量 展示备注需要
+        planNum: '', //主要设备房 展示备注需要
+        typeNum: '', //图例数量 展示备注需要
     },
     getters: {
         plazaName: (state) => state.plazaName,
@@ -166,31 +166,31 @@ export default new Vuex.Store({
                 .then((res) => {
                     // 获取用户当前权限
                     console.log(res.result)
-                    if (res.result === "success") {
-                        commit("STOREACCESSLEVEL", res.level)
+                    if (res.result === 'success') {
+                        commit('STOREACCESSLEVEL', res.level)
                         let level = res.level
                         if (window.opener) {
                             let data = window.opener.__fromGroupPage
                             level = data.level
-                            commit("SETPLAZENAME", data.plazaName)
-                            localStorage.setItem("PLAZAID", data.plazaId)
-                            commit("STOREPLAZAID", data.plazaId)
+                            commit('SETPLAZENAME', data.plazaName)
+                            localStorage.setItem('PLAZAID', data.plazaId)
+                            commit('STOREPLAZAID', data.plazaId)
                             router.push({
-                                path: "./home/homepage",
+                                path: './home/homepage',
                             })
                         } else {
                             if (level === 0) {
                                 if (res.treeData[0].ccode) {
-                                    localStorage.setItem("PLAZAID", res.treeData[0].ccode)
-                                    commit("STOREPLAZAID", res.treeData[0].ccode)
-                                    commit("SETPLAZENAME", res.treeData[0].cname)
+                                    localStorage.setItem('PLAZAID', res.treeData[0].ccode)
+                                    commit('STOREPLAZAID', res.treeData[0].ccode)
+                                    commit('SETPLAZENAME', res.treeData[0].cname)
                                 }
                                 router.push({
-                                    path: "./home/homepage",
+                                    path: './home/homepage',
                                 })
                             } else {
                                 router.push({
-                                    path: "./group",
+                                    path: './group',
                                 })
                             }
                         }
@@ -198,37 +198,37 @@ export default new Vuex.Store({
                         // commit('SETISREQUESTtAUTH', false)
                     } else {
                         router.push({
-                            path: "/404",
+                            path: '/404',
                         })
-                        commit("SETISREQUESTtAUTH", res)
+                        commit('SETISREQUESTtAUTH', res)
                     }
                 })
                 .catch((err) => {
                     router.push({
-                        path: "/404",
+                        path: '/404',
                     })
-                    commit("SETISREQUESTtAUTH", err)
+                    commit('SETISREQUESTtAUTH', err)
                 })
         },
         getFloors(context) {
             queryFloor({
-                plazaId: localStorage.getItem("PLAZAID") || context.state.plazaId,
+                plazaId: localStorage.getItem('PLAZAID') || context.state.plazaId,
             }).then((res) => {
-                if (res.result == "success") {
-                    context.commit("SETFLOORS", res.data)
+                if (res.result == 'success') {
+                    context.commit('SETFLOORS', res.data)
                 }
             })
         },
         async getfmapID(context) {
             await queryfmapID({
-                mapId: localStorage.getItem("PLAZAID") || context.state.plazaId,
+                mapId: localStorage.getItem('PLAZAID') || context.state.plazaId,
             }).then((res) => {
-                context.commit("SETMAPID", `${localStorage.getItem("PLAZAID") || context.state.plazaId}_${res.mapVersion}`)
+                context.commit('SETMAPID', `${localStorage.getItem('PLAZAID') || context.state.plazaId}_${res.mapVersion}`)
             })
         },
         async getBrand(context) {
             let data = {
-                plazaId: `${localStorage.getItem("PLAZAID") || context.state.plazaId}`,
+                plazaId: `${localStorage.getItem('PLAZAID') || context.state.plazaId}`,
             }
             await queryBrand({
                 data,
@@ -240,7 +240,7 @@ export default new Vuex.Store({
                         obj[i.bunkdesc] = i
                     })
                 }
-                context.commit("SETBUNKOBJ", obj)
+                context.commit('SETBUNKOBJ', obj)
             })
         },
     },

+ 3 - 3
src/views/other/zhsxOtherTable2.vue

@@ -4,7 +4,7 @@
             <el-input
                 clearable
                 @keyup.enter.native='dsfjc'
-                @blur="dsfjc"
+                @blur='dsfjc'
                 placeholder='搜索任务名称'
                 size='small'
                 prefix-icon='el-icon-search'
@@ -38,7 +38,7 @@
             <el-input
                 clearable
                 @keyup.enter.native='dsfjc'
-                 @blur="dsfjc"
+                @blur='dsfjc'
                 placeholder='搜索部门'
                 size='small'
                 prefix-icon='el-icon-search'
@@ -48,7 +48,7 @@
             <el-input
                 clearable
                 @keyup.enter.native='dsfjc'
-                 @blur="dsfjc"
+                @blur='dsfjc'
                 placeholder='搜索检测结论'
                 size='small'
                 prefix-icon='el-icon-search'

+ 5 - 3
src/views/overview/index.vue

@@ -11,9 +11,11 @@
                 <span>项目基本信息</span>
             </nav>
             <!-- <el-button type='info' plain disabled> -->
-            <div class='view-button' :disabled='true' @click='findxmzl' title='数字化移交系统上线后可用'>
-                <img src='../../assets/imgs/wd.png' alt />
-                项目资料
+            <div title='数字化移交系统上线后可用'>
+                <div class='view-button' :disabled='true' @click='findxmzl'>
+                    <img src='../../assets/imgs/wd.png' alt />
+                    项目资料
+                </div>
             </div>
             <!-- </el-button> -->
         </div>

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

@@ -112,7 +112,7 @@
             style='width:100%;margin-top:12px'
             :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
         >
-            <el-table-column type='index' label='序号' width='50' :index='indexMethod'></el-table-column>
+            <el-table-column type='index' label='序号' width='50'></el-table-column>
             <el-table-column prop='sbjc' label='设备名称' min-width='150' :show-overflow-tooltip='true' resizable>
                 <template slot-scope='{row}'>{{row.type_name||'--'}}</template>
             </el-table-column>
@@ -168,7 +168,7 @@ import { mapGetters } from 'vuex'
 import { queryHxsbDetail } from '@/api/room.js'
 
 export default {
-    props: ['row'],
+    props: ['row', 'location'],
     data() {
         return {
             dialogFormVisible: false,
@@ -248,7 +248,7 @@ export default {
                 manufacturer: this.row.manufacturer || '--',
                 sbxh: this.row.sbxh || '--',
                 brand: this.row.brand || '--',
-                location: this.row.classstructureid,
+                location: this.location,
                 classstructureid: this.row.classstructureid
                 // type_code: this.row.type_code
             }

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

@@ -135,6 +135,7 @@
                             :page='page2'
                             :total='total2'
                             :size='size2'
+                            :location='location'
                             @Index2Emit='Index2Emit'
                         ></room-table3>
                     </el-tab-pane>

+ 2 - 2
src/views/room/room3.vue

@@ -42,7 +42,7 @@
             ></el-pagination>
         </div>
         <el-dialog width='90%' :title='`${systemName}-${row.type_name}`' :visible.sync='innerVisible' append-to-body>
-            <detail v-if='row' :row='row' :floorChange='floorChange'></detail>
+            <detail v-if='row' :row='row' :location='location' :floorChange='floorChange'></detail>
         </el-dialog>
     </div>
 </template>
@@ -53,7 +53,7 @@ import { Select } from 'meri-design'
 import Detail from './detail'
 
 export default {
-    props: ['table3', 'total', 'page', 'size', 'loading', 'floorChange', 'systemName'],
+    props: ['table3', 'total', 'page', 'size', 'loading', 'floorChange', 'systemName', 'location'],
     data() {
         return {
             innerVisible: false,