From a8c8a8b6dcb9ca76c629b249147dbeb77d3f9aa0 Mon Sep 17 00:00:00 2001
From: hyx <hanyuxia@iie.ac.cn>
Date: Tue, 21 Mar 2023 17:10:37 +0800
Subject: [PATCH] =?UTF-8?q?CN-936=20=E5=BC=80=E5=8F=91appearance=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2:=E8=B0=83=E6=95=B4=E4=BF=9D=E5=AD=98=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=BD=8D=E7=BD=AE=EF=BC=9B=E4=BF=AE=E6=94=B9=E6=97=B6?=
 =?UTF-8?q?=E5=8C=BA=E5=88=97=E8=A1=A8=E8=8E=B7=E5=8F=96=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/administration/Appearance.scss      |  7 ++-
 src/utils/api.js                              |  1 +
 src/views/administration/Appearance.vue       | 49 ++++++++++---------
 3 files changed, 31 insertions(+), 26 deletions(-)

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">
             <template v-for="timezone in timezoneList" :key="timezone.id">
-              <el-option :label="timezone.value" :value="timezone.value">
-                <span style="float: left">{{ timezone.value }}</span>
-                <span style="float: right;">{{ timezone.remark}}</span>
+              <el-option :label="timezone.name" :value="timezone.name">
+                <span style="float: left">{{ timezone.name }}</span>
+                <span style="float: right;">{{ timezone.offset}}</span>
               </el-option>
             </template>
           </el-select>
 
         </el-form-item>
       </el-form>
-    </div>
-    <div class="edit-appearance-base__footer">
-      <button style="position: relative;" :class="{'footer__btn--disabled': blockOperation.save}" :disabled="blockOperation.save" class="footer__btn" @click="save">
-        <loading size="small" :loading="blockOperation.save"></loading>
-        <span>{{$t('overall.save')}}</span>
-      </button>
+      <div class="edit-appearance-base__footer">
+        <button style="position: relative;" :class="{'footer__btn--disabled': blockOperation.save}" :disabled="blockOperation.save" class="footer__btn" @click="save">
+          <loading size="small" :loading="blockOperation.save"></loading>
+          <span>{{$t('overall.save')}}</span>
+        </button>
+      </div>
     </div>
   </div>
 </template>
@@ -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)
           }