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

ruoyi-ui/src/assets/styles/bigScreen.scss

@@ -107,3 +107,29 @@
 		transform: translateY(-24px);
 	}
 }
+
+
+::v-deep .el-dialog {
+	//background-color: #033447;
+
+	.el-dialog__header {
+		padding: 0;
+	}
+
+	.el-dialog__headerbtn {
+		top: 10px;
+		right: 10px;
+		z-index: 1;
+		font-size: 24px;
+	}
+
+	.el-dialog__body {
+		//color: #fff;
+		padding: 20px 10px 20px 20px;
+
+		.scroll-wrap {
+			height: 82vh;
+			padding-right: 10px;
+		}
+	}
+}

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

@@ -1,18 +1,21 @@
 <template>
 	<div>
-		<el-dialog :visible.sync="isOpen" width="800px" @close="handleClose" append-to-body>
+		<el-dialog :visible.sync="isOpen" width="1000px" @close="handleClose" append-to-body>
 			<el-scrollbar wrapClass="scroll-wrap">
 				<article>
-					<p>唯一编号：WWER12312389</p>
-					<p>归属机构：首开寸草养老照料中心</p>
+					<p>生产厂家：{{ info.cj }}</p>
+					<p>归属机构：{{ info.jgmc }}</p>
 				</article>
+				<div class="video-wrap">
+					实时监控画面
+				</div>
 			</el-scrollbar>
 		</el-dialog>
 	</div>
 </template>
 
 <script>
-import { getMonitorDetails, } from '@/api/bigScreen'
+import { getMonitorDetails } from '@/api/bigScreen'
 
 export default {
 	name: 'MonitorInfo',
@@ -29,50 +32,39 @@ export default {
 	data() {
 		return {
 			isOpen: false,
-		};
+			info:{},
+		}
 	},
 	computed: {},
 	watch: {
-		visible(newVal) {this.isOpen = newVal;},
+		visible: {
+			immediate: true,
+			handler(newVal) {this.isOpen = newVal}
+		},
 		id: {
 			deep: true,
 			handler(newVal) {
 				if (newVal) {
-					console.log(newVal);
+					getMonitorDetails({ id: newVal }).then(({ code,data }) => {
+						if(code !== 200) return
+						this.info = data
+						console.log(data)
+					})
 				}
 			}
 		}
 	},
 	methods: {
 		handleClose() {
-			this.$emit('update:visible', this.isOpen);
-		},
+			this.$emit('update:visible', this.isOpen)
+		}
 	}
-};
+}
 </script>
 
 <style scoped lang="scss">
