浏览代码

价值曲线

zhuliu 1 年之前
父节点
当前提交
dd3c3a59c7
共有 47 个文件被更改,包括 480 次插入3699 次删除
  1. 0 286
      src/api/InvalidResponse.js
  2. 0 76
      src/api/custom.js
  3. 0 70
      src/api/data.js
  4. 0 35
      src/api/download.js
  5. 0 40
      src/api/field.js
  6. 0 40
      src/api/highlight.js
  7. 0 41
      src/api/importPatent.js
  8. 33 33
      src/api/index.js
  9. 0 24
      src/api/matters.js
  10. 16 0
      src/api/newApi/importAndExport.js
  11. 10 0
      src/api/newApi/otherPatentInformation.js
  12. 0 60
      src/api/oauth2.js
  13. 0 333
      src/api/patent.js
  14. 10 0
      src/api/permission.js
  15. 0 220
      src/api/product.js
  16. 0 393
      src/api/project.js
  17. 0 97
      src/api/quartz.js
  18. 0 580
      src/api/report.js
  19. 0 54
      src/api/reportManage.js
  20. 0 26
      src/api/task.js
  21. 0 134
      src/api/template.js
  22. 2 28
      src/api/user.js
  23. 6 3
      src/router/index.js
  24. 33 0
      src/utils/common.js
  25. 3 0
      src/utils/permissions.js
  26. 2 20
      src/views/analyse/custom/index.vue
  27. 0 708
      src/views/analyse/custom/index1.vue
  28. 17 16
      src/views/components/import/conditionImport/components/search_history.vue
  29. 1 16
      src/views/components/indicia/components/mixins.js
  30. 0 1
      src/views/home/components/echarts/components/report.vue
  31. 2 0
      src/views/project/patentCollection/components/mixins/fastSelectPatent.js
  32. 7 7
      src/views/project/patentCollection/components/mixins/index.js
  33. 2 2
      src/views/project/patentCollection/components/views/Table.vue
  34. 9 9
      src/views/project/patentCollection/index.vue
  35. 225 307
      src/views/project/patentDetails/components/patentMessage/history/echarts/components/MultipleLine/index.vue
  36. 20 17
      src/views/project/patentDetails/components/patentMessage/history/echarts/components/echarts.vue
  37. 5 2
      src/views/project/patentDetails/components/patentMessage/history/echarts/index.vue
  38. 2 2
      src/views/project/patentDetails/components/patentMessage/history/licenseHistory.vue
  39. 11 3
      src/views/report/InvalidResponse/components/Evidence/evidence.vue
  40. 6 2
      src/views/report/InvalidResponse/components/powerManage/powerManage.vue
  41. 10 2
      src/views/report/InvalidResponse/components/reasonsAndEvidence/details.vue
  42. 20 4
      src/views/report/InvalidResponse/components/reasonsAndEvidence/reasonsAndEvidence.vue
  43. 6 2
      src/views/report/analysisAndOpinion/components/comparisonResults/index.vue
  44. 5 1
      src/views/report/components/details/components/splitDetails.vue
  45. 6 2
      src/views/report/components/patentList/components/index.vue
  46. 4 0
      src/views/report/components/productResult/productResult.vue
  47. 7 3
      src/views/report/tort/components/informationEntry/indexMenu.vue

+ 0 - 286
src/api/InvalidResponse.js

