up

src/layout/components/Navbar.vue

@@ -1,12 +1,17 @@
 <template>
   <div class="navbar">
     <div class="hos-name">
+
+      <!--Logo-->
       <img :src="logo" alt="logo">
 
+      <!--开关左边导航-->
       <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
 
+      <!--单位名称-->
       <span v-if="userData.ocName" class="tag">{{ userData.ocName }}</span>
 
+      <!--消息-->
       <countdown v-if="userData.licExpiredTime" :end-time="userData.licExpiredTime">
         <div
           slot="process"
@@ -16,8 +21,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" />
@@ -31,6 +38,8 @@
         </el-tooltip>
 
       </template>
+
+      <!--上面导航-->
       <div class="sideMenuTab">
         <div
           v-for="(tab,index) in sideMenus"
@@ -43,11 +52,15 @@
           <p>{{ tab.name }}</p>
         </div>
       </div>
+
+      <!--消息-->
       <div class="right-menu-item" @click="navToPage('/message')">
         <el-badge :is-dot="false" class="nav-icon">
           <i class="el-icon-message-solid" />
         </el-badge>
       </div>
+
+      <!--用户-->
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
           <el-avatar v-if="userData" :src="userData.userAvatar" />
@@ -78,6 +91,7 @@ import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
 import { getUnReadCounter } from '@/api/system/msgApi'
 export default {
+  name: 'NavBar',
   components: {
     Breadcrumb,
     Hamburger,
@@ -223,7 +237,7 @@ export default {
     .logo {
       display: block;
       width: auto;
-      height: 42px;
+      height: 48px;
     }
 
     .tag{
@@ -318,10 +332,10 @@ export default {
       }
     }
     .sideMenuTab{
-        height: 100%;
-        display: flex;
-        justify-content: flex-start;
-        padding-right: 50px;
+      height: 100%;
+      display: flex;
+      justify-content: flex-start;
+      padding-right: 50px;
       .item{
         height: 100%;
         display: flex;
@@ -342,7 +356,7 @@ export default {
         &.active-6{color: #29c761;font-weight: 600;}
         &.active-7{color: #f9e871;font-weight: 600;}
         .iconfont{
-          font-size: 30px;
+          font-size: 36px;
           color: inherit;
            &[class^=el-icon-],  &[class*=" el-icon-"]{
                 font-family: "element-icons" !important;
@@ -354,8 +368,8 @@ export default {
         p{
           padding: 0;
           margin: 5px 0 0 0;
-          font-size: 12px;
-          color: #fff;
+          font-size: 14px;
+          color: #ccc;
         }
       }
     }

src/views/hos/components/ArtDetail.vue

@@ -30,6 +30,8 @@
 import Art from '@/views/system/art/components/Art'
 import { getArtById, deleteArtById } from '@/api/system/artApi'
 import AttachList from '@/components/AttachList'
+import { isNotNull } from '@/utils'
+
 export default {
   name: 'ArtDetail',
   components: { Art, AttachList },
@@ -60,6 +62,7 @@ export default {
     }
   },
   methods: {
+    isNotNull,
     loadData(artId, artCatTitle) {
       this.dialogVisible = true
       this.artId = artId
@@ -111,12 +114,6 @@ export default {
           })
         })
       })
-    },
-    isNotNull(val) {
-      if (val !== undefined && val !== '' && val !== 'undefined' && val !== ' ' && val !== null) {
-        return true
-      }
-      return false
     }
   }
 }
@@ -127,7 +124,7 @@ export default {
   margin: 10px 10px 10px 10px;
   padding: 15px;
   background-color: #193142FF;
-  height: calc(100vh - 88px);
+  height: calc(100vh - 95px);
   .header{
     display: flex;
     justify-content: space-between;

src/views/hos/components/ArtList.vue

@@ -102,7 +102,7 @@ export default {
 <style lang="scss" scoped>
 .content-container {
   margin: 10px 0 10px 10px;
-  height: calc(100vh - 90px);
+  height: calc(100vh - 95px);
 
   .title-bar {
     position: relative;

src/views/hos/components/ArtPanel.vue

@@ -127,6 +127,7 @@ export default {
 <style lang="scss" scoped>
   .ArtPanel-group-box {
     width: calc(100% - 15px);
+    border-top: 4px solid #1F3C51;
     background-color: #0C3242;
     border-radius: 5px 5px 0 0;
     padding: 15px;

src/views/hos/components/AssessList.vue

@@ -7,10 +7,10 @@
           <span>{{ title }}</span>
         </div>
       </el-col>
-      <el-col :span="12">
+      <el-col :span="10">
         <span class="tip">说明：红色未达标，黄色表示未评价。</span>
       </el-col>
-      <el-col :span="6" class="right flex-rt">
+      <el-col :span="8" class="right flex-rt">
         <p class="current-score"> 当月分值: <span> {{ hosScore }} </span>分</p>
         <el-button type="primary" icon="el-icon-document" size="mini" @click="handleExport">导出</el-button>
         <el-button style="margin-left: 10px;" type="primary" icon="el-icon-printer" size="mini" @click="handlePrint">打印</el-button>
@@ -283,9 +283,9 @@ export default {
     handlePrint() {
       let iframe = document.getElementById('print-iframe')
       if (!iframe) {
-        var el = document.querySelector('#print_view')
+        const el = document.querySelector('#print_view')
         iframe = document.createElement('IFRAME')
-        var doc = null
+        let doc = null
         iframe.setAttribute('id', 'print-iframe')
         iframe.setAttribute('style', 'position:absolute;width:0px;height:0px;left:-500px;top:-500px;')
         document.body.appendChild(iframe)
@@ -311,10 +311,10 @@ export default {
 </script>
 <style lang="scss" scoped>
 .content-container {
-  margin: 10px 0 0 10px;
+  margin: 10px 10px 0 10px;
   overflow: hidden;
   background: #193142;
-  height: calc(100vh - 80px);
+  height: calc(100vh - 95px);
 
   p {
     margin: 0;

src/views/hos/components/StoryMonthScore.vue

@@ -129,7 +129,7 @@ export default {
 .content-container {
   background: #193142;
   margin: 10px 0 0 10px;
-  height: calc(100vh - 85px);
+  height: calc(100vh - 95px);
 
   .title-bar {
     height: 40px;
@@ -148,7 +148,7 @@ export default {
   }
 
   .list-group{
-    height: calc(100vh - 140px);
+    height: calc(100vh - 145px);
     background: #193142;
     .list-item{
       height: 40px;

src/views/hos/doctor/components/Doctor.vue

@@ -44,8 +44,8 @@
       </vuescroll>
 
       <div class="btn-group">
-        <el-button type="primary" @click="submitForm('ruleForm')">确 定</el-button>
-        <el-button class="cancel-btn" @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
+        <el-button class="cancel-btn" @click="dialogVisible = false">取消</el-button>
       </div>
     </div>
   </el-drawer>

src/views/hos/doctor/index.vue

@@ -30,6 +30,7 @@
 
         <el-table-column label="姓名" align="center" header-align="center" min-width="120">
           <template v-slot="{row}">
+            <i class="el-icon-user-solid" />
             <span>{{ row.doctorName }}</span>
           </template>
         </el-table-column>
@@ -211,7 +212,7 @@ export default {
 </script>
 <style scoped>
 .content-container {
-  height: calc(100vh - 90px);
+  height: calc(100vh - 95px);
 }
 
 </style>

src/views/hos/overview/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="page-container">
+    <!--统计-->
     <el-row class="top-panel">
       <el-col :span="6">
         <div class="group-box">
@@ -15,6 +16,7 @@
           </div>
         </div>
       </el-col>
+
       <el-col :span="12">
         <div class="group-box">
           <div class="group-title">
@@ -33,25 +35,24 @@
           </div>
         </div>
       </el-col>
+
       <el-col :span="6">
         <div class="group-box">
-          <el-row>
-            <el-col :span="24">
-              <div class="group-title">
-                历年{{ month }}月评分-<span>同比</span>
-              </div>
-              <div class="group-content">
-                <YoYChart :keys="YoYScoreKeys" :values="YoYScoreValues" />
-              </div>
-            </el-col>
-          </el-row>
+          <div class="group-title">
+            历年{{ month }}月评分-<span>同比</span>
+          </div>
+          <div class="group-content">
+            <YoYChart :keys="YoYScoreKeys" :values="YoYScoreValues" />
+          </div>
         </div>
       </el-col>
     </el-row>
+
+    <!--数据块-->
     <el-row>
       <el-col :span="6">
         <div>
-          <TaskPanel more="/hos/satisfy/task/index" height="calc(100vh - 270px)" :task-cat-id="storyId" />
+          <TaskPanel more="/hos/satisfy/task/index" height="calc(100vh - 282px)" :task-cat-id="storyId" />
         </div>
       </el-col>
       <el-col :span="12">
@@ -61,7 +62,7 @@
             <el-link @click="handleMoreAssess()">立即评价</el-link>
           </div>
           <el-row>
-            <vuescroll :ops="ops" style="height: calc(100vh - 338px)">
+            <vuescroll :ops="ops" style="height: calc(100vh - 350px)">
               <ImprovingAdvice :story-id="storyId" />
             </vuescroll>
           </el-row>
@@ -70,7 +71,7 @@
 
       <el-col :span="6">
         <div>
-          <ArtPanel more="/hos/satisfy/news/index" height="calc(100vh - 270px)" />
+          <ArtPanel more="/hos/satisfy/news/index" height="calc(100vh - 282px)" />
         </div>
       </el-col>
     </el-row>
@@ -242,7 +243,8 @@ export default {
 
 <style lang="scss" scoped>
 .page-container {
-  padding: 15px;
+  margin: 0px;
+  padding: 5px 10px;
   color: #FFF;
   position: relative;
 

src/views/hos/panorama/index.vue

@@ -141,7 +141,7 @@
                 <div class="more" @click="handleMoreAssess('/hos/satisfy/statis/grid')">更多</div>
               </div>
               <el-row>
-                <vuescroll :ops="ops" style="height: calc(100vh - 646px)">
+                <vuescroll :ops="ops" style="height: calc(100vh - 658px)">
                   <GroupScoreRank :data="groupDataList" />
                 </vuescroll>
               </el-row>
@@ -154,7 +154,7 @@
                 <div class="more" @click="handleMoreAssess('/hos/satisfy/statis/doctor')">更多</div>
               </div>
               <el-row>
-                <vuescroll :ops="ops" style="height: calc(100vh - 646px)">
+                <vuescroll :ops="ops" style="height: calc(100vh - 658px)">
                   <DoctorScoreRank :data="doctorDataList" />
                 </vuescroll>
               </el-row>
@@ -213,7 +213,7 @@
             </div>
           </div>
         </div>
-        <RecentRecord more="/hos/satisfy/news/index" height="calc(100vh - 330px)" :data="todayOverview.data" />
+        <RecentRecord more="/hos/satisfy/news/index" height="calc(100vh - 340px)" :data="todayOverview.data" />
       </el-col>
     </el-row>
   </div>
@@ -415,7 +415,7 @@ export default {
     },
 
     getMonthScoreKeys(date = (new Date()), unit = '') {
-      var days = []
+      const days = []
       if (typeof (date) === 'string') { // 2022/09
         date = new Date(date)
       }
@@ -430,7 +430,7 @@ export default {
 
     showYearScore(data) {
       if (Array.isArray(data)) return data
-      var arr = []
+      const arr = []
       for (let i = 1; i <= 12; i++) {
         arr.push(data[`m${i}`] ? data[`m${i}`] : 0)
       }

src/views/hos/statis/group/index.vue

@@ -36,8 +36,8 @@
       </div>
 
       <div class="right" style="min-width:400px;flex: 1;">
-        <el-input v-model="conditions.keywords" class="search-input m-right-15" placeholder="请输入内容">
-          <el-button slot="append" icon="el-icon-search" @click="getData()" />
+        <el-input v-model="conditions.keywords" class="search-input m-right-15" size="mini" placeholder="请输入内容">
+          <el-button slot="append" icon="el-icon-search" size="mini" @click="getData()" />
         </el-input>
         <el-button class="filter-item" type="primary" icon="el-icon-document" size="mini" @click="handleExport">导出</el-button>
         <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-printer" size="mini" @click="handlePrint">打印</el-button>

src/views/system/art/components/ArtList.vue

@@ -67,6 +67,7 @@ import { mapGetters } from 'vuex'
 import Art from './Art'
 import artDetail from './ArtDetail'
 export default {
+  name: 'ArtList',
   components: {
     Pagination,
     Art,
@@ -171,7 +172,7 @@ export default {
     .content-container {
         background: #193142FF;
         margin: 10px 10px 10px 10px;
-        height: calc(100vh - 90px);
+        height: calc(100vh - 95px);
 
         .page-title {
           color: #FFF;

src/views/system/checklist/index.vue

@@ -16,10 +16,10 @@
     </el-row>
 
     <el-row class="content-body">
-      <el-table v-loading="listLoading" class="page-table" border :data="dataList" size="mini" height="calc(100vh - 220px)">
+      <el-table v-loading="listLoading" class="page-table" border :data="dataList" size="mini" height="calc(100vh - 218px)">
         <el-table-column type="index" label="序号" header-align="center" align="center" width="80" />
 
-        <el-table-column prop="checklistTitle" label="名称" header-align="left" align="left" width="260">
+        <el-table-column prop="checklistTitle" label="评价清单" header-align="left" align="left" width="260">
           <template v-slot="{row}">
             <span><i class="el-icon-tickets" /> {{ row.checklistTitle }}</span>
           </template>
@@ -39,7 +39,7 @@
 
         <el-table-column prop="issuedAt" label="变更人" header-align="center" align="center" width="200">
           <template v-slot="{row}">
-            <i class="el-icon-user" />
+            <i class="el-icon-user-solid" />
             <span> {{ row.issuedAccountName }}</span>
           </template>
         </el-table-column>

src/views/system/group/user/UserList.vue

@@ -15,7 +15,7 @@
     </el-row>
 
     <el-row class="content-body">
-      <el-table v-loading="listLoading" class="page-table" :data="dataList" size="mini" height="calc(100vh - 240px)">
+      <el-table v-loading="listLoading" class="page-table" :data="dataList" size="mini" height="calc(100vh - 237px)">
         <el-table-column type="index" align="center" label="序号" width="70" />
 
         <el-table-column align="center" header-align="center" label="头像" width="50">
@@ -286,7 +286,7 @@ export default {
 
 <style scoped>
 .content-container {
-  margin: 10px 10px 10px 0 ;
+  margin: 10px 10px 0px 0 ;
 }
 
 </style>

src/views/system/position/index.vue

@@ -10,7 +10,7 @@
         <el-button class="filter-item" type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
       </el-col>
     </el-row>
-    <el-table v-loading="listLoading" class="page-table" border :data="dataList" size="mini" height="calc(100vh - 240px)">
+    <el-table v-loading="listLoading" class="page-table" border :data="dataList" size="mini" height="calc(100vh - 226px)">
       <el-table-column type="index" label="序号" header-align="center" align="center" width="80" />
 
       <el-table-column label="岗位名称" width="200" align="center" header-align="center">

src/views/system/task/components/TaskCounter.vue

@@ -151,7 +151,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .content-container {
-  height: calc(100vh - 90px);
+  height: calc(100vh - 95px);
 
   .btn-group {
     width: 100%;

src/views/system/task/components/TaskList.vue

@@ -7,8 +7,8 @@
         </div>
       </el-col>
       <el-col :span="12" class="right">
-        <el-input v-model="conditions.keywords" class="search-input" placeholder="请输入内容">
-          <el-button slot="append" icon="el-icon-search" @click="getData()" />
+        <el-input v-model="conditions.keywords" class="search-input" size="mini" placeholder="请输入内容">
+          <el-button slot="append" icon="el-icon-search" size="mini" @click="getData()" />
         </el-input>
       </el-col>
     </el-row>
@@ -294,6 +294,6 @@ export default {
 <style lang="scss" scoped>
 .content-container{
   margin: 10px 10px 10px 0;
-  height: calc(100vh - 90px);
+  height: calc(100vh - 95px);
 }
 </style>