taoge_xiaodi/maintenance_system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!57 发布 vue 版本 5.1.1 与 cloud 版本2.1.1

Browse Source 
Merge pull request !57 from 疯狂的狮子Li/dev
This commit is contained in:
疯狂的狮子Li
2023-11-14 03:11:07 +00:00
committed by Gitee
parent 5bc7044032 6e6062e824
commit 9e89ab5bae
19 changed files with 403 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/index.vue
View File

@ -33,7 +33,7 @@
* 部署方式 Docker 容器编排 一键部署业务集群<br />
* 国际化 SpringMessage Spring标准国际化方案<br />
</p>
<p><b>当前版本:</b> <span>v5.1.0</span></p>
<p><b>当前版本:</b> <span>v5.1.1</span></p>
<p>
<el-tag type="danger">&yen;免费开源</el-tag>
</p>
@ -78,7 +78,7 @@
* 分布式监控 Prometheus、Grafana 全方位性能监控<br />
* 其余与 Vue 版本一致<br />
</p>
<p><b>当前版本:</b> <span>v2.1.0</span></p>
<p><b>当前版本:</b> <span>v2.1.1</span></p>
<p>
<el-tag type="danger">&yen;免费开源</el-tag>
</p>
@ -96,6 +96,12 @@
</template>
<script setup name="Index" lang="ts">
import { initWebSocket } from '@/utils/websocket';
onMounted(() => {
let protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://'
initWebSocket(protocol + window.location.host + import.meta.env.VITE_APP_BASE_API + "/resource/websocket");
});
const goTarget = (url:string) => {
window.open(url, '__blank')

7
src/views/monitor/logininfor/index.vue
View File

@ -76,6 +76,12 @@
sortable="custom"
:sort-orders="['descending', 'ascending']"
/>
<el-table-column label="客户端" align="center" prop="clientKey" :show-overflow-tooltip="true" />
<el-table-column label="设备类型" align="center">
<template #default="scope">
<dict-tag :options="sys_device_type" :value="scope.row.deviceType" />
</template>
</el-table-column>
<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" />
@ -103,6 +109,7 @@ import { list, delLoginInfo, cleanLoginInfo, unlockLoginInfo } from "@/api/monit
import { LoginInfoQuery, LoginInfoVO } from "@/api/monitor/loginInfo/types";
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { sys_device_type } = toRefs<any>(proxy?.useDict("sys_device_type"));
const { sys_common_status } = toRefs<any>(proxy?.useDict("sys_common_status"));
const loginInfoList = ref<LoginInfoVO[]>([]);

7
src/views/monitor/online/index.vue
View File

@ -29,6 +29,12 @@
</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="clientKey" :show-overflow-tooltip="true" />
<el-table-column label="设备类型" align="center">
<template #default="scope">
<dict-tag :options="sys_device_type" :value="scope.row.deviceType" />
</template>
</el-table-column>
<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" />
@ -59,6 +65,7 @@ import { forceLogout, list as initData } from "@/api/monitor/online";
import { OnlineQuery, OnlineVO } from "@/api/monitor/online/types";
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { sys_device_type } = toRefs<any>(proxy?.useDict("sys_device_type"));
const onlineList = ref<OnlineVO[]>([]);
const loading = ref(true);

2
src/views/system/user/profile/thirdParty.vue
View File

@ -20,7 +20,7 @@
<div id="git-user-binding">
<h4 class="provider-desc">你可以绑定以下第三方帐号</h4>
<div id="authlist" class="user-bind">
<a class="third-app" href="#" @click="authUrl('wechar');" title="使用 微信 账号授权登录">
<a class="third-app" href="#" @click="authUrl('wechat');" title="使用 微信 账号授权登录">
<div class="git-other-login-icon">
<svg-icon icon-class="wechat" />
</div>