diff --git a/src/api/personCenter.js b/src/api/personCenter.js
index bb93be81..bb788a50 100644
--- a/src/api/personCenter.js
+++ b/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,
diff --git a/src/views/personalCenter/browsingHistory/BrowsingHistory.vue b/src/views/personalCenter/browsingHistory/BrowsingHistory.vue
index 95900b9e..31202359 100644
--- a/src/views/personalCenter/browsingHistory/BrowsingHistory.vue
+++ b/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
- })
- }
- })
- }
+ })
}
}
}
diff --git a/src/views/personalCenter/myCollection/MyCollection.vue b/src/views/personalCenter/myCollection/MyCollection.vue
index c9ab18d3..de0e7391 100644
--- a/src/views/personalCenter/myCollection/MyCollection.vue
+++ b/src/views/personalCenter/myCollection/MyCollection.vue
@@ -5,30 +5,18 @@
-
-
-
-
-
-
-
+
-
+
@@ -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({
diff --git a/src/views/personalCenter/receivedShare/ReceivedShare.vue b/src/views/personalCenter/receivedShare/ReceivedShare.vue
index 4f69c59e..35d7fb6d 100644
--- a/src/views/personalCenter/receivedShare/ReceivedShare.vue
+++ b/src/views/personalCenter/receivedShare/ReceivedShare.vue
@@ -6,15 +6,15 @@
-
+
+ dict-code="sector"
+ v-model="queryParam.source">
@@ -53,8 +53,8 @@
- {{ record.receiptTime || record.receiptTime === 0 ? record.receiptTime : global.emptyLine }}
- {{ record.receiptTime || record.receiptTime === 0 ? record.receiptTime : global.emptyLine }}
+ {{ record.sharingTime || record.sharingTime === 0 ? record.sharingTime : global.emptyLine }}
+ {{ record.sharingTime || record.sharingTime === 0 ? record.sharingTime : global.emptyLine }}
@@ -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'
}
}
}
diff --git a/src/views/personalCenter/sentShare/SentShare.vue b/src/views/personalCenter/sentShare/SentShare.vue
index 27dbd892..2551c9b4 100644
--- a/src/views/personalCenter/sentShare/SentShare.vue
+++ b/src/views/personalCenter/sentShare/SentShare.vue
@@ -6,15 +6,15 @@
-
+
+ dict-code="sector"
+ v-model="queryParam.source">
@@ -53,8 +53,8 @@
- {{ record.transmitTime || record.transmitTime === 0 ? record.transmitTime : global.emptyLine }}
- {{ record.transmitTime || record.transmitTime === 0 ? record.transmitTime : global.emptyLine }}
+ {{ record.sharingTime || record.sharingTime === 0 ? record.sharingTime : global.emptyLine }}
+ {{ record.sharingTime || record.sharingTime === 0 ? record.sharingTime : global.emptyLine }}
@@ -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'
}
}
}