Sfoglia il codice sorgente

对接接口,并修改问题

wql2000518 4 mesi fa
parent
commit
5a459e4aff

+ 1 - 1
components/chart/table.vue

@@ -11,7 +11,7 @@
 			</view>
 			<view class="tb" v-for="(item1,index1) in item.params" :key="index1" :style="{color: fontColor(item1)}">
 				<template v-if="item1.status !== undefined && item1.data === undefined">
-					<view :class="item1.status ? 'success' : 'error'"></view>
+					<view :class="item1.status === 'true' || item1.status === 1 ? 'success' : 'error'"></view>
 				</template>
 				<template v-else>{{ item1.data ? item1.data : item1 }}</template>
 			</view>

+ 2 - 0
main.js

@@ -6,6 +6,7 @@ import cmjAnimation from './components/cmj-animation.vue'
 import barChart from './components/chart/barChart'
 import table from './components/chart/table'
 import electronChart from './components/electron-chart/electron-chart'
+import service from './utils/http.js'
 
 Vue.component('page-header', pageHeader)
 Vue.component('page-card', pageCard)
@@ -14,6 +15,7 @@ Vue.component('cmj-animation', cmjAnimation)
 Vue.component('bar-chart', barChart)
 Vue.component('simple-table', table)
 Vue.component('electron-chart', electronChart)
+Vue.prototype.$http = service
 // #ifndef VUE3
 import Vue from 'vue'
 import './uni.promisify.adaptor'

+ 38 - 2
pages.json

@@ -163,13 +163,19 @@
 			}
 		},
 		{
-			"path": "pages/data/gs-system/shgs",
+			"path": "pages/data/gs-system/shs",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path": "pages/data/gs-system/shzs",
+			"path": "pages/data/gs-system/xfs",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/data/gs-system/scs",
 			"style": {
 				"navigationStyle": "custom"
 			}
@@ -187,10 +193,40 @@
 			}
 		},
 		{
+			"path": "pages/data/rl-system/xgl",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
 			"path": "pages/data/znjc/page",
 			"style": {
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/data/supply-water/supply-room/room1065",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/data/transport/belt/belt07",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/data/transport/belt/jxpdjk",
+			"style": {
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/data/transport/belt/emss",
+			"style": {
+				"navigationStyle": "custom"
+			}
 		}
 	],
 	"globalStyle": {

+ 10 - 1
pages/data/cj-system/gzm.vue

@@ -63,10 +63,19 @@
 				}]
 			}
 		},
-		onLoad(option) {},
+		onLoad(option) {
+			this.getData()
+		},
 		methods: {
 			goBack() { // 返回上一頁面
 				uni.navigateBack()
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/gzm`,
+					method: 'POST'
+				})
+				this.tableList = res.data.data.tableList
 			}
 		}
 	}

+ 12 - 14
pages/data/cj-system/kjky.vue

@@ -23,19 +23,6 @@
 	export default {
 		data() {
 			return {
-				list: [{
-					name: '主风机',
-					status: {
-						name: '风门',
-						status: 1
-					}
-				}, {
-					name: '副风机',
-					status: {
-						name: '风门',
-						status: 0
-					}
-				}],
 				tableHead: ['巷道', '测点', '压力', '开关量'],
 				tableList: [{
 					name: '运输巷',
@@ -77,10 +64,21 @@
 				}]
 			}
 		},
-		onLoad(option) {},
+		onLoad(option) {
+			this.getData()
+		},
 		methods: {
 			goBack() { // 返回上一頁面
 				uni.navigateBack()
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/kjky`,
+					method: 'POST'
+				})
+				this.tableList = res.data.data.tableList
+				this.tableList1 = res.data.data.tableList1
+				this.tableList2 = res.data.data.tableList2
 			}
 		}
 	}

+ 10 - 14
pages/data/cj-system/kjsp.vue

@@ -17,19 +17,6 @@
 	export default {
 		data() {
 			return {
-				list: [{
-					name: '主风机',
-					status: {
-						name: '风门',
-						status: 1
-					}
-				}, {
-					name: '副风机',
-					status: {
-						name: '风门',
-						status: 0
-					}
-				}],
 				tableHead: ['参数', '数值'],
 				tableList: [{
 					name: '1#内部温度',
@@ -145,10 +132,19 @@
 				}]
 			}
 		},
-		onLoad(option) {},
+		onLoad(option) {
+			this.getData()
+		},
 		methods: {
 			goBack() { // 返回上一頁面
 				uni.navigateBack()
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/kjsp`,
+					method: 'POST'
+				})
+				this.tableList = res.data.data.tableList
 			}
 		}
 	}

+ 509 - 49
pages/data/electron/line-picture/line-picture.vue

@@ -2,19 +2,14 @@
 	<view class="page-body">
 		<page-header :name="pageName" :bg="'#1560e0'" :showLeft="true" @goBack="goBack()"></page-header>
 		<view class="scroll-wrap">
-			<view class="basic-info-wrap">
+			<!-- <view class="basic-info-wrap">
 				<electron-chart></electron-chart>
 				<view class="radius-wrap"></view>
-			</view>
+			</view> -->
 			<view class="detail-info-wrap">
-				<page-card style="margin-bottom: 30rpx;" :notShow="true" :name="'引自35KV变5211变电箱信息'">
-					<template v-slot:content>
-						<simple-table class="card-table" :tableHead="tableHead" :list="list"></simple-table>
-					</template>
-				</page-card>
-				<page-card style="margin-bottom: 30rpx;" :notShow="true" :name="'引自35KV变5110变电箱信息'">
+				<page-card v-for="(item,index) in list"  style="margin-bottom: 30rpx;" :notShow="true" :name="item.name">
 					<template v-slot:content>
-						<simple-table class="card-table" :tableHead="tableHead" :list="list"></simple-table>
+						<simple-table class="card-table" :tableHead="tableHead" :list="item.params"></simple-table>
 					</template>
 				</page-card>
 			</view>
@@ -26,47 +21,512 @@
 	export default {
 		data() {
 			return {
-				tableHead: ['名称', 'Q:kVar', 'p:kw', 'Uab:V', 'cos', 'Ia:A'], // 表头名称
+				tableHead: ['名称', '参数'], // 表头名称
 				pageName: '',
-				list: [{ // 列表数据
-					name: 5401,
-					params: [0, 0, 0, 0, 0]
-				}, {
-					name: 5402,
-					params: [0, 0, 0, 0, 0]
-				}, {
-					name: 5403,
-					params: [0, 0, 0, 0, 0]
-				}, {
-					name: 5404,
-					params: [0, 0, 0, 0, 0]
-				}, {
-					name: 5405,
-					params: [0, 0, 0, 0, 0]
-				}, {
-					name: 5406,
-					params: [0, 0, 0, 0, 0]
-				}, {
-					name: 5407,
-					params: [124.8, 124.8, 124.8, 124.8, 124.8]
-				}, {
-					name: 5408,
-					params: [0, 0, 0, 0, 0]
-				}, {
-					name: 5409,
-					params: [0, 0, 0, 0, 0]
-				}, {
-					name: 5410,
-					params: [0, 0, 0, 0, 0]
-				}, {
-					name: 5411,
-					params: [0, 0, 0, 0, 0]
-				}, {
-					name: 5412,
-					params: [0, 0, 0, 0, 0]
-				}, {
-					name: 500,
-					params: [0, 0, 0, 0, 0]
+				list: [{
+					name: 'I路进线',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: 'III路进线',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: '+786m车场南翼移变',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: '变电所1#移变',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: '07机巷中部移变',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: '06机巷配电点',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: '2#移动变电站',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: '6#主排水泵',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: '5#主排水泵',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: '备用',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: '联络',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: '4#移动变电站',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: '3#主排水泵',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: '2#主排水泵',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: '1#主排水泵',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: '备用',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: '备用',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: '备用',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: '3#移变风机专变',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: 'II路进线',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
+				},{
+					name: 'IV路进线',
+					params: [{
+						name: '母线AB相电压Uab',
+						params: ['0.00']
+					},{
+						name: '母线BC相电压Ubc',
+						params: ['0.00']
+					},{
+						name: 'A相电流Ia',
+						params: ['0.00']
+					},{
+						name: 'C相电流Ic',
+						params: ['0.00']
+					},{
+						name: '有功功率P',
+						params: ['0.00']
+					},{
+						name: '无功功率Q',
+						params: ['0.00']
+					},{
+						name: '功率因素',
+						params: ['0.00']
+					}]
 				}]
 			}
 		},

+ 43 - 39
pages/data/gs-system/shgs.vue

@@ -20,7 +20,8 @@
 						<view class="detail-wrap">
 							<template v-for="(item, index) in statusList">
 								<view class="item" v-if="!item.data">
-									<status-tip class="status-wrap" :name="item.name" :status="item.status"></status-tip>
+									<status-tip class="status-wrap" :name="item.name"
+										:status="item.status"></status-tip>
 								</view>
 								<view class="item" v-else>
 									<view>{{ item.name }}</view>
@@ -35,7 +36,8 @@
 						<view class="detail-wrap">
 							<template v-for="(item, index) in statusList1">
 								<view class="item" v-if="!item.data">
-									<status-tip class="status-wrap" :name="item.name" :status="item.status"></status-tip>
+									<status-tip class="status-wrap" :name="item.name"
+										:status="item.status"></status-tip>
 								</view>
 								<view class="item" v-else>
 									<view>{{ item.name }}</view>
@@ -66,6 +68,15 @@
 				}, {
 					name: '清水池液位',
 					data: '2.69m'
+				}, {
+					name: '供水压力高报',
+					data: '0.0MPa'
+				}, {
+					name: '供水压力低报',
+					data: '0.0MPa'
+				}, {
+					name: '供水压力低报',
+					data: '0.0MPa'
 				}],
 				statusList: [{
 					name: '1#阀门',
@@ -84,63 +95,55 @@
 					status: 1,
 				}],
 				statusList1: [{
-					name: '报警水位',
-					status: 1,
-				}, {
-					name: '消防报警水位',
-					status: 1,
-				}, {
-					name: '出口压力低PJ5',
+					name: 'QSC水位低',
 					status: 1,
 				}, {
-					name: '消防溢流水位',
+					name: '主泵2过热',
 					status: 1,
 				}, {
-					name: 'JK压力低PJ6',
+					name: '稳压泵过热',
 					status: 1,
 				}, {
-					name: '系统故障',
+					name: '主泵3过热',
 					status: 1,
 				}, {
-					name: '出口压力低',
+					name: 'JK压力低PJ4',
 					status: 1,
 				}, {
-					name: '溢流水位',
+					name: '主泵4过热',
 					status: 1,
 				}, {
-					name: '出口压力高',
+					name: 'CK压力低PJ1',
 					status: 1,
 				}, {
 					name: '控制柜自动',
 					status: 1,
 				}, {
-					name: '软启动器1故障',
+					name: 'CK压力低PJ2',
 					status: 1,
 				}, {
 					name: '控制柜手动',
 					status: 1,
-				}, {
-					name: '软启动器2故障',
-					status: 1,
-				}, {
-					name: '变频器故障',
-					status: 1,
-				}, {
-					name: '软启动器3故障',
-					status: 1,
-				}, {
-					name: '管道漏水',
-					status: 1,
 				}],
 				pageData: {}
 			}
 		},
 		onLoad(option) {
 			this.pageData = JSON.parse(option.data)
+			this.getData()
 		},
 		methods: {
 			goBack() { // 返回上一頁面
 				uni.navigateBack()
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/scs`,
+					method: 'POST'
+				})
+				this.list = res.data.data.list
+				this.statusList = res.data.data.statusList
+				this.statusList1 = res.data.data.statusList1
 			}
 		}
 	}
