调整

.env.development

@@ -2,8 +2,8 @@ NODE_ENV=devlopment
 VUE_APP_NODE_NAME=devlopment
 OUT_PUT_NAME=dev
 VUE_APP_LOCAL_STORAGE_PREFIX=dev
-VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/jp-housekeeper-server/
-VUE_APP_MIRROR_BACKEND_URL=https://mirror.xiaoxinda.com/xpgjapi/
+VUE_APP_BACKEND_URL=http://192.168.33.162:8086/jp-housekeeper-server/
+VUE_APP_MIRROR_BACKEND_URL=http://192.168.33.162:8086/jp-housekeeper-server/
 #小鹏管家微信appid
 VUE_APP_WXAPPID=wx7e70eb62a8459869
 VUE_APP_ALIAPPID=2019032063568906

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

@@ -202,17 +202,16 @@
 			},
             selectIndexOf(){
                 var picker = new mui.PopPicker();
-
                 picker.setData([{
-                    text: "全部（"+this.allCount+"）",
+                    text: "全部（"+this.obj.allPersonNum+"）",
                     value: 0
                 },
                     {
-                        text: "已上报（"+this.obj.total+"）",
+                        text: "已上报（"+this.obj.dkPersonNum+"）",
                         value: 1
                     },
                     {
-                        text: "未上报（"+(this.allCount-this.obj.total)+"）",
+                        text: "未上报（"+(this.obj.allPersonNum-this.obj.dkPersonNum)+"）",
                         value: 2
                     }
                 ]);

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

@@ -40,6 +40,10 @@
 				<h5>健康状态</h5>
 			</div>
 			<form class="mui-input-group">
+				<div class="mui-input-row">
+					<label style="width:50%">健康码颜色</label>
+					<span v-text="detail.personHealthLedger.healthCodeN" style="width:50%"> </span>
+				</div>
 				<div class="mui-input-row">
 					<label style="width:50%">自身健康情况</label>
 					<span v-text="detail.personHealthLedger.healthStatusN" style="width:50%"> </span>
@@ -123,7 +127,8 @@
 				detail: {
 					personHealthLedger: {
 						healthStatusN: null,
-						familyGreenCode: ""
+						familyGreenCode: "",
+						healthCodeN:"",
 					}
 				},
 				isLoading: false,
@@ -154,6 +159,16 @@
 					this.isLoading = false;
 
 					this.detail = response;
+					
+					if(this.detail.personHealthLedger.healthCode){
+						var healthCodeObj={
+							"00":"绿码",
+							"01":"黄码",
+							"10":"红码",
+						}
+						this.detail.personHealthLedger.healthCodeN=healthCodeObj[this.detail.personHealthLedger.healthCode]
+					}
+					
 				}).catch(error => {
 					this.isLoading = false;
 					mui.toast(error);

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

@@ -34,6 +34,22 @@
 				<h5>健康状态</h5>
 			</div>
 			<form class="mui-input-group vongi-editme">
+				
+				
+				<div class="mui-input-row">
+					<label style="width:50%">健康码颜色<i class="colorfe616c" v-if="!curDateIsUpload">*</i></label>
+					<span v-if="curDateIsUpload" style="width:50%" v-text="report.healthCodeN">其他</span>
+				
+					<button class="mui-btn mui-btn-block mui-navigate-right" v-if="!curDateIsUpload" @click="selectHealth" type='button'
+					 style="width:50%">
+						{{report.healthCodeN?report.healthCodeN:'请选择'}}
+					</button>
+					<i style="
+						margin-left: 14px;
+						font-size: 10px;
+					"
+					 v-if="!curDateIsUpload">以湖北健康码的颜色为准</i>
+				</div>
 				<div class="mui-input-row">
 					<label style="width:50%">自身健康情况<i class="colorfe616c" v-if="!curDateIsUpload">*</i></label>
 					<span v-if="curDateIsUpload" style="width:50%" v-text="report.healthStatusN">其他</span>
@@ -200,6 +216,8 @@
 				report: {
                     isJingzhou:null,
                     isProvince:null,
+					healthCode: "",
+					healthCodeN: "请选择",
 					healthStatus: "",
 					healthStatusN: "请选择",
 					vaccinationStatus: "",
@@ -224,6 +242,25 @@
 				max: 37.3,
 				healthStatusList: [],
 					healthStatusListVaccination: [],
+					healthCodeList:[{
+						text: "绿码",
+						value: "00"
+					},
+					{
+						text: "黄码",
+						value: "01"
+					},
+					{
+						text: "红码",
+						value: "10"
+					}
+				],
+				healthCodeObj:{
+					"00":"绿码",
+					"01":"黄码",
+					"10":"红码",
+				}
+				
 			}
 		},
 		created() {
@@ -392,6 +429,16 @@
 					this.report.isGoto = selectItems[0].value;
 				});
 			},
