枣泉：2.1.0

common/vmeitime-http/api.js

@@ -197,11 +197,39 @@ export const zaoquan_dcs_getSupport = (data) => {
 		data,
 	})
 }
+// 工作面 智能综采
+export const zaoquan_dcs_workface = (data) => {
+	return http.request({
+		baseUrl: uni.getStorageSync('unified_automation_system_url'),
+		url: '/zaoquan/dcs/workface',
+		data,
+	})
+}
 
-
-
-
-
+// 压风制氮
+export const zaoquan_dcs_an = (data) => {
+	return http.request({
+		baseUrl: uni.getStorageSync('unified_automation_system_url'),
+		url: '/zaoquan/dcs/an',
+		data,
+	})
+}
+// 水泵
+export const zaoquan_dcs_pump = (data) => {
+	return http.request({
+		baseUrl: uni.getStorageSync('unified_automation_system_url'),
+		url: '/zaoquan/dcs/pump',
+		data,
+	})
+}
+// 变电所
+export const zaoquan_dcs_power = (data) => {
+	return http.request({
+		baseUrl: uni.getStorageSync('unified_automation_system_url'),
+		url: '/zaoquan/dcs/power',
+		data,
+	})
+}
 
 // 首页风格切换
 export const home_style_setting = (data) => {

components/t-p-zaoquan/t-p-zaoquan.vue

@@ -128,13 +128,13 @@
 								icon: require("./icon/sc_zhidan.png"),
 								module: "yfzd",
 								name: "1314<br/>压风制氮",
-								url: "../../production/zaoquan/control_platform/air_nitrogen/air_nitrogen?title=1314压风制氮",
+								url: "../../production/zaoquan/control_platform/air_nitrogen/air_nitrogen?title=1314压风制氮&sys_code=1314",
 							},
 							{
 								icon: require("./icon/sc_zhidan.png"),
 								module: "yfzd",
 								name: "12采区<br/>压风制氮",
-								url: "../../production/zaoquan/control_platform/air_nitrogen/air_nitrogen?title=12采区压风制氮",
+								url: "../../production/zaoquan/control_platform/air_nitrogen/air_nitrogen?title=12采区压风制氮&sys_code=12",
 							}
 						]
 					},

manifest.json

@@ -2,7 +2,7 @@
     "name" : "智慧枣泉(新)",
     "appid" : "__UNI__4B520D3",
     "description" : "",
-    "versionName" : "2.0.16",
+    "versionName" : "2.1.0",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
@@ -148,17 +148,21 @@
     "mp-toutiao" : {
         "usingComponents" : true,
         "uniStatistics" : {
-            "enable" : true
+            "enable" : false
         }
     },
     "uniStatistics" : {
-        "enable" : false
+        "enable" : false,
+        "version" : "2"
     },
     "vueVersion" : "2",
     "h5" : {
         "router" : {
             "mode" : "hash",
             "base" : "./"
+        },
+        "uniStatistics" : {
+            "enable" : false
         }
     }
 }

pages/production/video_monitor/video_monitor.vue

@@ -13,11 +13,12 @@
 		},
 		onLoad(option) {
 			// this.href = "http://anstatic.nxmy.com:8011/assets/html/video/?mine_code=" + option.mine_code
-			this.href = "http://anstatic.nxmy.com:8011/assets/html/zhks-quankuang/ningmeijituan/video_ws/?mine_code=" + option.mine_code + "_jituan"
-			
+			this.href = "http://anstatic.nxmy.com:8011/assets/html/zhks-quankuang/ningmeijituan/video_ws/video_login?mine_code=" + option.mine_code + "_jituan" + "&ts=" + Date.now();
+			// console.log(this.href)
 			// this.get_product_data_query_power()
 		},
 		methods:{
+			
 			// get_product_data_query_power(){
 			// 	this.$p_api.product_data_query_power({
 			// 		staff_num: uni.getStorageSync('user').staff_num,

pages/production/zaoquan/control_platform/air_nitrogen/air_nitrogen.vue

@@ -503,9 +503,8 @@
 			uni.setNavigationBarTitle({
 				title: option.title
 			})
-		},
-		mounted() {
-			this.getServerData();
+			
+			this.getServerData(option.sys_code);
 		},
 		methods: {
 			change_tab_index(index) {
@@ -515,11 +514,18 @@
 				this.tab_info.state = this.info[index].state
 				this.tab_info.table = this.info[index].table
 			},
-			getServerData() {
-				this.tab_index = 0
-				this.tab_info.title = this.info[0].label + "参数"
-				this.tab_info.state = this.info[0].state
-				this.tab_info.table = this.info[0].table
+			getServerData(sys_code) {
+				this.$api.zaoquan_dcs_an({
+					sys_code: sys_code
+				}).then((res) => {
+					console.log(res.data)
+					this.info =res.data
+					
+					this.tab_index = 0
+					this.tab_info.title = this.info[0].label + "参数"
+					this.tab_info.state = this.info[0].state
+					this.tab_info.table = this.info[0].table
+				})
 			},
 		}
 	}

