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/scgl/cngh.vue | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 205 insertions(+), 10 deletions(-)
diff --git a/src/views/scgl/cngh.vue b/src/views/scgl/cngh.vue
index 2ad7c15..5fdc9cf 100644
--- a/src/views/scgl/cngh.vue
+++ b/src/views/scgl/cngh.vue
@@ -188,7 +188,9 @@
>
<el-button v-if="operation==='setting'" type="primary" @click="addRow">鏂板</el-button>
<div class="elTableDiv">
+ <!-- 閫夋嫨榛樿鏂规鐨勬椂鍊欐槸杩欎釜table-->
<el-table
+ v-if="operation!=='setting'"
ref="tableDataDialogRef"
class="tableFixedDialog"
:data="tableDataDialog"
@@ -200,8 +202,8 @@
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
>
+
<el-table-column
- v-if="operation!=='setting'"
width="50"
fixed
>
@@ -218,7 +220,6 @@
prop="code"
label="鏂规缂栫爜"
width="100"
- fixed
show-tooltip-when-overflow
>
<template slot-scope="{row}">
@@ -365,6 +366,195 @@
range-separator="~"
start-placeholder="寮�濮�"
end-placeholder="缁撴潫"
+ @focus="val=>getTime(val,row,'wktme5_start')"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ v-if="operation==='setting'"
+ width="100"
+ fixed="right"
+ label="鎿嶄綔"
+ >
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-button v-if="row.isVisible===0" type="text" @click="delRow(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===1" type="text" @click="saveRow(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1" type="text" @click="cancelRow(row)">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- 璁剧疆鐨勬椂鍊欐槸杩欎釜table-->
+ <el-table
+ v-else
+ ref="tableDataDialogRef"
+ class="tableFixedDialog"
+ :data="tableDataDialog"
+ :style="{width: 100+'%',height:(tableHeight-200)+'px'}"
+ border
+ :height="(tableHeight-200)+'px'"
+ :row-class-name="tableRowClassName"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ >
+ <el-table-column
+ prop="code"
+ label="鏂规缂栫爜"
+ width="100"
+ fixed
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">{{ row.code }}</div>
+ <el-input v-else v-model="row.code" placeholder="璇疯緭鍏�" type="text" />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="name"
+ label="鏂规鍚嶇О"
+ width="150"
+ fixed
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">{{ row.name }}</div>
+ <el-input v-else v-model="row.name" placeholder="璇疯緭鍏�" type="text" />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="duration"
+ label="宸ヤ綔鏃堕暱"
+ width="100"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <div>{{ row.duration ? parseFloat(row.duration.toFixed(2)) : '0' }} 灏忔椂</div>
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ prop="wktme1_start"
+ label="宸ヤ綔鏃堕棿涓�"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">
+ <div v-if="row.wktme1_start">{{ row.wktme1_start }}</div>
+ <div v-else>/</div>
+ </div>
+ <el-time-picker
+ v-else
+ v-model="row.wktme1_start"
+ is-range
+ :editable="false"
+ :clearable="false"
+ range-separator="~"
+ start-placeholder="寮�濮�"
+ end-placeholder="缁撴潫"
+ format="HH:mm"
+ @blur="val=>getTime(val,row,'wktme1_start')"
+ @focus="val=>getTime(val,row,'wktme1_start')"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wktme2_start"
+ label="宸ヤ綔鏃堕棿浜�"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">
+ <div v-if="row.wktme2_start">{{ row.wktme2_start }}</div>
+ <div v-else>/</div>
+ </div>
+ <el-time-picker
+ v-else-if="row.isVisible===1"
+ v-model="row.wktme2_start"
+ is-range
+ :disabled="row.wktme1_start.length===0"
+ :editable="false"
+ :clearable="false"
+ range-separator="~"
+ start-placeholder="寮�濮�"
+ end-placeholder="缁撴潫"
+ format="HH:mm"
+ @blur="val=>getTime(val,row,'wktme2_start')"
+ @focus="val=>getTime(val,row,'wktme2_start')"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wktme3_start"
+ label="宸ヤ綔鏃堕棿涓�"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">
+ <div v-if="row.wktme3_start">{{ row.wktme3_start }}</div>
+ <div v-else>/</div>
+ </div>
+ <el-time-picker
+ v-else-if="row.isVisible===1"
+ v-model="row.wktme3_start"
+ is-range
+ :disabled="row.wktme2_start.length===0"
+ :editable="false"
+ :clearable="false"
+ format="HH:mm"
+ range-separator="~"
+ start-placeholder="寮�濮�"
+ end-placeholder="缁撴潫"
+ @blur="val=>getTime(val,row,'wktme3_start')"
+ @focus="val=>getTime(val,row,'wktme3_start')"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wktme4_start"
+ label="宸ヤ綔鏃堕棿鍥�"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">
+ <div v-if="row.wktme4_start">{{ row.wktme4_start }}</div>
+ <div v-else>/</div>
+ </div>
+ <el-time-picker
+ v-else-if="row.isVisible===1"
+ v-model="row.wktme4_start"
+ is-range
+ :disabled="row.wktme3_start.length===0"
+ format="HH:mm"
+ :clearable="false"
+ :editable="false"
+ range-separator="~"
+ start-placeholder="寮�濮�"
+ end-placeholder="缁撴潫"
+ @blur="val=>getTime(val,row,'wktme4_start')"
+ @focus="val=>getTime(val,row,'wktme4_start')"
+ />
+
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="wktme5_start"
+ label="宸ヤ綔鏃堕棿浜�"
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.isVisible===0">
+ <div v-if="row.wktme5_start">{{ row.wktme5_start }}</div>
+ <div v-else>/</div>
+ </div>
+ <el-time-picker
+ v-else-if="row.isVisible===1"
+ v-model="row.wktme5_start"
+ is-range
+ :disabled="row.wktme4_start.length===0"
+ :clearable="false"
+ :editable="false"
+ format="HH:mm"
+ range-separator="~"
+ start-placeholder="寮�濮�"
+ end-placeholder="缁撴潫"
+ @blur="val=>getTime(val,row,'wktme5_start')"
@focus="val=>getTime(val,row,'wktme5_start')"
/>
</template>
@@ -643,7 +833,7 @@
this.total = res.count
this.tableData = res.data
this.tableData.forEach(item => {
- item.CaptPlanShopCalendarList = item.CaiptPlanShopCalendarList ? item.CaptPlanShopCalendarList : []
+ item.CaptPlanShopCalendarList = item.CaptPlanShopCalendarList ? item.CaptPlanShopCalendarList : []
})
return { code: res.code }
@@ -873,17 +1063,22 @@
}
}
</style>
-<style>
+<style lang="scss">
.el-table .custom-row {
background: #f8f8fa;
}
-
-/*涓轰簡璁╅潰鏉垮湪瓒呭嚭鍖哄煙鍙樉绀�*/
-.el-table__body-wrapper{
- overflow: visible !important
-}
.table_only{
-overflow: visible !important
+ overflow: visible !important;
+ .el-table__body-wrapper{
+ overflow: visible !important
+ }
}
+/*涓轰簡璁╅潰鏉垮湪瓒呭嚭鍖哄煙鍙樉绀�*/
+/*.el-table__body-wrapper{*/
+/* overflow: visible !important*/
+/*}*/
+/*.table_only{*/
+/*overflow: visible !important*/
+/*}*/
</style>
--
Gitblit v1.9.3