diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index a2d24c0b9..ca68b2ff2 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1807,4 +1807,6 @@ module.exports = { andTheOperatorCurrentData:' And the operator is the responsible person for the current data', upgradeInstructions:'Upgrade Instructions', upgradeOrNot:'Upgrade or not', + operationRecords:'Operation Records', + versionUpdatedRecord:'Version Updated Record', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 7376d26c3..f7a7221b3 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1909,4 +1909,6 @@ module.exports = { andTheOperatorCurrentData:',并且登录人为当前数据的责任人', upgradeInstructions:'升版说明', upgradeOrNot:'是否升版', + operationRecords:'操作记录', + versionUpdatedRecord:'版本更新记录', } \ No newline at end of file diff --git a/jero-web/src/components/UpdateLog/index.vue b/jero-web/src/components/UpdateLog/index.vue index f29fb58b8..6388938fb 100644 --- a/jero-web/src/components/UpdateLog/index.vue +++ b/jero-web/src/components/UpdateLog/index.vue @@ -12,15 +12,21 @@ {{$t('cancel')}} - + + + + + +
+ @@ -126,11 +156,13 @@ text-align: right; margin-top: 20px; } - /deep/.tooltipColor .ant-tooltip-inner { + + /deep/ .tooltipColor .ant-tooltip-inner { color: #333; background-color: #fff !important; } - /deep/.tooltipColor .ant-tooltip-arrow::before { + + /deep/ .tooltipColor .ant-tooltip-arrow::before { background-color: #fff; } \ No newline at end of file diff --git a/jero-web/src/components/UpdateLog/versionUpdatedRecordList.vue b/jero-web/src/components/UpdateLog/versionUpdatedRecordList.vue new file mode 100644 index 000000000..1642c6f6c --- /dev/null +++ b/jero-web/src/components/UpdateLog/versionUpdatedRecordList.vue @@ -0,0 +1,138 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 3965a9050..1b8c32b24 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -323,7 +323,7 @@
- + @@ -434,7 +434,8 @@ exportData: '/dummy/dummyInventoryInfoEO/exportData', exportTemplate: '/dummy/dummyInventoryInfoEO/exportTemplate', getSysCategoryTree: '/sys/category/getSysCategoryTree', - logList: '/dummy/dummyLogEO/page' + logList: '/dummy/dummyLogEO/page', + versionList:'/log/marketListVersionUpdateLogEO/page', }, loading: false, dataSource: [], @@ -1062,7 +1063,8 @@ this.getList() }, UpdateLogClick() { - this.$refs.UpdateLogRef.getList({ dummyInventoryBaseId: this.$route.query.id }) + this.$refs.UpdateLogRef.getList({ dummyInventoryBaseId: this.$route.query.id, }, + {listId:this.$route.query.id,listType:'Market Regulation List'}) }, searchQuery() { this.getList() diff --git a/jero-web/src/views/virtualAuthenticationList/components/releaseForm.vue b/jero-web/src/views/virtualAuthenticationList/components/releaseForm.vue index 724b58b64..c2685d197 100644 --- a/jero-web/src/views/virtualAuthenticationList/components/releaseForm.vue +++ b/jero-web/src/views/virtualAuthenticationList/components/releaseForm.vue @@ -22,7 +22,7 @@ - + diff --git a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue index 5a6f8b47f..3d54dc18e 100644 --- a/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue +++ b/jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue @@ -244,7 +244,7 @@ - + @@ -299,7 +299,8 @@ editModel: '/authDummy/authDummyInventoryInfoEO/edit',//编辑 setBatch: '/authDummy/authDummyInventoryInfoEO/setBatch',//批量设置 importZipUrl: '/authDummy/authDummyInventoryInfoEO/importData',//导入 - number: '/project/projectLawsInventoryEO/list' + number: '/project/projectLawsInventoryEO/list', + versionList:'/log/marketListVersionUpdateLogEO/page', }, queryParam: {}, orderByField: '', @@ -416,7 +417,8 @@ this.toggleSearchStatus = !this.toggleSearchStatus }, UpdateLogClick() { - this.$refs.UpdateLogRef.getList({ authDummyInventoryBaseId: this.$route.query.id }) + this.$refs.UpdateLogRef.getList({ authDummyInventoryBaseId: this.$route.query.id }, + {listId:this.$route.query.id,listType:'Market Certification List'}) }, //搜索 searchQuery() {