图表分析

src/views/analyse/custom/components/Tabs/DataItem.vue

@@ -166,7 +166,8 @@ export default {
         expandTrigger: 'click',
         value: 'value',
         label: 'name',
-        emitPath: false
+        emitPath: false,
+        children: 'child',
       },
       expandField: {
         x: [],
@@ -186,7 +187,7 @@ export default {
         '96': '自定义字段',
       },
       defaultProps: {
-        children: 'children',
+        children: 'child',
         label: 'name'
       },
       maxDate:'',
@@ -269,33 +270,40 @@ export default {
         }
         // 给ipc、cpc、upc、loc添加大小类等
         if (data[i].groupBy == 'classify') {
-            var special= {
-              MC: [
-                { id: 'IC', name: '部' },
-                { id: 'IC2', name: '大类' },
-                { id: 'IC3', name: '小类' },
-                { id: 'IC4', name: '大组' },
-                { id: 'IC5', name: '小组' },
-              ],
-              CPC: [
-                { id: 'CPC', name: '部' },
-                { id: 'CPC2', name: '大类' },
-                { id: 'CPC3', name: '小类' },
-                { id: 'CPC4', name: '大组' },
-                { id: 'CPC5', name: '小组' },
-              ],
-              UPC: [
-                // { value: '0', label: '分类号' },//老系统有
-                { id: 'UPC', name: '大类' },
-                { id: 'UPC2', name: '小类' },
-              ],
-              LOC: [
-                // { value: '0', label: '分类号' },//老系统有
-                { id: 'LOC', name: '大类' },
-                { id: 'LOC2', name: '小类' },
-              ],
-            }
-            data[i].expand = special[data[i].value]
+            // var special= {
+            //   MC: [
+            //     { id: 'IC', name: '部' },
+            //     { id: 'IC2', name: '大类' },
+            //     { id: 'IC3', name: '小类' },
+            //     { id: 'IC4', name: '大组' },
+            //     { id: 'IC5', name: '小组' },
+            //   ],
+            //   CPC: [
+            //     { id: 'CPC', name: '部' },
+            //     { id: 'CPC2', name: '大类' },
+            //     { id: 'CPC3', name: '小类' },
+            //     { id: 'CPC4', name: '大组' },
+            //     { id: 'CPC5', name: '小组' },
+            //   ],
+            //   UPC: [
+            //     // { value: '0', label: '分类号' },//老系统有
+            //     { id: 'UPC', name: '大类' },
+            //     { id: 'UPC2', name: '小类' },
+            //   ],
+            //   LOC: [
+            //     // { value: '0', label: '分类号' },//老系统有
+            //     { id: 'LOC', name: '大类' },
+            //     { id: 'LOC2', name: '小类' },
+            //   ],
+            // }
+          // data[i].expand = special[data[i].value]
+
+          data[i].expand = data[i].children.map(item => {
+            return {
+                id: item.value,
+                name: item.label
+              }
+            })
           }
       }
       this.$store.commit('SET_SYSTEM_FIELD',data)
@@ -327,12 +335,12 @@ export default {
             }
           }
           if (filedObj[data[i].groupBy]) {
-            filedObj[data[i].groupBy].children.push(data[i])
+            filedObj[data[i].groupBy].child.push(data[i])
           } else {
             filedObj[data[i].groupBy] = {
               value: data[i].groupBy,
               name: obj[data[i].groupBy],
-              children: [
+              child: [
                 data[i]
               ],
             }
@@ -340,12 +348,12 @@ export default {
           
         } else {//自定义字段
           if (filedObj.customField) {
-            filedObj.customField.children.push(data[i])
+            filedObj.customField.child.push(data[i])
           } else {
             filedObj[data[i].group] = {
               value: 'customField',
               name: obj.customField,
-              children: [data[i]]
+              child: [data[i]]
             }
           }
         }
@@ -553,8 +561,8 @@ export default {
     setChildren(arr) {
       arr.forEach(item => {
         this.$set(item, 'disabled', item.parentId !== this.parentId && this.parentId !== -1)
-        if (item.children && item.children.length) {
-          this.setChildren(item.children)
+        if (item.child && item.child.length) {
+          this.setChildren(item.child)
         } else {
 
         }

src/views/project/patentCollection/components/views/Table.vue

@@ -23,7 +23,7 @@
 
       <el-table-column v-for="item in column.filter(item => !item.ifHidden)"
         :render-header="$commonJS.renderHeaderMethods" :key="item.value" :prop="item.field" :label="item.name"
-        sortable="custom" align="center">
+        :sortable="item.ifSort?'custom':false" align="center">
         <template slot-scope="scope">
           <div v-if="['patentNo'].includes(item.value)">
             <el-popover placement="right-start" width="500" trigger="hover">