diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 59e69521d..6b58bafed 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -613,8 +613,8 @@ module.exports = { Transfer: 'Transfer', CertificationDirectory: 'Certification directory', TaskRequirements: 'Task requirements', - CertificationProgress: 'Certification progress', - CurrentProjectStatusEvaluation: 'Current project status evaluation', + CertificationProgress: 'Homo Progress', + CurrentProjectStatusEvaluation: 'Current State', NiONumber: 'NiO number', ParameterName: 'Parameter name', ParameterDescription: 'Parameter description', @@ -790,4 +790,6 @@ module.exports = { resultReported:'Result Reported', TheDoesNotContainData:'The maintenance list of the virtual list does not contain data', number:'No', + Deadline:'Deadline', + toBeConfirmed:'To be confirmed', } \ 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 5a0153b86..f23b64a57 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -483,6 +483,7 @@ module.exports = { nonConformity: '不符合', Tracked: '待追踪', notInvolved: '不涉及', + toBeConfirmed:'待确认', Operator: '操作人', role: '角色', operationContent: '操作内容', @@ -795,4 +796,5 @@ module.exports = { resultReported:'结果报告', TheDoesNotContainData:'该虚拟清单的维护清单中没有数据,是否需要添加', number:'序号', + Deadline:'截止时间', } \ 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 123e1c951..2035ca5a8 100644 --- a/jero-web/src/components/UpdateLog/index.vue +++ b/jero-web/src/components/UpdateLog/index.vue @@ -16,7 +16,7 @@ class="table" :columns="columns" :pagination="false" - :scroll="{y: 400}" + :scroll="{y: 420}" :data-source="dataSource" :loading="loading" > @@ -56,11 +56,12 @@ loading:false, pageNo: 1, pageSize: 10, + queryId:{}, total: 0, columns: [ { title: this.$t('OperationDetails'), - dataIndex: 'content', + dataIndex: 'logContent', align: 'center', ellipsis: true, scopedSlots: { customRender: 'content' } @@ -78,9 +79,10 @@ mounted() { }, methods:{ - getList(){ + getList(data){ this.visible = true this.pageNo = 1 + this.queryId = data this.bussLogList() }, onChange(page, pageSize) { @@ -96,7 +98,7 @@ let query = { pageNo: this.pageNo, pageSize: this.pageSize, - documentId: this.$route.query.id + ...this.queryId } this.loading = true getAction(this.url.logList, query).then((res) => { @@ -114,5 +116,8 @@ \ 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 116e3e610..15c4addf6 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -270,7 +270,8 @@ importZipUrl: '/dummy/dummyInventoryInfoEO/importData', exportData: '/dummy/dummyInventoryInfoEO/exportData', exportTemplate: '/dummy/dummyInventoryInfoEO/exportTemplate', - getSysCategoryTree: '/sys/category/getSysCategoryTree' + getSysCategoryTree: '/sys/category/getSysCategoryTree', + logList:'/dummy/dummyLogEO/page', }, loading: false, dataSource: [], @@ -589,7 +590,7 @@ this.getList() }, UpdateLogClick() { - this.$refs.UpdateLogRef.getList() + this.$refs.UpdateLogRef.getList({dummyInventoryBaseId:this.$route.query.id}) }, searchQuery() { this.getList() diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index c58d93a70..acf55b009 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -52,21 +52,23 @@ >
- {{result.serialNumber}}
+ {{result.serialNumber}}
{{result.title}}
- 1212sdfdsf
- 责任领土 + 1212sdfdsf
+ hahahaha
- {{$t('cutoffTime')}}: {{result.designDueDate}}
- {{$t('ProcessStatus')}}: {{result.designFlowTaskStatus}}
- {{result.designStatus}} + {{$t('Deadline')}}: {{result.designDueDate}}
+ {{$t('ProcessStatus')}}: {{result.designStatus}}
+ + {{statusText[result.designFlowTaskStatus]}} +
@@ -74,9 +76,11 @@
- {{$t('cutoffTime')}}: {{result.prehomoDueDate}}
- {{$t('ProcessStatus')}}: {{result.prehomoFlowTaskStatus}}
- {{result.prehomoTaskStatus}} + {{$t('Deadline')}}: {{result.prehomoDueDate}}
+ {{$t('ProcessStatus')}}: {{result.prehomoTaskStatus}}
+ + {{statusText[result.prehomoFlowTaskStatus]}} +
@@ -84,9 +88,11 @@
- {{$t('cutoffTime')}}: {{result.verifyDueDate}}
- {{$t('ProcessStatus')}}: {{result.verifyFlowTaskStatus}}
- {{result.verifyStatus}} + {{$t('Deadline')}}: {{result.verifyDueDate}}
+ {{$t('ProcessStatus')}}: {{result.verifyStatus}}
+ + {{statusText[result.verifyFlowTaskStatus]}} +
@@ -136,6 +142,7 @@ title: this.$t('standardInformation'), align: 'center', dataIndex: 'standard', + width: 200, scopedSlots: { customRender: 'standardInformation' } }, { @@ -183,6 +190,21 @@ 'haveDone': '已办', 'showData': '展示数据' }, + color: { + 'conformity': 'accordColor', + 'inconformity': 'nonConformityColor', + 'to track': 'TrackedColor', + 'uninvolved': 'notInvolvedColor', + 'to be confirmed': 'submittedColor' + }, + statusText: { + 'conformity': this.$t('accord'), + 'inconformity': this.$t('nonConformity'), + 'to track': this.$t('Tracked'), + 'uninvolved': this.$t('notInvolved'), + 'to be confirmed': this.$t('toBeConfirmed') + }, + queryParam: {}, url: { list: '/project/projectTaskInventoryEO/list' @@ -379,7 +401,7 @@ height: calc(100% + 32px); top: -16px; left: -16px; - border: 1px seagreen solid; + border: 1px #00B3BE solid; } .content-box-jiao { @@ -387,22 +409,70 @@ right: 0; width: 0; height: 0; - border-right: 30px solid red; - border-bottom: 30px solid transparent + border-right: 14px solid #00B3BE; + border-bottom: 14px solid transparent } .box-content { margin-bottom: 8px; display: inline-block; text-align: left; + font-weight: 400; + color: #040B29; + } + + .box-content-a { + margin-bottom: 8px; + display: inline-block; + text-align: left; + font-weight: 400; + } + + .box-content-index { + margin-bottom: 8px; + display: inline-block; + text-align: left; + font-weight: 400; + color: #040B29; + } + + .box-content-index:last-child { + margin-bottom: 0; } .box-content-color { - padding: 6px 14px; - box-sizing: border-box; - background: #1ABBC4; - color: #2F8DF3; + width: 78px; + height: 32px; + display: inline-block; border-radius: 4px; + text-align: center; + font-size: 14px; + line-height: 32px; + } + + .accordColor { + background: #96ecad; + color: #26BD4B; + } + + .nonConformityColor { + background: #eeaeae; + color: #E83030; + } + + .TrackedColor { + background: #f0d7b1; + color: #FDA71C; + } + + .notInvolvedColor { + background: #e2edf8; + color: #707486; + } + + .submittedColor { + color: #00B3BE; + background: #94e0e4; } .Current-color {