From de29dc841e562cd13a3bf45d8460bf38a9410940 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 04 一月 2023 16:53:10 +0800
Subject: [PATCH] 1.提交
---
src/views/jcsz/yhqd.vue | 98 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 74 insertions(+), 24 deletions(-)
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 20a2285..840f709 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -17,10 +17,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="鐢ㄦ埛缂栫爜" style=" display: flex;">
+ <el-form-item label="鐢ㄦ埛缂栫爜" style=" display: flex;">
<el-input v-model="form.UserCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鐢ㄦ埛鍚嶇О" style=" display: flex;">
@@ -54,7 +54,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-show="isExpandForm" label-width="70px" label="鍦ㄨ亴鐘舵��" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="鍦ㄨ亴鐘舵��" style=" display: flex;">
<el-select
v-model="form.Enable"
:popper-append-to-body="false"
@@ -71,7 +71,10 @@
</el-select>
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
+ <div
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'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>
@@ -122,6 +125,7 @@
<el-table-column
prop="usercode"
label="鐢ㄦ埛缂栫爜"
+ show-tooltip-when-overflow
min-width="110"
sortable="custom"
/>
@@ -130,17 +134,20 @@
label="鐢ㄦ埛鍚嶇О"
min-width="110"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="password"
label="鐢ㄦ埛瀵嗙爜"
min-width="110"
sortable="custom"
+ show-tooltip-when-overflow
/>
<el-table-column
prop="org_name"
label="鎵�灞炵粍缁�"
min-width="110"
+ show-tooltip-when-overflow
sortable="custom"
>
<template slot-scope="{row}">
@@ -151,6 +158,7 @@
<el-table-column
prop="group_name"
label="鐢熶骇鐝粍"
+ show-tooltip-when-overflow
min-width="110"
sortable="custom"
>
@@ -162,6 +170,7 @@
<el-table-column
prop="wagetype"
label="宸ヨ祫绫诲瀷"
+ show-tooltip-when-overflow
sortable="custom"
width="110"
>
@@ -173,6 +182,7 @@
<el-table-column
prop="mobile"
label="鑱旂郴鏂瑰紡"
+ show-tooltip-when-overflow
min-width="110"
sortable="custom"
>
@@ -185,6 +195,7 @@
prop="email"
label="鐢靛瓙閭"
sortable="custom"
+ show-tooltip-when-overflow
min-width="110"
>
<template slot-scope="{row}">
@@ -194,17 +205,20 @@
</el-table-column>
<el-table-column
prop="enable"
+ show-tooltip-when-overflow
label="鍦ㄨ亴鐘舵��"
width="110"
sortable="custom"
>
<template slot-scope="{row}">
<div v-if="row.enable==='Y'">
- <svg-icon icon-class="circleYes" style="margin-right: 2px" />
+ <!-- <svg-icon icon-class="circleYes" style="margin-right: 2px" />-->
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
鍦ㄨ亴
</div>
<div v-if="row.enable==='N'">
- <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+ <!--/* <svg-icon icon-class="circleNo" style="margin-right: 2px" />*/-->
+ <i class="el-icon-info" style="margin-right: 2px" />
绂昏亴
</div>
</template>
@@ -212,22 +226,30 @@
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
+ show-tooltip-when-overflow
width="110"
sortable="custom"
/>
<el-table-column
prop="lm_date"
label="鍒涘缓鏃堕棿"
+ show-tooltip-when-overflow
width="160"
sortable="custom"
/>
<el-table-column
prop="is_role"
label="鍏宠仈瑙掕壊"
+ show-tooltip-when-overflow
width="110"
>
<template slot-scope="{row}">
- <i v-if="row.is_role==='Y'" class="el-icon-share" @click="roleClick({row})" />
+ <i
+ v-if="row.is_role==='Y'"
+ :style="{color:$store.state.settings.theme}"
+ class="el-icon-share"
+ @click="roleClick({row})"
+ />
<i
v-if="row.is_role==='N'"
class="el-icon-share"
@@ -244,10 +266,14 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
- <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ <i
+ :style="{color:$store.state.settings.theme}"
+ class="el-icon-edit-outline"
+ @click="edit('edit',row)"
+ />
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" @click="del(row.id)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row.id)" />
</el-tooltip>
</div>
</template>
@@ -381,38 +407,50 @@
<!-- @opened="handleOpenedRoles"-->
<div>
- <i class="el-icon-s-comment" style="color:#42b983;" /> 鐢ㄦ埛鍚嶇О锛歿{ dialogFormRoles.username }}
+ <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> 鐢ㄦ埛鍚嶇О锛歿{ dialogFormRoles.username }}
</div>
<el-divider />
<div>
<div style="margin-bottom:20px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 瑙掕壊绫诲瀷闆嗗悎锛�
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 瑙掕壊绫诲瀷闆嗗悎锛�
</div>
<div class="myCheckboxGroup">
<div
v-for="item in dialogFormRoles.rolesArr"
:key="item.code"
- :style="{border:item.isSelected1?'1px solid #42b983':'1px solid #eee'}"
+ :style="{border:item.isSelected1?'1px solid '+ $store.state.settings.theme :'1px solid #eee'}"
class="myCheckbox"
@click="myCheckboxClick(item)"
>
- <input
- class="myCheckboxInput"
- type="checkbox"
- :value="item.code"
- :name="item.name"
- :style="{color:item.isSelected2?'#42b983':'#fff'}"
- @click="myCheckboxInputClick(item)"
- >{{ item.name }}
+ <!-- <input-->
+ <!-- class="myCheckboxInput"-->
+ <!-- type="checkbox"-->
+ <!-- :value="item.code"-->
+ <!-- :name="item.name"-->
+ <!-- :style="{color:item.isSelected2?'#42b983':'#fff'}"-->
+ <!-- @click="myCheckboxInputClick(item)"-->
+ <!-- >{{ item.name }}-->
<!-- 鐖跺瓙鐐瑰嚮浜嬩欢涓嶅奖鍝�-->
<!-- onClick="event.cancelBubble = true"-->
+ <el-checkbox
+ :key="item.code"
+ v-model="item.isSelected2"
+ class="myCheckboxInput"
+ :value="item.code"
+ :name="item.name"
+ :label="item.name"
+ :checked="item.isSelected2"
+ @change="myCheckboxInputClick(item)"
+ />
+ <div class="myCheckboxInputLabel">{{ item.name }}</div>
+
</div>
</div>
</div>
<el-divider />
<div>
<div style="margin-bottom:20px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 瑙掕壊锛�
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 瑙掕壊锛�
</div>
<el-tree
ref="roleTree"
@@ -485,6 +523,7 @@
prop="group_code"
label="鐝粍缂栫爜"
sortable="custom"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<el-input
@@ -500,6 +539,7 @@
prop="group_name"
label="鐝粍鍚嶇О"
sortable="custom"
+ show-tooltip-when-overflow
>
<template slot-scope="{row}">
<el-input v-if="row.isVisible===1" v-model="row.group_name" placeholder="璇疯緭鍏�" />
@@ -508,6 +548,7 @@
</el-table-column>
<el-table-column
prop="description"
+ show-tooltip-when-overflow
label="鐝粍鎻忚堪"
sortable="custom"
>
@@ -1177,7 +1218,7 @@
},
// myCheckBoxInput鐐瑰嚮浜嬩欢 灏忕洅瀛愮偣鍑�(input)
myCheckboxInputClick(item) {
- item.isSelected2 = !item.isSelected2
+ item.isSelected2 = !!item.isSelected2
this.dialogFormRoles.rolesArrSelectedArr = [...new Set(this.dialogFormRoles.rolesArrSelectedArr)]// 鏁扮粍鍘婚噸
if (item.isSelected2) { // 浠庢病閫変腑鍒伴�変腑
console.log('浠庢病閫変腑鍒伴�変腑')
@@ -1364,12 +1405,20 @@
margin: 10px 30px 0 0;
border-radius: 5px;
cursor: default;
+ position: relative;
.myCheckboxInput {
margin: 1px 5px 0 0;
cursor: pointer;
}
+ .myCheckboxInputLabel {
+ position: absolute;
+ left: 29px;
+ padding: 5px;
+ top: 6px;
+ color: transparent;
+ }
}
input[type=checkbox] {
@@ -1515,13 +1564,14 @@
</style>
<style>
-.osloading{
+.osloading {
font-size: 26px !important;
}
-.el-loading-text{
+.el-loading-text {
font-size: 26px !important;
}
+
.el-table .custom-row {
background: #f8f8fa;
}
--
Gitblit v1.9.3