From 8d0dd464392a3b683b20c247d6bdb6685397f086 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 23 Mar 2023 16:39:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=8A=A8=E5=8A=9B?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/basicInformation.vue | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 05f836c76..87a40f6be 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -122,13 +122,26 @@
{{$t('Vehicledynamictype')}}
- + + + + + + {{ item.projectName}} + + + + @@ -178,6 +191,8 @@ return { confirmLoading: false, disabled: false, + formInline:{}, + projectNameList:[], } }, mounted() { From 4d812ed8f42b3b24c6b37e06db45bd5665538b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 23 Mar 2023 17:01:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=82=AC=E5=8A=9E?= =?UTF-8?q?=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectDetails/index.vue | 3 +- .../components/certificationDirectory.vue | 8 +++-- .../components/transferList.vue | 16 ++++++--- .../components/transferListvirtal.vue | 36 +++++++++---------- .../components/certificationList/index.vue | 14 +++++--- 5 files changed, 45 insertions(+), 32 deletions(-) diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index 95d0f33d4..b80f7017a 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -143,6 +143,7 @@ @@ -206,7 +207,7 @@ '12': '系统管理员', '13': 'Viewer', '14': '品牌管理员', - '20': '接口人', + '20': '工程接口人', '21': '责任人', '30': '工程接口人', '31': '责任人', diff --git a/jero-web/src/views/projectManagement/components/certificationDirectory.vue b/jero-web/src/views/projectManagement/components/certificationDirectory.vue index 2adc1d21b..e15fbb63f 100644 --- a/jero-web/src/views/projectManagement/components/certificationDirectory.vue +++ b/jero-web/src/views/projectManagement/components/certificationDirectory.vue @@ -11,7 +11,8 @@ style="height: 100%;overflow: auto;padding-bottom: 53px;">
-
+
{{$t('add')}}
@@ -76,7 +77,7 @@ certificationDirectoryAdd, viewFileModel }, - props: ['isDisplayNum'], + props: ['isDisplayNum','roleSwitchingCode'], mixins:[ResizeHeader, ResizeColumnProvide], data() { return { @@ -158,7 +159,8 @@ computed: { columns() { let columnResult = JSON.parse(JSON.stringify(this.columnsAll)) - if (this.isDisplayNum != 2) { + if (this.roleSwitchingCode == 2 && this.isDisplayNum == 2){ + }else{ for (var i = 0; i < columnResult.length; i++) { if (columnResult[i].title === this.$t('operation')) { columnResult.splice(i, 1) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue index 5e6100722..25ccd69f9 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferList.vue @@ -15,10 +15,10 @@
-
- {{$t('VirtualListName')}} +
+ {{$t('CertificationListName')}}
-
@@ -87,7 +87,7 @@ selectedRowKeys: [], columns: [ { - title: this.$t('VirtualListName'), + title: this.$t('CertificationListName'), dataIndex: 'name', align: 'left', ellipsis: true, @@ -155,11 +155,17 @@ let query = { pageNo: this.pageNo, pageSize: this.pageSize, - ...this.queryParam + ...this.queryParam, + state:'1', } this.loading = true getAction('/authDummy/authDummyInventoryBaseEO/page', query).then((res) => { if (res.success) { + if (res.result.current > 1 && res.result.records.length == 0) { + this.pageNo = 1 + this.replacePage() + return + } this.dataList = res.result.records || [] this.total = res.result.total this.loading = false diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue b/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue index 9416a4fd8..a23a71c49 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/transferListvirtal.vue @@ -32,9 +32,9 @@ - + + + {{$t('query')}} {{$t('reset')}} @@ -180,8 +180,8 @@ export default { this.pageNo = 1 this.queryParam = {} this.replacePage() - this.$refs.globalAdvancedQueryRef.resetLine() - this.$refs.globalAdvancedQueryRef.emitCallback() + // this.$refs.globalAdvancedQueryRef.resetLine() + // this.$refs.globalAdvancedQueryRef.emitCallback() }, onChange(page, pageSize) { this.pageNo = page @@ -192,19 +192,19 @@ export default { this.pageSize = pageSize this.replacePage() }, - handleSuperQuery(params, matchType) { - let sqp = {} - if (!params || (params && params.length == 0)) { - sqp['superQueryParams'] = '' - this.$refs.globalAdvancedQueryRef.superQueryFlag = false - } else { - this.$refs.globalAdvancedQueryRef.superQueryFlag = true - sqp['superQueryParams'] = encodeURI(JSON.stringify(params)) - sqp['superQueryMatchType'] = matchType - } - this.queryParamQuery = sqp - this.replacePage() - }, + // handleSuperQuery(params, matchType) { + // let sqp = {} + // if (!params || (params && params.length == 0)) { + // sqp['superQueryParams'] = '' + // this.$refs.globalAdvancedQueryRef.superQueryFlag = false + // } else { + // this.$refs.globalAdvancedQueryRef.superQueryFlag = true + // sqp['superQueryParams'] = encodeURI(JSON.stringify(params)) + // sqp['superQueryMatchType'] = matchType + // } + // this.queryParamQuery = sqp + // this.replacePage() + // }, replacePage() { let query = { // pageNo: this.pageNo, diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 44cbc496d..7f30ea37e 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -96,7 +96,8 @@
-
+
{{ $t('CertificationDirectory') }}
@@ -377,7 +378,8 @@
- + @@ -477,6 +479,7 @@ export default { name: 'index', + props:['isDisplayNum'], components: { globalAdvancedQuery, ImportFile, @@ -601,14 +604,16 @@ align: 'left', dataIndex: 'category', width: 180, - ellipsis: true + ellipsis: true, + fixed: 'left', }, { title: this.$t('inspectionItems'), align: 'left', dataIndex: 'inspectionItem', width: 180, - ellipsis: true + ellipsis: true, + fixed: 'left', }, { title: this.$t('configurationItem'), @@ -723,7 +728,6 @@ ], selectedRowKeys: [], selectedRowKeysList: [], - isDisplayNum: 2, long: '', toDoIds: [], toDoNotConditions: [], From 67320ac02965fa57711f563ec60669cfcdd1fab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 23 Mar 2023 17:08:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E5=88=97=E8=A1=A8-NIO=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E7=BE=8E=E8=A7=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 2 +- jero-web/src/components/tableCollection/index1.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 948ab4a67..fe5619225 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -819,7 +819,7 @@ customRender: 'titleName' } if (res.db_field_name == 'nioNumber') { - this.columns[index].width = 100 + this.columns[index].width = 120 } if (res.click1) { this.columns[index].scopedSlots = { diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index 1a2c3d641..f8ecad5d1 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -610,7 +610,7 @@ customRender: 'titleName' } if (res.db_field_name == 'nioNumber') { - this.columns[index].width = 100 + this.columns[index].width = 120 } if (res.click) { // 工程接口人列表修改