Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-application

app/recover/css/new_recover.css

@@ -1,5 +1,6 @@
body {
	font-family: "microsoft yahei";
	color: #333;
}
#app {
	min-width: 1024px;

app/recover/css/personal-manage.css

@@ -3,8 +3,8 @@
.w350 {width: 350px;}
.w-100-350 {width: calc(100% - 351px);}
.c-orange {color: orange;}
.bgc-orange {background-color: orange;}
.bgc-c1c1c1 {background-color: #c1c1c1;}
.bgc-orange {background-color: #ff9526;}
.bgc-c1c1c1 {background-color: #ebebf5;}
.lh22 {height: 22px; line-height: 22px;}
.b-r-11 {border-radius: 11px;}
.w30 {width: 30px;}

app/recover/html/new_recover.html

@@ -108,7 +108,7 @@
		        							<div class="m0 p0 lh18 clearfix">
        										<span class="fl c-999">计划时间：</span>
        										<p class="fl lh18 mb5 mr20 clearfix" v-for="(time, ind) in detail.specialistServiceItemDO.executeTime" :key="ind" v-if="detail.specialistServiceItemDO.executeTime.length">
        											<span class="fl">{{time}}</span><span class="fl ml5 sub-tap cur-pit" @click="spliceTimeArr(index, ind)"></span>
        											<span class="fl">{{time}}</span><span class="fl ml5 c-red cur-pit" @click="spliceTimeArr(index, ind)">删除</span>
        										</p>
        										<span class="fl c-12b7f5 cur-pit calendar" contenteditable="true" readonly @mousedown="selectTime(index)" class=flatpickr data-enable-time=true data-time_24hr=true>添加</span>
        										<span class="fl c-12b7f5 cur-pit ml10" v-show="sureIndex == index">确定</span>

app/recover/html/personal-manage.html

@@ -84,7 +84,7 @@
	        		<div class="plr5">
		        		<h4 class="m0 pl15 lh40 c-border-b c-position-r clearfix"><em class="c-position-a set-blue-span"></em>康复计划<span class="fr w80 c-333 c-f12 c-t-center">进行中：{{recoverPatInfo.planUnderway}}</span><span class="fr w80 c-333 c-f12 c-t-center">已完成：{{recoverPatInfo.planFinish}}</span></h4>
		        		<div class="pb10" style="overflow: hidden; height: 230px;">
			    			<ul class="p0 m0 c-h100" style="overflow: auto;">
			    			<ul class="p0 plr5 m0 c-h100" style="overflow: auto;">
			    				<li class="clearfix plr5 ptb10 mt10 plan-li cur-pit c-border b-r-3" v-for="(plan, index) in recoverPatInfo.planList" :key="index" @click="jumpPlan(plan)">
			    					<div class="fl w300">
			    						<p class="p0 m0 lh22 clearfix">

app/recover/html/select-disease.html

@@ -12,7 +12,7 @@
	<div id="app" class="c-t-center" style="height: 100%;" v-cloak>
		<div style="overflow: hidden; height: calc(100% - 60px);">
			<ul class="disease-list c-h100 p0 m0 pl20 pr10 clearfix" style="overflow: auto;">
				<li class="fl mr10 plr20 ptb5 c-border b-r-3 mt20" :class="{'active':index == selectIndex}" v-for="(disease, index) in diseaseArr" :key="index" @click="selectFn(index)">{{disease.diseaseName}}</li>
				<li class="fl mr10 plr20 ptb5 c-border b-r-3 mt20 cur-pit" :class="{'active':index == selectIndex}" v-for="(disease, index) in diseaseArr" :key="index" @click="selectFn(index)">{{disease.diseaseName}}</li>
			</ul>
		</div>
		<div class="ptb20">

app/recover/html/select-patient.html

@@ -29,9 +29,9 @@
			</ul>
			<ul class="label-list p0 m0" style="overflow: auto; height: 100%;" v-if="isLabel">
				<li v-for="(label, index) in labelList" :key="index">
					<h4 class="c-border-b m0 lh40 pl10 pr50 clearfix" @click="selectIndexFn(index, label)" :class="{'active':selectIndex == index}">{{label.labelName}}<span class="fr">{{label.count}}</span></h4>
					<h4 class="c-border-b m0 lh40 pl10 pr50 cur-pit clearfix" @click="selectIndexFn(index, label)" :class="{'active':selectIndex == index}">{{label.labelName}}<span class="fr">{{label.count}}</span></h4>
					<ul class="pat-list p0 m0 c-border-b" v-if="selectIndex == index">
						<li class="clearfix lh40 plr20 ptb10" v-for="(pati, ind) in patiList" @click="getPatientInfo(pati)">
						<li class="clearfix lh40 plr20 ptb10 cur-pit" v-for="(pati, ind) in patiList" @click="getPatientInfo(pati)">
							<div class="fl set-img">
								<img :src="setPatImg(pati.photo)" alt="居民头像" />
							</div>

app/rehabilitation/css/health_control.css

@@ -10,12 +10,12 @@ body {
}
.data {
    min-width: 1280px;
    /* min-width: 1235px; */
  
}
.nav {
    min-width: 1265px;
    /* min-width: 1235px; */
}
@@ -119,7 +119,9 @@ li {
    width: 160px;
    height: 28px;
}
.c-blocks-3{
    min-width: 1440px;
}
.neirongrigh {
    margin: 10px;
    margin-left: 0px;
@@ -433,9 +435,6 @@ select.form-control {
     border-radius: 10px;
}
.c-blocks-3 {
    min-width: 1235px;
}
.nodata {
    text-align: center;

app/temporary/css/userInfo.css

@@ -44,6 +44,9 @@
	background:#999999;
    border-radius:4px;
}
::-webkit-scrollbar-thumb {
    background: white !important;
}
.label-list::-webkit-scrollbar-corner {
    background:#82AFFF;
}