优化代码

public/index.html

@@ -16,7 +16,7 @@
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <!-- 首屏加载样式 -->
     <link rel="stylesheet" href="<%= BASE_URL %>indexLoading.css" type="text/css">
-    
+
     <!-- 万达置顶条 -->
     <script src="https://cdn.bootcss.com/jquery/3.4.1/jquery.js"></script>
     <link rel="stylesheet" href="http://sso4pub.wanda-dev.cn/Styles/floatMenu.css" type="text/css">
@@ -119,7 +119,7 @@
             it to continue.</strong>
     </noscript>
     <!-- 置顶条问题 -->
-    <div style="height:26px;background-color:#efefef;padding:0 10px" id="wd-fm"></div>
+    <div style="height:26px;background-color:#efefef;padding:0 10px;z-index: 999;" id="wd-fm"></div>
     <div id="app">
         <!-- 首屏加载,只在main.ts中写时,页面还是有很长时间的空白,故在此也写首屏加载 -->
             <!-- <div class="p-index-loading">
@@ -133,14 +133,6 @@
                 </ul>
             </div> -->
     </div>
-    <script>
-        // 指定条问题
-        var wd_fm_info = {
-            profile: {
-                // username: encodeURIComponent('张三')
-            }
-        };
-    </script>
     <script src="http://sso4pub.wanda-dev.cn/Scripts/floatMenu.js" type="text/javascript"></script>
     <script type="text/javascript">
         var wd_sso_menuInfo =

src/App.vue

