From bbcbf37eea5f177c208750236864202e35244107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Wed, 30 Aug 2023 18:21:26 +0800
Subject: [PATCH] =?UTF-8?q?:lipstick:=E5=9C=A8=E7=BA=BF=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=A1=E7=89=87=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Notice/Index.vue        |  4 +--
 src/views/login.vue                    |  2 +-
 src/views/monitor/onlineuser/index.vue | 49 +++++++++++++++++++++-----
 3 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/src/components/Notice/Index.vue b/src/components/Notice/Index.vue
index d93af43..0958f3d 100644
--- a/src/components/Notice/Index.vue
+++ b/src/components/Notice/Index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-popover placement="bottom" trigger="hover" width="400px" popper-class="el-popover-pupop-user-news">
+    <el-popover placement="bottom" trigger="click" width="400px" popper-class="el-popover-pupop-user-news">
       <template #reference>
         <el-badge :is-dot="noticeDot" style="line-height: 18px">
           <el-icon><bell /></el-icon>
@@ -16,7 +16,7 @@
             <div class="content-box-item" v-for="(v, k) in noticeList" :key="k">
               <div>{{ v.noticeTitle }}</div>
               <div class="content-box-msg" v-html="v.noticeContent"></div>
-              <div class="content-box-time">{{ v.updateTime }}</div>
+              <div class="content-box-time">{{ v.createTime }}</div>
             </div>
           </template>
           <div class="content-box-empty" v-else>
diff --git a/src/views/login.vue b/src/views/login.vue
index 502bb2c..69dfdad 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -24,7 +24,7 @@
             </template>
           </el-input>
         </el-form-item>
-        <el-form-item prop="code" v-show="captchaOnOff != 'off'">
+        <el-form-item prop="code" v-if="captchaOnOff != 'off'">
           <el-input v-model="loginForm.code" auto-complete="off" :placeholder="$t('login.captcha')" style="width: 63%" @keyup.enter="handleLogin">
             <template #prefix>
               <svg-icon name="validCode" class="input-icon" />
diff --git a/src/views/monitor/onlineuser/index.vue b/src/views/monitor/onlineuser/index.vue
index ca024ad..6ba7fb1 100644
--- a/src/views/monitor/onlineuser/index.vue
+++ b/src/views/monitor/onlineuser/index.vue
@@ -1,17 +1,23 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true">
+      <el-form-item>
+        <el-button plain type="primary" @click="onLockAll()" icon="lock" v-hasPermi="['monitor:online:forceLogout']">全部强退</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-radio-group v-model="viewSwitch">
+          <el-radio-button label="1">表格</el-radio-button>
+          <el-radio-button label="2">卡片</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">刷新</el-button>
       </el-form-item>
     </el-form>
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="2">
-        <el-button plain type="primary" @click="onLockAll()" icon="lock" v-hasPermi="['monitor:online:forceLogout']">全部强退</el-button>
-      </el-col>
-    </el-row>
-    <el-table :data="onlineUsers" v-loading="loading" ref="tableRef" border highlight-current-row>
-      <!-- <el-table-column prop="connnectionId" label="连接id"></el-table-column> -->
+    <!-- <el-row :gutter="10" class="mb8">
+      <el-col :span="2"> </el-col>
+    </el-row> -->
+    <el-table :data="onlineUsers" v-loading="loading" ref="tableRef" border highlight-current-row v-if="viewSwitch == 1">
       <el-table-column label="No" type="index" width="50" align="center">
         <template #default="scope">
           <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
@@ -35,6 +41,27 @@
         </template>
       </el-table-column>
     </el-table>
+
+    <el-row :gutter="20" v-if="viewSwitch == 2">
+      <el-col v-for="item in onlineUsers" :lg="4" :span="24">
+        <el-card :body-style="{ padding: '15px' }">
+          <el-descriptions :column="1" :title="item.name">
+            <el-descriptions-item label="登录平台">{{ item.platform }}</el-descriptions-item>
+            <el-descriptions-item label="登录地点">{{ item.location }}</el-descriptions-item>
+            <el-descriptions-item label="在线时长" :span="2">
+              <el-tag type="success">{{ item.onlineTime }}分钟</el-tag>
+            </el-descriptions-item>
+          </el-descriptions>
+          <el-text truncated>{{ item.browser }}</el-text>
+          <div>
+            <el-button text @click="onChat(item)" icon="bell" v-hasRole="['admin']">通知</el-button>
+            <el-button text @click="onLock(item)" icon="lock" v-hasPermi="['monitor:online:forceLogout']">强退</el-button>
+          </div>
+        </el-card>
+      </el-col>
+
+      <el-empty v-show="total == 0" description="no data" />
+    </el-row>
     <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
   </div>
 </template>
@@ -43,7 +70,6 @@
 import { listOnline, forceLogout, forceLogoutAll } from '@/api/monitor/online'
 import dayjs from 'dayjs'
 import useSocketStore from '@/store/modules/socket'
-import useUserStore from '@/store/modules/user'
 const { proxy } = getCurrentInstance()
 const queryRef = ref(null)
 const queryParams = reactive({
@@ -54,7 +80,7 @@ const queryParams = reactive({
 const onlineNum = computed(() => {
   return useSocketStore().onlineNum
 })
-
+const viewSwitch = ref(1)
 const loading = ref(false)
 const onlineUsers = ref([])
 const total = ref(0)
@@ -127,3 +153,8 @@ watch(
   }
 )
 </script>
+<style>
+.el-col {
+  margin-bottom: 10px;
+}
+</style>