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 |   72 ++++++++++++++++++++++++++++++-----
 1 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/src/views/layout/components/Header/index.vue b/src/views/layout/components/Header/index.vue
index dde7c97..6d55cf9 100644
--- a/src/views/layout/components/Header/index.vue
+++ b/src/views/layout/components/Header/index.vue
@@ -9,10 +9,7 @@
     </div>
     <!-- 鍙充晶鑿滃崟 -->
     <div class="header-right">
-      <!-- 鎼滅储妗� -->
-      <div class="menu-right__item search">
-        <el-input suffix-icon="el-icon-search" v-model="keyword" placeholder="璇疯緭鍏ユ悳绱㈠唴瀹�"></el-input>
-      </div>
+      <div class="menu-right__item search"></div>
       <!-- 鐧诲綍鐢ㄦ埛 -->
       <div class="menu-right__item user" @mousemove="flag.user = true" @mouseleave="flag.user = false">
         <el-avatar :size="20" :src="user.user.icon" v-if="user.user.icon"></el-avatar>
@@ -40,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'>
@@ -57,12 +54,37 @@
           <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 />
       </el-dialog>
       <el-dialog :visible.sync="baseInformationVisible" width="35%" title="鍩烘湰淇℃伅" v-if="baseInformationVisible"
-        :before-close="handleClose">
+        >
         <el-form :model="info" class="info" label-width="6vw">
           <el-form-item label="鐢ㄦ埛ID" min-width="6">
             <el-input v-model="info.id"></el-input>
@@ -101,6 +123,8 @@
     return {
       baseInformationVisible: false,
       updatePasswordDialog: false,
+      channelSettingVisible:false,
+      checked3:true,
       menuLeftList: [
         {
           label: '椹鹃┒鑸�',
@@ -110,15 +134,15 @@
         },
         {
           label: '瑙嗛宸℃煡',
-          checked: false,
+          checked: true,
           url: '',
           id: '2f'
         },
         {
           label: '鎵ф硶绠＄悊',
-          checked: false,
+          checked: true,
           url: '',
-          if: '3f',
+          id: '3f',
         },
       ],
       flag: {
@@ -127,6 +151,7 @@
       },
       user: '',
       menuMessageList: [],
+      channelData: [],
       messageCounts: 0,
       keyword: '',
       info: null,
@@ -149,10 +174,29 @@
           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;
+          done();
+        })
+        .catch((_) => { });
+    },
+    handleClose(done) {
+      this.$confirm("纭鍏抽棴锛�")
+        .then((_) => {
+          this.channelSettingVisible = false;
           done();
         })
         .catch((_) => { });
@@ -213,7 +257,13 @@
     },
     menuChange(data) {
       if (data.id === '1f') {
-        window.open('http://121.37.167.200:28081/cockpit-pub/pc-board?boardId=zfu0LsJ9', '_blank');
+        window.open('http://cockpit.patstech.net:28081/cockpit/dist/board.html#/share-board/zfu0LsJ9', '_blank');
+      }
+      if (data.id === '2f') {
+        this.$router.push({path: "/home/video"})
+      }
+      if (data.id === '3f') {
+        this.$router.push({path: "/home/operate/casepool/pool"})
       }
     }
   }

--
Gitblit v1.8.0