@@ -213,62 +216,63 @@
 					border-radius: 35rpx 35rpx 0 0;
 				}
 			}
-			
+
 			.detail-info-wrap {
 				padding: 40rpx 35rpx;
-				
+
 				.detail-wrap {
 					display: flex;
 					flex-wrap: wrap;
 					padding: 35rpx 55rpx 18rpx 55rpx;
 					color: #8D8D8D;
+
 					.item {
 						display: flex;
 						font-size: 26rpx;
 						justify-content: space-between;
 						width: calc(50% - 61rpx);
 						margin-bottom: 50rpx;
-						
+
 						.params {
 							color: #00BD00;
 						}
-						
+
 						.status-wrap {
 							width: 100%;
-							
+
 							/deep/ .tip-wrap {
 								width: 100%;
 								justify-content: space-between;
 							}
 						}
 					}
-					
+
 					.item:nth-child(2n) {
 						margin-left: 120rpx;
 					}
 				}
-				
+
 				.params-wrap {
 					display: flex;
 					flex-wrap: wrap;
 					font-size: 26rpx;
 					padding: 35rpx 55rpx;
-					
+
 					.item {
 						width: calc(50% - 32rpx);
 						display: flex;
 						justify-content: space-between;
 						margin-top: 50rpx;
-						
+
 						view:first-child {
 							color: #8D8D8D;
 						}
 					}
-					
+
 					.item:nth-child(2n) {
 						margin-left: 62rpx;
 					}
-					
+
 					.item:nth-child(-n+2) {
 						margin-top: 0;
 					}

+ 10 - 1
pages/data/gs-system/shzs.vue

@@ -62,7 +62,7 @@
 					data: '25.00A'
 				}, {
 					name: '供电压力',
-					data: '0.45MPa'
+					data: '3.45V'
 				}, {
 					name: '设定压力',
 					data: '0.20MPa'
@@ -94,10 +94,19 @@
 		},
 		onLoad(option) {
 			this.pageData = JSON.parse(option.data)
+			this.getData()
 		},
 		methods: {
 			goBack() { // 返回上一頁面
 				uni.navigateBack()
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/shs`,
+					method: 'POST'
+				})
+				this.list = res.data.data.list
+				this.statusList = res.data.data.statusList
 			}
 		}
 	}

+ 322 - 0
pages/data/gs-system/xfs.vue

@@ -0,0 +1,322 @@
+<template>
+	<view class="page-body">
+		<page-header :name="pageData.name" :bg="'#1560e0'" :showLeft="true" @goBack="goBack()"></page-header>
+		<view class="scroll-wrap">
+			<view class="basic-info-wrap">
+				<view class="info-wrap">
+					<view v-for="(item,index) in list" class="data-item-wrap">
+						<view class="title">{{ item.name }}</view>
+						<view class="data">{{ item.data }}</view>
+					</view>
+				</view>
+				<view class="img-wrap">
+					<image src="@/static/pool.png" />
+				</view>
+				<view class="radius-wrap"></view>
+			</view>
+			<view class="detail-info-wrap">
+				<page-card style="margin-bottom: 30rpx;" :notShow="true" :name="'设备状态'">
+					<template v-slot:content>
+						<view class="detail-wrap">
+							<template v-for="(item, index) in statusList">
+								<view class="item" v-if="!item.data">
+									<status-tip class="status-wrap" :name="item.name"
+										:status="item.status"></status-tip>
+								</view>
+								<view class="item" v-else>
+									<view>{{ item.name }}</view>
+									<view class="params">{{ item.data }}</view>
+								</view>
+							</template>
+						</view>
+					</template>
+				</page-card>
+				<page-card style="margin-bottom: 30rpx;" :notShow="true" :name="'水泵故障'">
+					<template v-slot:content>
+						<view class="detail-wrap">
+							<template v-for="(item, index) in statusList1">
+								<view class="item" v-if="!item.data">
+									<status-tip class="status-wrap" :name="item.name"
+										:status="item.status"></status-tip>
+								</view>
+								<view class="item" v-else>
+									<view>{{ item.name }}</view>
+									<view class="params">{{ item.data }}</view>
+								</view>
+							</template>
+						</view>
+					</template>
+				</page-card>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [{
+					name: '管道压力',
+					data: '0.45MPa'
+				}, {
+					name: '瞬时流量',
+					data: '20.12m³/h'
+				}, {
+					name: '累计流量',
+					data: '39589m³'
+				}, {
+					name: '清水池液位',
+					data: '2.69m'
+				}, {
+					name: '供水压力高报值',
+					data: '2.69m'
+				}, {
+					name: '供水压力低报值',
+					data: '2.69m'
+				}, {
+					name: '液位高报值',
+					data: '2.69m'
+				}, {
+					name: '液位低报值',
+					data: '2.69m'
+				}, {
+					name: '液位控制下限',
+					data: '2.69m'
+				}, {
+					name: '变频运行频率',
+					data: '38.50Hz'
+				}, {
+					name: '变频运行电流',
+					data: '16.50Hz'
+				}, {
+					name: '仪表设定压力',
+					data: '0.50MPa'
+				}, {
+					name: '仪表反馈压力',
+					data: '0.49MPa'
+				}, {
+					name: '变频故障代码',
+					data: '0.00'
+				}],
+				statusList: [{
+					name: '1#阀门',
+					status: 1,
+				}, {
+					name: '2#阀门',
+					status: 1,
+				}, {
+					name: '3#阀门',
+					status: 1,
+				}, {
+					name: '4#阀门',
+					status: 1,
+				}, {
+					name: '稳压',
+					status: 1,
+				}],
+				statusList1: [{
+					name: '报警水位',
+					status: 1,
+				}, {
+					name: '消防报警水位',
+					status: 1,
+				}, {
+					name: '出口压力低PJ5',
+					status: 1,
+				}, {
+					name: '消防溢流水位',
+					status: 1,
+				}, {
+					name: 'JK压力低PJ6',
+					status: 1,
+				}, {
+					name: '系统故障',
+					status: 1,
+				}, {
+					name: '出口压力低',
+					status: 1,
+				}, {
+					name: '溢流水位',
+					status: 1,
+				}, {
+					name: '出口压力高',
+					status: 1,
+				}, {
+					name: '控制柜自动',
+					status: 1,
+				}, {
+					name: '软启动器1故障',
+					status: 1,
+				}, {
+					name: '控制柜手动',
+					status: 1,
+				}, {
+					name: '软启动器2故障',
+					status: 1,
+				}, {
+					name: '变频器故障',
+					status: 1,
+				}, {
+					name: '软启动器3故障',
+					status: 1,
+				}, {
+					name: '管道漏水',
+					status: 1,
+				}],
+				pageData: {}
+			}
+		},
+		onLoad(option) {
+			this.pageData = JSON.parse(option.data)
+			this.getData()
+		},
+		methods: {
+			goBack() { // 返回上一頁面
+				uni.navigateBack()
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/xfs`,
+					method: 'POST'
+				})
+				this.list = res.data.data.list
+				this.statusList = res.data.data.statusList
+				this.statusList1 = res.data.data.statusList1
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.page-body {
+		.scroll-wrap {
+			height: calc(100vh - 85rpx);
+			overflow: scroll;
+
+			.basic-info-wrap {
+				position: relative;
+				height: auto;
+				padding: 50rpx 49rpx 0;
+				background: url(../../../static/page_bg.png);
+				background-size: 200%;
+
+				.info-wrap {
+					display: flex;
+					flex-wrap: wrap;
+
+					.data-item-wrap {
+						width: 33.33%;
+						padding: 9rpx 0;
+						min-height: 81rpx;
+						text-align: center;
+						margin-top: 48rpx;
+						border-right: 1px solid #FFFFFF;
+
+						.title {
+							font-size: 22rpx;
+							color: #FFFFFF;
+							margin-bottom: 14rpx;
+						}
+
+						.data {
+							font-weight: 700;
+							font-size: 32rpx;
+							color: #FFF600;
+						}
+					}
+
+					.data-item-wrap:nth-child(-n+3) {
+						margin-top: 0;
+					}
+
+					.data-item-wrap:nth-child(3n) {
+						border: none;
+					}
+				}
+
+				.img-wrap {
+					padding: 38rpx 0 57rpx;
+					text-align: center;
+
+					image {
+						width: 350rpx;
+						height: 194rpx;
+					}
+				}
+
+				.radius-wrap {
+					position: absolute;
+					left: 0;
+					bottom: 0;
+					width: 100vw;
+					height: 30rpx;
+					background-color: #fff;
+					border-radius: 35rpx 35rpx 0 0;
+				}
+			}
+
+			.detail-info-wrap {
+				padding: 40rpx 35rpx;
+
+				.detail-wrap {
+					display: flex;
+					flex-wrap: wrap;
+					padding: 35rpx 55rpx 18rpx 55rpx;
+					color: #8D8D8D;
+
+					.item {
+						display: flex;
+						font-size: 26rpx;
+						justify-content: space-between;
+						width: calc(50% - 61rpx);
+						margin-bottom: 50rpx;
+
+						.params {
+							color: #00BD00;
+						}
+
+						.status-wrap {
+							width: 100%;
+
+							/deep/ .tip-wrap {
+								width: 100%;
+								justify-content: space-between;
+							}
+						}
+					}
+
+					.item:nth-child(2n) {
+						margin-left: 120rpx;
+					}
+				}
+
+				.params-wrap {
+					display: flex;
+					flex-wrap: wrap;
+					font-size: 26rpx;
+					padding: 35rpx 55rpx;
+
+					.item {
+						width: calc(50% - 32rpx);
+						display: flex;
+						justify-content: space-between;
+						margin-top: 50rpx;
+
+						view:first-child {
+							color: #8D8D8D;
+						}
+					}
+
+					.item:nth-child(2n) {
+						margin-left: 62rpx;
+					}
+
+					.item:nth-child(-n+2) {
+						margin-top: 0;
+					}
+				}
+			}
+		}
+	}
+</style>

+ 14 - 20
pages/data/index.vue

@@ -44,14 +44,16 @@
 						path: `/pages/data/znjc/page`,
 						src: 'http://anstatic.nxmy.com:8011/assets/html/zhks-quankuang/ningmeijituan/video_ws/video_XXX/?mine_code=qingshuiying_jituan#/'
 					}]