+			selectHealth() {
+				var picker = new mui.PopPicker();
+			
+				picker.setData(this.healthCodeList);
+			
+				picker.show((selectItems) => {
+					this.report.healthCode = selectItems[0].value;
+					this.report.healthCodeN = selectItems[0].text;
+				});
+			},
 			selectTouch() {
 				var picker = new mui.PopPicker();
 
@@ -439,11 +486,13 @@
                     mui.toast("页面加载失败!");
                     return;
                 }
-
-                if (this.report.address=='定位中……'||this.report.address=='无法获取定位') {
-                    mui.alert("定位失败，请检查手机权限后，点击<span class=\"mui-icon mui-icon-location\" style=\"color: #096DD9;font-size: 16px;\"></span>蓝色定位图标重新获取位置信息!");
-                    return;
-                }
+				if (process.env.VUE_APP_NODE_NAME != 'devlopment') {
+					if (this.report.address=='定位中……'||this.report.address=='无法获取定位') {
+					    mui.alert("定位失败，请检查手机权限后，点击<span class=\"mui-icon mui-icon-location\" style=\"color: #096DD9;font-size: 16px;\"></span>蓝色定位图标重新获取位置信息!");
+					    return;
+					}
+				}
+               
 				// if (this.report.healthStatus.length == 0) {
 				// 	mui.toast("请选择自身健康情况!");
 				// 	return;
@@ -453,8 +502,9 @@
 				// 	mui.toast("请选择疫苗接种情况!");
 				// 	return;
 				// }
-				if (!this.report.vaccinationStatusN||this.report.vaccinationStatusN=='请选择') {
-					mui.toast("请选择疫苗接种情况!");
+			
+				if (!this.report.healthCodeN||this.report.healthCodeN=='请选择') {
+					mui.toast("请选择健康码颜色!");
 					return;
 				}
 				// if (this.report.familyStatus.length == 0) {
@@ -465,6 +515,10 @@
                     mui.toast("请选择自身健康情况!");
                     return;
                 }
+				if (!this.report.vaccinationStatusN||this.report.vaccinationStatusN=='请选择') {
+					mui.toast("请选择疫苗接种情况!");
+					return;
+				}
                 if (!this.report.familyStatusN||this.report.familyStatusN=='请选择') {
                     mui.toast("请选择家庭成员身体健康情况!");
                     return;
@@ -523,6 +577,11 @@
 
                             if (response.personHealthLedger != null) {
 								this.report.vaccinationStatusN = response.personHealthLedger.vaccinationStatusN;
+								if(response.personHealthLedger.healthCode){
+									this.report.healthCodeN = this.healthCodeObj[response.personHealthLedger.healthCode];
+								}
+								
+								
                                 this.report.healthStatusN = response.personHealthLedger.healthStatusN;
                                 this.report.healthRemark = response.personHealthLedger.healthRemark;
                                 this.report.familyStatusN = response.personHealthLedger.familyStatusN;
@@ -552,7 +611,11 @@
                                 this.report.familyStatusN = response.personHealthLedger.familyStatusN;
                                 this.report.vaccinationStatusN = response.personHealthLedger.vaccinationStatusN;
                                 this.report.vaccinationStatus = response.personHealthLedger.vaccinationStatus;
-
+							
+								this.report.healthCode = response.personHealthLedger.healthCode;
+								if(response.personHealthLedger.healthCode){
+									this.report.healthCodeN = this.healthCodeObj[response.personHealthLedger.healthCode];
+								}
                                 this.report.healthStatus = response.personHealthLedger.healthStatus;
                                 this.report.familyStatus = response.personHealthLedger.familyStatus;