nanMing 1 rok pred
rodič
commit
b38b6412c8

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

@@ -10,8 +10,8 @@
 						<td rowspan="5">
 							<el-image
 								style="width: 100%; height: 100%" fit="cover"
-								:src="require('@/assets/images/bigScreen/jg_1.png')"
-								:preview-src-list="[require('@/assets/images/bigScreen/jg_1.png')]"
+								:src="info.photo"
+								:preview-src-list="[info.photo]"
 							>
 							</el-image>
 						</td>

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

@@ -31,13 +31,13 @@
 							</div>
 							<div class="cate line">
 								<p class="price">
-									<span>床位费</span><b>¥{{ infomation.cwf_zd || 0 }} - ¥{{ infomation.cwf_zg || 0 }}</b>
+									<span>床位费</span><b>¥{{ infomation['cwf_zd'] || 0 }} - ¥{{ infomation['cwf_zd'] || 0 }}</b>
 								</p>
 								<p class="price">
-									<span>护理费</span><b>¥{{ infomation.hlf_zd || 0 }} - ¥{{ infomation.hlf_zg || 0 }}</b>
+									<span>护理费</span><b>¥{{ infomation['hlf_zd'] || 0 }} - ¥{{ infomation['hlf_zd'] || 0 }}</b>
 								</p>
 								<p class="price">
-									<span>膳食费</span><b>¥{{ infomation.ssf_zd || 0 }} - ¥{{ infomation.ssf_zg || 0 }}</b>
+									<span>膳食费</span><b>¥{{ infomation['ssf_zd'] || 0 }} - ¥{{ infomation['ssf_zd'] || 0 }}</b>
 								</p>
 								<span>(温馨提示:月价格仅供参考)</span>
 							</div>
@@ -77,9 +77,9 @@
 								<el-tab-pane label="收费标准" name="1">
 									<el-table :data="ratesData" border style="width: 100%">
 										<el-table-column prop="lb" label="收费类别" align="center"></el-table-column>
-										<el-table-column prop="xm" label="收费项目" align="center"></el-table-column>
+										<!--<el-table-column prop="xm" label="收费项目" align="center"></el-table-column>-->
 										<el-table-column prop="price" label="参考价格" align="center"></el-table-column>
-										<el-table-column prop="note" label="备注" align="center"></el-table-column>
+										<!--<el-table-column prop="note" label="备注" align="center"></el-table-column>-->
 									</el-table>
 								</el-tab-pane>
 								<el-tab-pane label="服务产品" name="2">
@@ -141,16 +141,13 @@ export default {
 				// { name: '内设医疗机构', bgColor: '#ffedc3', color: '#b68100' },
 				// { name: '医疗机构合作', bgColor: '#dcf3ed', color: '#48a48e' }
 			],
+			// 轮播图列表
 			carousel: [],
+			// 收费标准
 			ratesData: [
-				{ lb: '床位费', xm: '双人间(无卫生间)', price: '¥5500', note: '' },
-				{ lb: '床位费', xm: '单人间(小)', price: '¥6000', note: '' },
-				{ lb: '床位费', xm: '双人间(独立卫生间)', price: '¥6500', note: '' },
-				{ lb: '床位费', xm: '单人间(大)', price: '¥6500', note: '' },
-				{ lb: '护理费', xm: '自理、轻度失能、中度失能、重度失能 (护理费2800-9800)', price: '¥2800', note: '' },
-				{ lb: '护理费', xm: '一对一护理', price: '¥12800', note: '' },
-				{ lb: '伙食费', xm: '伙食费', price: '¥1500', note: '' }
+				// { lb: '床位费', xm: '双人间(无卫生间)', price: '¥5500', note: '' },
 			],
+			// 交易记录
 			tradeData: [
 				{ time: '20230719', addr: '英雄街道', lb: '护理费', price: '¥2800', name: '五晓峰' },
 				{ time: '20230719', addr: '英雄街道', lb: '护理费', price: '¥2800', name: '五晓峰' },
@@ -162,7 +159,10 @@ export default {
 	},
 	computed: {},
 	watch: {
-		visible(newVal) {this.isOpen = newVal},
+		visible: {
+			immediate: true,
+			handler(newVal) {this.isOpen = newVal}
+		},
 		id: {
 			deep: true,
 			handler(newVal) {
@@ -174,8 +174,8 @@ export default {
 						if (code !== 200) return
 						this.infomation = {
 							...data,
-							minPrice: (+data.hlf_zd) + (+data.cwf_zd) + (+data.ssf_zd) || 0,
-							maxPrice: (+data.hlf_zg) + (+data.cwf_zg) + (+data.ssf_zg) || 0
+							minPrice: (+data['hlf_zd']) + (+data['cwf_zd']) + (+data['ssf_zd']) || 0,
+							maxPrice: (+data['hlf_zd']) + (+data['cwf_zd']) + (+data['ssf_zd']) || 0
 						}
 
 						if (['10', '20', '21', '22', '23'].includes(data.dwxz)) {
@@ -191,8 +191,13 @@ export default {
 						}
 
 						this.carousel = data['jg_url']?.split(',')
+						this.ratesData = [
+							{ lb: '床位费', price: data['cwf_zg'] ? `¥${data['cwf_zd']} - ¥${data['cwf_zg']}` : '¥0' },
+							{ lb: '护理费', price: data['hlf_zg'] ? `¥${data['hlf_zd']} - ¥${data['hlf_zg']}` : '¥0' },
+							{ lb: '膳食费', price: data['ssf_zg'] ? `¥${data['ssf_zd']} - ¥${data['ssf_zg']}` : '¥0' },
+							{ lb: '其他收费', price: data['qtsf_zg'] ? `¥${data['qtsf_zd']} - ¥${data['qtsf_zg']}` : '¥0' }
+						]
 						this.loading = false
-						console.log(this.infomation)
 					})
 				}
 			}

+ 16 - 1
ruoyi-ui/vue.config.js

@@ -53,12 +53,27 @@ module.exports = {
         }
       },
       '/uploadPath': {
-        target: `http://localhost:8080/file/uploadPath`,
+        // target: `http://localhost:8080/uploadPath`,
+        target: `http://121.36.73.159:801/uploadPath`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + '/uploadPath']: ''
         }
       },
+      '/getxflrinfo': {
+        target: `http://121.36.73.159:8090/getxflrinfo`,
+        changeOrigin: true,
+        pathRewrite: {
+          ['^' + '/getxflrinfo']: ''
+        }
+      },
+      '/getxflrdata': {
+        target: `http://121.36.73.159:8090/getxflrdata`,
+        changeOrigin: true,
+        pathRewrite: {
+          ['^' + '/getxflrdata']: ''
+        }
+      },
       '/mzylfwobs': {
         target: `http://localhost:8080/file/mzylfwobs`,
         changeOrigin: true,