pages/production/zaoquan/control_platform/coal_mining/coal_mining.vue

@@ -5,7 +5,7 @@
 		</view>
 
 		<view class="container">
-			<view class="btn">
+			<view class="btn" @click="goto_url('../../h5/h5?url=220707新智能综采首页')">
 				<view class="left">
 					<view class="icon">
 						<image src="../img/btn_icon.png" mode="widthFix"></image>
@@ -14,9 +14,9 @@
 						综采动态监视系统
 					</view>
 				</view>
-				<!-- <view class="right">
+				<view class="right">
 					<uni-icons type="arrowright" color="#FFF"></uni-icons>
-				</view> -->
+				</view>
 			</view>
 
 			<view class="info">
@@ -249,6 +249,7 @@
 		},
 		mounted() {
 			this.get_data()
+			this.getServerData();
 		},
 		methods: {
 			goto_url(url) {
@@ -256,12 +257,24 @@
 					url: url
 				})
 			},
+			getServerData() {
+				this.$api.zaoquan_dcs_workface({
+					sys_code: "220707gzm"
+				}).then((res) => {
+					console.log(res.data)
+					
+					this.info = res.data.info
+					this.ruhuabeng = res.data.ruhuabeng
+					this.caimeiji = res.data.caimeiji
+					this.sanji = res.data.sanji
+				})
+			},
 			get_data() {
 				this.$api.zaoquan_dcs_getSupport({
 					sys_code: "main"
 				}).then((res) => {
 					uni.hideLoading()
-					console.log(res.data)
+					// console.log(res.data)
 					let charts = res.data.sys_point.support
 
 					// NaN 重置为0
@@ -313,7 +326,7 @@
 					this.opts.extra.markLine.data[1].value = 16
 					this.opts.yAxis.data[0].max = 60
 
-					console.log(this.chartData)
+					// console.log(this.chartData)
 
 				})
 			}

pages/production/zaoquan/control_platform/coal_mining/emulsion_pump/emulsion_pump.vue

@@ -6,7 +6,8 @@
 
 		<view class="container">
 			<view class="info">
-				<view class="item" :class="tab_index==index?'active':''" v-for="(item,index) in info" :key="index" @click="change_tab_index(index)">
+				<view class="item" :class="tab_index==index?'active':''" v-for="(item,index) in info" :key="index"
+					@click="change_tab_index(index)">
 					<view class="label">{{item.label}}</view>
 					<view class="value">
 						<view class="state" :style="{'backgroundColor':item.state == 1?'#00BD00':'#D6000F'}">
@@ -43,14 +44,14 @@
 					</view>
 				</view>
 
-				<view class="section">
+				<!-- <view class="section">
 					<view class="title">
 						<view class="left">乳化泵系统压力曲线图</view>
 					</view>
 					<view class="inner">
 
 					</view>
-				</view>
+				</view> -->
 
 			</view>
 		</view>
@@ -147,10 +148,10 @@
 					}
 				],
 
-				tab_index:0,
+				tab_index: 0,
 				tab_info: {
 					title: "1#液泵",
-					state:0,
+					state: 0,
 					info: [{
 							label: "润滑油温(℃)",
 							value: 0
@@ -162,7 +163,7 @@
 					]
 				},
 
-				
+
 				chartData_1: {
 					categories: ["00:00", "00:00", "00:00", "00:00", "00:00", "00:00"],
 					series: [{
@@ -183,15 +184,22 @@
 			this.getServerData();
 		},
 		methods: {
-			change_tab_index(index){
+			change_tab_index(index) {
 				this.tab_index = index
-				
+
 				this.tab_info.title = this.info[index].label
 				this.tab_info.state = this.info[index].state
 				this.tab_info.info = this.info[index].info
 			},
 			getServerData() {
-
+				this.$api.zaoquan_dcs_workface({
+					sys_code: "rhb"
+				}).then((res) => {
+					console.log(res.data)
+
+					this.info = res.data.info
+					this.chartData_1 = res.data.chartData_1
+				})
 			},
 		}
 	}
@@ -249,7 +257,8 @@
 					}
 				}
 			}
