专利挖掘

src/router/index.js

@@ -112,6 +112,8 @@ const routes = [
             path:'/details',
             meta: {
               title: '专利挖掘详情',
+              sign:'patentMiningDetails',
+              belong:'patentMining'
             },
             component: () => import('@/views/patentMining/components/details/index.vue'),
           },
@@ -119,6 +121,8 @@ const routes = [
             path:'/excavateTask',
             meta: {
               title: '专利挖掘任务',
+              sign:'patentMiningExcavateTask',
+              belong:'patentMining'
             },
             component: () => import('@/views/patentMining/components/excavateTask/index.vue'),
           },
@@ -126,6 +130,8 @@ const routes = [
             path:'/handleExamine',
             meta: {
               title: '专利挖掘任务详情',
+              sign:'patentMiningHandleExamine',
+              belong:'patentMining'
             },
             component: () => import('@/views/patentMining/components/handleExamine/index.vue'),
           },

src/views/components/dialog/nodeCopy.vue

@@ -347,7 +347,8 @@ export default {
 </script>
 <style lang="scss" scoped>
 .table:empty{
-    content:'暂无数据'
+    content:'暂无数据';
+    text-align: center;
 }
 </style>
 <style lang="scss">

src/views/patentMining/components/details/basicMessage.vue

@@ -0,0 +1,31 @@
+<template>
+  <div>
+    <basicMessage :id="id"></basicMessage>
+    <projectPath :id="id"></projectPath>
+  </div>
+</template>
+
+<script>
+import basicMessage from './components/basicMessage.vue';
+import projectPath from './components/projectPath.vue'
+export default {
+  components: {
+    basicMessage,
+    projectPath
+  },
+  props: {
+    id:''
+  },
+  data() {
+    return {
+    };
+  },
+  watch: {},
+  computed: {},
+  created() {},
+  mounted() {},
+  methods: {},
+};
+</script>
+<style lang="scss" scoped>
+</style>

src/views/patentMining/components/basicMessage.vue

@@ -85,24 +85,19 @@
         </el-descriptions-item>
       </el-descriptions>
     </div>
-    <div style="width: 100%;">
-      <!-- 项目流程 -->
-      <projectPath></projectPath>
-    </div>
   </div>
 </template>
 
 <script>
-import projectPath from './projectPath.vue'
 export default {
   components: {
-    projectPath,
   },
-  props:['row'],
+  props:['id'],
   data() {
     return {
       column:4,
-      queryParams:{}
+      queryParams:{},
+      row:{}
     }
   },
   mounted() {

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

@@ -1,23 +1,22 @@
 <template>
   <!-- 详情 -->
-  <div class="details">
-    <el-tabs v-model="activeName" type="card" @tab-click="handleClick" style="height: 100%;">
-      <el-tab-pane label="基本信息" name="basicMessage">
-        <BasicMessage :row="row"></BasicMessage>
-      </el-tab-pane>
-      <el-tab-pane label="挖掘任务" name="excavateTask" style="height: 100%;">
-        <ExcavateTaskIndex style="height: 100%;"></ExcavateTaskIndex>
-      </el-tab-pane>
-      <el-tab-pane label="文件列表" name="fileMessage" style="height: 100%;">
-        <FileMessage style="height: 100%;"></FileMessage>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
+  <div class="height_100">
+      <el-container>
+        <el-header class="basic_header">
+            <el-tabs v-model="activeName" type="card" @tab-click="handleClick" style="width:100%">
+              <el-tab-pane v-for="item in menu" :key='item.path' :label="item.label" :name="item.path"></el-tab-pane>
+            </el-tabs>
+        </el-header>
+        <el-main>
+            <component :is='activeName' :id="id"></component>
+        </el-main>
+      </el-container>
+    </div>
 </template>
 
 <script>
-import BasicMessage from '../basicMessage.vue'
-import ExcavateTaskIndex from '../excavateTask/index.vue'
+import BasicMessage from './basicMessage.vue'
+import ExcavateTaskIndex from '../excavateTask/excavateTask.vue'
 import FileMessage from '../fileMessage.vue'
 export default {
   components: {
@@ -27,12 +26,26 @@ export default {
   },
   data() {
     return {
-      activeName: 'basicMessage'
+      activeName: 'basicMessage',
+      menu:[
+        {
+          label:'基本信息',
+          path:'basicMessage'
+        },
+        {
+          label:'挖掘任务',
+          path:'ExcavateTaskIndex'
+        },
+        {
+          label:'文件列表',
+          path:'FileMessage'
+        },
+      ]
     };
   },
   computed: {
-    row() {
-      return this.$route.query
+    id() {
+      return this.$route.query.id
     },
   },
   mounted() {
@@ -40,20 +53,23 @@ export default {
   },
   methods: {
     handleClick(tab, event) {
-      console.log(tab, event);
     }
   }
 };
 </script>
 
+<style lang="scss" scoped>
+.basic_header{
+  padding: 0 !important;
+  width: 100%;
+  align-items: end;
+  border-bottom:0 ;
+}
+</style>
 <style lang="scss">
-.details {
-  width: calc(100% - 40px);
-  height: calc(100% - 40px) !important;
-  padding: 20px;
-  .el-tabs__content{
-    height: calc(100% - 40px);
-    overflow: auto;
+  .basic_header{
+      .el-tabs__header{
+          margin: 0;
+      }
   }
-}
 </style>

src/views/patentMining/components/dialog/addAndEditProject.vue

@@ -291,7 +291,7 @@ export default {
   created() { },
   mounted() {
     // 获取人员列表
-    this.getPermissionPersonnel();
+    // this.getPermissionPersonnel();
   },
   methods: {
     /**
@@ -543,13 +543,11 @@ export default {
     },
     // 选中的研发项目名称
     handleRdName(val) {
-      console.log(val);
       this.$set(this.form,'rdnumber',val.number)
       this.$set(this.form,'rdName',val.name)
     },
     // 监听研发项目名称输入框的值
     changeRdName(val) {
-      console.log(val);
       if (val) {
         if (this.form.rdnumber) {
           let a=this.rdNumberArr.data.findIndex(item => {
@@ -763,6 +761,7 @@ export default {
     this.form.adminIds = []
     this.form.adminPersons = []
     this.personnelList.data = []
+    this.personnelList.queryParams.name = ''
     this.personnelList.queryParams.current = 1
   },
 };

src/views/patentMining/components/excavateTask/excavateTask.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 挖掘任务 -->
-  <div class="excavateTask">
+  <div class="height_100">
     <el-container>
       <el-header style="display: flex;justify-content: space-between;align-items: center;">
         <div>
@@ -10,7 +10,7 @@
           <el-button type="primary" size="small" @click="createTask">创建任务</el-button>
         </div>
       </el-header>
-      <el-main>
+      <el-main class="height_100">
         <el-table :data="tableData" style="width: 100%;" border header-row-class-name="custom-table-header">
           <el-table-column label="#" align="center" width="80px">
             <template slot-scope="scope">
@@ -49,12 +49,10 @@
           </el-table-column>
         </el-table>
       </el-main>
-      <el-footer>
-        <div>
+      <el-footer class="pagination">
           <el-pagination background layout="total, prev, pager, next, jumper" :current-page.sync="queryParams.current"
             :page-size.sync="queryParams.size" @current-change="handleCurrentChange" :total="queryParams.total">
           </el-pagination>
-        </div>
       </el-footer>
     </el-container>
 
@@ -231,5 +229,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.excavateTask {}
 </style>

src/views/patentMining/components/excavateTask/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <excavateTask style="height: 100%;"></excavateTask>
+  <div class="height_100">
+    <excavateTask ></excavateTask>
   </div>
 </template>
 

src/views/patentMining/components/fileMessage.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 详情文件 -->
-  <div class="fileMessage">
+  <div class="height_100">
     <el-container>
       <el-header style="display: flex;justify-content: space-between;align-items: center;">
         <div>
@@ -45,12 +45,10 @@
           </el-table-column>
         </el-table>
       </el-main>
-      <el-footer>
-        <div>
+      <el-footer class="pagination"> 
           <el-pagination background layout="total, prev, pager, next, jumper" :current-page.sync="queryParams.current"
             :page-size.sync="queryParams.size" @current-change="handleCurrentChange" :total="queryParams.total">
           </el-pagination>
-        </div>
       </el-footer>
     </el-container>
 

src/views/patentMining/components/mixins/index.js

@@ -25,16 +25,12 @@ export default {
     // 点击名称等事件
     handleItem(row, key) {
       // 跳转详情页面
-      let router = this.$router.resolve({
+      this.$router.push({
         path: '/details',
         query: {
-          name: row.name,
-          type: row.type,
-          status: row.status,
-          createPerson: row.createPerson,
+          id:row.id
         }
       })
-      window.open(router.href, '_blank')
     },
     //操作列事件
     handleCommand(option, row) {

src/views/patentMining/components/view/commonTable.vue

@@ -14,7 +14,9 @@
         :label="item.name" align="center" sortable="custom">
         <template slot-scope="scope">
           <div v-if="['name'].includes(item.value)">
-            <el-link @click="handleItem(scope.row, item.value)" v-html="$commonJS.getColumnData(scope.row, item)"></el-link>
+            <el-link @click="handleItem(scope.row, item.value)" >
+              <span v-html="$commonJS.getColumnData(scope.row, item)"></span>
+            </el-link>
           </div>
           <div v-else v-html="$commonJS.getColumnData(scope.row, item)"></div>
         </template>

src/views/patentMining/components/viewIndex.vue

@@ -7,7 +7,7 @@
             :disabled="!$permission('/workspace/project/check')"></mySearch>
         </div>
         <div style="display:flex;margin-right:10px">
-          <div id="step2">
+          <div id="step2"  v-if="[2].indexOf(isOperate) == -1">
             <span>分组查询：</span>
             <el-select v-model="group" :disabled="!$permission('/workspace/project/check')" clearable size="small"
               @change="onChange" style="width:200px">

src/views/project/index.vue

@@ -17,8 +17,8 @@
               <mySearch style="width:500px" :SearchFields="searchFiled" @search="search" :searchValue="searchOption"
                 :disabled="!$permission('/workspace/project/check')"></mySearch>
             </div>
-            <div style="display:flex;margin-right:10px" v-if="[2].indexOf(isOperate) == -1">
-              <div id="step2">
+            <div style="display:flex;margin-right:10px">
+              <div id="step2"  v-if="[2].indexOf(isOperate) == -1">
                 <span>分组查询：</span>
                 <el-select v-model="group" :disabled="!$permission('/workspace/project/check')" clearable size="small"
                   @change="onChange" style="width:200px">
@@ -26,7 +26,7 @@
                   </el-option>
                 </el-select>
               </div>
-              <el-button-group class="margin-left_10" id="step3">
+              <el-button-group class="margin-left_10" id="step3"  v-if="[2].indexOf(isOperate) == -1">
                 <el-button :type="queryShowType === '0' ? 'primary' : ''" @click="onChange2('0')"
                   size="small">列表</el-button>
                 <el-button :type="queryShowType === '1' ? 'primary' : ''" @click="onChange2('1')"
@@ -35,17 +35,13 @@
               <el-dropdown id="step4" trigger="click" split-button type="primary" size="small">
                 <span @click="handleAdd" v-disabled="false">新增专利数据库</span>
                 <el-dropdown-menu slot="dropdown" class="text-align_center">
-                  <el-dropdown-item @click.native="handleExport">导出列表</el-dropdown-item>
+                  <el-dropdown-item @click.native="handleExport"  v-if="[2].indexOf(isOperate) == -1">导出列表</el-dropdown-item>
                   <el-dropdown-item @click.native="handleImport"
-                    :disabled="!$permission('/workspace/project/import')">导入数据包</el-dropdown-item>
+                    :disabled="!$permission('/workspace/project/import')"  v-if="[2].indexOf(isOperate) == -1">导入数据包</el-dropdown-item>
                   <el-dropdown-item @click.native="handleField">显示栏位管理</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
-            <div v-else>
-              <el-button type="primary" @click="handleAdd" size="small"
-                v-disabled="!$permission('/workspace/project/add')">新增专利数据库</el-button>
-            </div>
           </el-header>
           <el-main class="workspace-main">
             <div v-loading="loading">

src/views/visual/components/drawer/titleDrawer.vue

@@ -15,7 +15,7 @@
 <script>
   import Project from '@/views/project/index.vue'
   import Report from '@/views/report/components/index.vue'
-  import patentMining from '@/views/patentMining/index.vue'
+  import patentMining from '@/views/patentMining/components/viewIndex.vue'
   export default {
     components: {
       Project,