From 8ee8a95b04b373371b3592ebd5b90d029c999d59 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 25 Oct 2022 13:47:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/tableCollection/index.vue | 94 +++++++++++++------ .../src/components/tableCollection/index1.vue | 80 +++++++++++----- .../components/comparisonResults.vue | 15 ++- 3 files changed, 129 insertions(+), 60 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index cc605e642..a567b381f 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -19,12 +19,16 @@ {{ text }} + + {{text}} +
- + {{ item.db_field_txt }} {{$t('See')}}
- + {{$t('See')}} @@ -55,7 +59,7 @@ {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }} + @click='ondataValueTobe(record)'>{{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }} {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }} @@ -135,14 +139,14 @@ - - - - - - - - + + + + + + + +
- {{$t('preservation')}} + + {{$t('preservation')}} {{$t('cancel')}}
@@ -235,7 +240,7 @@ default: {}, require: true }, - description:'', + description: '', formInline: { type: Object, default: true @@ -300,7 +305,7 @@ indeterminate: false, columns: [], content: [], - confirmLoading:false, + confirmLoading: false, selectedRowKeys: [], selectedRowrowValue: [], dataSource: [], @@ -316,7 +321,7 @@ sdt: 0, // 工程接口人 dre: 0, // 填写人 areaVisible: false, - areaVisiblezr:false, + areaVisiblezr: false, form: {}, rules: { querySdt: [ @@ -342,13 +347,13 @@ xs: { span: 24 }, sm: { span: 7 } }, - queryParamQuery:{}, - queryParam:{}, + queryParamQuery: {}, + queryParam: {}, querySdtList: [], // 工程接口人 Dateline: {}, getquerySdtId: '', // 当前工程接口人的id areaVisibleView: false, // 查看配置得弹框 - seeVisibleView:false, + seeVisibleView: false, configDetail: {} // 查看配置得详细信息 } }, @@ -394,7 +399,7 @@ this.$emit('handlePreservation') this.getTableList() }, - onClickTitle(val){ + onClickTitle(val) { console.log(val) this.description = val.description this.seeVisibleView = true @@ -455,7 +460,11 @@ // 责任领域 保存 handleSubmitzr(record) { let _this = this - let param = { dutyTerritory: this.Dateline.queryzr, ids: this.getquerySdtId,paramsManifestId: this.$route.query.id, } + let param = { + dutyTerritory: this.Dateline.queryzr, + ids: this.getquerySdtId, + paramsManifestId: this.$route.query.id + } this.$refs.ruleFormOne.validate(valid => { if (valid) { this.confirmLoading = true @@ -538,7 +547,7 @@ this.areaVisible = false this.$refs['ruleForm'].resetFields() }, - cancel(){ + cancel() { this.areaVisiblezr = false this.$refs['ruleFormOne'].resetFields() }, @@ -597,7 +606,7 @@ } getAction('/params/userTypeLog/queryCurrentType', query).then((res) => { if (res.success) { - this.queryParamQuery = {...this.queryParamQuery} + this.queryParamQuery = { ...this.queryParamQuery } if (res.result && res.result.userType) { if (!(result.some(val => val.value == res.result.userType))) { @@ -631,7 +640,7 @@ let params = { paramsManifestId: paramsManifestid, flag: '7', - userType:userType, + userType: userType } getAction(url, params).then((res) => { if (res.success) { @@ -662,25 +671,27 @@ dataIndex: res.db_field_name, align: 'center', // ellipsis: true, - fixed: res.click5?'left':'', + fixed: res.click5 ? 'left' : '', sorter: res.sort, width: 160 }) - console.log(res) this.columns[index].scopedSlots = { customRender: 'titleName' } - if(res.click1){ + if (res.db_field_name == 'nioNumber') { + this.columns[index].width = 100 + } + if (res.click1) { this.columns[index].scopedSlots = { customRender: 'operationzr' } } - if(res.click2){ + if (res.click2) { this.columns[index].scopedSlots = { customRender: 'ParameterDescription' } } - if(res.click3){ + if (res.click3) { this.columns[index].scopedSlots = { customRender: 'paramsNameDescription' } @@ -691,6 +702,12 @@ customRender: 'operationbtn' } } + if (res.db_field_name == 'paramsName') { + this.columns[index].width = 200 + this.columns[index].scopedSlots = { + customRender: 'paramsName' + } + } } }) this.columns = [...this.columns] @@ -707,7 +724,7 @@ let params = { paramsManifestId: this.$route.query.id, pageNo: this.pageNo, - pageSize: this.pageSize, + pageSize: this.pageSize // userTypes: this.currentPersonRole } let url @@ -812,7 +829,7 @@ // }) let tt = [] if (this.currentPersonRole !== 'dre') { - console.log(res.result.records,'res.result.records') + 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) { @@ -912,6 +929,7 @@ border: none !important; padding: 0 !important; } + //::v-deep .ant-table-row:first-child { // background: #fff!important; // /*opacity: 0.9;*/ @@ -952,6 +970,7 @@ font-weight: 400; } } + .textfield { width: 100%; margin-bottom: 8px; @@ -981,6 +1000,19 @@ } } } + + .textName { + width: 100%; + overflow: hidden; + display: -webkit-box; + text-overflow: ellipsis; + /*! autoprefixer: off */ + -webkit-box-orient: vertical; + -webkit-line-clamp: 2; + /*! autoprefixer: on;*/ + text-justify: inter-ideograph; + word-break: break-all + } \ No newline at end of file