Merge branch 'product' into internal_search

src/views/product/components/jsMind/components/mind.vue

@@ -759,9 +759,11 @@ export default {
       }
       data1.topic = this.getModelCardDom(data1)
 
-
       //装载架构
       var data2 = data1.children
+      if(!data2){
+        return
+      }
       // 获取需要返回的架构数组以及funList
       var treeList = [], funList = []
       for(var i = 0;i<data2.length;i++){
@@ -810,6 +812,9 @@ export default {
 
       //装载产品
       var data2 = data1.children
+      if(!data2){
+        return
+      }
       // 获取需要返回的架构数组以及funList
       var productList = [], funList = []
       for(var i = 0;i<data2.length;i++){

src/views/project/patentCollection/index.vue

@@ -861,7 +861,7 @@ export default {
     //图表分析
     async handleAnalyses() {
       var params = {
-        searchQuery: this.searchStr || '',//检索条件
+        condition: this.searchStr || '',//检索条件
         customFields: this.customFields || [],
         groupField:this.queryParams.groupField,
         orderDTOList: this.sort,//排序信息