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

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

This commit is contained in:
851673013@qq.com 2022-07-18 15:20:02 +08:00
parent 6b9de7f3b7 57758bbfa4
commit 07d387b5a2
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
front/public/static/config/location.js
View File

@ -1,13 +1,13 @@
/* /*
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23 * @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian * @LastEditors: hisense.liangjunhua
* @LastEditTime: 2022-07-18 11:34:38 * @LastEditTime: 2022-07-18 15:07:32
* @Description: 数据资源参数配置 * @Description: 数据资源参数配置
*/ */
//const newLocation = 'qingdao' const newLocation = 'qingdao'
// const newLocation = 'baotou' // const newLocation = 'baotou'
const newLocation = 'xihaian' // const newLocation = 'xihaian'
// 数据资源数据 // 数据资源数据
const whoShow = {} const whoShow = {}

5
front/src/views/home/apply.vue
View File

@ -272,7 +272,10 @@
const num = ref(0) const num = ref(0)
list.value.map((item) => { list.value.map((item) => {
item.arr.map((val) => { item.arr.map((val) => {
let obj = item.children.filter((type) => type.id == val.id)[0] console.log(item, '组件===========================')
let obj = item.children
? item.children.filter((type) => type.id == val.id)[0]
: val.type !== '应用资源'
if (obj) { if (obj) {
console.log('11111111111111111111111111111', obj, flag.value) console.log('11111111111111111111111111111', obj, flag.value)
if (obj.type !== '应用资源') { if (obj.type !== '应用资源') {

14
front/src/views/home/components/searchResultList.vue
View File

@ -547,13 +547,13 @@
time: item.createDate, time: item.createDate,
type: item.type, type: item.type,
componentType: componentType:
item.infoList.filter( (item.infoList.filter(
(val) => (val) => (val.attrType == '组件类型')[0]
(val.attrType == '组件类型')[0] && ) &&
item.infoList.filter( item.infoList.filter(
(val) => val.attrType == '组件类型' (val) => val.attrType == '组件类型'
)[0].attrValue )[0].attrValue) ||
) || '', '',
}, },
], ],
deptId: item.deptId, deptId: item.deptId,