-				},{
+				}, {
 					name: '排水系统',
 					children: [{
 						name: '+786m水泵房',
-						path: `/pages/data/supply-water/supply-room/supply-room`
+						path: `/pages/data/supply-water/supply-room/supply-room`,
+						params: `786`
 					}, {
 						name: '+1065m水泵房',
-						path: `/pages/data/supply-water/supply-room/supply-room`
+						path: `/pages/data/supply-water/supply-room/room1065`,
+						params: `1065`
 					}]
 				}, {
 					name: '提升系统',
@@ -81,14 +83,7 @@
 					name: '通风系统',
 					children: [{
 						name: '主通风机监控系统',
-						path: '/pages/data/ventilation/air-system/air-system',
-						children: [{
-							name: '1#风机',
-							status: 1
-						}, {
-							name: '2#风机',
-							status: 0
-						}]
+						path: '/pages/data/ventilation/air-system/air-system'
 					}, {
 						name: '制氮监控系统',
 						path: '/pages/data/nitrogen/compress-system/compress-system'
@@ -113,26 +108,26 @@
 							path: '/pages/data/transport/belt/belt'
 						}, {
 							name: '主运输07风巷皮带',
-							path: '/pages/data/transport/belt/belt'
+							path: '/pages/data/transport/belt/belt07'
 						}, {
 							name: '井下皮带监控',
-							path: '/pages/data/transport/belt/belt'
+							path: '/pages/data/transport/belt/jxpdjk'
 						}, {
 							name: '二煤上山皮带监控',
-							path: '/pages/data/transport/belt/belt'
+							path: '/pages/data/transport/belt/emss'
 						}
 					]
 				}, {
 					name: '供水系统',
 					children: [{
 						name: '生活水供水监控',
-						path: '/pages/data/gs-system/shzs'
+						path: '/pages/data/gs-system/shs'
 					}, {
 						name: '消防供水监控',
-						path: '/pages/data/gs-system/shgs'
+						path: '/pages/data/gs-system/xfs'
 					}, {
 						name: '生产水供水监控',
-						path: '/pages/data/gs-system/shgs'
+						path: '/pages/data/gs-system/scs'
 					}]
 				}, {
 					name: '热力系统',
@@ -141,7 +136,7 @@
 						path: '/pages/data/rl-system/rqgl'
 					}, {
 						name: '新锅炉房监控',
-						path: '/pages/data/rl-system/rqgl'
+						path: '/pages/data/rl-system/xgl'
 					}, {
 						name: '换热站监控',
 						path: '/pages/data/rl-system/hrz'
@@ -165,7 +160,6 @@
 			}
 		},
 		onLoad() {
-
 		},
 		methods: {
 			tabChange(index) {
@@ -175,7 +169,7 @@
 				uni.navigateTo({
 					url: item.path + `?data=${JSON.stringify(item)}`
 				})
-			}
+			},
 		}
 	}
 </script>

+ 74 - 63
pages/data/nitrogen/compress-system/compress-system.vue

@@ -6,14 +6,15 @@
 				<view class="info-wrap">
 				</view>
 				<view class="img-wrap">
-					<image src="@/static/nitrogen-static.png"/>
+					<image src="@/static/nitrogen-static.png" />
 				</view>
 				<view class="radius-wrap"></view>
 			</view>
 			<view class="detail-info-wrap">
-				<page-card v-for="(item,index) in 4" :key="index" style="margin-bottom: 30rpx;" :notShow="true" :name="`${index + 1}#制氮机`">
+				<page-card v-for="(item,index) in paramsList" :key="index" style="margin-bottom: 30rpx;" :notShow="true"
+					:name="`${index + 1}#制氮机`">
 					<template v-slot:content>
-						<simple-table :tableHead="tableHead" :list="paramsList"></simple-table>
+						<simple-table :tableHead="tableHead" :list="item.params"></simple-table>
 					</template>
 				</page-card>
 			</view>
@@ -27,69 +28,72 @@
 			return {
 				pageData: {}, // 页面数据
 				tableHead: ['名称', '参数状态'], // 页头
-				paramsList: [{ // 参数列表
-						name: '1号阀',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: '2号阀',
-						params: [{
-							status: 0
-						}]
-					},
-					{
-						name: '3号阀',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: '排空阀',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: '系统阀',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: '送气阀',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: '4号阀',
-						params: [{
-							status: 0
-						}]
-					},
-					{
-						name: '空气罐压力(Mpa)',
-						params: ['0.00']
-					},
-					{
-						name: '氨气罐压力(Mpa)',
-						params: ['0.00']
-					},
-					{
-						name: '氧气含量(%)',
-						params: ['0.00']
-					},
-					{
-						name: '瞬时流量(m³/h)',
-						params: ['00.00']
-					}
-				]
+				paramsList: [{
+					params: [{ // 参数列表
+							name: '1号阀',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: '2号阀',
+							params: [{
+								status: 0
+							}]
+						},
+						{
+							name: '3号阀',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: '排空阀',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: '系统阀',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: '送气阀',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: '4号阀',
+							params: [{
+								status: 0
+							}]
+						},
+						{
+							name: '空气罐压力(Mpa)',
+							params: ['0.00']
+						},
+						{
+							name: '氨气罐压力(Mpa)',
+							params: ['0.00']
+						},
+						{
+							name: '氧气含量(%)',
+							params: ['0.00']
+						},
+						{
+							name: '瞬时流量(m³/h)',
+							params: ['00.00']
+						}
+					]
+				}]
 			}
 		},
 		onLoad(option) {
 			this.pageData = JSON.parse(option.data)
+			this.getData()
 		},
 		methods: {
 			goBack() { // 返回上一頁面
@@ -97,6 +101,13 @@
 			},
 			activeChange(item) { // 状态切换
 				this.activeData = item
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/zdjk`,
+					method: 'POST'
+				})
+				this.paramsList = res.data.data.data
 			}
 		}
 	}
@@ -117,7 +128,7 @@
 
 				.info-wrap {
 					border-bottom: 1rpx dashed #fff;
-					
+
 				}
 
 				.img-wrap {

+ 257 - 122
pages/data/nitrogen/flj_yf.vue

@@ -4,7 +4,7 @@
 		<view class="scroll-wrap">
 			<view class="basic-info-wrap">
 				<view class="info-wrap">
-					<view @click="activeChange(item)" v-for="(item,index) in list"
+					<view @click="activeChange(item,index)" v-for="(item,index) in list"
 						:class="activeData.name === item.name ? 'active item' : 'item'" :key="index">
 						<status-tip class="status-wrap" :name="item.name" :status="item.status"
 							:tip="item.status ? '运行' : '停止'"></status-tip>
@@ -22,7 +22,7 @@
 			<view class="detail-info-wrap">
 				<page-card style="margin-bottom: 30rpx;" :notShow="true" :name="activeData.name">
 					<template v-slot:content>
-						<simple-table :tableHead="tableHead" :list="paramsList"></simple-table>
+						<simple-table :tableHead="tableHead" :list="paramsList[activeIndex]"></simple-table>
 					</template>
 				</page-card>
 			</view>
@@ -36,6 +36,7 @@
 			return {
 				pageData: {},
 				activeData: {},
+				activeIndex: 0,
 				list: [{
 					name: '副立井1#空压机',
 					status: 1
@@ -44,137 +45,271 @@
 					status: 1
 				}],
 				tableHead: ['名称', '参数/状态'],
-				paramsList: [{
-						name: '运行时间(h)',
-						params: ['30439']
-					},
-					{
-						name: '加载时间(s)',
-						params: ['28116']
-					},
-					{
-						name: '排气压力(MPa)',
-						params: ['0.51']
-					},
-					{
-						name: '排气温度(℃)',
-						params: ['80.30']
-					},
-					{
-						name: '电机电流(A)',
-						params: ['0.00']
-					},
-					{
-						name: '油气桶压力(MPa)',
-						params: ['0.58']
-					},
-					{
-						name: '油漆桶温度(℃)',
-						params: ['72.40']
-					},
-					{
-						name: 'KYJ自动运行停机',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: 'KYJ排气压力异常',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: 'KYJ风机接触器故障',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: 'KYJ主接触器故障',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: 'KYJ油压过低',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: 'KYJA\D故障',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: 'KYJ风机过滤',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: 'KYJ排气高温',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: 'KYJ油滤压差',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: 'KYJ相序错误',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: 'KYJ主电机过流',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: 'KYJ空滤压差',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: 'KYJ油细压差',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: '重故障',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: '轻故障',
-						params: [{
-							status: 1
-						}]
-					}
+				paramsList: [
+					[{
+							name: '运行时间(h)',
+							params: ['30439']
+						},
+						{
+							name: '加载时间(s)',
+							params: ['28116']
+						},
+						{
+							name: '排气压力(MPa)',
+							params: ['0.51']
+						},
+						{
+							name: '排气温度(℃)',
+							params: ['80.30']
+						},
+						{
+							name: '电机电流(A)',
+							params: ['0.00']
+						},
+						{
+							name: '油气桶压力(MPa)',
+							params: ['0.58']
+						},
+						{
+							name: '油漆桶温度(℃)',
+							params: ['72.40']
+						},
+						{
+							name: 'KYJ自动运行停机',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ排气压力异常',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ风机接触器故障',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ主接触器故障',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ油压过低',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJA\D故障',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ风机过滤',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ排气高温',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ油滤压差',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ相序错误',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ主电机过流',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ空滤压差',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ油细压差',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: '重故障',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: '轻故障',
+							params: [{
+								status: 1
+							}]
+						}
+					],
+					[{
+							name: '运行时间(h)',
+							params: ['30439']
+						},
+						{
+							name: '加载时间(s)',
+							params: ['28116']
+						},
+						{
+							name: '排气压力(MPa)',
+							params: ['0.51']
+						},
+						{
+							name: '排气温度(℃)',
+							params: ['80.30']
+						},
+						{
+							name: '电机电流(A)',
+							params: ['0.00']
+						},
+						{
+							name: '油气桶压力(MPa)',
+							params: ['0.58']
+						},
+						{
+							name: '油漆桶温度(℃)',
+							params: ['72.40']
+						},
+						{
+							name: 'KYJ自动运行停机',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ排气压力异常',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ风机接触器故障',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ主接触器故障',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ油压过低',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJA\D故障',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ风机过滤',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ排气高温',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ油滤压差',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ相序错误',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ主电机过流',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ空滤压差',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: 'KYJ油细压差',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: '重故障',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: '轻故障',
+							params: [{
+								status: 1
+							}]
+						}
+					]
 				]
 			}
 		},
 		onLoad(option) {
 			this.pageData = JSON.parse(option.data)
-			this.activeData = this.list[0]
+			this.getData()
 		},
 		methods: {
 			goBack() { // 返回上一頁面
 				uni.navigateBack()
 			},
-			activeChange(item) { // 切换状态
+			activeChange(item, index) { // 切换状态
 				this.activeData = item
+				this.activeIndex = index
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/fljyf`,
+					method: 'POST'
+				})
+				this.list = res.data.data.list
+				this.activeData = this.list[0]
+				const mKeys = Object.keys(res.data.data).filter(key => key.startsWith('m'));
+				this.paramsList = mKeys.map(key => {
+					return res.data.data[key]
+				});
 			}
 		}
 	}

+ 129 - 43
pages/data/nitrogen/nitrogen-system/nitrogen-system.vue

@@ -4,8 +4,8 @@
 		<view class="scroll-wrap">
 			<view class="basic-info-wrap">
 				<view class="info-wrap">
-					<view @click="activeChange(item)" v-for="(item,index) in list" :class="activeData.name === item.name ? 'active item' : 'item'"
-						:key="index">
+					<view @click="activeChange(item,index)" v-for="(item,index) in list"
+						:class="activeData.name === item.name ? 'active item' : 'item'" :key="index">
 						<status-tip class="status-wrap" :name="item.name" :status="item.status"
 							:tip="item.status ? '运行' : '停止'"></status-tip>
 					</view>
@@ -22,7 +22,7 @@
 			<view class="detail-info-wrap">
 				<page-card style="margin-bottom: 30rpx;" :notShow="true" :name="activeData.name">
 					<template v-slot:content>
