diff --git a/src/assets/css/components/views/administration/Appearance.scss b/src/assets/css/components/views/administration/Appearance.scss
index c0ec4db3..e35cf2ef 100644
--- a/src/assets/css/components/views/administration/Appearance.scss
+++ b/src/assets/css/components/views/administration/Appearance.scss
@@ -1,5 +1,5 @@
.appearance{
- height: calc(100% - 100px);
+ height: 100%;
display:flex;
flex-direction:column;
.appearance-form {
@@ -10,7 +10,6 @@
display: flex;
flex-direction: column;
height: 100%;
- //width: 600px;
.el-input {
width:600px;
}
@@ -23,10 +22,10 @@
.edit-appearance-base__footer {
display: flex;
align-items: center;
- justify-content: center;
+ justify-content: start;
height: 100px;
margin-top: 3px;
- box-shadow: 0 -1px 4px 0 rgba(0,0,0,0.10);
+ padding-left:200px;
.footer__btn {
margin: 0 10px;
diff --git a/src/utils/api.js b/src/utils/api.js
index 5103d533..94fadf4a 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -20,6 +20,7 @@ export const api = {
login: '/sys/login',
// user
user: '/sys/user',
+ timezone:'/sys/timezones',
// 获取配置
config: '/sys/config',
// role
diff --git a/src/views/administration/Appearance.vue b/src/views/administration/Appearance.vue
index ac1dbd78..714cf295 100644
--- a/src/views/administration/Appearance.vue
+++ b/src/views/administration/Appearance.vue
@@ -38,21 +38,21 @@
popper-class="right-box-select-dropdown right-box-select-report "
size="small">
-
- {{ timezone.value }}
- {{ timezone.remark}}
+
+ {{ timezone.name }}
+ {{ timezone.offset}}
-
-
@@ -115,16 +115,21 @@
this.dateFormatList.forEach(date => {
date.example = window.$dayJs(new Date()).tz().format(date.value)
})
- this.timezoneList = await getDictList({ type: 'timezoneList',pageSize: -1 })
+ await get(api.timezone).then(response => {
+ if (response.code === 200) {
+ this.timezoneList = response.data
+ }
+ })
+
if (this.timezoneList && this.timezoneList.length > 0) {
this.timezoneList.forEach(mapData => {
- let remark = Number(mapData.remark)/3600000 //转换为小
- mapData.timezoneOffset = remark
- let hour = Math.abs(parseInt(remark))
- let remarkStr = remark.toString()
+ let offset = Number(mapData.offset)/3600000 //转换为小
+ mapData.timezoneOffset = offset
+ let hour = Math.abs(parseInt(offset))
+ let offsetStr = offset.toString()
let minute = 0
- if(remarkStr.indexOf('.') > -1){
- minute = Math.abs(Number(remarkStr.substring(remarkStr.indexOf('.')))*60)
+ if(offsetStr.indexOf('.') > -1){
+ minute = Math.abs(Number(offsetStr.substring(offsetStr.indexOf('.')))*60)
}
let str = ''
if(hour<10){
@@ -138,12 +143,12 @@
}else {
str += minute
}
- if(remark > 0){
- mapData.remark = 'UTC+'+str
- }else if(remark === 0){
- mapData.remark = 'UTC'
+ if(offset > 0){
+ mapData.offset = 'UTC+'+str
+ }else if(offset === 0){
+ mapData.offset = 'UTC'
}else {
- mapData.remark = 'UTC-'+str
+ mapData.offset = 'UTC-'+str
}
})
}
@@ -177,7 +182,7 @@
if (this.appearanceObject.timezone !== localStorage.getItem(storageKey.sysTimezone)) {
localStorage.setItem(storageKey.sysTimezone, this.appearanceObject.timezone)
}
- let timezone = this.timezoneList.find(mapData => mapData.value === this.appearanceObject.timezone)
+ let timezone = this.timezoneList.find(mapData => mapData.name === this.appearanceObject.timezone)
if (timezone.timezoneOffset !== localStorage.getItem(storageKey.timezoneOffset)) {
localStorage.setItem(storageKey.timezoneOffset, timezone.timezoneOffset)
}