-			.item.active{
+
+			.item.active {
 				background-color: #3495FA;
 				border-radius: 14rpx;
 			}
@@ -262,9 +271,11 @@
 			display: flex;
 			align-items: center;
 			justify-content: space-around;
+
 			.left {
 				width: 200rpx;
 				text-align: center;
+
 				image {
 					width: 112rpx;
 				}
@@ -273,17 +284,21 @@
 			.right {
 				color: #FFF;
 				font-size: 28rpx;
-				.title{
+
+				.title {
 					line-height: 60rpx;
 				}
-				.line{
+
+				.line {
 					display: flex;
 					align-items: center;
 					line-height: 60rpx;
-					.label{
+
+					.label {
 						width: 300rpx;
 					}
-					.value{
+
+					.value {
 						width: 100rpx;
 					}
 				}

pages/production/zaoquan/control_platform/coal_mining/sanji/sanji.vue

@@ -227,9 +227,16 @@
 				this.tab_info = this.info[index].table
 			},
 			getServerData() {
-				this.tab_index = 0
-
-				this.tab_info = this.info[0].table
+				
+				this.$api.zaoquan_dcs_workface({
+					sys_code: "sj"
+				}).then((res) => {
+					console.log(res.data)
+					this.info = res.data
+					
+					this.tab_index = 0
+					this.tab_info = this.info[0].table
+				})
 			},
 		}
 	}

pages/production/zaoquan/control_platform/coal_mining/shearer/shearer.vue

@@ -17,7 +17,17 @@
 			</view>
 
 			<view class="img">
-				<image src="../../img/caimeiji.png" mode="widthFix"></image>
+				<view class="box left">
+					<image v-if="table_data[0].tbody[1].value != 0" src="../../img/cmj_jt.gif" mode="widthFix"></image>
+					<image v-else src="../../img/cmj_jt.png" mode="widthFix"></image>
+				</view>
+				<view class="box right">
+					<image v-if="table_data[0].tbody[1].value != 0" src="../../img/cmj_jt.gif" mode="widthFix"></image>
+					<image v-else src="../../img/cmj_jt.png" mode="widthFix"></image>
+				</view>
+				<view class="main">
+					<image src="../../img/cmj_zt.png" mode="widthFix"></image>
+				</view>
 			</view>
 
 
@@ -64,14 +74,14 @@
 					</view>
 				</view>
 
-				<view class="section">
+				<!-- <view class="section">
 					<view class="title">
 						<view class="left">采煤机牵引速度变化图</view>
 					</view>
 					<view class="inner">
 
 					</view>
-				</view>
+				</view> -->
 
 			</view>
 		</view>
@@ -205,7 +215,7 @@
 						}]
 					},
 				},
-				
+
 				chartData_2: {
 					categories: ["00:00", "00:00", "00:00", "00:00", "00:00", "00:00"],
 					series: [{
@@ -218,16 +228,25 @@
 					legend: {
 						show: false
 					}
-					
+
 				}
 			};
 		},
 		mounted() {
 			this.getServerData();
+			console.log(this.table_data[0].tbody[1].value)
 		},
 		methods: {
 			getServerData() {
-
+				this.$api.zaoquan_dcs_workface({
+					sys_code: "cmj"
+				}).then((res) => {
+					console.log(res.data)
+					this.info = res.data.info
+					this.chartData_1 = res.data.chartData_1
+					this.chartData_2 = res.data.chartData_2
+					this.table_data = res.data.table_data
+				})
 			},
 		}
 	}
@@ -288,11 +307,34 @@
 		}
 
 		.img {
-			margin-bottom: 20rpx;
-			text-align: center;
+			margin: 20rpx auto;
+			padding-bottom: 20rpx;
+			position: relative;
+
+			.main {
+				text-align: center;
+
+				image {
+					width: 546rpx;
+				}
+			}
+
+			.box {
+				image {
+					width: 100rpx;
+				}
+			}
+
+			.left {
+				position: absolute;
+				top: -16rpx;
+				left: 84rpx;
+			}
 
-			image {
-				width: 546rpx;
+			.right {
+				position: absolute;
+				top: 110rpx;
+				right: 96rpx;
 			}
 		}
 

pages/production/zaoquan/control_platform/drainage/drainage.vue

@@ -5,7 +5,7 @@
 		</view>
 
 		<view class="container">
-			<view class="btn">
+			<view class="btn" @click="open('../../h5/h5?url=多级排水系统')">
 				<view class="left">
 					<view class="icon">
 						<image src="../img/btn_icon.png" mode="widthFix"></image>
@@ -14,9 +14,9 @@
 						多级排水系统
 					</view>
 				</view>
-				<!-- <view class="right">
+				<view class="right">
 					<uni-icons type="arrowright" color="#FFF"></uni-icons>
-				</view> -->
+				</view>
 			</view>
 
 			<view class="info">
@@ -28,7 +28,7 @@
 				</view>
 			</view>
 
-			<view class="btn">
+			<view class="btn" @click="open('../../h5/h5?url=多级供水')">
 				<view class="left">
 					<view class="icon">
 						<image src="../img/btn_icon.png" mode="widthFix"></image>
@@ -37,9 +37,9 @@
 						多级供水系统
 					</view>
 				</view>
-				<!-- <view class="right">
+				<view class="right">
 					<uni-icons type="arrowright" color="#FFF"></uni-icons>
-				</view> -->
+				</view>
 			</view>
 
 			<view class="info">
@@ -160,13 +160,31 @@
 				],
 			};
 		},