-						<simple-table :tableHead="tableHead" :list="paramsList"></simple-table>
+						<simple-table :tableHead="tableHead" :list="paramsList[activeIndex]"></simple-table>
 					</template>
 				</page-card>
 			</view>
@@ -36,64 +36,150 @@
 			return {
 				pageData: {},
 				activeData: {},
+				activeIndex: 0,
 				list: [{
 					name: '1#空压',
-					status: 1
+					status: 0
 				}, {
 					name: '2#空压',
-					status: 1
+					status: 0
 				}, {
 					name: '3#空压',
-					status: 1
+					status: 0
 				}],
 				tableHead: ['名称', '参数/状态'],
-				paramsList: [{
-						name: '气压(Mpa)',
-						params: ['0.59']
-					},
-					{
-						name: '排空阀',
-						params: [{
-							status: 0
-						}]
-					},
-					{
-						name: '系统阀',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: '送气阀',
-						params: [{
-							status: 1
-						}]
-					},
-					{
-						name: '罐压(Mpa)',
-						params: ['0.59']
-					},
-					{
-						name: '罐温(℃)',
-						params: ['31.0']
-					},
-					{
-						name: '罐报警值(℃)',
-						params: ['120.0']
-					}
+				paramsList: [
+					[{
+							name: '气压(Mpa)',
+							params: ['0.59']
+						},
+						{
+							name: '排空阀',
+							params: [{
+								status: 0
+							}]
+						},
+						{
+							name: '系统阀',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: '送气阀',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: '罐压(Mpa)',
+							params: ['0.59']
+						},
+						{
+							name: '罐温(℃)',
+							params: ['31.0']
+						},
+						{
+							name: '罐报警值(℃)',
+							params: ['120.0']
+						}
+					],
+					[{
+							name: '气压(Mpa)',
+							params: ['0.59']
+						},
+						{
+							name: '排空阀',
+							params: [{
+								status: 0
+							}]
+						},
+						{
+							name: '系统阀',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: '送气阀',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: '罐压(Mpa)',
+							params: ['0.59']
+						},
+						{
+							name: '罐温(℃)',
+							params: ['31.0']
+						},
+						{
+							name: '罐报警值(℃)',
+							params: ['120.0']
+						}
+					],
+					[{
+							name: '气压(Mpa)',
+							params: ['0.59']
+						},
+						{
+							name: '排空阀',
+							params: [{
+								status: 0
+							}]
+						},
+						{
+							name: '系统阀',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: '送气阀',
+							params: [{
+								status: 1
+							}]
+						},
+						{
+							name: '罐压(Mpa)',
+							params: ['0.59']
+						},
+						{
+							name: '罐温(℃)',
+							params: ['31.0']
+						},
+						{
+							name: '罐报警值(℃)',
+							params: ['120.0']
+						}
+					]
 				]
 			}
 		},
 		onLoad(option) {
 			this.pageData = JSON.parse(option.data)
-			this.activeData = this.list[0]
+			this.getData()
 		},
 		methods: {
 			goBack() { // 返回上一頁面
 				uni.navigateBack()
 			},
-			activeChange(item) { // 切换状态
+			activeChange(item, index) { // 切换状态
 				this.activeData = item
+				this.activeIndex = index
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/yfjk`,
+					method: 'POST'
+				})
+				this.list = res.data.data.list
+				this.activeData = this.list[0]
+				const mKeys = Object.keys(res.data.data).filter(key => key.startsWith('data'));
+				this.paramsList = mKeys.map(key => {
+					return res.data.data[key]
+				});
 			}
 		}
 	}
@@ -154,7 +240,7 @@
 						width: 310rpx;
 						height: 138rpx;
 					}
-					
+
 					view {
 						margin-top: 25rpx;
 						color: #fff;

+ 16 - 5
pages/data/rl-system/hrz.vue

@@ -6,7 +6,7 @@
 				<view class="info-wrap">
 					<view v-for="(item,index) in list" class="data-item-wrap">
 						<view class="title">{{ item.name }}</view>
-						<view class="data">{{ item.data }}</view>
+						<view class="data">{{ item.params }}</view>
 					</view>
 				</view>
 				<view class="img-wrap">
@@ -43,13 +43,13 @@
 			return {
 				list: [{
 					name: '水箱液位高报值',
-					data: '0.0m'
+					params: '0.0m'
 				}, {
 					name: '水箱液位低报值',
-					data: '0.0m'
+					params: '0.0m'
 				}, {
 					name: '软化水箱液位',
-					data: '1.30m'
+					params: '1.30m'
 				}],
 				pageData: {},
 				tableHead: ['名称', '进气压力'],
@@ -71,7 +71,7 @@
 					name: '补水泵',
 					params: ['0.36MPa']
 				}],
-				tableHead2: ['名称', '压力', '温度'],
+				tableHead2: ['名称', '温度', '压力'],
 				paramsList2: [{
 					name: '回水罐',
 					params: ['0.38MPa', '-03.09℃']
@@ -83,10 +83,21 @@
 		},
 		onLoad(option) {
 			this.pageData = JSON.parse(option.data)
+			this.getData()
 		},
 		methods: {
 			goBack() { // 返回上一頁面
 				uni.navigateBack()
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/hrz`,
+					method: 'POST'
+				})
+				this.list = res.data.data.list
+				this.paramsList = res.data.data.paramsList
+				this.paramsList1 = res.data.data.paramsList1
+				this.paramsList2 = res.data.data.paramsList2
 			}
 		}
 	}

+ 8 - 0
pages/data/rl-system/rqgl.vue

@@ -66,10 +66,18 @@
 		},
 		onLoad(option) {
 			this.pageData = JSON.parse(option.data)
+			this.getData()
 		},
 		methods: {
 			goBack() { // 返回上一頁面
 				uni.navigateBack()
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/rqgl`,
+					method: 'POST'
+				})
+				this.paramsList = res.data.data.paramsList
 			}
 		}
 	}

+ 24 - 16
pages/data/rl-system/xgl.vue

@@ -27,61 +27,69 @@
 				tableHead: ['名称', '参数'],
 				paramsList: [{
 					name: '1#锅炉',
-					params: ['???℃']
+					params: ['105℃']
 				},{
 					name: '2#锅炉',
-					params: ['???℃']
+					params: ['105℃']
 				},{
 					name: '3#锅炉',
-					params: ['???℃']
+					params: ['106℃']
 				},{
 					name: '4#锅炉',
-					params: ['???℃']
+					params: ['100℃']
 				},{
 					name: '锅炉供水管',
-					params: ['???℃']
+					params: ['120℃']
 				},{
 					name: '二次供水管',
-					params: ['???℃']
+					params: ['121℃']
 				},{
 					name: '实际目标水温',
-					params: ['???℃']
+					params: ['130℃']
 				},{
 					name: '当前室内水温',
-					params: ['???℃']
+					params: ['100℃']
 				},{
 					name: '低低控制温度',
-					params: ['???℃']
+					params: ['50℃']
 				},{
 					name: '最低控制温度',
-					params: ['???℃']
+					params: ['50℃']
 				},{
 					name: '最高控制温度',
-					params: ['???℃']
+					params: ['200℃']
 				},{
 					name: '出水超温',
-					params: ['???℃']
+					params: ['110℃']
 				},{
 					name: '二次供水超温',
-					params: ['???℃']
+					params: ['115℃']
 				},{
 					name: '二次回水低压',
-					params: ['???MPa']
+					params: ['0.57MPa']
 				},{
 					name: '水箱液位高',
-					params: ['???M']
+					params: ['60M']
 				},{
 					name: '水箱液位低',
-					params: ['???M']
+					params: ['20M']
 				}]
 			}
 		},
 		onLoad(option) {
 			this.pageData = JSON.parse(option.data)
+			this.getData()
 		},
 		methods: {
 			goBack() { // 返回上一頁面
 				uni.navigateBack()
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/xgl`,
+					method: 'POST'
+				})
+				this.paramsList = res.data.data.paramsList
 			}
 		}
 	}

+ 219 - 0
pages/data/supply-water/supply-room/room1065.vue