-::v-deep .el-dialog {
-	.el-dialog__header {
-		padding: 0;
-	}
+@import "@/assets/styles/bigScreen";
 
-	.el-dialog__headerbtn {
-		top: 10px;
-		right: 10px;
-		z-index: 1;
-		font-size: 24px;
-	}
-
-	.el-dialog__body {
-		padding: 20px 10px 20px 20px;
-
-		.scroll-wrap {
-			height: 30vh;
-			padding-right: 10px;
-		}
-	}
-}
 article {
 	display: flex;
 	justify-content: flex-start;
@@ -80,8 +72,15 @@ article {
 	font-size: 16px;
 
 	p {
-		width: 33%;
+		width: 50%;
 		margin-bottom: 10px;
 	}
 }
+.video-wrap{
+	background-color: #ECF5FF;
+	height: 700px;
+	text-align: center;
+	line-height: 700px;
+	font-size: 20px;
+}
 </style>

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

@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<el-dialog :visible.sync="isOpen" width="800px" @close="handleClose" append-to-body>
+		<el-dialog :visible.sync="isOpen" width="1000px" @close="handleClose" append-to-body>
 			<el-scrollbar wrapClass="scroll-wrap">
 				<h5>老人信息介绍</h5>
 				<table>
@@ -228,27 +228,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
-::v-deep .el-dialog {
-	.el-dialog__header {
-		padding: 0;
-	}
-
-	.el-dialog__headerbtn {
-		top: 5px;
-		right: 5px;
-		z-index: 1;
-		font-size: 24px;
-	}
-
-	.el-dialog__body {
-		padding: 25px 10px 25px 20px;
-
-		.scroll-wrap {
-			height: 82vh;
-			padding-right: 10px;
-		}
-	}
-}
+@import "@/assets/styles/bigScreen";
 
 h5 {
 	font-size: 18px;

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

@@ -1,8 +1,8 @@
 <template>
 	<div>
 		<el-dialog :visible.sync="isOpen" width="1200px" @close="handleClose" append-to-body>
-			<el-scrollbar wrapClass="scroll-wrap">
-				<article v-loading="loading">
+			<el-scrollbar v-loading="loading" wrapClass="scroll-wrap">
+				<article>
 					<header>
 						<h4>{{ infomation.jgmc }}</h4>
 						<div class="tag-content line">
@@ -31,13 +31,13 @@
 							</div>
 							<div class="cate line">
 								<p class="price">
-									<span>床位费</span><b>¥{{ infomation['cwf_zd'] || 0 }} - ¥{{ infomation['cwf_zd'] || 0 }}</b>
+									<span>床位费</span><b>¥{{ infomation['cwf_zd'] || 0 }} - ¥{{ infomation['cwf_zg'] || 0 }}</b>
 								</p>
 								<p class="price">
-									<span>护理费</span><b>¥{{ infomation['hlf_zd'] || 0 }} - ¥{{ infomation['hlf_zd'] || 0 }}</b>
+									<span>护理费</span><b>¥{{ infomation['hlf_zd'] || 0 }} - ¥{{ infomation['hlf_zg'] || 0 }}</b>
 								</p>
 								<p class="price">
-									<span>膳食费</span><b>¥{{ infomation['ssf_zd'] || 0 }} - ¥{{ infomation['ssf_zd'] || 0 }}</b>
+									<span>膳食费</span><b>¥{{ infomation['ssf_zd'] || 0 }} - ¥{{ infomation['ssf_zg'] || 0 }}</b>
 								</p>
 								<span>(温馨提示：月价格仅供参考)</span>
 							</div>
@@ -58,19 +58,19 @@
 							<div class="info">
 								<p>
 									<span>综合评价：</span>
-									<span>好评(0)</span>
-									<span>中评(0)</span>
-									<span>差评(0)</span>
+									<span>好评({{ infomation.hp || 0 }})</span>
+									<span>中评({{ infomation.zp || 0 }})</span>
+									<span>差评({{ infomation.cp || 0 }})</span>
 								</p>
-								<p>床位数：{{ infomation.cwzs }}/{{ infomation.cwzs }}（可选订床位/总床位）</p>
-								<p>建筑面积：{{ infomation.jzmj }}m<sup>2</sup></p>
+								<p>床位数：{{ infomation.cwzs || 0 }}/{{ infomation.cwzs || 0 }}（可选订床位/总床位）</p>
+								<p>建筑面积：{{ infomation.jzmj || 0 }}m<sup>2</sup></p>
 								<p>电话：{{ infomation.frlxfs }}</p>
 								<p>联系人：{{ infomation.frxm }}</p>
 								<p>地址：{{ infomation.txdz }}</p>
 							</div>
 						</div>
 						<div class="part2">
-							<el-tabs v-model="activeName" type="card" @tab-click="tabClick">
+							<el-tabs v-model="activeName" type="card">
 								<el-tab-pane label="基本信息" name="0">
 									<div class="text">{{ infomation.jgjs }}</div>
 								</el-tab-pane>
@@ -97,10 +97,10 @@
 								</el-tab-pane>
 								<el-tab-pane label="历史评价" name="4">
 									<el-radio-group class="bottom-group" v-model="evaluate" @input="evaluateChange">
-										<el-radio :label="0">全部</el-radio>
-										<el-radio :label="1">好评(0)</el-radio>
-										<el-radio :label="2">中评(0)</el-radio>
-										<el-radio :label="3">差评(0)</el-radio>
+										<el-radio label="0">全部({{ infomation.zpj || 0 }})</el-radio>
+										<el-radio label="1">好评({{ infomation.hp || 0 }})</el-radio>
+										<el-radio label="2">中评({{ infomation.zp || 0 }})</el-radio>
+										<el-radio label="3">差评({{ infomation.cp || 0 }})</el-radio>
 									</el-radio-group>
 								</el-tab-pane>
 							</el-tabs>
@@ -175,7 +175,7 @@ export default {
 						this.infomation = {
 							...data,
 							minPrice: (+data['hlf_zd']) + (+data['cwf_zd']) + (+data['ssf_zd']) || 0,
-							maxPrice: (+data['hlf_zd']) + (+data['cwf_zd']) + (+data['ssf_zd']) || 0
+							maxPrice: (+data['hlf_zg']) + (+data['cwf_zg']) + (+data['ssf_zg']) || 0
 						}
 
 						if (['10', '20', '21', '22', '23'].includes(data.dwxz)) {
@@ -199,6 +199,18 @@ export default {
 						]
 						this.loading = false
 					})
+					getProduction(p).then(({ code, rows }) => {
+						if (code !== 200) return
+						console.log('产品列表：' + rows)
+					})
+					getTradingRecord(p).then(({ code, rows }) => {
+						if (code !== 200) return
+						console.log('交易信息：' + rows)
+					})
+					getEvaluate(p).then(({ code, rows }) => {
+						if (code !== 200) return
+						console.log('历史评价：' + rows)
+					})
 				}
 			}
 		}
