From 33dcba80ee50759a7ca06905232f69c8ddc8627c Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 29 十二月 2022 17:59:09 +0800
Subject: [PATCH] Merge branch 'dev1.0' of ssh://42.193.1.25:29418/sccg_ui into dev1.0
---
src/views/layout/components/Header/index.vue | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/src/views/layout/components/Header/index.vue b/src/views/layout/components/Header/index.vue
index 08c899e..6d55cf9 100644
--- a/src/views/layout/components/Header/index.vue
+++ b/src/views/layout/components/Header/index.vue
@@ -37,7 +37,7 @@
<el-card class="box-card">
<div class="card-header">
<span>娑堟伅涓績</span>
- <el-button type="text">鎺ユ敹璁剧疆</el-button>
+ <el-button type="text" @click="channelSetting">鎺ユ敹璁剧疆</el-button>
</div>
<div v-for="item in menuMessageList" :key="item.id" class="message-card__item">
<router-link to='/home/operate/message/messageIndex'>
@@ -54,6 +54,31 @@
<i class="el-icon-switch-button"></i>
</el-tooltip>
</div>
+ <el-dialog :visible.sync="channelSettingVisible" width="25%" title="娑堟伅鏍忕洰璁剧疆" v-if="channelSettingVisible"
+ :before-close="handleChannelClose">
+ <el-table
+ ref="multipleTable"
+ :header-cell-style="{
+ 'font-size': '14px',
+ 'font-weight': '650',
+ 'line-height': '45px',
+ }"
+ :data="channelData"
+ style="width: 100%"
+
+ > <el-table-column
+ type="selection"
+ width="55"
+
+ >
+ </el-table-column>
+ <el-table-column prop="columnName" label="鍏ㄩ儴" min-width="5" align="center">
+ <!-- <template slot-scope="scope">{{ scope.row.id }}</template> -->
+ </el-table-column>
+ </el-table>
+ <el-button type="button" @click="channelSetting">鏇存柊</el-button>
+ <el-button type="button" @click="channelSetting">鍙栨秷</el-button>
+ </el-dialog>
<el-dialog :visible.sync="updatePasswordDialog" width="40%" title="淇敼瀵嗙爜" v-if="updatePasswordDialog"
:before-close="handleClose">
<updatePassword />
@@ -98,6 +123,8 @@
return {
baseInformationVisible: false,
updatePasswordDialog: false,
+ channelSettingVisible:false,
+ checked3:true,
menuLeftList: [
{
label: '椹鹃┒鑸�',
@@ -124,6 +151,7 @@
},
user: '',
menuMessageList: [],
+ channelData: [],
messageCounts: 0,
keyword: '',
info: null,
@@ -146,7 +174,18 @@
this.info = res.data.user;
})
},
- handleClose(done) {
+ channelSetting(){
+ this.channelSettingVisible=true;
+ const userInfo = JSON.parse(sessionStorage.getItem('user'));
+ this.$axios({
+ method: 'get',
+ url: 'sccg/message_column/getShowColumn?'+'id='+userInfo.user.id
+ })
+ .then(res => {
+ this.channelData=res.data
+ })
+ },
+ handleChannelClose(done) {
this.$confirm("纭鍏抽棴锛�")
.then((_) => {
this.dialogUpload = false;
@@ -154,6 +193,14 @@
})
.catch((_) => { });
},
+ handleClose(done) {
+ this.$confirm("纭鍏抽棴锛�")
+ .then((_) => {
+ this.channelSettingVisible = false;
+ done();
+ })
+ .catch((_) => { });
+ },
//淇敼瀵嗙爜
updatePassword() {
this.updatePasswordDialog = true;
--
Gitblit v1.8.0