Merge branch 'master' of http://47.92.161.104:10080/wgl/jp-xpgj

.env.development

@@ -6,4 +6,4 @@ VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/jp-housekeeper-server/
 #小鹏管家微信appid
 VUE_APP_WXAPPID=wx7e70eb62a8459869
 VUE_APP_AUTH=
-VUE_APP_VERSION=2.0.3
+VUE_APP_VERSION=2.0.4

.env.production

@@ -6,4 +6,4 @@ VUE_APP_BACKEND_URL=http://xpgjapi.xiaoxinda.com/
 #小鹏管家微信appid
 VUE_APP_WXAPPID=wx7e70eb62a8459869
 VUE_APP_AUTH=
-VUE_APP_VERSION=2.0.3
+VUE_APP_VERSION=2.0.4

.env.test

@@ -6,4 +6,4 @@ VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/jp-housekeeper-server/
 #小鹏管家微信appid
 VUE_APP_WXAPPID=wx7e70eb62a8459869
 VUE_APP_AUTH=
-VUE_APP_VERSION=2.0.3
+VUE_APP_VERSION=2.0.4

src/assets/css/xpwyfyy.css

@@ -48,6 +48,9 @@ body {
 .color999 {
 	color: #999
 }
+.color333 {
+	color: #333
+}
 
 .margin60 {
 	margin-bottom: 60px
@@ -3012,4 +3015,101 @@ h3 {
 .vongi-car.vongi-meform-pho h5 {
 	font-size: 14px;
 	font-weight: bold;
-}
+}
+.vongi-fqhd .vongi-fqhd-add{
+	text-align: center;
+	display: flex;
+    justify-content: center;
+    position:relative
+}
+.vongi-fqhd .vongi-cashier-text{
+	position:relative;
+	padding-right:25px
+}
+.vongi-fqhd .vongi-cashier .iconfont{
+	position:absolute;
+	right:0;
+	color:#999;
+	font-size:14px
+}
+.vongi-fqhd .vongi-cashier .iconfont.icon-guanbi1{
+	top:0px
+}
+.vongi-fqhd .vongi-cashier .iconfont.icon-jiantou1{
+	bottom:0px
+}
+.vongi-fqhd-addimg{
+	position:relative;
+	background:#eee;
+	height:72px;
+	width:72px;
+	overflow: hidden;
+	display: flex;
+}
+.vongi-fqhd-addimg span{
+	background:rgba(0,0,0,0.6);
+	position:absolute;
+	bottom:0;
+	width:100%;
+	color:#ffffff;
+	font-size:11px;
+	text-align: center;
+}
+.vongi-fqhd-addimg img{
+	object-fit: cover;
+	width:100%;
+	min-height: 100%;
+}
+
+.vongi-fqhd .vongi-cashier .vongi-fqhd-addimg .iconfont{
+	top:50%;
+	right:50%;
+	font-size:24px;
+	margin-top:-12px;
+	margin-right:-12px
+}
+.vongi-fqhd .vongi-popover .iconfont{
+	font-size:24px
+}
+.vongi-fqhd .vongi-popover .mui-grid-view.mui-grid-9 .mui-table-view-cell{
+	padding:0
+}
+
+.vongi-popover .mui-popover-arrow:after {
+    position: absolute;
+    top: -8px;
+    left: 50%;
+    width: 16px;
+    height: 16px;
+    content: ' ';
+    -webkit-transform: rotate(45deg);
+    transform: rotate(45deg);
+    border-radius: 3px;
+    background: #ffffff;
+    margin-left:-8px
+}
+.vongi-popover{
+    width: 100px;
+    background:#ffffff;
+    border-radius: 7px;
+    -webkit-box-shadow: 0 0 15px rgba(0, 0, 0, .1);
+    box-shadow: 0 0 15px rgba(0, 0, 0, .1);
+    position:absolute;
+    top:35px;
+    left:50%;
+    margin-left:-50px;
+    z-index: 999;
+}
+.vongi-zc .openfyy-list .mui-table-view-cell.mui-selected{
+	background:#3385FF;
+	color:#ffffff;
+}
+.vongi-zc .openfyy-list .mui-table-view-cell.mui-selected h6{
+	color:rgba(255,255,255,0.7)
+}
+.vongi-zc .openfyy-list .mui-table-view-cell.mui-selected .mui-navigate-right:after, .vongi-zc .openfyy-list .mui-table-view-cell.mui-selected .mui-push-right:after{
+	color:#ffffff
+}
+ .vongi-zc .mui-selected a{
+ 	border:0
+ }

src/projects/business/views/Master/Company/RegisterInfo.vue

@@ -36,10 +36,18 @@
 						<label>您的身份</label>
 						<span v-text="detail.personRoleName"></span>
 					</div>
+					<div v-if="detail.companyName" class="mui-input-row">
+						<label v-text="companyNameLabel"></label>
+						<span v-text="detail.companyName"></span>
+					</div>
 					<div v-if="detail.structureId" class="mui-input-row">
 						<label v-text="structureLabel"></label>
 						<span v-text="detail.sceneId=='4'?detail.address:detail.structureName"></span>
 					</div>
+					<div v-if="detail.address" class="mui-input-row">
+						<label>家庭住址</label>
+						<span v-text="detail.address"></span>
+					</div>
 				</form>
 			</div>
 			<div v-if="detail.status=='0'" class="fyy-scon-botton">
@@ -188,6 +196,26 @@
 					console.log(newValue)
 				}
 			},
+			companyNameLabel:{
+				// getter
+				get: function() {
+					if (this.detail.sceneId == '1') {
+						return '公司名称';
+					} else if (this.detail.sceneId == '2') {
+						return '所在小区';
+					} else if (this.detail.sceneId == '3') {
+						return '所在小区';
+					} else if (this.detail.sceneId == '4') {
+						return '所在小区';
+					} else {
+						return '';
+					}
+				},
+				// setter
+				set: function(newValue) {
+					console.log(newValue)
+				}
+			},
 			...mapGetters({
 				openId: 'wx_openid',
 				token: 'token',

src/projects/pension/router/master.js

@@ -227,6 +227,28 @@ const routesMaster = [
 							mode: true
 						}
 					},
+					//参数详情
+					{
+						path: 'chart',
+						name: 'MasterHealthChart',
+						component: () => import('../views/Master/Health/Chart.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '参数详情',
+						}
+					},
+					//预警参数设置
+					{
+						path: 'warningSet',
+						name: 'MasterHealthWarningSet',
+						component: () => import('../views/Master/Health/WarningSet.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '预警参数设置',
+						}
+					},
 				],
 			},
 

src/projects/pension/views/Common/Device/List.vue

@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<common ref="common" @asynCallBack="asynCallBack"></common>
-		<top-header :pageTitle="pageTitle"></top-header>
+		<top-header :pageTitle="pageTitle" routeName="Master"></top-header>
 
 		<div class="mui-content vongi-qqhm vongi-sblist">
 			<ul class="mui-table-view">

src/projects/pension/views/Master/Health/Chart.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/pension/views/Master/Health/WarningSet.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>