Compare commits

..

No commits in common. "169d66e608fd58c4e772a1f8c6720eb26baeca51" and "337ee0a931050428ae7c9c95f2a55b17aa157096" have entirely different histories.

3 changed files with 18 additions and 25 deletions

View File

@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-07-14 10:01:08
* @LastEditTime: 2022-07-13 18:05:38
* @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: {

View File

@ -120,7 +120,7 @@
return false
}
// debugger
commit('setUsername', data.data.realName)
commit('setUsername', data.data.username)
commit('setRole', data.data.roleIdList.length)
commit('setUserId', data.data.id)
// TODO

View File

@ -113,7 +113,7 @@
import { ref, onMounted, onBeforeUnmount, defineProps } from 'vue'
import { recordRoute } from '@/config'
import { useRoute, useRouter } from 'vue-router'
import { mynotice } from '@/api/home'
import { getUser, mynotice } from '@/api/home'
import { useStore } from 'vuex'
import { getSgcTotal } from '@/api/home'
import mybus from '@/myplugins/mybus'
@ -132,25 +132,22 @@
// // { name: '', key: 'houtaiguanli' },
// { name: '', key: 'assignCase' },
// ])
const user = ref({
username: store.getters['user/username'],
})
// user.username.value = store.getters(['user/username'])
const user = ref({})
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) => {
// user.value = res.data.data
// // console.log('user===============>', user.value)
// })
//
getUser().then((res) => {
user.value = res.data.data
// console.log('user===============>', user.value)
})
// 退
const logout = async () => {
await store.dispatch('user/logout')
@ -224,9 +221,9 @@
router.push({
path: '/integrationServices',
// path: '/DetailsPageconetent',
query: {
select: '融合服务',
},
query: {
select: '融合服务',
},
})
break
default:
@ -326,7 +323,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;
@ -365,7 +362,7 @@
color: #fff !important;
}
.info {
// width: 2rem;
width: 2rem;
margin-left: 0.2rem;
display: flex;
justify-content: center;
@ -384,11 +381,7 @@
font-size: 0.16rem;
}
.name {
max-width: 3.3rem;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
-webkit-box-orient: vertical;
max-width: 0.75rem;
overflow: hidden;
}
.out {