Merge branch 'nan' of sckj/mz-cloud into master

ruoyi-ui/src/api/bigScreen.js

@@ -21,10 +21,10 @@ export function getOldmanMarkers(params) {
 // 老人详情数据
 export function getOldmanDetails(params) {
   var xhr = new XMLHttpRequest()
-  xhr.open("get", '/getxflrinfo?lrid=' + params.lrid, false);
-  xhr.setRequestHeader("Content-Type","application/json;charset=utf-8");
-  xhr.send();
-  return  JSON.parse(xhr.responseText);
+  xhr.open('get', '/getxflrinfo?lrid=' + params.lrid, false)
+  xhr.setRequestHeader('Content-Type', 'application/json;charset=utf-8')
+  xhr.send()
+  return JSON.parse(xhr.responseText)
 }
 
 // 养老机构点位数据
@@ -45,6 +45,33 @@ export function getOrgDetails(params) {
   })
 }
 
+// 服务产品数据
+export function getProduction(params) {
+  return request({
+    url: '/system/wlcp/list',
+    method: 'get',
+    params: params
+  })
+}
+
+// 交易信息数据
+export function getTradingRecord(params) {
+  return request({
+    url: '/system/ddjy/list',
+    method: 'get',
+    params: params
+  })
+}
+
+// 历史评价数据
+export function getEvaluate(params) {
+  return request({
+    url: '/system/ddpj/list',
+    method: 'get',
+    params: params
+  })
+}
+
 // 为老服务商点位数据
 export function getServiceMarkers(params) {
   return request({

ruoyi-ui/src/views/bigScreen/resources/details/MonitorInfo.vue

@@ -35,7 +35,6 @@ export default {
 	watch: {
 		visible(newVal) {this.isOpen = newVal;},
 		id: {
-			immediate: true,
 			deep: true,
 			handler(newVal) {
 				if (newVal) {

ruoyi-ui/src/views/bigScreen/resources/details/OldmanInfo.vue

@@ -6,7 +6,7 @@
 				<table>
 					<tr>
 						<td>姓名:</td>
-						<td colspan="2">阴胜江</td>
+						<td colspan="2">{{ info.name }}</td>
 						<td rowspan="5">
 							<el-image
 								style="width: 100%; height: 100%" fit="cover"
@@ -18,155 +18,157 @@
 					</tr>
 					<tr>
 						<td>性别:</td>
-						<td colspan="2">阴胜江</td>
+						<td colspan="2">{{ info.sex }}</td>
 					</tr>
 					<tr>
 						<td>民族:</td>
-						<td colspan="2">阴胜江</td>
+						<td colspan="2">{{ info.nation }}</td>
 					</tr>
 					<tr>
 						<td>身份证号:</td>
-						<td colspan="2">阴胜江</td>
+						<td colspan="2">{{ info.idNumber }}</td>
 					</tr>
 					<tr>
 						<td>联系电话:</td>
-						<td colspan="2">阴胜江</td>
+						<td colspan="2">{{ info.phone }}</td>
 					</tr>
 					<tr>
 						<td>户籍地址:</td>
-						<td colspan="3"></td>
+						<td colspan="3">{{ info.nativePlace }}</td>
 					</tr>
 					<tr>
 						<td>户籍地址详细:</td>
-						<td colspan="3"></td>
+						<td colspan="3">{{ info.nativePlaceExt }}</td>
 					</tr>
 					<tr>
 						<td>是否户籍地址和现居地址一致:</td>
-						<td colspan="3"></td>
+						<td colspan="3">{{ info.isSameWithAddress }}</td>
 					</tr>
 					<tr>
 						<td>现居地址:</td>
-						<td colspan="3"></td>
+						<td colspan="3">{{ info.address }}</td>
 					</tr>
 					<tr>
 						<td>现居地址详细:</td>
-						<td colspan="3"></td>
+						<td colspan="3">{{ info.addressExt }}</td>
 					</tr>
 					<tr>
 						<td>婚姻及配偶情况:</td>
-						<td></td>
+						<td>{{ info.partnerState }}</td>
 						<td>配偶姓名:</td>
-						<td></td>
+						<td>{{ info.partnerName }}</td>
 					</tr>
 					<tr>
 						<td>配偶身份证号:</td>
-						<td></td>
+						<td>{{ info.partnerIdNumber }}</td>
 						<td>健康状况:</td>
-						<td></td>
+						<td>{{ info.health }}</td>
 					</tr>
 					<tr>
 						<td>残疾类别:</td>
-						<td></td>
+						<td>{{ info.disabilityCategory }}</td>
 						<td>残疾人等级:</td>
-						<td></td>
+						<td>{{ info.disabilityLevel }}</td>
 					</tr>
 					<tr>
 						<td>重特大疾病类别:</td>
-						<td></td>
+						<td>{{ info.majorDiseases }}</td>
 						<td>老年人能力状况:</td>
-						<td></td>
+						<td>{{ info.ability }}</td>
 					</tr>
 					<tr>
 						<td>生活经济状况:</td>
-						<td></td>
+						<td>{{ info.livingCondition }}</td>
 						<td>收入来源:</td>
-						<td></td>
+						<td>{{ info.sourceOfIncome }}</td>
 					</tr>
 					<tr>
 						<td>其它收入来源:</td>
-						<td></td>
+						<td>{{ info.sourceOfIncomeExt }}</td>
 						<td>本人上年度可支配收入:</td>
-						<td></td>
+						<td>{{ info.income }}</td>
 					</tr>
 					<tr>
 						<td>家庭救助帮扶情况:</td>
-						<td></td>
+						<td>{{ info.rescueState }}</td>
 						<td>其它家庭救助帮扶情况:</td>
-						<td></td>
+						<td>{{ info.rescueStateExt }}</td>
 					</tr>
 					<tr>
 						<td>是否为失独家庭:</td>
-						<td></td>
+						<td>{{ info.isLoss }}</td>
 						<td>陪伴居住情况:</td>
-						<td></td>
+						<td>{{ info.accompany }}</td>
 					</tr>
 					<tr>
 						<td>其他陪伴居住情况:</td>
-						<td></td>
+						<td>{{ info.accompanyExt }}</td>
 						<td>日常生活照料人:</td>
-						<td></td>
+						<td>{{ info.lookAfter }}</td>
 					</tr>
 					<tr>
 						<td>其他日常生活照料人:</td>
-						<td></td>
+						<td>{{ info.lookAfterExt }}</td>
 						<td>主要照料人姓名:</td>
-						<td></td>
+						<td>{{ info.mainLookName }}</td>
 					</tr>
 					<tr>
 						<td>主要照料人性别:</td>
-						<td></td>
+						<td>{{ info.mainLookSex }}</td>
 						<td>主要照料人电话:</td>
-						<td></td>
+						<td>{{ info.mainLookPhone }}</td>
 					</tr>
 					<tr>
 						<td>关爱服务需求:</td>
-						<td></td>
+						<td>{{ info.demand }}</td>
 						<td>其它关爱服务需求:</td>
-						<td></td>
+						<td>{{ info.demandExt }}</td>
 					</tr>
 					<tr>
 						<td>老年人类别:</td>
-						<td colspan="3"></td>
+						<td colspan="3">{{ info.oldType }}</td>
 					</tr>
 				</table>
 
-				<h5>子女信息详情</h5>
-				<table style="margin-bottom: 10px">
-					<tr>
-						<td>姓名:</td>
-						<td></td>
-						<td>性别:</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>常用联系电话:</td>
-						<td></td>
-						<td>是否外出:</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>外出原因:</td>
-						<td></td>
-						<td>外出地点:</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>最后一次离家时间:</td>
-						<td></td>
-						<td>是否有配偶:</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>子女配偶姓名:</td>
-						<td></td>
-						<td>子女配偶电话:</td>
-						<td></td>
-					</tr>
-					<tr>
-						<td>平均一年探望次数:</td>
-						<td colspan="3"></td>
-					</tr>
-				</table>
+				<div v-if="info.childInfo && info.childrenNum != '0'" v-for="child in JSON.parse(info.childInfo)" :key="child._id">
+					<h5>子女信息详情{{info.childrenNum}}</h5>
+					<table style="margin-bottom: 10px">
+						<tr>
+							<td>姓名:</td>
+							<td>{{ child.name }}</td>
+							<td>性别:</td>
+							<td>{{ child.sex }}</td>
+						</tr>
+						<tr>
+							<td>常用联系电话:</td>
+							<td>{{ child.phone }}</td>
+							<td>是否外出:</td>
+							<td>{{ child.isHasGoOut }}</td>
+						</tr>
+						<tr>
+							<td>外出原因:</td>
+							<td>{{ child.outgoingCause }}</td>
+							<td>外出地点:</td>
+							<td>{{ child.outgoingplace }}</td>
+						</tr>
+						<tr>
+							<td>最后一次离家时间:</td>
+							<td>{{ child.outgoingTime }}</td>
+							<td>是否有配偶:</td>
+							<td>{{ child.isHasPartner }}</td>
+						</tr>
+						<tr>
+							<td>子女配偶姓名:</td>
+							<td>{{ child.name2 }}</td>
+							<td>子女配偶电话:</td>
+							<td>{{ child.phone2 }}</td>
+						</tr>
+						<tr>
+							<td>平均一年探望次数:</td>
+							<td colspan="3">{{ child.visit }}</td>
+						</tr>
+					</table>
+				</div>
 			</el-scrollbar>
 		</el-dialog>
 	</div>
@@ -191,33 +193,29 @@ export default {
 		return {
 			isOpen: false,
 			activeNames: ['1'],
-			info:{},
+			info: {}
 		}
 	},
 	computed: {},
 	watch: {
 		visible(newVal) {this.isOpen = newVal},
 		id: {
-			immediate: true,
+			// immediate: true,
 			deep: true,
 			handler(newVal) {
 				if (newVal) {
 					var xhr = new XMLHttpRequest()
-					xhr.open("get", '/getxflrinfo?lrid=' + newVal, false);
-					xhr.setRequestHeader("Content-Type","application/json;charset=utf-8");
-					xhr.send();
-					let data = JSON.parse(xhr.responseText);
-					console.log(data)
-					this.info = data[0]
+					xhr.open('get', '/getxflrinfo?lrid=' + newVal, false)
+					xhr.setRequestHeader('Content-Type', 'application/json;charset=utf-8')
+					xhr.send()
+					let data = JSON.parse(xhr.responseText)
+
+					this.info = data.data[0]
+					console.log(this.info)
 				}
 			}
 		}
 	},
-	created() {
-		// getOldmanDetails({ lrid: '5dde3f1b0e2c4d237088d122' }).then((res) => {
-		// 	console.log(res)
-		// })
-	},
 	methods: {
 		handleClose() {
 			this.$emit('update:visible', this.isOpen)

ruoyi-ui/src/views/bigScreen/resources/details/ServiceInfo.vue

@@ -174,7 +174,6 @@ export default {
 	watch: {
 		visible(newVal) {this.isOpen = newVal;},
 		id: {
-			immediate: true,
 			deep: true,
 			handler(newVal) {
 				if (newVal) {

ruoyi-ui/src/views/bigScreen/resources/details/SmartInfo.vue

@@ -36,7 +36,6 @@ export default {
 	watch: {
 		visible(newVal) {this.isOpen = newVal;},
 		id: {
-			immediate: true,
 			deep: true,
 			handler(newVal) {
 				if (newVal) {

ruoyi-ui/src/views/bigScreen/resources/index.vue

@@ -892,6 +892,7 @@ export default {
     markerClick(e) {
       this.jgId = e.target._opts.extData.id
       this.isShowInfo = true
+	    console.log(this.jgId)
     },
 
     clickScreen() {