From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev

---
 zhitan-vue/src/views/monitor/online/index.vue |  178 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 99 insertions(+), 79 deletions(-)

diff --git a/zhitan-vue/src/views/monitor/online/index.vue b/zhitan-vue/src/views/monitor/online/index.vue
index eb17ebc..1d0523c 100644
--- a/zhitan-vue/src/views/monitor/online/index.vue
+++ b/zhitan-vue/src/views/monitor/online/index.vue
@@ -1,106 +1,126 @@
 <template>
-   <div class="app-container">
+  <div class="app-container page">
+    <div class="form-card">
       <el-form :model="queryParams" ref="queryRef" :inline="true">
-         <el-form-item label="鐧诲綍鍦板潃" prop="ipaddr">
-            <el-input
-               v-model="queryParams.ipaddr"
-               placeholder="璇疯緭鍏ョ櫥褰曞湴鍧�"
-               clearable
-               style="width: 200px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
-            <el-input
-               v-model="queryParams.userName"
-               placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
-               clearable
-               style="width: 200px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
-            <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
-         </el-form-item>
+        <el-form-item label="鐧诲綍鍦板潃" prop="ipaddr">
+          <el-input
+            v-model="queryParams.ipaddr"
+            placeholder="璇疯緭鍏ョ櫥褰曞湴鍧�"
+            clearable
+            style="width: 200px"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
+          <el-input
+            v-model="queryParams.userName"
+            placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
+            clearable
+            style="width: 200px"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+          <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+        </el-form-item>
       </el-form>
-      <el-table
-         v-loading="loading"
-         :data="onlineList.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
-         style="width: 100%;"
-      >
-         <el-table-column label="搴忓彿" width="50" type="index" align="center">
-            <template #default="scope">
-               <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
-            </template>
-         </el-table-column>
-         <el-table-column label="浼氳瘽缂栧彿" align="center" prop="tokenId" :show-overflow-tooltip="true" />
-         <el-table-column label="鐧诲綍鍚嶇О" align="center" prop="userName" :show-overflow-tooltip="true" />
-         <el-table-column label="鎵�灞為儴闂�" align="center" prop="deptName" :show-overflow-tooltip="true" />
-         <el-table-column label="涓绘満" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
-         <el-table-column label="鐧诲綍鍦扮偣" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
-         <el-table-column label="鎿嶄綔绯荤粺" align="center" prop="os" :show-overflow-tooltip="true" />
-         <el-table-column label="娴忚鍣�" align="center" prop="browser" :show-overflow-tooltip="true" />
-         <el-table-column label="鐧诲綍鏃堕棿" align="center" prop="loginTime" width="180">
-            <template #default="scope">
-               <span>{{ parseTime(scope.row.loginTime) }}</span>
-            </template>
-         </el-table-column>
-         <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
-            <template #default="scope">
-               <el-button link type="primary" icon="Delete" @click="handleForceLogout(scope.row)" v-hasPermi="['monitor:online:forceLogout']">寮洪��</el-button>
-            </template>
-         </el-table-column>
-      </el-table>
+    </div>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="pageNum" v-model:limit="pageSize" />
-   </div>
+    <div class="table-bg-style">
+      <div class="table-box">
+        <el-table
+          v-loading="loading"
+          :data="onlineList.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
+          style="width: 100%"
+        >
+          <el-table-column label="搴忓彿" width="60" type="index" align="center">
+            <template #default="scope">
+              <span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="浼氳瘽缂栧彿" align="center" prop="tokenId" :show-overflow-tooltip="true" />
+          <el-table-column label="鐧诲綍鍚嶇О" align="center" prop="userName" :show-overflow-tooltip="true" />
+          <el-table-column label="鎵�灞為儴闂�" align="center" prop="deptName" :show-overflow-tooltip="true" />
+          <el-table-column label="涓绘満" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
+          <el-table-column label="鐧诲綍鍦扮偣" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
+          <el-table-column label="鎿嶄綔绯荤粺" align="center" prop="os" :show-overflow-tooltip="true" />
+          <el-table-column label="娴忚鍣�" align="center" prop="browser" :show-overflow-tooltip="true" />
+          <el-table-column label="鐧诲綍鏃堕棿" align="center" prop="loginTime" width="180">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.loginTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+            <template #default="scope">
+              <el-button
+                link
+                type="primary"
+                icon="Delete"
+                @click="handleForceLogout(scope.row)"
+                v-hasPermi="['monitor:online:forceLogout']"
+                >寮洪��</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination v-show="total > 0" :total="total" v-model:page="pageNum" v-model:limit="pageSize" />
+      </div>
+    </div>
+  </div>
 </template>
 
 <script setup name="Online">
-import { forceLogout, list as initData } from "@/api/monitor/online";
+import { forceLogout, list as initData } from "@/api/monitor/online"
 
-const { proxy } = getCurrentInstance();
+const { proxy } = getCurrentInstance()
 
-const onlineList = ref([]);
-const loading = ref(true);
-const total = ref(0);
-const pageNum = ref(1);
-const pageSize = ref(10);
+const onlineList = ref([])
+const loading = ref(true)
+const total = ref(0)
+const pageNum = ref(1)
+const pageSize = ref(10)
 
 const queryParams = ref({
   ipaddr: undefined,
-  userName: undefined
-});
+  userName: undefined,
+})
 
 /** 鏌ヨ鐧诲綍鏃ュ織鍒楄〃 */
 function getList() {
-  loading.value = true;
-  initData(queryParams.value).then(response => {
-    onlineList.value = response.rows;
-    total.value = response.total;
-    loading.value = false;
-  });
+  loading.value = true
+  initData(queryParams.value).then((response) => {
+    onlineList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
 }
 /** 鎼滅储鎸夐挳鎿嶄綔 */
 function handleQuery() {
-  pageNum.value = 1;
-  getList();
+  pageNum.value = 1
+  getList()
 }
 /** 閲嶇疆鎸夐挳鎿嶄綔 */
 function resetQuery() {
-  proxy.resetForm("queryRef");
-  handleQuery();
+  proxy.resetForm("queryRef")
+  handleQuery()
 }
 /** 寮洪��鎸夐挳鎿嶄綔 */
 function handleForceLogout(row) {
-    proxy.$modal.confirm('鏄惁纭寮洪��鍚嶇О涓�"' + row.userName + '"鐨勭敤鎴�?').then(function () {
-  return forceLogout(row.tokenId);
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-  }).catch(() => {});
+  proxy.$modal
+    .confirm('鏄惁纭寮洪��鍚嶇О涓�"' + row.userName + '"鐨勭敤鎴�?')
+    .then(function () {
+      return forceLogout(row.tokenId)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+    })
+    .catch(() => {})
 }
 
-getList();
+getList()
 </script>
+<style lang="scss" scoped>
+@import "@/assets/styles/page.scss";
+</style>

--
Gitblit v1.9.3