+		mounted() {
+			this.getServerData()
+		},
 		methods: {
+			open(url) {
+				uni.navigateTo({
+					url: url
+				})
+			},
 			goto_url(item) {
 				uni.navigateTo({
-					url: "./pump_house/pump_house" + "?title=" + item.title + "&sys_code=" + item
-						.sys_code
+					url: "./pump_house/pump_house" + "?title=" + item.title + "&sys_code=" + item.sys_code
 				})
-			}
+			},
+			getServerData() {
+				this.$api.zaoquan_dcs_pump({
+					sys_code: "list"
+				}).then((res) => {
+					console.log(res.data)
+					
+					this.info_gongshui = res.data.info_gongshui
+					this.info_paishui = res.data.info_paishui
+					this.list = res.data.list
+				})
+			},
 		}
 	}
 </script>

pages/production/zaoquan/control_platform/drainage/pump_house/pump_house.vue

@@ -9,7 +9,7 @@
 			<view class="main">
 				<view class="item" v-for="(item,index) in main" :key="index">
 					<view class="label">{{item.label}}</view>
-					<view class="value">{{item.value}}</view>
+					<view class="value">{{item.value}}{{item.unit}}</view>
 				</view>
 			</view>
 
@@ -208,11 +208,11 @@
 								},
 								{
 									label: "前轴温度",
-									value: "27℃",
+									value: "0℃",
 								},
 								{
 									label: "后轴温度",
-									value: "29℃",
+									value: "0℃",
 								},
 								{
 									label: "电机温度",
@@ -336,11 +336,11 @@
 							},
 							{
 								label: "前轴温度",
-								value: "27℃",
+								value: "0℃",
 							},
 							{
 								label: "后轴温度",
-								value: "29℃",
+								value: "0℃",
 							},
 							{
 								label: "电机温度",
@@ -378,18 +378,35 @@
 
 			getServerData() {
 				if (this.sys_code.indexOf("929") == -1) {
-					this.tab_index = 0
-
-					this.tab_info.title = this.info[0].label + "设备信息"
-					this.tab_info.state = this.info[0].state
-					this.tab_info.table = this.info[0].table
+					this.$api.zaoquan_dcs_pump({
+						sys_code: this.sys_code
+					}).then((res) => {
+						console.log(res.data)
+						this.info = res.data.info
+						this.main = res.data.main
+						
+						this.tab_index = 0
+						this.tab_info.title = this.info[0].label + "设备信息"
+						this.tab_info.state = this.info[0].state
+						this.tab_info.table = this.info[0].table
+					})
 				} else {
-					this.tab_index = 0
-
-					this.tab_info.title = this.info_929[0].title + "设备信息"
-					this.tab_info.state = this.info_929[0].state
-					this.tab_info.table = this.info_929[0].table
+					this.$api.zaoquan_dcs_pump({
+						sys_code: this.sys_code
+					}).then((res) => {
+						console.log(res.data)
+						this.info_929 = res.data.info_929
+						this.main = res.data.main
+						
+						this.tab_index = 0
+						
+						this.tab_info.title = this.info_929[0].title + "设备信息"
+						this.tab_info.state = this.info_929[0].state
+						this.tab_info.table = this.info_929[0].table
+					})
 				}
+				
+				
 			}
 		}
 	}

pages/production/zaoquan/control_platform/substation/detail/detail.vue

@@ -8,17 +8,90 @@
 				</view>
 				
 			</view>
