Merge remote-tracking branch 'origin/master'

src/assets/css/xpwyfyy.css

@@ -1229,7 +1229,6 @@ h3 {
 
 .vongi-wordcard-sp .mui-slider .mui-segmented-control.mui-segmented-control-inverted .mui-control-item.mui-active {
 	background: 0;
-	border-bottom: 2px solid #375cf5
 }
 
 .vongi-wordcard-sp .mui-slider .mui-segmented-control.mui-segmented-control-inverted .mui-control-item {

src/projects/business/views/Master/Health/WorkerInfo.vue

@@ -37,7 +37,7 @@
 			<form class="mui-input-group">
 				<div class="mui-input-row">
 					<label style="width:50%">自身健康情况</label>
-					<span v-html="detail.personHealthLedger.healthStatusN"> </span>
+					<span v-html="detail.personHealthLedger.healthStatusN" style="width:50%"> </span>
 				</div>
 				<div class="mui-input-row">
 					<label>今日体温</label>
@@ -51,11 +51,11 @@
 				</div>
 				<div class="mui-input-row">
 					<label style="width:70%">家庭成员身体健康情况</label>
-					<span v-html="detail.personHealthLedger.familyStatusN">健康</span>
+					<span v-html="detail.personHealthLedger.familyStatusN" style="width:30%">健康</span>
 				</div>
 				<div class="mui-input-row">
 					<label style="width:50%">家庭成员健康码</label>
-					<span class="vongi-yddk-dat-photo">
+					<span class="vongi-yddk-dat-photo" style="width:50%">
 						<div class="flew">
 							<div class="mui-col-xs-3" v-for="(code,index) in detail.personHealthLedger.familyGreenCode.split(',')">
 								<img :src="code+ '?x-oss-process=image/resize,m_fill,w_128,h_128'" width="100%" />
@@ -65,11 +65,11 @@
 				</div>
 				<div class="mui-input-row">
 					<label style="width:70%" v-html="detail.personHealthLedger.isGoto?'是':'否'">假期是否曾前往重点疫区</label>
-					<span>否</span>
+					<span style="width:30%">否</span>
 				</div>
 				<div class="mui-input-row">
 					<label style="width:70%" v-html="detail.personHealthLedger.isTouch?'是':'否'">是否接触重点疫区高危人群</label>
-					<span>否</span>
+					<span style="width:30%">否</span>
 				</div>
 			</form>