companyId

src/projects/business/views/HouseKeeper/Control/CompanyList.vue

@@ -7,7 +7,7 @@
 			<ul class="mui-table-view openfyy-list">
 
 				<li class="mui-table-view-cell mui-media"  v-for="(item,index) in companyList" :key="index">
-					<a @click="goto(item.id)" class="mui-navigate-right">
+					<a @click="goto(item.id,item.name)" class="mui-navigate-right">
 						<div class="mui-media-body">
 							{{item.name}}
 							<h4 class='mui-pull-right'><span class="color4fc5f7">{{item.detectedNum}}</span>/<span class="color4fc5f7">{{item.personNum}}</span></h4>
@@ -18,6 +18,8 @@
 			</ul>
 			<h6>已测：<span class="color4fc5f7">{{sumDetectedNum}}</span>  /  应测：<span class="color4fc5f7">{{sumPersonNum}}</span></h6>
 		</div>
+	<loading :visible="isLoading"></loading>
+
 </div>
 </template>
 
@@ -55,11 +57,14 @@
 
 		},
 		methods: {
-			goto(id){
+			goto(id,name){
 
 				this.$router.push({
 					name: 'HouseKeeperControlHealthWorkerTemperature',
-					query: {id:id}
+					query: {
+						companyId:id,
+						companyName:escape(name)
+					}
 				})
 			},
 			//提交

src/projects/business/views/HouseKeeper/Control/Health/AbnormalRecord.vue

@@ -77,6 +77,12 @@
 			}
 		},
 		created() {
+			if(this.$route.query.companyId){
+				this.listForm.companyId  = this.$route.query.companyId;
+			}else{
+				this.listForm.companyId = this.company_data.id;
+			}
+
 			if (this.$route.query.queryDate) {
 				this.listForm.queryDate = this.$route.query.queryDate;
 			} else {
@@ -137,8 +143,10 @@
 			},
 			doRightLink() {
 				this.$router.push({
-					name: 'HouseKeeperAdminHealthNoTemperatureRecord',
-					query: {}
+					name: 'HouseKeeperControlHealthNoTemperatureRecord',
+					query: {
+						companyId:this.listForm.companyId
+					}
 				})
 			},
 			asynCallBack() {

src/projects/business/views/HouseKeeper/Control/Health/AbnormalStatistics.vue

@@ -68,6 +68,8 @@
 				</ul>
 			</div>
 		</div>
+	<loading :visible="isLoading"></loading>
+
 </div>
 </template>
 

src/projects/business/views/HouseKeeper/Control/Health/NoTemperatureRecord.vue

@@ -70,7 +70,12 @@
 			}
 		},
 		created() {
-			this.subForm.companyId = this.company_data.id;
+			if(this.$route.query.companyId){
+				this.subForm.companyId  = this.$route.query.companyId;
+			}else{
+				this.subForm.companyId = this.company_data.id;
+ 			}
+
 			this.subForm.queryDate = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}');
 		},
 		methods: {

src/projects/business/views/HouseKeeper/Control/Health/Worker.vue

@@ -1,86 +1,175 @@
 <template>
 <div>
     <header class="mui-bar mui-bar-nav">
-				<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-				<h1 class="mui-title">详情</h1>
-			</header>
-			<div class="mui-content vongi-qingjiadt">
-				<div class="mui-content-padded">
-					<h5>个人信息</h5>
-				</div>
-				<form class="mui-input-group">
-					<div class="mui-input-row">
-						<label>姓名</label>
-						<span>王后雄</span>
-					</div>
-					<div class="mui-input-row">
-						<label>手机号</label>
-						<span>18600112233</span>
+			<h1 class="mui-title">职工台账</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content fyy-wall vongi-zgtz">
+			<div class="mui-content-padded fyy-date mui-clearfix">
+				<h5>荆鹏软件
+					<a href="" class="mui-navigate-right mui-pull-right">2020-03-19</a>
+				</h5>
+			</div>
+			<div class="vongi-clasadmin">
+				<h4>班级健康码统计</h4>
+				<div class="vongi-clasadmin-list">
+					<div class="vongi-clasadmin-ma mui-col-xs-3">
+						<span class="color55f868">2953</span>
+						<div class="mui-media-body">绿码</div>
 					</div>
-					<div class="mui-input-row">
-						<label>工号</label>
-						<span>0011223</span>
+					<div class="vongi-clasadmin-ma mui-col-xs-3">
+						<span class="colorf8b155">12</span>
+						<div class="mui-media-body">黄码</div>
 					</div>
-					<div class="mui-input-row">
-						<label>学校名称</label>
-						<span>湖北荆鹏软件集团有限公司</span>
+					<div class="vongi-clasadmin-ma mui-col-xs-3">
+						<span class="colorfe616c">0</span>
+						<div class="mui-media-body">红码</div>
 					</div>
-					<div class="mui-input-row">
-						<label>岗位</label>
-						<span>软件工程师</span>
+					<div class="vongi-clasadmin-ma mui-col-xs-3">
+						<span class="color999">23</span>
+						<div class="mui-media-body">灰码</div>
 					</div>
-
-				</form>
-				<div class="mui-content-padded">
-					<h5>健康状态</h5>
 				</div>
-				<form class="mui-input-group">
-					<div class="mui-input-row">
-						<label style="width:50%">自身健康情况</label>
-						<span>其他</span>
-					</div>
-					<div class="mui-input-row">
-						<label>今日体温</label>
-						<span>36.3°C</span>
-					</div>
-					<div class="mui-input-row">
-						<label>其他情况</label>
-						<span>无</span>
+				<div class="vongi-zgtz-search">
+					<div class="mui-input-row mui-search">
+						<input type="search" placeholder="请输入姓名">
 					</div>
-					<div class="mui-input-row">
-						<label style="width:70%">家庭成员身体健康情况</label>
-						<span>健康</span>
+				</div>
+			</div>
+			<div id="slider" class="mui-slider mui-fullscreen">
+				<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
+					<div class="mui-scroll">
+						<a class="mui-control-item mui-active" href="#item1mobile" style="width:30%">
+							全部<span class="mui-badge">3</span>
+						</a>
+						<a class="mui-control-item" href="#item2mobile" style="width:36%">
+							正常记录<span class="mui-badge">2</span>
+						</a>
+						<a class="mui-control-item" href="#item3mobile" style="width:34%">
+							异常记录<span class="mui-badge">1</span>
+						</a>
 					</div>
-					<div class="mui-input-row">
-						<label style="width:50%">家庭成员健康码</label>
-						<span class="vongi-yddk-dat-photo">
-							<div class="flew">
-								<div class="mui-col-xs-3">
-									<img src="~$project/assets/img/zhaop1.jpg" width="100%"/>
-								</div>
-								<div class="mui-col-xs-3">
-									<img src="~$project/assets/img/zhaop1.jpg" width="100%"/>
-								</div>
-								<div class="mui-col-xs-3">
-									<img src="~$project/assets/img/zhaop1.jpg" width="100%"/>
-								</div>
-								<div class="mui-col-xs-3">
-									<img src="~$project/assets/img/zhaop1.jpg" width="100%"/>
-								</div>
-							</div>							
-						</span>
+				</div>
+				<div class="mui-slider-group">
+					<div id="item1mobile" class="mui-slider-item mui-control-content mui-active">
+						<div id="scroll1" class="mui-scroll-wrapper">
+							<div class="mui-scroll vongi-yctj-list">
+								<ul class="mui-table-view mui-table-view-chevron vongi-zgtz">
+									<li class="mui-table-view-cell mui-collapse vongi-archives">
+										<a class="mui-navigate-right" href="#">
+											湖北荆盛贸易有限公司
+											<h4 class='mui-pull-right'><span class="color4fc5f7">1</span>/<span class="color4fc5f7">2</span></h4>
+										</a>
+										<ul class="mui-table-view mui-table-view-chevron">
+											<li class="mui-table-view-cell">
+												<a class="mui-navigate-right" href="#">
+													<div class="mui-pull-left flew-items">
+														<div class="mui-media-object flew"><img src="~$project/assets/img/03.jpg" width="50" /></div>
+														<h4>郭麒麟</h4>
+														<span class="mui-icon iconfont icon-erweima1 color55f868"></span>
+													</div>
+													<div class="mui-pull-right color55f868">已上报</div>
+												</a>
+											</li>
+											<li class="mui-table-view-cell">
+												<a class="mui-navigate-right" href="#">
+													<div class="mui-pull-left flew-items">
+														<div class="mui-media-object flew"><img src="~$project/assets/img/03.jpg" width="50" /></div>
+														<h4>郭麒麟</h4>
+														<span class="mui-icon iconfont icon-erweima1 colorfe616c"></span>
+													</div>
+													<div class="mui-pull-right colorfe616c">未上报</div>
+												</a>
+											</li>
+										</ul>
+									</li>
+									<li class="mui-table-view-cell mui-collapse vongi-archives">
+										<a class="mui-navigate-right" href="#">
+											食堂
+											<h4 class='mui-pull-right'><span class="color4fc5f7">1</span>/<span class="color4fc5f7">2</span></h4>
+										</a>
+										<ul class="mui-table-view mui-table-view-chevron">
+											<li class="mui-table-view-cell">
+												<a class="mui-navigate-right" href="#">
+													<div class="mui-pull-left flew-items">
+														<div class="mui-media-object flew"><img src="~$project/assets/img/03.jpg" width="50" /></div>
+														<h4>郭麒麟</h4>
+														<span class="mui-icon iconfont icon-erweima1 color55f868"></span>
+													</div>
+													<div class="mui-pull-right color55f868">已上报</div>
+												</a>
+											</li>
+											<li class="mui-table-view-cell">
+												<a class="mui-navigate-right" href="#">
+													<div class="mui-pull-left flew-items">
+														<div class="mui-media-object flew"><img src="~$project/assets/img/03.jpg" width="50" /></div>
+														<h4>郭麒麟</h4>
+														<span class="mui-icon iconfont icon-erweima1 colorfe616c"></span>
+													</div>
+													<div class="mui-pull-right colorfe616c">未上报</div>
+												</a>
+											</li>
+										</ul>
+									</li>
+								</ul>
+							</div>
+						</div>
 					</div>
-					<div class="mui-input-row">
-						<label style="width:70%">假期是否曾前往重点疫区</label>
-						<span>否</span>
+					<div id="item2mobile" class="mui-slider-item mui-control-content mui-active">
+						<div id="scroll1" class="mui-scroll-wrapper">
+							<div class="mui-scroll vongi-yctj-list vongi-archives">
+								<ul class="mui-table-view mui-table-view-chevron vongi-zcjlu">
+									<li class="mui-table-view-cell">
+										<a class="mui-navigate-right" href="#">
+											<div class="mui-pull-left flew-items">
+												<div class="mui-media-object flew"><img src="~$project/assets/img/03.jpg" width="50" /></div>
+												<h4>郭麒麟</h4>
+											</div>
+											<div class="mui-pull-right color55f868">已上报</div>
+										</a>
+									</li>
+									<li class="mui-table-view-cell">
+										<a class="mui-navigate-right" href="#">
+											<div class="mui-pull-left flew-items">
+												<div class="mui-media-object flew"><img src="~$project/assets/img/03.jpg" width="50" /></div>
+												<h4>郭麒麟</h4>
+											</div>
+											<div class="mui-pull-right color55f868">已上报</div>
+										</a>
+									</li>
+								</ul>
+							</div>
+						</div>
 					</div>
-					<div class="mui-input-row">
-						<label style="width:70%">是否接触重点疫区高危人群</label>
-						<span>否</span>
+					<div id="item3mobile" class="mui-slider-item mui-control-content mui-active">
+						<div id="scroll1" class="mui-scroll-wrapper">
+							<div class="mui-scroll vongi-yctj-list vongi-archives">
+								<ul class="mui-table-view mui-table-view-chevron vongi-zcjlu">
+									<li class="mui-table-view-cell">
+										<a class="mui-navigate-right" href="#">
+											<div class="mui-pull-left flew-items">
+												<div class="mui-media-object flew"><img src="~$project/assets/img/03.jpg" width="50" /></div>
+												<h4>郭麒麟</h4>
+											</div>
+											<div class="mui-pull-right colorfe616c">未上报</div>
+										</a>
+									</li>
+									<li class="mui-table-view-cell">
+										<a class="mui-navigate-right" href="#">
+											<div class="mui-pull-left flew-items">
+												<div class="mui-media-object flew"><img src="~$project/assets/img/03.jpg" width="50" /></div>
+												<h4>郭麒麟</h4>
+											</div>
+											<div class="mui-pull-right colorfe616c">未上报</div>
+										</a>
+									</li>
+								</ul>
+							</div>
+						</div>
 					</div>
-				</form>
-
+				</div>
 			</div>
+		</div>
 </div>
 </template>
 
@@ -88,6 +177,8 @@
 </script>
 
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style scoped src="$project/assets/css/sczpfyy.css"></style>
+<style scoped src="$project/assets/css/wallfyy.css"></style>
 <style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/business/views/HouseKeeper/Control/Health/WorkerInfo.vue

@@ -1,175 +1,86 @@
 <template>
 <div>
     <header class="mui-bar mui-bar-nav">
-			<h1 class="mui-title">职工台账</h1>
-			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-		</header>
-		<div class="mui-content fyy-wall vongi-zgtz">
-			<div class="mui-content-padded fyy-date mui-clearfix">
-				<h5>荆鹏软件
-					<a href="" class="mui-navigate-right mui-pull-right">2020-03-19</a>
-				</h5>
-			</div>
-			<div class="vongi-clasadmin">
-				<h4>班级健康码统计</h4>
-				<div class="vongi-clasadmin-list">
-					<div class="vongi-clasadmin-ma mui-col-xs-3">
-						<span class="color55f868">2953</span>
-						<div class="mui-media-body">绿码</div>
+				<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+				<h1 class="mui-title">详情</h1>
+			</header>
+			<div class="mui-content vongi-qingjiadt">
+				<div class="mui-content-padded">
+					<h5>个人信息</h5>
+				</div>
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>姓名</label>
+						<span>王后雄</span>
 					</div>
-					<div class="vongi-clasadmin-ma mui-col-xs-3">
-						<span class="colorf8b155">12</span>
-						<div class="mui-media-body">黄码</div>
+					<div class="mui-input-row">
+						<label>手机号</label>
+						<span>18600112233</span>
 					</div>
-					<div class="vongi-clasadmin-ma mui-col-xs-3">
-						<span class="colorfe616c">0</span>
-						<div class="mui-media-body">红码</div>
+					<div class="mui-input-row">
+						<label>工号</label>
+						<span>0011223</span>
 					</div>
-					<div class="vongi-clasadmin-ma mui-col-xs-3">
-						<span class="color999">23</span>
-						<div class="mui-media-body">灰码</div>
+					<div class="mui-input-row">
+						<label>学校名称</label>
+						<span>湖北荆鹏软件集团有限公司</span>
 					</div>
-				</div>
-				<div class="vongi-zgtz-search">
-					<div class="mui-input-row mui-search">
-						<input type="search" placeholder="请输入姓名">
+					<div class="mui-input-row">
+						<label>岗位</label>
+						<span>软件工程师</span>
 					</div>
+
+				</form>
+				<div class="mui-content-padded">
+					<h5>健康状态</h5>
 				</div>
-			</div>
-			<div id="slider" class="mui-slider mui-fullscreen">
-				<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
-					<div class="mui-scroll">
-						<a class="mui-control-item mui-active" href="#item1mobile" style="width:30%">
-							全部<span class="mui-badge">3</span>
-						</a>
-						<a class="mui-control-item" href="#item2mobile" style="width:36%">
-							正常记录<span class="mui-badge">2</span>
-						</a>
-						<a class="mui-control-item" href="#item3mobile" style="width:34%">
-							异常记录<span class="mui-badge">1</span>
-						</a>
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label style="width:50%">自身健康情况</label>
+						<span>其他</span>
 					</div>
-				</div>
-				<div class="mui-slider-group">
-					<div id="item1mobile" class="mui-slider-item mui-control-content mui-active">
-						<div id="scroll1" class="mui-scroll-wrapper">
-							<div class="mui-scroll vongi-yctj-list">
-								<ul class="mui-table-view mui-table-view-chevron vongi-zgtz">
-									<li class="mui-table-view-cell mui-collapse vongi-archives">
-										<a class="mui-navigate-right" href="#">
-											湖北荆盛贸易有限公司
-											<h4 class='mui-pull-right'><span class="color4fc5f7">1</span>/<span class="color4fc5f7">2</span></h4>
-										</a>
-										<ul class="mui-table-view mui-table-view-chevron">
-											<li class="mui-table-view-cell">
-												<a class="mui-navigate-right" href="#">
-													<div class="mui-pull-left flew-items">
-														<div class="mui-media-object flew"><img src="~$project/assets/img/03.jpg" width="50" /></div>
-														<h4>郭麒麟</h4>
-														<span class="mui-icon iconfont icon-erweima1 color55f868"></span>
-													</div>
-													<div class="mui-pull-right color55f868">已上报</div>
-												</a>
-											</li>
-											<li class="mui-table-view-cell">
-												<a class="mui-navigate-right" href="#">
-													<div class="mui-pull-left flew-items">
-														<div class="mui-media-object flew"><img src="~$project/assets/img/03.jpg" width="50" /></div>
-														<h4>郭麒麟</h4>
-														<span class="mui-icon iconfont icon-erweima1 colorfe616c"></span>
-													</div>
-													<div class="mui-pull-right colorfe616c">未上报</div>
-												</a>
-											</li>
-										</ul>
-									</li>
-									<li class="mui-table-view-cell mui-collapse vongi-archives">
-										<a class="mui-navigate-right" href="#">
-											食堂
-											<h4 class='mui-pull-right'><span class="color4fc5f7">1</span>/<span class="color4fc5f7">2</span></h4>
-										</a>
-										<ul class="mui-table-view mui-table-view-chevron">
-											<li class="mui-table-view-cell">
-												<a class="mui-navigate-right" href="#">
-													<div class="mui-pull-left flew-items">
-														<div class="mui-media-object flew"><img src="~$project/assets/img/03.jpg" width="50" /></div>
-														<h4>郭麒麟</h4>
-														<span class="mui-icon iconfont icon-erweima1 color55f868"></span>
-													</div>
-													<div class="mui-pull-right color55f868">已上报</div>
-												</a>
-											</li>
-											<li class="mui-table-view-cell">
-												<a class="mui-navigate-right" href="#">
-													<div class="mui-pull-left flew-items">
-														<div class="mui-media-object flew"><img src="~$project/assets/img/03.jpg" width="50" /></div>
-														<h4>郭麒麟</h4>
-														<span class="mui-icon iconfont icon-erweima1 colorfe616c"></span>
-													</div>
-													<div class="mui-pull-right colorfe616c">未上报</div>
-												</a>
-											</li>
-										</ul>
-									</li>
-								</ul>
-							</div>
-						</div>
+					<div class="mui-input-row">
+						<label>今日体温</label>
+						<span>36.3°C</span>
 					</div>
-					<div id="item2mobile" class="mui-slider-item mui-control-content mui-active">
-						<div id="scroll1" class="mui-scroll-wrapper">
-							<div class="mui-scroll vongi-yctj-list vongi-archives">
-								<ul class="mui-table-view mui-table-view-chevron vongi-zcjlu">
-									<li class="mui-table-view-cell">
-										<a class="mui-navigate-right" href="#">
-											<div class="mui-pull-left flew-items">
-												<div class="mui-media-object flew"><img src="~$project/assets/img/03.jpg" width="50" /></div>
-												<h4>郭麒麟</h4>
-											</div>
-											<div class="mui-pull-right color55f868">已上报</div>
-										</a>
-									</li>
-									<li class="mui-table-view-cell">
-										<a class="mui-navigate-right" href="#">
-											<div class="mui-pull-left flew-items">
-												<div class="mui-media-object flew"><img src="~$project/assets/img/03.jpg" width="50" /></div>
-												<h4>郭麒麟</h4>
-											</div>
-											<div class="mui-pull-right color55f868">已上报</div>
-										</a>
-									</li>
-								</ul>
-							</div>
-						</div>
+					<div class="mui-input-row">
+						<label>其他情况</label>
+						<span>无</span>
 					</div>
-					<div id="item3mobile" class="mui-slider-item mui-control-content mui-active">
-						<div id="scroll1" class="mui-scroll-wrapper">
-							<div class="mui-scroll vongi-yctj-list vongi-archives">
-								<ul class="mui-table-view mui-table-view-chevron vongi-zcjlu">
-									<li class="mui-table-view-cell">
-										<a class="mui-navigate-right" href="#">
-											<div class="mui-pull-left flew-items">
-												<div class="mui-media-object flew"><img src="~$project/assets/img/03.jpg" width="50" /></div>
-												<h4>郭麒麟</h4>
-											</div>
-											<div class="mui-pull-right colorfe616c">未上报</div>
-										</a>
-									</li>
-									<li class="mui-table-view-cell">
-										<a class="mui-navigate-right" href="#">
-											<div class="mui-pull-left flew-items">
-												<div class="mui-media-object flew"><img src="~$project/assets/img/03.jpg" width="50" /></div>
-												<h4>郭麒麟</h4>
-											</div>
-											<div class="mui-pull-right colorfe616c">未上报</div>
-										</a>
-									</li>
-								</ul>
-							</div>
-						</div>
+					<div class="mui-input-row">
+						<label style="width:70%">家庭成员身体健康情况</label>
+						<span>健康</span>
 					</div>
-				</div>
+					<div class="mui-input-row">
+						<label style="width:50%">家庭成员健康码</label>
+						<span class="vongi-yddk-dat-photo">
+							<div class="flew">
+								<div class="mui-col-xs-3">
+									<img src="~$project/assets/img/zhaop1.jpg" width="100%"/>
+								</div>
+								<div class="mui-col-xs-3">
+									<img src="~$project/assets/img/zhaop1.jpg" width="100%"/>
+								</div>
+								<div class="mui-col-xs-3">
+									<img src="~$project/assets/img/zhaop1.jpg" width="100%"/>
+								</div>
+								<div class="mui-col-xs-3">
+									<img src="~$project/assets/img/zhaop1.jpg" width="100%"/>
+								</div>
+							</div>							
+						</span>
+					</div>
+					<div class="mui-input-row">
+						<label style="width:70%">假期是否曾前往重点疫区</label>
+						<span>否</span>
+					</div>
+					<div class="mui-input-row">
+						<label style="width:70%">是否接触重点疫区高危人群</label>
+						<span>否</span>
+					</div>
+				</form>
+
 			</div>
-		</div>
 </div>
 </template>
 
@@ -177,8 +88,6 @@
 </script>
 
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
-<style scoped src="$project/assets/css/sczpfyy.css"></style>
-<style scoped src="$project/assets/css/wallfyy.css"></style>
 <style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/business/views/HouseKeeper/Control/Health/WorkerTemperature.vue

@@ -5,7 +5,7 @@
 
 		<div class="mui-content fyy-date">
 			<div class="mui-content-padded fyy-date mui-clearfix">
-				<h5>{{company_data.name}}
+				<h5>{{companyName}}
 					<a class="mui-navigate-right mui-pull-right" @click="selectData">{{listForm.queryDate}}</a>
 				</h5>
 			</div>
@@ -64,7 +64,7 @@
 					style: 'font-size:14px;color:#000;',
 					title: '未测人员'
 				},
-
+				companyName:'',
 				listForm: {
 					pageIndex: 1,
 					pageSize: 20,
@@ -78,7 +78,14 @@
 		},
 		created() {
 			//赋值当前公司
-			this.listForm.companyId = this.company_data.id;
+			if(this.$route.query.companyId){
+				this.listForm.companyId = this.$route.query.companyId;
+				this.companyName=unescape(this.$route.query.companyName);
+
+			}else{
+				this.listForm.companyId = this.company_data.id;
+				this.companyName=this.company_data.name;
+			}
 
 			if (this.$route.query.queryDate) {
 				this.listForm.queryDate = this.$route.query.queryDate;
@@ -141,7 +148,10 @@
 			doRightLink() {
 				this.$router.push({
 					name: 'HouseKeeperControlHealthNoTemperatureRecord',
-					query: {}
+					query: {
+						companyId:	this.listForm.companyId,
+
+					}
 				})
 			},
 			asynCallBack() {