-			<view class="img_box img_box_1000" v-if="type == '1000'">
+			<view class="img_box img_box_1200" v-if="type == '5fq1200'">
+				<scroll-view class="main" scroll-x="true">
+					<view class="img">
+						<image src="../img/1200.jpg" mode="widthFix"></image>
+					</view>
+					<view class="box line_1">
+						<view class="item" :style="{backgroundColor:tip[item].color}" v-for="(item,index) in state.slice(0, 19)" :key="index"></view>
+					</view>
+					<view class="box line_2">
+						<view class="item" :style="{backgroundColor:tip[item].color}" v-for="(item,index) in state.slice(19, 40)" :key="index"></view>
+					</view>
+					
+					<view class="box line_3">
+						<view class="item" :style="{backgroundColor:tip[item].color}" v-for="(item,index) in state.slice(40, 65)" :key="index"></view>
+					</view>
+				</scroll-view>
+			</view>
+			<view class="img_box img_box_950_2" v-else-if="type == '5fq950'">
+				<scroll-view class="main" scroll-x="true">
+					<view class="img">
+						<image src="../img/950_2.jpg" mode="widthFix"></image>
+					</view>
+					<view class="box line_1">
+						<view class="item" :style="{backgroundColor:tip[item].color}" v-for="(item,index) in state.slice(0, 11)" :key="index"></view>
+					</view>
+			
+					<view class="box line_2">
+						<view class="item" :style="{backgroundColor:tip[item].color}" v-for="(item,index) in state.slice(11, 25)" :key="index"></view>
+					</view>
+					
+					<view class="box line_3">
+						<view class="item" :style="{backgroundColor:tip[item].color}" v-for="(item,index) in state.slice(25, 44)" :key="index"></view>
+					</view>
+				</scroll-view>
+			</view>
+			<view class="img_box img_box_1142" v-else-if="type == '1142'">
+				<scroll-view class="main" scroll-x="true">
+					<view class="img">
+						<image src="../img/1142.jpg" mode="widthFix"></image>
+					</view>
+					<view class="box line_1">
+						<view class="item" :style="{backgroundColor:tip[item].color}" v-for="(item,index) in state.slice(0, 16)" :key="index"></view>
+					</view>
+			
+					<view class="box line_2">
+						<view class="item" :style="{backgroundColor:tip[item].color}" v-for="(item,index) in state.slice(16, 32)" :key="index"></view>
+					</view>
+				</scroll-view>
+			</view>
+			<view class="img_box img_box_22" v-else-if="type == '22high'">
+				<scroll-view class="main" scroll-x="true">
+					<view class="img">
+						<image src="../img/22.jpg" mode="widthFix"></image>
+					</view>
+					<view class="box line_1">
+						<view class="item" :style="{backgroundColor:tip[item].color}" v-for="(item,index) in state.slice(0, 23)" :key="index"></view>
+					</view>
+				</scroll-view>
+			</view>
+			<view class="img_box img_box_980" v-else-if="type == '980'">
+				<scroll-view class="main" scroll-x="true">
+					<view class="img">
+						<image src="../img/980.jpg" mode="widthFix"></image>
+					</view>
+					<view class="box line_1">
+						<view class="item" :style="{backgroundColor:tip[item].color}" v-for="(item,index) in state.slice(0, 17)" :key="index"></view>
+					</view>
+			
+					<view class="box line_2">
+						<view class="item" :style="{backgroundColor:tip[item].color}" v-for="(item,index) in state.slice(17, 41)" :key="index"></view>
+					</view>
+				</scroll-view>
+			</view>
+			<view class="img_box img_box_1000" v-else-if="type == '1000low'">
 				<scroll-view class="main" scroll-x="true">
 					<view class="img">
 						<image src="../img/1000.png" mode="widthFix"></image>
 					</view>
 					<view class="box line_1">
-						<view class="item" :style="{backgroundColor:tip[1].color}" v-for="(item,index) in 25" :key="index"></view>
+						<view class="item" :style="{backgroundColor:tip[item].color}" v-for="(item,index) in state.slice(0, 25)" :key="index"></view>
 					</view>
 
 					<view class="box line_2">
-						<view class="item" v-for="(item,index) in 23" :key="index"></view>
+						<view class="item" :style="{backgroundColor:tip[item].color}" v-for="(item,index) in state.slice(25, 48)" :key="index"></view>
 					</view>
 				</scroll-view>
 			</view>
@@ -28,11 +101,25 @@
 						<image src="../img/720.png" mode="widthFix"></image>
 					</view>
 					<view class="box line_1">
-						<view class="item" :style="{backgroundColor:tip[1].color}" v-for="(item,index) in 18" :key="index"></view>
+						<view class="item" :style="{backgroundColor:tip[item].color}" v-for="(item,index) in state.slice(0, 18)" :key="index"></view>
+					</view>
+			
+					<view class="box line_2">
+						<view class="item" :style="{backgroundColor:tip[item].color}" v-for="(item,index) in state.slice(18)" :key="index"></view>
+					</view>
+				</scroll-view>
+			</view>
+			<view class="img_box img_box_880" v-else-if="type == '880'">
+				<scroll-view class="main" scroll-x="true">
+					<view class="img">
+						<image src="../img/880.png" mode="widthFix"></image>
+					</view>
+					<view class="box line_1">
+						<view class="item"  :style="{backgroundColor:tip[item].color}" v-for="(item,index) in state.slice(0, 9)" :key="index"></view>
 					</view>
 			
 					<view class="box line_2">
-						<view class="item" v-for="(item,index) in 24" :key="index"></view>
+						<view class="item"  :style="{backgroundColor:tip[item].color}" v-for="(item,index) in state.slice(9, 23)" :key="index"></view>
 					</view>
 				</scroll-view>
 			</view>
@@ -80,31 +167,32 @@
 					}
 					
 				],