@@ -49,7 +49,7 @@ export default {
     },
     mounted() {
         this.isMounted = true
-        this.plazaIds = localStorage.getItem('PLAZAID')
+        this.plazaIds = localStorage.getItem('PLAZAID');
     },
     computed: {
         ...mapGetters(['plazaId', 'fmapID', 'haveFengMap', 'accessLevel']),

src/api/httputils.js

@@ -24,20 +24,12 @@ axiosservice.interceptors.request.use(
     (config) => {
         config.withCredentials = true // 允许携带token ,这个是解决跨域产生的相关问题
         let isPreview = null
-        let token = store.getters['ssoToken']
-        if (store.getters['isPreview'] == "null" || store.getters['isPreview'] == "") {
-            isPreview = 'false'
+        let token = store.getters['ssoToken'];
+        if (store.getters['isPreview'] == "null" || store.getters['isPreview'] == "" || store.getters['isPreview'] == null) {
+            isPreview = false
         } else {
             isPreview = store.getters['isPreview']
         }
-
-        // if (config.url.indexOf('mapapp') < 0) {
-        //     config.headers = {
-        //         'sso-token': token,
-        //         isPreview: isPreview, //默认false,当预览开启的时候是true
-        //     }
-        // }
-        // if (config.url.indexOf('/data') > -1 && config.url !== '/data/data/auth/check') {
         if (config.url.indexOf('/data') > -1) {
             config.headers = {
                 'sso-token': token,

src/components/Legend/src/legend.vue

@@ -67,27 +67,18 @@
 
             <!-- 有修改权限 -->
             <el-tooltip
-                v-if='editPmt'
                 class='bjpmt'
                 effect='dark'
                 :content='editTips?editTips:`编辑${categoryId=="FZQZL"?"分水器支路分布图":"消防泵房引出管路分布图"}`'
                 placement='left'
             >
-                <span class='edit-icon corner-con' @click='goToEditer'>
+                <span v-show="permissions ? permissions.includes('GLSMS_PLANARGRAPH_MANAGE'):false" class='edit-icon corner-con' @click='goToEditer'>
                     <img src='@/assets/imgs/bjs.png' alt />
                     <!-- 角标 -->
                     <!-- <span v-if='draftNum' class='corner' :style='{lineHeight : draftNum > 99 ?"10px":"18px"}'>{{draftNum > 99 ? '...' : draftNum}}</span> -->
                     <span v-if='draftNum' class='corner'></span>
                 </span>
             </el-tooltip>
-
-            <!-- 无修改权限 -->
-            <span v-else class='edit-icon2 corner-con'>
-                <img src='@/assets/imgs/bjs.png' alt />
-                <!-- 角标 -->
-                <!-- <span v-if='draftNum' class='corner' :style='{lineHeight : draftNum > 99 ?"10px":"18px"}'>{{draftNum > 99 ? '...' : draftNum}}</span> -->
-                <span v-if='draftNum' class='corner'></span>
-            </span>
         </div>
         <div class='select-floor' v-if='isFloor'>
             <p class='p1'>{{`请选择需要创建"${categoryId=='FZQZL'?'分水器支路分布图':'消防泵房引出管路分布图'}"的楼层`}}</p>
@@ -128,7 +119,6 @@ export default {
             editText: '',
             editSwitch: false,
             isFloor: false,
-            editPmt: true, //是否有跳转道图例库的权限
             floorSelectAble: [],
             floor: '', //传的楼层
             floorName: '',
@@ -140,13 +130,13 @@ export default {
         }
     },
     computed: {
-        ...mapGetters(['planNum', 'typeNum', 'plazaId', 'fmapID', 'floorSelect', 'isMessage', 'ssoToken', 'showView', 'legendTable']),
+        ...mapGetters(['planNum', 'typeNum', 'plazaId', 'fmapID', 'floorSelect', 'isMessage', 'ssoToken', 'showView', 'legendTable','permissions']),
     },
     props: {
         floors: {
             //原理图中有数据楼层
             default: () => {
-                ;[]
+                []
             },
             type: Array,
         },

src/store/index.js

@@ -1,7 +1,13 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-import { login, queryFloor, queryfmapID } from '@/api/login.js'
-import { queryBrand } from '@/api/public.js'
+import {
+    login,
+    queryFloor,
+    queryfmapID
+} from '@/api/login.js'
+import {
+    queryBrand
+} from '@/api/public.js'
 import axios from 'axios'
 import router from '../router'
 
@@ -161,10 +167,12 @@ 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)
@@ -191,7 +199,9 @@ export default new Vuex.Store({
                                 }
                                 router.push({
                                     path: './home/overview',
-                                    query: { plazaId: res.treeData[0].ccode },
+                                    query: {
+                                        plazaId: res.treeData[0].ccode
+                                    },
                                 })
                             } else {
                                 router.push({
@@ -199,8 +209,13 @@ export default new Vuex.Store({
                                 })
                             }
                         }
-                        // commit('SETISREQUESTtAUTH', false)
-                        // commit('SETISREQUESTtAUTH', false)
+                        //   给oA头添加名称
+                        // 指定条问题
+                        window.wd_fm_info = {
+                            profile: {
+                                username: encodeURIComponent(res.username)
+                            }
+                        };
                     }
                 })
                 .catch((err) => {
@@ -211,17 +226,21 @@ export default new Vuex.Store({
                     // commit('SETISREQUESTtAUTH', err)
                 })
         },
-        async getUserInfoNoPath({ commit }, palyload) {
+        async getUserInfoNoPath({
+            commit
+        }, palyload) {
             await login({
-                returnTree: true,
-            })
+                    returnTree: true,
+                })
                 .then((res) => {
                     if (res.result === 'success') {
                         // commit('STOREACCESSLEVEL', res.level)
                         commit('SETAUTHMSG', res)
-                        // localStorage.setItem('PLAZAID', res.treeData[0].ccode)
-                        // commit('STOREPLAZAID', res.treeData[0].ccode)
-                        // commit('SETPLAZENAME', res.treeData[0].cname)
+                        window.wd_fm_info = {
+                            profile: {
+                                username: encodeURIComponent(res.username)
+                            }
+                        };
                     }
                 })
                 .catch((err) => {
@@ -267,4 +286,4 @@ export default new Vuex.Store({
         },
     },
     modules: {},
-})
+})