Merge remote-tracking branch 'origin/master'

src/assets/css/navMenu.css

@@ -3,7 +3,7 @@
 .lefter ul{}
 .lefter ul li{width: 70px; height: 72px; padding-top: 8px; border-bottom: 1px solid #242c4a;-webkit-border-top-right-radius: 4px; }
 .lefter ul li p{ line-height: 35px; color: #596698;}
-.righter{ float: right; width: 88.625%; padding-right: 2%;}
+.righter{ float: right; width: 90.625%; padding-right: 2%;}
 .lefter ul li.er{width: 70px; height: 39px; padding-top: 0; line-height: 39px; border-bottom: 1px solid #242c4a; color: #A6AED6;}
 .lefter ul li.san{width: 70px; height: 39px; padding-top: 0; line-height: 39px; border-bottom: 1px solid #242c4a; color: #A6AED6;}
 .lefter ul li.clk{ background-color: #2E88FF; color: #fff; background:-webkit-linear-gradient(top,#4CBBFF,#2E88FF);}

src/components/common/sideNavbar/MainSideNavbar.vue

 <template>
   <div id="mainSideNavbar">
   <side-navbar>
-    <side-navbar-item  link="/gpHome/gpContract">
+    <side-navbar-item name="1"  link="/gpHome/gpContract">
       <img slot="icon" src="~assets/img/navSide/icon-memu1.png" alt="">
       <img slot="active-icon" src="~assets/img/navSide/icon-memu1-selected.png" alt="">
       <div slot="text">签约管理</div>
     </side-navbar-item>
-    <side-navbar-item link="/gpHome/gpContractExpense">
+    <side-navbar-item name="2" link="/gpHome/gpContractExpense">
       <img slot="icon" src="~assets/img/navSide/icon-memu2.png" alt="">
       <img slot="active-icon" src="~assets/img/navSide/icon-memu2-selected.png" alt="">
       <div slot="text">费用管理</div>
@@ -15,12 +15,12 @@
       <div  @click="navItemClick('/gpHome/gpContractExpense')" :class="qyclass"><i class="el-icon-document-copy"></i> 签约</div>
       <div  @click="navItemClick('/gpHome/gpVisitExpense')" :class="jzclass"><i class="el-icon-document-copy"></i> 就诊</div>
     </div>
-    <side-navbar-item link="/gpHome/gpPerformance">
+    <side-navbar-item name="1" link="/gpHome/gpPerformance">
       <img slot="icon" src="~assets/img/navSide/icon-memu3.png" alt="">
       <img slot="active-icon" src="~assets/img/navSide/icon-memu3-selected.png" alt="">
       <div slot="text">绩效考核</div>
     </side-navbar-item>
-    <side-navbar-item link="/gpHome/gpDefect">
+    <side-navbar-item name="1" link="/gpHome/gpDefect">
       <img slot="icon" src="~assets/img/navSide/icon-memu4.png" alt="">
       <img slot="active-icon" src="~assets/img/navSide/icon-memu4-selected.png" alt="">
       <div slot="text">缺陷管理</div>
@@ -89,17 +89,14 @@
     text-align: center;
     background:linear-gradient(180deg,rgba(30,36,67,1) 0%,rgba(19,24,44,1) 100%)
   }
-	.feeclass {
-    width: 70px;
+	.feeclass{width: 70px;
     height: 39px;
     padding-top: 0;
     line-height: 39px;
     border-bottom: 1px solid #242c4a;
-    color: #A6AED6;
-  }
+    color: #A6AED6;}
 	
-	.feeactive {
-    width: 70px;
+	.feeactive{width: 70px;
     height: 39px;
     padding-top: 0;
     line-height: 39px;

src/components/common/sideNavbar/SideNavbarItem.vue

@@ -21,23 +21,32 @@
       link: {
         type: String,
         required: true
-      }
+      },
+	  name:name
     },
 
     computed: {
       isActive() {
-        if(this.$route.path==='/gpHome/gpContractExpense' || this.$route.path==='/gpHome/gpVisitExpense' ){
-          return false
-        }else{
-          return this.$route.path.indexOf(this.link) !== -1
-        }
+		if(this.$route.path==='/gpHome/gpContractExpense' || this.$route.path==='/gpHome/gpVisitExpense' ){
+			if(this.name==2){
+				return true
+			}else{
+				return false
+			}
+		}else{
+			return this.$route.path.indexOf(this.link) !== -1
+		}
       },
       activeClass() {
         if(this.$route.path==='/gpHome/gpContractExpense' || this.$route.path==='/gpHome/gpVisitExpense' ){
-          return this.isActive ?'activeClass2':{}
-        }else{
-          return this.isActive ? 'activeClass' : {}
-        }
+          if(this.name==2){
+            return 'activeClass2'
+          }else{
+            return {}
+          }
+            }else{
+              return this.isActive ? 'activeClass' : {}
+            }
       },
       activeStyle() {
         return this.isActive ? {'color': '#FFFFFF'} : {}

src/views/gp/patient/MzPatient.vue

@@ -2,7 +2,7 @@
   <div class="outer">
     <section class="container">
 			<section class="header">
-				<div class="nav" @click="goExit"><img src="~assets/img/header/iconmainnav.png"></div>
+				<div class="naver" @click="goExit"><img src="~assets/img/header/iconmainnav.png"></div>
 				<div class="headeright2">
 					<div class="fytitle">居民就诊分析</div>
 					<div class="fybutton">
@@ -1067,8 +1067,11 @@ export default {
 			}
 		},
 		tochange(){
+      console.log(this.$router.push({
+				path: '/zyPatient?sfz='+this.sfz
+			}))
 			this.$router.push({
-				path: './Hospital?sfz='+this.sfz
+				path: '/zyPatient?sfz='+this.sfz
 			});
 		},
 		headerStyle(){
@@ -1155,7 +1158,7 @@ export default {
 			this.$router.push('/'+this.backUrl);
 		},
 		goExit() {
-			this.$router.push('/Home');
+			this.$router.push('/menu');
 		},
 		showLoading() {
 			this.loading = true
@@ -1223,4 +1226,5 @@ export default {
 .spanwai{width: 20px; display: inline-block; text-align: center;height: 20px;}
 .spanpl5{padding-left: 5px;}
 .spanfr{float: right;}
+/deep/.el-button:focus, .el-button:hover{color: #FFFFFF;background-color:#4A5786;}
 </style>

src/views/gp/patient/ZyPatient.vue

@@ -732,7 +732,7 @@ export default {
 		},
 		tochange(){
 			this.$router.push({
-				path: './Member?sfz='+this.sfz
+				path: '/mzPatient?sfz='+this.sfz
 			});
 		},
 		headerStyle(){
@@ -785,7 +785,7 @@ export default {
 			this.$router.push('/'+this.backUrl);
 		},
 		goExit() {
-			this.$router.push('/Home');
+			this.$router.push('/menu');
 		},
 		showLoading() {
 			this.loading = true