YaolongHan 4 سال پیش
والد
کامیت
d271c82895
2فایلهای تغییر یافته به همراه66 افزوده شده و 77 حذف شده
  1. 56 66
      src/store/index.js
  2. 10 11
      src/views/equipment/eqDialog.vue

+ 56 - 66
src/store/index.js

@@ -1,15 +1,9 @@
-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({
@@ -17,36 +11,36 @@ export default new Vuex.Store({
         // ssoToken: 'admin:liujiandong',
         // 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,
@@ -167,45 +161,43 @@ export default new Vuex.Store({
     },
     actions: {
         // 获取项目列表、userId
-        async getUserInfo({
-            commit
-        }, palyload) {
+        async getUserInfo({ commit }, palyload) {
             await login({
-                    returnTree: true,
-                })
+                returnTree: true,
+            })
                 .then((res) => {
                     // 获取用户当前权限
                     console.log(res.result)
-                    if (res.result === 'success') {
-                        commit('STOREACCESSLEVEL', res.level)
-                        commit('SETAUTHMSG', res)
+                    if (res.result === "success") {
+                        commit("STOREACCESSLEVEL", res.level)
+                        commit("SETAUTHMSG", res)
                         let level = res.level
-                        console.log('window.opener', window.opener)
+                        console.log("window.opener", window.opener)
                         if (window.opener && window.opener.__fromGroupPage) {
                             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/overview',
+                                    path: "./home/overview",
                                     query: {
-                                        plazaId: res.treeData[0].ccode
+                                        plazaId: res.treeData[0].ccode,
                                     },
                                 })
                             } else {
                                 router.push({
-                                    path: './group',
+                                    path: "./group",
                                 })
                             }
                         }
@@ -213,38 +205,36 @@ export default new Vuex.Store({
                         // 指定条问题
                         window.wd_fm_info = {
                             profile: {
-                                username: encodeURIComponent(res.username)
-                            }
-                        };
+                                username: encodeURIComponent(res.username),
+                            },
+                        }
                     }
                 })
                 .catch((err) => {
-                    console.log('getuserfo catch', err)
+                    console.log("getuserfo catch", err)
                     // router.push({
                     //     path: '/404',
                     // })
                     // commit('SETISREQUESTtAUTH', err)
                 })
         },
-        async getUserInfoNoPath({
-            commit
-        }, palyload) {
+        async getUserInfoNoPath({ commit }, palyload) {
             await login({
-                    returnTree: true,
-                })
+                returnTree: true,
+            })
                 .then((res) => {
-                    if (res.result === 'success') {
+                    if (res.result === "success") {
                         // commit('STOREACCESSLEVEL', res.level)
-                        commit('SETAUTHMSG', res)
+                        commit("SETAUTHMSG", res)
                         window.wd_fm_info = {
                             profile: {
-                                username: encodeURIComponent(res.username)
-                            }
-                        };
+                                username: encodeURIComponent(res.username),
+                            },
+                        }
                     }
                 })
                 .catch((err) => {
-                    console.log('getuserfo catch', err)
+                    console.log("getuserfo catch", err)
                     // router.push({
                     //     path: '/404',
                     // })
@@ -253,23 +243,23 @@ export default new Vuex.Store({
         },
         async getFloors(context) {
             await 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,
@@ -281,9 +271,9 @@ export default new Vuex.Store({
                         obj[i.bunkdesc] = i
                     })
                 }
-                context.commit('SETBUNKOBJ', obj)
+                context.commit("SETBUNKOBJ", obj)
             })
         },
     },
     modules: {},
-})
+})

+ 10 - 11
src/views/equipment/eqDialog.vue

@@ -156,17 +156,6 @@ export default {
                     this.activeName = this.typecode
                     this.isShowTab()
                     this.initImage(this.typecode)
-                    // if (
-                    //     this.dialogInfo.children[0].id.slice(2, 4) == 'YL' &&
-                    //     this.dialogInfo.children[this.dialogInfo.children.length - 1].param.type_code.slice(0, 3) == 'FBT'
-                    // ) {
-                    //     this.typecode = this.dialogInfo.children[this.dialogInfo.children.length - 1].param.type_code
-                    //     this.activeName = this.typecode
-                    //     // this.showFenbuPic = true
-                    //     // this.$nextTick(() => {
-                    //     //     this.$refs.fenbutu[0] && this.$refs.fenbutu[0].openFloorMap()
-                    //     // })
-                    // }
                 }
             } else {
                 this.activeName = this.dialogInfo.param.tab_code
@@ -303,14 +292,24 @@ export default {
             queryTab({ data, postParams }).then((res) => {
                 this.tabCount = []
                 let data = res.data.data || []
+                let counts = []
                 data.forEach((el) => {
                     this.tabCount.push({
                         count: el.count,
                         system: el.params.system,
                         typecode: el.params.typecode,
                     })
+                    counts.push(el.count)
                 })
                 this.$emit('emitCount', this.tabCount)
+                if (counts.every((el) => el == 0)) {
+                    this.typecode = this.dialogInfo.children[this.dialogInfo.children.length - 1].param.type_code
+                    this.activeName = this.typecode
+                    this.showFenbuPic = true
+                    this.$nextTick(() => {
+                        this.$refs.fenbutu[0] && this.$refs.fenbutu[0].openFloorMap()
+                    })
+                }
             })
         },
         /**