Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/public/static/config/location.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-13 18:05:38
+ * @LastEditTime: 2022-07-14 10:01:08
  * @Description: 数据资源参数配置
  */
 const newLocation = 'qingdao'
@@ -32,12 +32,12 @@ if (newLocation === 'qingdao') {
     { name: '能力统计', key: 'abilityStatistics' },
     // { name: '开发指南', key: 'developmentGuide' },
     { name: '指导手册', key: 'instructionManual' },
-    { name: '需求中心', key: 'demandCenter' },
+    // { name: '需求中心', key: 'demandCenter' },
     // { name: '个人中心', key: 'personalCenter' },
     { name: '区市站点', key: 'mapTest' },
     // { name: '后台管理', key: 'houtaiguanli' },
     { name: '赋能案例', key: 'assignCase' },
-    // { name: '融合服务', key: 'integrationServices' },
+    { name: '融合服务', key: 'integrationServices' },
   ]
   footerDataList.footerList = {
     company: {

front/src/store/modules/user.js

@@ -120,7 +120,7 @@
        return false
      }
      // debugger
-     commit('setUsername', data.data.username)
+     commit('setUsername', data.data.realName)
      commit('setRole', data.data.roleIdList.length)
      commit('setUserId', data.data.id)
      // TODO 获取用户信息，后续执行部分操作

front/src/views/home/components/header.vue

@@ -113,7 +113,7 @@
   import { ref, onMounted, onBeforeUnmount, defineProps } from 'vue'
   import { recordRoute } from '@/config'
   import { useRoute, useRouter } from 'vue-router'
-  import { getUser, mynotice } from '@/api/home'
+  import { mynotice } from '@/api/home'
   import { useStore } from 'vuex'
   import { getSgcTotal } from '@/api/home'
   import mybus from '@/myplugins/mybus'
@@ -132,22 +132,25 @@
   //   // { name: '后台管理', key: 'houtaiguanli' },
   //   { name: '赋能案例', key: 'assignCase' },
   // ])
-  const user = ref({})
+  const user = ref({
+    username: store.getters['user/username'],
+  })
+  // user.username.value = store.getters(['user/username'])
   const select = ref(router.currentRoute.value.name)
   const mynoticeFlag = ref(false)
   const mynoticeData = ref([])
-  console.log('navListManagement------------>', navListManagement);
+  console.log('navListManagement------------>', navListManagement)
 
   // eslint-disable-next-line no-undef
   const navList = ref(navListManagement.navList)
   const props = defineProps({
     showView: { type: String, default: '' },
   })
-  // 获取用户信息
+  // // 获取用户信息
-  getUser().then((res) => {
+  // getUser().then((res) => {
-    user.value = res.data.data
+  //   user.value = res.data.data
-    // console.log('user===============>', user.value)
+  //   // console.log('user===============>', user.value)
-  })
+  // })
   // 退出登录
   const logout = async () => {
     await store.dispatch('user/logout')
@@ -323,7 +326,7 @@
     display: flex;
     justify-content: center;
     align-items: center;
-    padding: 0 1rem;
+    // padding: 0 1rem;
     background-color: rgba(0, 0, 25, 0.7);
     position: fixed;
     z-index: 1000;
@@ -362,7 +365,7 @@
       color: #fff !important;
     }
     .info {
-      width: 2rem;
+      // width: 2rem;
       margin-left: 0.2rem;
       display: flex;
       justify-content: center;
@@ -381,7 +384,11 @@
         font-size: 0.16rem;
       }
       .name {
-        max-width: 0.75rem;
+        max-width: 3.3rem;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 1;
+        -webkit-box-orient: vertical;
         overflow: hidden;
       }
       .out {