@@ -0,0 +1,219 @@
+<template>
+	<view class="page-body">
+		<page-header :name="pageData.name" :bg="'#1560e0'" :showLeft="true" @goBack="goBack()"></page-header>
+		<view class="scroll-wrap">
+			<view class="basic-info-wrap">
+				<view class="info-wrap">
+					<view class="data-wrap">
+						<view class="data-item-wrap" v-for="(item, index) in list">
+							<view class="title">{{ item.name }}</view>
+							<view class="data">{{ item.params }}</view>
+						</view>
+					</view>
+				</view>
+				<view class="radius-wrap"></view>
+			</view>
+			<view class="detail-info-wrap">
+				<page-card v-for="(item, index) in itemList" :key="index" style="margin-bottom: 30rpx;" :notShow="true" :name="item.name">
+					<template v-slot:content>
+						<simple-table :tableHead="tableHead" :list="item.params"></simple-table>
+					</template>
+				</page-card>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				activeData: {}, // 当前选中的项
+				list: [{ // 基础信息
+					name: '1#管路流量',
+					params: '818547.8m³/h'
+				}, {
+					name: '2#管路流量',
+					params: '206.2m³/h'
+				}, {
+					name: '3#管路流量',
+					params: '639019.3m³/h'
+				}, {
+					name: '1#水位',
+					params: '1.50m'
+				}, {
+					name: '2#水位',
+					params: '1.49m'
+				}], // 基础信息,
+				allData: [],
+				pageData: {}, // 页头信息
+				tableHead: ['名称', '参数'], // 表名
+				itemList: [{
+					name: '一号泵控制',
+					params: [{
+						name: '负压',
+						params: ['0.000Mpa']
+					}, {
+						name: '正压',
+						params: ['0.03Mpa']
+					}, {
+						name: '电压',
+						params: ['00.00V']
+					}]
+				}, {
+					name: '二号泵控制',
+					params: [{
+						name: '负压',
+						params: ['-0.002Mpa']
+					}, {
+						name: '正压',
+						params: ['0.06Mpa']
+					}, {
+						name: '电压',
+						params: ['00.00V']
+					}]
+				}, {
+					name: '三号泵控制',
+					params: [{
+						name: '负压',
+						params: ['0.000Mpa']
+					}, {
+						name: '正压',
+						params: ['0.00Mpa']
+					}, {
+						name: '电压',
+						params: ['00.00V']
+					}]
+				}]
+			}
+		},
+		onLoad(option) {
+			this.pageData = JSON.parse(option.data)
+			this.getData()
+		},
+		methods: {
+			goBack() { // 返回上一頁面
+				uni.navigateBack()
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/qsy1065sbf`,
+					method: 'POST'
+				})
+				this.list = res.data.data.list
+				this.itemList = res.data.data.itemList
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.page-body {
+		.scroll-wrap {
+			height: calc(100vh - 85rpx);
+			overflow: scroll;
+
+			.basic-info-wrap {
+				position: relative;
+				height: auto;
+				padding: 50rpx 49rpx 0;
+				background: url(../../../../static/page_bg.png);
+				background-size: 150%;
+
+				.info-wrap {
+					display: flex;
+					flex-wrap: wrap;
+					border-bottom: 1rpx dashed #fff;
+					padding-bottom: 85rpx;
+				}
+
+				.img-wrap {
+					padding-top: 34rpx;
+					text-align: center;
+
+					image {
+						width: 324rpx;
+						height: 128rpx;
+					}
+
+					view {
+						margin-top: 26rpx;
+						color: #fff;
+						font-size: 26rpx;
+					}
+				}
+
+				.data-wrap {
+					display: flex;
+					flex-wrap: wrap;
+					width: 100%;
+
+					.data-item-wrap {
+						width: 33.33333%;
+						padding: 9rpx 0;
+						min-height: 81rpx;
+						text-align: center;
+						margin-top: 60rpx;
+
+						.title {
+							font-size: 22rpx;
+							color: #FFFFFF;
+							margin-bottom: 14rpx;
+						}
+
+						.data {
+							font-weight: 700;
+							font-size: 36rpx;
+							color: #FFF600;
+							word-wrap: break-word;
+						}
+					}
+
+					.data-item-wrap:nth-child(-n+3) {
+						margin-top: 0;
+					}
+				}
+
+				.status-list {
+					width: 100%;
+					padding-top: 60rpx;
+					
+					.item-wrap {
+						display: flex;
+						font-size: 26rpx;
+						color: #FFFFFF;
+						padding: 23rpx 32rpx;
+					}
+					
+					.active {
+						background: #3495FA;
+						box-shadow: 0rpx 3rpx 7rpx 0rpx rgba(0,8,35,0.31);
+						border-radius: 14rpx;
+					}
+					
+					/deep/ .tip-wrap {
+						margin-left: 12rpx;
+					}
+				}
+				
+				.radius-wrap {
+					position: absolute;
+					left: 0;
+					bottom: 0;
+					width: 100vw;
+					height: 30rpx;
+					background-color: #fff;
+					border-radius: 35rpx 35rpx 0 0;
+				}
+			}
+
+			.detail-info-wrap {
+				padding: 40rpx 35rpx;
+
+				/deep/ .card-wrap:last-child {
+					margin-bottom: 0 !important;
+				}
+			}
+		}
+	}
+</style>

+ 17 - 7
pages/data/supply-water/supply-room/supply-room.vue

@@ -16,7 +16,7 @@
 			<view class="detail-info-wrap">
 				<page-card v-for="(item, index) in itemList" :key="index" style="margin-bottom: 30rpx;" :notShow="true" :name="item.name">
 					<template v-slot:content>
-						<simple-table :tableHead="tableHead" :list="item.paramsList"></simple-table>
+						<simple-table :tableHead="tableHead" :list="item.params"></simple-table>
 					</template>
 				</page-card>
 			</view>
@@ -44,12 +44,13 @@
 				}, {
 					name: '2#水位',
 					params: '1.49m'
-				}],
+				}], // 基础信息,
+				allData: [],
 				pageData: {}, // 页头信息
 				tableHead: ['名称', '参数'], // 表名
 				itemList: [{
 					name: '一号泵控制',
-					paramsList: [{
+					params: [{
 						name: '负压',
 						params: ['0.000Mpa']
 					}, {
@@ -61,7 +62,7 @@
 					}]
 				}, {
 					name: '二号泵控制',
-					paramsList: [{
+					params: [{
 						name: '负压',
 						params: ['-0.002Mpa']
 					}, {
@@ -73,7 +74,7 @@
 					}]
 				}, {
 					name: '三号泵控制',
-					paramsList: [{
+					params: [{
 						name: '负压',
 						params: ['0.000Mpa']
 					}, {
@@ -85,7 +86,7 @@
 					}]
 				}, {
 					name: '五号泵控制',
-					paramsList: [{
+					params: [{
 						name: '负压',
 						params: ['0.000Mpa']
 					}, {
@@ -97,7 +98,7 @@
 					}]
 				}, {
 					name: '六号泵控制',
-					paramsList: [{
+					params: [{
 						name: '负压',
 						params: ['0.000Mpa']
 					}, {
@@ -112,10 +113,19 @@
 		},
 		onLoad(option) {
 			this.pageData = JSON.parse(option.data)
+			this.getData()
 		},
 		methods: {
 			goBack() { // 返回上一頁面
 				uni.navigateBack()
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/qsy786sbf`,
+					method: 'POST'
+				})
+				this.list = res.data.data.list
+				this.itemList = res.data.data.itemList
 			}
 		}
 	}

+ 18 - 4
pages/data/transport/belt/belt.vue

@@ -4,7 +4,7 @@
 		<view class="scroll-wrap">
 			<view class="basic-info-wrap">
 				<view class="info-wrap">
-					<view @click="activeChange(item)" v-for="(item,index) in list" :class="activeData.name === item.name ? 'active item' : 'item'"
+					<view @click="activeChange(item,index)" v-for="(item,index) in list" :class="activeData.name === item.name ? 'active item' : 'item'"
 						:key="index">
 						<status-tip class="status-wrap" :name="item.name" :status="item.status"
 							:tip="item.status ? '运行' : '停止'"></status-tip>
@@ -18,7 +18,7 @@
 			<view class="detail-info-wrap">
 				<page-card style="margin-bottom: 30rpx;" :notShow="true" :name="'皮带参数'">
 					<template v-slot:content>
-						<simple-table :tableHead="tableHead" :list="paramsList"></simple-table>
+						<simple-table :tableHead="tableHead" :list="paramsList[activeIndex]"></simple-table>
 					</template>
 				</page-card>
 			</view>
@@ -42,6 +42,7 @@
 					status: 1
 				}],
 				tableHead: ['名称', '参数/状态'],
