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

@@ -1,13 +1,13 @@
 /*
  * @Author: hisense.wuhongjian
  * @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: 数据资源参数配置
  */
-//const newLocation = 'qingdao'
+const newLocation = 'qingdao'
 // const newLocation = 'baotou'
-const newLocation = 'xihaian'
+// const newLocation = 'xihaian'
 
 // 数据资源数据
 const whoShow = {}

front/src/views/home/apply.vue

@@ -272,7 +272,10 @@
       const num = ref(0)
       list.value.map((item) => {
         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) {
             console.log('11111111111111111111111111111', obj, flag.value)
             if (obj.type !== '应用资源') {

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

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