Browse Source

专利数据库以及图表分析

zhuliu 1 năm trước cách đây
mục cha
commit
479dd05912

+ 10 - 22
src/router/index.js

@@ -369,6 +369,16 @@ const routes = [
             },
             component: () => import('@/views/report/InvalidResponse/components/Evidence/index.vue'),
           },
+          //报告文档
+          {
+            path: '/reportFiles',
+            name: 'reportFiles',
+            meta: {
+              title: '报告文档',
+              sign: 'reportFiles',
+            },
+            component: () => import('@/views/report/components/reportFile/index.vue'),
+          },
         ],
       },
       //任务模块
@@ -411,28 +421,6 @@ const routes = [
         component: () => import('@/views/visual/title/index.vue')
       },
       //图表分析
-      // {
-      //   path: "/analyse",
-      //   component:{render(c){return c('router-view')}},
-      //   redirect:'/analyse',
-      //   children: [
-      //     {
-      //       path: "custom",
-      //       component: () => import('@/views/analyse/custom'),
-      //       meta: {
-      //         title: '自定义分析列表'
-      //       }
-      //     },
-      //     {
-      //       path: "report",
-      //       component: () => import('@/views/analyse/report/create'),
-      //       meta: {
-      //         title: '一键生成报告'
-      //       }
-      //     },
-      //   ]
-      // },
-      //图表分析
       {
         path: "customChart",
         component: () => import('@/views/analyse/custom'),

+ 3 - 0
src/utils/common.js

@@ -391,6 +391,9 @@ export default {
   },
   //校验是否全部上传
   checkUploadFile(data) {
+    if(!data){
+      return []
+    }
     var arr = []
     let allUpload = this.validFile(data,arr)
     if (allUpload) {

+ 1 - 0
src/views/analyse/custom/components/Charts/index.vue

@@ -18,6 +18,7 @@ export default {
       type: String,
       default: '500px'
     },
+    form: Object
   },
   data() {
     return {

+ 51 - 41
src/views/analyse/custom/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="custom-analyse">
-    <el-container v-if="showPage" v-loading="loading">
+    <el-container>
       <el-aside width="350px">
-        <el-container>
+        <!-- <el-container>
           <el-header class="custom-analyse-tabs">
             <el-tabs v-model="activeTab" type="card">
               <el-tab-pane label="分析项" name="TabItem"></el-tab-pane>
@@ -11,36 +11,33 @@
               <el-tab-pane label="辅助线" name="TabLine" :disabled="enable.indexOf(form.setting.type) === -1"></el-tab-pane>
             </el-tabs>
           </el-header>
-          <el-main class="nopadding">
-            <component
+          <el-main class="nopadding"> -->
+            <!-- <component
                 :is="activeTab"
                 :active-item="activeItem"
                 @edit="handleEdit"
                 @delete="handleDelete"
                 @select="handleSelect"
-            ></component>
-          </el-main>
-        </el-container>
+            ></component> -->
+          <!-- </el-main>
+        </el-container> -->
+        <TabItem :active-item="activeItem" @edit="handleEdit" @delete="handleDelete" @select="handleSelect"></TabItem>
       </el-aside>
       <el-container>
         <el-header>
           <template>
-            <div class="custom-analyse-chart-title">
-              <span>{{ chartTitle }}</span>
-            </div>
             <div class="custom-analyse-options">
               <span class="text">专利数量<span class="number">{{ patentNum }} 件</span></span>
-              <el-button size="small" type="primary" @click="handleAdd3" :disabled="!($permission('/workspace/folder/analyticSystem/chartAnalysis/addGroup') && $r(projectId,[1,2]))">添加组</el-button>
-              <el-button size="small" type="success" @click="submit" :loading="loadingBtn">预览图表</el-button>
+              <el-button size="small" type="primary" @click="handleAdd3">添加组</el-button>
               <el-dropdown size="small">
-                <el-button size="small" type="warning" :disabled="!$permission('/workspace/folder/analyticSystem/chartAnalysis/moreMenu')">
+                <el-button size="small" type="warning">
                   更多菜单<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item @click.native="handleScreenshot" :disabled="!($permission('/workspace/folder/analyticSystem/chartAnalysis/moreMenu/screenShot') && $r(projectId,[1,2,4]))">截图</el-dropdown-item>
-                  <el-dropdown-item @click.native="handleAdd1(0)" :disabled="!($permission('/workspace/folder/analyticSystem/chartAnalysis/moreMenu/save') && $r(projectId,[1,2]))">保存修改</el-dropdown-item>
-                  <el-dropdown-item @click.native="handleAdd1(1)" :disabled="!$permission('/workspace/folder/analyticSystem/chartAnalysis/moreMenu/saveAs')">另存为</el-dropdown-item>
-                  <el-dropdown-item @click.native="handleExport" :disabled="!($permission('/workspace/folder/analyticSystem/chartAnalysis/moreMenu/export') && $r(projectId,[1,2,4]))">导出数据</el-dropdown-item>
+                  <el-dropdown-item @click.native="handleScreenshot">截图</el-dropdown-item>
+                  <el-dropdown-item @click.native="handleAdd1(0)">保存修改</el-dropdown-item>
+                  <el-dropdown-item @click.native="handleAdd1(1)">另存为</el-dropdown-item>
+                  <el-dropdown-item @click.native="handleExport">导出数据</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -48,7 +45,7 @@
         </el-header>
         <el-main class="custom-analyse-chart-img-box">
           <div v-if="showChart">
-            <chart ref="chartDom" :width="form.setting.width + form.setting.widthUnit" :height="form.setting.height + form.setting.heightUnit" />
+            <chart ref="chartDom" :form="from" :width="form.setting.width + form.setting.widthUnit" :height="form.setting.height + form.setting.heightUnit" />
           </div>
         </el-main>
       </el-container>
@@ -58,7 +55,7 @@
       <el-form v-if="dialogVisible" ref="ruleForm" :model="form2" :rules="rules" label-position="left" label-width="100px">
         <el-form-item label="所属组" prop="parentId" v-if="form2.type">
           <el-select v-model="form2.parentId" filterable allow-create placeholder="请选择" style="width: 100%">
-            <el-option v-for="item in treeList" :label="item.name" :value="item.id"></el-option>
+            <el-option v-for="item in treeList" :label="item.name" :key="item.id" :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item :label="`${form2.type ? '项目名称' : '组名称'}`" prop="name">
@@ -69,7 +66,7 @@
         </el-form-item>
         <el-form-item label="使用权限" prop="permissions" v-if="form2.type">
           <el-select v-model="form2.permissions" placeholder="请选择" style="width: 100%">
-            <el-option v-for="item in $constants.permissions" :label="item.label" :value="item.value"></el-option>
+            <el-option v-for="item in $constants.permissions" :label="item.label" :key="item.value" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -78,6 +75,16 @@
         <el-button type="primary" @click="handleConfirm" :loading="loadingBtn">确 定</el-button>
       </div>
     </el-dialog>
+    <el-drawer
+        title="图表配置"
+        :visible.sync="drawer"
+        direction="rtl"
+        :before-close="handleClose"
+        size="500px">
+        <div style="width:500px">
+            <Style :form="form"></Style> 
+        </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -92,8 +99,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { detectionChartType, getFormPermissions, getTreeNameByIds, getXAxisName, getSourceName } from "@/utils/chart";
 import TabItem from "./components/Tabs/Item";
 import TabData from "./components/Tabs/Data";
-import TabStyle from "./components/Tabs/Style";
-import TabLine from "./components/Tabs/Line";
+// import TabLine from "./components/Tabs/Line";
 import html2canvas from "html2canvas";
 
 export default {
@@ -126,7 +132,6 @@ export default {
           {required: true, message: '请输入显示次序', trigger: 'blur'},
         ],
       },
-      patentNum: 0,
       showChart: true,
       showPage: false,
       loadingBtn2: false,
@@ -143,19 +148,30 @@ export default {
       tempForm: {
         name: '',
         sort: 0
-      }
+      },
+      //图形配置
+      form:{}
     }
   },
   computed: {
-    ...mapGetters(['userinfo', 'projectId', 'customField', 'patentField'])
+    ...mapGetters(['userinfo']),
+    search(){
+        var a = this.$route.query.search
+        if(a){
+            a = JSON.parse(a)
+        }
+        return a
+    },
+    projectId(){
+        return this.$route.query.projectId
+    },
+    patentNum(){
+        return this.$route.query.patentNum || 0
+    },
   },
   mounted() {
-    this.showPage = false
-    if (this.patentKey) {
-      this.getPatentListNum()
-    } else {
-      this.errorPage()
-    }
+
+    this.getData()
   },
   methods: {
     normalizer(node) {
@@ -183,9 +199,7 @@ export default {
 
     },
     // 获取???
-    getPatentListNum() {
-      this.$api.getPatentListNum({patentKey: this.patentKey}).then(async (response) => {
-        this.patentNum = response.data
+    async getData() {
         await this.getTreeList()
         if (this.treeList.length === 0 || this.treeList[0].children.length === 0) {
           this.handleAdd()
@@ -196,9 +210,7 @@ export default {
           await this.handleSelect(this.treeList[0].children[0].uid)
         }
         this.showPage = true
-      }).catch(error => {
-        this.errorPage()
-      })
+
     },
     handleDelete(value) {
       this.$confirm('确认删除本条数据吗?', '提示', {
@@ -228,7 +240,7 @@ export default {
       this.setChildren(this.treeList, 'isDisabled')
       this.loading = false
     },
-    beforeClose() {
+    handleClose() {
       this.drawer = false
     },
     setChildren(arr, key) {
@@ -401,8 +413,8 @@ export default {
           y: []
         },
       }
+      this.form = form
       this.$store.commit('SET_CHART_FORM', form)
-      this.drawer = true
     },
     async handleEdit(value) {
       this.title = '编辑组'
@@ -598,7 +610,6 @@ export default {
         this.$message.error('请选择图表类型')
         return false
       }
-      this.drawer = false
       await this.getDataCount()
       this.refreshChart()
       this.showChart = true
@@ -683,7 +694,6 @@ export default {
             }
             await this.getTreeList()
             this.loadingBtn = false
-            this.drawer = false
             this.handleClose()
           } catch (e) {
             this.loadingBtn = false

+ 3 - 3
src/views/analyse/custom/mixins.js

@@ -6,9 +6,9 @@ import html2canvas from 'html2canvas'
 
 export const customPage = {
   computed: {
-    form() {
-      return this.$store.state.chart.form
-    },
+    // form() {
+    //   return this.$store.state.chart.form
+    // },
     changeNum() {
       return this.$store.state.chart.changeNum
     },

+ 1 - 1
src/views/components/errorPage/components/ErrorPageLayout.vue

@@ -3,7 +3,7 @@
       <div class="error-page-svg">
         <slot />
       </div>
-      <router-link to="/">
+      <router-link to="/home">
         <el-button type="primary">回到首页</el-button>
       </router-link>
     </div>

+ 231 - 0
src/views/project/components/drawer/File.vue

@@ -0,0 +1,231 @@
+<template>
+  <div>
+    <el-drawer class="custom-drawer-form" title="其它附件管理" size="1000px" :visible.sync="drawer" direction="rtl" :before-close="close" destroy-on-close>
+      <el-container class="project-file">
+        <el-header>
+          <el-form :inline="true" class="project-file-header-form">
+            <el-form-item label="名称">
+              <el-input v-model="queryParams.name" size="small" placeholder="请输入文件名称"></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="" size="small" @click="getList">查询</el-button>
+              <el-button type="primary" size="small" @click="handleAdd()">新增</el-button>
+            </el-form-item>
+          </el-form>
+        </el-header>
+        <el-main class="project-file-main">
+          <el-table v-loading="loading" :data="tableData" border header-row-class-name="custom-table-header">
+            <el-table-column type="index" label="#" width="55" align="center"></el-table-column>
+            <el-table-column prop="name" label="名称" align="center" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="suffix" label="类型" align="center" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="projectName" label="所属专题库" align="center" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="createName" label="创建人" align="center" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="createTime" label="创建时间" align="center" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{ $d(scope.row.createTime) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="150">
+              <template slot-scope="scope">
+                <el-dropdown  split-button type="primary" size="small" >
+                  <span @click="handleEdit(scope.row)">编辑</span>
+                  <el-dropdown-menu slot="dropdown" class="text-align_center">
+                    <el-dropdown-item @click.native="handleDownload(scope.row)">下载</el-dropdown-item>
+                    <el-dropdown-item @click.native="preview(scope.row)">预览</el-dropdown-item>
+                    <el-dropdown-item divided class="color-red" @click.native="handleDelete(scope.row)">删除</el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+                <!-- <el-button  size="small" type="primary" @click="handleDownload(scope.row)">下载</el-button> -->
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-main>
+        <el-footer class="footer-common">
+          <el-button @click="close">关 闭</el-button>
+        </el-footer>
+      </el-container>
+    </el-drawer>
+
+    <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" append-to-body destroy-on-close :before-close="cancel">
+      <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="80px" label-position="left">
+        <el-form-item label="文件名称" prop="name">
+          <el-input v-model="ruleForm.name" placeholder="请输入文件名称"></el-input>
+        </el-form-item>
+        <el-form-item label="文件选择" class="margin-bottom_0" required>
+          <el-upload class="upload-file" drag action="#" :auto-upload="false" :show-file-list="false" :on-change="onChange">
+            <i :class="!ruleForm.file ? 'el-icon-upload' : 'el-icon-refresh'"></i>
+            <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
+            <div class="el-upload__tip" slot="tip"></div>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submit" :loading="btnLoading">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+export default {
+  data() {
+    return {
+      type: 0,
+      projectId: 0,
+      drawer: false,
+      loading: false,
+      btnLoading: false,
+      total: 0,
+      tableData: [],
+      queryParams: {
+        name: '',
+        type: '',
+        size: 10,
+        current: 1,
+        projectId: 0,
+        order: 'desc'
+      },
+      title: '',
+      dialogVisible: false,
+      ruleForm: {},
+      rules: {
+        name: [{ required: true, message: '请输入文件名称', trigger: 'blur' },],
+      },
+    }
+  },
+  computed: {
+
+  },
+  mounted() {
+  },
+  methods: {
+    close() {
+      this.drawer = false
+      this.$emit('close')
+    },
+    open(id, type) {
+      this.type = type
+      this.projectId = id
+      this.queryParams.projectId = id
+      this.queryParams.type = type
+      this.drawer = true
+      this.getList()
+    },
+    onChange(file, fileList) {
+      this.$set(this.ruleForm, 'name', file.name.substring(0, file.name.lastIndexOf(".")))
+      this.$set(this.ruleForm, 'file', file.raw)
+    },
+    getList() {
+      this.loading = true
+      this.$api.getProjectFileList(this.queryParams).then(response => {
+        this.tableData = response.data.records
+        this.total = response.data.total
+        this.loading = false
+      }).catch(error => {
+        this.loading = false
+      })
+    },
+
+    cancel() {
+      this.$set(this.ruleForm, 'name', '')
+      this.$set(this.ruleForm, 'file', undefined)
+      this.$set(this.ruleForm, 'remark', '')
+      this.$set(this.ruleForm, 'type', this.type)
+      this.$set(this.ruleForm, 'id', undefined)
+      this.dialogVisible = false
+    },
+    handleAdd() {
+      this.title = '新增'
+      this.$set(this.ruleForm, 'type', this.type)
+      this.dialogVisible = true
+    },
+    handleEdit(row) {
+      this.title = '编辑'
+      this.dialogVisible = true
+      this.ruleForm = { ...row }
+    },
+    handleDownload(row) {
+      downLoad2(row.url)
+    },
+    submit() {
+      if (!this.ruleForm.id && !this.ruleForm.file) {
+        this.$message.error('请选择文件')
+        return false
+      }
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          let formData = new FormData()
+          formData.append('projectId', this.projectId)
+          formData.append('name', this.ruleForm.name)
+          if (this.ruleForm.file) {
+            formData.append('file', this.ruleForm.file)
+          }
+          formData.append('remark', this.ruleForm.remark || '')
+          formData.append('type', this.ruleForm.type)
+          this.btnLoading = true
+          if (this.ruleForm.id) {
+            formData.append('id', this.ruleForm.id)
+            formData.append('url', this.ruleForm.url)
+            this.$api.editProjectFile(formData).then(response => {
+              this.$message.success('编辑成功')
+              this.btnLoading = false
+              this.getList()
+              this.cancel()
+            }).catch(error => {
+              this.btnLoading = false
+            })
+          } else {
+            this.$api.addProjectFile(formData).then(response => {
+              this.$message.success('新增成功')
+              this.btnLoading = false
+              this.getList()
+              this.cancel()
+            }).catch(error => {
+              this.btnLoading = false
+            })
+          }
+        }
+      })
+    },
+    handleDelete(row) {
+      this.$confirm('确认删除本条数据吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.loading = true
+        this.$api.deleteProjectFile({ id: row.id }).then(response => {
+          this.$message.success('删除成功')
+          this.loading = false
+          this.getList()
+        }).catch(error => {
+          this.loading = false
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.project-file {
+  height: 100%;
+  .margin-bottom_0 {
+    margin-bottom: 0 !important;
+  }
+  .pagination {
+    text-align: center;
+    margin: 20px 0;
+  }
+  .project-file-header-form {
+    margin-left: 20px;
+  }
+  .project-file-main {
+    background: #fff;
+    padding: 5px 20px;
+    margin-top: 20px;
+  }
+}
+</style>

+ 34 - 2
src/views/project/components/drawer/form.vue

@@ -139,6 +139,9 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-form-item label="附件" prop="systemFileList">
+              <myUpload :file-list="ruleForm.systemFileList" @on-change="onchangeFile" @on-remove="onRemove" style="height: 180px;" :autoUpload="true"></myUpload>
+            </el-form-item>
             <el-form-item label="备注" prop="description">
               <el-input v-model="ruleForm.description" placeholder="请输入备注" type="textarea"></el-input>
             </el-form-item>
@@ -543,7 +546,31 @@ export default {
         this.show = false
       }
     },
-
+    // 上传的文件监听
+    onchangeFile(file, fileList) {
+      if(!this.ruleForm.systemFileList){
+        this.$set(this.ruleForm,'systemFileList',[])
+      }
+      if (file.guid) {
+        let index = this.ruleForm.systemFileList.findIndex(item => {
+          return item.uid == file.uid
+        })
+        if (index != -1) {
+          this.ruleForm.systemFileList.splice(index, 1, file)
+        }
+      } else {
+        this.ruleForm.systemFileList.push(file.raw)
+      }
+    },
+    // 删除上传的文件
+    onRemove(file, fileList) {
+      let index = this.ruleForm.systemFileList.findIndex(item => {
+        return item.uid == file.uid
+      })
+      if (index != -1) {
+        this.ruleForm.systemFileList.splice(index, 1)
+      }
+    },
     //提交数据
     submit() {
       this.$refs.ruleForm.validate((valid) => {
@@ -568,7 +595,12 @@ export default {
               )
             })
           }
-         
+         // 判断文件是否都上传完毕
+         var guids = this.$commonJS.checkUploadFile(this.ruleForm.systemFile)
+            if(!guids){
+                return false
+            }
+            this.form.fileGuids = guids
           if (this.ruleForm.id) {
             this.$api.updatePatentProject(this.ruleForm).then(response => {
               this.loading = false

+ 5 - 1
src/views/project/components/view/MergeTable.vue

@@ -95,4 +95,8 @@ export default {
 }
 </script>
 
-<style lang="scss">.workspace-merge-table {}</style>
+<style lang="scss">
+.workspace-merge-table {
+  
+}
+</style>

+ 2 - 2
src/views/project/components/view/card.vue

@@ -23,8 +23,8 @@
                   <el-dropdown-item command="3">任务清单</el-dropdown-item>
                 <el-dropdown-item command="5" :disabled="!$permission('/workspace/project/report_manage')">报告管理</el-dropdown-item>
                 <el-dropdown-item command="6" v-if="item.isCategory == 1&& $permission('/workspace/product')">产品架构</el-dropdown-item>
-                <el-dropdown-item command="7" v-if="$permission('/workspace/event')">事 件</el-dropdown-item>
-                <el-dropdown-item command="8" :disabled="!$permission('/workspace/project/other_accessories')">其它附件</el-dropdown-item>
+                <!-- <el-dropdown-item command="7" v-if="$permission('/workspace/event')">事 件</el-dropdown-item> -->
+                <!-- <el-dropdown-item command="8" :disabled="!$permission('/workspace/project/other_accessories')">其它附件</el-dropdown-item> -->
                 <el-dropdown-item command="9" :disabled="!($permission('/workspace/project/project_share')&&$r(item.id,[2]))">项目分享</el-dropdown-item>
                 
                 </el-dropdown-menu>

+ 2 - 2
src/views/project/components/view/table.vue

@@ -39,8 +39,8 @@
                 <el-dropdown-item command="3">任务清单</el-dropdown-item>
                 <el-dropdown-item command="5">报告管理</el-dropdown-item>
                 <el-dropdown-item command="6">产品架构</el-dropdown-item>
-                <el-dropdown-item command="7">事件</el-dropdown-item>
-                <el-dropdown-item command="8">其他附件</el-dropdown-item>
+                <!-- <el-dropdown-item command="7">事件</el-dropdown-item> -->
+                <!-- <el-dropdown-item command="8">其他附件</el-dropdown-item> -->
                 <el-dropdown-item command="9">项目分享</el-dropdown-item>
                 <el-dropdown-item command="10" divided style="color:red">删 除</el-dropdown-item>
               </el-dropdown-menu>

+ 33 - 1
src/views/project/index.vue

@@ -408,15 +408,18 @@ export default {
           this.patentImport(row,4)
           break
         case '3'://任务清单
-          this.handleFile(row, 0)
+          this.taskList(row)
           break
         case '5'://报告管理
+          this.reportFile(row)
           break
         case '6'://产品架构
+          this.framework(row)
           break
         case '7'://事件
           break
         case '8'://其他附件
+          this.otherFiles(row)
           break;
         case '9'://项目分享
           break;
@@ -428,6 +431,35 @@ export default {
           break
       }
     },
+    otherFiles(row){
+
+    },
+    //任务清单
+    taskList(row){
+      this.$router.push(
+        {
+          path:'/myTask',
+          query:{
+            projectId:row.id
+          }
+        }
+      )
+    },
+    //报告文档
+    reportFile(row){
+      this.$router.push(
+        {
+          path:'/reportFiles',
+          query:{
+            projectId:row.id
+          }
+        }
+      )
+    },
+    //架构
+    framework(row){
+
+    },
     //专利导入
     patentImport(row,type){
       var form = {

+ 7 - 8
src/views/project/patentCollection/index.vue

@@ -99,8 +99,6 @@
                     </el-dropdown-menu>
                   </el-dropdown>
                 </el-dropdown-item>
-                <!-- <el-dropdown-item @click.native="handleAnalyse('custom')"
-                  :disabled="!($permission('/workspace/folder/analyticSystem/chartAnalysis') && $r(projectId, [1, 2, 4]))">图表分析</el-dropdown-item> -->
                 <el-dropdown-item @click.native="handleAnalyses">图表分析</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -599,16 +597,17 @@ export default {
     },
     //图表分析
     async handleAnalyses() {
-      // this.chartLoading = true
-      // const key = await this.saveSelectPatent(false)
-      // this.chartLoading = false
-      let key = '6da6c3df8b54450aac71617dce3e8a71'
-      // this.$store.commit('SET_PATENT_KEY', key)
+      var params = {
+        searchQuery: this.searchStr || '',//检索条件
+        customFields: this.customFields || [],
+        orderDTOList: this.sort,//排序信息
+      }
       const router = this.$router.resolve({
         path: '/customChart',
         query: {
           projectId: this.projectId,
-          key: key
+          search:JSON.stringify(params),
+          patentNum:this.total
         }
       })
       window.open(router.href, '_blank');

+ 30 - 0
src/views/report/components/reportFile/index.vue

@@ -0,0 +1,30 @@
+<template>
+  <div class="height_100">
+    <reportFileTable :projectId="projectId"></reportFileTable>
+  </div>
+</template>
+
+<script>
+import reportFileTable from './reportFileTable.vue';
+export default {
+  components: {
+    reportFileTable
+  },
+  props: {},
+  data() {
+    return {
+    };
+  },
+  watch: {},
+  computed: {
+    projectId(){
+        return this.$route.query.projectId
+    }
+  },
+  created() {},
+  mounted() {},
+  methods: {},
+};
+</script>
+<style lang="scss" scoped>
+</style>

+ 1 - 1
src/views/report/components/reportFile/reportFileTable.vue

@@ -108,7 +108,7 @@ export default {
           value: "type",
         },
         {
-          name: "所属报告",
+          name: "所属项目",
           type: "String",
           value: "projectName",
         },