+				activeIndex: 0,
 				paramsList: [{
 					name: '速度',
 					params: ['23m/s']
@@ -87,14 +88,27 @@
 		},
 		onLoad(option) {
 			this.pageData = JSON.parse(option.data)
-			this.activeData = this.list[0]
+			this.getData()
 		},
 		methods: {
 			goBack() { // 返回上一頁面
 				uni.navigateBack()
 			},
-			activeChange(item) { // 切换状态
+			activeChange(item,index) { // 切换状态
 				this.activeData = item
+				this.activeIndex = index
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/jxpd06`,
+					method: 'POST'
+				})
+				this.activeData = this.list[0]
+				this.list = res.data.data.list
+				const mKeys = Object.keys(res.data.data).filter(key => key.startsWith('m'));
+				this.paramsList = mKeys.map(key => {
+					return res.data.data[key]
+				});
 			}
 		}
 	}

+ 198 - 0
pages/data/transport/belt/belt07.vue

@@ -0,0 +1,198 @@
+<template>
+	<view class="page-body">
+		<page-header :name="pageData.name" :bg="'#1560e0'" :showLeft="true" @goBack="goBack()"></page-header>
+		<view class="scroll-wrap">
+			<view class="basic-info-wrap">
+				<view class="info-wrap">
+					<view @click="activeChange(item,index)" v-for="(item,index) in list" :class="activeData.name === item.name ? 'active item' : 'item'"
+						:key="index">
+						<status-tip class="status-wrap" :name="item.name" :status="item.status"
+							:tip="item.status ? '运行' : '停止'"></status-tip>
+					</view>
+				</view>
+				<view class="img-wrap">
+					<image src="@/static/pd.png"/>
+				</view>
+				<view class="radius-wrap"></view>
+			</view>
+			<view class="detail-info-wrap">
+				<page-card style="margin-bottom: 30rpx;" :notShow="true" :name="'皮带参数'">
+					<template v-slot:content>
+						<simple-table :tableHead="tableHead" :list="paramsList[activeIndex]"></simple-table>
+					</template>
+				</page-card>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				activeData: {},
+				activeIndex: 0,
+				list: [{
+					name: '1#皮带',
+					status: 1
+				},{
+					name: '2#皮带',
+					status: 1
+				},{
+					name: '3#皮带',
+					status: 1
+				}],
+				tableHead: ['名称', '参数/状态'],
+				paramsList: [{
+					name: '速度',
+					params: ['23m/s']
+				},{
+					name: '远近控状态',
+					params: ['正常']
+				},{
+					name: '联锁模式',
+					params: ['暂无']
+				},{
+					name: '区域闯入',
+					params: ['暂无']
+				},{
+					name: '急停',
+					params: ['暂无']
+				},{
+					name: '备要信号',
+					params: [{
+						status: 1
+					}]
+				},{
+					name: '烟雾',
+					params: [{
+						status: 1
+					}]
+				},{
+					name: '堆煤',
+					params: [{
+						status: 1
+					}]
+				},{
+					name: '纵断',
+					params: [{
+						status: 1
+					}]
+				},{
+					name: '跑偏',
+					params: [{
+						status: 1
+					}]
+				}]
+			}
+		},
+		onLoad(option) {
+			this.pageData = JSON.parse(option.data)
+			this.activeData = this.list[0]
+			this.getData()
+		},
+		methods: {
+			goBack() { // 返回上一頁面
+				uni.navigateBack()
+			},
+			activeChange(item,index) { // 切换状态
+				this.activeData = item
+				this.activeIndex = index
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/fxpd07`,
+					method: 'POST'
+				})
+				this.activeData = this.list[0]
+				this.list = res.data.data.list
+				const mKeys = Object.keys(res.data.data).filter(key => key.startsWith('m'));
+				this.paramsList = mKeys.map(key => {
+					return res.data.data[key]
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.page-body {
+		.scroll-wrap {
+			height: calc(100vh - 85rpx);
+			overflow: scroll;
+
+			.basic-info-wrap {
+				position: relative;
+				height: auto;
+				padding: 50rpx 49rpx 0;
+				background: url(../../../../static/page_bg.png);
+				background-size: 100%;
+				
+				.info-wrap {
+					display: flex;
+					flex-wrap: wrap;
+					border-bottom: 1rpx dashed #fff;
+					padding-bottom: 20rpx;
+					
+					.item {
+						display: flex;
+						justify-content: space-between;
+						width: calc(50% - 64rpx);
+						padding: 20rpx;
+						color: #fff;
+						font-size: 26rpx;
+						
+						.status-wrap {
+							width: 100%;
+							/deep/ .tip-wrap {
+								justify-content: space-between;
+							}
+						}
+						
+						.params {
+							color: #FFFF00;
+						}
+					}
+					
+					.item:nth-child(2n-1) {
+						margin-right: 120rpx
+					}
+					
+					.active {
+						background: #3495FA;
+						box-shadow: 0px 3px 7px 0px rgba(0, 8, 35, 0.31);
+						border-radius: 14px;
+					}
+				}
+				
+				.img-wrap {
+					padding: 70rpx 0;
+					text-align: center;
+					
+					image {
+						width: 443rpx;
+						height: 48rpx;
+					}
+				}
+				
+				.radius-wrap {
+					position: absolute;
+					left: 0;
+					bottom: 0;
+					width: 100vw;
+					height: 30rpx;
+					background-color: #fff;
+					border-radius: 35rpx 35rpx 0 0;
+				}
+			}
+
+			.detail-info-wrap {
+				padding: 40rpx 35rpx;
+
+				/deep/ .card-wrap:last-child {
+					margin-bottom: 0 !important;
+				}
+			}
+		}
+	}
+</style>

+ 194 - 0
pages/data/transport/belt/emss.vue

@@ -0,0 +1,194 @@
+<template>
+	<view class="page-body">
+		<page-header :name="pageData.name" :bg="'#1560e0'" :showLeft="true" @goBack="goBack()"></page-header>
+		<view class="scroll-wrap">
+			<view class="basic-info-wrap">
+				<view class="info-wrap">
+					<view @click="activeChange(item,index)" v-for="(item,index) in list" :class="activeData.name === item.name ? 'active item' : 'item'"
+						:key="index">
+						<status-tip class="status-wrap" :name="item.name" :status="item.status"
+							:tip="item.status ? '运行' : '停止'"></status-tip>
+					</view>
+				</view>
+				<view class="img-wrap">
+					<image src="@/static/pd.png"/>
+				</view>
+				<view class="radius-wrap"></view>
+			</view>
+			<view class="detail-info-wrap">
+				<page-card style="margin-bottom: 30rpx;" :notShow="true" :name="'皮带参数'">
+					<template v-slot:content>
+						<simple-table :tableHead="tableHead" :list="paramsList[activeIndex]"></simple-table>
+					</template>
+				</page-card>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				activeData: {},
+				list: [{
+					name: 'PD2M2#皮带',
+					status: 1
+				},{
+					name: 'PD2M3#皮带',
+					status: 1
+				}],
+				tableHead: ['名称', '参数/状态'],
+				activeIndex: 0,
+				paramsList: [{
+					name: '速度',
+					params: ['23m/s']
+				},{
+					name: '远近控状态',
+					params: ['正常']
+				},{
+					name: '联锁模式',
+					params: ['暂无']
+				},{
+					name: '区域闯入',
+					params: ['暂无']
+				},{
+					name: '急停',
+					params: ['暂无']
+				},{
+					name: '备要信号',
+					params: [{
+						status: 1
+					}]
+				},{
+					name: '烟雾',
+					params: [{
+						status: 1
+					}]
+				},{
+					name: '堆煤',
+					params: [{
+						status: 1
+					}]
+				},{
+					name: '纵断',
+					params: [{
+						status: 1
+					}]
+				},{
+					name: '跑偏',
+					params: [{
+						status: 1
+					}]
+				}]
+			}
+		},
+		onLoad(option) {
+			this.pageData = JSON.parse(option.data)
+			this.getData()
+		},
+		methods: {
+			goBack() { // 返回上一頁面
+				uni.navigateBack()
+			},
+			activeChange(item,index) { // 切换状态
+				this.activeData = item
+				this.activeIndex = index
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/emss`,
+					method: 'POST'
+				})
+				this.list = res.data.data.list
+				this.activeData = this.list[0]
+				const mKeys = Object.keys(res.data.data).filter(key => key.startsWith('m'));
+				this.paramsList = mKeys.map(key => {
+					return res.data.data[key]
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.page-body {
+		.scroll-wrap {
+			height: calc(100vh - 85rpx);
+			overflow: scroll;
+
+			.basic-info-wrap {
+				position: relative;
+				height: auto;
+				padding: 50rpx 49rpx 0;
+				background: url(../../../../static/page_bg.png);
+				background-size: 100%;
+				
+				.info-wrap {
+					display: flex;
+					flex-wrap: wrap;
+					border-bottom: 1rpx dashed #fff;
+					padding-bottom: 20rpx;
+					
+					.item {
+						display: flex;
+						justify-content: space-between;
+						width: calc(50% - 30rpx);
+						padding: 20rpx;
+						color: #fff;
+						font-size: 26rpx;
+						
+						.status-wrap {
+							width: 100%;
+							/deep/ .tip-wrap {
+								justify-content: space-between;
+							}
+						}
+						
+						.params {
+							color: #FFFF00;
+						}
+					}
+					
+					.item:nth-child(2n-1) {
+						margin-right: 60rpx
+					}
+					
+					.active {
+						background: #3495FA;
+						box-shadow: 0px 3px 7px 0px rgba(0, 8, 35, 0.31);
+						border-radius: 14px;
+					}
+				}
+				
+				.img-wrap {
+					padding: 70rpx 0;
+					text-align: center;
+					
+					image {
+						width: 443rpx;
+						height: 48rpx;
+					}
+				}
+				
+				.radius-wrap {
+					position: absolute;
+					left: 0;
+					bottom: 0;
+					width: 100vw;
+					height: 30rpx;
+					background-color: #fff;
+					border-radius: 35rpx 35rpx 0 0;
+				}
+			}
+
+			.detail-info-wrap {
+				padding: 40rpx 35rpx;
+
+				/deep/ .card-wrap:last-child {
+					margin-bottom: 0 !important;
+				}
+			}
+		}
+	}
+</style>

+ 197 - 0
pages/data/transport/belt/jxpdjk.vue

@@ -0,0 +1,197 @@
+<template>
+	<view class="page-body">
+		<page-header :name="pageData.name" :bg="'#1560e0'" :showLeft="true" @goBack="goBack()"></page-header>
+		<view class="scroll-wrap">
+			<view class="basic-info-wrap">
+				<view class="info-wrap">
+					<view @click="activeChange(item,index)" v-for="(item,index) in list" :class="activeData.name === item.name ? 'active item' : 'item'"
+						:key="index">
+						<status-tip class="status-wrap" :name="item.name" :status="item.status"
+							:tip="item.status ? '运行' : '停止'"></status-tip>
+					</view>
+				</view>
+				<view class="img-wrap">
+					<image src="@/static/pd.png"/>
+				</view>
+				<view class="radius-wrap"></view>
+			</view>
+			<view class="detail-info-wrap">
+				<page-card style="margin-bottom: 30rpx;" :notShow="true" :name="'皮带参数'">
+					<template v-slot:content>
+						<simple-table :tableHead="tableHead" :list="paramsList[activeIndex]"></simple-table>
+					</template>
+				</page-card>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				activeData: {},
+				list: [{
+					name: '1#皮带',
+					status: 1
+				},{
+					name: '2#皮带',
+					status: 1
+				},{
+					name: '3#皮带',
+					status: 1
+				}],
+				tableHead: ['名称', '参数/状态'],
+				activeIndex: 0,
+				paramsList: [{
+					name: '速度',
+					params: ['23m/s']
+				},{
+					name: '远近控状态',
+					params: ['正常']
+				},{
+					name: '联锁模式',
+					params: ['暂无']
+				},{
+					name: '区域闯入',
+					params: ['暂无']
+				},{
+					name: '急停',
+					params: ['暂无']
+				},{
+					name: '备要信号',
+					params: [{
+						status: 1
+					}]
+				},{
+					name: '烟雾',
+					params: [{
+						status: 1
+					}]
+				},{
+					name: '堆煤',
+					params: [{
+						status: 1
+					}]
+				},{
+					name: '纵断',
+					params: [{
+						status: 1
+					}]
+				},{
+					name: '跑偏',
+					params: [{
+						status: 1
+					}]
+				}]
+			}
+		},
+		onLoad(option) {
+			this.pageData = JSON.parse(option.data)
+			this.getData()
+		},
+		methods: {
+			goBack() { // 返回上一頁面
+				uni.navigateBack()
+			},
+			activeChange(item,index) { // 切换状态
+				this.activeData = item
+				this.activeIndex = index
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/jxpdjk`,
+					method: 'POST'
+				})
+				this.activeData = this.list[0]
+				this.list = res.data.data.list
+				const mKeys = Object.keys(res.data.data).filter(key => key.startsWith('m'));
+				this.paramsList = mKeys.map(key => {
+					return res.data.data[key]
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.page-body {
+		.scroll-wrap {
+			height: calc(100vh - 85rpx);
+			overflow: scroll;
+
+			.basic-info-wrap {
+				position: relative;
+				height: auto;
+				padding: 50rpx 49rpx 0;
+				background: url(../../../../static/page_bg.png);
+				background-size: 100%;
+				
+				.info-wrap {
+					display: flex;
+					flex-wrap: wrap;
+					border-bottom: 1rpx dashed #fff;
+					padding-bottom: 20rpx;
+					
+					.item {
+						display: flex;
+						justify-content: space-between;
+						width: calc(50% - 64rpx);
+						padding: 20rpx;
+						color: #fff;
+						font-size: 26rpx;
+						
+						.status-wrap {
+							width: 100%;
+							/deep/ .tip-wrap {
+								justify-content: space-between;
+							}
+						}
+						
+						.params {
+							color: #FFFF00;
+						}
+					}
+					
+					.item:nth-child(2n-1) {
+						margin-right: 120rpx
+					}
+					
+					.active {
+						background: #3495FA;
+						box-shadow: 0px 3px 7px 0px rgba(0, 8, 35, 0.31);
+						border-radius: 14px;
+					}
+				}
+				
+				.img-wrap {
+					padding: 70rpx 0;
+					text-align: center;
+					
+					image {
+						width: 443rpx;
+						height: 48rpx;
+					}
+				}
+				
+				.radius-wrap {
+					position: absolute;
+					left: 0;
+					bottom: 0;
+					width: 100vw;
+					height: 30rpx;
+					background-color: #fff;
+					border-radius: 35rpx 35rpx 0 0;
+				}
+			}
+
+			.detail-info-wrap {
+				padding: 40rpx 35rpx;
+
+				/deep/ .card-wrap:last-child {
+					margin-bottom: 0 !important;
+				}
+			}
+		}
+	}
+</style>

+ 148 - 39
pages/data/transport/jdgl.vue

@@ -4,8 +4,8 @@
 		<view class="scroll-wrap">
 			<view class="basic-info-wrap">
 				<view class="info-wrap">
-					<view @click="activeChange(item)" v-for="(item,index) in list" :class="activeData.name === item.name ? 'active item' : 'item'"
-						:key="index">
+					<view @click="activeChange(item,index)" v-for="(item,index) in list"
+						:class="activeData.name === item.name ? 'active item' : 'item'" :key="index">
 						<status-tip class="status-wrap" :name="item.name" :status="item.status"
 							:tip="item.status ? '运行' : '停止'"></status-tip>
 					</view>
@@ -15,7 +15,7 @@
 			<view class="detail-info-wrap">
 				<page-card style="margin-bottom: 30rpx;" :notShow="true" :name="activeData.name">
 					<template v-slot:content>
-						<simple-table :tableHead="tableHead" :list="paramsList"></simple-table>
+						<simple-table :tableHead="tableHead" :list="paramsList[activeIndex]"></simple-table>
 					</template>
 				</page-card>
 			</view>
@@ -29,63 +29,172 @@
 			return {
 				pageData: {},
 				activeData: {},
+				activeIndex: 0,
 				list: [{
 					name: '1#甲带给料机',
 					status: 1
-				},{
+				}, {
 					name: '2#甲带给料机',
 					status: 1
-				},{
+				}, {
 					name: '3#甲带给料机',
 					status: 0
-				},{
+				}, {
 					name: '4#甲带给料机',
 					status: 1
 				}],
 				tableHead: ['名称', '参数/状态'],
-				paramsList: [{
-						name: '控制方式',
-						params: ['就地']
-					},
-					{
-						name: '变频器母线电压(V)',
-						params: ['9999']
-					},
-					{
-						name: '变频器输出电压(V)',
-						params: ['9999']
-					},
-					{
-						name: '变频器输出电流(A)',
-						params: ['20.23']
-					},
-					{
-						name: '变频器输出频率(Hz)',
-						params: ['9364']
-					},
-					{
-						name: '变频器温度(℃)',
-						params: ['80.24']
-					},
-					{
-						name: '变频器故障',
-						params: [{
-							status: 1
-						}]
-					}
+				paramsList: [
+					[{
+							name: '控制方式',
+							params: ['就地']
+						},
+						{
+							name: '变频器母线电压(V)',
+							params: ['9999']
+						},
+						{
+							name: '变频器输出电压(V)',
+							params: ['9999']
+						},
+						{
+							name: '变频器输出电流(A)',
+							params: ['20.23']
+						},
+						{
+							name: '变频器输出频率(Hz)',
+							params: ['9364']
+						},
+						{
+							name: '变频器温度(℃)',
+							params: ['80.24']
+						},
+						{
+							name: '变频器故障',
+							params: [{
+								status: 1
+							}]
+						}
+					],
+					[{
+							name: '控制方式',
+							params: ['就地']
+						},
+						{
+							name: '变频器母线电压(V)',
+							params: ['9999']
+						},
+						{
+							name: '变频器输出电压(V)',
+							params: ['9999']
+						},
+						{
+							name: '变频器输出电流(A)',
+							params: ['20.23']
+						},
+						{
+							name: '变频器输出频率(Hz)',
+							params: ['9364']
+						},
+						{
+							name: '变频器温度(℃)',
+							params: ['80.24']
+						},
+						{
+							name: '变频器故障',
+							params: [{
+								status: 1
+							}]
+						}
+					],
+					[{
+							name: '控制方式',
+							params: ['就地']
+						},
+						{
+							name: '变频器母线电压(V)',
+							params: ['9999']
+						},
+						{
+							name: '变频器输出电压(V)',
+							params: ['9999']
+						},
+						{
+							name: '变频器输出电流(A)',
+							params: ['20.23']
+						},
+						{
+							name: '变频器输出频率(Hz)',
+							params: ['9364']
+						},
+						{
+							name: '变频器温度(℃)',
+							params: ['80.24']
+						},
+						{
+							name: '变频器故障',
+							params: [{
+								status: 1
+							}]
+						}
+					],
+					[{
+							name: '控制方式',
+							params: ['就地']
+						},
+						{
+							name: '变频器母线电压(V)',
+							params: ['9999']
+						},
+						{
+							name: '变频器输出电压(V)',
+							params: ['9999']
+						},
+						{
+							name: '变频器输出电流(A)',
+							params: ['20.23']
+						},
+						{
+							name: '变频器输出频率(Hz)',
+							params: ['9364']
+						},
+						{
+							name: '变频器温度(℃)',
+							params: ['80.24']
+						},
+						{
+							name: '变频器故障',
+							params: [{
+								status: 1
+							}]
+						}
+					]
 				]
 			}
 		},
 		onLoad(option) {
 			this.pageData = JSON.parse(option.data)
-			this.activeData = this.list[0]
+			this.getData()
 		},
 		methods: {
 			goBack() { // 返回上一頁面
 				uni.navigateBack()
 			},
-			activeChange(item) { // 切换状态
+			activeChange(item, index) { // 切换状态
 				this.activeData = item
+				this.activeIndex = index
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/jdglj`,
+					method: 'POST'
+				})
+				this.list = res.data.data.list
+				this.activeData = this.list[0]
+				const mKeys = Object.keys(res.data.data).filter(key => key.startsWith('m'));
+				this.paramsList = mKeys.map(key => {
+					return res.data.data[key]
+				});
 			}
 		}
 	}
@@ -145,7 +254,7 @@
 						width: 310rpx;
 						height: 138rpx;
 					}
-					
+
 					view {
 						margin-top: 25rpx;
 						color: #fff;

+ 32 - 80
pages/data/transport/passenger/passenger.vue

@@ -6,7 +6,7 @@
 				<view class="info-wrap">
 					<view v-for="(item,index) in list" class="data-item-wrap">
 						<view class="title">{{ item.name }}</view>
-						<view class="data">{{ item.data }}</view>
+						<view class="data">{{ item.params }}</view>
 					</view>
 				</view>
 				<view class="img-wrap">
@@ -20,11 +20,12 @@
 						<view class="detail-wrap">
 							<template v-for="(item, index) in statusList">
 								<view class="item" v-if="!item.data">
-									<status-tip class="status-wrap" :name="item.name" :status="item.status"></status-tip>
+									<status-tip class="status-wrap" :name="item.name"
+										:status="item.status"></status-tip>
 								</view>
 								<view class="item" v-else>
 									<view>{{ item.name }}</view>
-									<view class="params">{{ item.data }}</view>
+									<view class="params">{{ item.params }}</view>
 								</view>
 							</template>
 						</view>
@@ -38,7 +39,7 @@
 									{{ item.name }}
 								</view>
 								<view>
-									{{ item.data }}
+									{{ item.params }}
 								</view>
 							</view>
 						</view>
@@ -55,13 +56,13 @@
 			return {
 				list: [{
 					name: '停车倒计时',
-					data: '0s'
+					params: '0s'
 				}, {
 					name: '猴车速度',
-					data: '0m/s'
+					params: '0m/s'
 				}, {
 					name: '制动闸压力',
-					data: '07.54MPa'
+					params: '07.54MPa'
 				}],
 				statusList: [{
 					name: '操作台急停',
@@ -91,67 +92,6 @@
 					name: '机尾通讯中断',
 					status: 1,
 				}],
-				statusList: [{
-					name: '欠速保护',
-					status: 1,
-				},{
-					name: '尾轮限位',
-					status: 1,
-				},{
-					name: '机尾越位',
-					status: 1,
-				},{
-					name: '重锤落地',
-					status: 1,
-				},{
-					name: '绳张紧',
-					status: 1,
-				},{
-					name: '主电机超温',
-					status: 1,
-				},{
-					name: '机尾吊椅间距保护',
-					status: 1,
-				},{
-					name: '掉绳保护',
-					status: 1,
-				},{
-					name: '油温过低',
-					status: 1,
-				},{
-					name: '抱闸失控',
-					status: 1,
-				},{
-					name: '超温保护',
-					status: 1,
-				},{
-					name: '机头越位',
-					status: 1,
-				},{
-					name: '断轴保护',
-					status: 1,
-				},{
-					name: '打滑保护',
-					status: 1,
-				},{
-					name: '液压站超温',
-					status: 1,
-				},{
-					name: '主电机断电',
-					status: 1,
-				},{
-					name: '安全闸保护',
-					status: 1,
-				},{
-					name: '断绳保护',
-					status: 1,
-				},{
-					name: '沿线急停',
-					status: 1,
-				},{
-					name: '减速机超温',
-					status: 1,
-				}],
 				paramsList: [{
 					name: '母线电压',
 					data: '999.00',
@@ -203,10 +143,21 @@
 				}]
 			}
 		},
-		onLoad() {},
+		onLoad() {
+			this.getData()
+		},
 		methods: {
 			goBack() { // 返回上一頁面
 				uni.navigateBack()
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/djjkcrq`,
+					method: 'POST'
+				})
+				this.list = res.data.data.list
+				this.statusList = res.data.data.statusList
+				this.paramsList = res.data.data.paramsList
 			}
 		}
 	}
@@ -279,62 +230,63 @@
 					border-radius: 35rpx 35rpx 0 0;
 				}
 			}
