Merge remote-tracking branch 'origin/master'

src/assets/css/contract.css

@@ -93,9 +93,6 @@
 .div-model .content2{ height: 124px; padding: 10px 15px;}
 .div-model .content3{ height: 94px; padding: 3px 15px 10px 15px;}
 .div-model .content2 .uname{ height: 25px; position: relative; line-height: 25px; font-size: 13px;color:rgba(255,255,255,1); text-align: left; margin-bottom: 6px;} 
-.unamediv{ position: absolute; left: 100px; top: 0px;}
-.unamediv i{ padding: 0 2px; margin-right: 5px;}
-.duline{ height: 30px; line-height: 30px;}
 .fl01{ float: left; width: 24%;}
 .fl02{ float: left; width: 44%; margin-left:1.5%;}
 
@@ -171,5 +168,133 @@
 .qycontent .qytextright span.span03{ color: #fff; font-size: 14px;padding: 0 2px}
 .qycontent .qytextright .spanline{text-decoration: underline}
 
+/*居民就诊分析*/
+.outer{display: flex; width:100%; height:100%;background: #272E52; align-items: center; /* 垂直居中 */justify-content: center; /* 水平居中 */}
+.container{width:100%; max-width:1280px; height: 600px; margin: 0 auto; background:-webkit-linear-gradient(top,#272E52,#171C30);position: relative;}
+.header{ height: 56px; background: #2e375c; margin-bottom: 20px;}
+.con-main{ height: 500px;}
+.naver{ width: 70px; float: left; height: 56px; background: #35406b; text-align: center; padding-top: 20px;}
+.naver img{ width: 16px; height: 16px;}
+.headeright2{ float: right; width: 90.625%; height: 56px;}
+.fytitle{ float: left; width: 140px; color: #fff; font-size: 16px; line-height: 56px; text-align: left;}
+.fyrighter{ float: right; width: 200px; text-align: right; height: 56px; line-height: 56px; background: url('../img/header/icon-main-user.png') no-repeat 0 center; background-size:20px 20px; color: #8891BE; padding-left:26px; text-align: left;}
+.fybutton{ float: right; width: 150px; padding-top: 15px; position: relative;}
+.fybutton .class-btn01{ float: left; color: #fff; border: 0; width: 66px; text-align: center; padding-left: 25px; height: 30px; background:#4A5786 url('../img/header/icon-white-back.png') no-repeat 5px center; background-size: 16px 16px;}
+.fybutton .class-btn02{ float: left; color: #fff; border: 0; width: 66px; text-align: center; padding-left: 25px; height: 30px; background:rgba(43,131,255,1) url('../img/header/icon-white-mainfilter.png') no-repeat 5px center; background-size: 16px 16px;}
+.lefter{ float: left; width: 70px; height: 500px; background: #191e38;}
+.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: 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);}
+.lefter ul li p.clk{ color: #fff; font-size: 14px;}
+.lefter ul li.clk2{ background-color: #34406A; color: #fff;}
+.lefter ul li p.clk2{ color: #fff; font-size: 14px;}
+.lftitle{ height: 57px; line-height: 57px; background: #31385F; text-align: center; color:rgba(255,255,255,1); font-size: 12px;}
+.lfline{ height: 39px; line-height: 39px; color: #A6AED6; text-align: left; padding-left: 8px;}
+.lflineclk{ background:-webkit-linear-gradient(top,#4CBBFF,#2E88FF); line-height: 39px; color: #fff;}
+.fl{ float: left;}
+.fr{ float: right;}
+.unamediv{ position: absolute; left: 100px; top: 0px;}
+.unamediv i{ padding: 0 2px; margin-right: 5px;}
+.duline{ height: 30px; line-height: 30px;}
+.du-01{ float: left; width: 12%; color: #A6AED6; text-align: left;}
+.du-01 em{width: 1px; height: 10px; margin-left: 24px;}
+.du-02{ float: left; width: 36%; padding-right: 5px; color: #fff; text-align: left; height: 30px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
+.du-03{ float: left; width: 39%; color: #fff; text-align: left; height: 30px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
+.ctmodel{ float: left; width: 50%; position: relative; padding-top: 10px;}
+.ctmodel2{ float: left; width: 100%; position: relative; padding-top: 10px;}
+.i04{ height: 12px; width: 2px; color: #2680FF; background: #2680FF; position: absolute; left: 0; top: 14px;}
+.i05{ height: 12px; width: 2px; color: #55FFE8; background: #55FFE8; position: absolute; left: 0; top: 14px;}
+.ctmline{ line-height: 25px; color: #F5565C; font-size: 24px; text-align: left; font-family: DINPro;}
+.ctmline .ctl01{ font-size: 16px;}
+.ctmline .ctl02{ font-size: 12px; color: #5492FF; border: 1px solid #5492FF; margin-right: 5px;text-align: center; padding: 0 1px 0 2px;border-radius: 3px;}
+.ctmline .ctl03{ font-size: 15px; color: #8891BE;}
+.ctmline .ctl04{ font-size: 12px; color: #8891BE; margin-right: 3px;}
+.div-model .title5{ height: 31px; line-height: 31px; text-align: left; padding-left: 10px; font-size: 14px;color:rgba(166,174,214,1);background:rgba(54,67,111,1); border-top-left-radius:3px;border-top-right-radius:3px;border-bottom-right-radius:0;border-bottom-left-radius:0;}
+.div-model .title5 span{ color: #AAB1D2; padding: 3px 8px; border-radius: 3px; border:1px solid rgba(98,109,146,1); margin-right: 10px; font-size: 12px;}
+.div-model .title5 span.clk{ color: #fff; background: #2680FF; border:1px solid #2680FF;}
+.detitle{ width: 100%; text-align: center; line-height: 30px; color: #fff;}
+.detitle span{ font-size: 22px;color: #fff; padding-right: 3px;}
+.ctmodel h3{ color: #AAB1D2; padding-left: 10px; text-align: left; margin-bottom: 10px;}
+
+.fl06{ float: left; width: 18%;}
+.fl07{ float: left; width: 39%; margin-left: 1.5%;}
+.fl08{ float: left; width: 70%;}
+.fl09{ float: left; width: 33.6%; clear: none; padding:10px 1% 0px 1%; height: 336px; position: relative; background: linear-gradient(180deg,#36436f,#36436f 14%,#30385a);}
+.fl10{float: left; width: 80%; margin-left: 2%;}
+.fr02{ float: right; width: 40%;}
+.fr03{ float: right; width: 28.2%;}
+.fl11{ float: left; width: 29.5%}
+.fl12{ float: right; width: 68.6%}
+.clear{ clear: both;}
+.fl13{ float: left; width: 23.8%;}
+.fl14{ float: left; width: 23.8%; margin-left: 1.55%;}
+.fl15{ float: right; width: 23.8%;}
+.fl16{ float: right; width: 64.5%; clear: none; padding:10px 1% 0px 1%; height: 336px; background: linear-gradient(180deg,#36436f,#36436f 14%,#30385a);}
+.fl33{ float: left; width:30%; margin-right:2% ;}
+.fl34{ float: left; width:36%;}
+
+.membertit01{ clear: both; height: 30px; color: #AAB1D2; line-height: 30px; text-align: left; padding-left: 10px; position: relative;}
+.membertit01 i.ii01{ height: 12px; width: 2px; color: #2680FF; background: #2680FF; position: absolute; left: 0; top: 10px;}
+.membertit01 i.ii02{ height: 12px; width: 2px; color: #55FFE8; background: #55FFE8; position: absolute; left: 0; top: 10px;}
+.membertit01 i.ii03{ height: 12px; width: 2px; color: #FF9D3D; background: #FF9D3D; position: absolute; left: 0; top: 10px;}
+.membertit01 i.ii04{ height: 12px; width: 2px; color: #FFC965; background: #FFC965; position: absolute; left: 0; top: 10px;}
+.membertit01 span{ font-size: 20px; color: #fff; line-height: 30px; float: left; display: block; padding: 0 5px; font-family: DINPro;}
+.membertit01 span.span00{ font-size: 12px; color: #AAB1D2; line-height: 30px;padding: 0}
+.membertit01 span.span01{ font-size: 14px; color: #fff; line-height: 30px;padding: 0}
+.membertit01 .mbleft{ float: left; width: 60%;}
+.membertit01 .mbright{ float: left; width: 40%; text-align: right;}
+.membertit01 span.span02{ font-size: 16px; color: #8891BE; line-height: 30px;padding: 0; float: right;}
+.membertit01 span.span03{ font-size: 12px; color: #8891BE; line-height: 30px;padding: 0; float: right;}
+.membertit01 img{ float: right; vertical-align: middle; margin-top: 10px; margin-left: 5px;}
+.membertit01 code{ margin-right: 3px; color: #5492FF; font-size: 12px; border: 1px solid #5492FF; text-align: center; border-radius: 3px; padding:0 1px; float: right; display: inline-block; height: 15px; line-height: 15px; margin-top: 5px;}
+.mbmodel{ float: left; width: 29%; text-align: left; padding-left: 4.33%;}
+.mbmodel h2{ clear: both; padding: 0; margin: 0; font-size: 12px; color: #AAB1D2; line-height: 28px;}
+.mbmodel p{ clear: both; padding: 0; margin: 0; font-size: 20px; color: #fff; font-family: DINPro;}
+.mbmodel p span{ font-size: 12px; padding-left: 3px;}
+.memberline2{ height: 40px; clear: both; text-align: left; padding-top: 5px;}
+.memberline23{ height: 40px; clear: both; text-align: left; padding-top: 5px; margin-bottom: 30px;}
+.memberline2 span{ color: #fff; font-size: 20px;font-family: DINPro;}
+.memberline2 span.mb-00{ color: #fff; font-size: 16px;}
+.memberline2 span.mb-01{ color: #FF5C5C; font-size: 12px; padding: 0 1px; border-radius: 3px; border: 1px solid #FF5C5C; margin-left: 8px; margin-right: 3px;}
+.memberline2 span.mb-02{ color: #8891BE; font-size: 16px;}
+.memberline2 span.mb-03{ color: #8891BE; font-size: 12px;}
+.memberline2 span.mb-04{ color: #5492FF; font-size: 12px; border: 1px solid #5492FF; padding: 0 1px; border-radius: 3px; margin-left: 25px; margin-right: 8px;}
+.mbbing{ position: absolute; right: 10px; bottom: 10px; width: 120px; height: 130px;}
+
+.mbrtitle{ height: 24px; position: relative;}
+.mbrtitle ul{ height: 24px; float: left; width: 196px;}
+.mbrtitle ul li{ height: 24px; line-height: 24px; border-radius: 3px; float: left; width: 60px;border:1px solid rgba(170,177,210,0.4); margin-right: 5px; color: #AAB1D2;font-size: 10px;text-align: center;}
+.mbrtitle ul li.clk{background:rgba(38,128,255,1); color: #fff;border:1px solid rgba(38,128,255,1);}
+.mbtcd{ position: absolute; left: 0; z-index: 999; padding: 0px 10px 10px; top: 30px; width: 500px; height: 270px; background:rgba(23,26,40,0.93);}
+.mbtcd23{ position: absolute; left: 20px; z-index: 999; padding: 0px 10px 10px; top: 30px; width: 450px; height: 160px; padding-top: 0px; background:rgba(23,26,40,0.93);}
+.mbtcd h3{ border-bottom: 1px solid #424966; margin-bottom: 10px; line-height: 30px; color: #fff; font-size: 12px; text-align: left;}
+.mbtcd .mbdline{clear: both; overflow: hidden;}
+.mbdleft{ float: left; color: #A6AED6; width: 70px; line-height: 30px; text-align: left;}
+.mbdleft2{ background: url(../img/common/icon-mainwen.png) no-repeat 100% center; background-size: 16px 16px;}
+.mbdright{ float: left; color: #fff; width: 410px; text-align: left;}
+.mbdright span{ line-height: 30px; margin: 0 5px;}
+.mbdright span.clk{ color: #0097FD;}
+.mbdright2{ float: left; color: #fff; width: 370px; text-align: left;}
+.mbdright2 span{ line-height: 26px; margin: 0 5px 10px 5px;background:rgba(51,62,95,1); display: inline-block;border-radius:4px;border:1px solid rgba(84,97,139,1); padding: 0 10px;}
+.mbdright2 span.clk{ color: #0097FD;background:rgba(33,76,126,1);}
+.mbdlinebtn{ clear: both; height: 50px; text-align: right;}
 
+.mbtcd2{ position: absolute; left: -300px; z-index: 999; padding: 0px 10px 10px; top: 40px; width: 300px; height: 266px; background:rgba(23,26,40,0.93);}
+.mbtcd2 h3{ border-bottom: 1px solid #424966; margin-bottom: 10px; line-height: 30px; color: #fff; font-size: 12px; text-align: left;}
+.mbtcd2 p{ clear: both; line-height: 25px; color: #fff; text-align: left;}
+.mbtcd2 p span{ color: #0097FD;}
 
+.mbrightu{ float: right; width: 60%;}
+.sxdiv{ float:right; width: auto;background:rgba(68,80,125,1);border-radius:3px;height: 24px; line-height: 24px; padding: 0 6px; color: #AAB1D2;}
+.sxdiv span{ color: #42CCFF;}
+.sxbtndiv{background:linear-gradient(90deg,rgba(77,187,255,1) 0%,rgba(43,131,255,1) 100%); margin-left: 10px; float: right; padding: 0 5px; height: 24px; border-radius: 2px; line-height: 24px; color: #fff;font-size: 8px;}
+.mbstatus{ height: 24px; margin: 4px 0; line-height: 24px; font-size: 12px; color: #AAB1D2; text-align: right;}
+.mbstatus i.mb01{ padding: 5px; background: #267fff; display: inline-block; margin-left: 6px;}
+.mbstatus i.mb02{ padding: 5px; background: #2c549c; display: inline-block; margin-left: 6px;}
+.mbstatus i.mb03{ padding: 5px; background: #2f6c95; display: inline-block; margin-left: 6px;}
+.mbstatus i.mb04{ padding: 5px; background: #34e0de; display: inline-block; margin-left: 6px;}
+.mbstatus i.mb05{ padding: 5px; background: #df485c; display: inline-block; margin-left: 6px;}
\ No newline at end of file

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