diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index b64ce7989..73cd82371 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1719,4 +1719,6 @@ module.exports = {
note:'Note: The attachment includes the list of test items and test report. Test standard or technical specification',
format:'It supports doc/docx/pdf format and is less than 50M in size',
cantTransferToYourself:"Can't transfer to yourself",
+ theDataYouInitiate:'The data you selected does not meet the process initiation criteria. Please recheck and initiate',
+ dataWithProcessReleasedCannotBeReset:'Data with a process status of list to be released cannot be reset',
}
\ 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 1aa0154f3..9369a1133 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -77,7 +77,7 @@ module.exports = {
yes: '是',
not: '否',
have:'有',
-
+
notOnlyRz: '否',
EnterValue: '请输入值',
SavedQuery: '保存的查询',
@@ -1618,7 +1618,7 @@ module.exports = {
thetargetvehicleofthisupgrade:'本次升级的目标车辆',
upgradeimpactassessment:'升级影响评估',
upgradehavechanged:'本次升级的系统名称与参数变化',
- auxiliaryupgradehavechanged:'本次升级的架势辅助功能名称与参数变化',
+ auxiliaryupgradehavechanged:'本次升级的驾驶辅助功能名称与参数变化',
usernotification:'用户告知内容及方式',
informationaboutotherupgradetasks:'其他升级任务信息',
totalquantity:'总数量（辆）',
@@ -1735,7 +1735,7 @@ module.exports = {
upgradeactivitiesaffectvehiclesafety:'升级活动是否影响车辆安全',
upgradeactivityprovidesuserconfirmationoptions:'升级活动是否提供用户确认选项',
upgradepackagetest:'升级包测试(可多选)',
- reliabilityofonlineupgradeactivities:'是杏已验证确认在线升级活动的安全性和可靠性',
+ reliabilityofonlineupgradeactivities:'是否已验证确认在线升级活动的安全性和可靠性',
adjustmentofchangedBulletinparameters:'已变更《公告》参数的对应调整（如有）',
preupgrade:'升级前',
afterupgrade:'升级后',
@@ -1746,8 +1746,8 @@ module.exports = {
beforetheOSversionupgraded:'操作系统版本号升级前',
aftertheoperatingsystemversionupgraded:'操作系统版本号升级后',
initialpackageforintegrityinflammatorydata:'初始软件包的完整性验证数据（需统一哈希算法并说明，例如SM3：d192e819d6990624f40e3585106ee134）',
- upgradepackageintegrityverificationdata:'升级包完整性验证数据',
- upgradepackagesize:'升级包大小',
+ upgradepackageintegrityverificationdata:'升级包完整性验证数据（需统一哈希算法并说明，例如SM3：d192e819d6990624f40e3585106ee134）',
+ upgradepackagesize:'升级包大小（MB）',
differentialupgradeornot:'是否差分升级',
upgradedestinationype:'升级目的类型',
functionalchangedescription:'功能变更描述',
@@ -1821,4 +1821,6 @@ module.exports = {
note:'注:附件包括测试项目清单、测试报告．测试标准或技术规范',
format:'支持doc/docx/pdf格式,大小50M以内',
cantTransferToYourself:"不能转办给自己",
+ theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起',
+ dataWithProcessReleasedCannotBeReset:'流程状态为清单待发布的数据不能被重置',
}
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
index fdd3d3a7a..d6fc8f2b7 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue
@@ -43,18 +43,13 @@
-
-
-
-
-
-
+
{{$t('add')}}
- {{$t('delete')}}
+ {{$t('delete')}}
@@ -155,23 +150,6 @@ export default {
width: 170,
scopedSlots: { customRender: 'upgradetheelectroniccontrollerinvolved' },
},
- {
- title: this.$t('functiondescription'),
- align: 'left',
- dataIndex: 'functiondescription',
- ellipsis: true,
- width: 170,
- scopedSlots: { customRender: 'functiondescription' },
- },
- {
- title: this.$t('applicationconditions'),
- align: 'left',
- dataIndex: 'applicationconditions',
- ellipsis: true,
- width: 170,
- scopedSlots: { customRender: 'applicationconditions' },
- },
-
{
title: this.$t('operation'),
align: 'left',
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
index 23fd852bf..57d4712a5 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue
@@ -79,6 +79,7 @@
formInline.VINcodelist == null) ? $t('clickUpload') : $t('viewUploadedFiles')
}}
+
支持cxv格式，大下20M以内，数量1-10个
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
index 2f91e3e28..3c081c5b6 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
@@ -478,8 +478,12 @@ this.$forceUpdate()
border-bottom: none;
vertical-align: top;
overflow: hidden; /*超出部分隐藏*/
- text-overflow: ellipsis; /*超出部分省略号表示*/
- white-space: nowrap;
+ // text-overflow: ellipsis; /*超出部分省略号表示*/
+ white-space: wrap;
+ display: flex;
+ // justify-content: center;
+ align-items: center;
+ line-height: 1.3;
}
//::v-deep .sider .ant-layout-sider .ant-layout-sider-dark{
// min-width: 723px !important;
@@ -511,14 +515,17 @@ this.$forceUpdate()
display: inline-block;
width: 100%;
height: 50px;
- line-height: 50px;
+ line-height: 1.3;
border: black solid 1px;
vertical-align: top;
border-right: none;
border-bottom: none;
overflow: hidden; /*超出部分隐藏*/
- text-overflow: ellipsis; /*超出部分省略号表示*/
- white-space: nowrap;
+ // text-overflow: ellipsis; /*超出部分省略号表示*/
+ white-space: wrap;
+ display: flex;
+ // justify-content: center;
+ align-items: center;
}
.sider-span{
display: inline-block;
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
index a226d99b5..ee2864893 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
@@ -260,7 +260,10 @@ export default {
display: flex;
}
-
+h1{
+ font-weight: 700;
+ font-style: 20px;
+}
.title-text-add {
width: 440px;
text-align: right;
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index 21166c48f..cf788bfe9 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -402,6 +402,7 @@
+ {{ $t('Submitting') }}
@@ -514,6 +515,7 @@
pageNo: 1,
pageSize: 50,
total: 0,
+ JTextLoading: false,
CertificationColor: {
'Test passed': 'accordColor',
'Test failed': 'nonConformityColor',
@@ -973,25 +975,49 @@
processResetClick() {
let _this = this
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
- this.$confirm({
- content: _this.$t('confirmResetProcess'),
- onOk() {
- let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
- postAction('/project/projectCertificationInventoryEO/resetFlow', {
- ids: idList.join(','),
- projectLibraryId: _this.$route.query.id,
- operatorType: 'certificationInventoryStudioReset'
- }).then((res) => {
- if (res.success) {
- _this.$message.success(_this.$t('OperationSuccessful'))
- _this.selectedRowKeys = []
- _this.getList()
- } else {
- _this.$message.warning(res.message)
- }
- })
+ let ids = []
+ let notConditions = []
+ for (let i = 0; i < this.selectedRowKeysList.length; i++) {
+ if (this.selectedRowKeysList[i].flowStatus == 'List to be released') {
+ notConditions.push(this.selectedRowKeysList[i].inspectionItem)
+ } else {
+ ids.push(this.selectedRowKeysList[i].id)
}
- })
+ }
+ let data = ''
+ if (notConditions && notConditions.length > 0) {
+ data = this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('conditionsNotMet') + ',' + this.$t('dataWithProcessReleasedCannotBeReset')
+ }
+ if (ids && ids.length > 0) {
+ this.$confirm({
+ content: _this.$t('confirmResetProcess'),
+ onOk() {
+ _this.JTextLoading = true
+ let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))
+ postAction('/project/projectCertificationInventoryEO/resetFlow', {
+ ids: idList.join(','),
+ projectLibraryId: _this.$route.query.id,
+ operatorType: 'certificationInventoryStudioReset'
+ }).then((res) => {
+ if (res.success) {
+ _this.$message.success(_this.$t('OperationSuccessful'))
+ _this.selectedRowKeys = []
+ _this.getList()
+ if (notConditions && notConditions.length > 0) {
+ _this.failedMessage(data)
+ }
+ _this.JTextLoading = false
+ } else {
+ _this.$message.warning(res.message)
+ _this.JTextLoading = false
+ }
+ })
+ }
+ })
+ } else {
+ this.failedMessage(data)
+ this.JTextLoading = false
+ }
} else {
this.$message.warning(this.$t('selectLeastOne'))
}
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 8053df156..7ab49a743 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1528,7 +1528,7 @@
_this.selectedRowKeys = []
_this.getList()
if (detailedWarningList && detailedWarningList.length > 0) {
- this.promptInformation(detailedWarningList)
+ _this.promptInformation(detailedWarningList)
}
} else {
_this.$message.warning(_this.$t('operationFailed'))
@@ -1689,19 +1689,20 @@
for (let i = 0; i < this.dataSource.length; i++) {
for (let j = 0; j < selectedRowKeys.length; j++) {
if (this.dataSource[i].id == selectedRowKeys[j]) {
- content.push(this.dataSource[i])
+ // content.push(this.dataSource[i])
+ isTrue = true
}
}
}
- for (let i = 0; i < content.length; i++) {
- if (content[i].designFlowStatus == 'List to be released' &&
- content[i].verifyFlowStatus == 'List to be released') {
- isTrue = false
-
- } else {
- isTrue = true
- }
- }
+ // for (let i = 0; i < content.length; i++) {
+ // if (content[i].designFlowStatus == 'List to be released' &&
+ // content[i].verifyFlowStatus == 'List to be released') {
+ // isTrue = false
+ //
+ // } else {
+ // isTrue = true
+ // }
+ // }
if (isTrue) {
this.changeInterface(selectedRowKeys)
}
@@ -2389,9 +2390,11 @@
_this.detailedWarningList.push(
< div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
}
+
}
if (this.requestsNum == 0) {
- _this.promptInformation(_this.detailedWarningList)
+ this.$message.warning(_this.$t('theDataYouInitiate'))
+ // _this.promptInformation(_this.detailedWarningList)
this.JTextLoading = false
}
},