@@ -1,286 +0,0 @@
-import axios from '@/utils/axios';
-
-export default {
-  /**
- * 查询excel导入
- */
-  importProjectPatent(params) {
-    return axios.post('/v2/project/import/patent', params)
-  },
-   /**
-   * 获取专利数据库文件夹列表
-   */
-   getProjectFolderList(params) {
-    return axios.get('/v2/project/folder/list', { params })
-  },
-   /**
-   * 获取自定义字段
-   */
-  getCustomField(params) {
-    return axios.get('/v2/field/custom', { params, loading: false })
-  },
-   /**
-   * 获取导入任务列表
-   */
-   getTaskList(params) {
-    return axios.get('/v2/task/list', { params })
-  },
-  /**
-   * 获取队列
-   */
-  getQueueList(params) {
-    return axios.get('/v2/task/queue', { params })
-  },
-  /**
-   * 删除导入成功的任务
-   */
-  deleteTask(params) {
-    return axios({
-      url: '/v2/task/delete',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
- * 查询无效证据和无效请求书
- */
-  queryProof(params) {
-    return axios.post('/report/api/CompareFiles/queryProof', params)
-  },
-  /**
- * 上传非专利文献
- */
-  addProofByFile(params) {
-    return axios.post('/report/api/CompareFiles/addProofByFile', params)
-  },
-  /**
- * 无效流程无效事务添加
- */
-  addInvalidProcess(params) {
-    return axios.post('/report/api/invalidProcess/add', params)
-  },
-  /**
- * 无效流程无效事务修改
- */
-  updateInvalidProcess(params) {
-    return axios.post('/report/api/invalidProcess/update', params)
-  },
-  /**
- * 无效流程无效事务查询
- */
-  queryInvalidProcess(params) {
-    return axios.get('/report/api/invalidProcess/query', {params})
-  },
-  /**
- * 无效流程无效事务删除
- */
-  deleteInvalidProcess(params) {
-    return axios.get('/report/api/invalidProcess/delete', {params})
-  },
-  /**
- * 无效理由和证据:添加无效理由和证据
- */
-  addInvalidReason(params) {
-    return axios.post('/report/api/invalidReason/addInvalidReason', params)
-  },
-  /**
- * 根据专利号查询专利
- */
-  getFeatureRights(params) {
-    return axios.get('/report/api/feature/getRights', {params})
-  },
-  /**
- * 添加特征
- */
-  addSingleFeature(params) {
-    return axios.post('/report/api/feature/addSingleFeature', params)
-  },
-  /**
- * 删除单个特征
- */
-  deleteSingleFeature(params) {
-    return axios.get('/report/api/feature/deleteSingleFeature', {params})
-  },
-  /**
- * 查询特征
- */
-  getFeatureList(params) {
-    return axios.get('/report/api/feature/getFeatureList', {params})
-  },
-   /**
- * 查询证据组合详情
- */
-   queryDetailByInvalidId(params) {
-    return axios.get('/report/api/proofGroup/queryDetailByInvalidId', {params})
-  },
-    /**
- * 修改证据组合详情
- */
-    updateProofGroup(params) {
-      return axios.post('/report/api/proofGroup/update', params)
-    },
-  /**
- * 添加或更新无效证据
- */
-  addOrUpdatePoofArguments(params) {
-    return axios.post('/report/api/arguments/addOrUpdatePoofArguments', params)
-  },
-  
-   /**
- * 添加更新无效证据
- */
-   addOrUpdateProofStr(params) {
-    return axios.post('/report/api/proof/addOrUpdateProofStr', params)
-  },
-   /**
- * 删除无效证据arguments/deleteProofStr
- */
-   deleteProofStr(params) {
-    // return axios.post('/report/api/proof/deleteProofStr', params)
-    return axios.post('/report/api/arguments/deleteProofStr', params)
-  },
-  /**
- * 查询陈述意见列表
- */
-  queryPoofArguments(params) {
-    return axios.get('/report/api/arguments/queryPoofArguments', {params})
-  },
-  /**
- * 查询无效理由和证据
- */
-  queryInvalidReason(params) {
-    return axios.get('/report/api/invalidReason/queryInvalidReason', {params})
-  },
-  /**
- * 更新无效理由和证据
- */
-  updateInvalidReason(params) {
-    return axios.post('/report/api/invalidReason/updateInvalidReason', params)
-  },
-   /**
- * 更新无效理由和证据的陈述意见
- */
-   updateArgumentStr(params) {
-    return axios.post('/report/api/invalidReason/updateArgumentStr', params)
-  },
-  /**
- * 删除无效理由和证据
- */
-  deleteInvalidReason(params) {
-    return axios.post('/report/api/invalidReason/deleteInvalidReason', params)
-  },
-  /**
- * 根据特征查询证据
- */
-  queryProofStr(params) {
-    return axios.get('/report/api/arguments/queryProofStr', {params})
-  },
-  /**
- * 添加陈述意见
- */
-  addArguments(params) {
-    return axios.post('/report/api/arguments/addArguments', params)
-  },
-  /**
- * 删除陈述意见
- */
-  deletePoofArguments(params) {
-    return axios.post('/report/api/arguments/deleteArguments', params)
-  },
-  /**
- * 划词查询陈述意见
- */
-  queryScratchs(params) {
-    return axios.get('/report/api/arguments/queryScratchs', {params})
-  },
-  /**
- * 划词编辑陈述意见
- */
-  updateArguments(params) {
-    return axios.post('/report/api/arguments/updateArgument', params)
-  },
-  /**
- * 生成陈述意见方案
- */
-  addArgumentsScenario(params) {
-    return axios.post('/report/api/argumentsScenario/add', params)
-  },
-  /**
- * 查询陈述意见方案
- */
-  queryArgumentsScenario(params) {
-    return axios.get('/report/api/argumentsScenario/query', {params})
-  },
-  /**
- * 删除陈述意见方案
- */
-  deleteArgumentsScenario(params) {
-    return axios.post('/report/api/argumentsScenario/delete', params)
-  },
-  /**
- * 更新陈述意见方案
- */
-  updataArgumentsScenario(params) {
-    return axios.post('/report/api/argumentsScenario/updata', params)
-  },
-
-   /**
- * 证据文献排序
- */
-   addProodOrder(params) {
-    return axios.post('/report/api/CompareFiles/order/addProodOrder', params)
-  },
-  
-
-
-/**
- * 添加自定义栏位
- */
-addOrUpdateInvalidFields(params) {
-  return axios.post('/report/api/invalidReasonField/addOrUpdateFields', params)
-},
-/**
- *  查询自定义栏位
- */
-queryInvalidFields(params) {
-  return axios.get('/report/api/invalidReasonField/queryFields', {params})
-},
-
-/**
- * 删除自定义栏位
- */
-deleteInvalidFields(params) {
-  return axios.post('/report/api/invalidReasonField/deleteFields', params)
-},
-/**
- * 更新自定义栏位排序和显示
- */
-updateSort(params) {
-  return axios.post('/report/api/invalidReasonField/updateSort', params)
-},
-
-/**
- * 添加或更新无效理由自定义字段值
- */
-addOrUpdateValue(params) {
-  return axios.post('/report/api/invalidReason/addOrUpdateValue', params)
-},
-/**
- * 导出无效理由列表
- */
-exportInvalid(params) {
-  return axios.get('/report/api/invalidReason/exportInvalid', {params})
-},
-/**
- * 删除证据文献
- */
-deleteCompareFile(params) {
-  return axios.post('/report/api/compare/deleteCompareFile', params)
-},
-/**
- * 删除划词陈述意见
- */
-deleteArguments(params) {
-  return axios.post('/report/api/arguments/deleteArguments', params)
-},
-}

+ 0 - 76
src/api/custom.js

@@ -1,76 +0,0 @@
-import axios from '@/utils/axios'
-
-export default {
-  /**
-   * 获取自定义分析树
-   */
-  getCustomTree(params) {
-    return axios.get('/v2/custom/analysis/item/tree', { params })
-  },
-  /**
-   * 获取自定义分析项
-   */
-  getCustomItem(data) {
-    return axios.get('/v2/custom/analysis/item/' + data)
-  },
-  /**
-   * 新增自定义分析项
-   */
-  addCustomItem(data) {
-    return axios.post('/v2/custom/analysis/item/add', data)
-  },
-  /**
-   * 编辑自定义分析项
-   */
-  editCustomItem(data) {
-    return axios.post('/v2/custom/analysis/item/edit', data)
-  },
-  /**
-   * 根据ID删除自定义分析项
-   */
-  deleteCustomItem(data) {
-    return axios.post('/v2/custom/analysis/item/delete/' + data)
-  },
-  /**
-   * 根据IDS删除自定义分析项
-   */
-  deleteBatchCustomItem(data) {
-    return axios.post('/custom/analysis/item/delete/batch', data)
-  },
-  /**
-   * 获取分析项图表配置
-   */
-  getCustomItemChartOption(data) {
-    return axios.get('/v2/custom/analysis/item/setting/' + data)
-  },
-  /**
-   * 修改分析项图表配置
-   */
-  editCustomItemChartOption(data) {
-    return axios.post('/v2/custom/analysis/item/setting/edit', data)
-  },
-  /**
-   * 新增分析项图表配置
-   */
-  addCustomItemChartOption(itemId, data) {
-    return axios.post('/v2/custom/analysis/item/setting/add?id=' + itemId, data)
-  },
-  /**
-   * 编辑维度数据
-   */
-  editCustomItemSource(data) {
-    return axios.post('/v2/custom/analysis/item/source/update', data)
-  },
-  /**
-   * 获取维度数据
-   */
-  getCustomItemSourceDataList(data) {
-    return axios.post('/v2/custom/analysis/item/source', data)
-  },
-  /**
-   * 获取分析项颜色设置
-   */
-  getItemSettingColor(params) {
-    return axios.get('/v2/custom/analysis/item/color', { params })
-  }
-}

+ 0 - 70
src/api/data.js

@@ -1,70 +0,0 @@
-import axios from '@/utils/axios'
-
-export default {
-  /**
-   * 获取分析结果(统计)
-   */
-  getDataCount(data) {
-    return axios.post('/v2/data/analysis/count', data)
-  },
-  /**
-   * 专利多维度分析
-   */
-  getAnalysisData(data) {
-    return axios.post('/v2/data/analysis', data)
-  },
-  /**
-   * 专利数据源
-   */
-  getAnalysisSource(params) {
-    return axios.get('/v2/data/analysis/source', { params })
-  },
-  /**
-   * 获取分析结果(矩阵)
-   */
-  getDataMatrix(data) {
-    return axios.post('/v1/data/analysis/matrix', data)
-  },
-  /**
-   * 根据key获取待分析的专利数量
-   */
-  getPatentListNum(params) {
-    return axios.get('/v2/data/analysis/patentNum', { params })
-  },
-  /**
-   * 获取分析专利数量
-   */
-  getPatentTotal(params) {
-    return axios.get('/v2/data/analysis/patent/total', { params })
-  },
-  /**
-   * 根据key获取待分析的专利
-   */
-  getPatentList(data) {
-    return axios.post('/v1/data/analysis/patent', data)
-  },
-  /**
-   * 获取维度数据
-   */
-  getSourceDataList(data) {
-    return axios.post('/v2/data/analysis/source', data)
-  },
-  /**
-   * 新增维度数据
-   */
-  addSourceData(data) {
-    return axios.post('/data/source/add', data)
-  },
-  /**
-   * 编辑维度数据
-   */
-  editSourceData(data) {
-    return axios.post('/data/source/edit', data)
-  },
-  /**
-   * 删除维度数据
-   */
-  deleteSourceData(data) {
-    return axios.post('/data/source/delete', data)
-  }
-}

+ 0 - 35
src/api/download.js

@@ -1,35 +0,0 @@
-import axios from '@/utils/axios'
-
-export default {
-  /**
-   * 获取用户报告下载列表
-   */
-  getReportDownloadList(params) {
-    return axios.get('/v2/report/download/record/list', { params })
-  },
-  /**
-   * 获取用户生成中的文件数量
-   */
-  getCurrentGenFileNum() {
-    return axios.get('/v2/report/download/record/currentNum')
-  },
-  /**
-   * 重新生成报告文件
-   */
-  resetReportFile(data) {
-    return axios.post('/v1/new/report/resetFile', data)
-  },
-  /**
-   * 删除报告记录
-   */
-  deleteReportRecord(data) {
-    return axios.post('/v2/report/download/record/delete/' + data);
-  },
-  /**
-   * 根据ID获取记录
-   */
-  getReportDownloadRecord(params) {
-    return axios.get('/v2/report/download/record', { params })
-  },
-  
-}

+ 0 - 40
src/api/field.js

@@ -1,40 +0,0 @@
-import axios from '@/utils/axios'
-
-export default {
-  /**
-   * 获取自定义字段
-   */
-  getCustomField(params) {
-    return axios.get('/v2/field/custom', { params, loading: false })
-  },
-  /**
-   * 获取系统字段
-   */
-  getSystemField(params) {
-    return axios.get('/v2/field/system', { params, loading: false })
-  },
-  /**
-   * 根据自定义字段ID获取树
-   */
-  getTreeList(params) {
-    return axios.get('/v2/field/tree/' + params)
-  },
-  /**
-   * 获取系统字段V2
-   */
-  getSystemListV2(params) {
-    return axios.get('/v2/patent/field/list', { params })
-  },
-  /**
-   * 获取用户设置字段
-   */
-  getUserSettingField(params) {
-    return axios.get('/v2/patent/field/setting', { params })
-  },
-  /**
-   * 更新用户设置字段
-   */
-  updateUserSettingField(data) {
-    return axios.post('/v2/patent/field/setting', data)
-  }
-}

+ 0 - 40
src/api/highlight.js

@@ -1,40 +0,0 @@
-import axios from '@/utils/axios'
-
-export default {
-  /**
-   * 新增标注
-   */
-  scratchWordsAdd(params) {
-    return axios.post('/v2/scratchWords/add', params)
-  },
-  /**
-   * 查询标注
-   */
-  scratchWordsQuery(params) {
-    return axios.post('/v2/scratchWords/query', params)
-  },
-  /**
-   * 更新标注
-   */
-  scratchWordsUpdate(params) {
-    return axios.post('/v2/scratchWords/update', params)
-  },
-  /**
-   * 删除标注
-   */
-  scratchWordsDelete(params) {
-    return axios.post('/v2/scratchWords/delete', params)
-  },
-  /**
-   * 标注库查询
-   */
-  queryScratchS(params) {
-    return axios.post('/v2/scratchWords/queryScratchs', params)
-  },
-  /**
-   * 标注库分组查询
-   */
-  queryGroupScratchS(params) {
-    return axios.post('/v2/scratchWords/queryGroupScratchs', params)
-  },
-}

+ 0 - 41
src/api/importPatent.js

@@ -1,41 +0,0 @@
-import axios from '@/utils/axios'
-
-export default {
- /**
-   * 检索专利
-   */
- patentSelectImport(params) {
-    return axios.post('/v2/patentStar/select', params)
-  },
-  /**
-   * 获取专利部分内容(1.权要 2.说明书文本 3.说明书pdf 4.摘要附图)
-   */
- getPatentPart(params) {
-    return axios.post('/v2/patentStar/getPatentPart', params)
-  },
-
-  /**
-   * 新增检索历史
-  */
-  addRetrieveRecord(params) {
-    return axios.post('/v2/RetrieveRecord/addRetrieveRecord', params)
-  },
-  /**
-   * 查询检索历史
-  */
-  queryRetrieveRecord(params) {
-    return axios.post('/v2/RetrieveRecord/queryRetrieveRecord', params)
-  },
-  /**
-   * 更新检索历史
-  */
-  updateRetrieveRecord(params) {
-    return axios.post('/v2/RetrieveRecord/updateRetrieveRecord', params)
-  },
-  /**
-   * 更新检索历史
-  */
-  deleteRetrieveRecord(params) {
-    return axios.post('/v2/RetrieveRecord/deleteRetrieveRecord', params)
-  },
-}

+ 33 - 33
src/api/index.js

@@ -1,25 +1,25 @@
-import report from "./report";
-import template from "./template";
-// import custom from "./custom";
-import field from "./field";
-import data from "./data";
-// import common from "./common";
-import oauth2 from "./oauth2";
-// import project from "./project";
-import download from "./download";
+// import report from "./report";
+// import template from "./template";
+// // import custom from "./custom";
+// import field from "./field";
+// import data from "./data";
+// // import common from "./common";
+// import oauth2 from "./oauth2";
+// // import project from "./project";
+// import download from "./download";
 import client from "./client";
 import user from "./user";
-import task from "./task";
-// import patent from "./patent";
+// import task from "./task";
+// // import patent from "./patent";
 import admin from "./admin";
 import permission from "./permission";
-import reportManage from "./reportManage";
-// import product from "./product";
-import quartz from './quartz';
-import highlight from './highlight';
+// import reportManage from "./reportManage";
+// // import product from "./product";
+// import quartz from './quartz';
+// import highlight from './highlight';
 
-import matters from './matters';
-import importPatent from './importPatent'
+// import matters from './matters';
+// import importPatent from './importPatent'
 
 // import InvalidResponse from "./InvalidResponse";
 
@@ -40,27 +40,27 @@ import custom from "./newApi/custom";
 import otherPatentInformation from "./newApi/otherPatentInformation";
 
 export default {
-  ...report,
-  ...template,
+  // ...report,
+  // ...template,
   
-  ...field,
-  ...data,
-  ...oauth2,
-  ...project,
-  ...download,
+  // ...field,
+  // ...data,
+  // ...oauth2,
+  // ...project,
+  // ...download,
   ...client,
   ...user,
-  ...task,
-  ...patent,
-  ...common,
+  // ...task,
+  // ...patent,
+  // ...common,
   ...admin,
   ...permission,
-  ...reportManage,
-  ...product,
-  ...quartz,
-  ...importPatent,
-  ...highlight,
-  ...matters,
+  // ...reportManage,
+  // ...product,
+  // ...quartz,
+  // ...importPatent,
+  // ...highlight,
+  // ...matters,
   // ...InvalidResponse,
 
   ...event,

+ 0 - 24
src/api/matters.js

@@ -1,24 +0,0 @@
-import axios from '@/utils/axios'
-
-export default {
-    //添加后续跟进事项
-    addMatters(params){
-        return axios.post('/report/api/followUps/add',params)
-    },
-    //查询后续跟进事项
-    queryMatters(params){
-        return axios.post('/report/api/followUps/query',params)
-    },
-    //修改后续跟进事项
-    updateMatters(params){
-        return axios.post('/report/api/followUps/update',params)
-    },
-    //删除后续跟进事项
-    deleteMatters(params){
-        return axios.post('/report/api/followUps/delete',params)
-    },
-    //更新登记结果
-    register(params){
-        return axios.post('/report/api/followUps/register',params)
-    },
-}

+ 16 - 0
src/api/newApi/importAndExport.js

@@ -33,6 +33,22 @@ export default {
     patentSelect(data) {
         return axios.post('/xiaoshi/patentStar/select', data)
     },
+
+    /**
+    * 检索历史
+    * 查询检索记录
+    */
+    queryRetrieveRecord(data) {
+        return axios.post('/xiaoshi/retrieveRecord/queryRetrieveRecord', data)
+    },
+    /**
+    * 检索历史
+    * 删除检索记录
+    */
+    deleteRetrieveRecord(data) {
+        return axios.post('/xiaoshi/retrieveRecord/deleteRetrieveRecord', data)
+    },
+
    /**
     * 获取报告模板
     */

+ 10 - 0
src/api/newApi/otherPatentInformation.js

@@ -170,4 +170,14 @@ export default {
   queryAsInvalidReasonHistory(data) {
     return axios.post("/xiaoshi/asInvalidReasonHistory/query", data);
   },
+
+
+  /**
+   * 价值曲线
+   * @param {*} data 
+   * @returns 
+   */
+  selectValueCurve(data) {
+    return axios.post("/xiaoshi/patent/selectValueCurve", data);
+  },
 }

+ 0 - 60
src/api/oauth2.js

@@ -1,60 +0,0 @@
-import axios from '@/utils/axios'
-
-export default {
-  /**
-   * 获取用户信息
-   */
-  getUserinfo(params) {
-    return axios.get('/v2/oauth2/userinfo')
-  },
-  /**
-   * 获取权限
-   */
-  getPermissions() {
-    return axios.get('/v2/oauth2/permissions')
-  },
-  /**
-   * 刷新令牌
-   */
-  refreshToken(params) {
-    return axios.get('/v2/oauth2/refreshToken', { params, loading: false })
-  },
-  /**
-   * 获取令牌
-   */
-  getToken(params) {
-    return axios.get('/v2/oauth2/token', { params, loading: false })
-  },
-  /**
-   * 获取验证码
-   */
-  getVerifyCode() {
-    return axios.get('/v2/oauth2/verifyCode')
-  },
-  /**
-   * 系统登录
-   */
-  doLogin(params) {
-    return axios({
-      url: '/v2/oauth2/token',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 退出登录
-   */
-  logout() {
-    return axios.post('/v2/oauth2/logout')
-  },
-  /**
-   * 修改密码
-   */
-  changePwd(params) {
-    return axios({
-      url: '/permission/api/personnel/changePwd',
-      method: 'post',
-      params: params
-    })
-  }
-}

+ 0 - 333
src/api/patent.js

@@ -1,333 +0,0 @@
-import axios from '@/utils/axios'
-
-export default {
-  /**
-   * 获取专利列表
-   */
-  getPatentListV2(data) {
-    return axios.post('/v2/patent/list', data);
-  },
-  /**
-   * 获取专利两边的数据
-   */
-  getBetweenPatentList(data) {
-    return axios.post('/v2/patent/between', data)
-  },
-  /**
-   * 获取专利申请人列表
-   */
-  getPatentApplicantList(params) {
-    return axios.get('/v2/patent/applicant/list', { params })
-  },
-  /**
-   * 获取专利申请人(合并)列表
-   */
-  getPatentApplicantMergeList(params) {
-    return axios.get('/v2/patent/applicant/merge/list', { params })
-  },
-  /**
-   * 新增专利申请人
-   */
-  addPatentApplicant(data) {
-    return axios.post('/v2/patent/applicant/add', data)
-  },
-  /**
-   * 编辑专利申请人
-   */
-  editPatentApplicant(data) {
-    return axios.post('/v2/patent/applicant/edit', data)
-  },
-  /**
-   * 删除专利申请人
-   */
-  deletePatentApplicant(params) {
-    return axios({
-      url: '/v2/patent/applicant/delete',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 删除专利申请人(合并)
-   */
-  deletePatentMergeApplicant(params) {
-    return axios({
-      url: '/v2/patent/applicant/merge/delete',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 批量上传专利说明书
-   */
-  batchUploadPatentInstruction(params) {
-    return axios({
-      url: '/v2/patent/instruction/batch/upload',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 编辑专利说明书
-   */
-  editPatentInstruction(data) {
-    return axios.post('/v2/patent/instruction/edit', data)
-  },
-  /**
-   * 专利说明书列表
-   */
-  getPatentInstructionList(params) {
-    return axios.get('/v2/patent/instruction/list', { params })
-  },
-  /**
-   * 专利阅读统计
-   */
-  getPatentReadTotal(params) {
-    return axios.get('/v2/patent/read/total', { params })
-  },
-  /**
-   * 获取专利查询字段源数据
-   */
-  getPatentQuerySource(params) {
-    return axios.get('/v2/patent/query/field/source', { params })
-  },
-  /**
-   * 专利导出
-   */
-  exportPatentList(data) {
-    return axios.post('/v2/patent/export', data)
-  },
-  /**
-   * 根据ID获取专利
-   */
-  getPatentById(id, params) {
-    return axios.get('/v2/patent/' + id, { params })
-  },
-  /**
-   * 设置专利已读未读
-   */
-  updatePatentReadStatus(data) {
-    return axios({
-      url: '/v2/patent/read/update',
-      method: 'post',
-      data: data,
-      loading: false
-    })
-  },
-  /**
-   * 更新专利列表字段
-   */
-  updatePatentListField(data) {
-    return axios.post('/v2/patent/list/field/update', data)
-  },
-  /**
-   * 查询源
-   */
-  getPatentQuerySourceList(data) {
-    return axios.post('/v2/patent/query/source', data)
-  },
-  /**
-   * 保存专利检索条件
-   */
-  savePatentQueryCondition(data) {
-    return axios.post('/v2/patent/query/condition', data)
-  },
-  /**
-   * 批量标引
-   */
-  patentBatchIndex(data) {
-    return axios.post('/v2/patent/batch/index', data)
-  },
-  /**
-   * 更新标签
-   */
-  updatePatentLabel(data) {
-    return axios.post('/v2/patent/label', data)
-  },
-  /**
-   * 获取专利ID
-   */
-  getPatentListIds(data) {
-    return axios.post('/v2/patent/ids', data)
-  },
-  /**
-   * 获取标引情况
-   */
-  getPatentIndexSetting(params) {
-    return axios.get('/v2/patent/index/setting', { params })
-  },
-  /**
-   * 获取标引情况
-   */
-  getPatentIndexSetting2(params) {
-    return axios.get('/v2/patent/index/setting/all', { params })
-  },
-  /**
-   * 更新标引
-   */
-  updatePatentIndexSetting(data) {
-    return axios.post('/v2/patent/index/setting', data)
-  },
-  /**
-   * 专利关键词高亮模板
-   */
-  getPatentKeywordsHighlight(params) {
-    return axios.get('/v2/patent/keywords/highlight/list', { params })
-  },
-  /**
-   * 更新专利关键词高亮模板
-   */
-  updatePatentKeywordsHighlight(data) {
-    return axios.post('/v2/patent/keywords/highlight/update', data)
-  },
-  /**
-   * 新增专利关键词高亮模板
-   */
-  addDefaultPatentKeywordsHighlight(params) {
-    return axios({
-      url: '/v2/patent/keywords/highlight/default',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 删除专利关键词高亮模板
-   */
-  deletePatentKeywordsHigh(params) {
-    return axios({
-      url: '/v2/patent/keywords/highlight/delete',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 保存所选专利
-   */
-  saveSelectPatent(data) {
-    return axios.post('/v2/patent/save/select', data)
-  },
-  /**
-   * 上传专利附图
-   */
-  uploadPatentImage(data) {
-    return axios.post('/v2/patent/image/add', data)
-  },
-  /**
-   * 修改专利附图
-   */
-  editPatentImage(data) {
-    return axios.post('/v2/patent/image/edit', data)
-  },
-  /**
-   * 上传专利附图
-   */
-  deletePatentImage(params) {
-    return axios({
-      url: '/v2/patent/image/delete',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 获取同族专利
-   */
-  getPatentFamilyList(params) {
-    return axios.get('/v2/patent/family/list', { params })
-  },
-  /**
-   * 专利注释
-   */
-  getPatentAnnotationList(params) {
-    return axios.get('/v2/patent/annotation/list', { params })
-  },
-  /**
-   * 更新专利注释
-   */
-  editPatentAnnotation(data) {
-    return axios.post('/v2/patent/annotation/edit', data)
-  },
-  /**
-   * 新增专利注释
-   */
-  addPatentAnnotation(data) {
-    return axios.post('/v2/patent/annotation/add', data)
-  },
-  /**
-   * 删除专利注释
-   */
-  deletePatentAnnotation(params) {
-    return axios({
-      url: '/v2/patent/annotation/delete',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 根据专利号获取ID
-   */
-  getPatentIdByPatentNo(params) {
-    return axios.get('/v2/patent/id', { params })
-  },
-  /**
-   * 获取专利发明人列表
-   */
-  getPatentInventorList(params) {
-    return axios.get('/v2/patent/inventor/list', { params })
-  },
-  /**
-   * 新增专利发明人
-   */
-  addPatentInventor(data) {
-    return axios.post('/v2/patent/inventor/add', data)
-  },
-  /**
-   * 编辑专利发明人
-   */
-  editPatentInventor(data) {
-    return axios.post('/v2/patent/inventor/edit', data)
-  },
-  /**
-   * 删除专利发明人
-   */
-  deletePatentInventor(params) {
-    return axios({
-      url: '/v2/patent/inventor/delete',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 获取说明书文件流
-   */
-  getPatentInstructionFile(params) {
-    return axios({
-      url: '/v2/patent/instruction/file',
-      method: 'post',
-      responseType: 'blob',
-      params: params
-    })
-  },
-
-  
-  /**
-   * 获取权要树
-   */
-  queryPatentRightTree(params) {
-    return axios.get('/v2/patentRight/queryPatentRightTree', {params})
-  },
-
-   /**
-   * 导出pdf首页
-   */
-   pdfFirstPage(params) {
-    return axios.post('/v2/patent/instruction/pdfFirstPage', params)
-  },
-
-  /**
-   * pdf首页列表
-   */
-  queryPatentPdfFirstPages(params) {
-    return axios.post('/v2/patent/instruction/queryPatentPdfFirstPages', params)
-  },
-
-}

+ 10 - 0
src/api/permission.js

@@ -15,6 +15,16 @@ PermissionLogin(data) {
    getPermissionUserInfo() {
     return axios.get('/permission/api/system/userinfo')
   },
+   /**
+   * 修改密码
+   */
+   changePwd(params) {
+    return axios({
+      url: '/permission/api/personnel/changePwd',
+      method: 'post',
+      params: params
+    })
+  },
 /**
 * 不分页查询部门
 */

+ 0 - 220
src/api/product.js

@@ -1,220 +0,0 @@
-import axios from '@/utils/axios'
-/**
-* 分析系统产品管理
-*/
-export default {
-/**
- * 新增产品类别
- */
-addNewProductCategorys(data) {
-    return axios.post('/v2/productCategorys/addNew', data)
-},
-/**
- * 查询产品类别
- */
-queryProductCategorys(data) {
-    return axios.post('/v2/productCategorys/query', data)
-},
-/**
- * 修改产品类别
- */
-updateProductCategorys(data) {
-    return axios.post('/v2/productCategorys/update', data)
-},
-/**
- * 删除产品类别
- */
-deleteProductCategorys(params) {
-    return axios.get('/v2/productCategorys/delete', {params})
-  },
-  /**
- * 产品类别趋势图
- */
-   showTrend(params) {
-    return axios.post('/v2/productCategorys/showTrend', params)
-  },
-   /**
- * 获取统一产品下的公司集合
- */
-getCompanyList(params) {
-    return axios.get('/v2/productCategorys/getCompanyList', {params})
-},
-       /**
- * 获取营销数据的地区集合
- */
-getAreaList(params) {
-    return axios.post('/v2/productCategorys/getAreaList', params)
-},
-/**
- * 新增产品
- */
-addNewProducts(data) {
-    return axios.post('/v2/products/addNew', data)
-},
-/**
- * 修改产品
- */
-updateProducts(data) {
-    return axios.post('/v2/products/update', data)
-},
-/**
- * 查询产品
- */
-queryProducts(data) {
-    return axios.post('/v2/products/query', data)
-},
-/**
- * 删除产品
- */
-deleteProducts(params) {
-    return axios.get('/v2/products/delete', {params})
-},
-  /**
- * 产品趋势图
- */
-   ProductShowTrend(params) {
-    return axios.post('/v2/products/showTrend', params)
-  },
-/**
- * 新增产品架构
- */
-addNewStructures(data) {
-    return axios.post('/v2/structures/addNew', data)
-},
-/**
- * 修改产品架构
- */
-updateStructures(data) {
-    return axios.post('/v2/structures/update', data)
-},
-/**
- * 查询产品架构
- */
-queryStructures(data) {
-    return axios.post('/v2/structures/query', data)
-},
-/**
- * 删除产品架构
- */
-deleteStructures(params) {
-    return axios.get('/v2/structures/delete', {params})
-},
-/**
- * 查询产品架构路径
- */
-queryPathStructureName(data) {
-    return axios.post('/v2/structures/queryPathStructureName', data)
-},
-/**
- * 新增营销数据
- */
- addNewProductMarketData(params) {
-    return axios.post('/v2/ProductMarketDatas/addNew', params)
-},
-/**
- * 查询营销数据
- */
- queryProductMarketData(params) {
-    return axios.post('/v2/ProductMarketDatas/query', params)
-},
-/**
- * 修改营销数据
- */
- updateProductMarketData(params) {
-    return axios.post('/v2/ProductMarketDatas/update', params)
-},
-/**
- * 删除营销数据
- */
- deleteProductMarketData(params) {
-    return axios.get('/v2/ProductMarketDatas/delete', {params})
-},
-
-/**
- * 新增许可历史
- */
- addPermissionRecord(params) {
-    return axios.post('/v2/permissionRecord/add', params)
-},
-/**
- * 查询许可历史
- */
- queryPermissionRecord(params) {
-    return axios.post('/v2/permissionRecord/query', params)
-},
-/**
- * 修改许可历史
- */
- updatePermissionRecord(params) {
-    return axios.post('/v2/permissionRecord/update', params)
-},
-/**
- * 删除许可历史
- */
- deletePermissionRecord(params) {
-    return axios.get('/v2/permissionRecord/delete', {params})
-},
-
-/**
- * 更新专利与产品标引
- */
- updateProductStructurePatentIndex(params) {
-    return axios.post('/v2/productStructurePatentIndex/update', params)
-},
-
-/**
- * 查询专利与产品标引
- */
- queryProductStructurePatentIndex(params) {
-    return axios.post('/v2/productStructurePatentIndex/query', params)
-},
- /**
- * 专利与产品批量标引
- */
-  addNewBatch(params) {
-    return axios.post('/v2/productStructurePatentIndex/addNewBatch', params)
-},
-
-/**
- * 查询产品相关专利
- */
-proPatentQueryPatents(data) {
-    return axios.post('/v2/proPatent/queryPatents', data)
-},
-/**
- * 上传导入产品相关专利
- */
-proPatentImportPatents(data) {
-    return axios.post('/v2/proPatent/importPatents', data)
-  },
-/**
- * 删除选中的产品相关专利
- */
-proPatentDelete(data) {
-    return axios.post('/v2/proPatent/delete', data)
-  },
-/**
- * 添加选中的产品专利
- */
-addPatentDelete(data) {
-    return axios.post('/v2/proPatent/add', data)
-  },
-
-/**
- * 产品相关专利新增部分专利查询
-*/
-PatentWorth(params) {
-    return axios.post('/v2/patent/showTrend', params)
-},
-
-/**
- * 批量关联产品和专利
-*/
-PatentAndProduct(params) {
-    return axios.post('/v2/products/addNewAssoProductPatent', params)
-},
-
-
-}
-
-

+ 0 - 393
src/api/project.js

@@ -1,393 +0,0 @@
-import axios from '@/utils/axios'
-
-export default {
-  /**
-   * 获取专利数据库列表
-   */
-  getProjectList(data) {
-    return axios.post('/v1/project/user', data)
-  },
-  /**
-   * 根据ID获取专利数据库
-   */
-  getProject(params) {
-    return axios.get('/v2/project/getProjectById',{ params })
-  },
-  /**
-   * 获取专利数据库列表V2
-   */
-  getProjectListV2(data) {
-    return axios.post('/v2/project/list', data)
-  },
-  /**
-   * 分类统计
-   */
-  getScenarioAndTypeTotal(params) {
-    return axios.get('/v2/project/total', params)
-  },
-  /**
-   * 获取专利数据库状态统计
-   */
-  getProjectStatusTotal(params) {
-    return axios.get('/v2/project/status/total', params)
-  },
-  /**
-   * 获取专利数据库类型统计
-   */
-  getProjectTypeTotal(params) {
-    return axios.get('/v2/project/type/total', { params })
-  },
-  /**
-   * 新增专利数据库
-   */
-  addProject(data) {
-    return axios.post('/v2/project/add', data)
-  },
-  /**
-   * 编辑专利数据库
-   */
-  editProject(data) {
-    return axios.post('/v2/project/edit', data)
-  },
-  /**
-   * 删除专利数据库
-   */
-  deleteProject(params) {
-    return axios({
-      url: '/v2/project/delete',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 专利数据库图表数据
-   */
-  getProjectChartData(params) {
-    return axios.get('/v2/project/chartData', { params })
-  },
-  /**
-   * 专利数据库专利导入
-   */
-  importProjectPatent(data) {
-    return axios.post('/v2/project/import/patent', data)
-  },
-  /**
-   * 专利数据库附件列表
-   */
-  getProjectFileList(params) {
-    return axios.get('/v2/project/file/list', { params })
-  },
-  /**
-   * 编辑专利数据库附件
-   */
-  editProjectFile(data) {
-    return axios.post('/v2/project/file/edit', data)
-  },
-  /**
-   * 新增专利数据库附件
-   */
-  addProjectFile(data) {
-    return axios.post('/v2/project/file/add', data)
-  },
-  /**
-   * 删除专利数据库附件
-   */
-  deleteProjectFile(params) {
-    return axios({
-      url: '/v2/project/file/delete',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 获取专利数据库成员列表
-   */
-  getProjectUserList(params) {
-    return axios.get('/v2/project/user/list', { params })
-  },
-  /**
-   * 新增专利数据库成员
-   */
-  addProjectUser(data) {
-    return axios.post('/v2/project/user/add', data)
-  },
-  /**
-   * 编辑专利数据库成员
-   */
-  editProjectUser(data) {
-    return axios.post('/v2/project/user/edit', data)
-  },
-  /**
-   * 删除专利数据库成员
-   */
-  deleteProjectUser(params) {
-    return axios({
-      url: '/v2/project/user/delete',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 分享专利数据库
-   */
-  projectShare({ id, data }) {
-    return axios.post('/v2/project/share?id=' + id, data)
-  },
-  /**
-   * 获取专利数据库字段列表
-   */
-  getProjectFieldList(params) {
-    return axios.get('/v2/project/field/list', { params })
-  },
-  /**
-   * 新增专利数据库字段
-   */
-  addProjectField(data) {
-    return axios.post('/v2/project/field/add', data)
-  },
-  /**
-   * 编辑专利数据库字段
-   */
-  editProjectField(data) {
-    return axios.post('/v2/project/field/edit', data)
-  },
-  /**
-   * 删除专利数据库字段
-   */
-  deleteProjectField(params) {
-    return axios({
-      url: '/v2/project/field/delete',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 导入专利数据库字段
-   */
-  importProjectField(params) {
-    return axios({
-      url: '/v2/project/field/import',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 复制专利数据库字段
-   */
-  copyProjectField(params) {
-    return axios({
-      url: '/v2/project/field/copy',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 获取专利数据库字段选项列表
-   */
-  getProjectFieldOptionList(params) {
-    return axios.get('/v2/project/field/option/list', { params })
-  },
-  /**
-   * 新增专利数据库字段选项
-   */
-  addProjectFieldOption(data) {
-    return axios.post('/v2/project/field/option/add', data)
-  },
-  /**
-   * 编辑专利数据库字段选项
-   */
-  editProjectFieldOption(data) {
-    return axios.post('/v2/project/field/option/edit', data)
-  },
-  /**
-   * 更新专利数据库字段选项
-   */
-  updateProjectFieldOption(data) {
-    return axios.post('/v2/project/field/option/update', data)
-  },
-  /**
-   * 删除专利数据库字段选项
-   */
-  deleteProjectFieldOption(params) {
-    return axios({
-      url: '/v2/project/field/option/delete',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 获取专利数据库文件夹列表
-   */
-  getProjectFolderList(params) {
-    return axios.get('/v2/project/folder/list', { params })
-  },
-  /**
-   * 新增专利数据库文件夹
-   */
-  addProjectFolder(data) {
-    return axios.post('/v2/project/folder/add', data)
-  },
-  /**
-   * 编辑专利数据库文件夹
-   */
-  editProjectFolder({ data, projectId }) {
-    return axios.post('/v2/project/folder/edit?projectId=' + projectId, data)
-  },
-  /**
-   * 删除专利数据库文件夹
-   */
-  deleteProjectFolder(params) {
-    return axios({
-      url: '/v2/project/folder/delete',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 获取专利查询树
-   */
-  getProjectFieldTree(params) {
-    return axios.get('/v2/project/field/tree', { params })
-  },
-  /**
-   * 更新文件夹专利
-   */
-  updateProjectFolderPatent(data) {
-    return axios.post('/v2/project/folder/patent', data)
-  },
-  /**
-   * 专利数据库自定义字段
-   */
-  getProjectCustomField(params) {
-    return axios.get('/v2/project/field/custom', { params })
-  },
-  /**
-   * 自定义字段
-   */
-  getProjectCustomFieldById(params) {
-    return axios.get('/v2/project/field/' + params)
-  },
-  /**
-   * 导出专利数据库数据
-   */
-  exportProject(data) {
-    return axios.post('/v2/project/export', data)
-  },
-  /**
-   * 导出专利数据库信息列表
-   */
-  exportProjectList(params) {
-    return axios({
-      url: '/v2/project/export/list',
-      method: 'post',
-      responseType: 'blob',
-      params: params
-    })
-  },
-  /**
-   * 获取专利数据库导出记录
-   */
-  getProjectExportList(params) {
-    return axios.get('/v2/project/export/list', { params })
-  },
-  /**
-   * 删除专利数据库导出记录
-   */
-  deleteProjectExport(params) {
-    return axios({
-      url: '/v2/project/export/delete',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 获取专利数据库字段排序
-   */
-  getProjectFieldOrder(params) {
-    return axios.get('/v2/project/field/order', { params })
-  },
-  /**
-   * 设置专利数据库字段排序
-   */
-  setProjectFieldOrder(data) {
-    return axios.post('/v2/project/field/order', data)
-  },
-  /**
-   * 导入专利数据库数据
-   */
-  importProjectData(params) {
-    return axios({
-      url: '/v2/project/import',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 判断是否存在导入任务
-   */
-  getProjectImportPageList(params) {
-    return axios.get('/v2/project/import/list', { params })
-  },
-  /**
-   * 获取导入任务记录
-   */
-  getProjectImportStatusList(params) {
-    return axios.get('/v2/project/import/status', { params })
-  },
-  /**
-   * 获取进行中导入ID
-   */
-  getProjectImportOngoing(params) {
-    return axios.get('/v2/project/import/ongoing', { params })
-  },
-  /**
-   * 删除导入记录
-   */
-  deleteProjectImport(params) {
-    return axios({
-      url: '/v2/project/import/delete',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 删除专利数据库专利
-   */
-  deleteProjectPatent(params) {
-    return axios({
-      url: '/v2/project/patent/delete',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 删除文件夹专利
-   */
-  deleteProjectFolderPatent(params) {
-    return axios({
-      url: '/v2/project/folder/patent/delete',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 导入专利数据库Excel文件
-   */
-  importProjectExcel(data) {
-    return axios.post('/v2/project/importExcel', data)
-  },
- 
-
-  //查询九大场景对应的事件数量
-  queryApplicationScenarioEventNumber(params){
-    return axios.get('/v2/event/queryApplicationScenarioEventNumber',{params})
-  },
-  //根据应用场景Id查询事件清单
-  queryByApplicationScenario(params){
-    return axios.post('/v2/event/queryEvents',params)
-  },
-  //根据应用场景和事件id查询专利数据库数量
-  queryInvestigationTypeProjectNumber(params){
-    return axios.post('/v2/event/queryInvestigationTypeProjectNumber',params)
-  },
-}

+ 0 - 97
src/api/quartz.js

@@ -1,97 +0,0 @@
-import axios from '@/utils/axios'
-export default{
-/**
-   * 获取下载接口所有配置
-   */
- getAllConfig(params) {
-    return axios.get('/v2/config/getAllConfig', { params })
-  },
-  /**
-   * 根据配置类型获取配置元素
-   */
-  getConfigCell(params) {
-    return axios.get('/v2/config/getConfigCell', { params })
-  },
-  /**
-   * 添加导入任务
-   */
-  addTask(data) {
-    return axios.post('/v2/task/addTask', data)
-  },
-  /**
-   * 继续导入任务
-   */
-  resumeJobTask(params) {
-    return axios.get('/v2/task/continue', {params})
-  },
-  /**
-   * 暂停导入任务
-   */
-  pauseJobTask(params) {
-    return axios.get('/v2/task/pause', {params})
-  },
-   /**
-   * 取消导入任务
-   */
-   cancelTask(params) {
-    return axios.get('/v2/task/cancelTask', {params})
-  },
-  /**
-   * 删除任务
-   */
-  // deleteTasks(data) {
-  //   return axios.post('/v2/task/deleteTasks', data)
-  // },
-  deleteTask(data) {
-    return axios.get('/v2/task/deleteTask', {data})
-  },
-  /**
-   * 更新定时任务
-   */
-  updateTasks(data) {
-    return axios.post('/v2/task/update', data)
-  },
-  /**
-   * 查询导入任务
-   */
-  // getTasks(data) {
-  //   return axios.post('/v2/task/getTasks', data)
-  // },
-  getTasks(data) {
-    return axios.post('/v2/task/queryTasks', data)
-  },
-  /**
-   * 查询实时进度或当前行数据的更新日志
-   */
-  // getTaskDetails(data) {
-  //   return axios.post('/v2/task/getTaskDetails', data)
-  // },
-  queryQrtzTaskLogs(data) {
-    return axios.post('/v2/task/queryQrtzTaskLogs', data)
-  },
-  /**
-   * 更改任务状态
-   */
-  setDetailState(params) {
-    return axios.get('/v2/task/setDetailState', {params})
-  },
-
-  //添加网站账号配置
-  addLoginConfig(params){
-    return axios.post('/v2/config/addLoginConfig',params)
-  },
-
-  //查询网站账号配置
-  queryLoginConfig(params){
-    return axios.post('/v2/config/queryLoginConfig',params)
-  },
-
-  //删除网站账号配置
-  deleteConfig(params){
-    return axios.post('/v2/config/deleteConfig',params)
-  },
-  //专利号导入
-  importByNos(params){
-    return axios.post('/v2/project/import/importByNos',params)
-  }
-}

+ 0 - 580
src/api/report.js

@@ -1,580 +0,0 @@
-import axios from '@/utils/axios'
-
-export default {
-  /**
-   * 根据专利号获取专利
-   */
-  PatentByPatentNo(params) {
-    return axios.get('/report/api/getPatentByPatentNo',{params})
-    // return axios({
-    //   url: '/report/api/getPatentByPatentNo',
-    //   method: 'post',
-    //   params: params
-    // })
-  },
- //查看某一件专利状态
- getPatentStatus(params){
-  return axios.get('/report/api/task/look', { params })
-},
-
-//更新某一件专利状态
-updatePatentStatus(params){
-  return axios.get('/report/api/task/read', { params })
-},
-  /** 
-   * 创建报告
-  */
- AddReport(params){
-    return axios.post('/report/api/report/addReport',params)
- },
- /** 
-   * 修改报告
-  */
-  UpdateReport(params){
-    return axios.post('/report/api/report/updateReport',params)
- },
-  /** 
-   * 修改报告状态
-  */
-   UpdateStatus(params){
-    return axios.get('/report/api/report/updateStatus',{params})
- },
- /** 
-   * 删除报告
-  */
-  deleReport(params) {
-    return axios.get('/report/api/report/deleReport', {params})
- },
- /** 
-   * 分页查询报告
-  */
-  QueryReport(params){
-    return axios.post('/report/api/report/queryReport', params)
- },
- /** 
-   * 根据报告id查询报告详情
-  */
- reReportDetail(params){
-  return axios.get('/report/api/report/reReportDetail', {params})
-},
- /** 
-   *新增审核任务
-  */
-  AddTask(params){
-    return axios.post('/report/api/task/addTask', params)
- },
- /** 
-   *任务审核
-  */
-   AuditTask(params){
-    return axios.post('/report/api/task/auditTask', params)
- },
- /** 
-   *分页查询任务
-  */
-   QueryPageList(params){
-    return axios.post('/report/api/task/queryPageList', params)
- },
- /** 
-   *完成任务
-  */
-  taskFinish(params){
-    return axios.get('/report/api/task/finish', {params})
- },
- /** 
-   *修改任务
-  */
-   UpdateTask(params){
-    return axios.post('/report/api/task/updateTask', params)
- },
-  /** 
-   * 拆分权要
-  */
-  splitPatentRight(params){
-    return axios.post('/report/api/feature/splitPatentRight',params)
-  },
-  /** 
-   * 查询特征
-  */
-   getFeatures(params){
-    return axios({
-        url: '/report/api/feature/getFeatures',
-        method: 'get',
-        params: params
-    })
-  },
-  /** 
-   * 保存拆分权要的解释
-  */
-  KeepPatentRight(params) {
-    return axios.post('/report/api/feature/addPatentRight',params)
-    // return axios({
-    //     url: '/report/api/feature/splitPatentRight',
-    //     method: 'post',
-    //     params: params,
-    // })
-  },
-
-  //根据报告Id获取专利列表
-  getPatentFromPAS(params){
-    return axios.post('/report/api/getPatentFromPAS',params)
-  },
-
-    //根据报告Id获取专利分页列表
-    getCompareFile(params){
-      return axios.post('/report/api/compare/getCompareFile',params)
-  },
-    
-    //根据报告Id添加FTO专利分页列表
-    addFTOCompareFile(params){
-      return axios.post('/report/api/compare/addFTOCompareFile',params)
-    },
-
-  //根据报告ID获取选中的专利号
-  getComPatentNos(params){
-    return axios.post('/report/api/getComPatentNos',params)
-  },
-
-  //添加对比文件
-  addCompareFile(params){
-    return axios.post('/report/api/compare/addCompareFile',params)
-  },
-
-
-  //删除对比文件
-  deleteCompareNo(params){
-    return axios.post('/report/api/compare/deleteCompareNo',params)
-  },
-  
-  //获得相似特征
-  simFeaturePatent(params){
-    return axios.post('/report/api/feature/querySimFeaturePatent',params)
-  },
-
-  //获取已确定的专利文件
-  getSureCompareFile(params){
-    return axios.post('/report/api/compare/getSureCompareFile',params)
-  },
-
-  //添加分配任务
-  addAssTask(params){
-    return axios.post('/report/api/task/addAssTask',params)
-  },
-  
-  //获取工作协同专利清单
-  reTaskPatents(params){
-    return axios.post('/report/api/task/reTaskPatents',params)
-  },
-
-  //查询任务清单
-  ReviewTheTasks(params){
-    return axios.post('/report/api/task/reviewTheTasks',params)
-  },
-
-  // //返回任务头部专利清单,需要taskId
-  // reTaskStatePatents(params){
-  //   return axios.get('/report/api/task/reTaskStatePatents',{params})
-  // },
-
-  //新增自定义字段
-  addPatentField(params){
-    return axios.post('/report/api/patentField/add',params)
-  },
-  //编辑自定义字段
-  editPatentField(params){
-    return axios.post('/report/api/patentField/edit',params)
-  },
-  //删除自定义字段
-  deletePatentField(params){
-    return axios.get('/report/api/patentField/delete',{params})
-  },
-  //查询自定义字段
-  listPatentField(params){
-    return axios.post('/report/api/patentField/list',params)
-  },
-  //自定义字段 获取选项列表
-  listPatentFieldOption(params){
-    return axios.get('/report/api/patentField/option/list',{params})
-  },
-  //自定义字段 更新选项列表
-  updatePatentField(params){
-    return axios.post('/report/api/patentField/update',params)
-  },
-  //自定义字段 删除选项列表
-  deleteOptionPatentField(params){
-    return axios.get('/report/api/patentField/option/delete',{params})
-  },
-  //根据自定义字段id和名字进行模糊查询
-  getPatentField(params){
-    return axios.post('/report/api/patentField/source',params)
-  },
-  //根据自定义字段查询相关报告
-  PatentQueryFieldSourceVO(params){
-    return axios.post('/report/api/patentField/query/PatentQueryFieldSourceVO',params)
-  },
-  //左侧自定义字段查询相关专利统计数据
-  sourceQueryPatentField(params){
-      return axios.post('/report/api/patentField/query/source',params)
-  },
-
-  //返回自定义头部的任务专利状态数量(需要传taskId)
-  taskReTaskStateCount(params){
-      return axios.get('/report/api/task/reTaskStateCount',{params})
-  },
-
-   //返回自定义头部的任务专利状态数量(不传taskId)
-   ReStateCount(params){
-    return axios.get('/report/api/compare/reStateCount',{params})
-  },
-   
-   //根据报告id获取专利数据库全部自定义字段get
-   getfieldFromPAS(params){
-    return axios.get('/report/api/getfieldFromPAS',{params})
-  },
-   //根据报告id获取专利数据库全部自定义字段值post
-   postfieldFromPAS(params){
-    return axios.post('/report/api/getSourceFromPAS',params)
-  },
-   //根据报告id获取专利数据库全部自定义字段树形结构get
-   getPatentQueryTree(params){
-    return axios.get('/report/api/getPatentQueryTree',{params})
-  },
-   //专利数据库筛选
-   getPatentListPAS(params){
-    return axios.post('/report/api/getPatentListPAS',params)
-  },
-
-   /** 
-   * 任务详情 
-  */
-  //任务详情 无效记录添加
-  addInvalidRecord(params){
-    return axios.post('/report/api/InvalidRecord/addInvalidRecord',params)
-  },
-  //任务详情 无效记录编辑
-  editInvalidRecord(params){
-    return axios.post('/report/api/InvalidRecord/updateInvalidRecord',params)
-  },
-  //任务详情 无效记录查询
-  queryInvalidRecord(params){
-    return axios.post('/report/api/InvalidRecord/queryInvalidRecord',params)
-  },
-  //任务详情 无效记录删除
-  deleInvalidRecord(params){
-    return axios.get('/report/api/InvalidRecord/deleInvalidRecord',{params})
-  },
-  
-  //任务详情 诉讼历史添加
-  addLitigationHistory(params){
-    return axios.post('/report/api/LitigationHistory/addLitigationHistory',params)
-  },
-  //任务详情 诉讼历史编辑
-  editLitigationHistory(params){
-    return axios.post('/report/api/LitigationHistory/updateLitigationHistory',params)
-  },
-  //任务详情 诉讼历史删除
-  deleteLitigationHistory(params){
-    return axios.get('/report/api/LitigationHistory/deleteLitigationHistory',{params})
-  },
-  //任务详情 诉讼历史查询
-  queryLitigationHistory(params){
-    return axios.post('/report/api/LitigationHistory/queryLitigationHistory',params)
-  },
-
-  //任务详情 审查历史增加
-  addReviewHistory(params){
-    return axios.post('/report/api/reviewHistory/addReviewHistory',params)
-  },
-  //任务详情 审查历史获取
-  queryReviewHistory(params){
-    return axios.post('/report/api/reviewHistory/queryReviewHistory',params)
-  },
-  //任务详情 审查历史修改
-  updateReviewHistory(params){
-    return axios.post('/report/api/reviewHistory/updateReviewHistory',params)
-  },
-  //任务详情 审查历史删除
-  deleReviewHistory(params){
-    return axios.get('/report/api/reviewHistory/deleReviewHistory',{params})
-  },
-
-  //任务详情 其他资料增加
-  addReferences(params){
-    return axios.post('/report/api/References/addReferences',params)
-  },
-  //任务详情 其他资料查询
-  queryReferences(params){
-    return axios.post('/report/api/References/queryReferences',params)
-  },
-  //任务详情 其他资料修改
-  updateReferences(params){
-    return axios.post('/report/api/References/updateReferences',params)
-  },
-  //任务详情 其他资料删除
-  deleReferences(params){
-    return axios.get('/report/api/References/deleReferences',{params})
-  },
-
-  //添加或更新作为无效证据使用历史
-  addOrUpdateInvalidReasonHistory(params){
-    return axios.post('/v2/invalidReasonHistory/addOrUpdateHistory',params)
-  },
-  //查询作为无效证据使用历史
-  queryInvalidReasonHistory(params){
-    return axios.post('/v2/invalidReasonHistory/queryHistory',params)
-  },
-  //删除作为无效证据使用历史
-  deleteInvalidReasonHistory(params){
-    return axios.post('/v2/invalidReasonHistory/deleteHistory',params)
-  },
-
-  //查看无效证据推荐
-  querySimFeaturePatentByPatentNo(params){
-    return axios.post('/report/api/feature/querySimFeaturePatentByPatentNo',params)
-  },
-
-
-
-
-  //上一篇、下一篇
-  getBetweenPatentList(params){
-    return axios.post('/report/api/AssoTaskPersonel/getPartClient',params)
-  },
-  // getBetweenPatentList(params){
-  //   return axios.get('/report/api/AssoTaskPersonel/getPartClient',{params})
-  // },
-
-  //增加对比记录
-  addCompareRecords(params){
-    return axios.post('/report/api/CompareRecords/addCompareRecords',params)
-  },
-
-  //删出对比记录
-  deleCompareRecords(params){
-    return axios.get('/report/api/CompareRecords/deleCompareRecords',{params})
-  },
-
-  //修改对比记录
-  updateCompareRecords(params){
-    return axios.post('/report/api/CompareRecords/updateCompareRecords',params)
-  },
-
-  //查询对比记录
-  selectCompareRecord(params){
-    return axios.post('/report/api/CompareRecords/selectCompareRecord',params)
-  },
-
-  //增加对比方案
-  addCompareScenarios(params){
-    return axios.post('/report/api/CompareScenariosController/addCompareScenarios',params)
-  },
-
-  //删除对比方案
-  deleteCompareScenarios(params){
-    return axios.post('/report/api/CompareScenariosController/delete',params)
-  },
-
-
-  //查询对比方案
-  selectCompareScenarios(params){
-    return axios.get('/report/api/CompareScenariosController/select',{params})
-  },
-
-  //初筛保存更新
-  settingCompareFiles(params){
-    return axios.post('/report/api/CompareFiles/index/setting',params)
-  },
-
-  //初筛获取
-  settingAllCompareFiles(params){
-    return axios.get('/report/api/CompareFiles/index/setting/all',{params})
-  },
-
-  //文件上传
-  upload(params){
-    return axios.post('/report/api/reportFile/add',params)
-  },
-
-  //查询报告模板
-  getTemplateByType(params){
-    return axios.post('/report/api/template/getTemplateByType',params)
-  },
-
-  //导出报告
-  exportReport(params){
-    return axios.get('/report/api/reportDocument/exportReport',{params})
-  },
-
-  //获得导出记录
-  getExportList(params){
-    return axios.post('/report/api/reportDocument/getExportList',params)
-  },
-
-  //删除导出记录
-  deleteExport(params){
-    return axios.get('/report/api/reportDocument/deleteExport',{params})
-  },
-
-  //导入
-  import(params){
-    return axios.post('/report/api/task/import',params)
-  },
-
-  //查询导出任务
-  reImportTask(params){
-    return axios.post('/report/api/task/reImportTask',params)
-  },
-
-  //删除导出任务
-  deleteImportTask(params){
-    return axios.get('/report/api/task/import/delete',{params})
-  },
-
-  //查询报告文档
-  CheckReportFileList(params){
-    return axios.post('/report/api/report/selectfile',params)
-  },
-
-  //增加报告文档
-  AddReportFileList(params){
-    return axios.post('/report/api/report/addFile',params)
-  },
-
-  //修改报告文档
-  EditReportFileList(params){
-    return axios.post('/report/api/report/updatefiles',params)
-  },
-
-  //删除报告文档
-  DeleteReportFileList(params){
-    return axios.get('/report/api/report/deletefile',{params})
-  },
-
-  //查看文件
-  seeFile(params){
-    return axios.get('/report/api/download/downloadFile',{params})
-  },
-
-  //任务进度
-  taskProgress(params){
-    return axios.get('/report/api/task/progress',{params})
-  },
-
-
-  //新增产品信息
-  addProduct(params){
-    return axios.post('/report/api/product/addProduct',params)
-  },
-
-  //获取产品信息
-  getProduct(params){
-    return axios.get('/report/api/product/getProduct',{params})
-  },
-  
-  //更新产品信息
-  updateProduct(params){
-    return axios.post('/report/api/product/updateProduct',params)
-  },
-
-  //根据任务ID和专利号获取拆分信息
-  getSplitMessage(params){
-    return axios.get('/report/api/feature/getSplitMessage',{params})
-  },
-
-  //添加FTO对比记录
-  addCompareMessage(params){
-    return axios.post('/report/api/compareMessage/addCompareMessage',params)
-  },
-
-  //查询FTO对比记录
-  queryCompareMessage(params){
-    return axios.get('/report/api/compareMessage/queryCompareMessage',{params})
-  },
-
-  //查找FTO已对比的专利文件
-  getComparedMessage(params){
-    return axios.post('/report/api/compareMessage/queryComparedMessage',params)
-  },
-
-  //添加FTO工作协同任务
-  addSyneryTask(params){
-    return axios.post('/report/api/task/addSyneryTask',params)
-  },
-
-  //FTO工作协同外部人员根据code获取任务信息
-  getTaskByCode(params){
-    return axios.get('/report/api/outSiders/getTaskByCode',{params})
-  },
-
-  //FTO查找协同对比记录
-  querySynery(params){
-    return axios.get('/report/api/compareMessage/querySynery',{params})
-  },
-
-  //添加FTO协同对比记录
-  addSynery(params){
-    return axios.post('/report/api/compareMessage/addSynery',params)
-  },
-
-  //FTO查找对比结果(带协同结果)
-  queryAllCompareMessage(params){
-    return axios.get('/report/api/compareMessage/queryAllCompareMessage',{params})
-  },
-
-  //FTO更新对比结果(带协同结果)
-  updateCompareMessage(params){
-    return axios.post('/report/api/compareMessage/updateCompareMessage',params)
-  },
-
-  //回避设计方案保存
-  addAvoidDesignDirection(params){
-    return axios.post('/report/api/avoidDesignDirections/addAvoidDesignDirection',params)
-  },
-
-   //给对比专利添加顺序
-   addOrder(params){
-    return axios.post('/report/api/CompareFiles/order/add',params)
-  },
-
-  //获取任务过滤条件
-  getTaskSources(params){
-    return axios.get('/report/api/task/getTaskSources',{params})
-  },
-  //回避设计方案查询
-  getAvoidDesignDirection(params){
-    return axios.get('/report/api/avoidDesignDirections/getAvoidDesignDirection',{params})
-  },
-
-  //查询报告分享人
-  showShare(params){
-    return axios.post('/report/api/shareReport/showShare',params)
-  },
-  //添加报告分享人
-  addShare(params){
-    return axios.post('/report/api/shareReport/add',params)
-  },
-  //删除报告分享人
-  removeShare(params){
-    return axios.post('/report/api/shareReport/remove',params)
-  },
-
-  //获取核心结论
-  getConclusion(params){
-    return axios.post('/report/api/getCronConClusions',params)
-  },
-
-  //报告可视化
-  reportVisual(params){
-    return axios.post('/report/api/report/reportVisual',params)
-  },
-
-  //添加核心结论
-  addConclusions(params){
-    return axios.post('/report/api/report/addConclusions',params)
-  },
-
-  //获得报告权限
-  getPermission(params){
-    return axios.get('/report/api/report/getPermission',{params})
-  }
-}

+ 0 - 54
src/api/reportManage.js

@@ -1,54 +0,0 @@
-import axios from '@/utils/axios'
-
-export default {
-
-  /**
-  * 获取字典项
-  */
-  DictMessage() {
-    return axios.get('/report/api/getSystemDicItem')
-  },
-/**
-  * 获取场景信息
-  */
- getDictsFromPAS() {
-  return axios.get('/report/api/getDictsFromPAS')
-},
-  /** 
-   * 获取所有人员
-  */
-  getAllPersonnel(){
-    return axios.get('/report/api/getAllPersonnel')
-  },
-
-  /** 
-   * 分页获取人员
-  */
-   getPartPersonnel(params){
-    return axios.post('/report/api/getPartPersonnel',params)
-  },
-
-  /**
-   * 获取所有客户
-   */
-  getAllClient(){
-    return axios.get('/report/api/getAllClient')
-  },
-
-  /**
-   * 获取所有部门
-   */
-  getAllDepartment(){
-    return axios.get('/report/api/getAllDepartment')
-  },
-  //创建报告
-  AddReport(params){
-    return axios.post('/report/api/report/addReport',params)
- },
- /** 
-   *新增审核任务
-  */
-   AddTask(params){
-    return axios.post('/report/api/task/addTask', params)
- },
-}

+ 0 - 26
src/api/task.js

@@ -1,26 +0,0 @@
-import axios from '@/utils/axios'
-
-export default {
-  /**
-   * 获取任务列表
-   */
-  getTaskList(params) {
-    return axios.get('/v2/task/list', { params })
-  },
-  /**
-   * 获取队列
-   */
-  getQueueList(params) {
-    return axios.get('/v2/task/queue', { params })
-  },
-  /**
-   * 删除任务
-   */
-  // deleteTask(params) {
-  //   return axios({
-  //     url: '/v2/task/delete',
-  //     method: 'post',
-  //     params: params
-  //   })
-  // }
-}

+ 0 - 134
src/api/template.js

@@ -1,134 +0,0 @@
-import axios from '@/utils/axios'
-
-export default {
-  /**
-   * 获取模板列表(新)
-   */
-  getNewTemplateList(params) {
-    return axios.get('/v2/report/template/list', { params })
-  },
-  /**
-   * 获取用户有权使用的模板列表
-   */
-  getNewTemplateListByUser(data) {
-    return axios.post('/v1/new/template/user', data)
-  },
-  /**
-   * 根据ID获取模板(新)
-   */
-  getNewTemplate(data) {
-    return axios.get('/v2/report/template/' + data)
-  },
-  /**
-   * 根据ID删除模板(新)
-   */
-  deleteNewTemplate(params) {
-    return axios({
-      url: '/v2/report/template/delete',
-      method: 'post',
-      params: params
-    })
-  },
-  /**
-   * 新增模板(新)
-   */
-  addNewTemplate(data) {
-    return axios.post('/v2/report/template/add', data)
-  },
-  /**
-   * 编辑模板(新)
-   */
-  editNewTemplate(data) {
-    return axios.post('/v2/report/template/edit', data)
-  },
-  /**
-   * 编辑模板标签
-   */
-  editTemplateLabel(data) {
-    return axios.post('/v2/report/template/label/edit', data)
-  },
-  /**
-   * 获取模板列表
-   */
-  getTemplateList(data) {
-    return axios.post('/template/list', data)
-  },
-  /**
-   * 根据ID获取模板分析树
-   */
-  getTemplateTree(data) {
-    return axios.post('/template/tree', data)
-  },
-  /**
-   * 根据ID删除模板
-   */
-  deleteTemplate(data) {
-    return axios.post('/template/delete', data)
-  },
-  /**
-   * 新增模板
-   */
-  addTemplate(data) {
-    return axios.post('/template/add', data)
-  },
-  /**
-   * 编辑模板
-   */
-  editTemplate(data) {
-    return axios.post('/template/edit', data)
-  },
-  /**
-   * 获取模板分析项列表
-   */
-  getTemplateItemList(data) {
-    return axios.post('/template/item/list', data)
-  },
-  /**
-   * 根据ID获取模板分析项
-   */
-  getTemplateItem(data) {
-    return axios.post('/template/item', data)
-  },
-  /**
-   * 根据ID删除模板分析项
-   */
-  deleteTemplateItem(data) {
-    return axios.post('/template/item/delete', data)
-  },
-  /**
-   * 根据IDS删除模板分析项
-   */
-  deleteBatchTemplateItem(data) {
-    return axios.post('/template/item/delete/batch', data)
-  },
-  /**
-   * 新增模板分析项
-   */
-  addTemplateItem(data) {
-    return axios.post('/template/item/add', data)
-  },
-  /**
-   * 编辑模板分析项
-   */
-  editTemplateItem(data) {
-    return axios.post('/template/item/edit', data)
-  },
-  /**
-   * 新增模板分析树
-   */
-  addTemplateTree(data) {
-    return axios.post('/template/tree/add', data)
-  },
-  /**
-   * 编辑模板分析树
-   */
-  editTemplateTree(data) {
-    return axios.post('/template/tree/edit', data)
-  },
-  /**
-   * 删除模板分析树
-   */
-  deleteTemplateTree(data) {
-    return axios.post('/template/tree/delete', data)
-  }
-}

+ 2 - 28
src/api/user.js

@@ -1,15 +1,7 @@
 import axios from '@/utils/axios'
 
 export default {
-  /**
-   * 系统用户类型
-   */
-  getUserList(params) {
-    return axios.get('/v2/user/list', { params })
-  },
-  // getPersonList(params) {
-  //   return axios.get('/v2/user/personnelList', { params })
-  // },
+
   getPersonList(data) {
     return axios.post('/permission/api/personnel/queryPageList', data)
 },
@@ -19,23 +11,5 @@ export default {
   editUser(data) {
     return axios.post('/permission/api/personnel/updateSelf', data)
   },
-  // editUser(data) {
-  //   return axios.post('/v2/user/edit', data)
-  // },
-  /**
-   * 新增用户
-   */
-  addUser(data) {
-    return axios.post('/v2/user/add', data)
-  },
-  /**
-   * 删除用户
-   */
-  deleteUser(params) {
-    return axios({
-      url: '/v2/user/delete',
-      method: 'post',
-      params: params
-    })
-  },
+
 }

+ 6 - 3
src/router/index.js

@@ -135,7 +135,8 @@ const routes = [
             meta: {
               title: '专利挖掘',
               sign: 'patentMining',
-              belong: 'patentMining'
+              belong: 'patentMining',
+              permission:'xiaoshi/patentMining'
             },
             component: () => import('@/views/patentMining/index.vue'),
           },
@@ -250,7 +251,8 @@ const routes = [
             meta: {
               title: '事件',
               sign: 'event',
-              belong: 'Event'
+              belong: 'Event',
+              permission:'xiaoshi/event'
             },
             component: () => import('@/views/event/index.vue'),
           },
@@ -499,7 +501,8 @@ const routes = [
         name:'searchHistory',
         meta: {
           title: '检索历史',
-          sign:'searchHistory'
+          sign:'searchHistory',
+          belong: 'conditionImport',
         },
         component: () => import('@/views/components/import/conditionImport/components/search_history.vue'),
       },

+ 33 - 0
src/utils/common.js

@@ -5,6 +5,7 @@ import Permission from '@/utils/permissions'
 import showPermissionDialog from "@/utils/model/noPermission/index";
 import { Base64 } from 'js-base64';
 import Config from '@/config'
+import moment from "moment";
 export default {
   /**
    * 防抖
@@ -152,6 +153,38 @@ export default {
   },
 
   /**
+   * 导出Excel
+   * @param {*} head excel头,可为空
+   * @param {*} body excel体,可为空
+   * @param {*} worksheetName  excel的worksheet名,可为空
+   * @param {*} ExcelName excel文件名,可为空
+   */
+  exportExcel(head, body, worksheetName='Sheet1', ExcelName){
+    // Worksheet名
+    const worksheet = worksheetName
+    const uri = 'data:application/vnd.ms-excel;base64,'
+
+    //文件名
+    if(!ExcelName){
+      ExcelName = moment().format('YYYYMMDDHHmmss')
+    }
+    // 下载的表格模板数据
+    const template = `<html xmlns:o="urn:schemas-microsoft-com:office:office"
+      xmlns:x="urn:schemas-microsoft-com:office:excel"
+      xmlns="http://www.w3.org/TR/REC-html40">
+      <head><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet>
+      <x:Name>${worksheet}</x:Name>
+      <x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet>
+      </x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]-->
+      </head><body><table><tr>${head}</tr>${body}</table></body></html>`
+    // 下载模板
+    let link = document.createElement('a')
+    link.setAttribute('href', uri + window.btoa(unescape(encodeURIComponent(template))))
+    link.setAttribute('download', ExcelName + '.xls')
+    link.click()
+    link = null
+  },
+  /**
    * 获取字段列表
    * @param {Array} array 
    * @param {Function} fun 

+ 3 - 0
src/utils/permissions.js

@@ -48,6 +48,9 @@ export default {
    * @param {*} projectId 项目ID
    */
   async projectPermission(projectId){
+    if(!projectId){
+      return true
+    }
     var data = {}
     if(sessionStorage.getItem('projectPermission')){
       data = JSON.parse(sessionStorage.getItem('projectPermission'))

+ 2 - 20
src/views/analyse/custom/index.vue

@@ -628,26 +628,8 @@ export default {
             this.$message.error('导出失败,请重试')
             return false
         }
-        // return false
-        // Worksheet名
-        const worksheet = 'Sheet1'
-        const uri = 'data:application/vnd.ms-excel;base64,'
-
-        // 下载的表格模板数据
-        const template = `<html xmlns:o="urn:schemas-microsoft-com:office:office"
-          xmlns:x="urn:schemas-microsoft-com:office:excel"
-          xmlns="http://www.w3.org/TR/REC-html40">
-          <head><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet>
-          <x:Name>${worksheet}</x:Name>
-          <x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet>
-          </x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]-->
-          </head><body><table><tr>${head}</tr>${body}</table></body></html>`
-        // 下载模板
-        let link = document.createElement('a')
-        link.setAttribute('href', uri + window.btoa(unescape(encodeURIComponent(template))))
-        link.setAttribute('download', moment().format('YYYYMMDDHHmmss') + '.xls')
-        link.click()
-        link = null
+        this.$commonJS.exportExcel(head,body)
+    
     },
     resetChartType() {
       this.form.setting.type = null

+ 0 - 708
src/views/analyse/custom/index1.vue

@@ -1,708 +0,0 @@
-<template>
-  <div class="custom-analyse">
-    <el-container>
-      <el-aside width="350px">
-        <!-- <el-container>
-          <el-header class="custom-analyse-tabs">
-            <el-tabs v-model="activeTab" type="card">
-              <el-tab-pane label="分析项" name="TabItem"></el-tab-pane>
-              <el-tab-pane label="数据" name="TabData"></el-tab-pane>
-              <el-tab-pane label="样式" name="TabStyle"></el-tab-pane>
-              <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
-                :is="activeTab"
-                :active-item="activeItem"
-                @edit="handleEdit"
-                @delete="handleDelete"
-                @select="handleSelect"
-            ></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-options">
-              <span class="text">专利数量<span class="number">{{ patentNum }} 件</span></span>
-              <el-button size="small" type="primary" @click="handleAdd3">添加组</el-button>
-              <el-dropdown size="small">
-                <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">截图</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>
-          </template>
-        </el-header>
-        <el-main class="custom-analyse-chart-img-box">
-          <div v-if="showChart">
-            <chart ref="chartDom" :form="from" :width="form.setting.width + form.setting.widthUnit" :height="form.setting.height + form.setting.heightUnit" />
-          </div>
-        </el-main>
-      </el-container>
-    </el-container>
-
-    <addAnalyseGroup ref="addAnalyseGroup" :projectId="projectId" @save="queryAnalyseGroup"></addAnalyseGroup>
-    <el-drawer
-        title="图表配置"
-        :visible.sync="drawer"
-        direction="rtl"
-        :before-close="handleClose"
-        size="500px">
-        <div style="width:500px">
-          <component :is='components'></component> 
-        </div>
-    </el-drawer>
-  </div>
-</template>
-
-<script>
-import Chart from "./components/Charts/index.vue";
-import { mapGetters } from "vuex";
-import { downLoad, findChildren, getTreeLastChildren, getTreeDataList, downLoadBase64 } from "@/utils";
-import { customPage } from "./mixins";
-import moment from "moment";
-import TreeSelect from '@riophae/vue-treeselect'
-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 TabLine from "./components/Tabs/Line";
-import html2canvas from "html2canvas";
-import addAnalyseGroup from './components/dialog/addAnalyseGroup.vue'
-export default {
-  components: {
-    TreeSelect,
-    Chart,
-    TabItem,
-    TabData,
-    TabStyle,
-    TabLine,
-    addAnalyseGroup
-  },
-  mixins: [customPage],
-  data() {
-    return {
-      components:'',
-      activeTab: 'TabItem',
-      enable: [2, 5, 6, 8, 9, 17],
-      saveType: 0,
-      form2: {},
-      rules: {
-        parentId: [
-          {required: true, message: '请选择上级目录', trigger: 'change'},
-        ],
-        name: [
-          {required: true, message: '请输入名称', trigger: 'blur'},
-        ],
-        permissions: [
-          {required: true, message: '请输选择使用权限', trigger: 'change'},
-        ],
-        sort: [
-          {required: true, message: '请输入显示次序', trigger: 'blur'},
-        ],
-      },
-      showChart: true,
-      showPage: false,
-      loadingBtn2: false,
-      loadingBtn3: false,
-      activeName: '1',
-      activeItem: [],
-      loading: false,
-      loadingBtn: false,
-      title: '',
-      chartTitle: '',
-      dialogVisible: false,
-      loadData: true,
-      drawer: false,
-      tempForm: {
-        name: '',
-        sort: 0
-      },
-    }
-  },
-  computed: {
-    ...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.getData()
-  },
-  methods: {
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.id,
-        label: node.name,
-        children: node.children
-      };
-    },
-
-
-    reset() {
-
-    },
-    // 获取???
-    async getData() {
-        await this.getTreeList()
-        if (this.treeList.length === 0 || this.treeList[0].children.length === 0) {
-          this.handleAdd()
-          this.showChart = false
-          this.saveType = 1
-        } else {
-          this.activeItem = [this.treeList[0].id]
-          await this.handleSelect(this.treeList[0].children[0].uid)
-        }
-        this.showPage = true
-
-    },
-    handleDelete(value) {
-      this.$confirm('确认删除本条数据吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(async () => {
-        const response = await this.$api.deleteCustomItem(value.id)
-        this.$message.success('删除成功')
-        await this.getTreeList()
-        if (this.form.id === value.id) {
-          const tree = this.treeList.find(item => item.id === value.parentId)
-          if (tree && tree.children.length) {
-            await this.handleSelect(tree.children[tree.children.length - 1].uid)
-          } else {
-            this.handleAdd()
-          }
-        }
-      })
-    },
-    // 获取需要进行的每一个分析项
-    async getTreeList() {
-      this.loading = true
-      const response = await this.$api.getCustomTree({ projectId: this.projectId })
-      // 获取到的数据存
-      this.$store.commit('SET_CHART_TREE', response.data)
-      this.setChildren(this.treeList, 'isDisabled')
-      this.loading = false
-    },
-    handleClose() {
-      this.drawer = false
-    },
-    setChildren(arr, key) {
-      arr.forEach(item => {
-        if (item.children && item.children.length) {
-          this.setChildren(item.children, key)
-        } else {
-          this.$set(item, key, item.type === 1)
-        }
-      })
-    },
-    refreshChart() {
-      this.$nextTick(() => {
-        let chartDom = this.$refs.chartDom
-        if (chartDom) {
-          chartDom.refreshChart()
-        }
-      })
-    },
-    onChange() {
-      if (this.saveType || !this.form2.id) {
-        this.form2.name = getSourceName(this.form.schema.x.field, this.form.schema.x.expand, this.form.schema.x.num)
-        const tree = this.treeList.find(item => item.id === this.form2.parentId)
-        if (tree) {
-          this.form2.sort = tree.children.length + 1
-        }
-      } else {
-        this.form2.name = this.tempForm.name
-        this.form2.sort = this.tempForm.sort
-      }
-    },
-    handleAdd3() {
-      var form = {
-            type:1,
-            permissions: 2,
-            parentId: 0,
-            sort: this.treeList.length + 1,
-            name: '',
-        }
-        var title = '添加组'
-        this.$refs.addAnalyseGroup.open(title,form)
-    },
-    async handleScreenshot() {
-      const canvas = await html2canvas(this.$refs.chartDom.$el)
-      const base64 = canvas.toDataURL('image/jpg')
-      downLoadBase64(base64, '图片.png')
-    },
-    async handleAdd1(saveType) {
-      this.saveType = saveType
-      this.onChange()
-      this.title = '保存自定义分析'
-      let data = {
-        parentId: null,
-        permissions: 2,
-        name: '',
-        sort: 0
-      }
-      if (this.form.uid) {
-        const response = await this.$api.getCustomItem(this.form.uid)
-        data = response.data
-        this.tempForm.name = data.name
-        this.tempForm.sort = data.sort
-      }
-      this.form2 = {
-        id: data.id,
-        parentId: data.parentId,
-        type: 1,
-        permissions: data.permissions,
-        name: data.name,
-        sort: data.sort,
-        setting: this.form.setting,
-        schema: this.form.schema,
-        source: this.form.source,
-        projectId: this.projectId
-      }
-      this.dialogVisible = true
-    },
-    handleAdd() {
-      let table = []
-      for (let i = 0; i < 10; i++) {
-        table.push({
-          min: 0,
-          max: 0,
-          color: null
-        })
-      }
-      let form = {
-        setting: {
-          type: 1,
-          showType: 0,
-          tableType: 0,
-          theme: "customed",
-          titleSize: 14,
-          dataSize: 14,
-          axisSize: 14,
-          dataLabel: false,
-          dataLabel2: false,
-          dataLabel3: false,
-          title1Dir: 0,
-          title1: "",
-          title2: "",
-          dataPosition: "top",
-          fontFamily: "sans-serif",
-          fontFamily2: "sans-serif",
-          fontFamily3: "sans-serif",
-          fontFamily4: "sans-serif",
-          fontWeight: false,
-          fontWeight2: false,
-          nameLocation: "end",
-          nameLocation2: "end",
-          width: "100",
-          height: "650",
-          widthUnit: "%",
-          heightUnit: "px",
-          splitLine: false,
-          splitLine2: false,
-          legend: true,
-          gridTop: "0",
-          gridLeft: "0",
-          gridBottom: "0",
-          gridRight: "0",
-          labelColor: "#000000",
-          legendColor: "#000000",
-          legendLocation: "top",
-          legendFontSize: "13",
-          fontSize: "13",
-          fontSize2: "13",
-          fontColor: "#000000",
-          fontColor2: "#000000",
-          show: true,
-          show2: true,
-          interval: true,
-          interval2: true,
-          rotate: "0",
-          rotate2: "0",
-          paddingTop: 0,
-          paddingBottom: 0,
-          paddingRight: 0,
-          paddingLeft: 0,
-          paddingTop2: 0,
-          paddingLeft2: 0,
-          paddingBottom2: 0,
-          paddingRight2: 0,
-          type2: "scroll",
-          barWidth: "",
-          scatterSize: "0",
-          config: {
-            color: [],
-            line: {
-              name: "",
-              first: "",
-              second: "",
-              operator: 0,
-              enable: false
-            },
-            table: table
-          }
-        },
-        schema: {
-          x: {
-            num: 10
-          },
-          y: {
-            num: 10
-          },
-        },
-        source: {
-          x: [],
-          y: []
-        },
-      }
-      this.form = form
-      this.$store.commit('SET_CHART_FORM', form)
-    },
-    handleEdit(value,type) {
-      var title = '编辑组'
-      var form = { ...value }
-      form.type = type
-      this.$refs.addAnalyseGroup.open(title,form)
-    },
-    getDataCountParams() {
-      let source = {
-        x: [],
-        y: [],
-      }
-      let schema = {
-        x: {},
-        y: {}
-      }
-      let merge = {
-        x: 0,
-        y: 0
-      }
-      Object.keys(source).forEach(dimension => {
-        if (this.form.schema[dimension].type === 6) {
-          if (this.form.setting.type === 20) {
-            source[dimension] = this.getTreeAllNode(dimension)
-            merge[dimension] = 1
-          } else if (this.form.setting.type === 30) {
-            source[dimension] = this.getTreeLastChildren(dimension)
-          } else {
-            source[dimension] = this.getPatentTreeChildren(dimension)
-            merge[dimension] = 1
-          }
-        } else {
-          source[dimension] = this.form.source[dimension].filter(item => item.selected)
-        }
-      })
-      Object.keys(schema).forEach(dimension => {
-        schema[dimension] = {
-          expand: this.form.schema[dimension].expand || 0,
-          field: this.form.schema[dimension].field || 0,
-          num: this.form.schema[dimension].num,
-          type: this.form.schema[dimension].type,
-          ptype: this.form.schema[dimension].ptype,
-          merge: merge[dimension]
-        }
-      })
-      return { source, schema }
-    },
-    async getDataCount() {
-      if (this.reloadData) {
-        const { source, schema } = this.getDataCountParams()
-        let params = {
-          type: this.form.setting.type,
-          schema: schema,
-          source: source,
-          patentKey: this.patentKey,
-          projectId: this.projectId
-        }
-        this.loading = true
-        try {
-          const response = await this.$api.getDataCount(params)
-          this.$store.commit('SET_DATA_COUNT', response.data)
-          this.refreshChart()
-          this.$store.commit('SET_RELOAD_DATA', false)
-          this.loading = false
-          this.showChart = true
-        } catch (e) {
-          this.loading = false
-          this.showChart = false
-        }
-      }
-    },
-    getTreeAllNode(dimension) {
-      const tree = getTreeDataList(this.form.source[dimension], [])
-      return tree.map(item => { return { id : item.id } })
-    },
-    getTreeLastChildren(dimension) {
-      const tree = getTreeDataList(this.form.source[dimension], [])
-      const data = tree.filter(item => this.treeKey[dimension].indexOf(item.id) !== -1)
-      let arr = data.filter(item =>  !item.children || !item.children.length)
-      data.map(item => arr.push(...getTreeLastChildren(item.children || [], [])))
-      return arr.map(item => { return { id : item.id } })
-    },
-    getPatentTreeChildren(dimension) {
-      const tree = getTreeDataList(this.form.source[dimension], [])
-      const selected = this.treeKey[dimension].map(item => item)
-      let arr = []
-      selected.map(item => {
-        const node = tree.find(t => t.id === item)
-        arr.push(node)
-        arr.push(...getTreeLastChildren(node.children || [], []))
-      })
-      return arr.map(item => { return { id : item.id } })
-    },
-    getTreeNodeName(node, tree) {
-      const path = node.path.split('/').map(p => parseInt(p, 0))
-      let name = []
-      path.map(item => {
-        const n = tree.find(x => x.id === item)
-        if (n) {
-          name.push(n.name)
-        }
-      })
-      return name.join('/')
-    },
-    getExportParams() { 
-      const xAxis = getXAxisName(this.patentField, this.form.schema.x.field, this.form.schema.x.expand)
-      let type = this.form.schema.y.field ? 2 : 1
-      type = this.form.setting.type === 21 ? 3 : type
-      let count = JSON.parse(JSON.stringify(this.count))
-      const xt = this.form.schema.x.type === 6
-      const yt = this.form.schema.y.type === 6
-      const xs = getTreeDataList(this.form.source.x, [])
-      const ys = getTreeDataList(this.form.source.y, [])
-      if (xt && !yt) {
-        for (let key in count) {
-          const xn = xs.find(item => item.id === parseInt(key))
-          const name = this.getTreeNodeName(xn, xs)
-          if (xn) {
-            count[name] = count[key]
-            delete count[key]
-          }
-        }
-      }
-      if (xt && yt) {
-        for (let xk in count) {
-          const xn = xs.find(item => item.id === parseInt(xk))
-          const xa = this.getTreeNodeName(xn, xs)
-          let data = {}
-          for (let yk in count[xk]) {
-            const yn = ys.find(item => item.id === parseInt(yk))
-            const ya = this.getTreeNodeName(yn, ys)
-            if (yn) {
-              data[ya] = count[xk][yk]
-            }
-          }
-          if (xn) {
-            count[xa] = data
-            delete count[xk]
-          }
-        }
-      }
-      if (!xt && yt) {
-        for (let key in count) {
-          let data = {}
-          for (let y in count[key]) {
-            const yn = ys.find(item => item.id === parseInt(y))
-            const ya = this.getTreeNodeName(yn, ys)
-            if (yn) {
-              data[ya] = count[key][y]
-              delete count[y]
-            }
-          }
-          count[key] = data
-        }
-      }
-      return { count, type, xAxis }
-    },
-    async handleExport() {
-      this.loadingBtn3 = true
-      const { count, type, xAxis } = this.getExportParams()
-      this.$api.exportCustomItem(count, type, xAxis).then(response => {
-        downLoad(response, moment().format('YYYYMMDDHHmmss') + '.xls')
-        this.loadingBtn3 = false
-      }).catch(error => {
-        this.loadingBtn3 = false
-      })
-    },
-    resetChartType() {
-      this.form.setting.type = null
-      this.$store.dispatch('resetSettingColor')
-    },
-    async submit() {
-      if (!this.form.schema.x.field) {
-        this.$message.error('请选择一维数据')
-        return false
-      }else{
-        if(this.form.source.x.length == 0){
-          this.$message.error('一维数据为空')
-          return false
-        }
-      }
-      if(this.form.schema.y.field){
-        if(this.form.source.y.length == 0){
-          this.$message.error('二维数据为空')
-          return false
-        }
-      }
-      const chartType = this.$constants.chartType.find(c => c.value === this.form.setting.type)
-      const { op, cg } = detectionChartType(chartType || {}, this.form)
-      if (op && cg) {
-        this.resetChartType()
-      }
-      if (!this.form.setting.type) {
-        this.$message.error('请选择图表类型')
-        return false
-      }
-      await this.getDataCount()
-      this.refreshChart()
-      this.showChart = true
-    },
-    async handleSelect(key) {
-      let source = {
-        x: [],
-        y: []
-      }
-      this.$store.commit('SET_RELOAD_DATA', true)
-      this.activeName = '1'
-      this.loading = true
-      const response = await this.$api.getCustomItem(key)
-      this.$store.commit('SET_CHART_FORM', JSON.parse(JSON.stringify(response.data)))
-      if (this.enable.indexOf(this.form.setting.type) === -1) {
-        this.form.setting.config.line.enable = false
-      }
-      for (let key in response.data.source) {
-        source[key] = response.data.source[key]
-        if (response.data.source[key].length === 0 || response.data.schema[key].type === 6) {
-          await this.$store.dispatch('getSourceDataList', key)
-          if (response.data.setting.title1) {
-            this.form.setting.title1 = response.data.setting.title1
-          }
-          if (response.data.setting.title2) {
-            this.form.setting.title2 = response.data.setting.title2
-          }
-        }
-      }
-      for (let key in response.data.schema) {
-        if (this.form.schema[key].type !== 6) {
-          this.$set(this.selected, key, this.form.source[key].slice(0, response.data.schema[key].num).map(item => item.name))
-          this.form.source[key].map(item => {
-            item.selected = this.selected[key].indexOf(item.name) !== -1
-          })
-        } else {
-          this.treeKey[key] = source[key].map(item => parseInt(item.name))
-          this.selected[key] = getTreeNameByIds(this.form.source[key], this.treeKey[key])
-        }
-      }
-      await this.$store.dispatch('getItemSettingColor', [])
-      await this.getDataCount()
-      this.$nextTick(() => {
-        this.loading = false
-      })
-    },
-    handleConfirm() {
-      this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          this.loadingBtn = true
-          let form = JSON.parse(JSON.stringify(this.form2))
-          for (let key in form.schema) {
-            form.schema[key].field = form.schema[key].field || 0
-            form.schema[key].expand = form.schema[key].expand || 0
-            if (form.schema[key].type === 6) {
-              form.source[key] = this.treeKey[key].map(item => { return { name: item, selected: true } })
-            }
-          }
-          try {
-            let response
-            if (typeof form.parentId === 'string') {
-              form.parentName = form.parentId
-              form.parentId = undefined
-            }
-            if (form.type) {
-              form.permissions = getFormPermissions(form)
-            }
-            if (!this.saveType && form.id) {
-              response = await this.$api.editCustomItem(form)
-              this.$message.success('编辑成功')
-            } else {
-              form.id = null
-              response = await this.$api.addCustomItem(form)
-              this.activeItem.push(response.data.parentId)
-              this.$message.success('添加成功')
-              if (form.type) {
-                await this.handleSelect(response.data.uid)
-              }
-            }
-            if (form.type) {
-              this.chartTitle = response.data.name
-            }
-            await this.getTreeList()
-            this.loadingBtn = false
-            this.handleClose()
-          } catch (e) {
-            this.loadingBtn = false
-          }
-        } else {
-          // console.log('error submit!!');
-          return false;
-        }
-      });
-    },
-  }
-}
-</script>
-
-<style lang="scss">
-.custom-analyse {
-  .custom-analyse-tabs {
-    .el-tabs__header {
-      margin-top: 35px !important;
-      margin-left: 22px;
-    }
-  }
-  .custom-analyse-chart-img-box {
-    background: #ffffff;
-  }
-  .custom-analyse-chart-title {
-    padding: 20px;
-    span {
-      font-weight: bold;
-      font-size: 16px;
-    }
-  }
-  .custom-analyse-options {
-    padding: 20px;
-    .number {
-      padding-left: 10px;
-      color: #409EFF;
-    }
-    .text {
-      font-size: 13px;
-      padding-right: 20px;
-    }
-  }
-}
-</style>

+ 17 - 16
src/views/components/import/conditionImport/components/search_history.vue

@@ -155,7 +155,7 @@ export default {
       this.loading = true
       this.$api.queryRetrieveRecord(this.queryParams).then(response=>{
         if(response.code == 200){
-          this.tableData = response.data.records
+          this.tableData = response.data.data
           this.queryParams.total = response.data.total
           this.loading = false
         }
@@ -191,29 +191,31 @@ export default {
       // }).catch(error=>{
 
       // })
+
       var a = {
-        condition:this.form.conditions,
+        searchCondition:this.form.conditions,
         DBType:this.form.dbType,
-        importToId:this.importData.importToId,
-        retrieveRecordId:null
+        retrieveRecordId:null,
+        ...this.importData,
+        type:4
       }
       const router = this.$router.resolve({
-                path: '/searchResult',
-                query: {
-                  data:JSON.stringify(a)
-                }
-            })
-            // this.$s.setSession('retrieveRecordId',0)
-            this.handleClose()
-            this.getList()
-            window.open(router.href, '_blank');
+          path: '/searchResult',
+          query: {
+            data:JSON.stringify(a)
+          }
+      })
+      this.handleClose()
+      this.getList()
+      window.open(router.href, '_blank');
     },
     //执行检索历史
     executeSearch(row){
       var a = {
-        condition:row.conditions,
+        searchCondition:row.conditions,
         DBType:row.dbType,
-        importToId:this.importData.importToId,
+        ...this.importData,
+        type:4,
         retrieveRecordId:null
       }
       const router = this.$router.resolve({
@@ -222,7 +224,6 @@ export default {
                   data:JSON.stringify(a)
                 }
             })
-            // this.$s.setSession('retrieveRecordId',row.id)
             window.open(router.href, '_blank');
     },
     //检索历史id加入到数组

+ 1 - 16
src/views/components/indicia/components/mixins.js

@@ -63,22 +63,7 @@ export const importExcel = {
         const body = this.res
         this.res=''
         const worksheet = title
-        const url = 'data:application/vnd.ms-excel;base64,'
-  
-        // 下载的表格模板数据
-        const template = `<html xmlns:o="urn:schemas-microsoft-com:office:office"
-                        xmlns:x="urn:schemas-microsoft-com:office:excel"
-                        xmlns="http://www.w3.org/TR/REC-html40">
-                        <head><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet>
-                        <x:Name>${worksheet}</x:Name>
-                        <x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet>
-                        </x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]-->
-                      </head><body><table><tr style="mso-number-format:'\@';height:45px;line-height:45px;text-align:center;width:150px;">${head}</tr>${body}</table></body></html>`
-        // 下载模板
-        let link = document.createElement('a')
-        link.setAttribute('href', url + window.btoa(unescape(encodeURIComponent(template))))
-        link.setAttribute('download', title + '.xls')
-        link.click()
+        this.$commonJS.exportExcel(head,body,worksheet,title)
         
       },
       getStr(item, filesValue) {

+ 0 - 1
src/views/home/components/echarts/components/report.vue

@@ -54,7 +54,6 @@ export default {
           }).catch(error => {
             data = []
           })
-        
         this.reportType.forEach((item,index) => {
           if(item.value == 6){
             return

+ 2 - 0
src/views/project/patentCollection/components/mixins/fastSelectPatent.js

@@ -115,12 +115,14 @@ export const fastSelectPatent = {
       var arr1 = [...new Set(arr.concat(this.queryParams.isAdd))]
       this.patentNoList = arr1.filter((x) => this.queryParams.isDelete.indexOf(x) == -1)
     },
+
     //获取已选择的总条数
     getSelectedTotal() {
       this.selectedTotal = Number(this.endNumber) - Number(this.startNumber) + 1 + Number(this.queryParams.isAdd.length) - Number(this.queryParams.isDelete.length)
     },
     //获取手动选择的专利
     getChoosePatentNo(patentNo) {
+      
       if (this.quickSelect) {
         var index = this.queryParams.isDelete.findIndex(item => {
           return item == patentNo

+ 7 - 7
src/views/project/patentCollection/components/mixins/index.js

@@ -59,13 +59,13 @@ export const projectData = {
       this.$emit('clickPatentNo', row, location)
     },
     changeSelect(patent) {
-      // const index1 = this.patentNoList.indexOf(patent.patentNo)
-      // if (index1 === -1) {
-      //     this.patentNoList.push(patent.patentNo)
-      // } else {
-      //   this.patentNoList.splice(index1, 1)
-      // }
-      // this.$emit('addSelect', patent.patentNo)
+      const index1 = this.patentNoList.indexOf(patent.patentNo)
+      if (index1 === -1) {
+          this.patentNoList.push(patent.patentNo)
+      } else {
+        this.patentNoList.splice(index1, 1)
+      }
+      this.$emit('addSelect', patent.patentNo)
     }
   },
 }

+ 2 - 2
src/views/project/patentCollection/components/views/Table.vue

@@ -5,8 +5,8 @@
       <el-table-column label="#" width="60" type="index" align="center">
         <template slot-scope="scope">
           <div v-if="refresh">
-            <el-checkbox-group v-model="patentNoList">
-              <el-checkbox :label="scope.row.patentNo">
+            <el-checkbox-group :value="patentNoList" >
+              <el-checkbox :label="scope.row.patentNo" @change="changeSelect(scope.row)">
                 <span>{{ (scope.$index + 1) + ((queryParams.current - 1) * queryParams.size) }}</span>
               </el-checkbox>
             </el-checkbox-group>

+ 9 - 9
src/views/project/patentCollection/index.vue

@@ -141,7 +141,7 @@
                   <el-dropdown-item @click.native="handleRead(0)"
                     :disabled="!$permission('/workspace/folder/isRead')">未读</el-dropdown-item> -->
                   <el-dropdown-item @click.native="handleIndex">批量标引</el-dropdown-item>
-                  <el-dropdown-item @click.native="checkPatentWorth" v-if="patentNoList.length">价值曲线</el-dropdown-item>
+                  <el-dropdown-item @click.native="checkPatentWorth">价值曲线</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -282,6 +282,7 @@ export default {
     this.getList()
   },
   methods: {
+    
     // 处理后的条件
     handleSearchValue({ searchStr, customFields }) {
       this.searchStr = searchStr
@@ -572,21 +573,20 @@ export default {
     //价值曲线
     checkPatentWorth(){
       let obj = {
-        selectQuery: {
-          isAdd: this.queryParams.isAdd,
-          isDelete: this.queryParams.isDelete,
-          startNumber: this.startNumber,
-          endNumber: this.endNumber,
-        },
+        isAdd: this.queryParams.isAdd,
+        isDelete: this.queryParams.isDelete,
+        startNumber: this.startNumber,
+        endNumber: this.endNumber,
         searchQuery: this.searchStr,
         customFields: this.customFields,
         orderDTOList:this.sort,
+        projectId: this.projectId,
       }
+      
       let router = this.$router.resolve({
         path: '/patentWorth',
         query: {
-          projectId: this.projectId,
-          ...obj
+          searchData:JSON.stringify(obj)
         }
       })
       window.open(router.href, '_blank')

+ 225 - 307
src/views/project/patentDetails/components/patentMessage/history/echarts/components/MultipleLine/index.vue

@@ -1,321 +1,239 @@
 <template>
-  <div style="margin-top:20px" >
-    <div style="display:flex;justify-content: flex-end;cursor: pointer;margin-bottom: -27px;margin-right:8px" :style="{ width: widths }" v-if="show">
-      <div class="set2">
-        <div>
-          <i class="el-icon-refresh" style="font-size:18px;" @click="review"></i>
-        </div>
-        <p class="text">还原</p>
-      </div>
-      <div class="set">
-        <div>
-          <i class="el-icon-setting" style="font-size: 18px;" @click="set"></i>
-        </div>
-        <p class="text">设置图表格式</p>
-      </div>
-      
-    </div>
-    <div :id="domId" :style="{ width: widths , height:heights }" ></div>
-    <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>
-  
+  <div style="background:#f4f4f4;padding:15px">
+   <div style="display:flex;justify-content: flex-end;cursor: pointer;;margin-bottom: -27px;margin-right:8px" :style="{ width: widths }">
+     <div class="set2">
+       <div>
+         <i class="el-icon-refresh" style="font-size:18px;" @click="review"></i>
+       </div>
+       <p class="text">还原</p>
+     </div>
+     <div class="set">
+       <div>
+         <i class="el-icon-setting" style="font-size:18px" @click="set"></i>
+       </div>
+       <p class="text">设置图表格式</p>
+     </div>
+   </div>
+   
+   <div :id="domId" :style="{ width: widths, height: heights }" style="background:white"></div>
+   <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>
 
 <script>
 import {chartOptionMixins,settingMethod} from '@/views/components/setting/mixins'
 import Style from '@/views/components/setting/style.vue'
-var that = this
 export default {
-  name: "CMultipleLine",
-  components:{
-        Style
-    },
-  mixins:[chartOptionMixins,settingMethod],
-  props: {
-    width: {
-      type: String,
-      default: '100%'
-    },
-    height: {
-      type: String,
-      default: '500px'
-    },
-    domId:{
-      default: 'multipleLine'
-    },
-  },
-  data() {
-    return {
-      widths:'100%',
-      heights:'500px',
-      drawer:false,
-      changeColor:true,
-      id:this.domId,
-      relation:{},
-      name:'',
-      // domId: 'multipleLine',
-      chartData:[],
-      show:false
-    }
-  },
-  computed:{
-    formSetting(){
-      return this.form.setting
-    },
-  },
-  watch:{
-    formSetting(val){
-      this.dispose(this.id)
-      this.heights = val.height + val.heightUnit
-      this.widths = val.width + val.widthUnit
-      var a = this.getOption2()
-      this.$nextTick(() => {
-        this.initChart(this.id, a)
-      })
-   }
-  },
-  mounted() {
-  },
+ name: "CMultipleLine",
+ components:{
+       Style
+   },
+ mixins:[chartOptionMixins,settingMethod],
+ props: {
+   width: {
+     type: String,
+     default: '100%'
+   },
+   height: {
+     type: String,
+     default: '500px'
+   },
+   domId:{
+     default: 'multipleLine'
+   },
   
-  methods: {
-    handleClose(){
-      this.form = JSON.parse(JSON.stringify(this.form))
-      this.drawer = false
-    },
-    set(){
-      this.drawer = true
-    },
-    open(chartData,name,relation,timeUnit){
-      if(!chartData || chartData.length==0){
-        this.show = false
-        return false
-      }
-      this.show = true
-      this.chartData = chartData
-      this.relation = relation
-      this.name = name
-      var a = this.getOption(name,relation,timeUnit)
-      this.$nextTick(() => {
-        this.initChart(this.id, a)
-      })
-    },
-  review(){
-      this.dispose(this.id)
-      var a = this.getOption2()
-      this.$nextTick(() => {
-          this.initChart(this.id, a)
-        })
-    },
-  getOption2(){
-    this.changeColor = false
-    let {backgroundColor,title,legend, xAxis, yAxis, series, grid,toolbox } = this.get2AxisOption('line', '')
-      // console.log(legend, xAxis, yAxis, series, grid)
-      return {
-        backgroundColor,
-        title,
-        tooltip: {
-          trigger: 'axis'
-        },
-        legend,
-        grid: grid,
-        xAxis: xAxis,
-        yAxis: yAxis,
-        series: series,
-        toolbox:toolbox
-      }
+ },
+ data() {
+   return {
+     widths:'100%',
+     heights:'500px',
+     drawer:false,
+     changeColor:true,
+     id:this.domId,
+     relation:{},
+     chartData:[]
+   }
+ },
+ computed:{
+   formSetting(){
+     return this.form.setting
+   }
+ },
+ watch:{
+   formSetting(val){
+     this.dispose(this.id)
+     this.heights = val.height + val.heightUnit
+     this.widths = val.width + val.widthUnit
+     var a = this.getOption2()
+     this.$nextTick(() => {
+         this.initChart(this.id, a)
+     })
   },
-    getOption(name,relation,timeUnit) {
-      this.form.setting.text.text = name
-      this.form.setting.title1 = relation.xStr
-      this.form.setting.title2 = relation.yStr+'/万元'
-      // var chartDom1 = document.getElementById(this.domId) 
-      // var myChart1 = this.$echarts.init(chartDom1)
-      var timeList = []
-      var productNameList = []
-      var productList = []
-      var data = []
-
-      for(var i = 0;i<this.chartData.length;i++){
-        var index = productList.findIndex(item=>{
-          return item.id == this.chartData[i].productId
-        })
-        if(index == -1){
-          productNameList.push(this.chartData[i].productName)
-          productList.push({
-            id:this.chartData[i].productId,
-            data:[this.chartData[i]]
-          })
-        }else{
-          productList[index].data.push(this.chartData[i])
-        }
-        var index2 = timeList.indexOf(this.chartData[i][relation.x])
-        if(index2 == -1){
-          timeList.push(this.chartData[i][relation.x])
-        }
-      }
-      for(let i =0;i<productList.length;i++){
-        var timeData = []
-        var productData = productList[i].data
-        for(let j = 0;j<productData.length;j++){
-          var index = timeList.indexOf(productData[j][relation.x])
-          timeData[index] = productData[j][relation.y]
-        }
-        data.push(
-          {
-            name:productNameList[i],
-            type:'line',
-            connectNulls:true,
-            data:timeData
-          }
-        )
-      }
-
-      // this.chartData.forEach(item => {
-      //   productNameList.push(item.productName)
-      //   data.push({
-      //     name:item.productName,
-      //     type:'line',
-      //     connectNulls:true,
-      //     saleVOS:item.saleVOS,
-      //     data:[]
-      //   })
-      //   item.saleVOS.forEach(item1=>{
-      //     var index = timeList.findIndex(i=>{
-      //       return item1[relation.x] == i
-      //     })
-      //     if(index == -1){
-      //       timeList.push(item1[relation.x])
-      //     }
-      //   })
-      // });
-      // timeList = timeList.sort((a,b)=>{
-      //     if(timeUnit == 0){
-      //       return Date.parse(a.replace(/-/g, "/")) - Date.parse(b.replace(/-/g, "/"))
-      //     }else if(timeUnit==1){
-      //       return  Date.parse(a.match(/(\d{1,3})+(?:\.\d+)?/g).join('/'))-Date.parse(b.match(/(\d{1,3})+(?:\.\d+)?/g).join('/'))
-      //     }else{
-      //       return Date.parse(a.substring(0,a.length-1))-Date.parse(b.substring(0,b.length-1))
-      //     }
-      //   }),
-      // data.forEach(item=>{
-      //   if(item.saleVOS && item.saleVOS.length>0){
-      //     item.saleVOS.forEach(item2=>{
-      //       var index = timeList.findIndex(i=>{
-      //         return item2[relation.x] == i
-      //       })
-      //       item.data[index] = item2[relation.y]
-      //     })
-      //   }
-        
-      // });
-      
-      this.selected = {
-        x:timeList,
-        y:productNameList,
-        data:data
-      }
-      if(this.changeColor){
-        this.setColor()
-      }
-      
-      // console.log(this.selected)
-      let {backgroundColor, title, legend, xAxis, yAxis, series, grid,toolbox } = this.get2AxisOption('line', '')
-      // console.log(legend, xAxis, yAxis, series, grid)
-      return {
-        backgroundColor,
-        title,
-        tooltip: {
-          trigger: 'axis'
-        },
-        legend,
-        grid: grid,
-        xAxis: xAxis,
-        yAxis: yAxis,
-        series: series,
-        toolbox:toolbox,
-       
-      }
-   
-      
-      // var option = {
-      //   title: {
-      //     text: name,
-      //     bottom:0,
-      //     left:'center'
-      //   },
-      //   tooltip: {
-      //     trigger: 'axis'
-      //   },
-      //   legend: {
-      //     data: productNameList.length>1?productNameList:[],
-      //   },
-      //   grid: {
-      //     left: '3%',
-      //     right: '4%',
-      //     bottom: '40',
-      //     containLabel: true
-      //   },
-      //   toolbox: {
-      //     feature: {
-      //       saveAsImage: {}
-      //     }
-      //   },
-      //   xAxis: {
-      //     type: 'category',
-      //     data: timeList,
-      //     name: '时间',
-      //     nameLocation: "end"
-      //   },
-      //   yAxis: {
-      //     type: 'value',
-      //     name: '销售额/万元',
-      //     nameLocation: "end"
-      //   },
-      //   series: data
-      // };
-      // myChart1.clear();
-      // myChart1.setOption(option);
-    }
+  domId(val){
+   this.id = val
   }
+ },
+ mounted() {
+ },
+ methods: {
+   handleClose(){
+     this.form = JSON.parse(JSON.stringify(this.form))
+     this.drawer = false
+   },
+   set(){
+     this.drawer = true
+     // this.$emit('form',this.form)
+   },
+   open(chartData,name,relation,timeUnit){
+     this.chartData = chartData
+     this.relation = relation
+     var a = this.getOption(name,relation,timeUnit)
+     this.$nextTick(() => {
+       this.initChart(this.id, a)
+     })
+   },
+   review(){
+     this.dispose(this.id)
+     var a = this.getOption2()
+     this.$nextTick(() => {
+         this.initChart(this.id, a)
+       })
+   },
+   getOption2(){
+     this.changeColor = false
+   let {backgroundColor,title, legend, xAxis, yAxis, series, grid,toolbox } = this.get2AxisOption('line', '')
+     return {
+       backgroundColor,
+       title,
+       tooltip: {
+         trigger: 'axis'
+       },
+       legend,
+       grid: grid,
+       xAxis: xAxis,
+       yAxis: yAxis,
+       series: series,
+       toolbox: toolbox
+     }
+ },
+   getOption(name,relation,timeUnit) {
+     this.form.setting.text.text = name
+     this.form.setting.title1 = '时间'
+     this.form.setting.title2 = '金额/万元'
+     // var chartDom1 = document.getElementById(this.domId) 
+     // var myChart1 = this.$echarts.init(chartDom1)
+     var timeList = []
+     var patentNoList = []
+     var data = []
+     this.chartData.forEach(item => {
+         for(let key in this.relation){
+             var index2 = data.findIndex(i=>{
+               return i.key == key
+             })
+             if(index2 ==-1){
+               data.push(
+                 {
+                   name:relation[key],
+                   key:key,
+                   type:'line',
+                   connectNulls:true,
+                   data:[]
+                 }
+               )
+             }
+           
+         }
+         var index = timeList.findIndex(i=>{
+           return item.time == i
+         })
+         if(index == -1){
+           timeList.push(item.time)
+         }
+     });
+     timeList = timeList.sort((a,b)=>{
+         if(timeUnit == 0){
+           return Date.parse(a.replace(/-/g, "/")) - Date.parse(b.replace(/-/g, "/"))
+         }else if(timeUnit==1){
+           return  Date.parse(a.match(/(\d{1,3})+(?:\.\d+)?/g).join('/'))-Date.parse(b.match(/(\d{1,3})+(?:\.\d+)?/g).join('/'))
+         }else{
+           return Date.parse(a.substring(0,a.length-1))-Date.parse(b.substring(0,b.length-1))
+         }
+       }),
+       data.forEach(item=>{
+          if(this.chartData && this.chartData.length>0){
+            this.chartData.forEach(item2=>{
+              var index = timeList.findIndex(i=>{
+                return item2.time == i
+              })
+              item.data[index] = item2[item.key]
+            })
+          }
+          
+        });
+     this.selected = {
+       x:timeList,
+       y:data.map(item=>{return item.name}),
+       data:data
+     }
+     if(this.changeColor){
+       this.setColor()
+     }
+     let {backgroundColor,title, legend, xAxis, yAxis, series, grid,toolbox } = this.get2AxisOption('line', '')
+     return {
+       backgroundColor,
+       title,
+       tooltip: {
+         trigger: 'axis'
+       },
+       legend,
+       grid: grid,
+       xAxis: xAxis,
+       yAxis: yAxis,
+       series: series,
+       toolbox:toolbox
+     }
+     
+   }
+ }
 }
 </script>
 <style lang="scss" scoped>
-  .text{
-    display: none;
-    font-size: 12px;
-    color: #4099c6;
-    position: absolute;
-    top: 10px;
-    left: -30px;
-    z-index: 999;
-    width: 200px;
-  }
-  .set{
-    position: relative;
-    // margin-bottom:-200%;
-    z-index: 999;
-    // padding: 10px 0;
-  }
-  .set2{
-    margin-right:6px;
-    position: relative;
-    z-index: 999;
-  }
-  .set2:hover .text{
-    left:0;
-    display: block;
-  }
-  .set:hover .text{
-    display: block;
-  }
+ .text{
+   display: none;
+   font-size: 12px;
+   color: #4099c6;
+   position: absolute;
+   top: 10px;
+   left: -30px;
+   z-index: 999;
+   width: 200px;
+ }
+ .set{
+   position: relative;
+   // margin-bottom:-20px;
+   z-index: 999;
+   // padding: 10px 0;
+ }
+ .set2{
+   margin-right:6px;
+   position: relative;
+   z-index: 999;
+ }
+ .set2:hover .text{
+   left:0;
+   display: block;
+ }
+ .set:hover .text{
+   display: block;
+ }
 </style>

+ 20 - 17
src/views/project/patentDetails/components/patentMessage/history/echarts/components/echarts.vue

@@ -4,7 +4,7 @@
             <div style="display:flex;justify-content: space-between;">
             <el-form :inline="true">
                 <el-form-item label="时间">
-                    <el-select v-model="queryParams.timeUnit" @change="changeEcharts()"  placeholder="请选择时间">
+                    <el-select v-model="queryParams.timeType" @change="changeEcharts()"  placeholder="请选择时间">
                         <el-option
                             v-for="item in timeList"
                             :key="item.value"
@@ -13,7 +13,7 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="地区">
+                <!-- <el-form-item label="地区">
                     <el-select v-model="queryParams.area" @change="changeEcharts()" clearable  placeholder="请选择地区">
                         <el-option
                             v-for="item in areaList"
@@ -22,7 +22,7 @@
                             :value="item.value">
                         </el-option>
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
             </el-form>
             </div>
         </div>
@@ -54,7 +54,7 @@ export default {
             component:'MultipleLine',
             components:'MultipleLineAll',
             queryParams:{
-                timeUnit:0,
+                timeType:0,
                 relation:1
             },
             relationList:[
@@ -105,11 +105,11 @@ export default {
     methods: {
         changeRelation(){
             var option = {
-                customLicenseMoney:'预估许可价值',
+                customLicense:'预估许可价值',
                 licenseFee:'已发生的许可费用',
-                saleTotalMoney:'营销数据'
+                saleMoney:'营销数据'
             }
-            this.$refs[this.component].open(this.chartData,'价值曲线',option,this.queryParams.timeUnit)
+            this.$refs[this.component].open(this.chartData,'价值曲线',option,this.queryParams.timeType)
 
         },
         async changeEcharts(){
@@ -119,24 +119,27 @@ export default {
        async init(){
            await this.getData()
             this.changeRelation()
-            const [areaList] = await Promise.allSettled([this.getAreaList()])
-            this.areaList= areaList.status =='fulfilled'?areaList.value.map(item=>{
-                return {
-                    value:item,
-                    label:item
-                }
-            }):[]
+            // const [areaList] = await Promise.allSettled([this.getAreaList()])
+            // this.areaList= areaList.status =='fulfilled'?areaList.value.map(item=>{
+            //     return {
+            //         value:item,
+            //         label:item
+            //     }
+            // }):[]
             
         },
        async getData(){
-            this.queryParams.saleArea = this.queryParams.area
+            // this.queryParams.saleArea = this.queryParams.area
             var params = {
                 ...this.searchQuery,
                 ...this.queryParams
             }
-            await this.$api.PatentWorth(params).then(response=>{
+            if(this.patentNo){
+                params.isAdd = [this.patentNo]
+            }
+            await this.$api.selectValueCurve(params).then(response=>{
                     if(response.code == 200){
-                        this.chartData = response.data
+                        this.chartData = response.data.data
                     }
             })
            

+ 5 - 2
src/views/project/patentDetails/components/patentMessage/history/echarts/index.vue

@@ -4,7 +4,6 @@
     </div>
 </template>
 <script>
-import routeVue from '@/utils/model/route.vue';
 import chart from './components/echarts.vue'
 export default{
     components:{
@@ -17,7 +16,11 @@ export default{
     },
     computed:{
         searchQuery(){
-            return this.$routeVue.query
+            var a = this.$route.query.searchData
+            if(a){
+                return JSON.parse(this.$route.query.searchData)
+            }
+            return {}
         }
     }
 }

+ 2 - 2
src/views/project/patentDetails/components/patentMessage/history/licenseHistory.vue

@@ -107,8 +107,8 @@ export default {
                     components:'el-input-number',
                     type:'number',
                     min:0,
-                    max:1,
-                    precision:1,
+                    max:'Infinity',
+                    precision:2,
                     step:0.1
                 },
                 {

+ 11 - 3
src/views/report/InvalidResponse/components/Evidence/evidence.vue

@@ -117,7 +117,7 @@ export default {
   mixins:[getTableHeight],
   props: {
     projectId:{
-        default:0
+        default:null
     },
     reportType:{
         default:0
@@ -206,7 +206,11 @@ export default {
         })
     },
     //上传证据文献
-    andClick(option){
+    async andClick(option){
+        if(!(await this.$permission.projectPermission(this.projectId))){
+            this.$showPermissionDialog()
+            return false
+        }
         switch(option){
             case '1'://专利号导入
                 this.patentImport(2)
@@ -368,7 +372,11 @@ export default {
         this.updateLiteratureOrder(data)
     },
     //更新排序
-    updateLiteratureOrder(dtoList){
+    async updateLiteratureOrder(dtoList){
+        if(!(await this.$permission.projectPermission(this.projectId))){
+            this.$showPermissionDialog()
+            return false
+        }
         this.$api.updateLiteratureOrder(dtoList).then(response=>{
             if(response.code == 200){
                 this.$message.success('更新排序成功')

+ 6 - 2
src/views/report/InvalidResponse/components/powerManage/powerManage.vue

@@ -103,7 +103,7 @@ export default {
   mixins:[getTableHeight],
   props: {
     projectId:{
-        default:0
+        default:null
     }
   },
   data() {
@@ -201,7 +201,11 @@ export default {
         })
     },
     //编辑
-    edit(){
+    async edit(){
+        if(!(await this.$permission.projectPermission(this.projectId))){
+            this.$showPermissionDialog()
+            return false
+        }
         this.isEdit = true
     },
     //保存

+ 10 - 2
src/views/report/InvalidResponse/components/reasonsAndEvidence/details.vue

@@ -1276,7 +1276,11 @@ export default {
             return item.value == id
         }).label
     },
-    batchAdd(type){
+    async batchAdd(type){
+        if(!(await this.$permission.projectPermission(this.projectId))){
+            this.$showPermissionDialog()
+            return false
+        }
         this.$refs.batchAddMessage.open(type,this.content.FirstEvidenceReason)
     },
     save(val){
@@ -1402,7 +1406,11 @@ export default {
             this.$message.error('编辑失败')
         })
     },
-    editContent(){
+    async editContent(){
+        if(!(await this.$permission.projectPermission(this.projectId))){
+            this.$showPermissionDialog()
+            return false
+        }
         this.edit = !this.edit
     },
     async getData(){

+ 20 - 4
src/views/report/InvalidResponse/components/reasonsAndEvidence/reasonsAndEvidence.vue

@@ -480,7 +480,11 @@ export default {
         
     
     },
-    removeInvalidStatutes(row){
+    async removeInvalidStatutes(row){
+        if(!(await this.$permission.projectPermission(this.projectId))){
+            this.$showPermissionDialog()
+            return false
+        }
         if(row.evidenceReasonId || row.secondEvidenceReasonId){
             this.$message.warning('该法条下存在无效证据,无法删除')
             return false
@@ -866,7 +870,11 @@ export default {
         }
     },
 
-    handleCommand(option){
+    async handleCommand(option){
+        if(!(await this.$permission.projectPermission(this.projectId))){
+            this.$showPermissionDialog()
+            return false
+        }
         switch(option){
             case '1'://添加无效理由(无效法条)
             case '2'://添加证据组合
@@ -916,7 +924,11 @@ export default {
         })
     },
     //管理无效证据
-    manageInvalidEvidence(row){
+    async manageInvalidEvidence(row){
+        if(!(await this.$permission.projectPermission(this.projectId))){
+            this.$showPermissionDialog()
+            return false
+        }
         var statutes = ['2','3','4','8']
         if(statutes.indexOf(row.statutesId)==-1 && !row.proofGroupId){
             var params = {
@@ -1137,7 +1149,11 @@ export default {
         tableElement.bodyWrapper.scrollTop = scrollTop
     },
     //删除
-    remove(row){
+    async remove(row){
+        if(!(await this.$permission.projectPermission(this.projectId))){
+            this.$showPermissionDialog()
+            return false
+        }
         this.$confirm('确认删除本条数据吗?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',

+ 6 - 2
src/views/report/analysisAndOpinion/components/comparisonResults/index.vue

@@ -49,7 +49,7 @@ export default {
   },
   props: {
     projectId:{
-        default:0
+        default:null
     },
     reportType:{
         default:''
@@ -221,7 +221,11 @@ export default {
             this.updateLiteratureOrder(data)
         },
         //更新排序
-        updateLiteratureOrder(dtoList){
+        async updateLiteratureOrder(dtoList){
+            if(!(await this.$permission.projectPermission(this.projectId))){
+                this.$showPermissionDialog()
+                return false
+            }
             this.$api.updateLiteratureOrder(dtoList).then(response=>{
                 if(response.code == 200){
                     this.$message.success('更新排序成功')

+ 5 - 1
src/views/report/components/details/components/splitDetails.vue

@@ -34,7 +34,11 @@ export default {
     
   },
   methods: {
-    save(data){
+    async save(data){
+      if(!(await this.$permission.projectPermission(this.projectId))){
+        this.$showPermissionDialog()
+        return false
+      }
       var params = {
         projectId:this.projectId,
         featuresList:data

+ 6 - 2
src/views/report/components/patentList/components/index.vue

@@ -22,7 +22,7 @@
             <div v-else style="display:flex;align-items:center">
               <el-dropdown id="step4" trigger="click" split-button type="primary" size="small" @click="handleFieldManage"
                 @command="handleCommand($event)">
-                <span v-disabled="false">显示栏位管理</span>
+                <span>显示栏位管理</span>
                 <el-dropdown-menu slot="dropdown" class="text-align_center">
                   <el-dropdown-item command="1">任务分配</el-dropdown-item>
                   <el-dropdown-item>
@@ -298,7 +298,11 @@ export default {
       this.$refs.field.open(this.fieldList)
     },
     // 显示管理旁下拉菜单
-    handleCommand(event) {
+    async handleCommand(event) {
+      if(!(await this.$permission.projectPermission(this.projectId))){
+        this.$showPermissionDialog()
+        return false
+      }
       switch (event) {
         case '1':
           this.handleAllocation()

+ 4 - 0
src/views/report/components/productResult/productResult.vue

@@ -299,6 +299,10 @@ export default {
     },
     // 工作协同
     async taskWork() {
+      if(!(await this.$permission.projectPermission(this.projectId))){
+        this.$showPermissionDialog()
+        return false
+      }
       this.$refs.checkPatent.open(this.projectId)
     },
     // 从专利清单子组件传值(专利号的数据)

+ 7 - 3
src/views/report/tort/components/informationEntry/indexMenu.vue

@@ -2,8 +2,8 @@
   <div>
     <informationEntry :patentNo="patentNo" :projectId="projectId" :reportType="reportType" :isSave="isSave" :isFormEdit="isEdit" @handleEdit="handleEdit">
       <div  slot="save" >
-        <el-button v-if="isEdit" type="primary" @click="save">保存</el-button>
-        <el-button v-else @click="edit">编辑</el-button>
+        <el-button v-if="isEdit" size="small" type="primary" @click="save">保存</el-button>
+        <el-button v-else size="small" @click="edit">编辑</el-button>
       </div>
       <div  slot="edit" >
         
@@ -32,7 +32,11 @@ export default {
     handleEdit(val) {
       this.isEdit=val
     },
-    edit() {
+    async edit() {
+      if(!(await this.$permission.projectPermission(this.projectId))){
+        this.$showPermissionDialog()
+        return false
+      }
       this.isEdit = !this.isEdit
     },
     save() {