bug修复，样式调整

xibinglee · Sep 20, 2019 · 5f0941b · 5f0941b
1 parent 8739f81
commit 5f0941b
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 26 deletions.
diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
     "sortablejs": "1.8.4",
     "tui-editor": "1.3.3",
     "vue": "2.6.10",
-    "vue-count-to": "1.0.13",
+    "vue-count-to": "^1.0.13",
     "vue-i18n": "7.3.2",
     "vue-router": "3.0.2",
     "vue-splitpane": "1.0.4",

diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
@@ -19,6 +19,7 @@
     left: 0;
     z-index: 1001;
     overflow: hidden;
+    box-shadow: 2px 0 6px rgba(0,0,0,.25);
 
     // reset element-ui css
     .horizontal-collapse-transition {

diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
@@ -30,9 +30,21 @@
                   <el-col :span="4" :offset="4">{{ $t('common.TotalVisit') }}</el-col>
                 </el-row>
                 <el-row>
-                  <el-col :span="4" :offset="4" class="num"><el-link type="primary">{{ todayIp }}</el-link></el-col>
-                  <el-col :span="4" :offset="4" class="num"><el-link type="primary">{{ todayVisit }}</el-link></el-col>
-                  <el-col :span="4" :offset="4" class="num"><el-link type="primary">{{ totalVisit }}</el-link></el-col>
+                  <el-col :span="4" :offset="4" class="num">
+                    <el-link type="primary">
+                      <countTo :start-val="0" :end-val="todayIp" :duration="3000" />
+                    </el-link>
+                  </el-col>
+                  <el-col :span="4" :offset="4" class="num">
+                    <el-link type="primary">
+                      <countTo :start-val="0" :end-val="todayVisit" :duration="3000" />
+                    </el-link>
+                  </el-col>
+                  <el-col :span="4" :offset="4" class="num">
+                    <el-link type="primary">
+                      <countTo :start-val="0" :end-val="totalVisit" :duration="3000" />
+                    </el-link>
+                  </el-col>
                 </el-row>
               </div>
             </el-col>
@@ -145,10 +157,12 @@
 <script>
 import echarts from 'echarts'
 import { parseTime } from '@/utils'
+import countTo from 'vue-count-to'
 import resize from '@/components/Charts/mixins/resize'
 
 export default {
   name: 'Dashboard',
+  components: { countTo },
   mixins: [resize],
   data() {
     return {
@@ -295,16 +309,33 @@ export default {
             splitLine: {
               show: false
             },
-            data: dateArr
+            data: dateArr,
+            axisLine: {
+              lineStyle: {
+                color: '#333'
+              }
+            }
           },
           yAxis: [
             {
               type: 'value',
               splitLine: {
-                show: false
+                lineStyle: {
+                  type: 'dashed',
+                  color: '#DDD'
+                }
               },
-              axisLabel: {
-                formatter: '{value}'
+              axisLine: {
+                show: false,
+                lineStyle: {
+                  color: '#333'
+                }
+              },
+              nameTextStyle: {
+                color: '#999'
+              },
+              splitArea: {
+                show: false
               }
             }],
           series: [
@@ -418,7 +449,7 @@ export default {
           p {
             margin: 5px 0 0 0;
             font-size: .7rem;
-            line-height: 1.2rem;
+            line-height: 1.3rem;
             white-space:normal;
           }
         }

diff --git a/src/views/febs/gen/generate/Index.vue b/src/views/febs/gen/generate/Index.vue
@@ -2,10 +2,10 @@
   <div class="app-container">
     <div class="filter-container">
       <el-input v-model="queryParams.tableName" :placeholder="$t('table.gen.generate.tableName')" class="filter-item search-item" />
-      <el-button class="filter-item" @click="search">
+      <el-button class="filter-item" type="primary" plain @click="search">
         {{ $t('table.search') }}
       </el-button>
-      <el-button class="filter-item" @click="reset">
+      <el-button class="filter-item" type="warning" plain @click="reset">
         {{ $t('table.reset') }}
       </el-button>
     </div>

diff --git a/src/views/febs/monitor/loginlog/Index.vue b/src/views/febs/monitor/loginlog/Index.vue
@@ -10,10 +10,10 @@
         class="filter-item search-item date-range-item"
         type="daterange"
       />
-      <el-button class="filter-item" @click="search">
+      <el-button class="filter-item" type="primary" plain @click="search">
         {{ $t('table.search') }}
       </el-button>
-      <el-button class="filter-item" @click="reset">
+      <el-button class="filter-item" type="warning" plain @click="reset">
         {{ $t('table.reset') }}
       </el-button>
       <el-dropdown v-has-any-permission="['loginlog:delete','loginlog:export']" trigger="click" class="filter-item">

diff --git a/src/views/febs/monitor/systemlog/Index.vue b/src/views/febs/monitor/systemlog/Index.vue
@@ -11,10 +11,10 @@
         class="filter-item search-item date-range-item"
         type="daterange"
       />
-      <el-button class="filter-item" @click="search">
+      <el-button class="filter-item" type="primary" plain @click="search">
         {{ $t('table.search') }}
       </el-button>
-      <el-button class="filter-item" @click="reset">
+      <el-button class="filter-item" type="warning" plain @click="reset">
         {{ $t('table.reset') }}
       </el-button>
       <el-dropdown v-has-any-permission="['log:delete','log:export']" trigger="click" class="filter-item">

diff --git a/src/views/febs/system/dept/Index.vue b/src/views/febs/system/dept/Index.vue
@@ -5,10 +5,10 @@
         <div class="app-container">
           <div class="filter-container">
             <el-input v-model="deptName" :placeholder="$t('table.dept.deptName')" class="filter-item search-item" />
-            <el-button class="filter-item" @click="search">
+            <el-button class="filter-item" type="primary" plain @click="search">
               {{ $t('table.search') }}
             </el-button>
-            <el-button class="filter-item" @click="reset">
+            <el-button class="filter-item" type="warning" plain @click="reset">
               {{ $t('table.reset') }}
             </el-button>
             <el-dropdown v-has-any-permission="['dept:add','dept:delete','dept:export']" trigger="click" class="filter-item">

diff --git a/src/views/febs/system/menu/Index.vue b/src/views/febs/system/menu/Index.vue
@@ -5,10 +5,10 @@
         <div class="app-container">
           <div class="filter-container">
             <el-input v-model="menuName" :placeholder="$t('table.menu.menuName')" class="filter-item search-item" />
-            <el-button class="filter-item" @click="search">
+            <el-button class="filter-item" type="primary" plain @click="search">
               {{ $t('table.search') }}
             </el-button>
-            <el-button class="filter-item" @click="reset">
+            <el-button class="filter-item" type="warning" plain @click="reset">
               {{ $t('table.reset') }}
             </el-button>
             <el-dropdown v-has-any-permission="['menu:add','menu:delete','menu:export']" trigger="click" class="filter-item">

diff --git a/src/views/febs/system/role/Index.vue b/src/views/febs/system/role/Index.vue
@@ -5,10 +5,10 @@
         <div class="app-container">
           <div class="filter-container">
             <el-input v-model="queryParams.roleName" :placeholder="$t('table.role.roleName')" class="filter-item search-item" />
-            <el-button class="filter-item" @click="search">
+            <el-button class="filter-item" type="primary" plain @click="search">
               {{ $t('table.search') }}
             </el-button>
-            <el-button class="filter-item" @click="reset">
+            <el-button class="filter-item" type="warning" plain @click="reset">
               {{ $t('table.reset') }}
             </el-button>
             <el-dropdown v-has-any-permission="['role:add','role:delete','role:export']" trigger="click" class="filter-item">

diff --git a/src/views/febs/system/user/Index.vue b/src/views/febs/system/user/Index.vue
@@ -11,10 +11,10 @@
         class="filter-item search-item date-range-item"
         type="daterange"
       />
-      <el-button class="filter-item" @click="search">
+      <el-button class="filter-item" type="primary" plain @click="search">
         {{ $t('table.search') }}
       </el-button>
-      <el-button class="filter-item" @click="reset">
+      <el-button class="filter-item" type="warning" plain @click="reset">
         {{ $t('table.reset') }}
       </el-button>
       <el-dropdown v-has-any-permission="['user:add','user:delete','user:reset','user:export']" trigger="click" class="filter-item">
@@ -81,7 +81,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('table.user.createTime')" align="center" min-width="180px" sortable="custom">
+      <el-table-column :label="$t('table.user.createTime')" prop="createTime" align="center" min-width="180px" sortable="custom">
         <template slot-scope="scope">
           <span>{{ scope.row.createTime }}</span>
         </template>

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
@@ -171,8 +171,8 @@ export default {
           }).then((r) => {
             const data = r.data
             this.saveLoginData(data)
-            this.$get('auth/user/detail').then((r) => {
-              this.$store.commit('account/setUser', r.data.data)
+            this.$get('auth/user').then((r) => {
+              this.$store.commit('account/setUser', r.data.principal)
               this.$message({
                 message: this.$t('tips.loginSuccess'),
                 type: 'success'