From a19094c8f57315c69401219cfb3b5139dde722ba Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 13 三月 2026 16:40:03 +0800
Subject: [PATCH] 海康电表维护
---
admin/src/views/login.vue | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/login.vue b/admin/src/views/login.vue
index a4f240a..9ba9b70 100644
--- a/admin/src/views/login.vue
+++ b/admin/src/views/login.vue
@@ -3,13 +3,8 @@
<img src="@/assets/images/bg@2x.png" class="main_bg" alt="">
<div class="login_wrap">
<div class="login_img">
-<<<<<<< HEAD
<div class="h3" style="font-size: 30px; margin-bottom: 0;">{{sysConfig.title || ''}}</div>
- <div class="h3">{{sysConfig.subtitle || title}}</div>
-=======
- <div class="h2">鑺滄箹鐑熻崏鏅烘収瀹夋秷瀹夊叏闃茶寖绯荤粺</div>
<div class="h3">鏅烘収鐗╂祦鍥尯瀹夋秷涓�浣撳寲绯荤粺</div>
->>>>>>> c5675caa (鏈�鏂扮増鏈�541200007)
</div>
<div class="form_wrap">
<div class="tabs">
@@ -115,11 +110,11 @@
const isRemPsd = localStorage.getItem('isRemPsd') || false
this.isRemPsd = JSON.parse(isRemPsd)
this.refreshCaptcha()
- this.getSystemConfig()
+ this.getSystemConfigDo()
},
methods: {
...mapMutations(['setUserInfo', 'setSysconfig']),
- getSystemConfig () {
+ getSystemConfigDo () {
getSystemConfig()
.then((res) => {
if (res && res.subtitle) {
--
Gitblit v1.9.3