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/logininfor/index.vue |  372 +++++++++++++++++++++++++++++------------------------
 1 files changed, 204 insertions(+), 168 deletions(-)

diff --git a/zhitan-vue/src/views/monitor/logininfor/index.vue b/zhitan-vue/src/views/monitor/logininfor/index.vue
index 9afb585..1444cce 100644
--- a/zhitan-vue/src/views/monitor/logininfor/index.vue
+++ b/zhitan-vue/src/views/monitor/logininfor/index.vue
@@ -1,145 +1,161 @@
 <template>
-   <div class="app-container">
+  <div class="app-container page">
+    <div class="form-card">
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
-         <el-form-item label="鐧诲綍鍦板潃" prop="ipaddr">
-            <el-input
-               v-model="queryParams.ipaddr"
-               placeholder="璇疯緭鍏ョ櫥褰曞湴鍧�"
-               clearable
-               style="width: 240px;"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
-            <el-input
-               v-model="queryParams.userName"
-               placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
-               clearable
-               style="width: 240px;"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="鐘舵��" prop="status">
-            <el-select
-               v-model="queryParams.status"
-               placeholder="鐧诲綍鐘舵��"
-               clearable
-               style="width: 240px"
-            >
-               <el-option
-                  v-for="dict in sys_common_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
-            </el-select>
-         </el-form-item>
-         <el-form-item label="鐧诲綍鏃堕棿" style="width: 308px">
-            <el-date-picker
-               v-model="dateRange"
-               value-format="YYYY-MM-DD HH:mm:ss"
-               type="daterange"
-               range-separator="-"
-               start-placeholder="寮�濮嬫棩鏈�"
-               end-placeholder="缁撴潫鏃ユ湡"
-               :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-            ></el-date-picker>
-         </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: 240px"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
+          <el-input
+            v-model="queryParams.userName"
+            placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
+            clearable
+            style="width: 240px"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="鐘舵��" prop="status">
+          <el-select v-model="queryParams.status" placeholder="鐧诲綍鐘舵��" clearable style="width: 240px">
+            <el-option v-for="dict in sys_common_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="鐧诲綍鏃堕棿" style="width: 308px">
+          <el-date-picker
+            v-model="dateRange"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="寮�濮嬫棩鏈�"
+            end-placeholder="缁撴潫鏃ユ湡"
+            :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+          ></el-date-picker>
+        </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>
+    </div>
 
-      <el-row :gutter="10" class="mb8">
-         <el-col :span="1.5">
+    <div class="table-bg-style">
+      <div class="table-box" style="margin-top: 0">
+        <el-row :gutter="10" class="mb8" style="margin-top: 8px">
+          <el-col :span="1.5">
             <el-button
-               type="danger"
-               plain
-               icon="Delete"
-               :disabled="multiple"
-               @click="handleDelete"
-               v-hasPermi="['monitor:logininfor:remove']"
-            >鍒犻櫎</el-button>
-         </el-col>
-         <el-col :span="1.5">
+              type="danger"
+              plain
+              icon="Delete"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="['monitor:logininfor:remove']"
+              >鍒犻櫎</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" @click="handleClean" v-hasPermi="['monitor:logininfor:remove']"
+              >娓呯┖</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
             <el-button
-               type="danger"
-               plain
-               icon="Delete"
-               @click="handleClean"
-               v-hasPermi="['monitor:logininfor:remove']"
-            >娓呯┖</el-button>
-         </el-col>
-         <el-col :span="1.5">
+              type="primary"
+              plain
+              icon="Unlock"
+              :disabled="single"
+              @click="handleUnlock"
+              v-hasPermi="['monitor:logininfor:unlock']"
+              >瑙i攣</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
             <el-button
-               type="primary"
-               plain
-               icon="Unlock"
-               :disabled="single"
-               @click="handleUnlock"
-               v-hasPermi="['monitor:logininfor:unlock']"
-            >瑙i攣</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="warning"
-               plain
-               icon="Download"
-               @click="handleExport"
-               v-hasPermi="['monitor:logininfor:export']"
-            >瀵煎嚭</el-button>
-         </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
+              type="warning"
+              plain
+              icon="Download"
+              @click="handleExport"
+              v-hasPermi="['monitor:logininfor:export']"
+              >瀵煎嚭</el-button
+            >
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
 