-			
+
 			.detail-info-wrap {
 				padding: 40rpx 35rpx;
-				
+
 				.detail-wrap {
 					display: flex;
 					flex-wrap: wrap;
 					padding: 35rpx 55rpx 18rpx 55rpx;
 					color: #8D8D8D;
+
 					.item {
 						display: flex;
 						font-size: 26rpx;
 						justify-content: space-between;
 						width: calc(50% - 61rpx);
 						margin-bottom: 50rpx;
-						
+
 						.params {
 							color: #00BD00;
 						}
-						
+
 						.status-wrap {
 							width: 100%;
-							
+
 							/deep/ .tip-wrap {
 								width: 100%;
 								justify-content: space-between;
 							}
 						}
 					}
-					
+
 					.item:nth-child(2n) {
 						margin-left: 120rpx;
 					}
 				}
-				
+
 				.params-wrap {
 					display: flex;
 					flex-wrap: wrap;
 					font-size: 26rpx;
 					padding: 35rpx 55rpx;
-					
+
 					.item {
 						width: calc(50% - 32rpx);
 						display: flex;
 						justify-content: space-between;
 						margin-top: 50rpx;
-						
+
 						view:first-child {
 							color: #8D8D8D;
 						}
 					}
-					
+
 					.item:nth-child(2n) {
 						margin-left: 62rpx;
 					}
-					
+
 					.item:nth-child(-n+2) {
 						margin-top: 0;
 					}

+ 24 - 10
pages/data/ts-system/flj.vue

@@ -6,7 +6,7 @@
 				<view class="info-wrap">
 					<view v-for="(item,index) in list" class="data-item-wrap">
 						<view class="title">{{ item.name }}</view>
-						<view class="data">{{ item.data }}</view>
+						<view class="data">{{ item.params }}</view>
 					</view>
 				</view>
 				<view class="radius-wrap"></view>
@@ -113,28 +113,28 @@
 			return {
 				list: [{
 					name: '磁场电流',
-					data: '22.27A'
+					params: '22.27A'
 				}, {
 					name: '运行速度',
-					data: '32/s'
+					params: '32/s'
 				}, {
 					name: '液压站压力',
-					data: '0.7MPa'
+					params: '0.7MPa'
 				}, {
 					name: '小罐深度',
-					data: '15M'
+					params: '15M'
 				}, {
 					name: '电枢电流',
-					data: '22.98A'
+					params: '22.98A'
 				}, {
 					name: '大罐深度',
-					data: '45M'
+					params: '45M'
 				}, {
 					name: '提物钩数',
-					data: '9'
+					params: '9'
 				}, {
 					name: '提人钩数',
-					data: '5'
+					params: '5'
 				}],
 				statusList: [{
 					name: '下碰撞开关',
@@ -237,10 +237,24 @@
 				}],
 			}
 		},
-		onLoad() {},
+		onLoad() {
+			this.getData()
+		},
 		methods: {
 			goBack() { // 返回上一頁面
 				uni.navigateBack()
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/fljts`,
+					method: 'POST'
+				})
+				this.list = res.data.data.list
+				this.statusList = res.data.data.statusList
+				this.statusList1 = res.data.data.statusList1
+				this.statusList2 = res.data.data.statusList2
+				this.statusList3 = res.data.data.statusList3
+				this.statusList4 = res.data.data.statusList4
 			}
 		}
 	}

+ 11 - 1
pages/data/ts-system/fxj_gd.vue

@@ -199,10 +199,20 @@
 				}]
 			}
 		},
-		onLoad() {},
+		onLoad() {
+			this.getData()
+		},
 		methods: {
 			goBack() { // 返回上一頁面
 				uni.navigateBack()
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/fxjgd`,
+					method: 'POST'
+				})
+				this.list = res.data.data.list
+				this.itemList = res.data.data.itemList
 			}
 		}
 	}

+ 45 - 33
pages/data/ts-system/fxj_jc.vue

@@ -6,15 +6,16 @@
 				<view class="info-wrap">
 					<view v-for="(item,index) in list" class="data-item-wrap">
 						<view class="title">{{ item.name }}</view>
-						<view class="data">{{ item.data }}</view>
+						<view class="data">{{ item.params }}</view>
 					</view>
 				</view>
 				<view class="radius-wrap"></view>
 			</view>
 			<view class="detail-info-wrap">
-				<page-card v-for="(item, index) in itemList" :key="index" style="margin-bottom: 30rpx;" :notShow="true" :name="item.name">
+				<page-card v-for="(item, index) in itemList" :key="index" style="margin-bottom: 30rpx;" :notShow="true"
+					:name="item.name">
 					<template v-slot:content>
