guoxiaohuan %!s(int64=4) %!d(string=hai) anos
pai
achega
210f343fce

+ 36 - 3
src/components/Legend/src/legend.vue

@@ -51,12 +51,12 @@
             </el-tooltip>
             <!-- 编辑图例 -->
             <el-tooltip effect='dark' content='编辑图例' placement='left'>
-                <p v-if='systemName != "土建系统" && isMessage' @click='editTl' class='tltk'>
+                <p v-if='systemName != "土建系统" && isMessage' @click='editTl' class='tltk-1'>
                     <img src='@/assets/imgs/bjtl.png' alt />
                 </p>
             </el-tooltip>
             <!-- 新增分布图 -->
-            <el-tooltip effect='dark' content='新增分布图' placement='left' v-if='floorSelect.length!=floors.length && !isMessage && type==0'>
+            <el-tooltip effect='dark' content='新增分布图' placement='left' v-if='floorSelect.length!=floors.length && type==0'>
                 <p class='tltk' style='margin-left: -5px;' @click='addFloor'>
                     <img src='@/assets/imgs/bjj.png' alt />
                 </p>
@@ -64,7 +64,13 @@
             <!-- 编辑分布图 -->
 
             <!-- 有修改权限 -->
-            <el-tooltip v-if='editPmt' class='bjpmt' effect='dark' :content='editTips' placement='left'>
+            <el-tooltip
+                v-if='editPmt'
+                class='bjpmt'
+                effect='dark'
+                :content='editTips?editTips:`编辑${categoryId=="FZQZL"?"分水器支路分布图":"消防泵房引出管路分布图"}`'
+                placement='left'
+            >
                 <span class='edit-icon corner-con' @click='goToEditer'>
                     <img src='@/assets/imgs/bjs.png' alt />
                     <!-- 角标 -->
