bug修复

front/public/static/config/location.js

@@ -1,22 +1,13 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
-<<<<<<< HEAD
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-07 17:30:10
-=======
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-07 17:41:25
->>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
+ * @LastEditTime: 2022-07-07 18:53:18
  * @Description: 数据资源参数配置
  */
 const newLocation = 'qingdao'
 // const newLocation = 'baotou'
-<<<<<<< HEAD
-// const newLocation = 'xihaian'
-=======
 //  const newLocation = 'xihaian'
->>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
 
 // 数据资源数据
 const whoShow = {}

front/src/store/modules/user.js

@@ -125,7 +125,10 @@ const actions = {
         commit('setUsername', data.data.username)
         commit('setRole', data.data.roleIdList.length)
         commit('setUserId', data.data.id)
-        resolve()
+        setTimeout(()=>{
+          resolve()
+        },500)
+
       })
     })
   },

front/src/vab/plugins/permissions.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 17:23:11
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-07 18:15:38
+ * @LastEditTime: 2022-07-07 19:58:32
  * @Description: 告诉大家这是什么
  */
 /**
@@ -49,7 +49,7 @@ router.beforeEach(async (to, from, next) => {
       next()
     } else {
       store.dispatch('user/getUserInfo').then((res)=>{
-        debugger
+        console.log('马到成功！')
         next()
       })
       // if (recordRoute)

front/src/views/home/infrastructurePage.vue

@@ -11,11 +11,7 @@
         <span
           v-for="itemContent in item.content"
           :key="itemContent"
-<<<<<<< HEAD
-          @click="tabClick(index, item.title)"
-=======
           @click="tabClick(index, itemContent, item)"
->>>>>>> 420a31531fdd60d9a8007e3328d071690c7688f1
           :class="
             clickList[index].content.indexOf(itemContent.labelName) != -1 ||
             clickList[index].content.indexOf(itemContent) != -1