Merge branch 'product' of http://1.116.113.26:8088/zhuliu/xiaoshi_system into product

src/views/components/import/conditionImport/searchResult.vue

@@ -84,15 +84,15 @@
 
 <script>
 import PatentTableListView from "@/views/project/patentCollection/components/views/Table.vue";
-// import PatentAbstractListView from "@/views/project/patentCollection/components/views/Abstract";
-// import PatentPictureListView from "@/views/project/patentCollection/components/views/Picture";
+import PatentAbstractListView from "@/views/project/patentCollection/components/views/Abstract";
+import PatentPictureListView from "@/views/project/patentCollection/components/views/Picture";
 import field from '@/views/components/dialog/fields.vue';
 import projectListDialog from "./components/projectListDialog.vue";
 export default {
   components: {
     PatentTableListView,
-    // PatentAbstractListView,
-    // PatentPictureListView,
+    PatentAbstractListView,
+    PatentPictureListView,
     field,
     projectListDialog
   },

src/views/report/components/details/index.vue

@@ -0,0 +1,55 @@
+<template>
+  <div>
+    <component :is='componentName'></component>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {},
+  props: {},
+  data() {
+    return {
+        componentName:'',
+        menu:[],
+        comments:{}
+    };
+  },
+  watch: {},
+  computed: {},
+  created() {},
+  mounted() {
+    this.getMenu()
+  },
+  methods: {
+    getMenu(){
+        this.menu = [
+            {
+                name:'Table',
+                path:'task/components/index.vue'
+            },
+            {
+                name:'report',
+                path:'report/components/index.vue'
+            }
+        ]
+        this.getComponents()
+    },
+    getComponents(){
+        this.menu.forEach((item,index)=>{
+         import(`@/views/${item.path}`).then(res=>{
+          this.comments[item.name] = res.default
+          if(index == 0){
+            this.componentName = this.comments[item.name]
+          }
+        })
+      })
+    },
+    changeComponent(name){
+        this.componentName = this.comments[name]
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+</style>

src/views/task/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Table :id="id" ></Table>
+    <Table :id="id"></Table>
   </div>
 </template>
 
@@ -12,7 +12,6 @@ export default {
   },
   data() {
     return {
-
     }
   },
   computed: {
@@ -21,11 +20,9 @@ export default {
     },
   },
   mounted() {
-
-  },
-  methods: {
-
+  
   },
+  methods: {},
 }
 </script>