-      <el-table ref="logininforRef" v-loading="loading" :data="logininforList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-         <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="璁块棶缂栧彿" align="center" prop="infoId" />
-         <el-table-column label="鐢ㄦ埛鍚嶇О" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
-         <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="status">
+        <el-table
+          ref="logininforRef"
+          v-loading="loading"
+          :data="logininforList"
+          @selection-change="handleSelectionChange"
+          :default-sort="defaultSort"
+          @sort-change="handleSortChange"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="璁块棶缂栧彿" align="center" prop="infoId" />
+          <el-table-column
+            label="鐢ㄦ埛鍚嶇О"
+            align="center"
+            prop="userName"
+            :show-overflow-tooltip="true"
+            sortable="custom"
+            :sort-orders="['descending', 'ascending']"
+          />
+          <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="status">
             <template #default="scope">
-               <dict-tag :options="sys_common_status" :value="scope.row.status" />
+              <dict-tag :options="sys_common_status" :value="scope.row.status" />
             </template>
-         </el-table-column>
-         <el-table-column label="鎻忚堪" align="center" prop="msg" :show-overflow-tooltip="true" />
-         <el-table-column label="璁块棶鏃堕棿" align="center" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
+          </el-table-column>
+          <el-table-column label="鎻忚堪" align="center" prop="msg" :show-overflow-tooltip="true" />
+          <el-table-column
+            label="璁块棶鏃堕棿"
+            align="center"
+            prop="loginTime"
+            sortable="custom"
+            :sort-orders="['descending', 'ascending']"
+            width="180"
+          >
             <template #default="scope">
-               <span>{{ parseTime(scope.row.loginTime) }}</span>
+              <span>{{ parseTime(scope.row.loginTime) }}</span>
             </template>
-         </el-table-column>
-      </el-table>
+          </el-table-column>
+        </el-table>
 
-      <pagination
-         v-show="total > 0"
-         :total="total"
-         v-model:page="queryParams.pageNum"
-         v-model:limit="queryParams.pageSize"
-         @pagination="getList"
-      />
-   </div>
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </div>
+    </div>
+  </div>
 </template>
 
 <script setup name="Logininfor">
-import { list, delLogininfor, cleanLogininfor, unlockLogininfor } from "@/api/monitor/logininfor";
+import { list, delLogininfor, cleanLogininfor, unlockLogininfor } from "@/api/monitor/logininfor"
 
-const { proxy } = getCurrentInstance();
-const { sys_common_status } = proxy.useDict("sys_common_status");
+const { proxy } = getCurrentInstance()
+const { sys_common_status } = proxy.useDict("sys_common_status")
 
