From b58dc818feacbfc6bf01453b0db8ad3306c8d6dd Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 20 十二月 2022 10:37:18 +0800
Subject: [PATCH] 1.table表新增show-tooltip-when-overflow属性
---
src/views/sbgl/djbz.vue | 143 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 102 insertions(+), 41 deletions(-)
diff --git a/src/views/sbgl/djbz.vue b/src/views/sbgl/djbz.vue
index 8dc73b3..fbe8a3d 100644
--- a/src/views/sbgl/djbz.vue
+++ b/src/views/sbgl/djbz.vue
@@ -10,12 +10,12 @@
<el-form
ref="form"
:model="form"
- label-width="80px"
+ label-width="100px"
inline
style="display: flex;justify-content: space-between"
>
<div class="elForm">
- <el-form-item label="鏍囧噯缂栫爜" style=" display: flex;">
+ <el-form-item label-width="70px" label="鏍囧噯缂栫爜" style=" display: flex;">
<el-input v-model="form.checkstandcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鏍囧噯鍚嶇О" style=" display: flex;">
@@ -32,18 +32,24 @@
</el-select>
</el-form-item>
</div>
- <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
+ <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
</el-form>
+
+ <div
+ class="bodyTopFormExpand"
+ />
</div>
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
:data="tableData"
:height="tableHeight+'px'"
border
+ class="tableFixed"
:row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
@@ -64,11 +70,13 @@
<el-table-column
prop="code"
label="鏍囧噯缂栫爜"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
prop="name"
label="鏍囧噯鍚嶇О"
+ show-tooltip-when-overflow
sortable="custom"
/>
@@ -87,6 +95,7 @@
prop="iscontr"
label="鐐规绠℃帶"
sortable="custom"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.iscontr==='Y'">
@@ -102,6 +111,7 @@
<el-table-column
prop="is_checkeqp"
label="鍏宠仈璁惧"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
@@ -118,12 +128,14 @@
prop="lm_user"
label="鍒涘缓浜哄憳"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
width="160"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
label="鎿嶄綔"
@@ -221,6 +233,7 @@
<el-table-column
prop="checkitem_code"
label="鐐规閮ㄤ綅缂栫爜"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.isVisible===0">{{ row.checkitem_code }}</div>
@@ -242,6 +255,7 @@
<el-table-column
prop="checkitem_name"
label="鐐规閮ㄤ綅鍚嶇О"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.isVisible===0">{{ row.checkitem_name }}</div>
@@ -274,6 +288,7 @@
<el-table-column
prop="isscan"
label="閫夋嫨鎵爜"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.isVisible===0">{{ row.isscan === 'Y' ? '鏄�' : '鍚�' }}</div>
@@ -294,6 +309,7 @@
<el-table-column
prop="cycle"
label="鐐规鍛ㄦ湡"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<div v-if="row.isVisible===0">{{ row.cycle === 'D' ? '鏃�' : '' }}</div>
@@ -331,7 +347,12 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
<el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="dialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -400,7 +421,12 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
<el-button @click="eqpDialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="eqpDialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="eqpDialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -500,7 +526,7 @@
},
title_value: '鏁版嵁瀵煎叆 / 鐐规閮ㄤ綅',
- code: '4',
+ code: '22',
shows: false
}
@@ -655,6 +681,7 @@
dialogVisibleConfirm() {
this.$refs.dialogForm.validate(valid => {
if (valid) {
+ this.$store.state.app.buttonIsDisabled = true
// this.tableDataDialog.forEach((item, index) => { // 鍘绘帀姝ｅ湪缂栬緫涓旀槸绌篶heckitem_code
// if (item.isVisible === 1 && item.checkitem_code === '') {
// this.tableDataDialog.splice(index, 1)
@@ -682,9 +709,10 @@
AddUpdateDeviceCheckStandArd(data, this.operation === 'add' ? 'Add' : 'Update').then(res => {
if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.getDeviceCheckStandArdSearch()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
}
@@ -803,50 +831,66 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 200
+ this.tableHeight = this.mainHeight - 195
+ this.$refs.tableDataRef.doLayout()
})
},
tableRowClassName({ row, rowIndex }) {
return 'custom-row'
},
// 鍏宠仈璁惧
- async checkeqpClick(row) {
+ checkeqpClick(row) {
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍔犺浇鏁版嵁锛岃绋嶇瓑...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
this.dialogFormEqp.name = row.name
this.dialogFormEqp.code = row.code
- const { data: res } = await DeviceCheckStanedAssociationEqp({ checkstand_code: row.code })
- this.dialogFormEqp.eqpAll = res.filter(item => item.children.length > 0)
+ DeviceCheckStanedAssociationEqp({ checkstand_code: row.code }).then(res => {
+ if (res.code === '200') {
+ setTimeout(() => {
+ loading.close()
+ this.dialogFormEqp.eqpAll = res.data.filter(item => item.children.length > 0)
- if (this.dialogFormEqp.eqpAll.length > 0) {
- this.dialogFormEqp.eqpAll.forEach((item, index) => {
- this.dialogFormEqp.eqpArr.push({
- code: item.code,
- name: item.name,
- type: item.type,
- isSelected1: index === 0,
- isSelected2: item.flag === 'Y'
- })
- if (item.flag === 'Y') {
- this.$nextTick(() => {
- $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ if (this.dialogFormEqp.eqpAll.length > 0) {
+ this.dialogFormEqp.eqpAll.forEach((item, index) => {
+ this.dialogFormEqp.eqpArr.push({
+ code: item.code,
+ name: item.name,
+ type: item.type,
+ isSelected1: index === 0,
+ isSelected2: item.flag === 'Y'
+ })
+ if (item.flag === 'Y') {
+ this.$nextTick(() => {
+ $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ }
+ if (item.children && item.children.length > 0) {
+ item.children.forEach(it => {
+ if (it.flag === 'Y') {
+ this.dialogFormEqp.eqpCodeSelectedArr.push(it.code)
+ }
+ })
+ }
+ })
+ this.dialogFormEqp.eqpAll[0].name = '鍏ㄩ儴'
+ this.dialogFormEqp.eqpTree = [this.dialogFormEqp.eqpAll[0]]
+ }
+
+ this.dialogVisibleEqp = true
+
+ this.$nextTick(() => { // 鏍戝舰鍥炴樉
+ this.$refs.epqTree.setCheckedKeys(this.dialogFormEqp.eqpCodeSelectedArr)
})
- }
- if (item.children && item.children.length > 0) {
- item.children.forEach(it => {
- if (it.flag === 'Y') {
- this.dialogFormEqp.eqpCodeSelectedArr.push(it.code)
- }
- })
- }
- })
- this.dialogFormEqp.eqpAll[0].name = '鍏ㄩ儴'
- this.dialogFormEqp.eqpTree = [this.dialogFormEqp.eqpAll[0]]
- }
-
- this.dialogVisibleEqp = true
-
- this.$nextTick(() => { // 鏍戝舰鍥炴樉
- this.$refs.epqTree.setCheckedKeys(this.dialogFormEqp.eqpCodeSelectedArr)
+ }, 1000)
+ } else {
+ loading.close()
+ }
})
},
// 鍏宠仈璁惧瀵硅瘽妗嗗叧闂�
@@ -1006,6 +1050,7 @@
eqpDialogVisibleConfirm() {
// console.log(this.dialogFormEqp.eqpCodeSelectedArr, 888)
// this.dialogVisibleEqp = false
+ this.$store.state.app.buttonIsDisabled = true
const data = []
this.dialogFormEqp.eqpAll.forEach((item, index) => {
if (item.children && item.children.length > 0) {
@@ -1022,9 +1067,10 @@
SaveDeviceCheckStanedAssociationEqp(data, this.dialogFormEqp.code).then(res => {
if (res.code === '200') {
+ this.dialogVisibleEqp = false
this.$message.success('鍏宠仈鎴愬姛锛�')
this.getDeviceCheckStandArdSearch()
- this.dialogVisibleEqp = false
+ this.$store.state.app.buttonIsDisabled = false
}
})
}
@@ -1197,9 +1243,24 @@
align-items: center;
justify-content: center;
}
+
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
</style>
<style>
+.osloading{
+ font-size: 26px !important;
+}
+.el-loading-text{
+ font-size: 26px !important;
+}
.el-table .custom-row {
background: #f8f8fa;
}
--
Gitblit v1.9.3