Merge pull request #167 from jamebal/dev

perf: optimize style

src/components/Icon/Icon.vue

@@ -5,18 +5,17 @@
 
 import { Icon } from 'ant-design-vue'
 const IconFont = Icon.createFromIconfontCN({
-  scriptUrl: document.location.protocol + '/resource/font_2024484_ziwmm4cu4r.js'
+  scriptUrl: document.location.protocol + '/resource/font_2024484_fr1a8jalngg.js'
 })
 
 // 把此段代码贴到iconfont项目页面的控制台中, 以获取图标列表
-
 // const nodeArray = Array.from(document.querySelectorAll('.block-icon-list .icon-item .icon-code.icon-code-show'));
 //  const iconNames = nodeArray.map(item => item.outerText.replace('icon-',''))
 //  console.log(iconNames.slice(0,80))
 // console.log(iconNames.slice(80,160))
 
 export const iconFonts = {
-  list: ["qrcode", "arrow1_left", "wulianwang-","zuji","disk-drive", "menu-fuzhi", "iso", "zuijinhuoyue","key", "shouquan", "sort", "grid", "list", "emoji-a", "emoji-bizui", "emoji-baiyan", "emoji-aixin", "emoji-dajing", "emoji-ziya", "emoji-daxiao", "emoji-esi", "emoji-fadai", "emoji-fankun", "emoji-ganga", "emoji-fennu", "emoji-hanyan", "emoji-jingkong", "emoji-haochi", "emoji-emo", "emoji-jingsong", "emoji-jingya", "emoji-kaixin", "emoji-lengku", "emoji-danao", "emoji-liukoushui", "emoji-liulei", "emoji-mengbi", "mianwubiaoqing", "nanguo", "shuizhuo", "taoyan", "tanchi", "siliao", "tiaopi", "xiaochulei", "wuliao", "xingxingyan", "xieyan", "xiasi", "xiaolian", "ku", "shengqi", "yousiliao", "en", "bushufu", "bianbian", "fankun1", "feiwen", "ganmao", "huaixiao", "liuhan", "outu", "keshui", "renzhe", "santiaoxian", "guaiwu", "shoushang", "tianshi", "shuai", "xianwen", "xiaodiaodaya", "xiong", "yiwen", "yun", "liubixie", "shimo", "dianzan", "biti", "fendou", "huqi", "heng", "kulou", "leng", "taoyan1", "shuixing", "aini", "aixin1", "zhadan", "xinsui",
+  list: ['gengxinjindu', 'duigou', 'bars-solid', 'sort-amount-down-solid', 'sort-amount-up-alt-solid', 'tag2', 'guazai', 'duplicate', 'play1', "qrcode", "arrow1_left", "wulianwang-","zuji","disk-drive", "menu-fuzhi", "iso", "zuijinhuoyue","key", "shouquan", "sort", "grid", "list", "emoji-a", "emoji-bizui", "emoji-baiyan", "emoji-aixin", "emoji-dajing", "emoji-ziya", "emoji-daxiao", "emoji-esi", "emoji-fadai", "emoji-fankun", "emoji-ganga", "emoji-fennu", "emoji-hanyan", "emoji-jingkong", "emoji-haochi", "emoji-emo", "emoji-jingsong", "emoji-jingya", "emoji-kaixin", "emoji-lengku", "emoji-danao", "emoji-liukoushui", "emoji-liulei", "emoji-mengbi", "mianwubiaoqing", "nanguo", "shuizhuo", "taoyan", "tanchi", "siliao", "tiaopi", "xiaochulei", "wuliao", "xingxingyan", "xieyan", "xiasi", "xiaolian", "ku", "shengqi", "yousiliao", "en", "bushufu", "bianbian", "fankun1", "feiwen", "ganmao", "huaixiao", "liuhan", "outu", "keshui", "renzhe", "santiaoxian", "guaiwu", "shoushang", "tianshi", "shuai", "xianwen", "xiaodiaodaya", "xiong", "yiwen", "yun", "liubixie", "shimo", "dianzan", "biti", "fendou", "huqi", "heng", "kulou", "leng", "taoyan1", "shuixing", "aini", "aixin1", "zhadan", "xinsui",
     "maren", "zhutou", "qie", "youling", "apple-fill", "attachment", "android-fill", "apple", "download", "arrow-up-circle", "arrow-right-circle", "arrow-down", "ashbin", "add", "file_music", "menu", "role", "jiaoseguanli", "yemianshezhi", "drop_down", "yuandian", "tag", "service-directory", "fabu", "wailian", "bianji-", "WEBSITE", "wangzhanguanli", "Up", "up", "fenlei", "guanlizhuanjiawenzhang", "pifu", "tuichudenglu", "shezhi", "wangzhan", "huaban", "yunshezhi", "UserSettings", "blogger", "biaoqian", "myself", "guidang", "quxiaoyulan1-copy", "yulan-copy", "quxiaoyulan1", "yulan"]
 }
 

src/views/login/index.vue

@@ -330,7 +330,7 @@ $light_gray:#eee;
     display: flex;
     justify-content: center;
     align-items: center;
-    height: 100vh;
+    height: calc(100vh - 6px);
   }
 
   .box-card {

src/views/setting/cloudManager.vue

@@ -78,25 +78,13 @@
         </el-tabs>
       </div>
     </el-card>
-    <el-card class="box-card progress">
-      <div slot="header">
-        <div class="box-card-header">
-          <div class="clearfix card-header-back">
-            <span>任务进度</span>
-          </div>
-        </div>
-      </div>
-      <div>
-        <task-progress :data="taskProgressDataList"></task-progress>
-      </div>
-    </el-card>
   </div>
 </template>
 
 <script>
 
 import config from '@/../package.json'
-import settingApi, { getSetting, getTaskProgress } from "@/api/setting-api";
+import settingApi, { getSetting } from "@/api/setting-api";
 import Logo from "@/components/Logo";
 import getPageTitle from "@/utils/get-page-title";
 import UploadImageInput from "@/components/input/UploadImageInput.vue";
@@ -117,7 +105,6 @@ export default {
       clickSync: false,
       indexingPercent: 100,
       syncPercent: 100,
-      taskProgressDataList: [],
       resetLoading: false,
       webpEnabled: false,
       logoFileName: '',
@@ -137,9 +124,6 @@ export default {
       if (this.activeName === '2') {
       }
     }
-    getTaskProgress().then(res => {
-      this.taskProgressDataList = res.data
-    })
   },
   computed: {
     ...mapState(['message']),

src/views/setting/taskProgress.vue

@@ -0,0 +1,54 @@
+<template>
+  <div class="app-container">
+    <el-card class="box-card">
+      <div slot="header">
+        <div class="box-card-header">
+          <div class="clearfix card-header-back">
+            <span>任务进度</span>
+          </div>
+        </div>
+      </div>
+      <div>
+        <task-progress :data="taskProgressDataList"></task-progress>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+
+import TaskProgress from "@/components/TaskProgress/index.vue";
+import {getTaskProgress} from "@/api/setting-api";
+
+export default {
+  components: { TaskProgress },
+  data() {
+    return {
+      taskProgressDataList: [],
+    }
+  },
+  mounted() {
+    getTaskProgress().then(res => {
+      this.taskProgressDataList = res.data
+    })
+  },
+  computed: {
+  },
+  watch: {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "src/styles/setting";
+
+.progress {
+  margin-top: 5px;
+  >>> .el-card__header {
+    padding: 8px 20px;
+  }
+}
+
+</style>