From d04ff1ec6cb23ee6052d6ff1aa9b762426847a15 Mon Sep 17 00:00:00 2001
From: lushangqing <lushangqing@honggroup.com.cn>
Date: Thu, 16 Jun 2022 10:53:58 +0800
Subject: [PATCH] 【596】登录logo 支持配置-图片预览接口联调，登录页相关图片地址更改，两种布局下首页logo地址更改 #3
---
hg-monitor-web-base/src/main/resources/static/vue3/src/views/logoConfig/index.html | 4 ++--
hg-monitor-web-base/src/main/resources/static/vue3/src/views/logoConfig/index.js | 12 ++++--------
hg-monitor-web-qh/src/main/resources/static/src/controller/userChange.js | 4 ++--
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/hg-monitor-web-base/src/main/resources/static/vue3/src/views/logoConfig/index.html b/hg-monitor-web-base/src/main/resources/static/vue3/src/views/logoConfig/index.html
index 0ee03c1..97c963f 100644
--- a/hg-monitor-web-base/src/main/resources/static/vue3/src/views/logoConfig/index.html
+++ b/hg-monitor-web-base/src/main/resources/static/vue3/src/views/logoConfig/index.html
@@ -1,7 +1,7 @@
<div class="logoConfig-container" :style="'height: '+height+'px'">
- <el-tabs v-if="hasRefresh" v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+ <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane v-for="(item,index) in skinData" :key="index" :label="item.name+'布局'" :name="item.name">
- <el-row class="logoConfig-item" >
+ <el-row class="logoConfig-item" v-if="hasRefresh" >
<!--<el-col :span="4" >
个性化布局-{{item.name}}
</el-col>-->
diff --git a/hg-monitor-web-base/src/main/resources/static/vue3/src/views/logoConfig/index.js b/hg-monitor-web-base/src/main/resources/static/vue3/src/views/logoConfig/index.js
index 1679f8f..2cb4ae1 100644
--- a/hg-monitor-web-base/src/main/resources/static/vue3/src/views/logoConfig/index.js
+++ b/hg-monitor-web-base/src/main/resources/static/vue3/src/views/logoConfig/index.js
@@ -14,7 +14,7 @@ export default {
//刷新页面
let hasRefresh=Vue.ref(true);
//ip地址
- let domainName=Vue.ref(sessionStorage.getItem('domainName')+"/api-auth/validata/code/");
+ let domainName=Vue.ref(sessionStorage.getItem('domainName')+"/api-u/sysConf/preview?code=");
//imageUrl:登录logo，imageUrlSkin：登录皮肤，imageUrlBg：登录背景，imageUrlIndex：首页logo
let skinData=Vue.ref([
{name:"default",imageUrl:'default-login-logo',imageUrlBg:'default-login-backGround'},
@@ -23,10 +23,6 @@ export default {
{name:"首页1",imageUrlIndex:'home1-logo'},
{name:"首页2",imageUrlIndex:'home2-logo'}
])
- let layoutIndexData=Vue.ref([
- {name:'首页logo1',imageUrlIndex:'home1-logo'},
- {name:'首页logo2',imageUrlIndex:'home2-logo'}
- ])
//上传完后的图片预览
let imageUrl=Vue.ref('');
@@ -49,8 +45,9 @@ export default {
if (res && res.success) {
proxy.$global.showMsg("上传成功！");
}
- hasRefresh.value=true;
-
+ setTimeout(function (){
+ hasRefresh.value=true;
+ },200)
})
imageUrl.value = URL.createObjectURL(fileObj);
}
@@ -68,7 +65,6 @@ export default {
imageUrl,
getFile,
skinData,
- layoutIndexData,
domainName
}
}
diff --git a/hg-monitor-web-qh/src/main/resources/static/src/controller/userChange.js b/hg-monitor-web-qh/src/main/resources/static/src/controller/userChange.js
index 48e765f..a5b20e0 100644
--- a/hg-monitor-web-qh/src/main/resources/static/src/controller/userChange.js
+++ b/hg-monitor-web-qh/src/main/resources/static/src/controller/userChange.js
@@ -282,8 +282,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
rowTail = '</div>';
}
if(v.ddicCode=="userLayout"){
- var selectOption=' <option value="layout">简约布局</option>'+
- ' <option value="layout-nx">经典布局</option>';
+ var selectOption=' <option value="layout">默认布局</option>'+
+ ' <option value="layout-nx">layout-nx</option>';
str='<select data-property="'+v.ddicCode+'" placeholder="'+v.ddicDesc+'" data-id="" data-username="" data-sort="" data-remark="" class="select layui-select select-input-my" name="' + v.ddicCode + '" autocomplete="off">'+
' <option value="" style="display:none;"></option>'+ selectOption +
--
libgit2 0.24.0