Signed-off-by: zhaobao <528046418@qq.com>

src/layout/components/Navbar.vue

@@ -2,8 +2,8 @@
   <div class="navbar">
     <div class="hos-name">
       <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" />
-      <!-- <span v-if="userData.ocName" class="tag">/{{ userData.ocName }}</span> -->
     </div>
     <!-- 隐藏标签 -->
     <breadcrumb v-if="0" id="breadcrumb-container" class="breadcrumb-container" />
@@ -21,15 +21,21 @@
 
       </template>
       <div class="sideMenuTab">
+
         <div
           v-for="(tab,index) in sideMenus"
           :key="'sideMenuTab'+index"
           class="item"
-          :class="sideMenuTabIndex===tab.id?'active-'+sideMenuTabIndex:''"
-          @click="sideTabChange(tab.id,tab)"
+          :class="sideMenuTabIndex===tab.id?'active':''"
         >
-          <i class="iconfont" :class="tab.icon" />
-          <p>{{ tab.name }}</p>
+          <a v-if="tab.href" :href="tab.href" target="_blank" class="item-cont">
+            <img :src="tab.icon" class="icon">
+            <p>{{ tab.name }}</p>
+          </a>
+          <div v-else class="item-cont" @click="sideTabChange(tab.id,tab)">
+            <img :src="tab.icon" class="icon">
+            <p>{{ tab.name }}</p>
+          </div>
         </div>
       </div>
       <div class="right-menu-item" @click="navToPage('/message')">
@@ -81,13 +87,14 @@ export default {
       sideMenuTabIndex: 0,
       sideMenus: [],
       sideMenuTabList: [
-        { name: '数据总览', icon: 'el-icon-s-platform', path: '/', permit: 'hos_overview', id: 0 },
-        { name: '平安医院', icon: 'icon-common_satisfaction', path: '/hos/safe/overview', permit: 'hos_safe', id: 1 },
-        { name: '质量医院', icon: 'icon-common_quality', path: '/hos/quality/overview', permit: 'hos_quality', id: 2 },
-        { name: '满意医院', icon: 'icon-common_safety', path: '/hos/satisfy/overview', permit: 'hos_satisfy', id: 3 },
-        { name: '智慧医院', icon: 'icon-common_wisdom1', path: '/hos/smart/overview', permit: 'hos_smart', id: 4 },
-        { name: '健康医院', icon: 'icon-common_health', path: '/hos/health/overview', permit: 'hos_health', id: 5 },
-        { name: '节约型医院', icon: 'icon-common_saving', path: '/hos/economic/overview', permit: 'hos_economic', id: 6 }
+        { name: '数据总览', icon: require('./nav/icon.png'), path: '/', permit: 'hos_overview', id: 0 },
+        { name: '平安医院', icon: require('./nav/icon-1.png'), path: '/hos/safe/overview', permit: 'hos_safe', id: 1, href: 'http://baidu.com' },
+        { name: '质量医院', icon: require('./nav/icon-2.png'), path: '/hos/quality/overview', permit: 'hos_quality', id: 2 },
+        { name: '满意医院', icon: require('./nav/icon-3.png'), path: '/hos/satisfy/overview', permit: 'hos_satisfy', id: 3 },
+        { name: '智慧医院', icon: require('./nav/icon-4.png'), path: '/hos/smart/overview', permit: 'hos_smart', id: 4 },
+        { name: '健康医院', icon: require('./nav/icon-5.png'), path: '/hos/health/overview', permit: 'hos_health', id: 5 },
+        { name: '节约型医院', icon: require('./nav/icon-6.png'), path: '/hos/economic/overview', permit: 'hos_economic', id: 6 },
+        { name: '系统管理', icon: require('./nav/icon-7.png'), path: '/hos/profile', permit: 'hos_economic', id: 7 }
       ]
     }
   },
