From adb74c51618faf025fe1d46bf6b22db895c2608f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期日, 12 二月 2023 11:16:14 +0800
Subject: [PATCH] 1.提交
---
src/views/jcsz/adsz.vue | 71 +++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 24 deletions(-)
diff --git a/src/views/jcsz/adsz.vue b/src/views/jcsz/adsz.vue
index 6d4edf7..4a607cf 100644
--- a/src/views/jcsz/adsz.vue
+++ b/src/views/jcsz/adsz.vue
@@ -3,7 +3,7 @@
<div class="body" :style="{height:mainHeight+'px'}">
<div class="body_left">
<div style="margin:10px 0">
- <i class="el-icon-s-comment" style="color:#42b983;" /> 杞﹂棿淇℃伅锛�
+ <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> 杞﹂棿淇℃伅锛�
</div>
<el-input
v-model="filterText"
@@ -29,18 +29,26 @@
<div :style="{height: (contentHeight+51)+'px'}">
<div class="pane_top">
<div style="display: flex;align-items: center">
- <div class="bar" />
+ <div class="bar" :style="{background:$store.state.settings.theme}" />
<div>鍝嶅簲浜哄憳</div>
<el-button
+ v-waves
icon="el-icon-circle-plus-outline"
:disabled="allowClose"
- :style="{color:allowClose?'#6f6e6f':'#42b983'}"
- style="height: 30px;line-height: 30px;font-size: 22px;padding: 10px"
+ :style="{color:allowClose?'#6f6e6f':$store.state.settings.theme}"
+ style="height: 30px;line-height: 30px;font-size: 22px;padding:10px;background-color: #fafafa"
@click="responseUserClick"
/>
</div>
- <div>
- <el-checkbox v-model="allowClose" @change="allowCloseChange">鍏佽鍏抽棴</el-checkbox>
+ <div style="display: flex;align-content: center">
+ <div>
+ <el-checkbox v-model="allowClose" @change="allowCloseChange">鍏佽鍏抽棴</el-checkbox>
+ </div>
+ <div style="margin-left: 5px;cursor: pointer">
+ <el-tooltip class="item" effect="dark" content="褰撳墠鍛煎彨绫诲瀷(鍚敤/鍏抽棴)" placement="top">
+ <i class="el-icon-question" :style="{color:$store.state.settings.theme}" />
+ </el-tooltip>
+ </div>
</div>
</div>
<el-empty v-if="AnDengResponUserArr.length===0" :image-size="200" description="鏆傛棤鏁版嵁" />
@@ -51,6 +59,7 @@
:closable="!allowClose"
type="success"
style="margin-right: 10px;margin-bottom: 10px"
+ :style="{color:$store.state.settings.theme}"
@close="val=>tagClose(val,item,tag)"
>
{{ tag.username }}
@@ -61,6 +70,7 @@
</el-tab-pane>
</el-tabs>
<el-button
+
style="position: absolute;top: 15px;right:10px;z-index: 1000"
icon="el-icon-setting"
@click="setting"
@@ -71,6 +81,7 @@
<!-- 鑷畾涔夊懠鍙被鍨�-->
<el-dialog
+ v-el-drag-dialog
title="鑷畾涔夊懠鍙被鍨�"
:visible.sync="settingDialogVisible"
width="800px"
@@ -80,6 +91,7 @@
@close="handleClose"
>
<el-button
+ v-waves
type="primary"
style="margin-bottom: 10px;"
icon="el-icon-circle-plus-outline"
@@ -140,10 +152,10 @@
>
<template slot-scope="{row}">
<div class="operationClass">
- <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>
- <!-- <el-button v-if="row.isVisible===0" type="text" @click="editRow(row)">缂栬緫</el-button>-->
- <el-button v-if="row.isVisible===0" type="text" @click="delRow(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="saveRow(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="cancelRow(row)">鍙栨秷</el-button>
+ <!-- <el-button v-waves v-if="row.isVisible===0" type="text" @click="editRow(row)">缂栬緫</el-button>-->
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="delRow(row)">鍒犻櫎</el-button>
</div>
</template>
</el-table-column>
@@ -151,16 +163,17 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisibleCancel">杩� 鍥�</el-button>
+ <el-button v-waves @click="dialogVisibleCancel">杩� 鍥�</el-button>
</div>
</span>
</el-dialog>
<el-dialog
+ v-el-drag-dialog
title="鍝嶅簲浜哄憳"
:visible.sync="userDialogVisible"
width="800px"
- top="15vh"
+ top="10vh"
:close-on-click-modal="false"
@closed="handleUserClose"
@close="handleUserClose"
@@ -175,17 +188,18 @@
closable
type="success"
style="margin-right: 10px;margin-bottom: 10px"
+ :style="{color:$store.state.settings.theme}"
@close="val=>userTagClose(val,tag)"
>
{{ tag.username }}
</el-tag>
</div>
<div>
- <i class="el-icon-s-comment" style="color:#42b983;margin: 20px 10px 20px 0" />浜哄憳锛�
+ <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" style="margin: 20px 10px 20px 0" />浜哄憳锛�
</div>
<div
style=" background-color: #fafafa; padding: 10px; min-height: 420px;"
- :style="{maxHeight:(contentHeight-300)+'px',overflowY: 'scroll'}"
+ :style="{maxHeight:(contentHeight-300)+'px'}"
>
<el-input
@@ -211,8 +225,9 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisibleUserCancel">鍙� 娑�</el-button>
+ <el-button v-waves @click="dialogVisibleUserCancel">鍙� 娑�</el-button>
<el-button
+ v-waves
type="primary"
:loading="$store.state.app.buttonIsDisabled"
:disabled="$store.state.app.buttonIsDisabled"
@@ -235,10 +250,12 @@
AnDengTypeSearch,
DeleteAnDengType
} from '@/api/jcsz'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
export default {
name: 'Zzjg',
-
+ directives: { elDragDialog, waves },
data() {
return {
mainHeight: 0,
@@ -362,6 +379,10 @@
})
},
async saveRow(row) {
+ console.log(row)
+ if (row.code.toString().trim() === '' || row.name.toString().trim() === '') {
+ return this.$message.info('绫诲瀷缂栫爜鎴栧悕绉颁笉鑳戒负绌猴紒')
+ }
const res = await AddUpdateAnDengType([row])
if (res.code === '200') {
await this.setting()
@@ -427,12 +448,14 @@
}
})
- loading.close()
- this.userDialogVisible = true
+ setTimeout(() => {
+ loading.close()
+ this.userDialogVisible = true
- this.$nextTick(() => {
- this.$refs.userTree.setCheckedKeys(this.treeCheckedKey)
- })
+ this.$nextTick(() => {
+ this.$refs.userTree.setCheckedKeys(this.treeCheckedKey)
+ })
+ }, 1000)
}
})
},
@@ -547,7 +570,7 @@
width: 4px;
height: 20px;
border-radius: 2px;
- background-color: $main_color;
+ //background-color: $main_color;
margin-right: 10px;
}
}
@@ -560,9 +583,9 @@
.body_left_tree {
::v-deep .is-current > .el-tree-node__content {
- background-color: $main_color !important;
+ background-color: #dedcdc !important;
font-weight: bolder;
- color: #FFFFFF;
+ //color: #FFFFFF;
}
}
</style>
--
Gitblit v1.9.3