-						<simple-table :tableHead="tableHead" :list="item.paramsList"></simple-table>
+						<simple-table :tableHead="tableHead" :list="item.params"></simple-table>
 					</template>
 				</page-card>
 			</view>
@@ -28,99 +29,109 @@
 			return {
 				list: [{
 					name: '提升高度',
-					data: '25m'
+					params: '25m'
 				}, {
 					name: '提升速度',
-					data: '18m/s'
+					params: '18m/s'
 				}, {
 					name: '制动油压',
-					data: '0.07Mpa'
+					params: '0.07Mpa'
 				}, {
 					name: '电枢电流',
-					data: '22.86A'
+					params: '22.86A'
 				}, {
 					name: '励磁电流',
-					data: '22.45A'
+					params: '22.45A'
 				}, {
 					name: '润滑油压',
-					data: '0.11Mpa'
+					params: '0.11Mpa'
 				}, {
 					name: '电机温度1',
-					data: '82.5℃'
+					params: '82.5℃'
 				}, {
 					name: '电机温度2',
-					data: '85.3℃'
+					params: '85.3℃'
 				}],
 				tableHead: ['名称', '深指', '行控'], // 表名
 				itemList: [{
 					name: '提升',
-					paramsList: [{
+					params: [{
 						name: '过卷',
 						params: [{
 							status: 1
-						},{
+						}, {
 							status: 1
 						}]
 					}, {
 						name: '停车',
 						params: [{
 							status: 1
-						},{
+						}, {
 							status: 1
 						}]
 					}, {
 						name: '校正',
 						params: [{
 							status: 1
-						},{
+						}, {
 							status: 1
 						}]
 					}, {
 						name: '减速',
 						params: [{
 							status: 1
-						},{
+						}, {
 							status: 0
 						}]
 					}]
 				}, {
 					name: '下放',
-					paramsList: [{
+					params: [{
 						name: '过卷',
 						params: [{
 							status: 1
-						},{
+						}, {
 							status: 1
 						}]
 					}, {
 						name: '停车',
 						params: [{
 							status: 1
-						},{
+						}, {
 							status: 1
 						}]
 					}, {
 						name: '校正',
 						params: [{
 							status: 0
-						},{
+						}, {
 							status: 1
 						}]
 					}, {
 						name: '减速',
 						params: [{
 							status: 1
-						},{
+						}, {
 							status: 1
 						}]
 					}]
 				}]
 			}
 		},
-		onLoad() {},
+		onLoad() {
+			this.getData()
+		},
 		methods: {
 			goBack() { // 返回上一頁面
 				uni.navigateBack()
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/fxjjc`,
+					method: 'POST'
+				})
+				this.list = res.data.data.list
+				this.itemList = res.data.data.itemList
 			}
 		}
 	}
@@ -193,62 +204,63 @@
 					border-radius: 35rpx 35rpx 0 0;
 				}
 			}
-			
+
 			.detail-info-wrap {
 				padding: 40rpx 35rpx;
-				
+
 				.detail-wrap {
 					display: flex;
 					flex-wrap: wrap;
 					padding: 35rpx 55rpx 18rpx 55rpx;
 					color: #8D8D8D;
+
 					.item {
 						display: flex;
 						font-size: 26rpx;
 						justify-content: space-between;
 						width: calc(50% - 61rpx);
 						margin-bottom: 50rpx;
-						
+
 						.params {
 							color: #00BD00;
 						}
-						
+
 						.status-wrap {
 							width: 100%;
-							
+
 							/deep/ .tip-wrap {
 								width: 100%;
 								justify-content: space-between;
 							}
 						}
 					}
-					
+
 					.item:nth-child(2n) {
 						margin-left: 120rpx;
 					}
 				}
-				
+
 				.params-wrap {
 					display: flex;
 					flex-wrap: wrap;
 					font-size: 26rpx;
 					padding: 35rpx 55rpx;
-					
+
 					.item {
 						width: calc(50% - 32rpx);
 						display: flex;
 						justify-content: space-between;
 						margin-top: 50rpx;
-						
+
 						view:first-child {
 							color: #8D8D8D;
 						}
 					}
-					
+
 					.item:nth-child(2n) {
 						margin-left: 62rpx;
 					}
-					
+
 					.item:nth-child(-n+2) {
 						margin-top: 0;
 					}

+ 76 - 13
pages/data/ventilation/air-system/air-system.vue

@@ -4,7 +4,7 @@
 		<view class="scroll-wrap">
 			<view class="basic-info-wrap">
 				<view class="item-wrap">
-					<view :class="index === active ? 'active item' : 'item'" v-for="(item, index) in pageData.children"
+					<view :class="index === active ? 'active item' : 'item'" v-for="(item, index) in machineList"
 						:key="index" @click="tabChange(index)">
 						<view class="title">
 							{{ item.name }}
@@ -12,21 +12,21 @@
 						<view class="params">
 							<view>负压</view>
 							<view class="unit">
-								<view>-53.52</view>
+								<view>{{ item.yl }}</view>
 								<view>Pa</view>
 							</view>
 						</view>
 						<view class="params">
 							<view>风速</view>
 							<view class="unit">
-								<view>2.30</view>
+								<view>{{ item.fs }}</view>
 								<view>m/s</view>
 							</view>
 						</view>
 						<view class="params">
 							<view>风量</view>
 							<view class="unit">
-								<view>11043.0</view>
+								<view>{{ item.fl }}</view>
 								<view>m³/min</view>
 							</view>
 						</view>
@@ -36,7 +36,7 @@
 					</view>
 				</view>
 				<view class="icon-wrap">
-					<view v-for="(item, index) in pageData.children" :key="index" class="icon">
+					<view v-for="(item, index) in machineList" :key="index" class="icon">
 						<image v-if="item.status" src="@/static/tf.jpg" />
 						<image v-else src="@/static/tf-static.png" />
 					</view>
@@ -51,7 +51,7 @@
 				</page-card>
 				<page-card style="margin-bottom: 30rpx;" :notShow="true" :name="'2#机组'">
 					<template v-slot:content>
-						<simple-table :tableHead="tableHead" :list="data"></simple-table>
+						<simple-table :tableHead="tableHead" :list="data2"></simple-table>
 					</template>
 				</page-card>
 				<page-card style="margin-bottom: 30rpx;" :notShow="true" :name="'设备状态'">
@@ -71,6 +71,19 @@
 				pageData: {}, // 页面基础数据
 				active: 0, // 当前选中的tab
 				tableHead: ['参数名称', '1#电机', '2#电机'],
+				machineList: [{
+					name: '1#风机',
+					fy: ``,
+					fs: ``,
+					fl: ``,
+					status: ``,
+				}, {
+					name: '2#风机',
+					fy: ``,
+					fs: ``,
+					fl: ``,
+					status: ``,
+				}],
 				data: [{
 					name: '定子1温度℃',
 					params: [75.45, 89.35],
@@ -121,32 +134,68 @@
 					params: [{
 						status: 1
 					}],
-				},{
+				}, {
 					name: '2#风机监测通讯',
 					params: [{
 						status: 1
 					}],
-				},{
+				}, {
 					name: '1500PLC主站通讯',
 					params: [{
 						status: 1
 					}],
-				},{
+				}, {
 					name: '1-1变频DP通讯正常',
 					params: [{
 						status: 1
 					}],
-				},{
+				}, {
 					name: '1-2变频DP通讯正常',
 					params: [{
 						status: 1
 					}],
-				},{
+				}, {
 					name: '2-1变频DP通讯正常',
 					params: [{
 						status: 1
 					}],
-				},{
+				}, {
+					name: '2-2变频DP通讯正常',
+					params: [{
+						status: 1
+					}],
+				}],
+				data2: [{
+					name: '1#风机监测通讯',
+					params: [{
+						status: 1
+					}],
+				}, {
+					name: '2#风机监测通讯',
+					params: [{
+						status: 1
+					}],
+				}, {
+					name: '1500PLC主站通讯',
+					params: [{
+						status: 1
+					}],
+				}, {
+					name: '1-1变频DP通讯正常',
+					params: [{
+						status: 1
+					}],
+				}, {
+					name: '1-2变频DP通讯正常',
+					params: [{
+						status: 1
+					}],
+				}, {
+					name: '2-1变频DP通讯正常',
+					params: [{
+						status: 1
+					}],
+				}, {
 					name: '2-2变频DP通讯正常',
 					params: [{
 						status: 1
@@ -156,6 +205,7 @@
 		},
 		onLoad(option) {
 			this.pageData = JSON.parse(option.data)
+			this.getData()
 		},
 		methods: {
 			goBack() { // 返回上一頁面
@@ -163,6 +213,16 @@
 			},
 			tabChange(index) { // 切换tab
 				this.active = index
+			},
+			async getData() {
+				let res = await this.$http({
+					url: `/qsy/dcs/transform/ztfj`,
+					method: 'POST'
+				})
+				this.machineList = res.data.data.machineList
+				this.data = res.data.data.data
+				this.data2 = res.data.data.data2
+				this.data1 = res.data.data.data1
 			}
 		}
 	}
@@ -258,21 +318,24 @@
 
 				.change-wrap {
 					padding: 32rpx 24rpx 45rpx;
-					
+
 					.legend-wrap {
 						display: flex;
 						justify-content: center;
 						padding-top: 32rpx;
+
 						.item {
 							display: flex;
 							align-items: center;
 							margin-right: 30rpx;
+
 							.icon {
 								width: 18rpx;
 								height: 18rpx;
 								margin-right: 5rpx;
 								border-radius: 4rpx;
 							}
+
 							.label {
 								font-size: 16rpx
 							}

+ 0 - 0
test.html


+ 58 - 0
utils/http.js

@@ -0,0 +1,58 @@
+let baseUrl = ''
+if (process.env.NODE_ENV === 'development') {
+  baseUrl = 'http://anvideo.nxmy.com:8011';
+} else {
+  baseUrl = 'http://anvideo.nxmy.com:8011';
+}
+
+function service(options = {}) {
+	uni.showLoading({
+		title: '加载中'
+	});
+	options.url = `${baseUrl}${options.url}`;
+	// 判断本地是否存在token,如果存在则带上请求头
+	let token = uni.getStorageSync('token')
+	options.header = {
+		'content-type': 'application/json',
+		'Authorization': `Bearer ${token || false}` // 这里是token(可自行修改)
+	};
+	// resolved是返回成功数据,rejected返回错误数据
+	return new Promise((resolved, rejected) => {
+		options.success = (res) => {
+			// 如果请求回来的状态码不是200则执行以下操作
+			uni.hideLoading();
+			if (res.statusCode === 404 || res.statusCode === 500) {
+				uni.showToast({
+					icon: 'none',
+					duration: 3000,
+					title: '服务器错误,请稍后再试'
+				});
+				rejected()
+			} else {
+				resolved(res)
+			}
+			// if (res.data.code !== 200) {
+			// 	uni.showToast({
+			// 		icon: 'none',
+			// 		duration: 3000,
+			// 		title: `${res.data.msg}`
+			// 	});
+			// 	rejected(res)
+			// } else {
+			// 	resolved(res.data.data)
+			// }
+		};
+		options.fail = (err) => {
+			uni.hideLoading();
+			uni.showToast({
+				icon: 'none',
+				duration: 3000,
+				title: '服务器错误,请稍后再试'
+			});
+			rejected(err);
+		};
+		uni.request(options);
+	});
+}
+ 
+export default service;