up

src/components/Hamburger/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div @click="toggleClick">
-    <i :class="[isActive ? 'el-icon-s-fold':'el-icon-s-unfold']" class="hamburger" />
+    <i :class="[isActive ? 'el-icon-s-fold':'el-icon-s-unfold']" class="hamburger" title="打开/关闭左边导航栏" />
   </div>
 </template>
 

src/components/ImageGrid/index.vue

@@ -68,18 +68,19 @@ export default {
 
 <style lang="scss" scoped>
     .grid-item {
-      padding-top: 10px;
+      padding-top: 5px;
       text-align: center;
       cursor: pointer;
       display: block;
 
       .title {
-        font-size: 16px;
-        font-weight: bold;
+        font-size: 14px;
+        font-weight: 400;
         color: #FFFFFF;
         background: linear-gradient(0deg, #FFFFFF 0%, #98A8B7 100%);
         -webkit-background-clip: text;
         -webkit-text-fill-color: transparent;
+        padding-bottom: 10px;
       }
 
       .el-image {

src/layout/components/Navbar.vue

@@ -1,9 +1,12 @@
 <template>
   <div class="navbar">
     <div class="hos-name">
-      <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
       <img :src="logo" alt="logo">
+
       <span v-if="userData.ocName" class="tag">{{ userData.ocName }}</span>
+
+      <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+
       <countdown v-if="userData.licExpiredTime" :end-time="userData.licExpiredTime">
         <div
           slot="process"
@@ -13,8 +16,10 @@
         <div slot="finish" class="tag authorization error">(请续费使用)</div>
       </countdown>
     </div>
+
     <!-- 隐藏标签 -->
     <breadcrumb v-if="0" id="breadcrumb-container" class="breadcrumb-container" />
+
     <div class="right-menu">
       <template v-if="device!=='mobile'">
         <search v-if="false" id="header-search" class="right-menu-item" />
@@ -28,8 +33,8 @@
         </el-tooltip>
 
       </template>
-      <div class="sideMenuTab">
 
+      <div class="sideMenuTab">
         <div
           v-for="(tab,index) in sideMenus"
           :key="'sideMenuTab'+index"
@@ -80,7 +85,9 @@ import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
 import { getUnReadCounter } from '@/api/system/msgApi'
+import { isNotNull } from '@/utils'
 export default {
+  name: 'Navbar',
   components: {
     Breadcrumb,
     Hamburger,
@@ -126,7 +133,7 @@ export default {
   mounted() {
     this.getUnReadMsg()
     this.initSideMenu()
-    this.initsideTab()
+    this.initSideTab()
   },
   methods: {
     getUnReadMsg() {
@@ -140,9 +147,9 @@ export default {
       sideMenuTabList = sideMenuTabList.filter(item => permits.includes(item.permit))
       this.sideMenus = sideMenuTabList
     },
-    initsideTab() {
+    initSideTab() {
       let index = 0
-      if (this.isNotNull(localStorage.getItem('tabIndex'))) {
+      if (isNotNull(localStorage.getItem('tabIndex'))) {
         index = parseFloat(localStorage.getItem('tabIndex'))
       }
       this.sideTabChange(index, {
@@ -181,10 +188,6 @@ export default {
         return item
       })
       this.$store.state.permission.routes = filterRoutes
-    },
-    isNotNull(value) {
-      if (value !== undefined && value !== 'undefined' && value !== null && value !== '') return true
-      return false
     }
   }
 }
@@ -207,39 +210,40 @@ export default {
   display: flex;
   justify-content: space-between;
   align-items: center;
-.hos-name{
-  height: 100%;
-  display: flex;
-  align-items: center;
-  float: left;
-  padding-left: 10px;
-  color: #fff;
-  // flex: 1;
-  img{
-      display: block;
-      width: auto;
-      height: 32px;
-  }
-  .tag{
-    font-size: 16px;
-    line-height: 1;
-    font-weight: 600;
-    padding-left: 5px;
-    margin-top: 15px;
-    &.authorization{
-      font-size: 12px;
-      margin-top: 20px;
-      color: #a33e3e;
-      // color: rgba(255, 255, 255, 0.7);
+
+  .hos-name{
+    height: 100%;
+    display: flex;
+    align-items: center;
+    float: left;
+    padding-left: 10px;
+    color: #fff;
+    // flex: 1;
+    img{
+        display: block;
+        width: auto;
+        height: 26px;
+    }
+    .tag{
+      font-size: 16px;
+      line-height: 1;
+      font-weight: 300;
+      padding-left: 15px;
+      margin-top: 7px;
+      &.authorization{
+        font-size: 12px;
+        margin-top: 20px;
+        color: #a33e3e;
+        // color: rgba(255, 255, 255, 0.7);
+      }
     }
-  }
 }
   .hamburger-container {
-    padding: 3px 6px;
+    padding: 6px 6px;
     margin-left: 5px;
     line-height: var(--navHeight);
     height: 100%;
-    font-size: 16px;
+    font-size: 14px;
     float: left;
     color: rgb(219, 204, 204) !important;
     cursor: pointer;

src/utils/index.js

@@ -780,3 +780,8 @@ export function ocAccess(i) {
   ]
   return strs[i]
 }
+
+export function isNotNull(value) {
+  if (value !== undefined && value !== 'undefined' && value !== null && value !== '') return true
+  return false
+}

src/views/hos/overview/index.vue

@@ -11,6 +11,7 @@
           <span class="tip">总评分</span>
         </div>
       </el-col>
+
       <el-col :xl="7" :md="7" :sm="5" :xs="12">
         <h3 class="page-title">
           <el-select v-model="year" placeholder="请选择" class="el-select-text" @change="getData">
@@ -25,6 +26,7 @@
         </h3>
         <FullYearChart :keys="yearScoreKeys" :values="yearScoreValues" @change="changeFullYearChart" />
       </el-col>
+
       <el-col :xl="13" :md="13" :sm="16" :xs="24" style="margin-top: 15px;">
         <el-row v-if="scoreList&&scoreList.length>0">
           <el-col v-for="(item, index) in scoreList" :key="index" :span="24/scoreList.length">
@@ -46,11 +48,13 @@
           </vuescroll>
         </div>
       </el-col>
+
       <el-col :span="7">
         <div>
           <art-panel more="/hos/plan/index" height="calc(100vh - 270px)" title="工作计划" :art-cat-list="planArtCatList" />
         </div>
       </el-col>
+
       <el-col :span="7">
         <div>
           <art-panel more="/hos/news/index" height="calc(100vh - 270px)" title="工作动态" :art-cat-list="newsArtCatList" />
@@ -196,7 +200,6 @@ export default {
           this.yearScore = data.yearScore
           this.showStoryScore(this.storyScore)
           this.showYearScore(this.yearScore)
-          this.$refs['ScoreChart'].draw(data.hosScore)
         } else {
           this.$message.error(msg)
         }
@@ -289,7 +292,7 @@ export default {
   color: #FFF;
 
   .page-title {
-    margin: 15px 0 10px;
+    margin: 15px 0 0 10px;
     font-size: 18px;
     font-weight: bold;
     color: #fff;

src/views/login/index.vue

@@ -259,12 +259,9 @@ $bg: #2d3a4b;
             }
 
             .form-title {
-                font-size: 14px;
-                font-weight: bold;
                 color: #212121;
                 margin-top: 0;
                 margin-bottom: 34px;
-                font-family: Be Vietnam;
                 font-size: 28px;
                 font-weight: 700;
                 line-height: 41px;