[update] 个人中心所有模块联调

src/api/personCenter.js

@@ -1,10 +1,10 @@
-import { getAction } from './manage'
+import { postAction } from './manage'
 
 // 我的收藏-取消收藏
-const cancelCollect = (params) => getAction('', params)
+const cancelCollect = (params) => postAction('/personal/lawsStandardCollection/delete', params)
 
 // 浏览记录-清除浏览记录
-const clearBrowsingHistory = (params) => getAction('', params)
+const clearBrowsingHistory = (params) => postAction('/personal/lawsBrowsingHistory/delete', params)
 
 export {
   cancelCollect,

src/views/personalCenter/browsingHistory/BrowsingHistory.vue

@@ -66,14 +66,14 @@ export default {
           title: this.$t('personalCenter.browsingHistory.standardNo'),
           align: 'center',
           width: 180,
-          dataIndex: 'owningPlate',
+          dataIndex: 'standardNum',
           scopedSlots: { customRender: 'toDetail' }
         },
         {
           title: this.$t('personalCenter.browsingHistory.standardName'),
           align: 'center',
           width: 180,
-          dataIndex: 'title',
+          dataIndex: 'standardName',
           scopedSlots: { customRender: 'toDetail' }
         },
         {
@@ -84,8 +84,8 @@ export default {
         }
       ],
       url: {
-        list: '',
-        deleteBatch: ''
+        list: '/personal/lawsBrowsingHistory/page',
+        deleteBatch: '/personal/lawsBrowsingHistory/deleteBatch'
       }
     }
   },
