wxb 5 anni fa
parent
commit
d1c78102a1

+ 7 - 4
src/layout/components/Settings/index.vue

@@ -43,17 +43,17 @@
         </div>
         <div class="drawer-item">
           <span>开启任务栏</span>
-          <el-switch v-model="tagsView" class="drawer-switch" />
+          <el-switch v-model="tagsView" :active-color="activeColor" class="drawer-switch" />
         </div>
 
         <div class="drawer-item">
           <span>Header 固定</span>
-          <el-switch v-model="fixedHeader" class="drawer-switch" />
+          <el-switch :active-color="activeColor" v-model="fixedHeader" class="drawer-switch" />
         </div>
 
         <div class="drawer-item">
           <span>侧边栏Logo</span>
-          <el-switch v-model="sidebarLogo" class="drawer-switch" />
+          <el-switch :active-color="activeColor" v-model="sidebarLogo" class="drawer-switch" />
         </div>
       </div>
     </div>
@@ -66,7 +66,9 @@ import ThemePicker from '@/components/ThemePicker'
 export default {
   components: { ThemePicker },
   data() {
-    return {}
+    return {
+      activeColor: this.$store.state.settings.theme
+    }
   },
   computed: {
     theme() {
@@ -111,6 +113,7 @@ export default {
   },
   methods: {
     themeChange(val) {
+      this.activeColor = val
       this.$store.dispatch('settings/changeSetting', {
         key: 'theme',
         value: val

+ 6 - 0
src/layout/components/Sidebar/index.vue

@@ -49,6 +49,12 @@ export default {
     isCollapse() {
       return !this.sidebar.opened
     }
+  },
+  mounted() {
+
+  },
+  methods: {
+
   }
 }
 </script>

+ 1 - 1
src/views/dashboard/admin/index.vue

@@ -61,7 +61,7 @@
 
     <el-card :bordered="false" :body-style="{padding: '0'}">
       <div class="salesCard">
-        <el-tabs>
+        <el-tabs >
           <el-tab-pane label="销售额">
             <el-row>
               <el-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">

+ 3 - 3
src/views/system/monitor.vue

@@ -10,7 +10,7 @@
               </div>
               <div class="monitor">
                 <div class="monitor-header">
-                  <el-progress type="circle" :percentage="info.cpu.Percent" />
+                  <el-progress :color="$store.state.settings.theme" type="circle" :percentage="info.cpu.Percent" />
                 </div>
                 <div class="monitor-footer">
                   <Cell label="CPU主频" :value="info.cpu.cpuInfo[0].modelName.split('@ ')[1]" border />
@@ -26,7 +26,7 @@
               </div>
               <div class="monitor">
                 <div class="monitor-header">
-                  <el-progress type="circle" :percentage="info.mem.usage" />
+                  <el-progress :color="$store.state.settings.theme" type="circle" :percentage="info.mem.usage" />
                 </div>
                 <div class="monitor-footer">
                   <Cell label="总内存" :value="info.mem.total+'G'" border />
@@ -42,7 +42,7 @@
               </div>
               <div class="monitor">
                 <div class="monitor-header">
-                  <el-progress type="circle" :percentage=" `${((info.disk.free / info.disk.total) * 100).toFixed(2)}` " />
+                  <el-progress :color="$store.state.settings.theme" type="circle" :percentage=" `${((info.disk.free / info.disk.total) * 100).toFixed(2)}` " />
                 </div>
                 <div class="monitor-footer">
                   <Cell label="总内存" :value="info.disk.total+'G'" border />