+				state:[],
 				table_data: [{
-						title: "引自35KV变5211变电箱信息",
+						title: "变电箱信息",
 						table: {
 							thead: ["名称", "Q:kVar", "p:kw", "Uab:V", "cos", "Ia:A"],
 							tbody: [
 								[
-									5401, 0, 0, 0, 0, 0
+									0, 0, 0, 0, 0, 0
 								],
 								[
-									5401, 0, 0, 0, 0, 0
+									0, 0, 0, 0, 0, 0
 								],
 
 							]
 						}
 					},
 					{
-						title: "引自35KV变5110变电箱信息",
+						title: "变电箱信息",
 						table: {
 							thead: ["名称", "Q:kVar", "p:kw", "Uab:V", "cos", "Ia:A"],
 							tbody: [
 								[
-									5401, 0, 0, 0, 0, 0
+									0, 0, 0, 0, 0, 0
 								],
 								[
-									5401, 0, 0, 0, 0, 0
+									0, 0, 0, 0, 0, 0
 								]
 							]
 						}
@@ -118,13 +206,20 @@
 			})
 
 			this.type = option.type
-		},
-		mounted() {
-			this.getServerData();
+			
+			this.getServerData(option.type);
 		},
 		methods: {
-			getServerData() {
-
+			getServerData(sys_code) {
+				this.$api.zaoquan_dcs_power({
+					sys_code: sys_code
+				}).then((res) => {
+					console.log(res.data)
+					
+					this.tip = res.data.tip
+					this.table_data = res.data.table_data
+					this.state = res.data.state
+				})
 			},
 		}
 	}
@@ -255,7 +350,254 @@
 			}
 		}
 	}
-
+	.img_box_1200 {
+		.main {
+			.img{
+				image{
+					width: 1610rpx;
+				}
+			}
+			.line_1 {
+				position: absolute;
+				top: 138rpx;
+				left: 70rpx;
+	
+				width: 1328rpx;
+			}
+	
+			.line_2 {
+				position: absolute;
+				top: 546rpx;
+				left: 70rpx;
+	
+				width: 1470rpx;
+			}
+			
+			.line_3 {
+				position: absolute;
+				top: 920rpx;
+				left: 138rpx;
+				
+				width: 1470rpx;
+				
+				justify-content: flex-start;
+				.item{
+					margin-right: 18rpx;
+				}
+				.item:nth-child(4){
+					margin-right: 46rpx;
+				}
+				.item:nth-child(5){
+					margin-right: 46rpx;
+				}
+				.item:nth-child(12){
+					margin-right: 46rpx;
+				}
+				.item:nth-child(19){
+					margin-right: 46rpx;
+				}
+				.item:nth-child(20){
+					margin-right: 46rpx;
+				}
+			}
+		}
+	}
+	.img_box_950_2 {
+		.main {
+			.img{
+				image{
+					width: 1250rpx;
+				}
+			}
+			.line_1 {
+				position: absolute;
+				top: 138rpx;
+				left: 186rpx;
+	
+				width: 914rpx;
+			}
+	
+			.line_2 {
+				position: absolute;
+				top: 540rpx;
+				left: 134rpx;
+				width: 966rpx;
+			}
+			
+			.line_3 {
+				position: absolute;
+				top: 916rpx;
+				left: 98rpx;
+				
+				width: 1470rpx;
+				
+				justify-content: flex-start;
+				.item{
+					margin-right: 18rpx;
+				}
+				.item:nth-child(4){
+					margin-right: 46rpx;
+				}
+				.item:nth-child(11){
+					margin-right: 46rpx;
+				}
+				.item:nth-child(17){
+					margin-right: 46rpx;
+				}
+			}
+		}
+	}
+	.img_box_1142 {
+		.main {
+			.img{
+				image{
+					width: 1540rpx;
+				}
+			}
+			.line_1 {
+				position: absolute;
+				top: 64rpx;
+				left: 54rpx;
+	
+				width: 1070rpx;
+				.item:nth-child(15){
+					margin-right: 20rpx;
+				}
+				.item:nth-child(9){
+					margin-right: 56rpx;
+				}
+				.item:nth-child(8){
+					margin-right: 20rpx;
+				}
+				.item:nth-child(1){
+					margin-right: 26rpx;
+				}
+			}
+	
+			.line_2 {
+				position: absolute;
+				top: 576rpx;
+				left: 94rpx;
+	
+				justify-content: flex-start;
+				.item{
+					margin-right: 16rpx;
+				}
+				.item:nth-child(1){
+					margin-right: 82rpx;
+				}
+				.item:nth-child(2){
+					margin-right: 16rpx;
+				}
+				.item:nth-child(3){
+					margin-right: 42rpx;
+				}
+				.item:nth-child(6){
+					margin-right: 42rpx;
+				}
+				.item:nth-child(9){
+					margin-right: 80rpx;
+				}
+				.item:nth-child(10){
+					margin-right: 210rpx;
+				}
+				.item:nth-child(11){
+					margin-right: 78rpx;
+				}
+				.item:nth-child(13){
+					margin-right: 42rpx;
+				}
+				.item:nth-child(16){
+					margin-right: 80rpx;
+				}
+			}
+		}
+	}
+	.img_box_22 {
+		.main {
+			.box{
+				justify-content: flex-start;
+			}
+			.line_1 {
+				position: absolute;
+				top: 76rpx;
+				left: 0rpx;
+	
+				// width: 1340rpx;
+				.item:first-child{
+					margin-top: 0;
+					margin-right: 34rpx;
+				}
+				.item:last-child{
+					margin-top: 0;
+				}
+				.item{
+					margin-top: 102rpx;
+					margin-right: 7.5px;
+				}
+				.item:nth-child(2){
+					margin-right: 80rpx;
+				}
+				.item:nth-child(3){
+					margin-right: 48rpx;
+				}
+				
+				.item:nth-child(20){
+					margin-right: 50rpx;
+				}
+				.item:nth-child(21){
+					margin-right: 80rpx;
+				}
+				.item:nth-child(22){
+					margin-right: 26rpx;
+				}
+			}
+		}
+	}
+	.img_box_980 {
+		.main {
+			.line_1 {
+				position: absolute;
+				top: 74rpx;
+				left: 56rpx;
+	
+				width: 1214rpx;
+			}
+	
+			.line_2 {
+				position: absolute;
+				top: 748rpx;
+				left: 6rpx;
+				
+				justify-content: flex-start;
+				.item{
+					margin-right: 16rpx;
+				}
+				.item:nth-child(1){
+					margin-right: 38rpx;
+				}
+				.item:nth-child(8){
+					margin-right: 38rpx;
+				}
+				.item:nth-child(9){
+					margin-right: 38rpx;
+				}
+				.item:nth-child(17){
+					margin-right: 38rpx;
+				}
+				.item:nth-child(18){
+					margin-right: 38rpx;
+				}
+				.item:nth-child(20){
+					margin-right: 36rpx;
+				}
+				.item:nth-child(23){
+					margin-right: 36rpx;
+				}
+				
+			}
+		}
+	}
 	.img_box_1000 {
 		.main {
 			.line_1 {
@@ -280,15 +622,15 @@
 			.line_1 {
 				position: absolute;
 				top: 76rpx;
-				left: 14rpx;
+				left: 16rpx;
 	
-				width: 1296rpx;
+				width: 1290rpx;
 			}
 	
 			.line_2 {
 				position: absolute;
 				top: 468rpx;
-				left: 18rpx;
+				left: 20rpx;
 	
 				width: 1286rpx;
 			}
@@ -297,4 +639,52 @@
 			}
 		}
 	}
