diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
index 14424544b..3c081c5b6 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue
@@ -3,7 +3,7 @@
-
+
@@ -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/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
index 28cdc7401..bee003e7b 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue
@@ -3,13 +3,14 @@
-
+
{{$t('templateDownload')}}
+
@@ -58,7 +59,7 @@
-
+
{{$t('Modelandfunctionrecord')}}
@@ -288,9 +289,9 @@ import ImportFile from '@/components/ImportFileData/index'
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;
@@ -336,4 +337,8 @@ import ImportFile from '@/components/ImportFileData/index'
.bootom-button{
text-align: center!important;
}
+ .plus{
+ margin-top: 5px;
+ line-height: 1.4 !important;
+ }
\ No newline at end of file
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
index 7b7d6f0b2..ee2864893 100644
--- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
+++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue
@@ -3,7 +3,7 @@
-
+
@@ -228,10 +228,16 @@ export default {
}
})
},
+ save(){
+
+ },
+
next(){
+ this.save()
this.$emit('recordparametersdown')
},
last(){
+ this.save()
this.$emit('recordparametersup')
},
dateChange(item) {
@@ -254,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/otamanagement/vehicleinformation/components/beupgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
index d952d59ea..d3a2a4bd3 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue
@@ -50,13 +50,13 @@
-
+
-
+
-
+
@@ -70,7 +70,7 @@
-
+
@@ -93,10 +93,10 @@
}}
-
注:附件包括测试项目清单、测试报告.测试标准或技术规范
-
支持doc/docx/pdf格式,大小50M以内
+
{{ $t('note') }}
+
{{ $t('format') }}
-
+
-
+
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
index 9d3871bec..5f4f216e0 100644
--- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
+++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue
@@ -32,7 +32,7 @@
-
+
@@ -99,7 +99,7 @@
{{$t('next')}}
-
+
diff --git a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
index 98267cd05..ddba93e87 100644
--- a/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
+++ b/jero-web/src/views/otamanagement/vehicleregistration/components/maintenance.vue
@@ -20,6 +20,7 @@
@@ -40,7 +41,7 @@
format="YYYY-MM-DD"
:getCalendarContainer="(trigger) => trigger.parentNode"
v-model="formInline.batjsj"
- style="width: 100%"/>
+ style="width: 90%"/>
@@ -51,9 +52,10 @@
{{$t('remarks')}}
-
+
@@ -75,7 +77,7 @@ export default {
visible: false,
confirmLoading: false,
formInline: {
- bazt:'',
+ bazt:undefined,
batjsj:'',
bz:'',
},
@@ -94,6 +96,9 @@ export default {
trigger: 'change'
}
],
+ bz: [
+ { min: 1, max: 500, message: this.$t('cantExeed') + '500' + this.$t('characters'), trigger: 'blur' }
+ ]
// designDeadline: [
// {
// required: true,
@@ -139,6 +144,11 @@ export default {
edit(row) {
if(row instanceof Array){
this.ids = row.join(',')
+ this.formInline = {
+ bazt:undefined,
+ batjsj:'',
+ bz:'',
+ }
}else{
this.formInline.bazt = row.bazt ? row.bazt : undefined
this.formInline.batjsj = row.batjsj
@@ -172,9 +182,15 @@ export default {
}
})
},
+ selectchange(value){
+ this.$nextTick(() => {
+ this.formInline = { ...this.formInline }
+ this.$refs.ruleForm.validateField('bazt')
+ })
+ },
handleCancel() {
this.formInline = {
- bazt:'',
+ bazt:undefined,
batjsj:'',
bz:'',}
this.ids = ''
@@ -259,7 +275,7 @@ export default {
.box-input {
display: inline-block;
height: 38px;
- width: 100%;
+ width: 90%;
}
.itemModel {
diff --git a/jero-web/src/views/otamanagement/vehicleregistration/index.vue b/jero-web/src/views/otamanagement/vehicleregistration/index.vue
index dd41cd958..9ddc8ef68 100644
--- a/jero-web/src/views/otamanagement/vehicleregistration/index.vue
+++ b/jero-web/src/views/otamanagement/vehicleregistration/index.vue
@@ -6,10 +6,10 @@
-
-
{{ $t('upgraderegistrationnumber') }}
+
+ {{ $t('registrationnumber') }}
-
@@ -104,7 +104,7 @@
{{ $t('datamaintenance') }}
-
+
diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
index 922689d45..250e8cca1 100644
--- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue
+++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue
@@ -317,7 +317,7 @@
{{$t('submit')}}
-
+
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 95cfd3f19..7ab49a743 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -761,14 +761,14 @@
scopedSlots: { customRender: 'verifyDeliverableTemplateName' }
}
]
- },
- {
- title: this.$t('operation'),
- align: 'left',
- fixed: 'right',
- width: 260,
- scopedSlots: { customRender: 'operation' }
}
+ // {
+ // title: this.$t('operation'),
+ // align: 'left',
+ // fixed: 'right',
+ // width: 260,
+ // scopedSlots: { customRender: 'operation' }
+ // }
],
columnsAll: [],
columnsFileAll: [
@@ -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)
}
@@ -1998,39 +1999,43 @@
moduleFlag: '法规清单'
}).then((res) => {
if (res.success) {
- this.columnsAll = res.result
- for (let j = 0; j < this.columnsAll.length; j++) {
- for (let i = 0; i < this.column.length; i++) {
- if (this.columnsAll[j].title == this.$t('confirmationOfDesignConformity')) {
- if (this.column[i].title == this.$t('confirmationOfDesignConformity')) {
- if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) {
- for (let k = 0; k < this.columnsAll[j].children.length; k++) {
- for (let l = 0; l < this.column[i].children.length; l++) {
- if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) {
- this.columnsAll[j].children[k] = this.column[i].children[l]
+ if (res.result && res.result.length > 0) {
+ this.columnsAll = res.result
+ for (let j = 0; j < this.columnsAll.length; j++) {
+ for (let i = 0; i < this.column.length; i++) {
+ if (this.columnsAll[j].title == this.$t('confirmationOfDesignConformity')) {
+ if (this.column[i].title == this.$t('confirmationOfDesignConformity')) {
+ if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) {
+ for (let k = 0; k < this.columnsAll[j].children.length; k++) {
+ for (let l = 0; l < this.column[i].children.length; l++) {
+ if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) {
+ this.columnsAll[j].children[k] = this.column[i].children[l]
+ }
}
}
}
}
- }
- } else if (this.columnsAll[j].title == this.$t('verificationAndConformityconfirmation')) {
- if (this.column[i].title == this.$t('verificationAndConformityconfirmation')) {
- if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) {
- for (let k = 0; k < this.columnsAll[j].children.length; k++) {
- for (let l = 0; l < this.column[i].children.length; l++) {
- if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) {
- this.columnsAll[j].children[k] = this.column[i].children[l]
+ } else if (this.columnsAll[j].title == this.$t('verificationAndConformityconfirmation')) {
+ if (this.column[i].title == this.$t('verificationAndConformityconfirmation')) {
+ if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) {
+ for (let k = 0; k < this.columnsAll[j].children.length; k++) {
+ for (let l = 0; l < this.column[i].children.length; l++) {
+ if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) {
+ this.columnsAll[j].children[k] = this.column[i].children[l]
+ }
}
}
}
}
- }
- } else {
- if (this.column[i].dataIndex == this.columnsAll[j].dataIndex) {
- this.columnsAll[j] = this.column[i]
+ } else {
+ if (this.column[i].dataIndex == this.columnsAll[j].dataIndex) {
+ this.columnsAll[j] = this.column[i]
+ }
}
}
}
+ } else {
+ this.columnsAll = this.column
}
this.columnsAll.push({
title: this.$t('operation'),
@@ -2385,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
}
},