-
+
{{$t('otaUpgradeManagementSystem')}}
@@ -416,9 +409,9 @@ import { message } from 'ant-design-vue'
font-weight: 500;
font-size: 14px;
margin-right: 16px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ // overflow: hidden;
+ // text-overflow: ellipsis;
+ // white-space: nowrap;
height: 42px;
line-height: 42px;
margin-top: 3px;
@@ -475,4 +468,13 @@ import { message } from 'ant-design-vue'
color: red;
margin-right: 3px;
}
+.plus{
+ margin-top: 5px;
+ line-height: 1.4 !important;
+ }
+ .plus2{
+ width: 134px;
+ margin-top: 5px;
+ line-height: 1.4 !important;
+ }
\ No newline at end of file
From 88d73ae906836fb5f0338144da6a43e0ab89120b Mon Sep 17 00:00:00 2001
From: yuekuo
Date: Tue, 28 Mar 2023 09:45:01 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=90=8E=E5=AD=98?=
=?UTF-8?q?=E6=94=BEid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/views/otamanagement/upgradeactivity/index.vue | 1 +
.../vehicleinformation/components/basicInformation.vue | 1 +
.../vehicleinformation/components/beupgradedonline.vue | 5 ++++-
.../otamanagement/vehicleinformation/components/other.vue | 7 +++++--
.../vehicleinformation/components/recordparameters.vue | 7 +++++--
.../vehicleinformation/components/safetyPrecautions.vue | 5 ++++-
.../vehicleinformation/components/upgradeRequirements.vue | 7 +++++--
.../vehicleinformation/components/upgradedonline.vue | 7 +++++--
8 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
index e144bf3b1..1900bb800 100644
--- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue
@@ -450,6 +450,7 @@ export default {
// 维护
maintenanceClick(row){
this.$refs.maintenanceRef.edit(row)
+ console.log(row);
},
// 数据维护
maintenanceallClick(){
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
index 897b043fa..8d130bb6f 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue
@@ -364,6 +364,7 @@ import { message } from 'ant-design-vue'
if(res.code == 200){
localStorage.setItem('otaId', res.result.otaId)
this.$message.success(this.$t('SavedSuccessfully'))
+ this.getData()
}
})
}
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
index ab3182be3..0ac3c4c48 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
@@ -362,8 +362,11 @@ import ImportFile from '@/components/ImportFileData/index'
},
save(){
postAction('/ota/otaBaCxKsjjsmccs/add',{otaId:localStorage.getItem('otaId'),list:this.dataSource,fj:this.fileList}).then(res =>{
- console.log(res);
+ if(res.code==200){
this.$message.success(this.$t('SavedSuccessfully'))
+ this.getData()
+ }
+
})
},
last(){
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue
index fec52fa31..ec37b9bc7 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/other.vue
@@ -70,8 +70,11 @@ export default {
if (valid) {
this.flag = 1
postAction('/ota/otaBaCxQt/add',{otaId:localStorage.getItem('otaId'),...this.queryParam}).then(res=>{
- console.log(res);
- this.$message.success(this.$t('SavedSuccessfully'))
+ if(res.code==200){
+ this.$message.success(this.$t('SavedSuccessfully'))
+ this.getData()
+ }
+
})
} else {
return false;
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
index 077f9fd9d..f4c4133b4 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/recordparameters.vue
@@ -944,8 +944,11 @@ export default {
cs:arr,
kzq:this.dataSourceList
}).then( res => {
- console.log(res);
- this.$message.success(this.$t('SavedSuccessfully'))
+ if(res.code==200){
+ this.$message.success(this.$t('SavedSuccessfully'))
+ this.getData()
+ }
+
})
},
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
index 2690dc4a0..1619acb2d 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue
@@ -249,8 +249,11 @@ import ImportFile from '@/components/ImportFileData/index'
obj.xxaqjz = this.dataSource[3].info
obj.zmclList = this.fileList.uploadName
postAction('/ota/otaBaCxAqcs/add',obj).then(res =>{
- console.log(res);
+ if(res.code==200){
this.$message.success(this.$t('SavedSuccessfully'))
+ this.getData()
+ }
+
})
},
last(){
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
index 5dbb6bc44..e8986b7e6 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue
@@ -295,8 +295,11 @@ export default {
obj.sjzt = this.dataSource[9].relevantverification
obj.zmclList = this.fileList.uploadName
postAction('/ota/otaBaCxZxsjyq/add', obj).then(res => {
- console.log(res);
- this.$message.success(this.$t('SavedSuccessfully'))
+ if(res.code==200){
+ this.$message.success(this.$t('SavedSuccessfully'))
+ this.getData()
+ }
+
})
},
last() {
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
index 5f4f216e0..1b0838b3e 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
@@ -457,8 +457,11 @@ import uploadFileOta from '@/components/uploadFileOta/file'
},
save(){
postAction('/ota/otaBaCxKsjxtmccs/add',{otaId:localStorage.getItem('otaId'),list:this.dataSource,fj:this.fileList}).then(res => {
- console.log(res);
- this.$message.success(this.$t('SavedSuccessfully'))
+ if(res.code==200){
+ this.$message.success(this.$t('SavedSuccessfully'))
+ this.getData()
+ }
+
})
}
}
From f53db1f6bce84ab993cae38807be1035cfdc5143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?=
Date: Tue, 28 Mar 2023 09:46:37 +0800
Subject: [PATCH 7/8] =?UTF-8?q?OTA=E7=AE=A1=E7=90=86=E5=B7=A5=E5=85=B7-?=
=?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=B4=BB=E5=8A=A8=E5=A4=87=E6=A1=88-?=
=?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=BD=B1=E5=93=8D=E8=AF=84=E4=BC=B0-?=
=?UTF-8?q?=E6=B3=A8=E9=87=8A?=
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/common/lang/zh-cn.js | 2 ++
.../components/upgradeimpactassessment.vue | 19 ++++++++++++++-----
3 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index c838f6ab1..8f052bcd8 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1723,4 +1723,6 @@ module.exports = {
dataWithProcessReleasedCannotBeReset:'Data with a process status of list to be released cannot be reset',
reasonForReturnOfDesignCompliance:'Reason for return of design compliance',
noteone:'Note: CSV format is supported. The value is within 20M and the number is 1 to 10',
+ notetwo:'\n1. Provide the modified or expanded batch of "Announcement" and supporting materials;\n2. Verification materials shall be submitted to ensure that products meet the relevant requirements of national laws and regulations, technologies, standards and technical specifications;\n',
+ notethree:'Provide supporting materials',
}
\ 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 e7f0d6b48..afb84484e 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1825,4 +1825,6 @@ module.exports = {
theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起',
dataWithProcessReleasedCannotBeReset:'流程状态为清单待发布的数据不能被重置',
reasonForReturnOfDesignCompliance:'设计符合性退回原因',
+ notetwo:'\n1、提供变更或扩展后的《公告》批次及证明材料;\n2、应提交验证材料，保障产品符合国家法律法规、技术、标准及技术规范等相关要求;\n',
+ notethree:'\n提供证明材料\n',
}
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
index d78323297..ef5679a0d 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
@@ -62,8 +62,10 @@
-
- {{$t('uploadattachment')}}
+
+ {{$t('uploadattachment')}}
+ {{$t('notetwo')}}
+ {{$t('format')}}
@@ -110,7 +112,7 @@
-
+
{{ $t('yes') }}
{{ $t('not') }}
@@ -133,7 +135,9 @@
-
{{$t('uploadattachment')}}
+
{{$t('uploadattachment')}}
+
{{$t('notethree')}}
+
{{$t('format')}}
@@ -464,7 +468,7 @@ this.$forceUpdate()
}
::v-deep .ant-layout-content {
min-height: 60px;
- line-height: 50px;
+ line-height: 20px;
}
//::v-deep > .ant-layout {
// margin-bottom: 48px;
@@ -542,4 +546,9 @@ this.$forceUpdate()
height: 50px;
margin-top: 8px;
}
+.spanone{
+ white-space: pre-wrap;
+ padding: 0 45px;
+ display: flex;
+}
\ No newline at end of file
From 149d47a73bbe987d6a6c28ae5824b48e3dae7d0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Tue, 28 Mar 2023 09:49:54 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E8=B0=83=E5=8F=96-=E5=8B=BE=E9=80=89?=
=?UTF-8?q?=E6=B8=85=E5=8D=95=E4=B8=AD=E5=B7=B2=E7=BB=8F=E5=AD=98=E5=9C=A8?=
=?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E7=9A=84=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/certificationList/index.vue | 12 ++++++------
.../components/listOfRegulations.vue | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue
index cf788bfe9..4eac491a2 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/index.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue
@@ -78,7 +78,7 @@