@@ -94,47 +94,40 @@ export default {
     handleGoDetail (record) {
       let path = ''
       // 需要先判断是哪种标准
-      if (record.type === 3) {
+      if (record.standardType === '1') {
+        path = '/standardRegulationLibrary/DomesticStandardDetail'
+      } else if (record.standardType === '2') {
+        path = '/standardRegulationLibrary/OverseasStandardDetail'
+      } else if (record.standardType === '3') {
         path = '/enterpriseStandardLibrary/enterpriseStandardDetail'
       }
       this.$openPageNewSheet({
         path: path,
         query: {
-          id: record.id
+          id: record.standardId
         }
       })
     },
     // 清除浏览记录
     clearBrowsingHistory () {
-      if (this.selectedRowKeys.length <= 0) {
-        this.$message.warning(this.$t('selectARecord'))
-      } else {
-        let ids = ''
-        for (let a = 0; a < this.selectedRowKeys.length; a++) {
-          ids += this.selectedRowKeys[a] + ','
+      this.$confirm({
+        title: this.$t('personalCenter.browsingHistory.clearBrowsingHistory'),
+        content: this.$t('personalCenter.browsingHistory.confirmClearBrowsingHistory'),
+        onOk: () => {
+          this.loading = true
+          clearBrowsingHistory().then((res) => {
+            if (res.success) {
+              this.$message.success(res.message)
+              this.loadData()
+              this.onClearSelected()
+            } else {
+              this.$message.warning(res.message)
+            }
+          }).finally(() => {
+            this.loading = false
+          })
         }
-        const that = this
-        this.$confirm({
-          title: this.$t('personCenter.browsingHistory.clearBrowsingHistory'),
-          content: this.$t('personCenter.browsingHistory.confirmClearBrowsingHistory'),
-          onOk: function () {
-            that.loading = true
-            clearBrowsingHistory({ ids: ids }).then((res) => {
-              if (res.success) {
-                // 重新计算分页问题
-                that.reCalculatePage(that.selectedRowKeys.length)
-                that.$message.success(res.message)
-                that.loadData()
-                that.onClearSelected()
-              } else {
-                that.$message.warning(res.message)
-              }
-            }).finally(() => {
-              that.loading = false
-            })
-          }
-        })
-      }
+      })
     }
   }
 }

src/views/personalCenter/myCollection/MyCollection.vue

@@ -5,30 +5,18 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :md="6" :sm="8">
-            <!--标准类别-->
-            <a-form-item :label="$t('personalCenter.collection.standardCategory')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag
-                v-model="queryParam.state"
-                :placeholder="$t('pleaseSelect') + $t('personalCenter.collection.standardCategory')"
-                :type="'select'"
-                :triggerChange="false"
-                :dictCode="'state'"
-              />
-            </a-form-item>
-          </a-col>
           <a-col :md="6" :sm="8">
             <!--标准号-->
             <a-form-item :label="$t('personalCenter.collection.standardNo')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter') + $t('personalCenter.collection.standardNo')"
-                       v-model="queryParam.standardNo"></a-input>
+              <j-input :placeholder="$t('pleaseEnter') + $t('personalCenter.collection.standardNo')"
+                       v-model="queryParam.standardNumber"></j-input>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8">
             <!--标准名称-->
             <a-form-item :label="$t('personalCenter.collection.standardName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter') + $t('personalCenter.collection.standardName')"
-                       v-model="queryParam.standardName"></a-input>
+              <j-input :placeholder="$t('pleaseEnter') + $t('personalCenter.collection.standardName')"
+                       v-model="queryParam.standardName"></j-input>
             </a-form-item>
           </a-col>
           <div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -92,7 +80,7 @@ export default {
           title: this.$t('personalCenter.collection.standardNo'),
           align: 'center',
           width: 180,
-          dataIndex: 'standardNo',
+          dataIndex: 'standardNumber',
           scopedSlots: { customRender: 'toDetail' }
         },
         {
@@ -113,14 +101,14 @@ export default {
           title: this.$t('personalCenter.collection.newCarTypeDate'),
           align: 'center',
           width: 180,
-          dataIndex: 'newCarTypeDate',
+          dataIndex: 'newModelImplementationDate',
           scopedSlots: { customRender: 'text' }
         },
         {
           title: this.$t('personalCenter.collection.productCarDate'),
           align: 'center',
           width: 180,
-          dataIndex: 'productCarDate',
+          dataIndex: 'onTheProductionDate',
           scopedSlots: { customRender: 'text' }
         },
         {
@@ -147,7 +135,11 @@ export default {
     handleGoDetail (record) {
       let path = ''
       // 需要先判断是哪种标准
-      if (record.type === 3) {
+      if (record.source === '1') {
+        path = '/standardRegulationLibrary/DomesticStandardDetail'
+      } else if (record.source === '2') {
+        path = '/standardRegulationLibrary/OverseasStandardDetail'
+      } else if (record.source === '3') {
         path = '/enterpriseStandardLibrary/enterpriseStandardDetail'
       }
       this.$openPageNewSheet({

src/views/personalCenter/receivedShare/ReceivedShare.vue

@@ -6,15 +6,15 @@
         <a-row :gutter="24">
           <a-col :span="6">
             <a-form-item :label="$t('personalCenter.receivedShare.pushSearch')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('personalCenter.receivedShare.enterPushInfo')" v-model="queryParam.transmitSearch"></a-input>
+              <a-input :placeholder="$t('personalCenter.receivedShare.enterPushInfo')" v-model="queryParam.title"></a-input>
             </a-form-item>
           </a-col>
           <a-col :span="6">
             <a-form-item :label="$t('personalCenter.receivedShare.owningPlate')" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag
                 :placeholder="$t('pleaseEnter')+$t('personalCenter.receivedShare.owningPlate')"
-                dict-code="inspect_status"
-                v-model="queryParam.owningPlate">
+                dict-code="sector"
+                v-model="queryParam.source">
               </j-dict-select-tag>
             </a-form-item>
           </a-col>
@@ -53,8 +53,8 @@
         <!--  接收时间，单独写出来是解决会有滚动条的问题  -->
         <template slot="receiptTime" slot-scope="{text, record}">
           <a-tooltip overlay-class-name="tooltip-style">
-            <template slot="title">{{ record.receiptTime || record.receiptTime === 0 ? record.receiptTime : global.emptyLine }}</template>
-            <div class="table-text">{{ record.receiptTime || record.receiptTime === 0 ? record.receiptTime : global.emptyLine }}</div>
+            <template slot="title">{{ record.sharingTime || record.sharingTime === 0 ? record.sharingTime : global.emptyLine }}</template>
+            <div class="table-text">{{ record.sharingTime || record.sharingTime === 0 ? record.sharingTime : global.emptyLine }}</div>
           </a-tooltip>
         </template>
 
@@ -85,7 +85,7 @@ export default {
           title: this.$t('personalCenter.receivedShare.owningPlate'),
           align: 'center',
           width: 180,
-          dataIndex: 'owningPlate',
+          dataIndex: 'source_dictText',
           scopedSlots: { customRender: 'text' }
         },
         {
@@ -99,7 +99,7 @@ export default {
           title: this.$t('personalCenter.receivedShare.forwarder'),
           align: 'center',
           width: 180,
-          dataIndex: 'forwarder',
+          dataIndex: 'sharerName',
           scopedSlots: { customRender: 'text' }
         },
         {
@@ -110,8 +110,8 @@ export default {
         }
       ],
       url: {
-        list: '',
-        deleteBatch: ''
+        list: '/personal/lawsStandardSharing/received/page',
+        deleteBatch: '/personal/lawsStandardSharing/deleteBatch'
       }
     }
   }

src/views/personalCenter/sentShare/SentShare.vue

@@ -6,15 +6,15 @@
         <a-row :gutter="24">
           <a-col :span="6">
             <a-form-item :label="$t('personalCenter.sentShare.transmitSearch')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('personalCenter.sentShare.enterTransmitSearch')" v-model="queryParam.transmitSearch"></a-input>
+              <a-input :placeholder="$t('personalCenter.sentShare.enterTransmitSearch')" v-model="queryParam.title"></a-input>
             </a-form-item>
           </a-col>
           <a-col :span="6">
             <a-form-item :label="$t('personalCenter.sentShare.owningPlate')" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag
                 :placeholder="$t('pleaseEnter')+$t('personalCenter.sentShare.owningPlate')"
-                dict-code="inspect_status"
-                v-model="queryParam.owningPlate">
+                dict-code="sector"
+                v-model="queryParam.source">
               </j-dict-select-tag>
             </a-form-item>
           </a-col>
@@ -53,8 +53,8 @@
         <!--  转发时间，单独写出来是解决会有滚动条的问题  -->
         <template slot="transmitTime" slot-scope="{text, record}">
           <a-tooltip overlay-class-name="tooltip-style">
-            <template slot="title">{{ record.transmitTime || record.transmitTime === 0 ? record.transmitTime : global.emptyLine }}</template>
-            <div class="table-text">{{ record.transmitTime || record.transmitTime === 0 ? record.transmitTime : global.emptyLine }}</div>
+            <template slot="title">{{ record.sharingTime || record.sharingTime === 0 ? record.sharingTime : global.emptyLine }}</template>
+            <div class="table-text">{{ record.sharingTime || record.sharingTime === 0 ? record.sharingTime : global.emptyLine }}</div>
           </a-tooltip>
         </template>
 
@@ -85,7 +85,7 @@ export default {
           title: this.$t('personalCenter.sentShare.owningPlate'),
           align: 'center',
           width: 180,
-          dataIndex: 'owningPlate',
+          dataIndex: 'source_dictText',
           scopedSlots: { customRender: 'text' }
         },
         {
@@ -99,7 +99,7 @@ export default {
           title: this.$t('personalCenter.sentShare.recipient'),
           align: 'center',
           width: 180,
-          dataIndex: 'title',
+          dataIndex: 'recipientName',
           scopedSlots: { customRender: 'text' }
         },
         {
@@ -110,8 +110,8 @@ export default {
         }
       ],
       url: {
-        list: '',
-        deleteBatch: ''
+        list: '/personal/lawsStandardSharing/issued/page',
+        deleteBatch: '/personal/lawsStandardSharing/deleteBatch'
       }
     }
   }