From e713b378b01d189f972cfb5b9eae749ee95a8b51 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 29 十月 2022 13:48:00 +0800
Subject: [PATCH] 1.解决两个账号登录，是否被挤掉的问题
---
src/views/zzmx/gxdy.vue | 265 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 174 insertions(+), 91 deletions(-)
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index c98245e..edc9fc6 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -11,12 +11,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.stepcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="宸ュ簭鍚嶇О" style=" display: flex;">
@@ -54,24 +54,43 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label-width="70px" label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="form.createuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</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"
+ >
+ <svg-icon
+ v-show="mouseHoverType==='mouseout'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+ @mouseenter="mouseHoverType=$event.type"
+ />
+ <svg-icon
+ v-show="mouseHoverType==='mouseenter'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+ @click="isExpandForm=!isExpandForm"
+ @mouseout="mouseHoverType=$event.type"
+ />
+ </div>
</div>
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
+ class="tableFixed"
:data="tableData"
- :height="tableHeight"
+ :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
border
:row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:tableHeight+'px'}"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -129,8 +148,14 @@
width="110"
>
<template slot-scope="{row}">
- <div v-if="row.enable==='Y'"><svg-icon icon-class="circleYes" style="margin-right: 2px" />鏄�</div>
- <div v-if="row.enable==='N'"> <svg-icon icon-class="circleNo" style="margin-right: 2px" />鍚�</div>
+ <div v-if="row.enable==='Y'">
+ <svg-icon icon-class="circleYes" style="margin-right: 2px" />
+ 鏄�
+ </div>
+ <div v-if="row.enable==='N'">
+ <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+ 鍚�
+ </div>
</template>
</el-table-column>
<el-table-column
@@ -277,7 +302,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>
@@ -345,7 +375,12 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
<el-button @click="workDialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="workDialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="workDialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -387,7 +422,12 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
<el-button @click="defectDialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="defectDialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="defectDialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -406,26 +446,17 @@
StepSearch
} from '@/api/zzmx'
import $ from 'jquery'
+import { validateCode } from '@/utils/global'
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
name: 'GXDY',
components: {
Pagination
},
data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ紪鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
return {
+ mouseHoverType: 'mouseout',
+ isExpandForm: false,
isIpad: false,
mainHeight: 0,
tableHeight: 0,
@@ -464,7 +495,7 @@
operation: '',
dialogFormRules: {
stepcode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
stepname: [
{ required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
@@ -600,6 +631,7 @@
dialogVisibleConfirm() {
this.$refs.dialogForm.validate(valid => {
if (valid) {
+ this.$store.state.app.buttonIsDisabled = true
const data = {
id: this.dialogForm.id,
stepcode: this.dialogForm.stepcode,
@@ -611,9 +643,10 @@
}
AddUpdateStep(data).then(res => {
if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.getStepSearch()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
}
@@ -626,64 +659,81 @@
this.$nextTick(() => {
// this.mainHeight = window.innerHeight - 250
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 200
+ this.tableHeight = this.mainHeight - 255
if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 40
}
this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
+ this.$refs.tableDataRef.doLayout()
})
},
/* 鍏宠仈宸ヤ綔绔欐ā鍧�*/
// 鍏宠仈宸ヤ綔绔欑偣鍑�
- async workClick(row) {
- this.workDialogVisible = true
+ workClick(row) {
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍔犺浇鏁版嵁锛岃绋嶇瓑...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+
this.workDialogForm.stepcode = row.stepcode
this.workDialogForm.stepname = row.stepname
- const { data: res } = await StepAssociationEqp({ stepcode: this.workDialogForm.stepcode })
- this.workDialogForm.workArr = res
- let workGatherArr = []
- if (row.flwtype === 'W') { // 澶栧崗鎯呭喌涓�
- workGatherArr = this.workDialogForm.workArr.filter(item => item.type === 'W')
- } else if (row.flwtype === 'Z') { // 鑷埗鎯呭喌涓�
- workGatherArr = this.workDialogForm.workArr.filter(item => item.type === 'E')
- } else { // 鑷埗锛嬪鍗�
- workGatherArr = this.workDialogForm.workArr
- }
- // this.workDialogForm.workArr[1].children = []
- const nodeKey = []// 闇�瑕佹爲褰㈡暟鏄剧殑鍊�
- workGatherArr.forEach((item, index) => {
- this.workDialogForm.workGatherArr.push({
- isSelected1: index === 0,
- isSelected2: item.flag === 'Y',
- code: item.code,
- name: item.name,
- type: item.type,
- flag: item.flag
- })
- if (item.flag === 'Y' && item.children && item.children.length > 0) {
- this.$nextTick(() => {
- $("input[name='gather']").eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
- })
- item.children.forEach(it => {
- if (it.flag === 'Y') {
- nodeKey.push(it.code)
- }
- })
- }
- if (index === 0) {
- if (item.children && item.children.length > 0) {
- this.workDialogForm.workTreeArr = this.workDialogForm.workArr.filter(it => it.code === item.code)
- this.workDialogForm.workTreeArr[0].name = '鍏ㄩ儴'
- }
- }
- // item.flag === 'Y'&&item
- })
- console.log(nodeKey, 1)
- this.$refs.workTree.setCheckedKeys(nodeKey)
- this.workDialogForm.workTreeSelectedArr = nodeKey
+ StepAssociationEqp({ stepcode: this.workDialogForm.stepcode }).then(res => {
+ if (res.code === '200') {
+ setTimeout(() => {
+ loading.close()
+ this.workDialogVisible = true
- console.log(this.workDialogForm.workGatherArr, 6)
- console.log(this.workDialogForm.workTreeArr, 7)
+ this.workDialogForm.workArr = res.data.filter(item => item.children.length !== 0)
+
+ let workGatherArr = []
+ if (row.flwtype === 'W') { // 澶栧崗鎯呭喌涓�
+ workGatherArr = this.workDialogForm.workArr.filter(item => item.type === 'W')
+ } else if (row.flwtype === 'Z') { // 鑷埗鎯呭喌涓�
+ workGatherArr = this.workDialogForm.workArr.filter(item => item.type === 'E')
+ } else { // 鑷埗锛嬪鍗�
+ workGatherArr = this.workDialogForm.workArr
+ }
+ const nodeKey = []// 闇�瑕佹爲褰㈡暟鏄剧殑鍊�
+ workGatherArr.forEach((item, index) => {
+ this.workDialogForm.workGatherArr.push({
+ isSelected1: index === 0,
+ isSelected2: item.flag === 'Y',
+ code: item.code,
+ name: item.name,
+ type: item.type,
+ flag: item.flag
+ })
+ if (item.flag === 'Y' && item.children && item.children.length > 0) {
+ this.$nextTick(() => {
+ $("input[name='gather']").eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ })
+ item.children.forEach(it => {
+ if (it.flag === 'Y') {
+ nodeKey.push(it.code)
+ }
+ })
+ }
+ if (index === 0) {
+ if (item.children && item.children.length > 0) {
+ this.workDialogForm.workTreeArr = this.workDialogForm.workArr.filter(it => it.code === item.code)
+ this.workDialogForm.workTreeArr[0].name = '鍏ㄩ儴'
+ }
+ }
+ // item.flag === 'Y'&&item
+ })
+
+ this.$nextTick(() => {
+ this.$refs.workTree.setCheckedKeys(nodeKey)
+ })
+ this.workDialogForm.workTreeSelectedArr = nodeKey
+ }, 1000)
+ } else {
+ loading.close()
+ }
+ })
},
// 澶х洅瀛愮偣鍑讳簨浠�
myCheckboxClick(val) {
@@ -902,8 +952,7 @@
// 纭
async workDialogVisibleConfirm() {
this.workDialogForm.workTreeSelectedArr = [...new Set(this.workDialogForm.workTreeSelectedArr)]
- console.log(this.workDialogForm.workTreeSelectedArr, 18)
- console.log(this.workDialogForm.workArr, 20)
+
const data = []
this.workDialogForm.workArr.forEach(item => {
if (item.flag === 'Y' && item.children && item.children.length > 0) {
@@ -914,34 +963,51 @@
})
}
})
- console.log(data)
+ this.$store.state.app.buttonIsDisabled = true
const res = await SaveStepAssociationEqp(this.workDialogForm.stepcode, data)
if (res.code === '200') {
+ this.workDialogVisible = false
this.$message.success('淇濆瓨鎴愬姛锛�')
await this.getStepSearch()
- this.workDialogVisible = false
+ this.$store.state.app.buttonIsDisabled = false
}
},
/* 鍏宠仈缂洪櫡*/
// 鍏宠仈缂洪櫡鐐瑰嚮
- async defectClick(row) {
+ defectClick(row) {
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍔犺浇鏁版嵁锛岃绋嶇瓑...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+
this.defectTreeCode = row.stepcode
this.defectTreeName = row.stepname
- this.defectDialogVisible = true
- const { data: res } = await StepAssociationDefect({ stepcode: row.stepcode })
- // this.defectTree = res
- this.defectTree.push({ code: 'QB', name: '鍏ㄩ儴', children: res, flag: 'N' })
- console.log(this.defectTree, 6)
- const nokeKey = []
- this.defectTree[0].children.forEach(item => {
- if (item.flag === 'Y') {
- nokeKey.push(item.code)
+ StepAssociationDefect({ stepcode: row.stepcode }).then(res => {
+ if (res.code === '200') {
+ setTimeout(() => {
+ loading.close()
+ this.defectDialogVisible = true
+
+ this.defectTree.push({ code: 'QB', name: '鍏ㄩ儴', children: res.data, flag: 'N' })
+
+ const nokeKey = []
+ this.defectTree[0].children.forEach(item => {
+ if (item.flag === 'Y') {
+ nokeKey.push(item.code)
+ }
+ })
+
+ this.$nextTick(() => {
+ this.$refs.defectTree.setCheckedKeys(nokeKey)
+ })
+ }, 1000)
+ } else {
+ loading.close()
}
- })
- console.log(nokeKey, 2)
- this.$nextTick(() => {
- this.$refs.defectTree.setCheckedKeys(nokeKey)
})
},
// 鍏抽棴
@@ -962,11 +1028,13 @@
data.push({ code: item.code, name: item.name })
}
})
+ this.$store.state.app.buttonIsDisabled = true
const res = await SaveStepAssociationDefect(this.defectTreeCode, data)
if (res.code === '200') {
+ this.defectDialogVisible = false
this.$message.success('淇濆瓨鎴愬姛锛�')
await this.getStepSearch()
- this.defectDialogVisible = false
+ this.$store.state.app.buttonIsDisabled = false
}
}
}
@@ -1125,9 +1193,24 @@
margin-bottom: 0;
}
+.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