-const logininforList = ref([]);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref([]);
-const single = ref(true);
-const multiple = ref(true);
-const selectName = ref("");
-const total = ref(0);
-const dateRange = ref([]);
-const defaultSort = ref({ prop: "loginTime", order: "descending" });
+const logininforList = ref([])
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const selectName = ref("")
+const total = ref(0)
+const dateRange = ref([])
+const defaultSort = ref({ prop: "loginTime", order: "descending" })
 
 // 鏌ヨ鍙傛暟
 const queryParams = ref({
@@ -149,77 +165,97 @@
   userName: undefined,
   status: undefined,
   orderByColumn: undefined,
-  isAsc: undefined
-});
+  isAsc: undefined,
+})
 
 /** 鏌ヨ鐧诲綍鏃ュ織鍒楄〃 */
 function getList() {
-  loading.value = true;
-  list(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
-    logininforList.value = response.rows;
-    total.value = response.total;
-    loading.value = false;
-  });
+  loading.value = true
+  list(proxy.addDateRange(queryParams.value, dateRange.value)).then((response) => {
+    logininforList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
 }
 /** 鎼滅储鎸夐挳鎿嶄綔 */
 function handleQuery() {
-  queryParams.value.pageNum = 1;
-  getList();
+  queryParams.value.pageNum = 1
+  getList()
 }
 /** 閲嶇疆鎸夐挳鎿嶄綔 */
 function resetQuery() {
-  dateRange.value = [];
-  proxy.resetForm("queryRef");
-  queryParams.value.pageNum = 1;
-  proxy.$refs["logininforRef"].sort(defaultSort.value.prop, defaultSort.value.order);
+  dateRange.value = []
+  proxy.resetForm("queryRef")
+  queryParams.value.pageNum = 1
+  proxy.$refs["logininforRef"].sort(defaultSort.value.prop, defaultSort.value.order)
 }
 /** 澶氶�夋閫変腑鏁版嵁 */
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.infoId);
-  multiple.value = !selection.length;
-  single.value = selection.length != 1;
-  selectName.value = selection.map(item => item.userName);
+  ids.value = selection.map((item) => item.infoId)
+  multiple.value = !selection.length
+  single.value = selection.length != 1
+  selectName.value = selection.map((item) => item.userName)
 }
 /** 鎺掑簭瑙﹀彂浜嬩欢 */
 function handleSortChange(column, prop, order) {
-  queryParams.value.orderByColumn = column.prop;
-  queryParams.value.isAsc = column.order;
-  getList();
+  queryParams.value.orderByColumn = column.prop
+  queryParams.value.isAsc = column.order
+  getList()
 }
 /** 鍒犻櫎鎸夐挳鎿嶄綔 */
 function handleDelete(row) {
-  const infoIds = row.infoId || ids.value;
-  proxy.$modal.confirm('鏄惁纭鍒犻櫎璁块棶缂栧彿涓�"' + infoIds + '"鐨勬暟鎹」?').then(function () {
-    return delLogininfor(infoIds);
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-  }).catch(() => {});
+  const infoIds = row.infoId || ids.value
+  proxy.$modal
+    .confirm('鏄惁纭鍒犻櫎璁块棶缂栧彿涓�"' + infoIds + '"鐨勬暟鎹」?')
+    .then(function () {
+      return delLogininfor(infoIds)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+    })
+    .catch(() => {})
 }
 /** 娓呯┖鎸夐挳鎿嶄綔 */
 function handleClean() {
-  proxy.$modal.confirm("鏄惁纭娓呯┖鎵�鏈夌櫥褰曟棩蹇楁暟鎹」?").then(function () {
-    return cleanLogininfor();
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("娓呯┖鎴愬姛");
-  }).catch(() => {});
+  proxy.$modal
+    .confirm("鏄惁纭娓呯┖鎵�鏈夌櫥褰曟棩蹇楁暟鎹」?")
+    .then(function () {
+      return cleanLogininfor()
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess("娓呯┖鎴愬姛")
+    })
+    .catch(() => {})
 }
 /** 瑙i攣鎸夐挳鎿嶄綔 */
 function handleUnlock() {
-  const username = selectName.value;
-  proxy.$modal.confirm('鏄惁纭瑙i攣鐢ㄦ埛"' + username + '"鏁版嵁椤�?').then(function () {
-    return unlockLogininfor(username);
-  }).then(() => {
-    proxy.$modal.msgSuccess("鐢ㄦ埛" + username + "瑙i攣鎴愬姛");
-  }).catch(() => {});
+  const username = selectName.value
+  proxy.$modal
+    .confirm('鏄惁纭瑙i攣鐢ㄦ埛"' + username + '"鏁版嵁椤�?')
+    .then(function () {
+      return unlockLogininfor(username)
+    })
+    .then(() => {
+      proxy.$modal.msgSuccess("鐢ㄦ埛" + username + "瑙i攣鎴愬姛")
+    })
+    .catch(() => {})
 }
 /** 瀵煎嚭鎸夐挳鎿嶄綔 */
 function handleExport() {
-  proxy.download("monitor/logininfor/export", {
-    ...queryParams.value,
-  }, `config_${new Date().getTime()}.xlsx`);
+  proxy.download(
+    "monitor/logininfor/export",
+    {
+      ...queryParams.value,
+    },
+    `config_${new Date().getTime()}.xlsx`
+  )
 }
 
-getList();
+getList()
 </script>
+
+<style lang="scss" scoped>
+@import "@/assets/styles/page.scss";
+</style>

--
Gitblit v1.9.3