@@ -180,7 +187,7 @@ export default {
   overflow: hidden;
   background: unset;
   box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
-  border-bottom: 1px solid #457486;
+  border-bottom: 1px solid #0f3a4a;
   position: fixed;
   width: 100%;
   z-index: 999;
@@ -188,6 +195,9 @@ export default {
   box-sizing: border-box;
   background-color: inherit;
   top: 0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 .hos-name{
   height: 100%;
   display: flex;
@@ -195,18 +205,18 @@ export default {
   float: left;
   padding-left: 10px;
   color: #fff;
-  flex: 1;
+  // flex: 1;
   img{
       display: block;
       width: auto;
-      height: 32px;
+      height: 36px;
   }
   .tag{
     font-size: 16px;
     line-height: 16px;
     font-weight: 600;
     padding-left: 10px;
-    margin-top: 10px;
+    margin-top: 15px;
   }
 }
   .hamburger-container {
@@ -236,12 +246,13 @@ export default {
   }
 
   .right-menu {
-    float: right;
+    // float: right;
     height: 100%;
     line-height: var(--navHeight);
     display: flex;
-    justify-content: flex-start;
+    justify-content: flex-end;
     align-items: center;
+    flex: 1;
     &:focus {
       outline: none;
     }
@@ -288,28 +299,44 @@ export default {
       }
     }
     .sideMenuTab{
+        overflow-x: auto;
         height: 100%;
         display: flex;
         justify-content: flex-start;
+        align-items: center;
         padding-right: 50px;
       .item{
-        height: 100%;
         display: flex;
         justify-content: center;
         align-items: center;
-        flex-direction: column;
-        color: #fff;
-        line-height: 1;
-        padding: 0 15px;
+        color: rgba(255, 255, 255, 0.7);
         cursor: pointer;
         transition: 0.2s;
-        &.active-0{color: #1890ff;font-weight: 600;}
-        &.active-1{color: #b97741;font-weight: 600;}
-        &.active-2{color: #97cd38;font-weight: 600;}
-        &.active-3{color: #dc5a2c;font-weight: 600;}
-        &.active-4{color: #414ab9;font-weight: 600;}
-        &.active-5{color: #c13ac9;font-weight: 600;}
-        &.active-6{color: #29c761;font-weight: 600;}
+        flex-shrink: 0;
+        height: 40px;
+        line-height: 40px;
+        border-radius: 20px;
+        .item-cont{
+          display: block;
+          height: 100%;
+          padding: 0 14px 0 8px;
+          border-radius: 20px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+        &.active{
+          background: rgba(24, 144, 255, 0.9);
+          p{
+            font-weight: 700;
+            color: #fff;
+          }
+        }
+        .icon{
+          display: block;
+          width: 24px;
+          height: 24px;
+        }
         .iconfont{
           font-size: 30px;
           &.el-icon-s-platform{
@@ -321,9 +348,8 @@ export default {
         }
         p{
           padding: 0;
-          margin: 5px 0 0 0;
-          font-size: 12px;
-          color: #fff;
+          font-size: 14px;
+          color: rgba(255, 255, 255, 0.7);
         }
       }
     }

src/layout/index.vue

@@ -48,7 +48,7 @@ export default {
         openSidebar: this.sidebar.opened,
         withoutAnimation: this.sidebar.withoutAnimation,
         mobile: this.device === 'mobile',
-        withoutMenu: this.permission_routes.filter(item => !item.hidden).length <= 1
+        withoutMenu: (this.permission_routes.filter(item => !item.hidden) < 1) && (this.permission_routes.filter(item => !item.hidden)[0].children < 1)
       }
     }
   },

src/router/modules/hos.js

@@ -171,7 +171,7 @@ const hosRouter = [
     component: Layout,
     redirect: '/hos/profile',
     name: 'hos_setting',
-    groupId: [0],
+    groupId: [7],
     meta: {
       title: '系统配置',
       icon: 'icon-common_digitization',

src/settings.js

@@ -38,8 +38,8 @@ module.exports = {
   */
   serverUrl: 'http://1.15.92.205:8080/', // 正式环境
   // serverUrl: 'http://114.116.19.14:8080/', // 正式环境
-  // devServerUrl: 'http://1.15.92.205:8080/', // 开发环境
-  devServerUrl: 'http://192.168.3.253:8001/', // 开发环境
+  devServerUrl: 'http://1.15.92.205:8001/', // 开发环境
+  // devServerUrl: 'http://192.168.3.253:8001/', // 开发环境
   /**
   * websocket 地址
   * dev 开发环境

src/views/hos/profile/index.vue

@@ -92,6 +92,7 @@ export default {
       getHosProfile().then((resp) => {
         const { code, msg, data } = resp
         if (code === 200) {
+          if (!data) return
           this.viewData = data
           this.mapCenter = [data.hosWzjd, data.hosWzwd]
         } else {

src/views/login/index.vue

@@ -1,12 +1,13 @@
 <template>
   <div class="login-container">
     <div class="title-container">
-      <h3 class="title"><el-image class="logo" :src="logoImage" /></h3>
+      <!-- <h3 class="title"><el-image class="logo" :src="logoImage" /></h3> -->
+      <h3 class="title">合阳人民医院“六院联创” 综合管理平台</h3>
     </div>
     <div class="login-form-wrap">
       <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
         <div class="title-container">
-          <h3 class="form-title">用户登录</h3>
+          <h3 class="form-title">深化“六院联创”建设，推动医院高质量发展</h3>
         </div>
 
         <el-form-item prop="username">
@@ -173,8 +174,8 @@ export default {
 /* 修复input 背景不协调 和光标变色 */
 
 $bg:#283443;
-$light_gray:#fff;
-$cursor: #fff;
+$light_gray:#000;
+$cursor: #86909C;
 
 @supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
   .login-container .el-input input {
@@ -186,7 +187,7 @@ $cursor: #fff;
 .login-container {
   .el-input {
     display: inline-block;
-    height: 47px;
+    height: 37px;
     width: 85%;
     background:none;
     border:none;
@@ -197,7 +198,7 @@ $cursor: #fff;
       border-radius: 0;
       padding: 12px 5px 12px 15px;
       color: $light_gray;
-      height: 47px;
+      height: 37px;
       caret-color: $cursor;
 
       &:-webkit-autofill {
@@ -208,10 +209,12 @@ $cursor: #fff;
   }
 
   .el-form-item {
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    background: rgba(0, 0, 0, 0.1);
+    height: 43px;
+    border: 1px solid #C6C6C6;
+    background: #fff;
     border-radius: 5px;
     color: #454545;
+    margin-bottom: 30px;
   }
 }
 </style>
@@ -225,30 +228,28 @@ $bg: #2d3a4b;
         min-height: 100%;
         width: 100%;
         background-image: url("../../assets/images/login/login_ornament.png");
-        background-size: 910px 870px;
+        background-size:100% 100%;
         background-repeat: no-repeat;
-        background-color: #071A29;
-        background-position:344px 106px;
         overflow: hidden;
         position: relative;
         .login-form-wrap {
             position: absolute;
-            background: rgba(255, 255, 255, .08);
-            right: 10%;
-            top: 30%;
-            padding: 10px;
+            // background: rgba(255, 255, 255, 0.8);
+            right: 98px;
+            top: 223px;
+            border-radius: 16px;
         }
 
         .login-form {
-            width: 367px;
-            height: 319px;
+            width: 420px;
+            height: 437px;
             max-width: 100%;
-            padding: 30px;
+            padding: 40px;
             margin: 0 auto;
             overflow: hidden;
-            background: rgba(255, 255, 255, .08);
-            border-radius: 5px;
-
+            background: rgba(255, 255, 255, 0.8);
+            border-radius: 16px;
+            box-sizing: border-box;
             .icon-image {
                 width: 20px;
                 height: 20px;
@@ -259,18 +260,21 @@ $bg: #2d3a4b;
             .form-title {
                 font-size: 14px;
                 font-weight: bold;
-                color: #FFFFFF;
-                text-align: center;
+                color: #212121;
                 margin-top: 0;
                 margin-bottom: 34px;
+                font-family: Be Vietnam;
+                font-size: 28px;
+                font-weight: 700;
+                line-height: 41px;
+                letter-spacing: 0em;
             }
 
             .tip-text {
                 font-size: 12px;
                 font-weight: bold;
                 color: #7C878E;
-                margin-bottom: 20px;
-
+                margin-bottom: 32px;
                 span {
                     color: #E41111;
                     position: relative;
@@ -309,6 +313,9 @@ $bg: #2d3a4b;
                 margin: 26px auto 40px 43px;
                 text-align: left;
                 font-weight: bold;
+                background-color:rgba(7, 28, 43, 0.03);
+                box-shadow: 0px 4px 16px 0px rgba(0, 0, 0, 0.1);
+                display: inline-block;
             }
         }