+	.img_box_880 {
+		.main {
+			.img {
+				image {
+					width: 910rpx;
+				}
+			}
+			.line_1 {
+				position: absolute;
+				top: 56rpx;
+				left: 64rpx;
+	
+				width: 762rpx;
+				.item:nth-child(5){
+					margin-right: 72rpx;
+				}
+			}
+	
+			.line_2 {
+				position: absolute;
+				top: 558rpx;
+				left: 14rpx;
+	
+				width: 890rpx;
+				.item:nth-child(1){
+					margin-right: 20rpx;
+				}
+				.item:nth-child(2){
+					margin-right: 58rpx;
+				}
+				.item:nth-child(3){
+					margin-right: 10rpx;
+				}
+				.item:nth-child(5){
+					margin-right: 50rpx;
+				}
+				.item:nth-child(10){
+					margin-right: 10rpx;
+				}
+				.item:nth-child(11){
+					margin-right: 58rpx;
+				}
+				.item:nth-child(12){
+					margin-right: 16rpx;
+				}
+			}
+		}
+	}
 </style>

pages/production/zaoquan/control_platform/substation/substation.vue

@@ -3,16 +3,16 @@
 		<view class="container">
 			<image src="./img/zongxianlu.png" mode="widthFix"></image>
 			<view class="content">
-				<view class="box box_1200" @click="navigator('五分区1200变电所','1200')"></view>
+				<view class="box box_1200" @click="navigator('五分区1200变电所','5fq1200')"></view>
 				<view class="box box_1142" @click="navigator('1142变电所','1142')"></view>
 				<view class="box box_950_1" @click="navigator('950变电所','950_1')"></view>
 				<view class="box box_720" @click="navigator('720变电所','720')"></view>
 				<view class="box box_929" @click="navigator('929变电所','929')"></view>
 
-				<view class="box box_950_2" @click="navigator('五分区950变电所','950_2')"></view>
-				<view class="box box_22" @click="navigator('22采区变电所','22')"></view>
+				<view class="box box_950_2" @click="navigator('五分区950变电所','5fq950')"></view>
+				<view class="box box_22" @click="navigator('22采区变电所','22high')"></view>
 				<view class="box box_980" @click="navigator('980变电所','980')"></view>
-				<view class="box box_1000" @click="navigator('1000变电所','1000')"></view>
+				<view class="box box_1000" @click="navigator('1000变电所','1000low')"></view>
 				<view class="box box_880" @click="navigator('880变电所','880')"></view>
 			</view>
 			