@@ -207,9 +219,6 @@ export default {
 		handleClose() {
 			this.$emit('update:visible', this.isOpen)
 		},
-		tabClick(tab) {
-			console.log(this.activeName)
-		},
 		evaluateChange(value) {
 			console.log(value)
 		},
@@ -235,6 +244,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
+@import "@/assets/styles/bigScreen";
 
 .line {
 	height: 26px;
@@ -245,28 +255,6 @@ export default {
 	align-items: center;
 }
 
-::v-deep .el-dialog {
-	.el-dialog__header {
-		padding: 0;
-	}
-
-	.el-dialog__headerbtn {
-		top: 10px;
-		right: 10px;
-		z-index: 1;
-		font-size: 24px;
-	}
-
-	.el-dialog__body {
-		padding: 20px 10px 20px 20px;
-
-		.scroll-wrap {
-			height: 82vh;
-			padding-right: 10px;
-		}
-	}
-}
-
 header {
 	h4 {
 		font-size: 24px;

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

@@ -1,6 +1,6 @@
 <template>
 	<div>
-		<el-dialog :visible.sync="isOpen" width="800px" @close="handleClose" append-to-body>
+		<el-dialog :visible.sync="isOpen" width="1000px" @close="handleClose" append-to-body>
 			<el-scrollbar wrapClass="scroll-wrap">
 				<article>
 					<p>设备类型：手环</p>
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import { 	getSmartDetails, } from '@/api/bigScreen'
+import { getSmartDetails } from '@/api/bigScreen'
 
 export default {
 	name: 'SmartInfo',
@@ -29,51 +29,38 @@ export default {
 	},
 	data() {
 		return {
-			isOpen: false,
-		};
+			isOpen: false
+		}
 	},
 	computed: {},
 	watch: {
-		visible(newVal) {this.isOpen = newVal;},
+		visible: {
+			immediate: true,
+			handler(newVal) {this.isOpen = newVal}
+		},
 		id: {
 			deep: true,
 			handler(newVal) {
 				if (newVal) {
-					console.log(newVal);
+					getSmartDetails({ id: newVal }).then(({ code, data }) => {
+						if (code !== 200) return
+						this.info = data
+						console.log(data)
+					})
 				}
 			}
 		}
 	},
 	methods: {
 		handleClose() {
-			this.$emit('update:visible', this.isOpen);
-		},
+			this.$emit('update:visible', this.isOpen)
+		}
 	}
-};
+}
 </script>
 
 <style scoped lang="scss">
-::v-deep .el-dialog {
-	.el-dialog__header {
-		padding: 0;
-	}
-
-	.el-dialog__headerbtn {
-		top: 10px;
-		right: 10px;
-		z-index: 1;
-		font-size: 24px;
-	}
-
-	.el-dialog__body {
-		padding: 20px 10px 20px 20px;
-
-		.scroll-wrap {
-			height: 30vh;
-			padding-right: 10px;
-		}
-	}
-}
+@import "@/assets/styles/bigScreen";
 
 article {
 	display: flex;