优化（报告管理等）

RMS-FrontEnd/src/views/components/articles/components/mixins.js

@@ -219,9 +219,9 @@ export const addContrast = {
       else{
         if(selectObj.anchorNode.nodeValue!=null){
           if(selectObj.extentOffset>=selectObj.anchorOffset){
-            this.anchorOffset += selectObj.anchorOffset - selectObj.anchorNode.nodeValue.length + selectObj.anchorNode.nodeValue.trimStart().length;
+            this.anchorOffset += selectObj.anchorOffset
           }else{
-            this.anchorOffset += selectObj.extentOffset - selectObj.extentNode.nodeValue.length + selectObj.extentNode.nodeValue.trimStart().length;
+            this.anchorOffset += selectObj.extentOffset
           }
            
         }

RMS-FrontEnd/src/views/components/common/mixins.js

@@ -162,7 +162,7 @@ export const patentKeywordsHighlight = {
      if(this.contrastList){
        for(let i=0;i<this.contrastList.length;i++){
         if(this.contrastList[i].patentNo == this.patent.publicNo){
-          if(this.contrastList[i].fields == field){
+          if(this.contrastList[i].fields.indexOf(field)!=-1){
             var a = {
             color:"#dff209",
             Type:2,

RMS-FrontEnd/src/views/report/components/Tabel.vue

@@ -6,32 +6,32 @@
           <span>{{ (scope.$index + 1) + ((params.current - 1) * params.size) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="名称"  align="center">
+      <el-table-column label="名称"  align="center" prop="name" sortable>
         <template slot-scope="scope">
             <el-link type="primary"  @click="tableName(scope.row)">{{scope.row.name}}</el-link>
         </template>
       </el-table-column>
-      <el-table-column label="标的专利/产品"  align="center">
+      <el-table-column label="标的专利/产品"  align="center" prop="signPatentNo" sortable>
         <template slot-scope="scope">
             <span v-if="scope.row.type == 3">{{scope.row.signPatentNo}}</span>
             <el-link type="primary" v-else @click="toPatentDetails(scope.row.signPatentNo,scope.row)">{{scope.row.signPatentNo}}</el-link>
         </template>
       </el-table-column>
-      <el-table-column label="应用场景" width="160" :show-overflow-tooltip="true" align="center">
+      <el-table-column label="应用场景" width="160" :show-overflow-tooltip="true" align="center" prop="scenarioNames" sortable>
         <template slot-scope="scope">
             <div v-for="item in scope.row.scenarioNames">{{item}}</div>
         </template>
       </el-table-column>
-      <el-table-column label="创建人" prop="createPersonName" align="center"> </el-table-column>
-      <el-table-column label="负责人" prop="personName" align="center"> </el-table-column>
-      <el-table-column label="客户" prop="clientName" align="center"> </el-table-column>
-      <el-table-column label="技术/产品" prop="proTec" align="center"> </el-table-column>
+      <el-table-column label="创建人" prop="createPersonName" sortable align="center"> </el-table-column>
+      <el-table-column label="负责人" prop="personName" sortable align="center"> </el-table-column>
+      <el-table-column label="客户" prop="clientName" sortable align="center"> </el-table-column>
+      <el-table-column label="技术/产品" prop="proTec" sortable align="center"> </el-table-column>
       <el-table-column label="状态" align="center" >
         <template slot-scope="scope">
             <span>{{state[scope.row.status]}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" prop="createTime" width="200" align="center"> </el-table-column>
+      <el-table-column label="创建时间" prop="createTime" sortable width="200" align="center"> </el-table-column>
   
       <el-table-column label="操作" align="center" width="200px">
         <template slot-scope="scope">
@@ -109,41 +109,36 @@ export default {
     },
 
     sortChange({ column, prop, order }) {
+      console.log(order)
       if (!order) {
         this.sortData('create_time', 'desc')
         return false
       }
       const o = {
-        'descending': 'desc',
-        'ascending': 'asc',
+        'descending': '1',
+        'ascending': '0',
       }
-      let key
-      switch (prop) {
-        case 'createTime':
-          key = 'create_time'
-          break
-        case 'clientName':
-          key = 'clientid'
-          break
-        case 'technicalTheme':
-          key = 'technical_theme'
-          break
-        case 'createName':
-          key = 'creat_id'
-          break
-        case 'contractNo':
-          key = 'contract_no'
-          break
-        case 'caseDate':
-          key = 'case'
-          break
-        case 'personnelName':
-          key = 'personnel_id'
-          break
-        default:
-          key = prop
-      }
-      this.sortData(key, o[order])
+      let orderBy = prop
+      // switch (prop) {
+      //   case 'clientName':
+      //     orderBy = 'clientId'
+      //     break
+      //   case 'createPersonName':
+      //     orderBy = 'createPersonId'
+      //     break
+      //   case 'scenarioNames':
+      //     orderBy = 'scenarioList'
+      //     break
+      //   case 'personName':
+      //     orderBy = 'personId'
+      //     break
+      //   case 'proTec':
+      //     orderBy = 'proTec'
+      //     break
+      //   default:
+      //     orderBy = prop
+      // }
+      this.sortData(orderBy, o[order])
     },
     sortData(prop, order) {
       this.$emit('sort', { prop, order })

RMS-FrontEnd/src/views/report/index.vue

@@ -35,10 +35,12 @@
         <div style="text-align: center;">
           <el-pagination
               background
-              layout="total, prev, pager, next, jumper"
+              layout="total,sizes, prev, pager, next, jumper"
               :current-page.sync="queryParams.current"
+              :page-sizes="pageSize"
               :page-size.sync="queryParams.size"
               @current-change="handleCurrentChange"
+              @size-change="handleSizeChange"
               :total="total">
           </el-pagination>
         </div>
@@ -85,6 +87,7 @@ export default {
   },
   data() {
     return {
+     
       btnLoading:false,
       reportTemplate:false,
       setVisible:false,
@@ -98,6 +101,7 @@ export default {
         current: 1,
         signPatentNo:"",
       },
+      pageSize:[10,"全部"],
       total: 0,
       loading: false,
       showDialog: false,
@@ -129,6 +133,12 @@ export default {
     this.getList()
   },
   methods: {
+    handleSizeChange(val) {
+      // this.queryParams.size = null
+      // this.queryParams.current = null
+      this.getList()
+        // console.log(`每页 ${val} 条`);
+      },
     getReportTemplateId(val){
       this.reportTemplateId = val
     },
@@ -351,7 +361,10 @@ export default {
       this.$refs.ReportForm.open(row)
     },
     handleSort(sort) {
-      this.queryParams.sort = { ...sort }
+      console.log(sort)
+      this.queryParams.orderBy = sort.prop
+      this.queryParams.orderDesc = sort.order
+      // this.queryParams.sort = { ...sort }
       this.getList()
     },
     handleCurrentChange(val) {
@@ -388,7 +401,13 @@ export default {
       this.loading = true
       this.$api.QueryReport(this.queryParams).then(response=>{
         if(response.code == 200){
+          this.pageSize = [10]
           this.dataList = response.data
+          // if(!this.queryParams.size){
+          //   this.queryParams.current = 1
+          //   this.queryParams.size = this.total = response.pageColumn.total
+          // }
+          this.pageSize.push(response.pageColumn.total)
           this.total = response.pageColumn.total
            this.loading = false
         }