安宁项目整改

App.vue

@@ -22,6 +22,8 @@
 			// uni.setStorageSync('mine_code', 'yangchangwan');
 			// uni.setStorageSync('mine_code', 'jinfeng');
 			// uni.setStorageSync('mine_code', 'jinfeng_neiwang');
+			// uni.setStorageSync('mine_code', 'lingxin');
+			// uni.setStorageSync('mine_code', 'renjiazhuang');
 			
 			// console.log(set_base_url(uni.getStorageSync('mine_code')))
 			

common/set_base_url.js

@@ -41,6 +41,12 @@ export const set_base_url = (mine_code) => {
 		case 'shicaocun':
 			return "http://shicaocun.nxjiewei.com:8011/api"
 			break;
+		case 'lingxin':
+			return "http://lingxin.nxjiewei.com:8011/api"
+			break;
+		case 'renjiazhuang':
+			return "http://renjiazhuang.nxjiewei.com:8011/api"
+			break;
 		default:
 			return ""
 	}
@@ -82,6 +88,12 @@ export const set_appName = (mine_code) => {
 		case 'jinfeng_neiwang':
 			return "智慧金凤(内网)"
 			break;
+		case 'lingxin':
+			return "智慧灵新"
+			break;
+		case 'renjiazhuang':
+			return "智慧任家庄"
+			break;
 		default:
 			return ""
 	}
@@ -122,6 +134,12 @@ export const set_mine = (mine_code) => {
 		case 'jinfeng_neiwang':
 			return "640323B0011010027334"
 			break;
+		case 'lingxin':
+			return "640181B0011010037973"
+			break;
+		case 'renjiazhuang':
+			return "640181B0011010037381"
+			break;
 		default:
 			return ""
 	}

common/vmeitime-http/api.js

@@ -54,6 +54,16 @@ export const test = (data) => {
 // 	this.res = '请求结果 : ' + JSON.stringify(res);
 // }
 
+// EC泛微平台-单点登录
+export const oauth_sso = (data) => {
+	return http.request({
+		method: "POST",
+		url: '/oauth/sso',
+		data,
+	})
+}
+
+
 // 宁煤信息平台免密token获取
 export const oauth_getNoPasswordToken = (data) => {
 	return http.request({

common/vmeitime-http/interface.js

@@ -47,6 +47,8 @@ export default {
 		// baseUrl: "http://jinfeng.nxjiewei.com:8011/api",
 		// 金凤:内网
 		// baseUrl: "http://n.jinfeng.nxjiewei.com:8011/api",
+		// baseUrl: "http://lingxin.nxjiewei.com:8011/api",
+		// baseUrl: "http://renjiazhuang.nxjiewei.com:8011/api",
 		
 		// baseUrl: uni.getStorageSync('base_url'),
 		header: {

components/origanizationSection/origanizationSection.vue

@@ -90,14 +90,15 @@
 					this.children = item.children
 					if (item.children.length == 0) {
 						this.get_user_list(item.id)
-						return
+					}else{
+						
 					}
-					uni.showToast({
-						icon: "none",
-						title: "部门加载中...",
-						duration: 2000,
-						mask: true
-					})
+					// uni.showToast({
+					// 	icon: "none",
+					// 	title: "部门加载中...",
+					// 	duration: 2000,
+					// 	mask: true
+					// })
 				}
 
 				// if(this.t !== null){

components/p-personnel-orientation-section-1/p-personnel-orientation-section-1.vue

@@ -11,6 +11,8 @@
 
 			<!-- 当前下井领导 -->
 			<view class="list" v-if="people_list.length > 0">
+				<!-- <view style="font-size: 30rpx;line-height: 120rpx;font-weight: 700;text-align: center;">当前井下矿领导</view> -->
+				<view class="title">当前井下矿领导</view>
 				<view class="label">
 					<view class="text box_1">姓名</view>
 					<view class="text box_2">下井时间</view>
@@ -99,9 +101,9 @@
 
 			.text {
 				text-align: center;
-				font-size: 27rpx;
+				font-size: 28rpx;
 				font-family: PingFangSC-Regular, PingFang SC;
-				font-weight: 400;
+				font-weight: 700;
 				color: #232627;
 
 				overflow: hidden;

components/p-personnel-orientation-section-3/p-personnel-orientation-section-3.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view class="content">
 			<view class="title">
-				井下人员（部门分布）
+				井下人员分布
 			</view>
 			<view class="inner">
 				<slot></slot>

components/t-i-navbar-2/t-i-navbar-2.vue

@@ -26,6 +26,8 @@
 							src="@/static/switch-kuang/jinjiaqu.png" mode=""></image>
 						<image v-if="mine_code == 'shicaocun'" src="@/static/switch-kuang/shicaocun.png" mode="">
 						</image>
+						<image v-if="mine_code == 'lingxin'" src="@/static/switch-kuang/lingxin.png" mode=""></image>
+						<image v-if="mine_code == 'renjiazhuang'" src="@/static/switch-kuang/renjiazhuang.png" mode=""></image>
 						<uni-icons type="arrowdown" color="#fff"></uni-icons>
 					</view>
 				</view>
@@ -47,6 +49,8 @@
 							src="@/static/switch-kuang/jinjiaqu.png" mode=""></image>
 						<image v-if="mine_code == 'shicaocun'" src="@/static/switch-kuang/shicaocun.png" mode="">
 						</image>
+						<image v-if="mine_code == 'lingxin'" src="@/static/switch-kuang/lingxin.png" mode=""></image>
+						<image v-if="mine_code == 'renjiazhuang'" src="@/static/switch-kuang/renjiazhuang.png" mode=""></image>
 					</view>
 				</view>
 				<view class="search" v-if="mine_code != 'qingshuiying' && mine_code != 'wuyegongsi'">

components/t-i-navbar/t-i-navbar.vue

@@ -26,6 +26,8 @@
 							src="@/static/switch-kuang/jinjiaqu.png" mode=""></image>
 						<image v-if="mine_code == 'shicaocun'" src="@/static/switch-kuang/shicaocun.png" mode="">
 						</image>
+						<image v-if="mine_code == 'lingxin'" src="@/static/switch-kuang/lingxin.png" mode=""></image>
+						<image v-if="mine_code == 'renjiazhuang'" src="@/static/switch-kuang/renjiazhuang.png" mode=""></image>
 						<uni-icons type="arrowdown" color="#fff"></uni-icons>
 					</view>
 				</view>
@@ -45,8 +47,9 @@
 						</image>
 						<image v-if="mine_code == 'jinjiaqu' || mine_code == 'jinjiaqu_neiwang'"
 							src="@/static/switch-kuang/jinjiaqu.png" mode=""></image>
-						<image v-if="mine_code == 'shicaocun'" src="@/static/switch-kuang/shicaocun.png" mode="">
-						</image>
+						<image v-if="mine_code == 'shicaocun'" src="@/static/switch-kuang/shicaocun.png" mode=""></image>
+						<image v-if="mine_code == 'lingxin'" src="@/static/switch-kuang/lingxin.png" mode=""></image>
+						<image v-if="mine_code == 'renjiazhuang'" src="@/static/switch-kuang/renjiazhuang.png" mode=""></image>
 					</view>
 				</view>
 				<view class="search" v-if="mine_code != 'qingshuiying' && mine_code != 'wuyegongsi'">

components/t-o-origanization/t-o-origanization.vue

@@ -15,6 +15,8 @@
 				<view class="text" v-if="mine_code == 'yangchangwan'">国家能源集团羊场湾煤矿</view>
 				<view class="text" v-if="mine_code == 'shicaocun'">国家能源集团石槽村煤矿</view>
 				<view class="text" v-if="mine_code == 'jinfeng' || mine_code == 'jinfeng_neiwang'">国家能源集团金凤煤矿</view>
+				<view class="text" v-if="mine_code == 'lingxin'">国家能源集团灵新煤矿</view>
+				<view class="text" v-if="mine_code == 'renjiazhuang'">国家能源集团任家庄煤矿</view>
 				
 			</view>
 			<view class="box">

components/t-p-lingxin/t-p-lingxin.vue

@@ -52,11 +52,12 @@
 				days_output: ""
 			};
 		},
-		created() {
+		mounted() {
 			// 井下人数
 			this.$p_api.personnel_people_now({
 				mine: this.mine
 			}).then((res) => {
+				console.log(res)
 				this.mineall_people = res.data.data.people_total
 			})
 		

components/t-p-n-section-1/t-p-n-section-1.vue

@@ -2,6 +2,54 @@
 <template>
 	<view>
 		<view class="content">
+
+			<view class="section">
+				<view class="title">
+					<view class="line"></view>
+					<view class="text">监测监控类</view>
+					<view class="line"></view>
+				</view>
+				<view class="list">
+					<view class="item" style="background-color: #FE882E;" @click="go_video()">
+						<view class="icon">
+							<image src="./icon/section_3_icon_1.png" mode=""></image>
+						</view>
+						<view class="name">工业视频</view>
+					</view>
+					<view class="item" style="background-color: #4DA5FC;" @click="go_shangtang()">
+						<view class="icon">
+							<image src="./icon/section_3_icon_2.png" mode=""></image>
+						</view>
+						<view class="name">AI视频分析</view>
+					</view>
+					<view class="item" style="background-color: #4DA5FC;" @click="go_safety_monitoring()">
+						<view class="icon">
+							<image src="./icon/section_3_icon_3.png" mode=""></image>
+						</view>
+						<view class="name">安全监测</view>
+					</view>
+					<view class="item" style="background-color: #CB50F9;" @click="go_personnel_orientation()">
+						<view class="icon">
+							<image src="./icon/section_3_icon_4.png" mode=""></image>
+						</view>
+						<view class="name">人员定位</view>
+					</view>
+					<view class="item" style="background-color: #00D679;" @click="go_zdhxt('kyjc')">
+						<view class="icon">
+							<image src="./icon/section_3_icon_5.png" mode=""></image>
+						</view>
+						<view class="name">矿压监测</view>
+					</view>
+					<view class="item" style="background-color: #8BC8DA;" @click="go_zdhxt('glyq')">
+						<view class="icon">
+							<image src="./icon/section_3_icon_6.png" mode=""></image>
+						</view>
+						<view class="name">锅炉烟气</view>
+					</view>
+
+				</view>
+			</view>
+
 			<view class="section">
 				<view class="title">
 					<view class="line"></view>
@@ -15,7 +63,7 @@
 						</view>
 						<view class="name">采煤</view>
 					</view>
-					<view class="item" style="background-color: #A3A2E4;"
+					<view class="item" style="background-color: #CB50F9;"
 						@click="go_record('a1547d077a7e46b0a8197b8c034e2dee')">
 						<view class="icon">
 							<image src="./icon/section_1_icon_2.png" mode=""></image>
@@ -28,19 +76,19 @@
 						</view>
 						<view class="name">主运输</view>
 					</view>
-					<view class="item" style="background-color: #63D57B;" @click="go_production_statistics()">
+					<view class="item" style="background-color: #00D679;" @click="go_production_statistics()">
 						<view class="icon">
 							<image src="./icon/section_1_icon_4.png" mode=""></image>
 						</view>
 						<view class="name">生产报表</view>
 					</view>
-					<view class="item" style="background-color: #E57A98;" @click="go_zdhxt('xdt')">
+					<view class="item" style="background-color: #F95877;" @click="go_zdhxt('xdt')">
 						<view class="icon">
 							<image src="./icon/section_1_icon_5.png" mode=""></image>
 						</view>
 						<view class="name">巷道图</view>
 					</view>
-					<view class="item" style="background-color: #E9A037;" @click="show_toast()">
+					<view class="item" style="background-color: #FE882E;" @click="show_toast()">
 						<view class="icon">
 							<image src="./icon/section_1_icon_6.png" mode=""></image>
 						</view>
@@ -56,25 +104,25 @@
 					<view class="line"></view>
 				</view>
 				<view class="list">
-					<view class="item" style="background-color: #E9A037;" @click="go_zdhxt('tfgl')">
+					<view class="item" style="background-color: #FE882E;" @click="go_zdhxt('tfgl')">
 						<view class="icon">
 							<image src="./icon/section_2_icon_1.png" mode=""></image>
 						</view>
 						<view class="name">主扇通风</view>
 					</view>
-					<view class="item" style="background-color: #638BD5;" @click="show_toast()">
+					<view class="item" style="background-color: #4DA5FC;" @click="show_toast()">
 						<view class="icon">
 							<image src="./icon/section_2_icon_2.png" mode=""></image>
 						</view>
 						<view class="name">电力监控</view>
 					</view>
-					<view class="item" style="background-color: #638BD5;" @click="show_toast()">
+					<view class="item" style="background-color: #4DA5FC;" @click="go_water_affairs()">
 						<view class="icon">
 							<image src="./icon/section_2_icon_3.png" mode=""></image>
 						</view>
 						<view class="name">智慧水务</view>
 					</view>
-					<view class="item" style="background-color: #A3A2E4;" @click="go_zdhxt('psxt')">
+					<view class="item" style="background-color: #CB50F9;" @click="go_zdhxt('psxt')">
 						<view class="icon">
 							<image src="./icon/section_2_icon_4.png" mode=""></image>
 						</view>
@@ -86,26 +134,26 @@
 						</view>
 						<view class="name">压风制氮</view>
 					</view>
-					<view class="item" style="background-color: #E9A037;"
+					<view class="item" style="background-color: #FE882E;"
 						@click="go_record('b89076dac2cd45a8831ee8d3e85b4ed6')">
 						<view class="icon">
 							<image src="./icon/section_2_icon_7.png" mode=""></image>
 						</view>
 						<view class="name">设备健康诊断</view>
 					</view>
-					<view class="item" style="background-color: #E57A98;" @click="show_toast()">
+					<view class="item" style="background-color: #F95877;" @click="show_toast()">
 						<view class="icon">
 							<image src="./icon/section_2_icon_8.png" mode=""></image>
 						</view>
 						<view class="name">胶轮车监控</view>
 					</view>
-					<view class="item" style="background-color: #A3A2E4;" @click="go_zdhxt('jkrc')">
+					<view class="item" style="background-color: #CB50F9;" @click="go_zdhxt('jkrc')">
 						<view class="icon">
 							<image src="./icon/section_2_icon_9.png" mode=""></image>
 						</view>
 						<view class="name">架空乘人器</view>
 					</view>
-					<view class="item" style="background-color: #63D57B;" @click="go_zdhxt('tsj')">
+					<view class="item" style="background-color: #00D679;" @click="go_zdhxt('tsj')">
 						<view class="icon">
 							<image src="./icon/section_2_icon_10.png" mode=""></image>
 						</view>
@@ -117,71 +165,24 @@
 			<view class="section">
 				<view class="title">
 					<view class="line"></view>
-					<view class="text">监测监控类</view>
-					<view class="line"></view>
-				</view>
-				<view class="list">
-					<view class="item" style="background-color: #E9A037;" @click="go_video()">
-						<view class="icon">
-							<image src="./icon/section_3_icon_1.png" mode=""></image>
-						</view>
-						<view class="name">工业视频</view>
-					</view>
-					<view class="item" style="background-color: #638BD5;" @click="go_shangtang()">
-						<view class="icon">
-							<image src="./icon/section_3_icon_2.png" mode=""></image>
-						</view>
-						<view class="name">AI视频分析</view>
-					</view>
-					<view class="item" style="background-color: #638BD5;" @click="go_safety_monitoring()">
-						<view class="icon">
-							<image src="./icon/section_3_icon_3.png" mode=""></image>
-						</view>
-						<view class="name">安全监测</view>
-					</view>
-					<view class="item" style="background-color: #A3A2E4;" @click="go_personnel_orientation()">
-						<view class="icon">
-							<image src="./icon/section_3_icon_4.png" mode=""></image>
-						</view>
-						<view class="name">人员定位</view>
-					</view>
-					<view class="item" style="background-color: #63D57B;" @click="go_zdhxt('kyjc')">
-						<view class="icon">
-							<image src="./icon/section_3_icon_5.png" mode=""></image>
-						</view>
-						<view class="name">矿压监测</view>
-					</view>
-					<view class="item" style="background-color: #8BC8DA;" @click="go_zdhxt('glyq')">
-						<view class="icon">
-							<image src="./icon/section_3_icon_6.png" mode=""></image>
-						</view>
-						<view class="name">锅炉烟气</view>
-					</view>
-
-				</view>
-			</view>
-
-			<view class="section">
-				<view class="title">
-					<view class="line"></view>
 					<view class="text">重点场所</view>
 					<view class="line"></view>
 				</view>
 				<view class="list">
-					<view class="item" style="background-color: #E9A037;"
+					<view class="item" style="background-color: #FE882E;"
 						@click="go_record('58915240cbff480d87ce20cbdfa66a87')">
 						<view class="icon">
 							<image src="./icon/section_4_icon_1.png" mode=""></image>
 						</view>
 						<view class="name">南湖</view>
 					</view>
-					<view class="item" style="background-color: #638BD5;" @click="show_toast()">
+					<view class="item" style="background-color: #4DA5FC;" @click="show_toast()">
 						<view class="icon">
 							<image src="./icon/section_4_icon_2.png" mode=""></image>
 						</view>
 						<view class="name">班前会</view>
 					</view>
-					<view class="item" style="background-color:#E57A98;"
+					<view class="item" style="background-color:#F95877;"
 						@click="go_record('4c1dbe725d8d485e9c58ab81c9f1fd5d')">
 						<view class="icon">
 							<image src="./icon/section_4_icon_3.png" mode=""></image>
@@ -207,7 +208,7 @@
 							<uni-th align="center">地点</uni-th>
 							<!-- <uni-th align="center">系统名称</uni-th> -->
 							<uni-th align="center">报警内容</uni-th>
-							<uni-th align="center">处理措施</uni-th>
+							<!-- <uni-th align="center">处理措施</uni-th> -->
 						</uni-tr>
 						<!-- 表格数据行 -->
 						<uni-tr v-for="(item,index) in list" :key="index" v-if="index < 5">
@@ -223,13 +224,13 @@
 							<uni-td style="vertical-align: middle;" align="center">
 								<view>{{item.abnormal_reason}}</view>
 							</uni-td>
-							<uni-td style="vertical-align: middle;" align="center">
+							<!-- <uni-td style="vertical-align: middle;" align="center">
 								<view>{{item.do_measure}}</view>
-							</uni-td>
+							</uni-td> -->
 						</uni-tr>
 
 					</uni-table>
-					
+
 					<view class="btn">
 						<view class="icon">
 							<image src="./icon/btn.png" mode=""></image>
@@ -247,17 +248,17 @@
 		name: "t-p-n-section-1",
 		data() {
 			return {
-				list:[]
+				list: []
 			};
 		},
 		mounted() {
 			this.get_ycbj_list()
 		},
 		methods: {
-			get_ycbj_list(){
+			get_ycbj_list() {
 				this.$p_api.get_ycbj_list({
-					
-				}).then((res)=>{
+
+				}).then((res) => {
 					this.list = res.data.content
 				})
 			},
@@ -313,6 +314,11 @@
 					url: "../../production/shangtang/shangtang"
 				})
 			},
+			go_water_affairs() {
+				uni.navigateTo({
+					url: "../../production/water_affairs/water_affairs"
+				})
+			}
 		}
 	}
 </script>
@@ -354,7 +360,7 @@
 
 					width: 200rpx;
 					height: 166rpx;
-					background-color: #638BD5;
+					background-color: #4DA5FC;
 					text-align: center;
 
 					box-sizing: border-box;

components/t-p-qingshuiying/t-p-qingshuiying.vue

@@ -47,6 +47,14 @@
 				<view class="tip"></view>
 			</view>
 		</view>
+		<view class="item_box" style="background-color: #8BC8DA;" @click="go_zdhxt('yfzd')">
+			<view class="img">
+				<image src="../t-p-icon/icon_10.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">压风制氮</view>
+			</view>
+		</view>
 		<!-- <view class="item_box" style="background-color: #2C3E50;"
 			@click="go_zdhxt('zys')">
 			<view class="img">

components/t-p-renjiazhuang/t-p-renjiazhuang.vue

@@ -36,6 +36,63 @@
 				<view class="tip">工业视频</view>
 			</view>
 		</view>
+		
+		<view class="item_box" style="background-color: #9CE2A6;"
+			@click="go_zdhxt('tfgl')">
+			<view class="img">
+				<image src="../t-p-icon/icon_5.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">通风管理</view>
+				<view class="tip"></view>
+			</view>
+		</view>
+		<view class="item_box" style="background-color: #8BC8DA;" @click="go_zdhxt('yfzd')">
+			<view class="img">
+				<image src="../t-p-icon/icon_10.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">压风制氮</view>
+			</view>
+		</view>
+		<view class="item_box" style="background-color: #2C3E50;"
+			@click="go_zdhxt('zys')">
+			<view class="img">
+				<image src="../t-p-icon/icon_8.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">主运输系统</view>
+				<view class="tip"></view>
+			</view>
+		</view>
+		<view class="item_box" style="background-color: #2873FF;"
+			@click="go_zdhxt('psxt')">
+			<view class="img">
+				<image src="../t-p-icon/icon_9.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">排水系统</view>
+				<view class="tip"></view>
+			</view>
+		</view>
+		<view class="item_box" style="background-color: #005754;" @click="go_zdhxt('tsj')">
+			<view class="img">
+				<image src="../t-p-icon/icon_15.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">提升机</view>
+			</view>
+		</view>
+		<view class="item_box" style="background-color: #009FE8;"
+			@click="go_zdhxt('gsxt')">
+			<view class="img">
+				<image src="../t-p-icon/icon_9.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">供水系统</view>
+				<view class="tip"></view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -69,6 +126,13 @@
 			})
 		},
 		methods: {
+			// 自动化统计列表
+			go_zdhxt(zdhxt) {
+				console.log(zdhxt)
+				uni.navigateTo({
+					url:"../../production/renjiazhuang/zidonghua_list/zidonghua_list?zdhxt=" + zdhxt
+				})
+			},
 			// 生产报表
 			go_production_report() {
 				uni.navigateTo({

manifest.json

@@ -2,7 +2,7 @@
     "name" : "安宁",
     "appid" : "__UNI__5DF9CB2",
     "description" : "",
-    "versionName" : "1.0.17",
+    "versionName" : "1.0.18",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
@@ -58,20 +58,22 @@
                 "abiFilters" : [ "armeabi-v7a", "x86" ]
             },
             /* ios打包配置 */
-            "ios" : {},
+            "ios" : {
+                "dSYMs" : false
+            },
             /* SDK配置 */
             "sdkConfigs" : {
                 "ad" : {},
                 "geolocation" : {
                     "amap" : {
                         "__platform__" : [ "android" ],
-                        "appkey_ios" : "",
+                        "appkey_ios" : "a75f68653f637eeb8fb094630dfe4c02",
                         "appkey_android" : "a75f68653f637eeb8fb094630dfe4c02"
                     }
                 },
                 "maps" : {
                     "amap" : {
-                        "appkey_ios" : "",
+                        "appkey_ios" : "a75f68653f637eeb8fb094630dfe4c02",
                         "appkey_android" : "a75f68653f637eeb8fb094630dfe4c02"
                     }
                 },

pages.json

@@ -443,7 +443,7 @@
 		}, {
 			"path": "pages/origanization/communication/origanization/personal_information/personal_information_peixun",
 			"style": {
-				"navigationBarTitleText": "个人信息"
+				"navigationBarTitleText": "个人培训档案"
 			}
 
 		}, {
@@ -958,7 +958,7 @@
             "path" : "pages/origanization/communication/origanization/personnel_statistics/personnel_statistics",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "人员统计",
+                "navigationBarTitleText": "人力资源分析",
                 "enablePullDownRefresh": false
             }
         }
@@ -989,9 +989,44 @@
             }
             
         }