@@ -139,12 +145,14 @@ export default {
     },
     props: {
         floors: {
+            //原理图中有数据楼层
             default: () => {
                 ;[]
             },
             type: Array
         },
         type: {
+            // 原理图类型 == 0 ;
             default: '1',
             type: String
         },
@@ -157,6 +165,7 @@ export default {
             type: String
         },
         editTips: {
+            // 编辑器文案
             type: String,
             default: ''
         }
@@ -455,6 +464,7 @@ export default {
         }
     },
     mounted() {
+        console.log('editTips', this.editTips)
         this.init()
         // 定时查询草稿箱数量
         this.getDraftNum() //首次查询
@@ -614,8 +624,31 @@ export default {
         cursor: pointer;
         border: 1px solid #eee;
     }
+    .tltk-1 {
+        margin-bottom: 10px;
+        display: none;
+        cursor: pointer;
+        border: 1px solid #eee;
+    }
 }
 .edit_map:hover .tltk {
+    // display: block;
+    // position: fixed;
+    // bottom: 70px;
+    margin-left: -10px;
+    right: 22px;
+    z-index: 1;
+    width: 48px;
+    height: 48px;
+    background: linear-gradient(180deg, rgba(54, 156, 247, 1) 0%, rgba(2, 91, 170, 1) 100%);
+    box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.2);
+    border-radius: 90px;
+    text-align: center;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+.edit_map:hover .tltk-1 {
     display: block;
 }
 .edit_map:hover .bjtk {

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

@@ -129,7 +129,16 @@ export default {
                     this.$store.commit('SETISMESSAGE', false)
                     return
                 } else {
-                    this.$store.commit('SETISMESSAGE', true)
+                    console.log('data[0].Elements.Node', data)
+                    if (
+                        data.Data[0].Elements.Nodes.length === 0 &&
+                        data.Data[0].Elements.Markers.length === 0 &&
+                        data.Data[0].Elements.Relations.length === 0
+                    ) {
+                        this.$store.commit('SETISMESSAGE', false)
+                    } else {
+                        this.$store.commit('SETISMESSAGE', true)
+                    }
                 }
                 // 无返回Data处理
                 if (!(data.Data && data.Data.length)) {

+ 2 - 2
src/components/menuList.vue

@@ -5,7 +5,7 @@
             <div class='downright'></div>
             <div class='home-box'>
                 <img src='@/assets/imgs/logo.png' alt />
-                <span>大连高新万达广场</span>
+                <span>{{plazaName}}</span>
                 <!-- <span v-if='plazas'>{{plazas.length>0?formatter(plazaId,plazas):'--'}}</span> -->
             </div>
         </div>
@@ -72,7 +72,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters(['plazas', 'plazaId', 'fmapID'])
+        ...mapGetters(['plazas', 'plazaId', 'fmapID', 'plazaName'])
     },
     watch: {
         $route: 'handleRoute'

+ 1 - 1
src/router/index.js

@@ -76,7 +76,6 @@ const router = new VueRouter({
 const ignore = ['/404', '/home/legendLibrary', '/home/legendRules']
 router.beforeEach(async (to, from, next) => {
     if (!ignore.includes(to.path)) {
-        console.log('vuex', store.state.accessLevel)
         const token = store.getters['ssoToken'] || query().token
         if (token) {
             store.commit('SETSSOTOKEN', token)
@@ -86,6 +85,7 @@ router.beforeEach(async (to, from, next) => {
             if (to.path == '/group' || to.path == '/home/homepage') {
                 if (store.state.accessLevel == -1) {
                     await store.dispatch('getUserInfo', router)
+                    await store.dispatch('getBrand')
                 }
             }
             await store.dispatch('getFloors')

+ 6 - 0
src/store/index.js

@@ -10,6 +10,7 @@ export default new Vuex.Store({
     state: {
         // ssoToken: 'admin:lengqiang',
         ssoToken: null,
+        plazaName: '',
         isPreview: false,
         lastRoute: '',
         isrequestAuth: true, // 是否请求登录校验接口
@@ -36,6 +37,8 @@ export default new Vuex.Store({
         showView: 1,
     },
     getters: {
+        plazaName: (state) => state.plazaName,
+        accessLevel: (state) => state.accessLevel,
         isPreview: (state) => state.isPreview,
         ssoToken: (state) => state.ssoToken,
         lastRoute: (state) => state.lastRoute,
@@ -53,6 +56,9 @@ export default new Vuex.Store({
         showView: (state) => state.showView,
     },
     mutations: {
+        SETPLAZENAME(state, data) {
+            state.plazaName = data
+        },
         SETSHOWVIEW(state, data) {
             state.showView = data
         },

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

@@ -247,6 +247,9 @@ export default {
                     this.build = res.build ? res.build : {}
                     this.constructions = res.constructions ? res.constructions : []
                     this.shuzihuayijiao = res.shuzihuayijiao ? res.shuzihuayijiao : ''
+                    if (res.plazaName) {
+                        this.$store.commit('SETPLAZENAME', res.plazaName)
+                    }
                 }
             })
         },
@@ -287,10 +290,10 @@ export default {
 </script>
 <style lang="less" scoped>
 @import '../../assets/css/rotation.less';
-.overview{
-    .view-box .view-left{
+.overview {
+    .view-box .view-left {
         overflow: hidden;
-        .lb-left{
+        .lb-left {
             margin-bottom: 0;
         }
     }

+ 11 - 4
src/views/room/index.vue

@@ -6,8 +6,13 @@
 <template>
     <div class='compute-box'>
         <el-dialog :title='`${systemName}`||"机房"' :visible.sync='visible' :fullscreen='true'>
-            <div class='compute-span'></div>
-            <el-tooltip class='item' effect='dark' :content='content' placement='top' v-if='(type=="floor" && smsxtArr.length>0)||type=="system"'>
+            <el-tooltip
+                class='item'
+                effect='dark'
+                :content='content'
+                placement='top'
+                v-if='(type=="floor"&& Object.keys(smsxtArr).length>0)||type=="system"'
+            >
                 <div class='compute-zf' @click='jumpFloor'></div>
             </el-tooltip>
 
@@ -493,7 +498,7 @@ export default {
             rwwcrq: '',
             ycgdtbsj: '',
             ycgdyssj: '',
-            smsxtArr: { smsx: '1001', smsxtname: '供电系统' },
+            smsxtArr: {},
             type: ''
         }
     },
@@ -827,7 +832,7 @@ export default {
         },
         // 查询楼层功能下的机房属于哪类设备
         init() {
-            this.smsxtArr = []
+            this.smsxtArr = {}
             let params = {
                 getParams: {
                     locationid: this.location,
@@ -836,6 +841,8 @@ export default {
             }
             querySystem(params).then(res => {
                 this.smsxtArr = res.data ? res.data[0] : {}
+                console.log(this.smsxtArr)
+
                 this.Index(this.smsxtArr.smsxt)
                 this.content = `查看${this.$cookie.get('floorNow')}层${this.smsxtArr.smsxtname}分布图`
             })

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 536 - 496
src/views/statistics/index.vue