From 3d645755ec1d28eef9b6b0920f528cda50a5519c Mon Sep 17 00:00:00 2001 From: zer0Black Date: Tue, 16 Aug 2022 11:00:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86=20?= =?UTF-8?q?=E5=A4=9A=E9=80=89=E6=8B=89=E4=B8=8B=E6=A1=86=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CollectionType/index.vue | 7 ++++--- .../src/components/tableCollection/index.vue | 20 ++++++++----------- .../components/uploadFileChangeDown/file.vue | 2 +- .../ParameterItemCollectionList.vue | 6 ++++-- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue index 94961b84c..3d2a8abce 100644 --- a/jero-web/src/components/CollectionType/index.vue +++ b/jero-web/src/components/CollectionType/index.vue @@ -680,8 +680,9 @@ uploadFileChangeDown }, mounted() { + console.log(this.detailDate) this.detailDate.list.forEach((item) => { - if (item.type === 'pull_more') { + if (item.type === 'pull_more' && !item.dataValue) { item.dataValue = [] } // this.detailDatetransformation.push(item) @@ -737,11 +738,11 @@ }, watch: { detailDate(newold, oldold) { - console.log(newold, oldold, 'll') + // console.log(newold, oldold, 'll') }, formInline: { handler(newOld, oldval) { - console.log(newOld, oldval, 'll') + // console.log(newOld, oldval, 'll') }, deep: true } diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index df0a4ef53..63102879c 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -220,10 +220,10 @@ type: Object, default: true }, - queryParamQuery: { - type: Object, - default: true - }, + // queryParamQuery: { + // type: Object, + // default: true + // }, currentPersonRole: { type: String, default: true @@ -649,7 +649,6 @@ } }) this.columns = [...this.columns] - console.log(this.columns) } }) }, @@ -726,9 +725,6 @@ this.selectedRowKeys = [] }, getTableList(currentPersonRole) { - console.log(currentPersonRole) - console.log(this.queryParamQuery) - // todo let paramsManifestid let url if (this.$route.query.it === undefined) { @@ -752,7 +748,6 @@ this.loading = true getAction(url, params).then((res) => { if (res.success) { - // todo // console.log(res.result,'res.result') // let tt = [] // this.dataSource = [] @@ -771,13 +766,14 @@ // }) let tt = [] if (this.currentPersonRole !== 'dre') { + console.log(res.result.records,'res.result.records') res.result.records.forEach((Obj) => { Object.keys(Obj).forEach((item) => { if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { Obj[item].list.forEach((itemLi) => { itemLi.isLock = 1 if (itemLi.type === 'pull_more') { - itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') + itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',') } }) } @@ -790,7 +786,7 @@ if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) { Obj[item].list.forEach((itemLi) => { if (itemLi.type === 'pull_more') { - itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',') + itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',') } }) } @@ -798,7 +794,7 @@ tt.push(Obj) }) } - this.dataSource = tt + this.dataSource = JSON.parse(JSON.stringify(tt)) this.total = res.result.total this.selectedRowKeys = [] this.selectedRowrowValue = [] diff --git a/jero-web/src/components/uploadFileChangeDown/file.vue b/jero-web/src/components/uploadFileChangeDown/file.vue index df598bc41..e742821cb 100644 --- a/jero-web/src/components/uploadFileChangeDown/file.vue +++ b/jero-web/src/components/uploadFileChangeDown/file.vue @@ -62,7 +62,7 @@ import { mapGetters } from 'vuex' } }, created() { - console.log(this.detailDate, 'detailDate') + // console.log(this.detailDate, 'detailDate') // this.detailDate.list.forEach((item) => { // if (item.type == 'file' && item.isLock == '1') { // this.disabled = true diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 1a2c2fbb3..b2ce60267 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -168,7 +168,8 @@ {{$t('Adjustareasofresponsibility')}} -
+ +
...{{ $t('more') }}
@@ -226,8 +227,9 @@
+ Date: Tue, 16 Aug 2022 13:57:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/countryCardRelease.vue | 4 +++- .../components/initiatingProcess.vue | 12 ++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index 9a0bd9f7f..335d28489 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -235,6 +235,7 @@ let query = { pageNo: this.pageNo, pageSize: this.pageSize, + createBy: this.userInfo().username, ...queryParam } this.loading = true @@ -476,7 +477,8 @@ .text-operation { margin-right: 8px; } - ::v-deep .ant-select-dropdown{ + + ::v-deep .ant-select-dropdown { z-index: 100; } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index cb0b66ab6..d851a0ecf 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -44,8 +44,10 @@ {{$t('selectedStandard')}}
- {{selectedRowKeysRecord[0] ? selectedRowKeysRecord[0].serialNumber+' - '+selectedRowKeysRecord[0].title:''}} + {{selectedRowKeysRecord[0] ? + selectedRowKeysRecord[0].serialNumber+'-'+selectedRowKeysRecord[0].title:''}}
@@ -323,7 +325,7 @@ this.formInline.lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId this.formInline.remark = this.$route.query.remark this.formInline.standId = this.$route.query.standId - this.formInline = {...this.formInline} + this.formInline = { ...this.formInline } this.getListOne() } eventBUs.$on('searchQuery', search => { @@ -697,6 +699,9 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + word-break: break-word; + padding: 0 14px; + box-sizing: border-box; } .title-text-right { @@ -710,6 +715,9 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + word-break: break-word; + padding: 0 14px; + box-sizing: border-box; color: #21c9cc; cursor: pointer; }