+        ,{
+            "path" : "pages/production/water_affairs/water_affairs",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "智慧水务",
+                "enablePullDownRefresh": false
+            }
+            
+        }, {
+			"path": "pages/production/renjiazhuang/zidonghua_list/zidonghua_list",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+
+		}
+        ,{
+            "path" : "pages/production/renjiazhuang/life_water/life_water",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0B163B"
+            }
+            
+        }
+        ,{
+            "path" : "pages/production/renjiazhuang/water_point/water_point",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#0B163B"
+            }
+            
+        }
     ],
 	"globalStyle": {
-		// "navigationStyle":"custom",
+		"navigationStyle":"custom",
 		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": " ",
 		"navigationBarBackgroundColor": "#009FE8",

pages/index/news/news.vue

@@ -74,7 +74,8 @@
 				uni.request({
 					method: "GET",
 					header: {
-						Authorization: this.token
+						Authorization: this.token,
+						'accesskey': "b364b449a18af327867f7edc3431b541"
 					},
 					url: this.base_url + "/article/detail",
 					data: {

pages/index/search/search.vue

@@ -122,7 +122,8 @@
 						url: this.base_url + "/user/search",
 						method: "POST",
 						header:{
-							'Authorization' : uni.getStorageSync('token_type') +' '+uni.getStorageSync('Authorization')
+							'Authorization' : uni.getStorageSync('token_type') +' '+uni.getStorageSync('Authorization'),
+							'accesskey': "b364b449a18af327867f7edc3431b541"
 						},
 						data: {
 							content: this.search_text
@@ -146,9 +147,16 @@
 			},
 			
 			go_user_info(staff_num) {
-				uni.navigateTo({
-					url:"../../origanization/communication/origanization/personal_information/personal_information?staff_num=" + staff_num
-				})
+				if(this.mine_code == 'ningmeijituan'){
+					uni.navigateTo({
+						url:"../../origanization/communication/origanization/personal_information/personal_information_peixun?staff_num=" + staff_num
+					})
+				}else{
+					uni.navigateTo({
+						url:"../../origanization/communication/origanization/personal_information/personal_information_info?staff_num=" + staff_num
+					})
+				}
+				
 			},
 			phone(mobile) {
 				if (mobile != null) {

pages/my/download/download.vue

@@ -38,6 +38,12 @@
 				<image v-if="mine_code == 'ningmeijituan'"
 					src="http://webdevelop.nxjiewei.com/assets/html/zhks-quankuang/ningmeijituan/download/download.png"
 					mode=""></image>
+				<image v-if="mine_code == 'lingxin'"
+					src="http://webdevelop.nxjiewei.com/assets/html/zhks-quankuang/lingxin/download/download.png"
+					mode=""></image>
+				<image v-if="mine_code == 'renjiazhuang'"
+					src="http://webdevelop.nxjiewei.com/assets/html/zhks-quankuang/renjiazhuang/download/download.png"
+					mode=""></image>
 			</view>
 			<view class="card_tips">
 				扫一扫下载

pages/my/forget-password/forget-password.vue

@@ -15,6 +15,8 @@
 			<text v-if="mine_code == 'yangchangwan'">羊场湾煤矿</text>
 			<text v-if="mine_code == 'shicaocun'">石槽村煤矿</text>
 			<text v-if="mine_code == 'jinfeng' || mine_code == 'jinfeng_neiwang'">金凤煤矿</text>
+			<text v-if="mine_code == 'lingxin'">灵新煤矿</text>
+			<text v-if="mine_code == 'renjiazhuang'">任家庄煤矿</text>
 		</view>
 		<view class="change_box">
 			<view class="item">

pages/my/login/login.vue

@@ -15,6 +15,8 @@
 			<text v-if="mine_code == 'yangchangwan'">羊场湾煤矿</text>
 			<text v-if="mine_code == 'shicaocun'">石槽村煤矿</text>
 			<text v-if="mine_code == 'jinfeng' || mine_code == 'jinfeng_neiwang'">金凤煤矿</text>
+			<text v-if="mine_code == 'lingxin'">灵新煤矿</text>
+			<text v-if="mine_code == 'renjiazhuang'">任家庄煤矿</text>
 		</view>
 		<view class="login_box">
 			<view class="item">

pages/my/personal_information/personal_information_peixun.vue

@@ -3,7 +3,8 @@
 		<view class="content" v-if="user_info">
 			<view class="user">
 				<view class="left">
-					<view class="line name">{{user_info.name}} <text style="font-size: 34rpx;margin-left: 100rpx;">{{staff_num}}</text> </view>
+					<view class="line name">{{user_info.name}} <text
+							style="font-size: 34rpx;margin-left: 100rpx;">{{staff_num}}</text> </view>
 					<view class="line">
 						<view class="item">
 							<view class="label">年龄</view>
@@ -17,9 +18,7 @@
 				</view>
 				<view class="right">
 					<view class="img">
-						<image
-							:src="user_info.photo_pic"
-							mode="aspectFill"></image>
+						<image :src="user_info.photo_pic" mode="aspectFill"></image>
 					</view>
 				</view>
 			</view>
@@ -118,7 +117,7 @@
 						<view class="label text_4">矫正措施</view>
 						<view class="label text_5">负责人签字</view>
 					</view>
-				
+
 					<view class="item" v-for="(item,index) in list" :key="index">
 						<view class="text_1">{{item.unsafe_time}}</view>
 						<view class="text_2">{{item.context}}</view>
@@ -134,7 +133,7 @@
 						<view class="label text_3">取证日期</view>
 						<view class="label text_4">有效时间至</view>
 					</view>
-				
+
 					<view class="item" v-for="(item,index) in list" :key="index">
 						<view class="text_1">{{item.organzation}}</view>
 						<view class="text_2">{{item.name}}</view>
@@ -150,7 +149,7 @@
 						<view class="label text_4">考试总分</view>
 						<view class="label text_5">考试成绩</view>
 					</view>
-				
+
 					<view class="item" v-for="(item,index) in list" :key="index">
 						<view class="text_1">{{item.name}}</view>
 						<view class="text_2">{{item.exam_time}}</view>
@@ -163,15 +162,14 @@
 					<view class="item label_box">
 						<view class="label text_1">个人工作简历</view>
 					</view>
-				
+
 					<view class="item" v-for="(item,index) in list" :key="index">
 						<view class="text_1">{{item.begda}} 到 {{item.endda}} {{item.works}}</view>
 					</view>
 				</view>
 				<!-- 荣誉及证书 -->
 				<view class="honor" v-if="active == 5">
-					<view class="item" v-for="(item,index) in honor" :key="index"
-						@click="click_image(index,item.path)">
+					<view class="item" v-for="(item,index) in honor" :key="index" @click="click_image(index,item.path)">
 						<view class="img">
 							<image :src="item.path" mode="aspectFill"></image>
 						</view>
@@ -190,59 +188,105 @@
 </template>
 
 <script>
-	import {set_base_url} from '@/common/set_base_url.js'
+	import {
+		set_base_url
+	} from '@/common/set_base_url.js'
 	export default {
 		data() {
 			return {
-				mine_code:"",
+				mine_code: "",
 				active: 0,
-				staff_num:'',
-				user_info:null,
-				list:null,
-				
+				staff_num: '',
+				user_info: null,
+				list: null,
+
 				base_url: "",
-				honor:[]
+				honor: []
 			};
 		},
 		onLoad() {
+			// #ifdef H5
+			function GetQueryString(name) {
+				var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+				var r = window.location.href.substr(1).match(reg);
+				if (r != null) return unescape(r[2]);
+				return null;
+			}
+
+			// 调用方法
+			// alert(GetQueryString("参数名1"));
+			// alert(GetQueryString("参数名2"));
+			
+			if(window.location.href.indexOf('oa=fanwei') != -1){
+				this.$api.oauth_sso({
+					url: window.location.href
+				}).then((res) => {
+					uni.setStorageSync('Authorization', res.data.data.accessToken)
+					uni.setStorageSync('token_type', res.data.data.token_type)
+					// 存储用户基本信息
+					uni.setStorageSync('user', res.data.data.user);
+					uni.setStorageSync('people_code', res.data.data.user.people_code);
+					// 存储电话号码
+					uni.setStorageSync('mobile', res.data.data.user.mobile);
+				
+					// 初始化当前煤矿编码
+					this.mine_code = uni.getStorageSync('mine_code')
+					// 根据矿编码切换首页接口不同的请求基础路径
+					this.base_url = set_base_url(this.mine_code)
+					this.staff_num = uni.getStorageSync('user').staff_num
+					this.get_examination_get_detail()
+				})
+			}else{
+				// 初始化当前煤矿编码
+				this.mine_code = uni.getStorageSync('mine_code')
+				// 根据矿编码切换首页接口不同的请求基础路径
+				this.base_url = set_base_url(this.mine_code)
+				this.staff_num = uni.getStorageSync('user').staff_num
+				this.get_examination_get_detail()
+			}
+	
+			// #endif
+
+			// #ifdef APP-PLUS
 			// 初始化当前煤矿编码
 			this.mine_code = uni.getStorageSync('mine_code')
 			// 根据矿编码切换首页接口不同的请求基础路径
 			this.base_url = set_base_url(this.mine_code)
 			this.staff_num = uni.getStorageSync('user').staff_num
 			this.get_examination_get_detail()
+			// #endif
 		},
 		methods: {
 			tab(index) {
-				console.log(index+1)
+				console.log(index + 1)
 				this.list = []
 				this.active = index
-				
+
 				this.$api.examination_get_detail({
-					staff_num:this.staff_num,
-					type: index+1
-				}).then((res)=>{
+					staff_num: this.staff_num,
+					type: index + 1
+				}).then((res) => {
 					console.log(res.data.content.data)
-					
+
 					this.list = res.data.content.data.list
-					
-					if(index == 5){
+
+					if (index == 5) {
 						this.honor = JSON.parse(res.data.content.data.list.honor)
 					}
 				})
 			},
-			get_examination_get_detail(){
+			get_examination_get_detail() {
 				this.$api.examination_get_detail({
-					staff_num:this.staff_num,
-					type:1
-				}).then((res)=>{
+					staff_num: this.staff_num,
+					type: 1
+				}).then((res) => {
 					console.log(res.data.content.data)
-					
+
 					this.user_info = res.data.content.data.user_info
 					this.list = res.data.content.data.list
 				})
 			},
-			
+
 			// 新增荣誉
 			add_image() {
 				const data = {
@@ -264,34 +308,34 @@
 				uni.showActionSheet({
 					itemList: ['查看', '删除'],
 					success: (res) => {
-			
+
 						if (res.tapIndex == 0) {
 							console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
-			
+
 							uni.previewImage({
 								urls: path.split(','),
 							});
-			
+
 						} else if (res.tapIndex == 1) {
 							console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
 							console.log(index)
-			
+
 							this.honor.splice(index, 1)
-			
+
 							console.log(this.honor)
-			
+
 							this.$api.user_updateUserMessage({
 								honor: JSON.stringify(this.honor)
 							}).then((res) => {
 								console.log(res)
-			
+
 								uni.showToast({
 									icon: "none",
 									title: "删除成功"
 								})
 							})
 						}
-			
+
 					},
 					fail: (res) => {
 						console.log(res.errMsg);
@@ -307,6 +351,7 @@
 		background-color: #009fe8;
 		box-sizing: border-box;
 		padding: 25rpx;
+
 		.line {
 			color: #FFFFFF;
 
@@ -373,6 +418,7 @@
 	.tab_content {
 		padding-top: 20rpx;
 		background-color: #009fe8;
+
 		.tab {
 			margin: 0 auto;
 			width: 700rpx;
@@ -421,6 +467,7 @@
 					-webkit-filter: none;
 					/* Chrome, Safari, Opera */
 					filter: none;
+
 					image {
 						margin-top: 10rpx;
 						width: 54rpx;
@@ -443,7 +490,7 @@
 
 			padding-top: 20rpx;
 
-			.list{
+			.list {
 				.item {
 					display: flex;
 					justify-content: space-around;
@@ -486,84 +533,87 @@
 					}
 				}
 			}
-			
+
 			.list_2 {
 				.item {
 					.text_1 {
 						width: 130rpx;
 					}
-			
+
 					.text_2 {
 						width: 180rpx;
 					}
-			
+
 					.text_3 {
 						width: 100rpx;
 					}
-			
+
 					.text_4 {
 						width: 100rpx;
 					}
-					
+
 					.text_5 {
 						width: 140rpx;
 					}
 				}
-			
+
 				.label_box {
 					.label {
 						font-size: 24rpx;
 					}
 				}
 			}
+
 			.list_3 {
 				.item {
 					.text_1 {
 						width: 160rpx;
 					}
-					
+
 					.text_2 {
 						width: 180rpx;
 					}
-					
+
 					.text_3 {
 						width: 130rpx;
 					}
-					
+
 					.text_4 {
 						width: 130rpx;
 					}
 				}
 			}
+
 			.list_4 {
 				.item {
 					.text_1 {
 						width: 180rpx;
 					}
-			
+
 					.text_2 {
 						width: 130rpx;
 					}
-			
+
 					.text_3 {
 						width: 100rpx;
 					}
-			
+
 					.text_4 {
 						width: 100rpx;
 					}
-					
+
 					.text_5 {
 						width: 100rpx;
 					}
 				}
-			
+
 				.label_box {
 					.label {
 						font-size: 24rpx;
 					}
 				}
 			}
+
 			.list_5 {
 				.item {
 					.text_1 {
@@ -572,29 +622,29 @@
 					}
 				}
 			}
-			
+
 			.honor {
 				box-sizing: border-box;
 				padding: 50rpx;
-			
+
 				overflow: hidden;
-			
+
 				.item {
 					float: left;
 					margin-right: 50rpx;
 					margin-bottom: 30rpx;
-			
+
 					width: 300rpx;
 					text-align: center;
-			
+
 					.img {
 						margin-bottom: 10rpx;
-			
+
 						image {
 							width: 300rpx;
 							height: 180rpx;
 						}
-			
+
 						.add {
 							font-size: 140rpx;
 							color: #DCDCDC;
@@ -604,18 +654,18 @@
 							background-color: #EEEEEE;
 						}
 					}
-			
+
 					.text {
 						width: 260rpx;
 						font-size: 30rpx;
 						color: #8e8e8e;
-			
+
 						overflow: hidden;
 						white-space: nowrap;
 						text-overflow: ellipsis;
 					}
 				}
-			
+
 				.item:nth-child(2n) {
 					margin-right: 0;
 				}

pages/ningdongyunying/personnel_orientation/personnel_orientation.vue

@@ -18,10 +18,10 @@
 							<view class="num">{{item_2.num}}个</view>
 						</view>
 					</view>
-					<view class="right_arrow">
+					<!-- <view class="right_arrow">
 						<view class="text">查看详情</view>
 						<view class="icon"></view>
-					</view>
+					</view> -->
 				</view>
 			</view>
 		</view>
@@ -56,7 +56,7 @@
 						"position": "bottom",
 					},
 					"title": {
-						"name": "下矿总人数",
+						"name": "当日下井总人数",
 						"color": "#555",
 					},
 					"subtitle": {
@@ -88,7 +88,7 @@
 					console.log(res.data.data)
 
 					this.ring_1.subtitle.name = res.data.data.total + res.data.data.mine_leader_total + res.data
-						.data.company_leader_total
+						.data.company_leader_total + '人'
 
 					this.chartData.series[0].data[0].value = res.data.data.total
 					this.chartData.series[0].data[1].value = res.data.data.mine_leader_total

pages/ningdongyunying/production_map/production_map.vue

@@ -145,6 +145,35 @@
 			uni.setNavigationBarTitle({
 				title: this.title
 			})
+			
+			// #ifdef H5
+			function GetQueryString(name) {
+				var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+				var r = window.location.href.substr(1).match(reg);
+				if (r != null) return unescape(r[2]);
+				return null;
+			}
+			
+			// 调用方法
+			// alert(GetQueryString("参数名1"));
+			// alert(GetQueryString("参数名2"));
+			if (window.location.href.indexOf('10.186.132.142') != -1) {
+				console.log(window.location.href)
+				this.$api.oauth_sso({
+					url: window.location.href
+				}).then((res) => {
+					uni.setStorageSync('Authorization', res.data.data.accessToken)
+					uni.setStorageSync('token_type', res.data.data.token_type)
+					// 存储用户基本信息
+					uni.setStorageSync('user', res.data.data.user);
+					uni.setStorageSync('people_code', res.data.data.user.people_code);
+					// 存储电话号码
+					uni.setStorageSync('mobile', res.data.data.user.mobile);
+				})
+			} else {
+				console.log('no_token')
+			}
+			// #endif
 		}
 	}
 </script>

pages/ningdongyunying/real_time_alarm/real_time_alarm.vue

@@ -10,7 +10,7 @@
 						<uni-th align="center">地点</uni-th>
 						<!-- <uni-th align="center">系统名称</uni-th> -->
 						<uni-th align="center">报警内容</uni-th>
-						<uni-th align="center">处理措施</uni-th>
+						<!-- <uni-th align="center">处理措施</uni-th> -->
 					</uni-tr>
 					<!-- 表格数据行 -->
 					<uni-tr v-for="(item,index) in list" :key="index">
@@ -26,9 +26,9 @@
 						<uni-td style="vertical-align: middle;" align="center">
 							<view>{{item.abnormal_reason}}</view>
 						</uni-td>
-						<uni-td style="vertical-align: middle;" align="center">
+						<!-- <uni-td style="vertical-align: middle;" align="center">
 							<view>{{item.do_measure}}</view>
-						</uni-td>
+						</uni-td> -->
 					</uni-tr>
 
 				</uni-table>
@@ -49,9 +49,13 @@
 		},
 		methods:{
 			get_ycbj_list(){
+				uni.showLoading({
+					mask:true
+				})
 				this.$p_api.get_ycbj_list({
 					
 				}).then((res)=>{
+					uni.hideLoading()
 					this.list = res.data.content
 				})
 			}

pages/origanization/communication/origanization/my_department/my_department.vue

@@ -29,9 +29,9 @@
 		data() {
 			return {
 				search_text: "",
-				
+
 				// 部门名称
-				section_fullname:"",
+				section_fullname: "",
 				// 人员列表
 				list: [
 
@@ -45,41 +45,47 @@
 		methods: {
 			get_info() {
 				this.$api.user_getUinfo({
-					staff_num : uni.getStorageSync('user').staff_num
-				}).then((res)=>{
+					staff_num: uni.getStorageSync('user').staff_num
+				}).then((res) => {
 					console.log(res.data.data)
 					this.section_fullname = res.data.data.section_fullname
 					// 获取当前部门人员
 					uni.showLoading({
-						mask:true
+						mask: true
 					})
 					this.$api.user_list({
-						id:res.data.data.section_id
-					}).then((res)=>{
+						id: res.data.data.section_id
+					}).then((res) => {
 						uni.hideLoading()
 						console.log(res)
 						this.list = res.data.data
 					})
 				})
 			},
-			go_user_info(staff_num){
-				uni.navigateTo({
-					url:"../personal_information/personal_information?staff_num=" + staff_num
-				})
+			go_user_info(staff_num) {
+				if (uni.getStorageSync('mine_code') == 'ningmeijituan') {
+					uni.navigateTo({
+						url: "../personal_information/personal_information_peixun?staff_num=" + staff_num
+					})
+				} else {
+					uni.navigateTo({
+						url: "../personal_information/personal_information_info?staff_num=" + staff_num
+					})
+				}
 			},
-			phone(mobile){
-				if(mobile != null){
+			phone(mobile) {
+				if (mobile != null) {
 					uni.makePhoneCall({
-					    phoneNumber: mobile
+						phoneNumber: mobile
 					});
-				}else{
+				} else {
 					uni.showToast({
-						icon:"none",
-						title:"未绑定手机号"
+						icon: "none",
+						title: "未绑定手机号"
 					})
 				}
 			},
-			
+
 		}
 	}
 </script>
@@ -147,19 +153,20 @@
 		.list {
 			.item {
 				height: 110rpx;
-		
+
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-		
+
 				margin-left: 108rpx;
 				border-bottom: 1rpx solid #F3F8F7;
-				
-				.left{
+
+				.left {
 					width: 500rpx;
-					
+
 					display: flex;
 					align-items: center;
+
 					.icon {
 						width: 35rpx;
 						text-align: center;
@@ -167,23 +174,24 @@
 						line-height: 35rpx;
 						border-radius: 50%;
 						border: 1rpx solid #00A1E9;
-					
+
 						font-size: 24rpx;
 						color: #00A1E9;
 					}
-					
+
 					.text {
 						width: 450rpx;
 						margin-left: 18rpx;
 						font-size: 30rpx;
-					
+
 					}
 				}
-				.right{
+
+				.right {
 					width: 90rpx;
 					text-align: center;
 				}
-				
+
 			}
 		}
 	}

pages/origanization/communication/origanization/origanization.vue

@@ -14,7 +14,8 @@
 				<view class="icon">
 					<image src="./icon/title_icon.png" mode=""></image>
 				</view>
-
+				<view class="text" v-if="mine_code == 'lingxin'">国家能源集团灵新煤矿</view>
+				<view class="text" v-if="mine_code == 'renjiazhuang'">国家能源集团任家庄煤矿</view>
 				<view class="text" v-if="mine_code == 'zaoquan'">国家能源集团枣泉煤矿</view>
 				<view class="text" v-if="mine_code == 'ningmeijituan'">国家能源集团宁夏煤业公司</view>
 

pages/origanization/communication/origanization/personnel_statistics/personnel_statistics - 副本.vue

@@ -0,0 +1,365 @@
+<template>
+	<view>
+		<view class="top_bg_color"></view>
+		<!-- 人员总数 -->
+		<view class="total">
+			<view class="num">{{total_count}}</view>
+			<view class="tip">在职总人数</view>
+		</view>
+
+		<view class="container">
+			<view class="content">
+				<view class="title">
+					<view class="left">
+						部门分布
+					</view>
+					<view class="right" @click="screen()">
+						<view class="icon">
+							<image src="./icon/check.png" mode=""></image>
+						</view>
+						<view class="text">筛选</view>
+					</view>
+				</view>
+				<view class="box">
+					<view class="charts-box">
+						<qiun-data-charts type="pie" :opts="opts" :chartData="chartData_1" />
+					</view>
+					<view class="table">
+						<uni-table border emptyText="暂无更多数据">
+							<!-- 表头行 -->
+							<uni-tr>
+								<uni-th align="center" width="150">部门名称</uni-th>
+								<uni-th align="center" width="100">人数</uni-th>
+								<uni-th align="center" width="100">占比</uni-th>
+							</uni-tr>
+							<!-- 表格数据行 -->
+							<uni-tr v-for="(item,index) in table_1" :key="index">
+								<uni-td style="vertical-align: middle;" align="center">
+									<view>{{item.section}}</view>
+								</uni-td>
+								<uni-td style="vertical-align: middle;" align="center">
+									<view>{{item.num}}</view>
+								</uni-td>
+								<uni-td style="vertical-align: middle;" align="center">
+									<view>{{item.proportion}}</view>
+								</uni-td>
+							</uni-tr>
+
+						</uni-table>
+
+						<view class="btn">
+							<view class="icon">
+								<image src="./icon/btn.png" mode=""></image>
+							</view>
+							<view class="btn_text" @click="go_origanization()">点击查看组织架构信息</view>
+						</view>
+					</view>
+
+				</view>
+			</view>
+
+			<view class="content">
+				<view class="title" style="background: linear-gradient(-90deg, #FFFFFF, #FFE0E0);">
+					<view class="left" style="border-left-color: #FF4949;">
+						学历分布
+					</view>
+				</view>
+				<view class="box">
+					<view class="charts-box">
+						<qiun-data-charts type="pie" :opts="opts" :chartData="chartData_2" />
+					</view>
+				</view>
+			</view>
+
+			<view class="content">
+				<view class="title" style="background: linear-gradient(-90deg, #FFFFFF, #FFE0E0);">
+					<view class="left" style="border-left-color: #FF4949;">
+						年龄分布
+					</view>
+				</view>
+				<view class="box">
+					<view class="charts-box">
+						<qiun-data-charts type="column" :opts="opts_column" :chartData="chartData_3" :ontouch="true" />
+					</view>
+				</view>
+			</view>
+
+			<!-- <view class="content">
+				<view class="title" style="background: linear-gradient(-90deg, #FFFFFF, #FFE0E0);">
+					<view class="left" style="border-left-color: #FF4949;">
+						党员分布
+					</view>
+				</view>
+				<view class="box">
+					<view class="charts-box">
+						<qiun-data-charts type="pie" :opts="opts" :chartData="chartData_1" />
+					</view>
+				</view>
+			</view> -->
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import data from "./chart.json"
+
+	export default {
+		data() {
+			return {
+				total_count: "-",
+				chartData_1: {},
+				chartData_2: {},
+				chartData_3: {},
+
+				table_1: [],
+				table_2: [],
+				//您可以通过修改 config-ucharts.js 文件中下标为 ['pie'] 的节点来配置全局默认参数，如都是默认参数，此处可以不传 opts 。实际应用过程中 opts 只需传入与全局默认参数中不一致的【某一个属性】即可实现同类型的图表显示不同的样式，达到页面简洁的需求。
+				opts: {
+					extra: {
+						pie: {
+							border: false,
+						}
+					},
+					legend: {
+						lineHeight: 25
+					}
+				},
+				opts_column: {
+					legend: {
+						show: false
+					},
+					enableScroll: true,
+					xAxis: {
+						scrollShow: true,
+						itemCount: 4,
+					}
+				}
+			};
+		},
+		onLoad() {
+			// #ifdef H5
+			function GetQueryString(name) {
+				var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+				var r = window.location.href.substr(1).match(reg);
+				if (r != null) return unescape(r[2]);
+				return null;
+			}
+
+			// 调用方法
+			// alert(GetQueryString("参数名1"));
+			// alert(GetQueryString("参数名2"));
+			if (window.location.href.indexOf('page=personnel_statistics') != -1) {
+				console.log(window.location.href)
+				this.$api.oauth_sso({
+					url: window.location.href
+				}).then((res) => {
+					uni.setStorageSync('Authorization', res.data.data.accessToken)
+					uni.setStorageSync('token_type', res.data.data.token_type)
+					// 存储用户基本信息
+					uni.setStorageSync('user', res.data.data.user);
+					uni.setStorageSync('people_code', res.data.data.user.people_code);
+					// 存储电话号码
+					uni.setStorageSync('mobile', res.data.data.user.mobile);
+					
+					this.getServerData()
+				})
+			} else {
+				console.log('no_token')
+			}
+			// #endif
+			
+			// #ifndef APP-PLUS
+			this.getServerData()
+			// #endif
+		},
+		methods: {
+			screen() {
+				uni.navigateTo({
+					url: "./screen/screen"
+				})
+			},
+			go_origanization() {
+				uni.navigateTo({
+					url: "../origanization?page=origanization"
+				})
+			},
+			getServerData() {
+				this.$api.census_personal_analysis({
+
+				}).then((res) => {
+					console.log(res.data.content.data)
+
+					this.chartData_1 = JSON.parse(JSON.stringify(res.data.content.data.pie_bumen));
+					this.chartData_2 = JSON.parse(JSON.stringify(res.data.content.data.pie_xueli));
+					this.chartData_3 = JSON.parse(JSON.stringify(res.data.content.data.column_nianling));
+
+					this.table_1 = res.data.content.data.table_pie_bumen
+					this.total_count = res.data.content.data.total_count
+				})
+				//模拟从服务器获取数据时的延时
+				// setTimeout(() => {
+				// 	//模拟服务器返回数据，如果数据格式和标准格式不同，需自行按下面的格式拼接
+				// 	this.chartData_1 = JSON.parse(JSON.stringify(data.pie_bumen));
+				// 	this.chartData_2 = JSON.parse(JSON.stringify(data.pie_xueli));
+				// 	this.chartData_3 = JSON.parse(JSON.stringify(data.column_nianling));
+
+				// 	this.table_1 = data.table_pie_bumen
+				// }, 500);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f3f9f7;
+		padding-bottom: 50rpx;
+	}
+
+	.top_bg_color {
+		width: 750rpx;
+		height: 600rpx;
+		background-image: linear-gradient(to bottom, #009fe8, #48bae4, #85d2e0, #bfe6e5, #f3f9f7);
+	}
+
+	.total {
+		margin-top: -560rpx;
+		margin-bottom: 50rpx;
+
+		color: #FFFFFF;
+		text-align: center;
+
+		.num {
+			font-size: 60rpx;
+		}
+
+		.tip {
+			font-size: 28rpx;
+			opacity: 0.8;
+		}
+	}
+
+	.container {
+		box-sizing: border-box;
+		padding: 0 25rpx;
+	}
+
+	.content {
+		margin-bottom: 40rpx;
+		width: 700rpx;
+		background: #FFFFFF;
+		box-shadow: 1rpx 10rpx 16rpx 0rpx rgba(0, 0, 0, 0.1300);
+		border-radius: 20rpx;
+
+		overflow: hidden;
+
+		.title {
+			box-sizing: border-box;
+			padding: 0 20rpx;
+			height: 90rpx;
+
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			background: linear-gradient(-90deg, #FFFFFF, #FFF6E7);
+
+			.left {
+				color: #343434;
+				font-weight: 700;
+
+				border-left: 6rpx solid #FCC950;
+				border-radius: 4rpx;
+				padding-left: 20rpx;
+			}
+
+			.right {
+				display: flex;
+				align-items: center;
+
+				.icon {
+					margin-right: 8rpx;
+
+					image {
+						width: 22rpx;
+						height: 25rpx;
+					}
+				}
+
+				.text {
+					font-size: 26rpx;
+					color: #343434;
+				}
+			}
+		}
+
+		.box {
+			box-sizing: border-box;
+			padding: 25rpx 10rpx;
+
+			/* 请根据实际需求修改父元素尺寸，组件自动识别宽高 */
+			.charts-box {
+				width: 100%;
+				height: 600rpx;
+			}
+
+			.table {
+				.uni-table-th.table--border {
+					color: #000000;
+					background-color: #FFF6E7;
+				}
+
+				.uni-table-td.table--border {
+					color: #666666;
+				}
+
+				position: relative;
+
+				margin:0 -10rpx 20rpx;
+				width: 700rpx;
+
+				.btn {
+					margin: 40rpx auto 0;
+					width: 400rpx;
+					height: 50rpx;
+
+					background-color: #69BBFA;
+					border-radius: 50rpx;
+
+					display: flex;
+					align-items: center;
+					justify-content: center;
+
+					.icon {
+						image {
+							width: 23rpx;
+							height: 24rpx;
+
+							display: block;
+						}
+					}
+
+					.btn_text {
+						margin-left: 10rpx;
+						font-size: 28rpx;
+						color: #FFFFFF;
+					}
+				}
+			}
+
+		}
+	}
+
+	.content:nth-child(3) {
+		.box {
+			.table {
+				margin-top: 40rpx;
+
+				.uni-table-th.table--border {
+					background-color: #FFE0E0;
+				}
+			}
+		}
+	}
+</style>

pages/origanization/communication/origanization/personnel_statistics/personnel_statistics.vue

@@ -2,11 +2,21 @@
 	<view>
 		<view class="top_bg_color"></view>
 		<!-- 人员总数 -->
-		<view class="total">
-			<view class="num">{{total_count}}</view>
-			<view class="tip">在职总人数</view>
+
+		<view class="total_box">
+			<view class="total">
+				<view class="tip">在职总人数</view>
+				<view class="num" v-if="total_count">{{total_count}} 人</view>
+			</view>
+			<view class="total" @click="go_origanization()">
+				<view class="tip">组织架构(人员查询)</view>
+				<view class="num">
+					<uni-icons type="search" size="30" color="#fff"></uni-icons>
+				</view>
+			</view>
 		</view>
 
+
 		<view class="container">
 			<view class="content">
 				<view class="title">
@@ -22,15 +32,15 @@
 				</view>
 				<view class="box">
 					<view class="charts-box">
-						<qiun-data-charts type="pie" :opts="opts" :chartData="chartData_1" />
+						<qiun-data-charts type="pie" :opts="opts" :chartData="chartData_1" tooltipFormat="personnel_statistics_ren"/>
 					</view>
 					<view class="table">
 						<uni-table border emptyText="暂无更多数据">
 							<!-- 表头行 -->
 							<uni-tr>
-								<uni-th align="center" width="150">部门名称</uni-th>
-								<uni-th align="center" width="100">人数</uni-th>
-								<uni-th align="center" width="100">占比</uni-th>
+								<uni-th align="center" width="180">部门名称</uni-th>
+								<uni-th align="center" width="90">人数</uni-th>
+								<uni-th align="center" width="80">占比</uni-th>
 							</uni-tr>
 							<!-- 表格数据行 -->
 							<uni-tr v-for="(item,index) in table_1" :key="index">
@@ -47,14 +57,14 @@
 
 						</uni-table>
 
-						<view class="btn">
+						<!-- <view class="btn">
 							<view class="icon">
 								<image src="./icon/btn.png" mode=""></image>
 							</view>
 							<view class="btn_text" @click="go_origanization()">点击查看组织架构信息</view>
-						</view>
+						</view> -->
 					</view>
-				
+
 				</view>
 			</view>
 
@@ -66,7 +76,30 @@
 				</view>
 				<view class="box">
 					<view class="charts-box">
-						<qiun-data-charts type="pie" :opts="opts" :chartData="chartData_2" />
+						<qiun-data-charts type="pie" :opts="opts" :chartData="chartData_2" tooltipFormat="personnel_statistics_ren"/>
+					</view>
+					<view class="table">
+						<uni-table border emptyText="暂无更多数据">
+							<!-- 表头行 -->
+							<uni-tr>
+								<uni-th align="center" width="180">学历</uni-th>
+								<uni-th align="center" width="90">人数</uni-th>
+								<uni-th align="center" width="80">占比</uni-th>
+							</uni-tr>
+							<!-- 表格数据行 -->
+							<uni-tr v-for="(item,index) in table_2" :key="index">
+								<uni-td style="vertical-align: middle;" align="center">
+									<view>{{item.name}}</view>
+								</uni-td>
+								<uni-td style="vertical-align: middle;" align="center">
+									<view>{{item.num}}</view>
+								</uni-td>
+								<uni-td style="vertical-align: middle;" align="center">
+									<view>{{item.proportion}}</view>
+								</uni-td>
+							</uni-tr>
+					
+						</uni-table>
 					</view>
 				</view>
 			</view>
@@ -79,8 +112,32 @@
 				</view>
 				<view class="box">
 					<view class="charts-box">
-						<qiun-data-charts type="column" :opts="opts_column" :chartData="chartData_3" :ontouch="true" />
-					</view>		
+						<!-- <qiun-data-charts type="column" :opts="opts_column" :chartData="chartData_3" :ontouch="true" /> -->
+						<qiun-data-charts type="bar" :opts="opts_bar" :chartData="chartData_3" :ontouch="true" tooltipFormat="personnel_statistics_ren"/>
+					</view>
+					<view class="table">
+						<uni-table border emptyText="暂无更多数据">
+							<!-- 表头行 -->
+							<uni-tr>
+								<uni-th align="center" width="180">年龄段</uni-th>
+								<uni-th align="center" width="90">人数</uni-th>
+								<uni-th align="center" width="80">占比</uni-th>
+							</uni-tr>
+							<!-- 表格数据行 -->
+							<uni-tr v-for="(item,index) in table_3" :key="index">
+								<uni-td style="vertical-align: middle;" align="center">
+									<view>{{item.name}}</view>
+								</uni-td>
+								<uni-td style="vertical-align: middle;" align="center">
+									<view>{{item.num}}</view>
+								</uni-td>
+								<uni-td style="vertical-align: middle;" align="center">
+									<view>{{item.proportion}}</view>
+								</uni-td>
+							</uni-tr>
+					
+						</uni-table>
+					</view>
 				</view>
 			</view>
 
@@ -107,13 +164,14 @@
 	export default {
 		data() {
 			return {
-				total_count:"-",
+				total_count: "",
 				chartData_1: {},
 				chartData_2: {},
 				chartData_3: {},
-				
-				table_1:[],
-				table_2:[],
+
+				table_1: [],
+				table_2: [],
+				table_3: [],
 				//您可以通过修改 config-ucharts.js 文件中下标为 ['pie'] 的节点来配置全局默认参数，如都是默认参数，此处可以不传 opts 。实际应用过程中 opts 只需传入与全局默认参数中不一致的【某一个属性】即可实现同类型的图表显示不同的样式，达到页面简洁的需求。
 				opts: {
 					extra: {
@@ -122,17 +180,37 @@
 						}
 					},
 					legend: {
-						lineHeight: 25
+						lineHeight: 25,
 					}
 				},
-				opts_column: {
+				// opts_column: {
+				// 	legend: {
+				// 		show: false
+				// 	},
+				// 	enableScroll: true,
+				// 	xAxis: {
+				// 		scrollShow: true,
+				// 		itemCount: 4,
+				// 	}
+				// }
+
+				opts_bar: {
+					padding: [15,50,0,5],
 					legend: {
-						show: false
+						show:false
 					},
-					enableScroll: true,
-					xAxis: {
-						scrollShow: true,
-						itemCount: 4,
+					extra: {
+						bar: {
+							type: "group",
+							width: 20,
+							meterBorde: 1,
+							meterFillColor: "#FFFFFF",
+							activeBgColor: "#000000",
+							activeBgOpacity: 0.08,
+							linearType: "custom",
+							barBorderCircle: true,
+							categoryGap: 2
+						}
 					}
 				}
 			};
@@ -145,28 +223,39 @@
 				if (r != null) return unescape(r[2]);
 				return null;
 			}
-			
+
 			// 调用方法
 			// alert(GetQueryString("参数名1"));
 			// alert(GetQueryString("参数名2"));
-			if (uni.getStorageSync('mine_code') == 'ningmeijituan') {
-				if (window.location.href.indexOf('page=personnel_statistics') != -1) {
-					console.log(window.location.href)
-			// 		this.$api.oauth_getNoPasswordToken({
-			// 			href: window.location.href,
-			// 			token: GetQueryString("token")
-			// 		}).then((res) => {
-			
-			// 		})
+			if(window.location.href.indexOf('oa=fanwei') != -1){
+				
+				if(uni.getStorageSync('Authorization')){
+					this.getServerData()
 				}else{
-					console.log('no_token')
+					this.$api.oauth_sso({
+						url: window.location.href
+					}).then((res) => {
+						uni.setStorageSync('Authorization', res.data.data.accessToken)
+						uni.setStorageSync('token_type', res.data.data.token_type)
+						// 存储用户基本信息
+						uni.setStorageSync('user', res.data.data.user);
+						uni.setStorageSync('people_code', res.data.data.user.people_code);
+						// 存储电话号码
+						uni.setStorageSync('mobile', res.data.data.user.mobile);
+					
+						window.location.reload()
+					})
 				}
+				
+				
 			}else{
-				console.log("no_ningmeijituan")
+				this.getServerData()
 			}
 			// #endif
-			
+
+			// #ifdef APP-PLUS
 			this.getServerData()
+			// #endif
 		},
 		methods: {
 			screen() {
@@ -174,23 +263,26 @@
 					url: "./screen/screen"
 				})
 			},
-			go_origanization(){
+			go_origanization() {
 				uni.navigateTo({
-					url:"../origanization?page=origanization"
+					url: "../origanization?page=origanization"
 				})
 			},
 			getServerData() {
 				this.$api.census_personal_analysis({
-					
-				}).then((res)=>{
+
+				}).then((res) => {
 					console.log(res.data.content.data)
-					
+
 					this.chartData_1 = JSON.parse(JSON.stringify(res.data.content.data.pie_bumen));
 					this.chartData_2 = JSON.parse(JSON.stringify(res.data.content.data.pie_xueli));
 					this.chartData_3 = JSON.parse(JSON.stringify(res.data.content.data.column_nianling));
 					
-					this.table_1 = res.data.content.data.table_pie_bumen
 					this.total_count = res.data.content.data.total_count
+					this.table_1 = res.data.content.data.table_pie_bumen
+					this.table_2 = res.data.content.data.table_pie_xueli
+					this.table_3 = res.data.content.data.table_pie_nianling
+										
 				})
 				//模拟从服务器获取数据时的延时
 				// setTimeout(() => {
@@ -198,7 +290,7 @@
 				// 	this.chartData_1 = JSON.parse(JSON.stringify(data.pie_bumen));
 				// 	this.chartData_2 = JSON.parse(JSON.stringify(data.pie_xueli));
 				// 	this.chartData_3 = JSON.parse(JSON.stringify(data.column_nianling));
-					
+
 				// 	this.table_1 = data.table_pie_bumen
 				// }, 500);
 			},
@@ -218,20 +310,26 @@
 		background-image: linear-gradient(to bottom, #009fe8, #48bae4, #85d2e0, #bfe6e5, #f3f9f7);
 	}
 
-	.total {
+	.total_box {
 		margin-top: -560rpx;
 		margin-bottom: 50rpx;
 
-		color: #FFFFFF;
-		text-align: center;
+		display: flex;
+		justify-content: space-around;
 
-		.num {
-			font-size: 60rpx;
-		}
+		.total {
+
+			color: #FFFFFF;
+			text-align: center;
 
-		.tip {
-			font-size: 28rpx;
-			opacity: 0.8;
+			.num {
+				font-size: 60rpx;
+			}
+
+			.tip {
+				font-size: 28rpx;
+				opacity: 0.8;
+			}
 		}
 	}
 
@@ -313,7 +411,7 @@
 
 				margin:0 -10rpx 20rpx;
 				width: 700rpx;
-				
+
 				.btn {
 					margin: 40rpx auto 0;
 					width: 400rpx;
@@ -346,10 +444,22 @@
 		}
 	}
 	
-	.content:nth-child(3){
-		.box{
-			.table{
+	.content:nth-child(2) {
+		.box {
+			.table {
 				margin-top: 40rpx;
+	
+				.uni-table-th.table--border {
+					background-color: #FFE0E0;
+				}
+			}
+		}
+	}
+	.content:nth-child(3) {
+		.box {
+			.table {
+				margin-top: 40rpx;
+
 				.uni-table-th.table--border {
 					background-color: #FFE0E0;
 				}

pages/origanization/communication/origanization/personnel_statistics/screen/screen.vue

@@ -19,7 +19,7 @@
 		
 		<!-- 人员总数 -->
 		<view class="total">
-			<view class="num">{{total_count}}</view>
+			<view class="num" v-if="total_count">{{total_count}} 人</view>
 			<view class="tip">当前部门在职总人数</view>
 		</view>
 		
@@ -36,14 +36,14 @@
 				</view>
 				<view class="box">
 					<view class="charts-box">
-						<qiun-data-charts type="pie" :opts="opts" :chartData="chartData_1" />
+						<qiun-data-charts type="pie" :opts="opts" :chartData="chartData_1" tooltipFormat="personnel_statistics_ren"/>
 					</view>
 					<view class="table">
 						<uni-table border emptyText="暂无更多数据">
 							<uni-tr>
-								<uni-th align="center" width="150">部门名称</uni-th>
-								<uni-th align="center" width="100">人数</uni-th>
-								<uni-th align="center" width="100">占比</uni-th>
+								<uni-th align="center" width="180">部门名称</uni-th>
+								<uni-th align="center" width="90">人数</uni-th>
+								<uni-th align="center" width="80">占比</uni-th>
 							</uni-tr>
 							<uni-tr v-for="(item,index) in table_1" :key="index">
 								<uni-td style="vertical-align: middle;" align="center">
@@ -70,7 +70,27 @@
 				</view>
 				<view class="box">
 					<view class="charts-box">
-						<qiun-data-charts type="pie" :opts="opts_xueli" :chartData="chartData_2" />
+						<qiun-data-charts type="pie" :opts="opts_xueli" :chartData="chartData_2" tooltipFormat="personnel_statistics_ren"/>
+					</view>
+					<view class="table">
+						<uni-table border emptyText="暂无更多数据">
+							<uni-tr>
+								<uni-th align="center" width="180">学历</uni-th>
+								<uni-th align="center" width="90">人数</uni-th>
+								<uni-th align="center" width="80">占比</uni-th>
+							</uni-tr>
+							<uni-tr v-for="(item,index) in table_2" :key="index">
+								<uni-td style="vertical-align: middle;" align="center">
+									<view>{{item.name}}</view>
+								</uni-td>
+								<uni-td style="vertical-align: middle;" align="center">
+									<view>{{item.num}}</view>
+								</uni-td>
+								<uni-td style="vertical-align: middle;" align="center">
+									<view>{{item.proportion}}</view>
+								</uni-td>
+							</uni-tr>
+						</uni-table>
 					</view>
 				</view>
 			</view>
@@ -83,7 +103,28 @@
 				</view>
 				<view class="box">
 					<view class="charts-box">
-						<qiun-data-charts type="column" :opts="opts_column" :chartData="chartData_3" :ontouch="true" />
+						<!-- <qiun-data-charts type="column" :opts="opts_column" :chartData="chartData_3" :ontouch="true" /> -->
+						<qiun-data-charts type="bar" :opts="opts_bar" :chartData="chartData_3" :ontouch="true" tooltipFormat="personnel_statistics_ren"/>
+					</view>
+					<view class="table">
+						<uni-table border emptyText="暂无更多数据">
+							<uni-tr>
+								<uni-th align="center" width="180">年龄段</uni-th>
+								<uni-th align="center" width="90">人数</uni-th>
+								<uni-th align="center" width="80">占比</uni-th>
+							</uni-tr>
+							<uni-tr v-for="(item,index) in table_3" :key="index">
+								<uni-td style="vertical-align: middle;" align="center">
+									<view>{{item.name}}</view>
+								</uni-td>
+								<uni-td style="vertical-align: middle;" align="center">
+									<view>{{item.num}}</view>
+								</uni-td>
+								<uni-td style="vertical-align: middle;" align="center">
+									<view>{{item.proportion}}</view>
+								</uni-td>
+							</uni-tr>
+						</uni-table>
 					</view>
 				</view>
 			</view>
@@ -115,15 +156,17 @@
 				section_list: [],
 				section_id:"",
 				// 类型
-				type:"枣泉煤矿",
-				type_list:['办公室','规划发展部','财务部','企业策划部'],
+				type:"",
+				type_list:[],
 				
-				total_count:"-",
+				total_count:"",
 				chartData_1: {},
 				chartData_2: {},
 				chartData_3: {},
 				
 				table_1:[],
+				table_2:[],
+				table_3:[],
 				//您可以通过修改 config-ucharts.js 文件中下标为 ['pie'] 的节点来配置全局默认参数，如都是默认参数，此处可以不传 opts 。实际应用过程中 opts 只需传入与全局默认参数中不一致的【某一个属性】即可实现同类型的图表显示不同的样式，达到页面简洁的需求。
 				opts: {
 					extra: {
@@ -146,14 +189,32 @@
 						lineHeight: 25,
 					}
 				},
-				opts_column: {
+				// opts_column: {
+				// 	legend: {
+				// 		show: false
+				// 	},
+				// 	enableScroll: true,
+				// 	xAxis: {
+				// 		scrollShow: true,
+				// 		itemCount: 4,
+				// 	}
+				// }
+				opts_bar: {
 					legend: {
-						show: false
+						show:false
 					},
-					enableScroll: true,
-					xAxis: {
-						scrollShow: true,
-						itemCount: 4,
+					extra: {
+						bar: {
+							type: "group",
+							width: 20,
+							meterBorde: 1,
+							meterFillColor: "#FFFFFF",
+							activeBgColor: "#000000",
+							activeBgOpacity: 0.08,
+							linearType: "custom",
+							barBorderCircle: true,
+							categoryGap: 2
+						}
 					}
 				}
 			};
@@ -199,8 +260,10 @@
 						this.chartData_2 = JSON.parse(JSON.stringify(res.data.content.data.pie_xueli));
 						this.chartData_3 = JSON.parse(JSON.stringify(res.data.content.data.column_nianling));
 						
-						this.table_1 = res.data.content.data.table_pie_bumen
 						this.total_count = res.data.content.data.total_count
+						this.table_1 = res.data.content.data.table_pie_bumen
+						this.table_2 = res.data.content.data.table_pie_xueli
+						this.table_3 = res.data.content.data.table_pie_nianling
 					})
 				})
 			},
@@ -256,8 +319,10 @@
 							this.chartData_2 = JSON.parse(JSON.stringify(res.data.content.data.pie_xueli));
 							this.chartData_3 = JSON.parse(JSON.stringify(res.data.content.data.column_nianling));
 							
-							this.table_1 = res.data.content.data.table_pie_bumen
 							this.total_count = res.data.content.data.total_count
+							this.table_1 = res.data.content.data.table_pie_bumen
+							this.table_2 = res.data.content.data.table_pie_xueli
+							this.table_3 = res.data.content.data.table_pie_nianling
 						})
 					},
 					fail: (res)=> {
@@ -417,4 +482,27 @@
 			
 		}
 	}
+	
+	.content:nth-child(2) {
+		.box {
+			.table {
+				margin-top: 40rpx;
+	
+				.uni-table-th.table--border {
+					background-color: #FFE0E0;
+				}
+			}
+		}
+	}
+	.content:nth-child(3) {
+		.box {
+			.table {
+				margin-top: 40rpx;
+	
+				.uni-table-th.table--border {
+					background-color: #FFE0E0;
+				}
+			}
+		}
+	}
 </style>

pages/origanization/communication/origanization/search/search.vue

@@ -18,6 +18,8 @@
 					<image src="./icon/title_icon.png" mode=""></image>
 				</view>
 				<view class="text" v-if="mine_code == 'zaoquan'">国家能源集团枣泉煤矿</view>
+				<view class="text" v-if="mine_code == 'lingxin'">国家能源集团灵新煤矿</view>
+				<view class="text" v-if="mine_code == 'renjiazhuang'">国家能源集团任家庄煤矿</view>
 				<view class="text" v-if="mine_code == 'ningmeijituan'">国家能源集团宁夏煤业公司</view>
 				<view class="text" v-if="mine_code == 'ningdongyunying'">国家能源集团宁东运营部</view>
 				<view class="text" v-if="mine_code == 'qingshuiying'">国家能源集团清水营煤矿</view>
@@ -78,9 +80,15 @@
 				})
 			},
 			go_user_info(staff_num) {
-				uni.navigateTo({
-					url: "../personal_information/personal_information?staff_num=" + staff_num
-				})
+				if(this.mine_code == 'ningmeijituan'){
+					uni.navigateTo({
+						url: "../personal_information/personal_information_peixun?staff_num=" + staff_num
+					})
+				}else{
+					uni.navigateTo({
+						url: "../personal_information/personal_information_info?staff_num=" + staff_num
+					})
+				}
 			},
 			phone(mobile) {
 				if (mobile != null) {

pages/production/personnel_orientation/depart-people-2/depart-people-2.vue

@@ -83,9 +83,9 @@
 			display: flex;
 			align-items: center;
 			.name{
-				font-size: 27rpx;
+				font-size: 28rpx;
 				font-family: PingFangSC-Regular, PingFang SC;
-				font-weight: 400;
+				font-weight: 700;
 				color: #232627;
 				text-align: center;
 			}

pages/production/personnel_orientation/depart-people/depart-people.vue

@@ -85,9 +85,9 @@
 			align-items: center;
 
 			.name {
-				font-size: 27rpx;
+				font-size: 28rpx;
 				font-family: PingFangSC-Regular, PingFang SC;
-				font-weight: 400;
+				font-weight: 700;
 				color: #232627;
 				text-align: center;
 			}

pages/production/personnel_orientation/downhole_statistics/downhole_statistics.vue

@@ -23,7 +23,7 @@
 				<view class="charts-box">
 					<qiun-data-charts type="arcbar" :chartData="chartData" background="none" :opts="arcbar" />
 				</view>
-				<view style="text-align: center;font-size: 24rpx;">月下井完成度</view>
+				<view style="text-align: center;font-size: 28rpx;">月下井完成度</view>
 			</view>
 
 		</view>
@@ -39,8 +39,6 @@
 					</view>
 				</view>
 			</scroll-view>
-
-
 		</view>
 
 		<!-- 下井记录 -->
@@ -68,10 +66,6 @@
 			</view>
 		</view>
 
-
-
-
-
 	</view>
 </template>
 
@@ -99,7 +93,6 @@
 
 				active: 0,
 
-
 				chartData: {
 					"categories": [],
 					"series": [{
@@ -167,6 +160,14 @@
 					mine: this.mine
 				}).then((res) => {
 					console.log(res.data.data)
+					
+					if(uni.getStorageSync('mine_code') == 'ningmeijituan'){
+						res.data.data.forEach((item,index)=>{
+							if(item.year < 2023 && item.month < 9){
+								res.data.data.splice(1,index)
+							}
+						})
+					}
 					this.month_list = res.data.data
 
 					this.get_personnel_downwell_month_once(res.data.data[0].year, res.data.data[0].month, res.data
@@ -229,7 +230,7 @@
 
 <style lang="scss">
 	page {
-		background-color: #f0f0f0;
+		background-color:#F2FAF7;
 	}
 
 	.section_info {
@@ -273,7 +274,7 @@
 
 			.box {
 				margin-top: 20rpx;
-				background-color: #f0f0f0;
+				background-color:#F2FAF7;
 				border-radius: 14rpx;
 
 				box-sizing: border-box;
@@ -286,7 +287,7 @@
 		}
 
 		.right {
-			margin-top: 120rpx;
+			margin-top: 60rpx;
 			width: 300rpx;
 
 
@@ -294,13 +295,14 @@
 			/* 请根据需求修改图表容器尺寸，如果父容器没有高度图表则会显示异常 */
 			.charts-box {
 				width: 100%;
-				height: 196rpx;
+				height: 230rpx;
 			}
 		}
 	}
 
 
 	.month_list {
+		background-color:#F2FAF7;
 		box-sizing: border-box;
 		padding: 20rpx;
 
@@ -345,7 +347,7 @@
 				justify-content: space-between;
 
 
-				border-bottom: 1rpx solid #f0f0f0;
+				border-bottom: 1rpx solid#F2FAF7;
 
 				.text {
 					width: 187.5rpx;
@@ -358,6 +360,7 @@
 				color: #009FE8;
 				border-bottom: 1rpx solid #009FE8;
 				line-height: 80rpx;
+				// background-color:#F2FAF7;
 			}
 		}
 	}

pages/production/personnel_orientation/people_track/people_track.vue

@@ -67,9 +67,9 @@
 			justify-content: space-between;
 			.name{
 				width: 250rpx;
-				font-size: 27rpx;
+				font-size: 30rpx;
 				font-family: PingFangSC-Regular, PingFang SC;
-				font-weight: 400;
+				font-weight: 700;
 				color: #232627;
 				text-align: center;
 			}

pages/production/personnel_orientation/personnel_orientation.vue

@@ -45,13 +45,36 @@
 			
 			<p-personnel-orientation-section-3>
 				<!-- 职能科室 -->
-				<view class="section_title">职能科室</view>
-				<canvas style="width: 720upx; height:800upx;" canvas-id="canvasRing2" id="canvasRing2"
-					@touchstart="touchRing2"></canvas>
+				<!-- <view class="section_title">职能科室</view> -->
+				<!-- <canvas style="width: 720upx; height:800upx;" canvas-id="canvasRing2" id="canvasRing2" @touchstart="touchRing2"></canvas> -->
 				<!-- 基层区队 -->
-				<view class="section_title">基层区队</view>
-				<canvas style="width: 720upx; height:800upx;" canvas-id="canvasRing3" id="canvasRing3"
-					@touchstart="touchRing3"></canvas>
+				<!-- <view class="section_title">基层区队</view> -->
+				<!-- <canvas style="width: 720upx; height:800upx;" canvas-id="canvasRing3" id="canvasRing3" @touchstart="touchRing3"></canvas> -->
+			
+				<!-- 表格 -->
+				<view class="table">
+					<uni-table border emptyText="暂无更多数据">
+						<!-- 表头行 -->
+						<uni-tr>
+							<uni-th align="center" width="180">部门名称</uni-th>
+							<uni-th align="center" width="90">人数</uni-th>
+							<uni-th align="center" width="80">占比</uni-th>
+						</uni-tr>
+						<!-- 表格数据行 -->
+						<uni-tr v-for="(item,index) in table" :key="index" @row-click="table_detail(item.depart_name)">
+							<uni-td style="vertical-align: middle;" align="center">
+								<view>{{item.depart_name}}</view>
+							</uni-td>
+							<uni-td style="vertical-align: middle;" align="center">
+								<view>{{item.pepole_num}}</view>
+							</uni-td>
+							<uni-td style="vertical-align: middle;" align="center">
+								<view>{{((item.pepole_num / people_total)*100).toFixed(2) + ' %'}}</view>
+							</uni-td>
+						</uni-tr>
+				
+					</uni-table>
+				</view>
 			</p-personnel-orientation-section-3>
 			<!-- 各科室下井人数 -->
 			<p-personnel-orientation-section-4 @changeDepart="changeDepart">
@@ -98,7 +121,11 @@
 
 				// 数据正常状态与更新时间
 				status: 1,
-				updated_at: ""
+				updated_at: "",
+				
+				// 表格
+				table:[],
+				people_total:0
 
 			}
 		},
@@ -131,7 +158,7 @@
 				this.updated_at = res.data.data.updated_at
 			})
 			
-			this.get_product_data_query_power()
+			// this.get_product_data_query_power()
 		},
 		methods: {
 			get_product_data_query_power(){
@@ -172,7 +199,7 @@
 					mine: this.mine
 				}).then((res) => {
 					// console.log(res)
-
+					this.people_total = res.data.data.people_total
 					let Ring = {
 						series: [{
 							name: '',
@@ -523,7 +550,9 @@
 					type: this.departType,
 					mine: this.mine
 				}).then((res) => {
-					// console.log(res.data.data)
+					console.log(res.data.data)
+					
+					this.table = res.data.data
 
 					let ColumnColumn = {
 						"categories": [],
@@ -643,6 +672,14 @@
 				});
 			},
 
+
+			table_detail(category){
+				console.log(category)
+				uni.navigateTo({
+					url: "./depart-people-2/depart-people-2?title=" + category +
+						"&departType=now" + "&mine=" + this.mine
+				})
+			}
 		}
 	}
 </script>
@@ -764,4 +801,20 @@
 		}
 	
 	}
+	
+	.table {
+		.uni-table-th.table--border {
+			color: #000000;
+			background-color: #F3F6FA;
+		}
+	
+		.uni-table-td.table--border {
+			color: #666666;
+		}
+	
+		position: relative;
+	
+		width: 720rpx;
+	
+	}
 </style>

pages/production/production_report/production_report.vue

@@ -40,7 +40,7 @@
 			this.mine = option.mine
 			this.org_num = option.org_num
 			
-			this.get_product_data_query_power()
+			// this.get_product_data_query_power()
 		},
 		methods:{
 			get_product_data_query_power(){

pages/production/qingshuiying/zidonghua_list/zidonghua_list.vue

@@ -14,8 +14,12 @@
 			<view v-if="zdhxt == 'zys'">
 				<image src="./img/zys.jpg" mode=""></image>
 			</view>
+			<!-- 压风制氮 -->
+			<view v-if="zdhxt == 'yfzd'">
+				<image src="./img/yfzd.jpg" mode=""></image>
+			</view>
 		</view>
-		
+
 		<!-- 列表 -->
 		<view class="list">
 			<!-- 通风管理 -->
@@ -36,13 +40,14 @@
 						</view>
 					</view>
 					<view class="inner_list" v-if="active == index">
-						<view class="inner_item" v-for="(item_2,index_2) in item.list" :key="index_2" @click="inner_item_active(item_2)">
+						<view class="inner_item" v-for="(item_2,index_2) in item.list" :key="index_2"
+							@click="inner_item_active(item_2)">
 							<view class="inner_icon"></view>
 							<view class="inner_name">{{item_2.name}}</view>
 						</view>
 					</view>
 				</view>
-				
+
 			</view>
 			<!-- 压风制氮 -->
 			<view v-if="zdhxt == 'yfzd'">
@@ -62,13 +67,14 @@
 						</view>
 					</view>
 					<view class="inner_list" v-if="active == index">
-						<view class="inner_item" v-for="(item_2,index_2) in item.list" :key="index_2" @click="inner_item_active(item_2)">
+						<view class="inner_item" v-for="(item_2,index_2) in item.list" :key="index_2"
+							@click="inner_item_active(item_2)">
 							<view class="inner_icon"></view>
 							<view class="inner_name">{{item_2.name}}</view>
 						</view>
 					</view>
 				</view>
-				
+
 			</view>
 			<!-- 排水系统 -->
 			<view v-if="zdhxt == 'psxt'">
@@ -88,13 +94,14 @@
 						</view>
 					</view>
 					<view class="inner_list" v-if="active == index">
-						<view class="inner_item" v-for="(item_2,index_2) in item.list" :key="index_2" @click="inner_item_active(item_2)">
+						<view class="inner_item" v-for="(item_2,index_2) in item.list" :key="index_2"
+							@click="inner_item_active(item_2)">
 							<view class="inner_icon"></view>
 							<view class="inner_name">{{item_2.name}}</view>
 						</view>
 					</view>
 				</view>
-				
+
 			</view>
 			<!-- 主运输 -->
 			<view v-if="zdhxt == 'zys'">
@@ -114,16 +121,17 @@
 						</view>
 					</view>
 					<view class="inner_list" v-if="active == index">
-						<view class="inner_item" v-for="(item_2,index_2) in item.list" :key="index_2" @click="inner_item_active(item_2)">
+						<view class="inner_item" v-for="(item_2,index_2) in item.list" :key="index_2"
+							@click="inner_item_active(item_2)">
 							<view class="inner_icon"></view>
 							<view class="inner_name">{{item_2.name}}</view>
 						</view>
 					</view>
 				</view>
-				
+
 			</view>
 		</view>
-	
+
 	</view>
 </template>
 
@@ -131,157 +139,179 @@
 	export default {
 		data() {
 			return {
-				zdhxt:"",
-				active:0,
-				
-				
+				zdhxt: "",
+				active: 0,
+
+
 				// 通风管理
-				data_tfgl:[
-					{
-						name:"清水营煤矿",
-						list:[
-							{
-								name:"通风系统",
-								url:"http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/ztfxt/ztfxt"
-							}
-						]
-					}
-				],
+				data_tfgl: [{
+					name: "清水营煤矿",
+					list: [{
+						name: "通风系统",
+						// url:"http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/ztfxt/ztfxt"
+						url: "../../unified_automation_system/ventilation/ventilation?system_type=fan_1"
+					}]
+				}],
 				// 排水系统
-				data_psxt:[
-					{
-						name:"清水营煤矿",
-						list:[
-							{
-								name:"主排水泵房786",
-								url:"http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/786bf/786bf"
+				data_psxt: [{
+						name: "清水营煤矿",
+						list: [{
+								name: "主排水泵房786",
+								// url: "http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/786bf/786bf"
+								url: "../../unified_automation_system/drainage/drainage?system_type=pump_1"
 							},
 							{
-								name:"主排水泵房11采区",
-								url:"http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/11bf/11bf"
+								name: "主排水泵房11采区",
+								url: "http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/11bf/11bf"
 							}
 						]
 					},
-					
+
 				],
 				// 主运输系统
-				data_zys:[
-					{
-						name:"清水营煤矿",
-						list:[
-							{
-								name:"06机巷皮带监控系统",
-								url:"http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/06jx_pd/06jx_pd"
-							},
-							{
-								name:"07风巷皮带监控系统",
-								url:"http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/07fx_pd/07fx_pd"
-							},
-							{
-								name:"二煤上山皮带监控系统",
-								url:"http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/emss_pd/emss_pd"
-							},
-							{
-								name:"井下皮带监控系统",
-								url:"http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/jx_pd/jx_pd"
-							}
-						]
-					},
-					
-				],
-				
+				data_zys: [{
+					name: "清水营煤矿",
+					list: [{
+							name: "06机巷皮带监控系统",
+							url: "http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/06jx_pd/06jx_pd"
+						},
+						{
+							name: "07风巷皮带监控系统",
+							url: "http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/07fx_pd/07fx_pd"
+						},
+						{
+							name: "二煤上山皮带监控系统",
+							url: "http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/emss_pd/emss_pd"
+						},
+						{
+							name: "井下皮带监控系统",
+							url: "http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/jx_pd/jx_pd"
+						}
+					]
+				}, ],
+
+				// 压风系统
+				data_yfzd: [{
+					name: "清水营煤矿",
+					list: [{
+							name: "压风系统",
+							url: "../../unified_automation_system/compressed_air/compressed_air?system_type=compressed_air"
+						},
+						{
+							name: "制氮系统",
+							url: "../../unified_automation_system/nitrogen_production_system/nitrogen_production_system?system_type=nitrogen"
+						}
+					]
+				}],
+
 			}
 		},
 		onLoad(option) {
 			this.zdhxt = option.zdhxt
-			
-			if(this.zdhxt == 'tfgl'){
+
+			if (this.zdhxt == 'tfgl') {
 				uni.setNavigationBarTitle({
-					title:"通风管理"
+					title: "通风管理"
 				})
-			}else if(this.zdhxt == 'psxt'){
+			} else if (this.zdhxt == 'psxt') {
 				uni.setNavigationBarTitle({
-					title:"排水系统"
+					title: "排水系统"
+				})
+			} else if (this.zdhxt == 'yfzd') {
+				uni.setNavigationBarTitle({
+					title: "压风制氮"
 				})
 			}
 		},
 		methods: {
-			inner_item_active(item_2){
-				console.log(item_2)
-				
-				uni.navigateTo({
-					url:"./detail/detail?url=" + item_2.url + "&name=" + item_2.name
-				})
-				
+			inner_item_active(item) {
+				console.log(item)
+
+				if (item.url.indexOf('unified_automation_system') != -1) {
+					uni.navigateTo({
+						url: item.url + "&name=" + item.name + "&mine_code=qingshuiying"
+					})
+				} else {
+					uni.navigateTo({
+						url: "./detail/detail?url=" + item.url + "&name=" + item.name
+					})
+				}
+
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	page{
+	page {
 		background-color: #F7F7F7;
 	}
-	
-	.top_img{
-		image{
+
+	.top_img {
+		image {
 			width: 750rpx;
 			height: 360rpx;
 		}
 	}
-	
-	.list{
+
+	.list {
 		padding-top: 20rpx;
-		.item{
+
+		.item {
 			background-color: #FFFFFF;
 			margin-bottom: 20rpx;
-			
+
 			box-sizing: border-box;
 			padding: 0 35rpx;
-			
-			.title{
+
+			.title {
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				
+
 				height: 110rpx;
 				border-bottom: 1rpx solid #f7f7f7;
-				.left{
+
+				.left {
 					display: flex;
 					align-items: center;
-					.icon{
+
+					.icon {
 						width: 31rpx;
 						height: 27rpx;
-						
+
 						background-image: url(img/icon.png);
 						background-size: cover;
 						background-repeat: no-repeat;
 					}
-					.name{
+
+					.name {
 						margin-left: 26rpx;
 						font-size: 38rpx;
 					}
 				}
-				.right{
-					
-				}
+
+				.right {}
 			}
-			.inner_list{
-				.inner_item{
+
+			.inner_list {
+				.inner_item {
 					display: flex;
 					align-items: center;
-					
+
 					height: 110rpx;
 					border-bottom: 1rpx solid #f7f7f7;
-					
+
 					padding-left: 96rpx;
-					.inner_icon{
+
+					.inner_icon {
 						width: 20rpx;
 						height: 20rpx;
 						background-color: #0992E5;
 						border-radius: 50%;
 					}
-					.inner_name{
+
+					.inner_name {
 						margin-left: 29rpx;
 						font-size: 32rpx;
 						color: #8a8a8a;
@@ -289,6 +319,6 @@
 				}
 			}
 		}
-		
+
 	}
 </style>

pages/production/renjiazhuang/life_water/life_water.json

@@ -0,0 +1,196 @@
+{
+	"cabinet":[
+		{
+			"title":"一号变频柜参数",
+			"data":[
+				{
+					"name":"1号供水泵",
+					"state":"2",
+					"state_list":[
+						{
+							"name":"状态名称",
+							"state":1
+						},
+						{
+							"name":"状态名称",
+							"state":2
+						},
+						{
+							"name":"状态名称",
+							"state":1
+						}
+					]
+				},
+				{
+					"name":"1号供水泵",
+					"state":"1",
+					"state_list":[
+						{
+							"name":"状态名称",
+							"state":1
+						},
+						{
+							"name":"状态名称",
+							"state":1
+						},
+						{
+							"name":"状态名称",
+							"state":1
+						}
+					]
+				},
+				{
+					"name":"1号供水泵",
+					"state":"1",
+					"state_list":[
+						{
+							"name":"状态名称",
+							"state":1
+						},
+						{
+							"name":"状态名称",
+							"state":1
+						},
+						{
+							"name":"状态名称",
+							"state":1
+						}
+					]
+				},
+				{
+					"name":"1号供水泵",
+					"state":"1",
+					"state_list":[
+						{
+							"name":"状态名称",
+							"state":1
+						},
+						{
+							"name":"状态名称",
+							"state":1
+						},
+						{
+							"name":"状态名称",
+							"state":1
+						}
+					]
+				}
+			]
+		},
+		{
+			"title":"二号变频柜参数",
+			"data":[
+				{
+					"name":"1号供水泵",
+					"state":"1",
+					"state_list":[
+						{
+							"name":"状态名称",
+							"state":1
+						},
+						{
+							"name":"状态名称",
+							"state":2
+						},
+						{
+							"name":"状态名称",
+							"state":1
+						}
+					]
+				},
+				{
+					"name":"1号供水泵",
+					"state":"1",
+					"state_list":[
+						{
+							"name":"状态名称",
+							"state":1
+						},
+						{
+							"name":"状态名称",
+							"state":1
+						},
+						{
+							"name":"状态名称",
+							"state":1
+						}
+					]
+				},
+				{
+					"name":"1号供水泵",
+					"state":"1",
+					"state_list":[
+						{
+							"name":"状态名称",
+							"state":1
+						},
+						{
+							"name":"状态名称",
+							"state":1
+						},
+						{
+							"name":"状态名称",
+							"state":1
+						}
+					]
+				},
+				{
+					"name":"1号供水泵",
+					"state":"1",
+					"state_list":[
+						{
+							"name":"状态名称",
+							"state":1
+						},
+						{
+							"name":"状态名称",
+							"state":1
+						},
+						{
+							"name":"状态名称",
+							"state":1
+						}
+					]
+				}
+			]
+		}
+			
+	
+	],
+	"state_list":[
+		{
+			"label": "排气高温",
+			"state": 2
+		},
+		{
+			"label": "传感器故障",
+			"state": 1
+		},
+		{
+			"label": "轻故障",
+			"state": 2
+		}
+	],
+	"parameter":[
+		{
+			"label": "吸附塔A压力",
+			"value": 67.959,
+			"unit": "Mpa"
+		},
+		{
+			"label": "吸附塔B压力",
+			"value": 67.959,
+			"unit": "Mpa"
+		},
+		{
+			"label": "空气罐压力",
+			"value": 67.959,
+			"unit": "Mpa"
+		},
+		{
+			"label": "氮气罐压力",
+			"value": 67.959,
+			"unit": "Mpa"
+		}
+	]
+}

pages/production/renjiazhuang/life_water/life_water.vue

@@ -0,0 +1,405 @@
+<template>
+	<view>
+		<view v-for="(item,index) in data.cabinet" :key="index">
+			<view class="title">
+				<view class="icon">
+					<image src="../icon/canshu.png" mode=""></image>
+				</view>
+				<view class="text">{{item.title}}</view>
+			</view>
+			<!-- 水泵 -->
+			<view class="pump_list">
+				<view class="pump" v-for="(item_2,index_2) in item.data" :key="index_2">
+					<view class="icon" v-if="item_2.state == 1">
+						<image src="../icon/water_pump_kai.jpg" mode=""></image>
+					</view>
+					<view class="icon" v-else>
+						<image src="../icon/water_pump.png" mode=""></image>
+					</view>
+					<view class="name">{{item_2.name}}</view>
+					<view class="state">
+						<view class="label">状态</view>
+						<!-- 1-开 2-关 -->
+						<view class="value value_1" v-if="item_2.state == 1"></view>
+						<view class="value value_2" v-else></view>
+					</view>
+					<view class="list">
+						<view class="state" v-for="(item_3,index_3) in item_2.state_list" :key="index_3">
+							<view class="label">{{item_3.name}}</view>
+							<!-- 1-开 2-关 -->
+							<view class="value value_1" v-if="item_3.state == 1"></view>
+							<view class="value value_2" v-else></view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 状态 -->
+		<view class="state_list" v-if="data.state_list">
+			<view class="title">
+				<view class="icon">
+					<image src="../icon/canshu.png" mode=""></image>
+				</view>
+				<view class="text">状态</view>
+			</view>
+			<view class="list">
+				<view class="state" v-for="(item,index) in data.state_list" :key="index">
+					<view class="label">{{item.label}}</view>
+					<!-- 1-开 2-关 -->
+					<view class="value value_1" v-if="item.state == 1"></view>
+					<view class="value value_2" v-if="item.state == 2"></view>
+				</view>
+			</view>
+		</view>
+		
+		<!-- 控制参数 -->
+		<view class="parameter" v-if="data.parameter">
+			<view class="title">
+				<view class="icon">
+					<image src="../icon/canshu.png" mode=""></image>
+				</view>
+				<view class="text">控制参数</view>
+			</view>
+			<view class="list">
+				<view class="item" v-for="(item_2,index_2) in data.parameter" :key="index_2"
+					@click="show_state(item_2)">
+					<view class="label">{{item_2.label}}</view>
+					<view class="value">{{item_2.state}}</view>
+					<view class="unit">{{item_2.unit}}</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import data from "./life_water.json"
+	
+	export default {
+		data() {
+			return {
+				mine_code: "",
+				system_type: "",
+
+				// 数据刷新定时器
+				data_timer: {},
+				data: null
+			};
+		},
+		onLoad(option) {
+			this.data = data
+			console.log(this.data)
+			uni.setNavigationBarTitle({
+				title: option.name
+			})
+			this.mine_code = option.mine_code
+			this.system_type = option.system_type
+
+			// this.get_data()
+			// this.data_timer = setInterval(() => {
+			// 	this.get_data()
+			// }, 5000)
+		},
+		methods: {
+			show_item(item) {
+				uni.showToast({
+					icon: "none",
+					title: item.label + "  " + item.value + "  " + item.unit
+				})
+			},
+			get_data() {
+				this.$api.unified_automation_system({
+					mine_code: 'renjiazhuang',
+					system_type: this.system_type
+				}).then((res) => {
+					console.log(res)
+					this.data = res.data
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #0B163B;
+		box-sizing: border-box;
+		padding: 30rpx 10rpx;
+	}
+
+	.title {
+		margin: 0 auto;
+		margin-bottom: 50rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+
+		width: 290rpx;
+		height: 60rpx;
+		background-image: url(../icon/border.png);
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+
+		.icon {
+			margin-right: 10rpx;
+
+			image {
+				width: 30rpx;
+				height: 30rpx;
+			}
+		}
+
+		.text {
+			color: #00FFF6;
+			font-size: 30rpx;
+		}
+	}
+
+
+	.pump_list {
+		margin-top: 20rpx;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+
+		.pump {
+			margin-bottom: 40rpx;
+			width: 360rpx;
+			
+			.icon {
+				text-align: center;
+
+				image {
+					width: 164rpx;
+					height: 138rpx;
+				}
+			}
+
+			.name {
+				margin-top: 20rpx;
+				text-align: center;
+				color: #DEF1FF;
+				font-size: 34rpx;
+				font-weight: 700;
+			}
+
+			.state {
+				margin-top: 10rpx;
+				height: 60rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				.label {
+					color: #4CB1FF;
+					font-size: 28rpx;
+				}
+
+				.value {
+					margin-left: 20rpx;
+					width: 40rpx;
+					height: 40rpx;
+					border-radius: 50%;
+				}
+
+				.value_1 {
+					background-color: #00FF00;
+				}
+
+				.value_2 {
+					background-color: #DCDCDC;
+				}
+			}
+			
+			.list{
+				overflow: hidden;
+				.state{
+					box-sizing: border-box;
+					
+					float: left;
+					width: 350rpx;
+					height: 70rpx;
+					display: flex;
+					align-items: center;
+					.label {
+						width: 160rpx;
+						color: #4CB1FF;
+						font-size: 28rpx;
+						
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						overflow: hidden;
+					}
+								
+					.value {
+						margin-left: 20rpx;
+						width: 40rpx;
+						height: 40rpx;
+						border-radius: 50%;
+					}
+								
+					.value_1 {
+						background-color: #00FF00;
+					}
+								
+					.value_2 {
+						background-color: #DCDCDC;
+					}
+				}
+			}
+
+		}
+
+		.pump:nth-child(Odd) {
+			border-right: 2rpx solid;
+			border-image: linear-gradient(#0B163B, #00B7F5, #0B163B) 10;
+		}
+	}
+	
+	.state_list{
+		margin-top: 40rpx;
+		.title {
+			margin: 20rpx auto;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+					
+			width: 230rpx;
+			height: 60rpx;
+			background-image: url(../icon/border.png);
+			background-size: 100% 100%;
+			background-repeat: no-repeat;
+					
+			.icon {
+				margin-right: 20rpx;
+					
+				image {
+					width: 30rpx;
+					height: 30rpx;
+				}
+			}
+					
+			.text {
+				color: #00FFF6;
+				font-size: 30rpx;
+			}
+		}
+					
+		.list{
+			margin: 0 auto;
+			width: 700rpx;
+			overflow: hidden;
+			
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			.state{
+				box-sizing: border-box;
+				width: 350rpx;
+				height: 70rpx;
+				display: flex;
+				align-items: center;
+				.label {
+					width: 240rpx;
+					color: #4CB1FF;
+					font-size: 28rpx;
+					text-align: justify;
+					text-align-last: justify;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					overflow: hidden;
+				}
+							
+				.value {
+					margin-left: 20rpx;
+					width: 40rpx;
+					height: 40rpx;
+					border-radius: 50%;
+				}
+							
+				.value_1 {
+					background-color: #00FF00;
+				}
+							
+				.value_2 {
+					background-color: #DCDCDC;
+				}
+			}
+		}
+	}
+	
+	.parameter {
+		box-sizing: border-box;
+		margin-top: 40rpx;
+	
+		.title {
+			margin: 0 auto;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+	
+			width: 230rpx;
+			height: 60rpx;
+			background-image: url(../icon/border.png);
+			background-size: 100% 100%;
+			background-repeat: no-repeat;
+	
+			.icon {
+				margin-right: 20rpx;
+	
+				image {
+					width: 30rpx;
+					height: 30rpx;
+				}
+			}
+	
+			.text {
+				color: #00FFF6;
+				font-size: 30rpx;
+			}
+		}
+	
+		.list {
+			margin-left: 20rpx;
+			margin-top: 40rpx;
+	
+			.item {
+				height: 60rpx;
+				display: flex;
+	
+				color: #4CB1FF;
+				font-size: 28rpx;
+	
+				.label {
+					width: 200rpx;
+	
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					overflow: hidden;
+				}
+	
+				.value {
+					margin: 0 20rpx;
+					width: 200rpx;
+					height: 40rpx;
+					box-sizing: border-box;
+					padding: 0 10rpx;
+					background: rgba(0, 4, 15, 0.36);
+					border: 2rpx solid #3D55A5;
+	
+					color: #FFF600;
+					font-size: 24rpx;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					overflow: hidden;
+				}
+	
+				.unit {
+					width: 100rpx;
+				}
+			}
+		}
+	}
+	
+</style>

pages/production/renjiazhuang/water_point/water_point.json

@@ -0,0 +1,116 @@
+{
+	"common": [
+		{
+			"name":"矿区水池信息控制",
+			"data":[
+				{
+					"label": "总管压力",
+					"value": 0.72,
+					"unit": "Mpa"
+				},
+				{
+					"label": "总管压力",
+					"value": 0.72,
+					"unit": "Mpa"
+				},
+				{
+					"label": "总管压力",
+					"value": 0.72,
+					"unit": "Mpa"
+				},
+				{
+					"label": "总管压力",
+					"value": 0.72,
+					"unit": "Mpa"
+				}
+			]
+		},
+		{
+			"name":"矿区水池信息控制",
+			"data":[
+				{
+					"label": "总管压力",
+					"value": 0.72,
+					"unit": "Mpa"
+				},
+				{
+					"label": "总管压力",
+					"value": 0.72,
+					"unit": "Mpa"
+				},
+				{
+					"label": "总管压力",
+					"value": 0.72,
+					"unit": "Mpa"
+				},
+				{
+					"label": "总管压力",
+					"value": 0.72,
+					"unit": "Mpa"
+				}
+			]
+		}
+	],
+	"cabinet":[
+		{
+			"title":"供水站变频柜参数",
+			"data":[
+				{
+					"name":"1号供水泵",
+					"state":"2",
+					"state_list":[
+						{
+							"name":"状态名称",
+							"state":1
+						},
+						{
+							"name":"状态名称",
+							"state":2
+						},
+						{
+							"name":"状态名称",
+							"state":1
+						}
+					]
+				},
+				{
+					"name":"1号供水泵",
+					"state":"1",
+					"state_list":[
+						{
+							"name":"状态名称",
+							"state":1
+						},
+						{
+							"name":"状态名称",
+							"state":1
+						},
+						{
+							"name":"状态名称",
+							"state":1
+						}
+					]
+				},
+				{
+					"name":"1号供水泵",
+					"state":"1",
+					"state_list":[
+						{
+							"name":"状态名称",
+							"state":1
+						},
+						{
+							"name":"状态名称",
+							"state":1
+						},
+						{
+							"name":"状态名称",
+							"state":1
+						}
+					]
+				}
+			]
+		}
+	]
+	
+}

pages/production/renjiazhuang/water_point/water_point.vue

@@ -0,0 +1,303 @@
+<template>
+	<view>
+		<view v-for="(item,index) in data.cabinet" :key="index">
+			<view class="common" v-if="data.common"  v-for="(item,index) in data.common" :key="index">
+				<view class="text">
+					{{item.name}}
+				</view>
+				<view class="list">
+					<view class="item" v-for="(item_2,index_2) in item.data" :key="index_2" @click="show_item(item_2)">
+						<view class="label">{{item_2.label}}</view>
+						<view class="value">{{item_2.value}}</view>
+						<view class="unit">{{item_2.unit}}</view>
+					</view>
+				</view>
+			</view>
+			
+			<view class="title">
+				<view class="icon">
+					<image src="../icon/canshu.png" mode=""></image>
+				</view>
+				<view class="text">{{item.title}}</view>
+			</view>
+			<!-- 水泵 -->
+			<view class="pump_list">
+				<view class="pump" v-for="(item_2,index_2) in item.data" :key="index_2">
+					<view class="icon" v-if="item_2.state == 1">
+						<image src="../icon/water_pump_kai.jpg" mode=""></image>
+					</view>
+					<view class="icon" v-else>
+						<image src="../icon/water_pump.png" mode=""></image>
+					</view>
+					<view class="name">{{item_2.name}}</view>
+					<view class="state">
+						<view class="label">状态</view>
+						<!-- 1-开 2-关 -->
+						<view class="value value_1" v-if="item_2.state == 1"></view>
+						<view class="value value_2" v-else></view>
+					</view>
+					<view class="list">
+						<view class="state" v-for="(item_3,index_3) in item_2.state_list" :key="index_3">
+							<view class="label">{{item_3.name}}</view>
+							<!-- 1-开 2-关 -->
+							<view class="value value_1" v-if="item_3.state == 1"></view>
+							<view class="value value_2" v-else></view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import data from "./water_point.json"
+	
+	export default {
+		data() {
+			return {
+				mine_code: "",
+				system_type: "",
+
+				// 数据刷新定时器
+				data_timer: {},
+				data: null
+			};
+		},
+		onLoad(option) {
+			this.data = data
+			console.log(this.data)
+			uni.setNavigationBarTitle({
+				title: option.name
+			})
+			this.mine_code = option.mine_code
+			this.system_type = option.system_type
+
+			// this.get_data()
+			// this.data_timer = setInterval(() => {
+			// 	this.get_data()
+			// }, 5000)
+		},
+		methods: {
+			show_item(item) {
+				uni.showToast({
+					icon: "none",
+					title: item.label + "  " + item.value + "  " + item.unit
+				})
+			},
+			get_data() {
+				this.$api.unified_automation_system({
+					mine_code: 'renjiazhuang',
+					system_type: this.system_type
+				}).then((res) => {
+					console.log(res)
+					this.data = res.data
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #0B163B;
+		box-sizing: border-box;
+		padding: 30rpx 10rpx;
+	}
+	
+	.common {
+		margin-bottom: 20rpx;
+		background-image: url(../icon/common_bg.png);
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+		
+		padding-top: 12rpx;
+		.text{
+			text-align: center;
+			color: #00FFF4;
+			font-weight: 700;
+		}
+		.list{
+			margin: 0 auto;
+			width: 700rpx;
+				
+			box-sizing: border-box;
+			padding: 40rpx;
+				
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+		}
+	
+		.item {
+			width: 300rpx;
+			height: 50rpx;
+			display: flex;
+			justify-content: space-between;
+	
+			color: #4CB1FF;
+			font-size: 28rpx;
+	
+			.label {
+				width: 110rpx;
+	
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				overflow: hidden;
+			}
+	
+			.value {
+				width: 110rpx;
+				height: 40rpx;
+				box-sizing: border-box;
+				padding: 0 10rpx;
+				background: rgba(0, 4, 15, 0.36);
+				border: 2rpx solid #3D55A5;
+	
+				color: #FFF600;
+				font-size: 24rpx;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				overflow: hidden;
+			}
+	
+			.unit {
+				width: 50rpx;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				overflow: hidden;
+			}
+		}
+	}
+	
+	
+	.title {
+		margin: 0 auto;
+		margin-bottom: 50rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+
+		width: 320rpx;
+		height: 60rpx;
+		background-image: url(../icon/border.png);
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+
+		.icon {
+			margin-right: 10rpx;
+
+			image {
+				width: 30rpx;
+				height: 30rpx;
+			}
+		}
+
+		.text {
+			color: #00FFF6;
+			font-size: 30rpx;
+		}
+	}
+
+
+	.pump_list {
+		margin-top: 20rpx;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+
+		.pump {
+			margin-bottom: 40rpx;
+			width: 360rpx;
+			
+			.icon {
+				text-align: center;
+
+				image {
+					width: 164rpx;
+					height: 138rpx;
+				}
+			}
+
+			.name {
+				margin-top: 20rpx;
+				text-align: center;
+				color: #DEF1FF;
+				font-size: 34rpx;
+				font-weight: 700;
+			}
+
+			.state {
+				margin-top: 10rpx;
+				height: 60rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				.label {
+					color: #4CB1FF;
+					font-size: 28rpx;
+				}
+
+				.value {
+					margin-left: 20rpx;
+					width: 40rpx;
+					height: 40rpx;
+					border-radius: 50%;
+				}
+
+				.value_1 {
+					background-color: #00FF00;
+				}
+
+				.value_2 {
+					background-color: #DCDCDC;
+				}
+			}
+			
+			.list{
+				overflow: hidden;
+				.state{
+					box-sizing: border-box;
+					
+					float: left;
+					width: 350rpx;
+					height: 70rpx;
+					display: flex;
+					align-items: center;
+					.label {
+						width: 160rpx;
+						color: #4CB1FF;
+						font-size: 28rpx;
+						
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						overflow: hidden;
+					}
+								
+					.value {
+						margin-left: 20rpx;
+						width: 40rpx;
+						height: 40rpx;
+						border-radius: 50%;
+					}
+								
+					.value_1 {
+						background-color: #00FF00;
+					}
+								
+					.value_2 {
+						background-color: #DCDCDC;
+					}
+				}
+			}
+
+		}
+
+		.pump:nth-child(Odd) {
+			border-right: 2rpx solid;
+			border-image: linear-gradient(#0B163B, #00B7F5, #0B163B) 10;
+		}
+	}
+		
+</style>

pages/production/renjiazhuang/zidonghua_list/zidonghua_list.vue

@@ -0,0 +1,393 @@
+<template>
+	<view>
+		<!-- 头图 -->
+		<view class="top_img">
+			<!-- 通风管理 -->
+			<view v-if="zdhxt == 'tfgl'">
+				<image src="./img/tfgl.jpg" mode=""></image>
+			</view>
+			<!-- 排水系统 -->
+			<view v-if="zdhxt == 'psxt'">
+				<image src="./img/psxt.jpg" mode=""></image>
+			</view>
+			<!-- 主运输 -->
+			<view v-if="zdhxt == 'zys'">
+				<image src="./img/zys.jpg" mode=""></image>
+			</view>
+			<!-- 压风制氮 -->
+			<view v-if="zdhxt == 'yfzd'">
+				<image src="./img/yfzd.jpg" mode=""></image>
+			</view>
+			<!-- 提升机 -->
+			<view v-if="zdhxt == 'tsj'">
+				<image src="./img/tsj.jpg" mode=""></image>
+			</view>
+			<!-- 供水系统 -->
+			<view v-if="zdhxt == 'gsxt'">
+				<image src="./img/gsxt.jpg" mode=""></image>
+			</view>
+		</view>
+
+		<!-- 列表 -->
+		<view class="list">
+			<!-- 通风管理 -->
+			<view v-if="zdhxt == 'tfgl'">
+				<view class="item" v-for="(item,index) in data_tfgl" :key="index">
+					<view class="title" @click="item_active(index)">
+						<view class="left">
+							<view class="icon"></view>
+							<view class="name">
+								{{item.name}}
+							</view>
+						</view>
+						<view class="right" v-if="index != active">
+							<uni-icons type="arrowright"></uni-icons>
+						</view>
+						<view class="right" v-if="index == active">
+							<uni-icons type="arrowdown"></uni-icons>
+						</view>
+					</view>
+					<view class="inner_list" v-if="active == index">
+						<view class="inner_item" v-for="(item_2,index_2) in item.list" :key="index_2"
+							@click="inner_item_active(item_2)">
+							<view class="inner_icon"></view>
+							<view class="inner_name">{{item_2.name}}</view>
+						</view>
+					</view>
+				</view>
+
+			</view>
+			<!-- 压风制氮 -->
+			<view v-if="zdhxt == 'yfzd'">
+				<view class="item" v-for="(item,index) in data_yfzd" :key="index">
+					<view class="title" @click="item_active(index)">
+						<view class="left">
+							<view class="icon"></view>
+							<view class="name">
+								{{item.name}}
+							</view>
+						</view>
+						<view class="right" v-if="index != active">
+							<uni-icons type="arrowright"></uni-icons>
+						</view>
+						<view class="right" v-if="index == active">
+							<uni-icons type="arrowdown"></uni-icons>
+						</view>
+					</view>
+					<view class="inner_list" v-if="active == index">
+						<view class="inner_item" v-for="(item_2,index_2) in item.list" :key="index_2"
+							@click="inner_item_active(item_2)">
+							<view class="inner_icon"></view>
+							<view class="inner_name">{{item_2.name}}</view>
+						</view>
+					</view>
+				</view>
+
+			</view>
+			<!-- 排水系统 -->
+			<view v-if="zdhxt == 'psxt'">
+				<view class="item" v-for="(item,index) in data_psxt" :key="index">
+					<view class="title" @click="item_active(index)">
+						<view class="left">
+							<view class="icon"></view>
+							<view class="name">
+								{{item.name}}
+							</view>
+						</view>
+						<view class="right" v-if="index != active">
+							<uni-icons type="arrowright"></uni-icons>
+						</view>
+						<view class="right" v-if="index == active">
+							<uni-icons type="arrowdown"></uni-icons>
+						</view>
+					</view>
+					<view class="inner_list" v-if="active == index">
+						<view class="inner_item" v-for="(item_2,index_2) in item.list" :key="index_2"
+							@click="inner_item_active(item_2)">
+							<view class="inner_icon"></view>
+							<view class="inner_name">{{item_2.name}}</view>
+						</view>
+					</view>
+				</view>
+
+			</view>
+			<!-- 主运输 -->
+			<view v-if="zdhxt == 'zys'">
+				<view class="item" v-for="(item,index) in data_zys" :key="index">
+					<view class="title" @click="item_active(index)">
+						<view class="left">
+							<view class="icon"></view>
+							<view class="name">
+								{{item.name}}
+							</view>
+						</view>
+						<view class="right" v-if="index != active">
+							<uni-icons type="arrowright"></uni-icons>
+						</view>
+						<view class="right" v-if="index == active">
+							<uni-icons type="arrowdown"></uni-icons>
+						</view>
+					</view>
+					<view class="inner_list" v-if="active == index">
+						<view class="inner_item" v-for="(item_2,index_2) in item.list" :key="index_2"
+							@click="inner_item_active(item_2)">
+							<view class="inner_icon"></view>
+							<view class="inner_name">{{item_2.name}}</view>
+						</view>
+					</view>
+				</view>
+
+			</view>
+			<!-- 提升机 -->
+			<view v-if="zdhxt == 'tsj'">
+				<view class="item" v-for="(item,index) in data_tsj" :key="index">
+					<view class="title" @click="item_active(index)">
+						<view class="left">
+							<view class="icon"></view>
+							<view class="name">
+								{{item.name}}
+							</view>
+						</view>
+						<view class="right" v-if="index != active">
+							<uni-icons type="arrowright"></uni-icons>
+						</view>
+						<view class="right" v-if="index == active">
+							<uni-icons type="arrowdown"></uni-icons>
+						</view>
+					</view>
+					<view class="inner_list" v-if="active == index">
+						<view class="inner_item" v-for="(item_2,index_2) in item.list" :key="index_2"
+							@click="inner_item_active(item_2)">
+							<view class="inner_icon"></view>
+							<view class="inner_name">{{item_2.name}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 供水系统 -->
+			<view v-if="zdhxt == 'gsxt'">
+				<view class="item" v-for="(item,index) in data_gsxt" :key="index">
+					<view class="title" @click="item_active(index)">
+						<view class="left">
+							<view class="icon"></view>
+							<view class="name">
+								{{item.name}}
+							</view>
+						</view>
+						<view class="right" v-if="index != active">
+							<uni-icons type="arrowright"></uni-icons>
+						</view>
+						<view class="right" v-if="index == active">
+							<uni-icons type="arrowdown"></uni-icons>
+						</view>
+					</view>
+					<view class="inner_list" v-if="active == index">
+						<view class="inner_item" v-for="(item_2,index_2) in item.list" :key="index_2"
+							@click="inner_item_active(item_2)">
+							<view class="inner_icon"></view>
+							<view class="inner_name">{{item_2.name}}</view>
+						</view>
+					</view>
+				</view>
+
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				zdhxt: "",
+				active: 0,
+
+
+				// 通风管理
+				data_tfgl: [{
+					name: "任家庄煤矿",
+					list: [{
+						name: "主通风系统",
+						url: "../../unified_automation_system/ventilation/ventilation?system_type=fan_1"
+					}]
+				}],
+				// 排水系统
+				data_psxt: [{
+						name: "任家庄煤矿",
+						list: [{
+								name: "850泵房",
+								url: "../../unified_automation_system/drainage/drainage?system_type=pump_1"
+							},
+							{
+								name: "650泵房",
+								url: "../../unified_automation_system/drainage/drainage?system_type=pump_2"
+							}
+						]
+					},
+
+				],
+				// 主运输系统
+				data_zys: [{
+					name: "任家庄煤矿",
+					list: [{
+						name: "主井皮带",
+						url: "../../unified_automation_system/belt_conveyor/belt_conveyor?system_type=belt_1"
+					}]
+				}, ],
+
+				// 压风系统
+				data_yfzd: [{
+					name: "任家庄煤矿",
+					list: [{
+						name: "压风系统",
+						url: "../../unified_automation_system/compressed_air/compressed_air?system_type=compressed_air"
+					}]
+				}],
+				// 提升机
+				data_tsj: [{
+					name: "任家庄煤矿",
+					list: [{
+						name: "副立井提升机系统",
+						url: "../../unified_automation_system/hoist/hoist?system_type=hoist"
+					}]
+				}],
+				// 供水系统
+				data_gsxt: [{
+					name: "任家庄煤矿",
+					list: [{
+						name: "矿区生活水",
+						url: "../life_water/life_water?system_type=life_water_1"
+					},{
+						name: "副立井生活水",
+						url: "../water_point/water_point?system_type=life_water_2"
+					}]
+				}],
+
+			}
+		},
+		onLoad(option) {
+			this.zdhxt = option.zdhxt
+
+			if (this.zdhxt == 'tfgl') {
+				uni.setNavigationBarTitle({
+					title: "通风管理"
+				})
+			} else if (this.zdhxt == 'psxt') {
+				uni.setNavigationBarTitle({
+					title: "排水系统"
+				})
+			} else if (this.zdhxt == 'yfzd') {
+				uni.setNavigationBarTitle({
+					title: "压风制氮"
+				})
+			} else if (this.zdhxt == 'zys') {
+				uni.setNavigationBarTitle({
+					title: "主运输系统"
+				})
+			} else if (this.zdhxt == 'gsxt') {
+				uni.setNavigationBarTitle({
+					title: "供水系统"
+				})
+			}
+
+		},
+		methods: {
+			inner_item_active(item) {
+				console.log(item)
+
+				if (item.url.indexOf('unified_automation_system') != -1) {
+					uni.navigateTo({
+						url: item.url + "&name=" + item.name + "&mine_code=renjiazhuang"
+					})
+				} else {
+					uni.navigateTo({
+						url: item.url + "&name=" + item.name + "&mine_code=renjiazhuang"
+					})
+				}
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F7F7F7;
+	}
+
+	.top_img {
+		image {
+			width: 750rpx;
+			height: 360rpx;
+		}
+	}
+
+	.list {
+		padding-top: 20rpx;
+
+		.item {
+			background-color: #FFFFFF;
+			margin-bottom: 20rpx;
+
+			box-sizing: border-box;
+			padding: 0 35rpx;
+
+			.title {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				height: 110rpx;
+				border-bottom: 1rpx solid #f7f7f7;
+
+				.left {
+					display: flex;
+					align-items: center;
+
+					.icon {
+						width: 31rpx;
+						height: 27rpx;
+
+						background-image: url(img/icon.png);
+						background-size: cover;
+						background-repeat: no-repeat;
+					}
+
+					.name {
+						margin-left: 26rpx;
+						font-size: 38rpx;
+					}
+				}
+
+				.right {}
+			}
+
+			.inner_list {
+				.inner_item {
+					display: flex;
+					align-items: center;
+
+					height: 110rpx;
+					border-bottom: 1rpx solid #f7f7f7;
+
+					padding-left: 96rpx;
+
+					.inner_icon {
+						width: 20rpx;
+						height: 20rpx;
+						background-color: #0992E5;
+						border-radius: 50%;
+					}
+
+					.inner_name {
+						margin-left: 29rpx;
+						font-size: 32rpx;
+						color: #8a8a8a;
+					}
+				}
+			}
+		}
+
+	}
+</style>

pages/production/safety_monitoring/safety_monitoring.vue

@@ -64,7 +64,7 @@
 			// 开关量统计
 			this.getSluice()
 			
-			this.get_product_data_query_power()
+			// this.get_product_data_query_power()
 		},
 		methods:{
 			get_product_data_query_power(){

pages/production/unified_automation_system/belt_conveyor/belt_conveyor.vue

@@ -10,16 +10,17 @@
 		</view>
 
 		<!-- 皮带数据 -->
-		<view class="belt" v-if="data.electric_parameter">
+		<!-- <view class="belt" v-if="data.electric_parameter"> -->
+		<view class="belt">
 			<view class="icon" v-if="data.state == 1">
 				<image src="./icon/belt_conveyor.gif" mode=""></image>
 			</view>
-			<view class="icon" v-if="data.state == 2">
+			<view class="icon" v-else>
 				<image src="./icon/belt_conveyor.png" mode=""></image>
 			</view>
 			<view class="name">{{data.name}}</view>
 			<!-- 电机运行参数 -->
-			<view class="parameter">
+			<view class="parameter" v-if="mine_code != 'renjiazhuang'">
 				<view class="title">
 					<view class="icon">
 						<image src="./icon/canshu.png" mode=""></image>
@@ -49,8 +50,40 @@
 					</view>
 				</view>
 			</view>
+			
+			<view class="parameter" v-if="mine_code == 'renjiazhuang'" style="margin-bottom: 80rpx;">
+				<view class="title">
+					<view class="icon">
+						<image src="./icon/canshu.png" mode=""></image>
+					</view>
+					<view class="text">电机运行参数</view>
+				</view>
+				<view class="content">
+					<view class="label_index">
+						<view class="index_title"></view>
+						<view class="index_box">
+							<view class="index">1号</view>
+							<view class="index">2号</view>
+							<view class="index">3号</view>
+							<view class="index">4号</view>
+						</view>
+					</view>
+					<view class="list">
+						<view class="item" v-for="(item,index) in data.electric_parameter" :key="index"
+							@click="show_value_list(item)" style="display: block;margin-bottom: 40rpx;">
+							<view class="label" style="margin-bottom: 10rpx;">{{item.label}}</view>
+							<view class="value_list">
+								<view class="item" v-for="(item_2,index_2) in item.value_list" :key="index_2">
+									<view class="value">{{item_2.value}}</view>
+									<view class="unit">{{item_2.unit}}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
 			<!-- 变频器运行参数 -->
-			<view class="parameter converter_parameter">
+			<view class="parameter converter_parameter" v-if="data.converter_parameter">
 				<view class="title">
 					<view class="icon">
 						<image src="./icon/canshu.png" mode=""></image>
@@ -82,7 +115,7 @@
 				</view>
 			</view>
 			<!-- 速度选择状态 -->
-			<view class="parameter">
+			<view class="parameter" v-if="speed_selection_state">
 				<view class="title">
 					<view class="icon">
 						<image src="./icon/canshu.png" mode=""></image>
@@ -95,13 +128,13 @@
 						<view class="label">{{item.label}}</view>
 						<!-- 1-开 2-关 -->
 						<view class="value value_1" v-if="item.state == 1"></view>
-						<view class="value value_2" v-if="item.state == 2"></view>
+						<view class="value value_2" v-else></view>
 					</view>
 				</view>
 			</view>
 			
 			<!-- 皮带控制模式 -->
-			<view class="parameter">
+			<view class="parameter" v-if="belt_control_mode">
 				<view class="title">
 					<view class="icon">
 						<image src="./icon/canshu.png" mode=""></image>
@@ -114,13 +147,13 @@
 						<view class="label">{{item.label}}</view>
 						<!-- 1-开 2-关 -->
 						<view class="value value_1" v-if="item.state == 1"></view>
-						<view class="value value_2" v-if="item.state == 2"></view>
+						<view class="value value_2" v-else></view>
 					</view>
 				</view>
 			</view>
 			
 			<!-- 皮带状态 -->
-			<view class="parameter belt_state">
+			<view class="parameter belt_state" v-if="belt_state">
 				<view class="title">
 					<view class="icon">
 						<image src="./icon/canshu.png" mode=""></image>
@@ -133,7 +166,7 @@
 						<view class="label">{{item.label}}</view>
 						<!-- 1-开 2-关 -->
 						<view class="value value_1" v-if="item.state == 1"></view>
-						<view class="value value_2" v-if="item.state == 2"></view>
+						<view class="value value_2" v-else></view>
 					</view>
 				</view>
 			</view>
@@ -151,13 +184,13 @@
 						<view class="label">{{item.label}}</view>
 						<!-- 1-开 2-关 -->
 						<view class="value value_1" v-if="item.state == 1"></view>
-						<view class="value value_2" v-if="item.state == 2"></view>
+						<view class="value value_2" v-else></view>
 					</view>
 				</view>
 			</view>
 			
 			<!-- 沿线闭锁状态 -->
-			<view class="parameter atresia">
+			<view class="parameter atresia" v-if="atresia">
 				<view class="title">
 					<view class="icon">
 						<image src="./icon/canshu.png" mode=""></image>
@@ -169,7 +202,7 @@
 						<view class="label">{{item.label}}</view>
 						<!-- 1-开 2-关 -->
 						<view class="value value_1" v-if="item.state == 1"></view>
-						<view class="value value_2" v-if="item.state == 2"></view>
+						<view class="value value_2" v-else></view>
 					</view>
 				</view>
 			</view>
@@ -231,13 +264,25 @@
 			},
 			show_value_list(item) {
 				console.log(item)
-				uni.showToast({
-					icon: "none",
-					title: item.label + "  " + item.value_list[0].value + "  " + item.value_list[0].unit + "  " +
-						item.value_list[1].value + "  " + item.value_list[1].unit + "  " + item.value_list[2]
-						.value +
-						"  " + item.value_list[2].unit
-				})
+				if(this.mine_code == 'renjiazhuang'){
+					uni.showToast({
+						icon: "none",
+						title: item.label + "  " + item.value_list[0].value + "  " + item.value_list[0].unit + "  " +
+							item.value_list[1].value + "  " + item.value_list[1].unit + "  " + item.value_list[2]
+							.value +
+							"  " + item.value_list[2].unit + "  " + item.value_list[3]
+							.value +
+							"  " + item.value_list[3].unit
+					})
+				}else{
+					uni.showToast({
+						icon: "none",
+						title: item.label + "  " + item.value_list[0].value + "  " + item.value_list[0].unit + "  " +
+							item.value_list[1].value + "  " + item.value_list[1].unit + "  " + item.value_list[2]
+							.value +
+							"  " + item.value_list[2].unit
+					})
+				}
 			}
 		}
 	}
@@ -259,7 +304,7 @@
 		background-repeat: no-repeat;
 
 		box-sizing: border-box;
-		padding: 40rpx;
+		padding: 40rpx 50rpx;
 
 		display: flex;
 		flex-wrap: wrap;
@@ -274,7 +319,7 @@
 			font-size: 28rpx;
 
 			.label {
-				width: 150rpx;
+				width: 200rpx;
 
 				text-overflow: ellipsis;
 				white-space: nowrap;

pages/production/unified_automation_system/compressed_air/compressed_air.vue

@@ -17,7 +17,7 @@
 				<view class="state">
 					<!-- 1-开 2-关 -->
 					<view class="value value_1" v-if="item.state == 1"></view>
-					<view class="value value_2" v-if="item.state == 2"></view>
+					<view class="value value_2" v-else></view>
 				</view>
 			</view>
 		</view>
@@ -29,7 +29,7 @@
 				<view class="box" v-if="item.state == 1">
 					<image src="./icon/compressed_air_run.gif" mode=""></image>
 				</view>
-				<view class="box" v-if="item.state == 2">
+				<view class="box" v-else>
 					<image src="./icon/close.png" mode=""></image>
 				</view>
 				<view class="name">{{item.name}}</view>
@@ -37,7 +37,7 @@
 					<view class="label">排污阀状态</view>
 					<!-- 1-开 2-关 -->
 					<view class="value value_1" v-if="item.drain_value_state == 1"></view>
-					<view class="value value_2" v-if="item.drain_value_state == 2"></view>
+					<view class="value value_2" v-else></view>
 				</view>
 				<!-- 运行参数 -->
 				<view class="parameter run_parameter">
@@ -57,7 +57,7 @@
 					</view>
 				</view>
 				<!-- 报警状态 -->
-				<view class="warn_state">
+				<view class="warn_state" v-if="item.warn_state">
 					<view class="title">
 						<view class="icon">
 							<image src="./icon/warn.png" mode=""></image>
@@ -69,7 +69,7 @@
 							<view class="label">{{item_2.label}}</view>
 							<!-- 1-开 2-关 -->
 							<view class="value value_1" v-if="item_2.state == 1"></view>
-							<view class="value value_2" v-if="item_2.state == 2"></view>
+							<view class="value value_2" v-else></view>
 						</view>
 					</view>
 				</view>

pages/production/unified_automation_system/drainage/drainage.vue

@@ -12,10 +12,10 @@
 		<!-- 水泵 -->
 		<view class="pump_list">
 			<view class="pump" v-for="(item,index) in data.water_pump" :key="index">
-				<view class="icon"v-if="item.state == 1">
+				<view class="icon" v-if="item.state == 1">
 					<image src="./icon/water_pump_kai.jpg" mode=""></image>
 				</view>
-				<view class="icon"v-if="item.state == 2">
+				<view class="icon" v-else>
 					<image src="./icon/water_pump.png" mode=""></image>
 				</view>
 				<view class="name">{{item.label}}</view>
@@ -23,7 +23,7 @@
 					<view class="label">状态</view>
 					<!-- 1-开 2-关 -->
 					<view class="value value_1" v-if="item.state == 1"></view>
-					<view class="value value_2" v-if="item.state == 2"></view>
+					<view class="value value_2" v-else></view>
 				</view>
 				<!-- 运行参数 -->
 				<view class="parameter run_parameter">

pages/production/unified_automation_system/hoist/hoist.vue

@@ -14,7 +14,7 @@
 					<view class="label">{{item.label}}</view>
 					<!-- 1-开 2-关 -->
 					<view class="value value_1" v-if="item.state == 1"></view>
-					<view class="value value_2" v-if="item.state == 2"></view>
+					<view class="value value_2" v-else></view>
 				</view>
 			</view>
 		</view>
@@ -25,7 +25,7 @@
 				<view class="box" v-if="item.state == 1">
 					<image src="./icon/hoist.jpg" mode=""></image>
 				</view>
-				<view class="box" v-if="item.state == 2">
+				<view class="box" v-else>
 					<image src="./icon/hoist.png" mode=""></image>
 				</view>
 				<view class="name">{{item.name}}</view>
@@ -59,7 +59,7 @@
 							<view class="label">{{item_2.label}}</view>
 							<!-- 1-开 2-关 -->
 							<view class="value value_1" v-if="item_2.state == 1"></view>
-							<view class="value value_2" v-if="item_2.state == 2"></view>
+							<view class="value value_2" v-else></view>
 						</view>
 					</view>
 				</view>
@@ -77,7 +77,7 @@
 							<view class="label">{{item_2.label}}</view>
 							<!-- 1-开 2-关 -->
 							<view class="value value_1" v-if="item_2.state == 1"></view>
-							<view class="value value_2" v-if="item_2.state == 2"></view>
+							<view class="value value_2" v-else></view>
 						</view>
 					</view>
 				</view>
@@ -95,7 +95,7 @@
 							<view class="label">{{item_2.label}}</view>
 							<!-- 1-开 2-关 -->
 							<view class="value value_1" v-if="item_2.state == 1"></view>
-							<view class="value value_2" v-if="item_2.state == 2"></view>
+							<view class="value value_2" v-else></view>
 						</view>
 					</view>
 				</view>
@@ -113,7 +113,7 @@
 							<view class="label">{{item_2.label}}</view>
 							<!-- 1-开 2-关 -->
 							<view class="value value_1" v-if="item_2.state == 1"></view>
-							<view class="value value_2" v-if="item_2.state == 2"></view>
+							<view class="value value_2" v-else></view>
 						</view>
 					</view>
 				</view>
@@ -131,7 +131,7 @@
 							<view class="label">{{item_2.label}}</view>
 							<!-- 1-开 2-关 -->
 							<view class="value value_1" v-if="item_2.state == 1"></view>
-							<view class="value value_2" v-if="item_2.state == 2"></view>
+							<view class="value value_2" v-else></view>
 						</view>
 					</view>
 				</view>
@@ -149,7 +149,7 @@
 							<view class="label">{{item_2.label}}</view>
 							<!-- 1-开 2-关 -->
 							<view class="value value_1" v-if="item_2.state == 1"></view>
-							<view class="value value_2" v-if="item_2.state == 2"></view>
+							<view class="value value_2" v-else></view>
 						</view>
 					</view>
 				</view>

pages/production/unified_automation_system/nitrogen_production_system/nitrogen_production_system.vue

@@ -149,6 +149,7 @@
 		overflow: hidden;
 
 		.tab {
+			margin-bottom: 30rpx;
 			margin-right: 60rpx;
 			float: left;
 			width: 160rpx;

pages/production/unified_automation_system/ventilation/ventilation.vue

@@ -193,7 +193,7 @@
 						justify-content: center;
 
 						.label {
-							width: 200rpx;
+							// width: 200rpx;
 							color: #4CB1FF;
 							font-size: 28rpx;
 						}

pages/production/video_monitor/video_monitor.vue

@@ -17,25 +17,25 @@
 			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,
-					data_module: "spjk"
-				}).then((res)=>{
-					if(res.data.content.status){
-						console.log("可查看")
-					}else{
-						uni.showToast({
-							icon:"none",
-							title:"没有查看权限！"
-						})
+			// get_product_data_query_power(){
+			// 	this.$p_api.product_data_query_power({
+			// 		staff_num: uni.getStorageSync('user').staff_num,
+			// 		data_module: "spjk"
+			// 	}).then((res)=>{
+			// 		if(res.data.content.status){
+			// 			console.log("可查看")
+			// 		}else{
+			// 			uni.showToast({
+			// 				icon:"none",
+			// 				title:"没有查看权限！"
+			// 			})
 						
-						setTimeout(()=>{
-							uni.navigateBack()
-						},1000)
-					}
-				})
-			},
+			// 			setTimeout(()=>{
+			// 				uni.navigateBack()
+			// 			},1000)
+			// 		}
+			// 	})
+			// },
 		}
 	}
 </script>

pages/production/water_affairs/water_affairs.vue

@@ -0,0 +1,164 @@
+<template>
+	<view>
+		<view class="tip">流量计名称</view>
+		
+		<view class="select_box" @click="select()">
+			<view class="title">{{title}}</view>
+			<view class="icon">
+				<uni-icons type="bottom" size="18" color="#fff"></uni-icons>
+			</view>
+		</view>
+		
+		<view class="content">
+			<view class="line">
+				<view class="label_box">
+					<view class="label">企业名称</view>
+					<view class="text">宁夏煤业有限责任公司任家庄煤矿</view>
+				</view>
+			</view>
+			<view class="line">
+				<view class="label_box">
+					<view class="label">流量计分类名称</view>
+					<view class="text">管段式</view>
+				</view>
+				<view class="label_box">
+					<view class="label">流量计编码</view>
+					<view class="text">1cad6c4f</view>
+				</view>
+			</view>
+			<view class="line">
+				<view class="label_box">
+					<view class="label">限时流量</view>
+					<view class="text">0</view>
+				</view>
+				<view class="label_box">
+					<view class="label">净累计量</view>
+					<view class="text">6711.41</view>
+				</view>
+			</view>
+			<view class="line">
+				<view class="label_box">
+					<view class="label">正累计量</view>
+					<view class="text">7097.43</view>
+				</view>
+				<view class="label_box">
+					<view class="label">负累计量</view>
+					<view class="text">385.96</view>
+				</view>
+			</view>
+			<view class="line">
+				<view class="label_box">
+					<view class="label">基站编码</view>
+					<view class="text">10.71.1.113</view>
+				</view>
+				<view class="label_box">
+					<view class="label">安装位置</view>
+					<view class="text">地面区域</view>
+				</view>
+			</view>
+			<view class="line">
+				<view class="label_box">
+					<view class="label">水资源用途</view>
+					<view class="text">生产用水</view>
+				</view>
+				<view class="label_box">
+					<view class="label">管道材质</view>
+					<view class="text">碳50</view>
+				</view>
+			</view>
+			<view class="line">
+				<view class="label_box">
+					<view class="label">管径</view>
+					<view class="text">DN50</view>
+				</view>
+				<view class="label_box">
+					<view class="label">流量计型号</view>
+					<view class="text">wet/311</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				title:"综采工作面（反渗透输出清水）",
+				itemList: ['井下涌水管道1#', '洗煤厂办公楼用水', '井下生产2#主管道'],
+			};
+		},
+		methods:{
+			select(){
+				uni.showActionSheet({
+					itemList: this.itemList,
+					success: (res) =>{
+						console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
+						this.title = this.itemList[res.tapIndex]
+					},
+					fail: function (res) {
+						console.log(res.errMsg);
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		background-color: #009fe8;
+		box-sizing: border-box;
+		padding: 25rpx;
+	}
+	.tip{
+		line-height: 90rpx;
+		font-size: 26rpx;
+		color: #fff;
+	}
+	.select_box{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		.title{
+			font-size: 36rpx;
+			color: #fff;
+			font-weight: 700;
+		}
+		.icon{
+			
+		}
+	}
+	
+	.content{
+		margin: 40rpx 0;
+		background-color: #fff;
+		border-radius: 10rpx;
+		.line{
+			box-sizing: border-box;
+			padding: 40rpx;
+			
+			border-bottom: 2rpx solid #DCDCDC;
+			
+			display: flex;
+			justify-content: space-between;
+			.label_box{
+				width: 300rpx;
+				.label{
+					font-size: 26rpx;
+					color: #999999;
+					margin-bottom: 20rpx;
+				}
+				.text{
+					font-size: 28rpx;
+					font-weight: 700;
+					
+					white-space: nowrap;
+				}
+			}
+		}
+		.line:last-child{
+			border-bottom: none;
+		}
+	}
+</style>

pages/production/zidonghua/data.json

@@ -0,0 +1,253 @@
+{
+	"data_tfgl": [{
+			"name": "枣泉煤矿",
+			"list": [{
+					"name": "东井通风",
+					"url": "http://webdevelop.nxjiewei.com/assets/html/zaoquan/djtf/#/"
+				},
+				{
+					"name": "西井通风",
+					"url": "http://webdevelop.nxjiewei.com/assets/html/zaoquan/xjtf/#/"
+				}
+			]
+		},
+		{
+			"name": "梅花井煤矿",
+			"list": [{
+					"name": "斜井通风",
+					"url": "http://webdevelop.nxjiewei.com/assets/html/meihuajing/xjtf/#/"
+				},
+				{
+					"name": "立井通风",
+					"url": "http://webdevelop.nxjiewei.com/assets/html/meihuajing/ljtf/#/"
+				}
+			]
+		},
+		{
+			"name": "清水营煤矿",
+			"list": [{
+				"name": "通风系统",
+				"url": "http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/ztfxt/ztfxt"
+			}]
+		},
+		{
+			"name": "金家渠煤矿",
+			"list": [{
+					"name": "中部主通风机监测系统",
+					"url": "../unified_automation_system/ventilation/ventilation?system_type=ventilation_zb&mine_code=jinjiaqu"
+				},
+				{
+					"name": "北部主通风机监测系统",
+					"url": "../unified_automation_system/ventilation/ventilation?system_type=ventilation_bb&mine_code=jinjiaqu"
+				}
+			]
+		},
+		{
+			"name": "石槽村煤矿",
+			"list": [{
+					"name": "1号回风斜井通风",
+					"url": "../unified_automation_system/ventilation/ventilation?system_type=fan_1&mine_code=shicaocun"
+				},
+				{
+					"name": "2号回风斜井通风",
+					"url": "../unified_automation_system/ventilation/ventilation?system_type=fan_2&mine_code=shicaocun"
+				}
+			]
+		}
+	],
+
+	"data_yfzd": [{
+			"name": "梅花井煤矿",
+			"list": [{
+					"name": "压风系统",
+					"url": "http://webdevelop.nxjiewei.com/assets/html/meihuajing/yf/#/"
+				},
+				{
+					"name": "制氮系统",
+					"url": "http://webdevelop.nxjiewei.com/assets/html/meihuajing/zd/#/"
+				}
+			]
+		},
+		{
+			"name": "金家渠煤矿",
+			"list": [{
+				"name": "空气压缩机集控系统",
+				"url": "../unified_automation_system/compressed_air/compressed_air?system_type=compressed_air&mine_code=jinjiaqu"
+			}]
+		},
+		{
+			"name": "石槽村煤矿",
+			"list": [{
+				"name": "空气压缩机集控系统",
+				"url": "../unified_automation_system/compressed_air/compressed_air?system_type=compressed_air&mine_code=shicaocun"
+			}, {
+				"name": "制氮系统",
+				"url": "../unified_automation_system/nitrogen_production_system/nitrogen_production_system?system_type=nitrogen&mine_code=shicaocun"
+			}]
+		}
+	],
+
+	"data_psxt": [{
+			"name": "枣泉煤矿",
+			"list": [{
+					"name": "720泵房",
+					"url": "http://webdevelop.nxjiewei.com/assets/html/zaoquan/720bf/#/"
+				},
+				{
+					"name": "880泵房",
+					"url": "http://webdevelop.nxjiewei.com/assets/html/zaoquan/880bf/#/"
+				},
+				{
+					"name": "929泵房",
+					"url": "http://webdevelop.nxjiewei.com/assets/html/zaoquan/929bf/#/"
+				},
+				{
+					"name": "950泵房",
+					"url": "http://webdevelop.nxjiewei.com/assets/html/zaoquan/950bf/#/"
+				},
+				{
+					"name": "980泵房",
+					"url": "http://webdevelop.nxjiewei.com/assets/html/zaoquan/980bf/#/"
+				}
+			]
+		},
+		{
+			"name": "梅花井煤矿",
+			"list": [{
+					"name": "850泵房",
+					"url": "http://webdevelop.nxjiewei.com/assets/html/meihuajing/850bf/#/"
+				},
+				{
+					"name": "697泵房",
+					"url": "http://webdevelop.nxjiewei.com/assets/html/meihuajing/697bf/#/"
+				}
+			]
+		},
+		{
+			"name": "清水营煤矿",
+			"list": [{
+					"name": "主排水泵房786",
+					"url": "http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/786bf/786bf"
+				},
+				{
+					"name": "主排水泵房11",
+					"url": "http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/11bf/11bf"
+				}
+			]
+		},
+		{
+			"name": "金家渠煤矿",
+			"list": [{
+					"name": "中央水泵排水系统",
+					"url": "../unified_automation_system/drainage/drainage?system_type=pump_zy&mine_code=jinjiaqu"
+				},
+				{
+					"name": "690水泵排水系统",
+					"url": "../unified_automation_system/drainage/drainage?system_type=pump_690&mine_code=jinjiaqu"
+				}
+			]
+		},
+		{
+			"name": "石槽村煤矿",
+			"list": [{
+					"name": "中央水泵排水系统",
+					"url": "../unified_automation_system/drainage/drainage?system_type=pump_1&mine_code=shicaocun"
+				},
+				{
+					"name": "715水泵排水系统",
+					"url": "../unified_automation_system/drainage/drainage?system_type=pump_2&mine_code=shicaocun"
+				},
+				{
+					"name": "630水泵排水系统",
+					"url": "../unified_automation_system/drainage/drainage?system_type=pump_3&mine_code=shicaocun"
+				}
+			]
+		}
+	],
+
+
+	"data_zys": [{
+			"name": "梅花井煤矿",
+			"list": [{
+				"name": "地面煤流",
+				"url": "http://webdevelop.nxjiewei.com/assets/html/meihuajing/dmml/#/"
+			}]
+		},
+		{
+			"name": "金家渠煤矿",
+			"list": [{
+					"name": "胶带运输机系统",
+					"url": "../unified_automation_system/belt_conveyor/belt_conveyor?system_type=belt_13&mine_code=jinjiaqu"
+				},
+				{
+					"name": "主斜井胶带运输机系统",
+					"url": "../unified_automation_system/belt_conveyor/belt_conveyor?system_type=belt_2&mine_code=jinjiaqu"
+				}
+			]
+		},
+		{
+			"name": "石槽村煤矿",
+			"list": [{
+				"name": "22采区皮带",
+				"url": "../unified_automation_system/belt_conveyor/belt_conveyor?system_type=belt_1&mine_code=shicaocun"
+			}, {
+				"name": "西翼巷皮带",
+				"url": "../unified_automation_system/belt_conveyor/belt_conveyor?system_type=belt_2&mine_code=shicaocun"
+			}, {
+				"name": "集中巷皮带",
+				"url": "../unified_automation_system/belt_conveyor/belt_conveyor?system_type=belt_3&mine_code=shicaocun"
+			}]
+		}
+	],
+
+
+	"data_xdt": [{
+		"name": "梅花井煤矿",
+		"list": [{
+			"name": "巷道图",
+			"url": "http://webdevelop.nxjiewei.com/assets/html/meihuajing/zongtu/#/"
+		}]
+	}],
+
+	"data_kyjc": [{
+		"name": "金家渠煤矿",
+		"list": [{
+			"name": "矿压监测",
+			"url": "../jinjiaqu/kuang_ya_jian_ce/kuang_ya_jian_ce"
+		}]
+	}],
+
+	"data_tsj": [{
+		"name": "金家渠煤矿",
+		"list": [{
+				"name": "中部副立井提升机系统",
+				"url": "../unified_automation_system/hoist/hoist?system_type=hoist&mine_code=jinjiaqu"
+			},
+			{
+				"name": "北部副立井提升机系统",
+				"url": "../unified_automation_system/north_hoist/north_hoist?system_type=hoist_2&mine_code=jinjiaqu"
+			},
+			{
+				"name": "13采区提升机监测系统",
+				"url": "../unified_automation_system/hoist_13/hoist_13?system_type=hoist_1&mine_code=jinjiaqu"
+			}
+		]
+	}],
+
+	"data_jkrc": [{
+		"name": "金家渠煤矿",
+		"list": [{
+			"name": "13采区架空人车系统",
+			"url": "../unified_automation_system/man_car/man_car?system_type=mancar&mine_code=jinjiaqu"
+		}]
+	}],
+
+	"data_glyq": [{
+		"name": "金家渠煤矿",
+		"list": [{
+			"name": "锅炉烟气系统",
+			"url": "../unified_automation_system/boiler_room/boiler_room?system_type=boiler&mine_code=jinjiaqu"
+		}]
+	}]
+
+}

pages/production/zidonghua/zidonghua.vue

@@ -300,6 +300,8 @@
 </template>
 
 <script>
+	import data from "./data.json"
+	
 	export default {
 		data() {
 			return {
@@ -336,7 +338,15 @@
 						name: "清水营煤矿",
 						list: [{
 							name: "通风系统",
-							url: "http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/ztfxt/ztfxt"
+							// url: "http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/ztfxt/ztfxt"
+							url:"../unified_automation_system/ventilation/ventilation?system_type=fan_1&mine_code=qingshuiying"
+						}]
+					},
+					{
+						name: "任家庄煤矿",
+						list: [{
+							name: "通风系统",
+							url:"../unified_automation_system/ventilation/ventilation?system_type=fan_1&mine_code=renjiazhuang"
 						}]
 					},
 					{
@@ -393,6 +403,26 @@
 							name: "制氮系统",
 							url: "../unified_automation_system/nitrogen_production_system/nitrogen_production_system?system_type=nitrogen&mine_code=shicaocun"
 						}]
+					},
+					{
+						name: "清水营煤矿",
+						list: [{
+								name: "压风系统",
+								url: "../unified_automation_system/compressed_air/compressed_air?system_type=compressed_air&mine_code=qingshuiying"
+							},
+							{
+								name: "制氮系统",
+								url: "../unified_automation_system/nitrogen_production_system/nitrogen_production_system?system_type=nitrogen&mine_code=qingshuiying"
+							}
+						]
+					},
+					{
+						name: "任家庄煤矿",
+						list: [{
+								name: "压风系统",
+								url: "../unified_automation_system/compressed_air/compressed_air?system_type=compressed_air&mine_code=renjiazhuang"
+							}
+						]
 					}
 				],
 				// 排水系统
@@ -436,7 +466,7 @@
 						name: "清水营煤矿",
 						list: [{
 								name: "主排水泵房786",
-								url: "http://webdevelop.nxjiewei.com/assets/html/qingshuiying/zidonghua_app/#/pages/index/786bf/786bf"
+								url: "../unified_automation_system/drainage/drainage?system_type=pump_1&mine_code=qingshuiying"
 							},
 							{
 								name: "主排水泵房11",
@@ -505,6 +535,20 @@
 							name: "集中巷皮带",
 							url: "../unified_automation_system/belt_conveyor/belt_conveyor?system_type=belt_3&mine_code=shicaocun"
 						}]
+					},
+					{
+						name: "清水营煤矿",
+						list: [{
+							name: "主运输1号皮带",
+							url: "../unified_automation_system/belt_conveyor/belt_conveyor?system_type=belt_1&mine_code=qingshuiying"
+						}]
+					},
+					{
+						name: "任家庄煤矿",
+						list: [{
+							name: "主井皮带",
+							url: "../unified_automation_system/belt_conveyor/belt_conveyor?system_type=belt_1&mine_code=renjiazhuang"
+						}]
 					}
 				],
 
@@ -566,6 +610,7 @@
 			}
 		},
 		onLoad(option) {
+			console.log(data)
 			this.zdhxt = option.zdhxt
 
 			if (this.zdhxt == 'tfgl') {

pages/tabbar/index/data.json

@@ -1,130 +0,0 @@
-{
-	"build": [{
-		"icon": "",
-		"name": "思想建设",
-		"url": ""
-	}, {
-		"icon": "",
-		"name": "责任建设",
-		"url": ""
-	}, {
-		"icon": "",
-		"name": "制度建设",
-		"url": ""
-	}, {
-		"icon": "",
-		"name": "双控建设",
-		"url": ""
-	}, {
-		"icon": "",
-		"name": "智能建设",
-		"url": ""
-	}, {
-		"icon": "",
-		"name": "素能建设",
-		"url": ""
-	}, {
-		"icon": "",
-		"name": "人文建设",
-		"url": ""
-	}],
-	"common": [{
-			"title": "实操应用",
-			"list": [{
-				"icon": "",
-				"name": "标准化考核",
-				"url": ""
-			}, {
-				"icon": "",
-				"name": "风险管控",
-				"url": ""
-			}, {
-				"icon": "",
-				"name": "隐患录入",
-				"url": ""
-			}, {
-				"icon": "",
-				"name": "实时预警",
-				"url": ""
-			}, {
-				"icon": "",
-				"name": "矿长记分",
-				"url": ""
-			}, {
-				"icon": "",
-				"name": "员工安全记分",
-				"url": ""
-			}, {
-				"icon": "",
-				"name": "票证管理",
-				"url": ""
-			}]
-		},
-		{
-			"title": "数据平台",
-			"list": [{
-				"icon": "",
-				"name": "标准化考核",
-				"url": ""
-			}, {
-				"icon": "",
-				"name": "风险管控",
-				"url": ""
-			}, {
-				"icon": "",
-				"name": "隐患录入",
-				"url": ""
-			}, {
-				"icon": "",
-				"name": "实时预警",
-				"url": ""
-			}, {
-				"icon": "",
-				"name": "矿长记分",
-				"url": ""
-			}, {
-				"icon": "",
-				"name": "员工安全记分",
-				"url": ""
-			}, {
-				"icon": "",
-				"name": "票证管理",
-				"url": ""
-			}]
-		},
-		{
-			"title": "学习资料",
-			"list": [{
-				"icon": "",
-				"name": "标准化考核",
-				"url": ""
-			}, {
-				"icon": "",
-				"name": "风险管控",
-				"url": ""
-			}, {
-				"icon": "",
-				"name": "隐患录入",
-				"url": ""
-			}, {
-				"icon": "",
-				"name": "实时预警",
-				"url": ""
-			}, {
-				"icon": "",
-				"name": "矿长记分",
-				"url": ""
-			}, {
-				"icon": "",
-				"name": "员工安全记分",
-				"url": ""
-			}, {
-				"icon": "",
-				"name": "票证管理",
-				"url": ""
-			}]
-		}
-	]
-
-
-}

pages/tabbar/index/index - 泛微.vue

@@ -1,19 +0,0 @@
-<template>
-	<view>
-		<web-view src=""></web-view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	
-</style>

pages/tabbar/index/index-安全管理体系第一版.vue

@@ -1,671 +0,0 @@
-<template>
-	<view>
-		<!-- 首页风格切换-1-切换风格 -->
-		<view class="top_bg_color">
-			<!-- 背景虚化轮播图 -->
-			<!-- <view class="bg_img" :style="{backgroundImage:'url('+top_bg_color_img+')'}"></view> -->
-			<!-- 固定安全色 -->
-			<view class="bg_img" :style="{backgroundColor:top_bg_color}"></view>
-
-			<t-i-navbar :mine_code="mine_code" :navbar_bg_color="navbar_bg_color"></t-i-navbar>
-			<t-i-notice :text="text"></t-i-notice>
-			<t-i-banner :banner="banners" :mine_code="mine_code" @change_top_bg_color_img="change_top_bg_color_img">
-			</t-i-banner>
-		</view>
-		
-		<view v-for="(item,index) in common" :key="index">
-			<view class="fixed_system" v-if="item.type_name == '七大板块' && item.index == index">
-				<view class="line">
-					<view class="item" v-for="(item_2,index_2) in item.data" :key="index_2" v-if="index_2 < 3" @click="go_page(item_2)">
-						<view class="icon">
-							<image :src="item_2.thumb" mode=""></image>
-						</view>
-						<view class="text">{{item_2.title}}</view>
-					</view>
-				</view>
-				<view class="line">
-					<view class="item" v-for="(item_2,index_2) in item.data" :key="index_2" v-if="index_2 > 2" @click="go_page(item_2)">
-						<view class="icon">
-							<image :src="item_2.thumb" mode=""></image>
-						</view>
-						<view class="text">{{item_2.title}}</view>
-					</view>
-				</view>
-			</view>
-			
-			<view class="todo" v-if="item.type_name == '待办事项' && item.index == index">
-				<view class="left">
-					<view class="title">
-						<view class="icon"></view>
-						<view class="text">待办事项</view>
-					</view>
-				</view>
-				<view class="right">
-					<view class="tip">您有 <text style="color: #FF0000;">0</text> 项待办</view>
-					<view class="detail">
-						详情 <uni-icons type="right" size="12" color="#B5B5B5"></uni-icons>
-					</view>
-				</view>
-			</view>
-			
-			<view class="nav" v-if="item.type_name == '实操应用' && item.index == index">
-				<view class="section" v-for="(item_2,index_2) in item.data" :key="index_2">
-					<view class="title">
-						<view class="icon"></view>
-						<view class="text">{{item_2.title}}</view>
-					</view>
-					<view class="list">
-						<view class="item" v-for="(item_3,index_3) in item_2.children" :key="index_3" @click="go_page(item_3)">
-							<view class="icon">
-								<image :src="item_3.thumb" mode=""></image>
-							</view>
-							<view class="text">{{item_3.title}}</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		
-			<view class="nav" v-if="item.type_name == '数据平台' && item.index == index">
-				<view class="section" v-for="(item_2,index_2) in item.data" :key="index_2">
-					<view class="title">
-						<view class="icon"></view>
-						<view class="text">{{item_2.title}}</view>
-					</view>
-					<view class="list">
-						<view class="item" v-for="(item_3,index_3) in item_2.children" :key="index_3" @click="go_page(item_3)">
-							<view class="icon">
-								<image :src="item_3.thumb" mode=""></image>
-							</view>
-							<view class="text">{{item_3.title}}</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		
-			<view class="nav" v-if="item.type_name == '学习资料' && item.index == index">
-				<view class="section" v-for="(item_2,index_2) in item.data" :key="index_2">
-					<view class="title">
-						<view class="icon"></view>
-						<view class="text">{{item_2.title}}</view>
-					</view>
-					<view class="list">
-						<view class="item" v-for="(item_3,index_3) in item_2.children" :key="index_3" @click="go_page(item_3)">
-							<view class="icon">
-								<image :src="item_3.thumb" mode=""></image>
-							</view>
-							<view class="text">{{item_3.title}}</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			
-			<view class="news" v-if="item.type_name == '动态信息' && item.index == index">
-				<view class="title_box">
-					<view class="left">
-						<view class="title">
-							<view class="icon"></view>
-							<view class="text">动态信息</view>
-						</view>
-					</view>
-					<view class="right" @click="go_more()">
-						<view class="detail">
-							查看全部 <uni-icons type="right" size="12" color="#B5B5B5"></uni-icons>
-						</view>
-					</view>
-				</view>
-				<view class="list">
-					<view class="item" v-for="(item,index) in newsList" :key="index" @click="go_detail(item.id)">
-						<view class="icon"></view>
-						<view class="inner">
-							<view class="new_title">{{item.title}}</view>
-							<view class="tip">
-								<view class="time">{{item.created_at}}</view>
-								<view class="detail">
-									详情<image src="./icon/new_detail.png" mode=""></image>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		
-
-	
-	</view>
-</template>
-
-<script>
-	import {
-		set_base_url
-	} from '@/common/set_base_url.js'
-	import {
-		goToLink
-	} from '@/common/common.js'
-	// 版本控制
-	import upApp from "@/uni_modules/uni-upgrade-center-app/utils/check-update"
-
-	export default {
-		data() {
-			return {
-				// 根_mine_code
-				app_mine_code: "",
-				// 当前煤矿编码
-				mine_code: "",
-				// 首页接口的基础请求路径  默认为当前矿编码的基础路径
-				base_url: " ",
-
-				// 轮播图
-				banners: [],
-				// 新闻列表
-				newsList: "",
-				// 值班公告
-				text: "",
-				
-				// 背景虚化图片
-				top_bg_color_img: "",
-				// 背景安全色
-				top_bg_color: "#7372c2",
-				top_bg_color_list: ['#d62b2b', '#00a2e8', '#b08654',"#7372c2"],
-				
-				// 标题栏背景色
-				navbar_bg_color: "",
-
-				common:[]
-			}
-		},
-		onPullDownRefresh() {
-			uni.reLaunch({
-				url: "./index"
-			})
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		onLoad() {
-			// 初始化当前煤矿编码
-			this.mine_code = uni.getStorageSync('mine_code')
-			// 根据矿编码切换首页接口不同的请求基础路径
-			this.base_url = set_base_url(this.mine_code)
-			
-			// #ifdef H5
-			if (this.mine_code == 'ningmeijituan') {
-				if (window.location.href.indexOf('token') != -1) {
-					this.$api.oauth_getNoPasswordToken({
-						token: window.location.href.split('token=')[1].split('&')[0],
-						caller: window.location.href.split('token=')[1].split('&')[1].split('=')[1]
-					}).then((res) => {
-
-						uni.setStorageSync('Authorization', res.data.data.accessToken)
-						uni.setStorageSync('token_type', res.data.data.token_type)
-						// 存储用户基本信息
-						uni.setStorageSync('user', res.data.data.user);
-						uni.setStorageSync('people_code', res.data.data.user.people_code);
-						// 存储电话号码
-						uni.setStorageSync('mobile', res.data.data.user.mobile);
-					})
-				}else{
-					this.check_token()
-				}
-			}else{
-				this.check_token()
-			}
-			// #endif
-
-			// 检查更新
-			upApp()
-			
-			// #ifdef APP-PLUS
-			this.check_token()
-			// #endif
-
-
-			// 获取轮播图
-			this.get_banner()
-			// 获取首页新闻列表
-			this.getNews()
-			// 值班公告
-			this.get_notice()
-			
-			this.get_home_aqyk_newLinks()
-		},
-		onPageScroll: function(e) {
-			if (e.scrollTop > 300) {
-				this.navbar_bg_color = "#009fe8"
-			} else {
-				this.navbar_bg_color = ""
-			}
-		},
-		methods: {
-			// 单点登录及token过期验证
-			check_token() {
-				// token过期验证
-				this.$api.worksheet_classify_list({
-
-				}).then((res) => {
-					// console.log(res)
-					if (res.data.code == 401) {
-						uni.showToast({
-							icon: "none",
-							title: "登录失效、请重新登录"
-						})
-
-						uni.clearStorageSync('Authorization');
-
-						setTimeout(function() {
-							uni.redirectTo({
-								url: "../../my/login/login"
-							})
-						}, 1500)
-					} else {
-						// console.log(res)
-					}
-				})
-			},
-			
-			get_home_aqyk_newLinks() {
-				this.$api.home_aqyk_newLinks({
-			
-				}).then((res) => {
-					// console.log(res.data)
-					
-					let data = res.data
-						data.forEach((item,index)=>{
-							item['index'] = index
-						})
-						
-						// console.log(data)
-					
-					this.common = data
-				})
-			},
-
-			// 获取轮播图
-			get_banner() {
-				uni.request({
-					url: this.base_url + "/scrollImg/list",
-					method: "GET",
-					header:{
-						'accesskey': "b364b449a18af327867f7edc3431b541"
-					},
-					success: (res) => {
-						// console.log(res.data.data.data)
-						this.banners = res.data.data.data
-						this.top_bg_color_img = this.banners[0].imgURL
-					}
-				})
-			},
-			// 请求新闻动态
-			getNews() {
-				uni.request({
-					url: this.base_url + "/article/list",
-					method: "GET",
-					header:{
-						'accesskey': "b364b449a18af327867f7edc3431b541"
-					},
-					data: {
-						pageSize: 4
-					},
-					success: (res) => {
-						this.newsList = res.data.data.data
-					}
-				})
-			},
-			// 值班公告
-			get_notice() {
-				uni.request({
-					url: this.base_url + "/notice/list",
-					method: "GET",
-					header:{
-						'accesskey': "b364b449a18af327867f7edc3431b541"
-					},
-					success: (res) => {
-						if (!res.data.data.content) {
-							this.text = res.data.data.message
-						} else {
-							this.text = res.data.data.content.replace(/<br /g, " ").replace(/>/g, " ").replace(
-								/\//g, " ")
-						}
-					}
-				})
-			},
-
-			// 切换背景图片
-			change_top_bg_color_img(index) {
-				if (index > 3) {
-					index = parseInt(4 * Math.random())
-				}
-
-				this.top_bg_color = this.top_bg_color_list[index]
-			},
-		
-			go_page(item){
-				if(item.link == null){
-					uni.showToast({
-						icon:"none",
-						title:"暂未开通"
-					})
-					return
-				}
-				
-				goToLink(item, this.mine_code)
-				
-			},
-			// 打开详情页
-			go_detail(id) {
-				uni.navigateTo({
-					url: "../../index/news/news?id=" + id + "&mine_code=ningmeijituan"
-				})
-			},
-			// 打开列表
-			go_more() {
-				uni.navigateTo({
-					url: "../../index/news/news_list/news_list?mine_code=ningmeijituan"
-				})
-			}
-		}
-
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #FFFFFF;
-	}
-
-	.top_bg_color {
-		position: relative;
-
-		width: 750rpx;
-		overflow: hidden;
-
-		.bg_img {
-			width: 750rpx;
-			height: 440rpx;
-
-			position: absolute;
-			top: 0;
-			left: 0;
-			z-index: 0;
-			background-position: center;
-			background-size: 100% 100%;
-			filter: blur(50px);
-			transform: scale(2);
-			opacity: 0.9;
-		}
-	}
-
-	.fixed_system {
-		box-sizing: border-box;
-		padding: 25rpx 0;
-		
-		width: 750rpx;
-		height: 436rpx;
-		background-image: url(./icon/section.png);
-		background-size: 100% 100%;
-		background-repeat: no-repeat;
-		
-		.line {
-			box-sizing: border-box;
-			padding: 25rpx;
-		
-			display: flex;
-			justify-content: center;
-		
-			.item {
-				margin-right: 54rpx;
-		
-				.icon {
-					image {
-						width: 109rpx;
-						height: 109rpx;
-						display: block;
-					}
-				}
-		
-				.text {
-					font-size: 28rpx;
-					color: #171717;
-				}
-			}
-		}
-		
-		.line:first-child {
-			.item:nth-child(3) {
-				margin-right: 0;
-			}
-		}
-		
-		.line:last-child {
-			.item:nth-child(4) {
-				margin-right: 0;
-			}
-		}
-	}
-		
-	.todo {
-		box-sizing: border-box;
-		padding: 25rpx;
-		
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		
-		.left {
-			.title {
-				display: flex;
-				align-items: center;
-		
-				.icon {
-					width: 9rpx;
-					height: 34rpx;
-					background-color: #04A0E8;
-					border-radius: 5rpx;
-				}
-		
-				.text {
-					margin-left: 10rpx;
-					color: #6A6A6A;
-					font-size: 33rpx;
-					font-weight: 700;
-				}
-			}
-		}
-		
-		.right {
-			display: flex;
-			align-items: baseline;
-		
-			.tip {
-				font-size: 25rpx;
-				color: #6A6A6A;
-			}
-		
-			.detail {
-				margin-left: 24rpx;
-				font-size: 25rpx;
-				color: #B5B5B5;
-			}
-		}
-	}
-		
-	.nav {
-		background-color: #F7F9F7;
-		width: 750rpx;
-		
-		padding: 10rpx 0;
-		.section {
-			background-color: #FFFFFF;
-			box-sizing: border-box;
-			padding: 25rpx;
-		
-			.title {
-				padding: 20rpx 0;
-				display: flex;
-				align-items: center;
-		
-				.icon {
-					width: 9rpx;
-					height: 34rpx;
-					background-color: #04A0E8;
-					border-radius: 5rpx;
-				}
-		
-				.text {
-					margin-left: 10rpx;
-					color: #6A6A6A;
-					font-size: 33rpx;
-					font-weight: 700;
-				}
-			}
-		
-			.list {
-				width: 700rpx;
-				overflow: hidden;
-		
-				.item {
-					margin-top: 20rpx;
-					float: left;
-					margin-right: 20rpx;
-		
-					width: 120rpx;
-					text-align: center;
-		
-					.icon {
-						image {
-							width: 73rpx;
-							height: 73rpx;
-						}
-					}
-		
-					.text {
-						color: #171717;
-						font-size: 26rpx;
-		
-						white-space: nowrap;
-						overflow: hidden;
-						text-overflow: ellipsis;
-					}
-				}
-		
-				.item:nth-child(5n) {
-					margin-right: 0;
-				}
-			}
-		}
-	}
-		
-	.news {
-		background-color: #F7F9F7;
-		padding-top: 20rpx;
-		
-		.title_box {
-			background-color: #FFFFFF;
-			box-sizing: border-box;
-			padding: 25rpx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-		
-			.left {
-				.title {
-					display: flex;
-					align-items: center;
-		
-					.icon {
-						width: 9rpx;
-						height: 34rpx;
-						background-color: #04A0E8;
-						border-radius: 5rpx;
-					}
-		
-					.text {
-						margin-left: 10rpx;
-						color: #6A6A6A;
-						font-size: 33rpx;
-						font-weight: 700;
-					}
-				}
-			}
-		
-			.right {
-				display: flex;
-				align-items: baseline;
-		
-				.tip {
-					font-size: 25rpx;
-					color: #6A6A6A;
-				}
-		
-				.detail {
-					margin-left: 24rpx;
-					font-size: 25rpx;
-					color: #B5B5B5;
-				}
-			}
-		}
-		
-		.list {
-			box-sizing: border-box;
-			padding: 25rpx;
-			background-color: #FFFFFF;
-		
-			.item {
-				margin-bottom: 20rpx;
-				display: flex;
-				justify-content: space-between;
-		
-				border-bottom: 1rpx solid #F5F6F7;
-		
-				.icon {
-					position: relative;
-					top: 16rpx;
-		
-					width: 8rpx;
-					height: 8rpx;
-					background: #999999;
-					border-radius: 50%;
-				}
-		
-				.inner {
-					width: 680rpx;
-		
-					.new_title {
-						color: #171717;
-						font-size: 29rpx;
-						line-height: 44rpx;
-					}
-		
-					.tip {
-						margin: 20rpx 0;
-						display: flex;
-						justify-content: space-between;
-		
-						.time {
-							font-size: 26rpx;
-							color: #999999;
-						}
-		
-						.detail {
-							color: #FD6B5C;
-							font-size: 23rpx;
-		
-							image {
-								margin-left: 8rpx;
-								width: 19rpx;
-								height: 16rpx;
-							}
-						}
-					}
-				}
-			}
-		
-			.item:last-child {
-				border: none;
-			}
-		}
-	}
-	
-	
-	
-</style>

pages/tabbar/production/production.vue

@@ -29,6 +29,15 @@
 		<view v-if="mine_code == 'jinfeng' || mine_code == 'jinfeng_neiwang'">
 			<t-p-jinfeng></t-p-jinfeng>
 		</view>
+		
+		<!-- 灵新 -->
+		<view v-if="mine_code == 'lingxin'">
+			<t-p-lingxin></t-p-lingxin>
+		</view>
+		<!-- 任家庄 -->
+		<view v-if="mine_code == 'renjiazhuang'">
+			<t-p-renjiazhuang></t-p-renjiazhuang>
+		</view>
 	</view>
 </template>
 

uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js

@@ -101,6 +101,10 @@ const cfu = {
 		"column_bfb": function(item, category, index, opts) {
 			return item.name + ':' + item.data + '%'
 		},
+		
+		"personnel_statistics_ren": function(item, category, index, opts) {
+			return item.name + ':' + item.data + '人'
+		},
 	},
 	//这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在opts参数，会将demotype与opts中option合并后渲染图表。
 	"demotype": {