From f85c9656ac332741037589e1428e5acc0959b7de Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 26 May 2022 13:57:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/common/lang/en-us.js | 2 +-
jero-web/src/views/documentManage/library/index.vue | 10 +++++++---
.../components/certificationProgressEchart.vue | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index c2b7ae4a0..9fdb884bb 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -813,7 +813,7 @@ module.exports = {
TheDoesNotContainData: 'The maintenance list of the virtual list does not contain data',
number: 'No.',
Deadline: 'Deadline',
- toBeConfirmed: 'To be confirmed',
+ toBeConfirmed: 'No rating',
designComplianceReview: 'Confirm design conformance',
preHomeConfirmation: 'Pre-Homo confirmation',
verificationComplianceReview: 'Verify conformance validation',
diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue
index 0560be03c..29c0b0b81 100644
--- a/jero-web/src/views/documentManage/library/index.vue
+++ b/jero-web/src/views/documentManage/library/index.vue
@@ -77,6 +77,7 @@
import { ACCESS_TOKEN } from '@/store/mutation-types'
import ImportFile from '@/components/ImportFile/index'
import Vue from 'vue'
+ import moment from 'moment'
export default {
name: 'docLibrary',
@@ -141,7 +142,8 @@
...this.$refs.searchRef.queryParam,
id: this.idList.join(',')
}
- downloadFile('document/bussDocumentLibraryEO/exportExcel', this.$t('DocumentLibrary')+'.xls', query, this.Deselect)
+ let handlingTime = moment(new Date()).format('YYYY-MM-DD')
+ downloadFile('document/bussDocumentLibraryEO/exportExcel', this.$t('DocumentLibrary')+handlingTime+'.xls', query, this.Deselect)
},
Deselect() {
this.$refs.tableDataRef.selectedRowKeys = []
@@ -154,7 +156,8 @@
id: this.idList.join(','),
flag: 'file'
}
- downloadFile('document/bussDocumentLibraryEO/exportZip', '文档库.zip', query, this.Deselect)
+ let handlingTime = moment(new Date()).format('YYYY-MM-DD')
+ downloadFile('document/bussDocumentLibraryEO/exportZip', this.$t('DocumentLibrary')+handlingTime+'.zip', query, this.Deselect)
},
//新增
handleAdd() {
@@ -162,7 +165,8 @@
},
//下载模板
handleModule() {
- downloadFile('document/bussDocumentLibraryEO/exportTemplate', '文档库导入模板.xls', {})
+
+ downloadFile('document/bussDocumentLibraryEO/exportTemplate', this.$t('importTemplate')+this.$t('importTemplate')+'.xls', {})
},
//批量删除
handleDel() {
diff --git a/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue b/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue
index dfa4961dd..70ddc668d 100644
--- a/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue
+++ b/jero-web/src/views/projectManagement/components/certificationProgressEchart.vue
@@ -126,7 +126,7 @@
name: this.$t('experimentFailed'),
status: res.certificationProgress
})
- color.push('#FF8543')
+ color.push('#E83030')
this.dataSource[0].experimentFailed = res.certificationProgressCount
} else if (res.certificationProgress == 'Test passed') {
data.push({
From 35dc8ae4c18654d2348feec62e86e9ee3ec74923 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 26 May 2022 14:18:49 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/listOfRegulations.vue | 22 +++++++++++--------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 78c310e50..e551f0dce 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1077,9 +1077,11 @@
}
})
} else {
+ let index = 0
for (let i = 0; i < this.dataSource.length; i++) {
for (let j = 0; j < selectedRowKeys.length; j++) {
if (this.dataSource[i].id == selectedRowKeys[j]) {
+ index++
this.dataSource[i].taskAffirmDueDate = this.formInline.taskAffirmDueDate
Object.keys(this.dataSource[i]).forEach(res => {
if (this.dataSource[i][res] && this.dataSource[i][res] instanceof String) {
@@ -1089,7 +1091,7 @@
})
setTimeout(() => {
this.confirmLoading = true
- this.startProcess(this.dataSource[i])
+ this.startProcess(this.dataSource[i],index)
}, 500)
}
}
@@ -1099,7 +1101,7 @@
})
},
- startProcess(value) {
+ startProcess(value,index) {
let query = {
type: 1,
msg: JSON.stringify(value).replace(/\"/g, '\''),
@@ -1110,12 +1112,12 @@
}
postAction('/workFlow/startProcess', query).then((res) => {
if (res.success) {
- this.completeTask(value, res.result)
+ this.completeTask(value, res.result,index)
}
})
},
- completeTask(value, taskId) {
+ completeTask(value, taskId,index) {
let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
value.handlingTime = handlingTime
let query = {
@@ -1125,11 +1127,13 @@
}
postAction('/workFlow/completeTask', query).then((res) => {
if (res.success) {
- this.visible = false
- this.selectedRowKeys = []
- this.$message.success(this.$t('OperationSuccessful'))
- this.confirmLoading = false
- this.getList()
+ if (index == this.selectedRowKeys.length){
+ this.visible = false
+ this.selectedRowKeys = []
+ this.$message.success(this.$t('OperationSuccessful'))
+ this.confirmLoading = false
+ this.getList()
+ }
} else {
this.$message.warning(this.$t('operationFailed'))
}
From 692989131f92ee6c166643d3d178c653924a6024 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 26 May 2022 14:37:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A6=96=E9=A1=B5?=
=?UTF-8?q?=E7=BC=A9=E6=94=BE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/components/menu/SideMenu.vue | 2 +-
jero-web/src/components/page/GlobalHeader.vue | 2 +-
jero-web/src/components/tools/Logo.vue | 18 +++++++++++++++---
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/jero-web/src/components/menu/SideMenu.vue b/jero-web/src/components/menu/SideMenu.vue
index 6cdaddbdc..adc5a8c3f 100644
--- a/jero-web/src/components/menu/SideMenu.vue
+++ b/jero-web/src/components/menu/SideMenu.vue
@@ -6,7 +6,7 @@
:collapsible="collapsible"
v-model="collapsed"
:trigger="null">
-
+
+ 
- {{ title }}
+ {{ title }}