浏览代码

专利挖掘

zhuhao 1 年之前
父节点
当前提交
3dcb02682b

+ 4 - 3
src/views/components/view/checkFile.vue

@@ -6,7 +6,7 @@
                 <el-link style="font-size: 16px" @click="downLoad"><i class="fa el-icon-download"></i><span style="margin-left:10px">下载</span></el-link>
             </div>
         </div>
-        <div style="display:flex;justify-content: center;">
+        <div style="display:flex;justify-content: center;height: calc(100% - 30px);">
             <div v-if="isPicture == 0"  v-loading="loadLoading" style="width:100%">
                 <iframe id="checkIframe" :src="FileUrl" frameborder="0" width="100%" :height="height"></iframe>
             </div>
@@ -41,7 +41,8 @@ export default {
         }
     },
     mounted(){
-        this.FileName = this.row.name?this.row.name+'.'+this.row.suffix:this.row.fileName
+        // this.FileName = this.row.name?this.row.name+'.'+this.row.suffix:this.row.fileName
+      this.FileName = this.row.originalName
         if(this.isPicture == 1){
             this.srcList = [this.FileUrl]
         }else{
@@ -116,7 +117,7 @@ export default {
     .header{
         padding: 0 20px;
         display: flex;
-        justify-content: space-around;
+        justify-content: space-between;
         align-items: center;
     }
 </style>

+ 9 - 21
src/views/patentMining/components/dialog/auditRecords.vue

@@ -12,25 +12,15 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column v-for="item in columnList" :key="item.value" :prop="item.value"
+
+        <el-table-column v-for="item in columnList2" :key="item.value" :prop="item.value"
           :render-header="$commonJS.renderHeaderMethods" :label="item.name" sortable="custom" align="center">
           <template slot-scope="scope">
-            <div v-if="['name'].includes(item.value)">
-              <el-link @click="handleItem(scope.row, item.value)">
-                <span v-html="$commonJS.getColumnData(scope.row, item)"></span>
-              </el-link>
-            </div>
-            <div v-else-if="['taskType'].includes(item.value)"
-              v-html="$commonJS.getColumnData(scope.row, item, null, { data: taskType })"></div>
-            <div v-else v-html="$commonJS.getColumnData(scope.row, item)"></div>
+            <div v-html="$commonJS.getColumnData(scope.row, item)"></div>
           </template>
         </el-table-column>
+        
       </el-table>
-      <div style="text-align: center;padding-top: 20px;">
-        <el-pagination background layout="total, prev, pager, next, jumper" :current-page.sync="queryParams.current"
-          :page-size.sync="queryParams.size" @current-change="handleCurrentChange" :total="queryParams.total">
-        </el-pagination>
-      </div>
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="handleClose">关 闭</el-button>
       </span>
@@ -75,12 +65,6 @@ export default {
       this.getList()
     },
     getList(row) {
-      // let params = {
-      //   ...this.queryParams,//分页信息
-      //   // searchQuery: this.$commonJS.objectToString(this.searchOption),//检索条件
-      //   orderDTOList: this.sort,//排序信息
-      //   id: id,
-      // }
       let params = {
         taskId: row.id
       }
@@ -88,7 +72,11 @@ export default {
         if (res.code == 200) {
           // this.detailsMessage = res.data.projectTaskVO//分配任务信息
           // this.tableData = res.data.systemFileList//文件
-          this.tableData = res.data.auditHistoryVOS.taskHandleResultVO//审查历史
+          for (let i = 0; i < res.data.auditHistoryVOS.length - 1; i++){
+            if (res.data.auditHistoryVOS[i].taskHandleResultVO) {
+              this.tableData.push(res.data.auditHistoryVOS[i].taskHandleResultVO)
+            }
+          }
         }
       })
     },

+ 47 - 24
src/views/patentMining/components/handleExamine/detailsPage.vue

@@ -27,38 +27,38 @@
               <template slot="label">
                 <i class="el-icon-user"></i> 任务名称
               </template>
-              <span v-html="getColumnData(detailsMessage,'name')"></span>
+              <span v-html="getColumnData(detailsMessage, 'name')"></span>
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
                 <i class="el-icon-user"></i> 创建人
               </template>
-              <span v-html="getColumnData(detailsMessage,'createName')"></span>
+              <span v-html="getColumnData(detailsMessage, 'createName')"></span>
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
                 <i class="el-icon-user"></i> 处理人
               </template>
-              <span v-html="getColumnData(detailsMessage,'handlerName')"></span>
+              <span v-html="getColumnData(detailsMessage, 'handlerName')"></span>
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
                 <i class="el-icon-mobile-phone"></i> 所属项目
               </template>
-              <span v-html="getColumnData(detailsMessage,'projectName')"></span>
+              <span v-html="getColumnData(detailsMessage, 'projectName')"></span>
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
                 <i class="el-icon-location-outline"></i> 所属流程
               </template>
-                {{ pathOptions.filter(item =>{ return item.value == detailsMessage.processId})[0].label }}
+              {{ pathOptions.filter(item => { return item.value == detailsMessage.processId })[0].label }}
               <!-- {{ detailsMessage.taskPath }} -->
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
                 <i class="el-icon-tickets"></i> 截止时间
               </template>
-              <span v-html="getColumnData(detailsMessage,'deadLineTime')"></span>
+              <span v-html="getColumnData(detailsMessage, 'deadLineTime')"></span>
             </el-descriptions-item>
           </el-descriptions>
         </div>
@@ -94,19 +94,19 @@
           <el-timeline :reverse="false" style="padding: 10px 0 0 10px;cursor: pointer;">
             <template>
               <div v-if="timelineList.length > 0">
-                <el-timeline-item v-for="item in timelineList" :key="item.id" timestamp=""  placement="top">
-                  <el-card >
-                  <div style="margin-bottom: 5px;">
-                    <span>处理人:</span>
-                    <span>{{ item.taskHandleResultVO?item.taskHandleResultVO.createName:'--' }}</span>
-                  </div>
-                  <div>
-                    <span>说明:</span>
-                    <span>{{ item.taskHandleResultVO?item.taskHandleResultVO.description:'--' }}</span>
-                  </div>
-                </el-card>
+                <el-timeline-item v-for="item in timelineList" :key="item.id" timestamp="" placement="top">
+                  <el-card>
+                    <div style="margin-bottom: 5px;">
+                      <span>处理人:</span>
+                      <span>{{ item.taskHandleResultVO ? item.taskHandleResultVO.createName : '--' }}</span>
+                    </div>
+                    <div>
+                      <span>说明:</span>
+                      <span>{{ item.taskHandleResultVO ? item.taskHandleResultVO.description : '--' }}</span>
+                    </div>
+                  </el-card>
                 </el-timeline-item>
-                
+
               </div>
               <div v-else>
                 <el-timeline-item timestamp="2018/4/12" placement="top">
@@ -127,9 +127,9 @@
 
 <script>
 import { downLoad2 } from "@/utils"
-import {optionsData} from '../mixins/index2'
+import { optionsData } from '../mixins/index2'
 export default {
-  mixins:[optionsData],
+  mixins: [optionsData],
   props: ['row'],
   data() {
     return {
@@ -149,7 +149,7 @@ export default {
   methods: {
     // 点击左侧图标回到指定位置
     handleTarget(val) {
-      let dom=''
+      let dom = ''
       switch (val) {
         case 1:
           dom = '.message'
@@ -186,7 +186,7 @@ export default {
         if (res.code == 200) {
           this.detailsMessage = res.data.projectTaskVO//分配任务信息
           this.tableData = res.data.systemFileList//文件
-          this.timelineList = res.data.auditHistoryVOS//审查历史
+          this.timelineList = res.data.auditHistoryVOS.splice(0, res.data.auditHistoryVOS.length - 1)//审查历史
         }
       })
     },
@@ -205,8 +205,31 @@ export default {
       }
     },
     // 预览
-    preview(data) { 
-      
+    preview(data) {
+      let guid = data.guid
+      var item = JSON.parse(JSON.stringify(data))
+
+      var arr = ['png', 'jpeg', 'bmp', 'jpg']
+      if (arr.includes(item.type)) {
+        var FileUrl = this.$commonJS.checkViewer(guid)
+        var isPicture = 1
+      } else {
+        let http = '139.224.24.90'
+        var url = this.$commonJS.checkViewer(guid)
+        // var FileUrl = `http://${this.$c.hostname}:8012/onlinePreview?url=`+ btoa(encodeURIComponent(this.$commonJS.checkViewer(guid)+ '&fullfilename=test.'+item.type))
+        var FileUrl = `http://${http}:8012/onlinePreview?url=`+ btoa(encodeURIComponent(url + '&fullfilename=test.'+item.type))
+        var isPicture = 0
+      }
+      // return
+      const router = this.$router.resolve({
+        path: '/checkFile',
+        query: {
+          row: JSON.stringify(item),
+          FileUrl: FileUrl,
+          isPicture: isPicture
+        }
+      })
+      window.open(router.href, '_blank');
     },
     // 下载
     downloads(data) {

+ 19 - 1
src/views/patentMining/components/mixins/index2.js

@@ -8,7 +8,7 @@ export const column = {
         2: '文件分配任务',
         3: '文件审核任务',
       },
-      // table栏位信息
+      // 任务列表table栏位信息
       columnList: [
         {
           name: "任务名称",
@@ -51,6 +51,24 @@ export const column = {
           value: "description",
         },
       ],
+      // 审核历史table栏位信息
+      columnList2: [
+        {
+          name: "处理人",
+          type: "String",
+          value: "createName",
+        },
+        {
+          name: "时间",
+          type: "String",
+          value: "createTime",
+        },
+        {
+          name: "结果",
+          type: "String",
+          value: "description",
+        },
+      ]
     }
   },
   mounted() {