up

src/layout/components/Navbar.vue

@@ -162,8 +162,8 @@ export default {
     // 渲染导航
     initSideTab() {
       let id = this.sideMenuTabId
-      if (isNotNull(localStorage.getItem('csat_tabId'))) {
-        id = parseFloat(localStorage.getItem('csat_tabId'))
+      if (isNotNull(localStorage.getItem('hhpt_tabId'))) {
+        id = parseFloat(localStorage.getItem('hhpt_tabId'))
       }
       const path = this.sideMenuTabList.filter(item => item.id === id)[0].path
       this.sideTabChange(id, {

src/router/index.js

@@ -8,7 +8,7 @@ Vue.use(Router)
 import systemRouter from './modules/system'
 
 // 医院管理员
-import csatRouter from './modules/csat'
+import hhptRouter from './modules/hhpt'
 
 export const constantRoutes = [
   {
@@ -63,7 +63,7 @@ export const constantRoutes = [
  */
 export const asyncRoutes = [
   ...systemRouter,
-  ...csatRouter,
+  ...hhptRouter,
   { path: '*', redirect: '/404', hidden: true }
 ]
 

src/router/modules/csat.js → src/router/modules/hhpt.js

@@ -231,22 +231,10 @@ const csatRouter = [
         meta: { title: '清单管理', noCache: true, permit: 'hos_checklist' }
       },
       {
-        path: 'doctor',
-        component: () => import('@/views/hos/doctor/index'),
-        name: 'hos_doctor',
-        meta: { title: '医生管理', noCache: true, permit: 'hos_doctor' }
-      },
-      {
         path: 'grid',
         component: () => import('@/views/system/grid'),
         name: 'hos_grid',
         meta: { title: '网格管理', noCache: true, permit: 'hos_grid' }
-      },
-      {
-        path: 'map',
-        component: () => import('@/views/system/map/index'),
-        name: 'hos_map',
-        meta: { title: '地图配置', noCache: true, permit: 'hos_map' }
       }
     ]
   },

src/settings.js

@@ -24,7 +24,7 @@ module.exports = {
    * @description Whether show the logo in sidebar
    */
   sidebarLogo: true,
-
+  openeds: true,
   /**
    * @type {string | array} 'production' | ['production', 'development']
    * @description Need show err logs component.

src/styles/element-ui-reset/el-card.scss

@@ -7,14 +7,14 @@
     box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
     color: #fff
 }
-  
+
 .el-card__header {
-    padding: 18px 20px;
+    padding: 5px 20px;
     border-bottom: 1px solid rgba(255, 255, 255, 0.1);
     -webkit-box-sizing: border-box;
     box-sizing: border-box
   }
-  
+
 .el-card__body {
-    padding: 20px 
+    padding: 10px 10px 0 10px
 }

src/styles/element-ui-reset/el-switch.scss

@@ -1,3 +1,36 @@
+.el-switch {
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  position: relative;
+  font-size: 12px;
+  line-height: 20px;
+  height: 20px;
+  vertical-align: middle;
+}
+
+.el-switch__label * {
+  line-height: 1;
+  font-size: 12px;
+  display: inline-block;
+}
+
 .el-switch__label,.el-switch__label--left{
   color: #FFF;
+  font-size: 12px;
+}
+
+.el-switch__core {
+  width: 30px !important;
+  height: 16px;
+}
+.el-switch__core::after {
+  width: 14px;
+  height: 14px;
+  margin-top: -1px;
+}
+.el-switch.is-checked .el-switch__core::after{
+  margin-left: -15px;
 }

src/styles/element-ui-reset/el-tree.scss

@@ -5,8 +5,8 @@
 
   .el-tree-node  > .el-tree-node__content,.el-tree-node__content{
     background-color: inherit;
-    height: 40px;
-    line-height: 40px;
+    height: 30px;
+    line-height: 30px;
   }
 
   .el-tree-node.is-current > .el-tree-node__content,.el-tree-node__content:hover {
@@ -25,7 +25,7 @@
     &.node-checked {
       position: relative;
       color: #08A6DC;
-  
+
       &::after {
         position: absolute;
         content: "";
@@ -39,14 +39,14 @@
         transform: rotate(270deg);
       }
     }
-  }     
+  }
 }
 .custom-theme .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
   background-color: #003E51;
-} 
+}
 .el-tree .is-checked>.el-tree-node__content{
   color: #08A6DC;
-} 
+}
 .custom-theme {
    .el-tree{
     &::v-deep .el-tree-node__content:hover {

src/styles/element-ui.scss

@@ -35,7 +35,7 @@
 
 .fixed-width {
   .el-button--mini {
-    padding: 7px 10px;
+    padding: 7px 7px;
     min-width: 60px;
   }
 }

src/styles/sidebar.scss

@@ -1,5 +1,5 @@
 #app {
-  --navHeight:65px;
+  --navHeight:75px;
   .main-container {
     // min-height: 100%;
     transition: margin-left .28s;

src/views/hos/assess/index.vue

@@ -23,7 +23,7 @@ export default {
   data() {
     return {
       title: '健康医院成果评价',
-      storyId: 3
+      storyId: 5
     }
   },
   computed: {

src/views/hos/data/index.vue

@@ -20,8 +20,8 @@ export default {
   components: { LeftChecklist, RecordList },
   data() {
     return {
-      title: '',
-      checklistCatId: 3,
+      title: '健康医院数据',
+      checklistCatId: 5,
       checklistId: ''
     }
   },

src/views/hos/doc/index.vue

@@ -14,7 +14,7 @@ export default {
   props: {},
   data() {
     return {
-      dirId: 3
+      dirId: 5
     }
   },
   computed: {

src/views/hos/instruction/index.vue

@@ -19,7 +19,7 @@ export default {
   components: { ArtDetail, ArtList },
   data() {
     return {
-      artCatId: 31,
+      artCatId: 51,
       title: '健康医院-实施计划'
     }
   },

src/views/hos/news/index.vue

@@ -14,7 +14,7 @@ export default {
   props: {},
   data() {
     return {
-      artCatId: 32
+      artCatId: 52
     }
   },
   computed: {

src/views/hos/overview/index.vue

@@ -117,7 +117,7 @@ export default {
       yearList: [],
       year: 2022,
       month: 10,
-      storyId: 3,
+      storyId: 5,
       score: 0,
       yearScore: [],
       yearScoreKeys: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],

src/views/hos/report/index.vue

@@ -21,7 +21,7 @@ export default {
     ])
   },
   mounted() {
-    this.selectStory(3, '健康医院')
+    this.selectStory(5, '健康医院')
   },
   methods: {
     selectStory(storyId, storyTitle) {

src/views/system/group/group/GroupTree.vue

@@ -156,11 +156,11 @@ export default {
 
     .title-bar {
       position: relative;
-      height: 40px;
+      height: 30px;
       font-size: 18px;
       color: #fff;
       font-weight: bold;
-      line-height: 40px;
+      line-height: 30px;
       text-indent: 15px;
       background: #113849;
       margin-bottom: 0;

src/views/system/industry/type/industryType.vue

@@ -1,144 +0,0 @@
-<template>
-  <el-dialog
-    :title="title"
-    :visible.sync="dialogVisible"
-    width="30%"
-  >
-    <div class="content-container">
-      <el-form ref="ruleForm" :model="formData" :rules="rules" label-width="100px">
-
-        <el-form-item label="类别名称">
-          <el-input v-model="formData.industryTypeTitle" placeholder="输入行业类型名称" />
-        </el-form-item>
-
-        <el-form-item label="说明" prop="positionDesc">
-          <el-input v-model="formData.industryTypeDesc" type="textarea" placeholder="输入说明" />
-        </el-form-item>
-      </el-form>
-    </div>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="submitForm('ruleForm')">确 定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { ACTION_ADD, ACTION_UPDATE } from '@/utils/actionType'
-import { getIndustryTypeById, createIndustryType, updateIndustryType } from '@/api/system/industryTypeApi'
-
-export default {
-  props: {
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-
-  data() {
-    return {
-      dialogVisible: false,
-      actionType: '',
-      formData: {
-        industryTypeId: undefined,
-        industryTypeTitle: '',
-        industryTypeDesc: ''
-      },
-      rules: {
-        industryTypeTitle: [
-          { required: true, message: '请填写名称', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-
-  methods: {
-    formSuccess() {
-      this.$emit('formSuccess')
-    },
-
-    // Show Add Model
-    showAddModel() {
-      this.actionType = ACTION_ADD
-      this.resetFormData()
-      this.dialogVisible = true
-    },
-
-    // Show Edit Model
-    showEditModel(industryId) {
-      this.actionType = ACTION_UPDATE
-      this.resetFormData()
-      this.dialogVisible = true
-      getIndustryTypeById(industryId).then((resp) => {
-        const { code, data } = resp
-        if (code === 200) {
-          this.formData = data
-        }
-      }).catch((error) => {
-        console.log(error)
-      })
-    },
-
-    // Reset Form Data
-    resetFormData() {
-      this.formData = {
-        industryTypeId: undefined,
-        industryTypeTitle: '',
-        industryTypeDesc: ''
-      }
-    },
-
-    // Submit
-    submitForm(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          this.handleActionCommand()
-        } else {
-          console.log('error submit!!')
-          return false
-        }
-      })
-    },
-
-    // Handle ACTION Command
-    handleActionCommand() {
-      const actionType = this.actionType
-      switch (actionType) {
-        case ACTION_ADD:
-          createIndustryType(this.formData).then((resp) => {
-            const { code, msg } = resp
-            if (code === 200) {
-              this.$message.success(msg)
-              this.dialogVisible = false
-              this.formSuccess()
-            } else {
-              this.$message.error(msg)
-            }
-          }).catch((error) => {
-            console.log(error)
-          })
-          break
-
-        case ACTION_UPDATE:
-          updateIndustryType(this.formData).then((resp) => {
-            const { code, msg } = resp
-            if (code === 200) {
-              this.dialogVisible = false
-              this.formSuccess()
-              this.$message.success(msg)
-            } else {
-              this.$message.error(msg)
-            }
-          }).catch((error) => {
-            console.log(error)
-          })
-          break
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>

src/views/system/profile/userProfile.vue

@@ -14,7 +14,8 @@
 
             <div class="box-center">
               <div class="user-name text-center">
-                <i class="el-icon-user" /> {{ viewData.accountName }} [{{ viewData.accountStaffNo }}]
+                <i class="el-icon-user" /> {{ viewData.accountName }}
+                <span v-if="viewData.accountStaffNo">[{{ viewData.accountStaffNo }}]</span>
               </div>
               <div class="user-phone text-center text-muted">
                 <i class="el-icon-mobile-phone" /> {{ viewData.accountPhone }}