@@ -34,9 +34,16 @@
 		},
 		methods: {
 			navigator(title,type) {
-				uni.navigateTo({
-					url: "./detail/detail?title=" + title + "&type=" + type
-				})
+				if(type == "950_1" || type == "929"){
+					uni.showToast({
+						icon:"none",
+						title:"暂未开通！"
+					})
+				}else{
+					uni.navigateTo({
+						url: "./detail/detail?title=" + title + "&type=" + type
+					})
+				}
 			}
 		}
 	}

pages/production/zaoquan/control_platform/transport/transport.vue

@@ -139,6 +139,48 @@
 							</view>
 						</view>
 					</view>
+					
+					<view class="text_box">
+						<view class="text text_mc_1295">
+							<view>速度：0.00m/s</view>
+							<view>终端电压：0V</view>
+						</view>
+						<view class="text text_xzxj">
+							<view>速度：0.00m/s</view>
+						</view>
+						<view class="text text_ymgb_152">
+							<view>电流：1.92A</view>
+						</view>
+						<view class="text text_zds_154">
+							<view>电流：1.92A</view>
+						</view>
+						<view class="text text_zds_153">
+							<view>电流：1.92A</view>
+						</view>
+						<view class="text text_jdj_162">
+							<view>速度：0.00m/s</view>
+							<view>电流：1.92A</view>
+						</view>
+						<view class="text text_jdj_161">
+							<view>速度：0.00m/s 电流：1.92A</view>
+						</view>
+						<view class="text text_cqys_13">
+							<view>带速：0.00m/s</view>
+						</view>
+						<view class="text text_cqys_23">
+							<view>速度：0.00m/s</view>
+						</view>
+						<view class="text text_cqys_1314">
+							<view>速度：0.00m/s</view>
+							<view>电流：1.92A</view>
+						</view>
+						<view class="text text_dzxj">
+							<view>速度：0.00m/s</view>
+						</view>
+						<view class="text text_pcgb_171">
+							<view>电流：1.92A</view>
+						</view>
+					</view>
 
 					<view class="btn_box">
 						<view class="btn btn_yssm_1200" @click="detail('1200运输石门胶带输送机','yssm_1200')">
@@ -350,6 +392,69 @@
 			}
 		}
 
+		.text_box{
+			position: absolute;
+			top: 0;
+			left: 0;
+			.text{
+				transform: rotate(90deg) scale(0.6);
+				position: absolute;
+				font-size: 10rpx;
+				color: #FFF;
+				font-weight: 700;
+				width: 200rpx;
+			}
+			.text_mc_1295{
+				top: 190rpx;
+				left: 472rpx;
+			}
+			.text_xzxj{
+				top: 310rpx;
+				left: 316rpx;
+			}
+			.text_ymgb_152{
+				top: 252rpx;
+				left: 170rpx;
+			}
+			.text_zds_154{
+				top: 228rpx;
+				left: 128rpx;
+			}
+			.text_zds_153{
+				top: 700rpx;
+				left: 140rpx;
+			}
+			.text_jdj_162{
+				top: 180rpx;
+				left: -12rpx;
+			}
+			.text_jdj_161{
+				width: 400rpx;
+				top: 580rpx;
+				left: -120rpx;
+			}
+			.text_cqys_13{
+				top: 612rpx;
+				left: 474rpx;
+			}
+			.text_cqys_23{
+				top: 1190rpx;
+				left: 500rpx;
+			}
+			.text_cqys_1314{
+				top: 680rpx;
+				left: 400rpx;
+			}
+			.text_dzxj{
+				top: 1320rpx;
+				left: 320rpx;
+			}
+			.text_pcgb_171{
+				top: 880rpx;
+				left: 60rpx;
+			}
+		}
+		
 		.btn_box {
 			position: absolute;
 			top: 0;

pages/production/zaoquan/control_platform/ventilate/ventilate.vue

@@ -238,9 +238,24 @@
 				],
 			};
 		},
+		mounted() {
+			this.getServerData()
+		},
 		methods: {
+			getServerData() {
+				this.$api.zaoquan_dcs_getFan({
+					sys_code: "index"
+				}).then((res) => {
+					console.log(res.data)
+					
+					this.chartData_1 = res.data.chartData_1
+					this.chartData_2 = res.data.chartData_2
+					this.info = res.data.info
+					this.list = res.data.list
+				})
+			},
 			goto_url(item) {
-				let zhutongfeng = ["east", "west", "1314"]
+				let zhutongfeng = ["east", "west", "1314","5fq"]
 
 				if (zhutongfeng.includes(item.sys_code)) {
 					uni.navigateTo({

pages/production/zaoquan/h5/h5.vue

@@ -8,11 +8,11 @@
 	export default {
 		data() {
 			return {
-				href: ""
+				href: "http://zdh.zaoquan.nxjiewei.com:8011/g/?xmlname="
 			};
 		},
 		onLoad(option) {
-			this.href = option.url
+			this.href = this.href+option.url
 		}
 	}
 </script>