wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
gongjiale 2022-10-13 11:36:58 +08:00
parent 17d08d399f e5fdaa744a
commit c2c5c30122
2 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
front/src/views/home/components/header.vue
View File

@ -151,7 +151,10 @@
const navList = ref(navListManagement.navList) const navList = ref(navListManagement.navList)
const backFlag = ref(true) const backFlag = ref(true)
getUserInfo().then((res) => { getUserInfo().then((res) => {
if (res.data.data.roleIdList.length == 0) { if (
res.data.data.roleIdList.length == 0 &&
res.data.data.superAdmin === 0
) {
backFlag.value = false backFlag.value = false
} }
}) })

67
front/src/views/home/integrationServicesDetails.vue
View File

@ -107,11 +107,18 @@
> >
<el-table-column <el-table-column
prop="name" prop="name"
label="数据" label="资源名称"
align="center" align="center"
width="200" width="200"
show-overflow-tooltip="true" show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
<el-table-column
prop="platform"
label="资源类型"
align="center"
width="100"
show-overflow-tooltip="true"
></el-table-column>
<el-table-column <el-table-column
prop="dept" prop="dept"
label="能力来源" label="能力来源"
@ -119,13 +126,6 @@
width="300" width="300"
show-overflow-tooltip="true" show-overflow-tooltip="true"
></el-table-column> ></el-table-column>
<el-table-column
prop="platform"
label="申请平台"
align="center"
width="100"
show-overflow-tooltip="true"
></el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
@ -312,44 +312,51 @@
arr = resource.map((res) => ({ arr = resource.map((res) => ({
id: res.resource.idtCameraChannel, id: res.resource.idtCameraChannel,
name: res.resource.channelName, name: res.resource.channelName,
dept: res.resource.nodeName, dept: res.resource.nodeName
platform: 'UCS', .split('-')
.splice(1)
.join('-')
.slice(1),
platform: '视频资源',
})) }))
} else if (item.title === '组件服务') { } else if (item.title === '组件服务') {
arr = resource.map((res) => ({ arr = resource.map((res) => ({
id: res.resource.id, id: res.resource.id,
name: res.resource.name, name: res.resource.name,
dept: res.resource.deptName, dept: res.resource.deptName,
platform: 'UCS', platform:
res.resource.infoList.find(
(item) => item.attrType === '组件类型'
)?.attrValue || '组件服务',
})) }))
} else if (item.title === '数据资源') { } else if (item.title === '数据资源') {
arr = resource.map((res) => ({ arr = resource.map((res) => ({
id: res.resource.zycode, id: res.resource.zycode,
name: res.resource.zyname, name: res.resource.zyname,
dept: res.resource.TGBM, dept: res.resource.TGBM,
platform: '共享交换平台', platform: '数据资源',
})) }))
} }
} }
if (item.title === '数据资源') { if (item.title === '数据资源') {
item.list.push({ // item.list.push({
id: '数据资源1', // id: '数据资源1',
name: '城管案件数据', // name: '城管案件数据',
dept: '市城管局', // dept: '市城管局',
platform: '政务信息共享交换网', // platform: '政务信息共享交换网',
}) // })
item.list.push({ // item.list.push({
id: '数据资源2', // id: '数据资源2',
name: '手机信令数据', // name: '手机信令数据',
dept: '运营商（移动）', // dept: '运营商（移动）',
platform: '政务信息共享交换网', // platform: '政务信息共享交换网',
}) // })
item.list.push({ // item.list.push({
id: '数据资源3', // id: '数据资源3',
name: '标准地址数据', // name: '标准地址数据',
dept: '市自规局', // dept: '市自规局',
platform: '政务信息共享交换网', // platform: '政务信息共享交换网',
}) // })
} else { } else {
item.list = arr item.list = arr
} }