枣泉：1.0.3

App.vue

@@ -29,6 +29,7 @@
 
 	page {
 		font-family: $tdw-base-font;
+		
 	}
 
 	.status_bar {

common/production-http/production-api.js

@@ -330,6 +330,7 @@ export const jt_safety_alarm_list = (data) => {
 	})
 }
 
+// 枣泉
 // 矿井水
 export const automate_mine_water_get_list = (data) => {
 	return http.request({
@@ -338,3 +339,27 @@ export const automate_mine_water_get_list = (data) => {
 		data,
 	})
 }
+
+
+// 信息中心 生产统计
+// 当日集团产量
+export const coalmine_output = (data) => {
+	return http.request({
+		url: '/coalmine/output',
+		data,
+	})
+}
+// 各矿产量
+export const coalmine_ratio = (data) => {
+	return http.request({
+		url: '/coalmine/ratio',
+		data,
+	})
+}
+// 周产量趋势
+export const coalmine_trend = (data) => {
+	return http.request({
+		url: '/coalmine/trend',
+		data,
+	})
+}

common/vmeitime-http/api.js

@@ -414,4 +414,21 @@ export const user_getUinfo = (data) => {
         url: '/user/getUinfo',
         data,
     })
-}	
+}	
+
+// 下井记录 重名人员列表
+export const user_getPersonnelListByName = (data) => {
+    return http.request({
+		method:'POST',
+        url: '/user/getPersonnelListByName',
+        data,
+    })
+}
+// 绑定人名和下井信息
+export const user_updateUserMessage = (data) => {
+    return http.request({
+		method:'POST',
+        url: '/user/updateUserMessage',
+        data,
+    })
+}

components/e-browse/e-browse - 副本.vue

@@ -0,0 +1,88 @@
+<template>
+	<view class="browse">
+		<view class="title">浏览记录</view>
+		<view class="list">
+			<view class="item" v-for="(item,index) in browse" :key="index">
+				<view class="img">
+					<view v-if="item.img == '' || item.img == 'none'">
+						<image :src="item.img" mode=""></image>
+					</view>
+					<view v-else>
+						<view class="img_tip" :style="{backgroundColor:bgColor[index]}">
+							{{item.name.split('').pop()}}
+						</view>
+					</view>
+				</view>
+				<view class="name">{{item.name}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:[
+			"browse",
+			"bgColor"
+		],
+		
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.browse{
+		margin-top: 20px;
+		margin-bottom: 40px;
+		.title {
+			line-height: 30px;
+			border-left: 4px solid #009FE8;
+			border-radius: 4px;
+			padding-left: 10px;
+			margin-bottom: 10px;
+		}
+		.list{
+			overflow: hidden;
+			.item{
+				float: left;
+				width: 140rpx;
+				text-align: center;
+				margin-bottom: 10px;
+				.img{
+					margin: 0 auto;
+					margin-bottom: 5px;
+					width: 120rpx;
+					height: 120rpx;
+					border-radius: 50%;
+					overflow: hidden;
+					
+					image{
+						width: 120rpx;
+						height: 120rpx;
+					}
+					
+					.img_tip{
+						width: 120rpx;
+						height: 120rpx;
+						// background-color: skyblue;
+						
+						text-align: center;
+						line-height: 120rpx;
+						color: #FFFFFF;
+					}
+				}
+				.name{
+					width: 140rpx;
+					
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+				}
+			}
+		}
+	}
+</style>

components/e-browse/e-browse.vue

@@ -1,19 +1,25 @@
 <template>
 	<view class="browse">
-		<view class="title">浏览记录</view>
-		<view class="list">
-			<view class="item" v-for="(item,index) in browse" :key="index">
-				<view class="img">
-					<view v-if="item.img == '' || item.img == 'none'">
-						<image :src="item.img" mode=""></image>
-					</view>
-					<view v-else>
-						<view class="img_tip" :style="{backgroundColor:bgColor[index]}">
-							{{item.name.split('').pop()}}
-						</view>
-					</view>
+		<view class="left">
+			<view class="icon">
+				<uni-icons type="staff" size="32" color="#009FE8"></uni-icons>
+			</view>
+			<view class="text">浏览记录</view>
+		</view>
+		<view class="right" @click="go_browse()">
+			<view class="list" v-for="(item,index) in browse" :key="index">
+				<view class="item" v-if="item.img">
+					<image :src="item.img" mode=""></image>
+				</view>
+				<view v-if="!item.img" class="item" :style="{backgroundColor:bgColor[index]}">
+					{{item.name.split('').pop()}}
 				</view>
-				<view class="name">{{item.name}}</view>
+			</view>
+			<view class="text">
+				更多记录
+			</view>
+			<view class="icon">
+				<uni-icons type="arrowright" size="22"></uni-icons>
 			</view>
 		</view>
 	</view>
@@ -21,67 +27,76 @@
 
 <script>
 	export default {
-		props:[
+		props: [
 			"browse",
-			"bgColor"
+			"bgColor",
+			"mine_code",
+			"pageId"
 		],
-		
+
 		data() {
 			return {
-				
+
 			};
+		},
+		methods: {
+			go_browse() {
+				uni.navigateTo({
+					url: "../../index/record/record-browse/record-browse?mine_code=" + this.mine_code + "&pageId=" +
+						this.pageId
+				})
+			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	.browse{
-		margin-top: 20px;
-		margin-bottom: 40px;
-		.title {
-			line-height: 30px;
-			border-left: 4px solid #009FE8;
-			border-radius: 4px;
-			padding-left: 10px;
-			margin-bottom: 10px;
+	.browse {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		height: 110rpx;
+		font-size: 32rpx;
+
+		.left {
+			height: 110rpx;
+
+			display: flex;
+			align-items: center;
+
+			.icon {
+				margin-right: 10rpx;
+			}
 		}
-		.list{
-			overflow: hidden;
-			.item{
-				float: left;
-				width: 140rpx;
-				text-align: center;
-				margin-bottom: 10px;
-				.img{
-					margin: 0 auto;
-					margin-bottom: 5px;
-					width: 120rpx;
-					height: 120rpx;
+
+		.right {
+			height: 110rpx;
+
+			display: flex;
+			align-items: center;
+
+			.list {
+				display: flex;
+
+				.item {
+					width: 70rpx;
+					height: 70rpx;
 					border-radius: 50%;
 					overflow: hidden;
-					
-					image{
-						width: 120rpx;
-						height: 120rpx;
-					}
-					
-					.img_tip{
-						width: 120rpx;
-						height: 120rpx;
-						// background-color: skyblue;
-						
-						text-align: center;
-						line-height: 120rpx;
-						color: #FFFFFF;
+
+					text-align: center;
+					line-height: 70rpx;
+					font-size: 28rpx;
+					color: #fff;
+
+					margin-right: 10rpx;
+
+					image {
+						width: 30rpx;
+						height: 30rpx;
 					}
 				}
-				.name{
-					width: 140rpx;
-					
-					white-space: nowrap;
-					overflow: hidden;
-					text-overflow: ellipsis;
-				}
 			}
 		}
 	}

components/n-safety-monitoring-tab/n-safety-monitoring-tab.vue

@@ -25,7 +25,7 @@
 							<view class="item" v-for="(item,index) in list" :key="index">
 								<view class="item_title">
 									<view class="item_icon">
-										
+
 										<image v-if="item.typeCode == '0001'" src="./icon/wasi.png" mode=""></image>
 										<image v-if="item.typeCode == '0004'" src="./icon/Co1.png" mode=""></image>
 										<image v-if="item.typeCode == '1010'" src="./icon/feng.png" mode=""></image>
@@ -34,7 +34,8 @@
 								</view>
 								<view class="item_content">
 									<view class="item_content_list">
-										<view class="content_item" v-for="(item_2,index_2) in item.normalCount" :key="index_2">
+										<view class="content_item" v-for="(item_2,index_2) in item.normalCount"
+											:key="index_2">
 											<view class="name">{{item_2.name}}</view>
 											<view class="num">{{item_2.count}}个</view>
 										</view>
@@ -57,48 +58,48 @@
 				// 标签栏目 煤矿名称列表
 				tabs: [],
 				// 煤矿编码数组
-				tabs_mine_code:[],
+				tabs_mine_code: [],
 				// 当前煤矿编码
-				mine_code_index:"",
-				
+				mine_code_index: "",
+
 				// 模拟量
-				simulation:0,
+				simulation: 0,
 				// 开关量
-				sluice:0,
+				sluice: 0,
 				// 列表项
-				list:[]
+				list: []
 			};
 		},
 		mounted() {
 			// 获取煤矿列表
 			this.get_tabs()
-			
+
 		},
-		methods:{
+		methods: {
 			tabClick(index) {
 				this.defaultIndex = index
 				// console.log(this.tabs_mine_code[index])
-				
+
 				// 切换当前煤矿编码
 				this.mine_code_index = this.tabs_mine_code[index]
 				// 切换后编码的煤矿详情数据查询
 				this.get_jt_safety_info_part()
-				
+
 				// 将切换后的编码发送给页面
-				this.$emit("code",this.mine_code_index)
+				this.$emit("code", this.mine_code_index)
 			},
 			// 获取煤矿列表
-			get_tabs(){
+			get_tabs() {
 				this.$p_api.jt_safety_mine_list({
-					
-				}).then((res)=>{
+
+				}).then((res) => {
 					// console.log(res.data.content.data)
-					
+
 					let data = res.data.content.data
-					
+
 					let tabs = []
 					let mine_code = []
-					
+
 					data.map(function(item, index) {
 						//新数组的项，用来盛放每一项中的各个参数，每次清空，这样避免改变sevm的值
 						var sevm = {};
@@ -107,7 +108,7 @@
 						//将项放进新的数组
 						tabs[index] = sevm
 					})
-					
+
 					data.map(function(item, index) {
 						//新数组的项，用来盛放每一项中的各个参数，每次清空，这样避免改变sevm的值
 						var sevm = {};
@@ -116,28 +117,32 @@
 						//将项放进新的数组
 						mine_code[index] = sevm
 					})
-					
+
 					this.tabs = tabs
 					this.tabs_mine_code = mine_code
 					// console.log(mine_code[0])
 					// 定义当前煤矿编码
 					this.mine_code_index = mine_code[0]
-					
+
 					// 当前编码的煤矿详情数据查询
 					this.get_jt_safety_info_part()
-					
+
 					// 将定义后的编码发送给页面
-					this.$emit("code",this.mine_code_index)
+					this.$emit("code", this.mine_code_index)
 				})
 			},
 			// 详情数据查询
-			get_jt_safety_info_part(){
+			get_jt_safety_info_part() {
+				uni.showLoading({
+					mask: true
+				})
 				this.$p_api.jt_safety_info_part({
-					mine_code:this.mine_code_index
-				}).then((res)=>{
+					mine_code: this.mine_code_index
+				}).then((res) => {
+					uni.hideLoading()
 					// console.log(res.data.content)
 					let data = res.data.content
-					
+
 					// 模拟量总数
 					this.simulation = data.count.simulation
 					// 开关量总数
@@ -146,141 +151,160 @@
 					this.list = data.data
 				})
 			},
-		
-			go_content(){
+
+			go_content() {
 				console.log(this.mine_code_index)
+
+				uni.navigateTo({
+					url: "../../production/safety_monitoring/safety_monitoring?mine=" + this.mine_code_index
+				})
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	.tab{
+	.tab {
 		box-sizing: border-box;
 		padding: 0 24rpx;
-		.tab_title{
-			 
-		}
-		.tab_content{
-			.inner{
+
+		.tab_title {}
+
+		.tab_content {
+			.inner {
+
 				// min-height: 300px;
-				.section_1{
+				.section_1 {
 					margin: 40rpx 0;
-					
+
 					display: flex;
 					justify-content: space-around;
-					.item{
+
+					.item {
 						width: 260rpx;
 						height: 260rpx;
 						background-color: #E1EFF8;
 						border-radius: 50%;
-						
+
 						display: flex;
 						justify-content: center;
 						align-items: center;
-						.box{
+
+						.box {
 							width: 200rpx;
 							height: 200rpx;
 							border: 16rpx solid #FFFFFF;
 							background-color: #57B3F4;
 							border-radius: 50%;
-							
+
 							display: flex;
 							flex-direction: column;
 							justify-content: center;
 							align-items: center;
-							
+
 							color: #FFFFFF;
-							.name{}
-							.num{}
+
+							.name {}
+
+							.num {}
 						}
 					}
-					.item:nth-child(2){
+
+					.item:nth-child(2) {
 						background-color: #B7FFC1;
-						.box{
+
+						.box {
 							background-color: #2ECD73;
 						}
 					}
 				}
-				
-				.section_2{
-					.list_item{
-						.item{
+
+				.section_2 {
+					.list_item {
+						.item {
 							border-top: 1rpx solid #f3f3f3;
 							border-bottom: 1rpx solid #f3f3f3;
 							box-sizing: border-box;
 							padding: 0 30rpx;
 							padding-top: 28rpx;
 							padding-bottom: 26rpx;
-							
-							.item_title{
+
+							.item_title {
 								display: flex;
 								box-sizing: border-box;
 								padding-bottom: 18rpx;
 								border-bottom: 1rpx solid #f3f3f3;
-								.item_icon{
+
+								.item_icon {
 									margin-left: 6rpx;
-									image{
+
+									image {
 										width: 83rpx;
 										height: 83rpx;
 									}
 								}
-								.item_name{
+
+								.item_name {
 									margin-left: 23rpx;
 									font-size: 29rpx;
 									font-family: PingFangSC-Regular, PingFang SC;
 									font-weight: 400;
 									color: #002257;
 									line-height: 83rpx;
-					
+
 								}
 							}
-							.item_content{
-								.item_content_list{
+
+							.item_content {
+								.item_content_list {
 									display: flex;
 									justify-content: space-between;
-									.content_item{
+
+									.content_item {
 										width: 158rpx;
 										text-align: center;
-										.name{
+
+										.name {
 											margin-top: 22rpx;
 											font-size: 25rpx;
 											font-family: PingFangSC-Regular, PingFang SC;
 											font-weight: 400;
 											color: #97A3B4;
 											line-height: 33rpx;
-					
+
 										}
-										.num{
+
+										.num {
 											margin-top: 6rpx;
 											font-size: 28rpx;
 											font-family: PingFangSC-Medium, PingFang SC;
 											font-weight: 500;
 											line-height: 33rpx;
-											
+
 											color: #2ECC71;
-					
+
 										}
 									}
-									.content_item:nth-child(2) .num{
+
+									.content_item:nth-child(2) .num {
 										color: #E74C3C;
 									}
-									.content_item:nth-child(3) .num{
+
+									.content_item:nth-child(3) .num {
 										color: #2C3E50;
 									}
-									.content_item:nth-child(4) .num{
+
+									.content_item:nth-child(4) .num {
 										color: #2F54EB;
 									}
 								}
 							}
 						}
 					}
-							
-							
+
+
 				}
 			}
 		}
 	}
-	
-	
 </style>

components/p-production-statistics-section-1/p-production-statistics-section-1.vue

@@ -1,6 +1,7 @@
 <template>
 	<view>
-		<canvas canvas-id="canvasRing" id="canvasRing" @touchstart="touchRing" style="width: 700upx; height:500upx;" ></canvas>
+		<canvas canvas-id="canvasRing" id="canvasRing" @touchstart="touchRing"
+			style="width: 700upx; height:500upx;"></canvas>
 	</view>
 </template>
 
@@ -26,19 +27,44 @@
 		},
 		methods: {
 			getServerData() {
-				let Ring = {
-					"series": [{
-						"name": "早班 63950.8 吨",
-						"data": 63950.8
-					}, {
-						"name": "中班 5860.8 吨",
-						"data": 5860.8
-					}, {
-						"name": "晚班 0 吨",
-						"data": 0
-					}]
-				};
-				_self.showRing("canvasRing", Ring);
+
+
+				this.$p_api.coalmine_output({
+
+				}).then((res) => {
+
+					let Ring = {
+						"series": [{
+							"name": "早班 000000 吨",
+							"data": 0
+						}, {
+							"name": "中班 000000 吨",
+							"data": 0
+						}, {
+							"name": "晚班 000000 吨",
+							"data": 0
+						}],
+						"total": 0
+					};
+
+					// console.log(res.data.data)
+
+					Ring.total = res.data.data.total
+
+					// console.log(Ring.total)
+
+					Ring.series[0].name = '早班 ' + res.data.data.n1 + ' 吨'
+					Ring.series[0].data = res.data.data.n1
+					Ring.series[1].name = '中班 ' + res.data.data.n2 + ' 吨'
+					Ring.series[1].data = res.data.data.n2
+					Ring.series[2].name = '晚班 ' + res.data.data.n3 + ' 吨'
+					Ring.series[2].data = res.data.data.n3
+
+					// console.log(Ring)
+					_self.showRing("canvasRing", Ring);
+				})
+
+
 			},
 			showRing(canvasId, chartData) {
 				canvaRing = new uCharts({
@@ -47,12 +73,11 @@
 					type: 'ring',
 					fontSize: 11,
 					legend: {
-						show: true,
 						position: 'left',
-						lineHeight: 40,
+						lineHeight: 50,
 					},
 					title: {
-						name: '69811.6吨',
+						name: chartData.total + ' 吨',
 						color: '#000000',
 						fontSize: 20 * _self.pixelRatio,
 						offsetY: 20 * _self.pixelRatio,
@@ -84,7 +109,7 @@
 				canvaRing.showToolTip(e, {
 					format: function(item) {
 						// return item.name + ' : ' + item.data + ' 吨'
-						return item.name 
+						return item.name
 					}
 				});
 			},

components/p-production-statistics-section-2/p-production-statistics-section-2.vue

@@ -26,52 +26,82 @@
 		},
 		methods: {
 			getServerData() {
-				let Pie = {
-					"series": [{
-						"name": "梅花井矿 0%",
-						"data": 0
-					}, {
-						"name": "枣泉矿 15.3%",
-						"data": 10493.3
-					}, {
-						"name": "红柳矿 11.21%",
-						"data": 7837
-					}, {
-						"name": "麦垛山矿 13.91%",
-						"data": 9711.1
-					}, {
-						"name": "金凤矿 5.27%",
-						"data": 3683.7
-					}, {
-						"name": "双马矿 4.29%",
-						"data": 2999.2
-					}, {
-						"name": "石槽村矿 7.35%",
-						"data": 5138.5
-					}, {
-						"name": "灵新矿 5.72%",
-						"data": 3994.7
-					}, {
-						"name": "任家庄矿 2.22%",
-						"data": 1556.5
-					}, {
-						"name": "红石湾矿 0%",
-						"data": 0
-					}, {
-						"name": "羊二矿 1.55%",
-						"data": 1085.6
-					}, {
-						"name": "羊一矿 28.79%",
-						"data": 20104
-					}, {
-						"name": "白芨沟井 4.59%",
-						"data": 3207.9
-					}, {
-						"name": "大峰矿 0%",
-						"data": 0
-					}]
-				};
-				_self.showPie("canvasPie", Pie);
+				// let Pie = {
+				// 	"series": [{
+				// 		"name": "梅花井矿 0%",
+				// 		"data": 0
+				// 	}, {
+				// 		"name": "枣泉矿 15.3%",
+				// 		"data": 10493.3
+				// 	}, {
+				// 		"name": "红柳矿 11.21%",
+				// 		"data": 7837
+				// 	}, {
+				// 		"name": "麦垛山矿 13.91%",
+				// 		"data": 9711.1
+				// 	}, {
+				// 		"name": "金凤矿 5.27%",
+				// 		"data": 3683.7
+				// 	}, {
+				// 		"name": "双马矿 4.29%",
+				// 		"data": 2999.2
+				// 	}, {
+				// 		"name": "石槽村矿 7.35%",
+				// 		"data": 5138.5
+				// 	}, {
+				// 		"name": "灵新矿 5.72%",
+				// 		"data": 3994.7
+				// 	}, {
+				// 		"name": "任家庄矿 2.22%",
+				// 		"data": 1556.5
+				// 	}, {
+				// 		"name": "红石湾矿 0%",
+				// 		"data": 0
+				// 	}, {
+				// 		"name": "羊二矿 1.55%",
+				// 		"data": 1085.6
+				// 	}, {
+				// 		"name": "羊一矿 28.79%",
+				// 		"data": 20104
+				// 	}, {
+				// 		"name": "白芨沟井 4.59%",
+				// 		"data": 3207.9
+				// 	}, {
+				// 		"name": "大峰矿 0%",
+				// 		"data": 0
+				// 	}]
+				// };
+				
+				this.$p_api.coalmine_ratio({
+					
+				}).then((res)=>{
+					console.log(res.data.data)
+					
+					let Pie = {
+						"series": [{
+							"name": "",
+							"data": 0
+						}]
+					};
+					
+						
+					res.data.data.forEach((item,index)=>{
+						var sevm = {}
+						
+						sevm.name = item.name_s
+						sevm.data = item.n1+item.n2+item.n3
+						
+						Pie.series[index] = sevm
+					})
+					
+					console.log(Pie)
+					
+					
+					_self.showPie("canvasPie", Pie);
+					
+				})
+				
+				
 			},
 			showPie(canvasId, chartData) {
 				canvaPie = new uCharts({
@@ -81,7 +111,7 @@
 					fontSize: 11,
 					legend: {
 						show: true,
-						position: 'right',
+						position: 'bottom',
 						lineHeight: 20,
 					},
 					background: '#FFFFFF',
@@ -90,12 +120,13 @@
 					animation: true,
 					width: _self.cWidth * _self.pixelRatio,
 					height: _self.cHeight * _self.pixelRatio,
-					dataLabel: false,
+					dataLabel: true,
 					extra: {
 						pie: {
 							lableWidth: 15
 						}
 					},
+					
 				});
 			},
 			touchPie(e) {

components/p-production-statistics-section-3/p-production-statistics-section-3.vue

@@ -26,21 +26,56 @@
 		},
 		methods: {
 			getServerData() {
-
-				let ColumnStack = {
-					 "categories": ["19日", "20日", "21日", "22日", "23日", "24日","25日"],
-					  "series": [{
-						"name": "早班",
-						"data": [96258.6, 102354.2, 87569.5, 87512.2, 79854.2, 89896.7,80666.3]
-					  }, {
-						"name": "中班",
-						"data": [15089.5, 34256.1, 30659.7, 28665.1, 27458.6, 26597.4,12658.7]
-					  }, {
-						"name": "晚班",
-						"data": [105203.2, 116542.2, 102654.2, 106598.2, 113568.2, 99685.2,0]
-					  }]
-				};
-				_self.showColumnStack("canvasColumnStack", ColumnStack);
+				this.$p_api.coalmine_trend({
+					
+				}).then((res)=>{
+					// console.log(res.data.data)
+					
+					let ColumnStack={
+						categories:[],
+						series:[
+							{
+								"name": "早班",
+								"data": []
+							},
+							{
+								"name": "中班",
+								"data": []
+							},
+							{
+								"name": "晚班",
+								"data": []
+							}
+						],
+					};
+					
+					res.data.data.map((item,index)=>{
+						var sevm = {};
+						sevm = item.date;
+						ColumnStack.categories[index] = sevm
+					})
+					
+					res.data.data.map((item,index)=>{
+						var sevm = {};
+						sevm = item.n1;
+						ColumnStack.series[0].data[index] = sevm
+					})
+					res.data.data.map((item,index)=>{
+						var sevm = {};
+						sevm = item.n2;
+						ColumnStack.series[1].data[index] = sevm
+					})
+					res.data.data.map((item,index)=>{
+						var sevm = {};
+						sevm = item.n3;
+						ColumnStack.series[2].data[index] = sevm
+					})
+					
+					
+					_self.showColumnStack("canvasColumnStack", ColumnStack);
+				})
+				
+				
 			},
 			showColumnStack(canvasId, chartData) {
 				canvaColumn = new uCharts({

components/p-production-statistics-section-4/p-production-statistics-section-4.vue

@@ -1,55 +1,31 @@
 <template>
 	<view>
-
 		<view class="list">
-			<view class="item">
-				<view class="item_title">梅花井矿</view>
-				<view class="item_content">
-					<view class="box">
-						<view class="name">早班产量</view>
-						<view class="num">0吨</view>
-					</view>
-					<view class="box">
-						<view class="name">中班产量</view>
-						<view class="num">0吨</view>
-					</view>
-					<view class="box">
-						<view class="name">晚班产量</view>
-						<view class="num">0吨</view>
-					</view>
-				</view>
-				<view class="item_bottom">
-					<view class="left">年累计产量：<text>1890691.3吨</text></view>
-					<view class="right" @click="go_container()">
-						<view class="more">更多详情</view>
-						<uni-icons type="arrowright" size="12" color="#75B8D5"></uni-icons>
-					</view>
-				</view>
-			</view>
-			<view class="item">
-				<view class="item_title">枣泉矿</view>
+			<view class="item" v-for="(item,index) in list" :key="index">
+				<view class="item_title">{{item.name}}</view>
 				<view class="item_content">
 					<view class="box">
 						<view class="name">早班产量</view>
-						<view class="num">9781.9吨</view>
+						<view class="num">{{item.n1}} 吨</view>
 					</view>
 					<view class="box">
 						<view class="name">中班产量</view>
-						<view class="num">711.4吨</view>
+						<view class="num">{{item.n2}} 吨</view>
 					</view>
 					<view class="box">
 						<view class="name">晚班产量</view>
-						<view class="num">0吨</view>
+						<view class="num">{{item.n3}} 吨</view>
 					</view>
 				</view>
 				<view class="item_bottom">
-					<view class="left">年累计产量：<text>1367859.5吨</text></view>
-					<view class="right" @click="go_container()">
+					<view class="left">年累计产量：<text>{{item.year}} 吨</text></view>
+					<view class="right" @click="go_container(item.org_num)">
 						<view class="more">更多详情</view>
 						<uni-icons type="arrowright" size="12" color="#75B8D5"></uni-icons>
 					</view>
 				</view>
 			</view>
+			
 		</view>
 
 	</view>
@@ -59,15 +35,29 @@
 	export default {
 		data() {
 			return {
-
+				list:[]
 			};
 		},
+		mounted() {
+			this.get_list()
+		},
 		methods:{
-			go_container(){
+			go_container(org_num){
 				uni.navigateTo({
-					url:"../../production/p-statistics/p-s-container/p-s-container"
+					url: "../../production/production_report/production_report?org_num=" +
+						org_num,
 				})
-			}
+			},
+			get_list(){
+				this.$p_api.coalmine_ratio({
+					
+				}).then((res)=>{
+					// console.log(res.data.data)
+					
+					this.list = res.data.data
+				})
+			},
+			
 		}
 		
 	}

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

@@ -6,11 +6,11 @@
 			</view>
 
 			<view class="navbar">
-				<view class="left" @click="switch_kuang()">
+				<view class="left">
 					<image v-if="mine_code == 'ningdongyunying'" src="./icon/ningdongyunying.png" mode=""></image>
 
 					<image v-if="mine_code == 'zaoquan'" src="./icon/zaoquan.png" mode=""></image>
-					<uni-icons type="arrowdown" color="#fff" v-if="mine_code == 'ningdongyunying'"></uni-icons>
+					<!-- <uni-icons  @click="switch_kuang()" type="arrowdown" color="#fff"></uni-icons> -->
 				</view>
 				<view class="search">
 					<view class="box">
@@ -84,11 +84,9 @@
 		},
 		methods: {
 			switch_kuang() {
-				if (this.mine_code == 'ningdongyunying') {
-					uni.navigateTo({
-						url: "../../index/switch-kuang/switch-kuang"
-					})
-				}
+				uni.navigateTo({
+					url: "../../index/switch-kuang/switch-kuang"
+				})
 			},
 			go_search() {
 				uni.navigateTo({

components/t-m-icon/t-m-icon.vue

@@ -31,12 +31,12 @@
 				</view>
 				<view class="name">使用手册</view>
 			</view>
-			<!-- <view class="item" @click="go_signature()">
+			<view class="item" @click="go_signature()">
 				<view class="icon">
-					<image src="./icon/jianyifankui.png" mode=""></image>
+					<image src="./icon/shouxieqianming.png" mode=""></image>
 				</view>
 				<view class="name">手写签名</view>
-			</view> -->
+			</view>
 			<view class="item" @click="go_feedback()">
 				<view class="icon">
 					<image src="./icon/jianyifankui.png" mode=""></image>

components/t-o-ningdongyunying/t-o-ningdongyunying.vue

@@ -0,0 +1,142 @@
+<template>
+	<view>
+		<view class="content">
+			<view class="title">
+				<view class="icon">
+					<image src="./icon/title_icon.png" mode=""></image>
+				</view>
+				<view class="text">国家能源集团宁东运营部</view>
+			</view>
+			<view class="box">
+				<view class="item" @click="go_communication_origanization()">
+					<view class="icon">
+						<image src="./icon/jiagou.png" mode=""></image>
+					</view>
+					<view class="text">组织架构</view>
+				</view>
+				<view class="item" @click="go_my_department()">
+					<view class="icon">
+						<image src="./icon/bumen.png" mode=""></image>
+					</view>
+					<view class="text">我的部门</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"t-o-ningdongyunying",
+		data() {
+			return {
+				list:[]
+			};
+		},
+		created() {
+			this.get_worksheet_classify_list()
+		},
+		methods:{
+			// 获取分类
+			get_worksheet_classify_list(){
+				this.$api.worksheet_classify_list({
+					
+				}).then((res)=>{
+					console.log(res.data.data)
+					this.list = res.data.data
+				})
+			},
+			// 工单列表
+			go_business(id,title){
+				uni.navigateTo({
+					url:"../../workbench/business_classfication/business_classfication?id="+id+"&title="+title
+				})
+			},
+			go_communication_origanization(){
+				uni.navigateTo({
+					url:"../../origanization/communication/origanization/origanization"
+				})
+			},
+			go_my_department(){
+				uni.navigateTo({
+					url:"../../origanization/communication/origanization/my_department/my_department"
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.list{
+		background-color: #FFFFFF;
+		margin-bottom: 20rpx;
+		
+		box-sizing: border-box;
+		padding: 50rpx 25rpx;
+		
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		.item{
+			width: 175rpx;
+			text-align: center;
+			.icon{
+				image{
+					width: 78rpx;
+					height: 78rpx;
+				}
+			}
+			.text{
+				margin-top: 24rpx;
+				font-size: 32rpx;
+			}
+		}
+	}
+	
+	.content{
+		background-color: #FFFFFF;
+		.title{
+			height: 110rpx;
+			display: flex;
+			align-items: center;
+			
+			box-sizing: border-box;
+			padding: 0 36rpx;
+			border-bottom: 1rpx solid #F3F8F7;
+			.icon{
+				image{
+					width: 48rpx;
+					height: 36rpx;
+				}
+			}
+			.text{
+				margin-left: 20rpx;
+				font-size: 38rpx;
+				font-weight: 700;
+			}
+		}
+		.box{
+			box-sizing: border-box;
+			padding: 0 50rpx;
+			.item{
+				height: 110rpx;
+				
+				display: flex;
+				align-items: center;
+				
+				border-bottom: 1rpx solid #F3F8F7;
+				
+				.icon{
+					image{
+						width: 36rpx;
+						height: 36rpx;
+					}
+				}
+				.text{
+					margin-left: 20rpx;
+					font-size: 32rpx;
+				}
+			}
+		}
+	}
+</style>

components/t-o-communication/t-o-communication.vue

@@ -57,7 +57,7 @@
 
 <script>
 	export default {
-		name:"t-o-communication",
+		name:"t-o-zaoquan",
 		data() {
 			return {
 				list:[]

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

@@ -45,7 +45,7 @@
 				<view class="tip">共40个通风机</view>
 			</view>
 		</view>
-		<view class="item_box" style="background-color: #FBB47B;">
+		<view class="item_box" style="background-color: #FBB47B;" @click="go_video_monitor()">
 			<view class="img">
 				<image src="../t-p-icon/icon_6.png" mode=""></image>
 			</view>
@@ -107,40 +107,47 @@
 		name: "t-p-n-section-1",
 		data() {
 			return {
-
+				mine_code: ""
 			};
 		},
-		methods:{
+		methods: {
 			// 自动化统计列表
-			go_zdhxt(zdhxt){
+			go_zdhxt(zdhxt) {
 				uni.navigateTo({
-					url:"../../production/zidonghua/zidonghua?url=" + "http://webdevelop.nxjiewei.com/assets/html/E-zidonghua/?zdhxt=" + zdhxt
+					url: "../../production/zidonghua/zidonghua?url=" +
+						"http://webdevelop.nxjiewei.com/assets/html/E-zidonghua/?zdhxt=" + zdhxt
 				})
 			},
 			// 生产统计
-			go_production_statistics(){
+			go_production_statistics() {
 				uni.navigateTo({
-					url:"../../ningdongyunying/production_statistics/production_statistics"
+					url: "../../ningdongyunying/production_statistics/production_statistics"
 				})
 			},
 			// 人员定位
-			go_personnel_orientation(){
+			go_personnel_orientation() {
 				uni.navigateTo({
-					url:"../../ningdongyunying/personnel_orientation/personnel_orientation"
+					url: "../../ningdongyunying/personnel_orientation/personnel_orientation"
 				})
 			},
 			// 安全监测
-			go_safety_monitoring(){
+			go_safety_monitoring() {
 				uni.navigateTo({
-					url:"../../ningdongyunying/safety_monitoring/safety_monitoring"
+					url: "../../ningdongyunying/safety_monitoring/safety_monitoring"
 				})
 			},
 			// 风险预控
-			go_risk_precontr0l(){
+			go_risk_precontr0l() {
 				uni.navigateTo({
-					url:"../../ningdongyunying/risk_precontrol/risk_precontrol"
+					url: "../../ningdongyunying/risk_precontrol/risk_precontrol"
 				})
-			}
+			},
+			// 视频监控
+			go_video_monitor() {
+				uni.navigateTo({
+					url: "../../production/video_monitor/video_monitor?mine_code=" + this.mine_code
+				})
+			},
 		}
 	}
 </script>
@@ -152,7 +159,7 @@
 		margin-bottom: 100rpx;
 
 		overflow: hidden;
-		
+
 
 		.item_box {
 			float: left;
@@ -198,5 +205,4 @@
 		}
 
 	}
-
 </style>

components/t-p-ningdongyunying/t-p-ningdongyunying.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<swiper duration="500">
+		<!-- <swiper duration="500">
 			<swiper-item>
 				<scroll-view scroll-y>
 					<view class="scroll__box">
@@ -15,7 +15,9 @@
 					</view>
 				</scroll-view>
 			</swiper-item>
-		</swiper>
+		</swiper> -->
+		
+		<t-p-n-section-1></t-p-n-section-1>
 	</view>
 </template>
 

components/t-w-ningdongyunying/t-w-ningdongyunying.vue

@@ -0,0 +1,270 @@
+<template>
+	<view class="headers">
+		<view class="headers_img">
+			<image :src="header" mode="aspectFill"></image>
+		</view>
+		<view class="headers_nav">
+			<view class="headers_ul">
+				<view class="headers_li" v-for="(item,index) in nav" :key="index" @click="getnav(item.link)">
+					<view class="headers_li_img">
+						<image :src="item.icon" mode=""></image>
+					</view>
+					<view class="headers_li_text">
+						{{item.title}}
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view class="headers_list" v-for="(item,index) in module" :key="index">
+			<view class="headers_title">
+				<text class="headers_title_h1">
+					{{item.title}}
+				</text>
+			</view>
+			<view class="headers_ul">
+				<view class="headers_li" v-for="(items,index) in item.children" :key="index"
+					@click="getmodule(items.link)">
+					<view class="headers_li_img">
+						<image :src="items.icon" mode=""></image>
+					</view>
+					<view class="headers_li_text">
+						{{items.title}}
+					</view>
+
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: [
+			"mine_code"
+		],
+		data() {
+			return {
+				module: [],
+				nav: [],
+				header: "",
+			};
+		},
+		created() {
+			this.getworkbench()
+		},
+		methods: {
+			getworkbench() {
+				this.$api.workbench_index({
+
+				}).then((res) => {
+					// console.log(res)
+					this.header = res.data.data.header
+					this.nav = res.data.data.nav
+					this.module = res.data.data.module
+
+				})
+			},
+			getnav(link) {
+				console.log(link)
+
+				// 二维码
+				if (link.indexOf("pageId") != -1 && link.indexOf("app:") == -1) {
+					let pageId = ""
+
+					function GetQueryString(name) {
+						var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+						var r = link.match(reg);
+						if (r != null) return unescape(r[2]);
+						return null;
+					}
+					console.log(GetQueryString("pageId"))
+					if (GetQueryString("pageId")) {
+						pageId = GetQueryString("pageId")
+					} else {
+						pageId = link.split('=')[1]
+					}
+
+					// uni.navigateTo({
+					// 	url: "../../index/record/record?pageId=" + pageId + "&mine_code=" + this.mine_code,
+					// })
+				}
+				// h5
+				if (link.indexOf("pageId") == -1 && link.indexOf("app:") == -1) {
+					// uni.navigateTo({
+					// 	url: "../../workbench/h5/h5?url=" + link
+					// })
+				}
+				// 原生
+				if (link.indexOf("pageId") == -1 && link.indexOf("app:") != -1) {
+					console.log("原生")
+					if (link.indexOf("/workBench/huiyiList") != -1) {
+						uni.showToast({
+							icon: "none",
+							title: "暂时没有会议"
+						})
+					}
+
+				}
+
+			},
+			getmodule(link) {
+				console.log(link)
+				console.log(this.mine_code)
+
+				// 二维码
+				if (link.indexOf("pageId") != -1 && link.indexOf("app:") == -1) {
+					let pageId = ""
+
+					function GetQueryString(name) {
+						var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+						var r = link.match(reg);
+						if (r != null) return unescape(r[2]);
+						return null;
+					}
+					console.log(GetQueryString("pageId"))
+					if (GetQueryString("pageId")) {
+						pageId = GetQueryString("pageId")
+					} else {
+						pageId = link.split('=')[1]
+					}
+
+					uni.navigateTo({
+						url: "../../index/record/record?pageId=" + pageId + "&mine_code=" + this.mine_code,
+					})
+				}
+				// h5
+				if (link.indexOf("pageId") == -1 && link.indexOf("app:") == -1) {
+					// uni.navigateTo({
+					// 	url: "../../workbench/h5/h5?url=" + link
+					// })
+
+					if (plus.os.name == 'Android') {
+
+						if (link.indexOf("cmb.pb") != -1) {
+							plus.runtime.launchApplication({
+								pname: 'cmb.pb'
+							}, (e) => {
+								console.log('Open system default browser failed: ' + e.message)
+
+								uni.showToast({
+									icon: "none",
+									title: "未安装此应用"
+								})
+							})
+						}
+
+						if (link.indexOf("com.icbc") != -1) {
+							plus.runtime.launchApplication({
+								pname: 'com.icbc'
+							}, (e) => {
+								console.log('Open system default browser failed: ' + e.message)
+
+								uni.showToast({
+									icon: "none",
+									title: "未安装此应用"
+								})
+							})
+						}
+
+
+					}
+				}
+				// 原生
+				if (link.indexOf("pageId") == -1 && link.indexOf("app:") != -1) {
+					console.log("原生")
+
+					console.log(link)
+					// 发票助手
+					if (link.indexOf("/workBench/invoice") != -1) {
+						console.log("发票助手")
+						uni.navigateTo({
+							url: "../../workbench/invoice_assistant/invoice_assistant"
+						})
+					}
+					
+					// 生活圈
+					if (link.indexOf("/workBench/lifeCircleWin") != -1) {
+						console.log("生活圈")
+						
+						uni.showToast({
+							icon:"none",
+							title:"暂未开通"
+						})
+					}
+
+				}
+
+			}
+		},
+
+	}
+</script>
+
+<style>
+	.headers {
+		width: 100%;
+		background-color: #F5F5F5;
+	}
+
+	.headers_img>image {
+		width: 100%;
+		height: 360rpx;
+	}
+
+	.headers_nav {
+		width: 100%;
+		background-color: #FFFFFF;
+		margin-bottom: 25rpx;
+	}
+
+	.headers_ul {
+		width: 100%;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-around;
+		margin-top: 10rpx;
+	}
+
+	.headers_ul::after {
+		content: '';
+		width: 25%;
+	}
+
+	.headers_title {
+		margin-left: 40rpx;
+		padding-top: 30rpx;
+		padding-bottom: 5rpx;
+	}
+
+	.headers_li {
+		width: 25%;
+		text-align: center;
+		margin-bottom: 25rpx;
+		margin-top: 25rpx;
+	}
+
+	.headers_li_img>image {
+		width: 100rpx;
+		height: 100rpx;
+		margin-bottom: 20rpx;
+	}
+
+	.headers_li_text {
+		font-size: 14px;
+	}
+
+	.headers_title_h1 {
+		font-weight: 800;
+	}
+
+	.headers_list {
+		width: 100%;
+		background-color: #fff;
+	}
+
+	.ly-tree-node__label {
+		color: #000000;
+	}
+</style>

components/t-w-zaoquan/t-w-zaoquan.vue

@@ -173,9 +173,16 @@
 						// })
 						
 						// people_num 特殊值
-						uni.navigateTo({
-							url:"../../production/personnel_orientation/downhole_statistics/downhole_statistics"
-						})
+						if(!uni.getStorageSync('people_code')){
+							uni.navigateTo({
+								url:"../../production/personnel_orientation/downhole_statistics/downhole_statistics?people_num=null&depart_name="+uni.getStorageSync('user').section+"&name="+uni.getStorageSync('user').name+"&mine=640181B0011010037723"
+							})
+						}else{
+							uni.navigateTo({
+								url:"../../production/personnel_orientation/downhole_statistics/downhole_statistics?people_num="+uni.getStorageSync('user').people_code+"&depart_name="+uni.getStorageSync('user').section+"&name="+uni.getStorageSync('user').name+"&mine=640181B0011010037723"
+							})
+						}
+						
 					}else if(link.indexOf("/browseQrcode/gridSubmitItem_win") != -1){
 						console.log("网格排查")
 						uni.navigateTo({

manifest.json

@@ -2,7 +2,7 @@
     "name" : "智慧枣泉",
     "appid" : "__UNI__4B520D3",
     "description" : "",
-    "versionName" : "1.0.2",
+    "versionName" : "1.0.3",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */

pages.json

@@ -427,6 +427,22 @@
             }
             
         }
+        ,{
+            "path" : "pages/workbench/downhole_statistics_user/downhole_statistics_user",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "下井记录"
+            }
+            
+        }
+        ,{
+            "path" : "pages/index/record/record-browse/record-browse",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "浏览记录"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",

pages/index/record/record-browse/record-browse.vue

@@ -0,0 +1,216 @@
+<template>
+	<view class="browse">
+		<view class="list" v-if="browse.length > 0">
+			<view class="item" v-for="(item,index) in browse" :key="index" @click="click(item)">
+				<view class="img">
+					<view v-if="item.img">
+						<image :src="item.img" mode=""></image>
+					</view>
+					<view v-if="!item.img">
+						<view class="img_tip" :style="{backgroundColor:bgColor[index]}">
+							{{item.name}}
+						</view>
+					</view>
+				</view>
+				<view class="name">{{item.name}}</view>
+			</view>
+		</view>
+
+
+		<uni-popup ref="popup" type="center">
+			<view class="popup_box">
+				<view class="img">
+					<view v-if="user.img">
+						<image :src="user.img" mode=""></image>
+					</view>
+					<view v-if="!user.img">
+						<view class="img_tip" :style="{backgroundColor:bgColor[Math.ceil(Math.random()*10)]}">
+							{{user.name}}
+						</view>
+					</view>
+				</view>
+				
+				<view class="name">姓名：{{user.name}}</view>
+				<view class="section">部门：{{user.department}}</view>
+				<view class="time">最近浏览时间：{{user.createDate}}</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				mine_code: "",
+				base_url: "",
+				// 二维码ID
+				pageId: '',
+
+
+				bgColor: [],
+				browse: [],
+				
+				user:{}
+			};
+		},
+		onLoad(option) {
+			console.log(option)
+			this.mine_code = option.mine_code
+			// 根据矿编码切换首页接口不同的请求基础路径
+			switch (option.mine_code) {
+				case 'ningdongyunying':
+					this.base_url = "http://ningdongyunying.nxjiewei.com:8011/api"
+					break;
+				case 'meihuajing':
+					this.base_url = "http://meihuajing.nxjiewei.com:8011/api"
+					break;
+				case 'zaoquan':
+					this.base_url = "http://zaoquan.nxjiewei.com:8011/api"
+					break;
+				default:
+					this.base_url = ""
+			}
+			// 获取二维码ID
+			this.pageId = option.pageId
+
+			// 获取浏览记录
+			this.get_browse()
+		},
+		methods: {
+			// 获取浏览记录
+			get_browse() {
+				uni.request({
+					url: this.base_url + "/swagger/api/pageuser/v1/getPageUserByPageId/" + this.pageId,
+					success: (res) => {
+						console.log(res.data.data)
+						this.browse = res.data.data
+
+						for (let i = 0; i < this.browse.length; i++) {
+							// 获取随机色
+							let r = parseInt(Math.random() * 256)
+							let g = parseInt(Math.random() * 256)
+							let b = parseInt(Math.random() * 256)
+
+							// ES6 字符串拼接
+							// this.bgColor = `rgba(${r},${g},${b},0.3)`
+							let color = "rgba(" + r + "," + g + "," + b + "," + 0.3 + ")"
+							// console.log(color)
+							this.bgColor.push(color)
+						}
+
+						this.$forceUpdate
+						this.$set(this.browse)
+					}
+				})
+			},
+
+			click(item) {
+				console.log(item)
+				
+				this.user = item
+				this.$refs.popup.open()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.browse {
+		margin-top: 20rpx;
+		margin-bottom: 40rpx;
+
+		.list {
+			overflow: hidden;
+
+			.item {
+				float: left;
+				width: 140rpx;
+				text-align: center;
+				margin-right: 12rpx;
+				margin-bottom: 20rpx;
+				
+				font-size: 30rpx;
+
+				.img {
+					margin: 0 auto;
+					width: 120rpx;
+					height: 120rpx;
+					border-radius: 50%;
+					overflow: hidden;
+
+					image {
+						width: 120rpx;
+						height: 120rpx;
+					}
+
+					.img_tip {
+						width: 120rpx;
+						height: 120rpx;
+
+						text-align: center;
+						line-height: 120rpx;
+						color: #FFFFFF;
+					}
+				}
+
+				.name {
+					margin-top: 20rpx;
+					width: 140rpx;
+
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+				}
+			}
+
+			.item:nth-child(5n) {
+				margin-right: 0;
+			}
+		}
+	}
+	
+	
+	.popup_box{
+		background-color: #FFFFFF;
+		border-radius: 12rpx;
+		
+		box-sizing: border-box;
+		padding: 50rpx 30rpx;
+		
+		text-align: center;
+		font-size: 30rpx;
+		.img {
+			margin: 0 auto;
+			width: 120rpx;
+			height: 120rpx;
+			border-radius: 50%;
+			overflow: hidden;
+		
+			image {
+				width: 120rpx;
+				height: 120rpx;
+			}
+		
+			.img_tip {
+				width: 120rpx;
+				height: 120rpx;
+		
+				text-align: center;
+				line-height: 120rpx;
+				color: #FFFFFF;
+			}
+		}
+		.name{
+			margin-top: 20rpx;
+			line-height: 60rpx;
+		}
+		.section{
+			line-height: 60rpx;
+		}
+		.time{
+			line-height: 60rpx;
+			color: #888888;
+		}
+	}
+</style>

pages/index/record/record.vue

@@ -69,19 +69,10 @@
 		</view>
 		
 
-		<!-- 记录列表 -->
-		<!-- <view v-if="recordList.length != 0">
-			<view class="RECORD">
-				<e-record :recordList="recordList" :instanceList="instanceList" @set_parentId="set_parentId"></e-record>
-			</view>
-		</view> -->
 		<!-- 浏览记录 -->
-		<!-- <view v-if="browse.length != 0">
-			<e-browse :browse="browse" :bgColor="bgColor"></e-browse>
-		</view> -->
-		
-		<!-- 添加记录 -->
-		<!-- <view v-if="selectRecord_list.length > 0" class="bottom_btn" @click="bottom_btn_click()">添加记录</view> -->
+		<view v-if="browse.length != 0">
+			<e-browse :browse="browse" :mine_code="mine_code" :pageId="pageId" :bgColor="bgColor"></e-browse>
+		</view>
 		
 	</view>
 </template>
@@ -140,9 +131,7 @@
 				// 所在模块索引
 				equipmentList_index:[],
 				
-				// 记录管理模块
-				recordList:[],
-				instanceList:[],
+				
 				
 				// 浏览记录
 				browse:[],
@@ -150,8 +139,6 @@
 				bgColor:[],
 				
 				
-				// 添加记录入口列表
-				selectRecord_list:[]
 			}
 		},
 		onLoad(option) {
@@ -180,35 +167,8 @@
 			// 获取浏览记录
 			this.get_browse()
 			
-			// 获取二维码记录筛选接口
-			this.get_selectRecord()
-			
-			
-			// 获取添加记录入口列表
-			this.get_selectRecord_list()
-			
 		},
 		methods: {
-			// 弹出添加记录菜单
-			bottom_btn_click(){
-				uni.showActionSheet({
-				    itemList: this.selectRecord_list_name,
-				    success: (res) => {
-				        // console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
-						// console.log(res.tapIndex)
-						// console.log(this.selectRecord_list[res.tapIndex].parentId)
-						
-						uni.navigateTo({
-							// url:"./selectRecord_list_detail/selectRecord_list_detail?pageRecordId=" + this.selectRecord_list[res.tapIndex].parentId + "&pageId=" + this.pageId,
-							url:"./selectRecord_list_detail/selectRecord_list_detail?pageRecordId=d540a652a218469d92c627f1c4b1d95e&pageId=" + this.pageId,
-						})
-				    },
-				    fail: function (res) {
-				        console.log(res.errMsg);
-				    }
-				})
-			},
-			
 			
 			// 获取二维码详情
 			get_inner(){
@@ -295,8 +255,10 @@
 					success: (res) => {
 						console.log(res.data.data)
 						this.browse = res.data.data
+						this.browse.length = 3
+						console.log(this.browse)
 						
-						for(let i=0;i<100;i++){
+						for(let i=0;i<3;i++){
 							// 获取随机色
 							let r = parseInt(Math.random() * 256)
 							let g = parseInt(Math.random() * 256)
@@ -308,67 +270,13 @@
 							// console.log(color)
 							this.bgColor.push(color)
 						}
+						
+						this.$forceUpdate()
 					}
 				})
 			},
 			
 			
-			// 获取二维码记录筛选接口
-			get_selectRecord(){
-				uni.request({
-					url: this.base_url + "/swagger/api/page/v1/selectRecordByGetPageId/"+this.pageId,
-					success: (res) => {
-						console.log(res.data.data)
-						this.recordList = res.data.data
-						// 根据筛选标签获取列表接口
-						this.get_PageRecordInstanceList(res.data.data[0].parentId)
-					}
-				})
-			},
-			
-			
-			set_parentId(parentId){
-				this.get_PageRecordInstanceList(parentId)
-			},
-			// 根据筛选标签获取列表接口
-			get_PageRecordInstanceList(parentId){
-				uni.showLoading({
-					icon:"none",
-					title:"加载中...",
-					mask:true
-				})
-				uni.request({
-					url: this.base_url + "/swagger/api/record/v1/getPageRecordInstanceList?pageId="+this.pageId+"&pageRecordParentId=" + parentId + " &pageNumber=1&pageSize=5",
-					success: (res) => {
-						console.log(res.data.data)
-						this.instanceList = res.data.data
-						uni.hideLoading()
-					}
-				})
-			},
-			
-			
-			// 获取添加记录入口列表
-			get_selectRecord_list(){
-				uni.request({
-					url: this.base_url + "/swagger/api/page/v1/selectRecordByGetPageId/"+this.pageId,
-					success: (res) => {
-						console.log(res.data.data)
-						this.selectRecord_list = res.data.data
-						
-						let selectRecord_list_name = []
-						
-						res.data.data.map(function(item,index){
-							selectRecord_list_name.push(item.templateName)
-						})
-						
-						console.log(selectRecord_list_name)
-						this.selectRecord_list_name = selectRecord_list_name
-					}
-				})
-			},
-		
-		
 		},
 	}
 </script>

pages/index/switch-kuang/switch-kuang.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view @click="click('meihuajing')">选择完毕</view>
+		<view @click="click('zaoquan')">选择完毕</view>
 	</view>
 </template>
 

pages/my/business-audit/chakan/chakan.vue

@@ -55,7 +55,7 @@
 				<view class="title">需审核图片</view>
 				<view class="inner">
 					<view class="img_list">
-						<view class="item" v-for="item in detail.$photos">
+						<view class="item" v-for="(item,index) in detail.$photos" :key="index">
 							<image :src="item.path" @click="open_img(item.path)"></image>
 						</view>
 					</view>

pages/my/business-audit/shenhe/shenhe.vue

@@ -55,7 +55,7 @@
 				<view class="title">需审核图片</view>
 				<view class="inner">
 					<view class="img_list">
-						<view class="item" v-for="item in detail.$photos">
+						<view class="item" v-for="(item,index) in detail.$photos" :key="index">
 							<image :src="item.path" @click="open_img(item.path)"></image>
 						</view>
 					</view>

pages/my/business-my/chakan/chakan.vue

@@ -55,7 +55,7 @@
 				<view class="title">需审核图片</view>
 				<view class="inner">
 					<view class="img_list">
-						<view class="item" v-for="item in detail.$photos">
+						<view class="item" v-for="(item,index) in detail.$photos" :key="index">
 							<image :src="item.path" @click="open_img(item.path)"></image>
 						</view>
 					</view>

pages/my/login/login.vue

@@ -76,6 +76,7 @@
 						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);
 

pages/my/personal_information/personal_information - 副本 (2).vue

@@ -1,23 +0,0 @@
-<template>
-	<view>
-		<web-view :src="href"></web-view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				href: ""
-
-			};
-		},
-		onLoad(option) {
-			this.href = "http://webdevelop.nxjiewei.com/assets/html/zhks-quankuang/user_info?token=" + uni.getStorageSync('Authorization') + "&mine_code=" + uni.getStorageSync('mine_code') + "&staff_num=" + uni.getStorageSync('user').staff_num
-		}
-	}
-</script>
-
-<style lang="scss">
-
-</style>

pages/my/personal_information/personal_information - 副本.vue

@@ -0,0 +1,428 @@
+<template>
+	<view>
+		<view class="top">
+			<view class="avatar">
+				<image v-if="info.avatar" :src="info.avatar" mode="aspectFill"></image>
+				<view class="avatar" v-if="!info.avatar && !info" :style="{backgroundColor:bgColor[1]}">
+					{{info.name.split('').pop()}}
+				</view>
+			</view>
+			<view class="info">
+				<view class="name">{{info.name}}</view>
+				<view class="box">
+					<view class="item">
+						<view class="label">部门</view>
+						<view class="text">{{info.section_fullname}}</view>
+					</view>
+					<view class="item">
+						<view class="label">职务</view>
+						<view class="text">{{info.duty_num}}</view>
+					</view>
+					<view class="item">
+						<view class="label">员工编号</view>
+						<view class="text">{{info.staff_num}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="content">
+			<view class="box">
+				<view class="item" @click="change_active(1)">
+					<view class="text" :style="{color:active == 1?'#333':'#8e8e8e'}">个人信息</view>
+					<view class="line" v-if="active == 1"></view>
+				</view>
+				<view class="item" @click="change_active(2)">
+					<view class="text" :style="{color:active == 2?'#333':'#8e8e8e'}">工作经历</view>
+					<view class="line" v-if="active == 2"></view>
+				</view>
+				<view class="item" @click="change_active(3)">
+					<view class="text" :style="{color:active == 3?'#333':'#8e8e8e'}">荣誉及证书</view>
+					<view class="line" v-if="active == 3"></view>
+				</view>
+			</view>
+
+
+			<!-- 个人信息 -->
+			<view class="list_1" v-if="active == 1">
+				<view class="item" @click="binding_phone()">
+					<view class="label">手机号</view>
+					<view class="text">12345678</view>
+					<view class="right">
+						<uni-icons type="arrowright" size="20" color="#999"></uni-icons>
+					</view>
+				</view>
+				<view class="item" @click="go_signature()">
+					<view class="label">手写签名</view>
+					<view class="text"> </view>
+					<view class="right">
+						<uni-icons type="arrowright" size="20" color="#999"></uni-icons>
+					</view>
+				</view>
+				<view class="item">
+					<view class="label">岗位分类</view>
+					<view class="text">{{info.job_classify}}</view>
+					<view class="right"></view>
+				</view>
+				<!-- <view class="item">
+					<view class="label">岗位</view>
+					<view class="text">{{info.position.title}}</view>
+					<view class="right"></view>
+				</view> -->
+				<view class="item">
+					<view class="label">民族</view>
+					<view class="text">{{info.nation}}</view>
+					<view class="right"></view>
+				</view>
+				<view class="item">
+					<view class="label">出生日期</view>
+					<view class="text">{{info.birthday}}</view>
+					<view class="right"></view>
+				</view>
+			</view>
+
+			<!-- 工作经历 -->
+			<view class="list_2" v-if="active == 2">
+				<view class="item">
+					<view class="text_1">任职时间</view>
+					<view class="text_2">工作单位</view>
+					<view class="text_3">职务</view>
+				</view>
+				<view class="item" v-for="item in 3" :key="item">
+					<view class="text_1">2008-06-23至1010-05-14</view>
+					<view class="text_2">公司名称公司名称公司名称</view>
+					<view class="text_3">工程师</view>
+				</view>
+			</view>
+			<!-- 荣誉及证书 -->
+			<view class="list_3" v-if="active == 3">
+				<view class="item" v-for="item in 4" :key="item">
+					<view class="img">
+						<image
+							src="https://cdn.colorhub.me/7X-46x4lrKMmT8Tyo5qNMRFN0p1R-nMEzlYx-XvdZiw/rs:auto:280:0:0/g:ce/bG9jYWw6Ly8vMTgv/NzUvOGFkNWU4NmZj/Mzc2NWJjYTBiYzAw/YTY1N2JiNWE5ZmMz/MjAyMTg3NS5qcGc.jpg"
+							mode="aspectFill"></image>
+					</view>
+					<view class="text">奖项名称奖项名称奖项名称</view>
+				</view>
+				<view class="item">
+					<view class="img">
+						<view class="add" @click="add()">+</view>
+					</view>
+					<view class="text"></view>
+				</view>
+			</view>
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 当前煤矿编码
+				mine_code: "",
+				// 基础请求路径
+				base_url: " ",
+				token:"",
+				
+				active: 1,
+				info: {},
+				// 头像随机色
+				bgColor: [],
+			};
+		},
+		onLoad() {
+			// 设置头像
+			for (let i = 0; i < 2; i++) {
+				// 获取随机色
+				let r = parseInt(Math.random() * 256)
+				let g = parseInt(Math.random() * 256)
+				let b = parseInt(Math.random() * 256)
+
+				// ES6 字符串拼接
+				// this.bgColor = `rgba(${r},${g},${b},0.3)`
+				let color = "rgba(" + r + "," + g + "," + b + "," + 0.3 + ")"
+				// console.log(color)
+				this.bgColor.push(color)
+			}
+			
+			// 初始化当前煤矿编码
+			this.mine_code = uni.getStorageSync('mine_code')
+			
+			// 根据矿编码切换首页接口不同的请求基础路径
+			switch (this.mine_code) {
+				case 'ningdongyunying':
+					this.base_url = "http://ningdongyunying.nxjiewei.com:8011/api"
+					break;
+				case 'meihuajing':
+					this.base_url = "http://meihuajing.nxjiewei.com:8011/api"
+					break;
+				case 'zaoquan':
+					this.base_url = "http://zaoquan.nxjiewei.com:8011/api"
+					break;
+				default:
+					this.base_url = ""
+			}
+			
+			this.token = "Bearer " +  uni.getStorageSync('Authorization')
+			this.get_info()
+		},
+		methods: {
+			change_active(index) {
+				this.active = index
+			},
+			// 绑定手机
+			binding_phone() {
+				uni.navigateTo({
+					url: "../../my/setPhone/setPhone"
+				})
+			},
+			// 手写签名
+			go_signature() {
+				uni.navigateTo({
+					url: "../../my/signature/signature"
+				})
+			},
+			get_info() {
+				this.$api.user_getUinfo({
+					staff_num: uni.getStorageSync('user').staff_num
+				}).then((res) => {
+					console.log(res.data.data)
+					this.info = res.data.data
+				})
+			},
+			
+			add(){
+				uni.chooseImage({
+					count: 1,
+					success: (chooseImageRes) => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						console.log(chooseImageRes.tempFiles[0]);
+						console.log(tempFilePaths)
+						
+						
+						// uni.uploadFile({
+						// 	url: this.base_url + "/worksheet/design/up_images",
+						// 	header: {
+						// 		'Authorization': this.token
+						// 	},
+						// 	filePath: tempFilePaths[0],
+						// 	formData: {
+						// 		image: chooseImageRes.tempFiles[0]
+						// 	},
+						// 	success: (uploadFileRes) => {
+						// 		console.log(uploadFileRes);
+						// 		console.log(uploadFileRes.data);
+						// 		// console.log(JSON.parse(uploadFileRes.data));
+								
+								
+						// 	}
+						// })
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F5F8F8;
+	}
+
+	.top {
+		background-color: #FFFFFF;
+		width: 750rpx;
+		height: 440rpx;
+
+		background-image: url(./icon/top.png);
+		background-size: 100% 100%;
+		background-position: 0 -110rpx;
+		background-repeat: no-repeat;
+
+		.avatar {
+			padding-top: 34rpx;
+			text-align: center;
+
+			image {
+				width: 200rpx;
+				height: 200rpx;
+
+				border-radius: 50%;
+			}
+		}
+
+		.info {
+			margin-top: 20rpx;
+
+			.name {
+				text-align: center;
+				font-size: 40rpx;
+				font-weight: 700;
+			}
+
+			.box {
+				margin-top: 30rpx;
+				display: flex;
+				justify-content: space-around;
+
+				.item {
+					width: 250rpx;
+					text-align: center;
+
+					.label {
+						font-size: 30rpx;
+						color: #009FE8;
+						margin-bottom: 10rpx;
+					}
+
+					.text {
+						font-size: 32rpx;
+					}
+				}
+			}
+		}
+
+		margin-bottom: 20rpx;
+	}
+
+	.content {
+		background-color: #FFFFFF;
+
+		.box {
+			display: flex;
+			justify-content: space-around;
+			align-items: center;
+
+			border-bottom: 2rpx solid #F5F8F8;
+
+			.item {
+				height: 95rpx;
+				width: 230rpx;
+				text-align: center;
+
+				position: relative;
+
+				.text {
+					font-size: 34rpx;
+					line-height: 95rpx;
+				}
+
+				.line {
+					margin: -6rpx auto 0;
+					width: 80rpx;
+					height: 6rpx;
+					background-color: #009FE8;
+				}
+			}
+		}
+
+		.list_1 {
+			box-sizing: border-box;
+			padding: 0 50rpx;
+
+			.item {
+				border-bottom: 2rpx solid #F5F8F8;
+				height: 95rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-size: 32rpx;
+
+				.label {
+					width: 200rpx;
+					text-align: left;
+				}
+
+				.text {
+					width: 350rpx;
+					text-align: left;
+					color: #8e8e8e;
+
+				}
+
+				.right {
+					width: 100rpx;
+					text-align: right;
+				}
+			}
+
+		}
+
+		.list_2 {
+			box-sizing: border-box;
+			padding: 0 50rpx;
+
+			.item {
+				border-bottom: 2rpx solid #F5F8F8;
+				height: 95rpx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				font-size: 30rpx;
+				text-align: center;
+				color: #8e8e8e;
+
+				.text_1 {
+					width: 190rpx;
+				}
+
+				.text_2 {
+					width: 240rpx;
+
+				}
+
+				.text_3 {
+					width: 160rpx;
+				}
+			}
+
+			.item:first-child {
+				font-size: 32rpx;
+				color: #333;
+			}
+
+		}
+
+		.list_3 {
+			box-sizing: border-box;
+			padding: 50rpx;
+			
+			overflow: hidden;
+			
+			.item {
+				float: left;
+				margin-right: 25rpx;
+				margin-bottom: 30rpx;
+				
+				width: 200rpx;
+				text-align: center;
+				.img{
+					image{
+						width: 200rpx;
+						height: 140rpx;
+					}
+					
+					.add{
+						font-size: 110rpx;
+						color: #DCDCDC;
+						text-align: center;
+						height: 140rpx;
+						line-height: 140rpx;
+						background-color: #EEEEEE;
+					}
+				}
+				.text{
+					width: 180rpx;
+					font-size: 24rpx;
+					color: #8e8e8e;
+				}
+			}
+			.item:nth-child(3n){
+				margin-right: 0;
+			}
+		}
+	}
+</style>

pages/my/personal_information/personal_information.vue

@@ -1,119 +1,6 @@
 <template>
 	<view>
-		<view class="top">
-			<view class="avatar">
-				<image v-if="info.avatar" :src="info.avatar" mode="aspectFill"></image>
-				<view class="avatar" v-if="!info.avatar && !info" :style="{backgroundColor:bgColor[1]}">
-					{{info.name.split('').pop()}}
-				</view>
-			</view>
-			<view class="info">
-				<view class="name">{{info.name}}</view>
-				<view class="box">
-					<view class="item">
-						<view class="label">部门</view>
-						<view class="text">{{info.section_fullname}}</view>
-					</view>
-					<view class="item">
-						<view class="label">职务</view>
-						<view class="text">{{info.duty_num}}</view>
-					</view>
-					<view class="item">
-						<view class="label">员工编号</view>
-						<view class="text">{{info.staff_num}}</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<view class="content">
-			<view class="box">
-				<view class="item" @click="change_active(1)">
-					<view class="text" :style="{color:active == 1?'#333':'#8e8e8e'}">个人信息</view>
-					<view class="line" v-if="active == 1"></view>
-				</view>
-				<view class="item" @click="change_active(2)">
-					<view class="text" :style="{color:active == 2?'#333':'#8e8e8e'}">工作经历</view>
-					<view class="line" v-if="active == 2"></view>
-				</view>
-				<view class="item" @click="change_active(3)">
-					<view class="text" :style="{color:active == 3?'#333':'#8e8e8e'}">荣誉及证书</view>
-					<view class="line" v-if="active == 3"></view>
-				</view>
-			</view>
-
-
-			<!-- 个人信息 -->
-			<view class="list_1" v-if="active == 1">
-				<view class="item" @click="binding_phone()">
-					<view class="label">手机号</view>
-					<view class="text">12345678</view>
-					<view class="right">
-						<uni-icons type="arrowright" size="20" color="#999"></uni-icons>
-					</view>
-				</view>
-				<view class="item" @click="go_signature()">
-					<view class="label">手写签名</view>
-					<view class="text"> </view>
-					<view class="right">
-						<uni-icons type="arrowright" size="20" color="#999"></uni-icons>
-					</view>
-				</view>
-				<view class="item">
-					<view class="label">岗位分类</view>
-					<view class="text">{{info.job_classify}}</view>
-					<view class="right"></view>
-				</view>
-				<!-- <view class="item">
-					<view class="label">岗位</view>
-					<view class="text">{{info.position.title}}</view>
-					<view class="right"></view>
-				</view> -->
-				<view class="item">
-					<view class="label">民族</view>
-					<view class="text">{{info.nation}}</view>
-					<view class="right"></view>
-				</view>
-				<view class="item">
-					<view class="label">出生日期</view>
-					<view class="text">{{info.birthday}}</view>
-					<view class="right"></view>
-				</view>
-			</view>
-
-			<!-- 工作经历 -->
-			<view class="list_2" v-if="active == 2">
-				<view class="item">
-					<view class="text_1">任职时间</view>
-					<view class="text_2">工作单位</view>
-					<view class="text_3">职务</view>
-				</view>
-				<view class="item" v-for="item in 3">
-					<view class="text_1">2008-06-23至1010-05-14</view>
-					<view class="text_2">公司名称公司名称公司名称</view>
-					<view class="text_3">工程师</view>
-				</view>
-			</view>
-			<!-- 荣誉及证书 -->
-			<view class="list_3" v-if="active == 3">
-				<view class="item" v-for="item in 4">
-					<view class="img">
-						<image
-							src="https://cdn.colorhub.me/7X-46x4lrKMmT8Tyo5qNMRFN0p1R-nMEzlYx-XvdZiw/rs:auto:280:0:0/g:ce/bG9jYWw6Ly8vMTgv/NzUvOGFkNWU4NmZj/Mzc2NWJjYTBiYzAw/YTY1N2JiNWE5ZmMz/MjAyMTg3NS5qcGc.jpg"
-							mode="aspectFill"></image>
-					</view>
-					<view class="text">奖项名称奖项名称奖项名称</view>
-				</view>
-				<view class="item">
-					<view class="img">
-						<view class="add" @click="add()">+</view>
-					</view>
-					<view class="text"></view>
-				</view>
-			</view>
-		</view>
-
-
+		<web-view :src="href"></web-view>
 	</view>
 </template>
 
@@ -121,287 +8,16 @@
 	export default {
 		data() {
 			return {
-				// 当前煤矿编码
-				mine_code: "",
-				// 基础请求路径
-				base_url: " ",
-				
-				active: 1,
-				info: {},
-				// 头像随机色
-				bgColor: [],
-			};
-		},
-		onLoad() {
-			// 设置头像
-			for (let i = 0; i < 2; i++) {
-				// 获取随机色
-				let r = parseInt(Math.random() * 256)
-				let g = parseInt(Math.random() * 256)
-				let b = parseInt(Math.random() * 256)
-
-				// ES6 字符串拼接
-				// this.bgColor = `rgba(${r},${g},${b},0.3)`
-				let color = "rgba(" + r + "," + g + "," + b + "," + 0.3 + ")"
-				// console.log(color)
-				this.bgColor.push(color)
-			}
-			
-			// 初始化当前煤矿编码
-			this.mine_code = uni.getStorageSync('mine_code')
-			
-			// 根据矿编码切换首页接口不同的请求基础路径
-			switch (this.mine_code) {
-				case 'ningdongyunying':
-					this.base_url = "http://ningdongyunying.nxjiewei.com:8011/api"
-					break;
-				case 'meihuajing':
-					this.base_url = "http://meihuajing.nxjiewei.com:8011/api"
-					break;
-				case 'zaoquan':
-					this.base_url = "http://zaoquan.nxjiewei.com:8011/api"
-					break;
-				default:
-					this.base_url = ""
-			}
+				href: ""
 
-			this.get_info()
+			};
 		},
-		methods: {
-			change_active(index) {
-				this.active = index
-			},
-			// 绑定手机
-			binding_phone() {
-				uni.navigateTo({
-					url: "../../my/setPhone/setPhone"
-				})
-			},
-			// 手写签名
-			go_signature() {
-				uni.navigateTo({
-					url: "../../my/signature/signature"
-				})
-			},
-			get_info() {
-				this.$api.user_getUinfo({
-					staff_num: uni.getStorageSync('user').staff_num
-				}).then((res) => {
-					console.log(res.data.data)
-					this.info = res.data.data
-				})
-			},
-			
-			add(){
-				uni.chooseImage({
-					count: 1,
-					success: (chooseImageRes) => {
-						const tempFilePaths = chooseImageRes.tempFilePaths;
-						console.log(chooseImageRes.tempFiles[0]);
-				
-					}
-				})
-			}
+		onLoad(option) {
+			this.href = "http://webdevelop.nxjiewei.com/assets/html/zhks-quankuang/user_info?token=" + uni.getStorageSync('Authorization') + "&mine_code=" + uni.getStorageSync('mine_code') + "&staff_num=" + uni.getStorageSync('user').staff_num
 		}
 	}
 </script>
 
 <style lang="scss">
-	page {
-		background-color: #F5F8F8;
-	}
-
-	.top {
-		background-color: #FFFFFF;
-		width: 750rpx;
-		height: 440rpx;
-
-		background-image: url(./icon/top.png);
-		background-size: 100% 100%;
-		background-position: 0 -110rpx;
-		background-repeat: no-repeat;
-
-		.avatar {
-			padding-top: 34rpx;
-			text-align: center;
-
-			image {
-				width: 200rpx;
-				height: 200rpx;
-
-				border-radius: 50%;
-			}
-		}
-
-		.info {
-			margin-top: 20rpx;
-
-			.name {
-				text-align: center;
-				font-size: 40rpx;
-				font-weight: 700;
-			}
-
-			.box {
-				margin-top: 30rpx;
-				display: flex;
-				justify-content: space-around;
-
-				.item {
-					width: 250rpx;
-					text-align: center;
-
-					.label {
-						font-size: 30rpx;
-						color: #009FE8;
-						margin-bottom: 10rpx;
-					}
-
-					.text {
-						font-size: 32rpx;
-					}
-				}
-			}
-		}
-
-		margin-bottom: 20rpx;
-	}
-
-	.content {
-		background-color: #FFFFFF;
 
-		.box {
-			display: flex;
-			justify-content: space-around;
-			align-items: center;
-
-			border-bottom: 2rpx solid #F5F8F8;
-
-			.item {
-				height: 95rpx;
-				width: 230rpx;
-				text-align: center;
-
-				position: relative;
-
-				.text {
-					font-size: 34rpx;
-					line-height: 95rpx;
-				}
-
-				.line {
-					margin: -6rpx auto 0;
-					width: 80rpx;
-					height: 6rpx;
-					background-color: #009FE8;
-				}
-			}
-		}
-
-		.list_1 {
-			box-sizing: border-box;
-			padding: 0 50rpx;
-
-			.item {
-				border-bottom: 2rpx solid #F5F8F8;
-				height: 95rpx;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				font-size: 32rpx;
-
-				.label {
-					width: 200rpx;
-					text-align: left;
-				}
-
-				.text {
-					width: 350rpx;
-					text-align: left;
-					color: #8e8e8e;
-
-				}
-
-				.right {
-					width: 100rpx;
-					text-align: right;
-				}
-			}
-
-		}
-
-		.list_2 {
-			box-sizing: border-box;
-			padding: 0 50rpx;
-
-			.item {
-				border-bottom: 2rpx solid #F5F8F8;
-				height: 95rpx;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				font-size: 30rpx;
-				text-align: center;
-				color: #8e8e8e;
-
-				.text_1 {
-					width: 190rpx;
-				}
-
-				.text_2 {
-					width: 240rpx;
-
-				}
-
-				.text_3 {
-					width: 160rpx;
-				}
-			}
-
-			.item:first-child {
-				font-size: 32rpx;
-				color: #333;
-			}
-
-		}
-
-		.list_3 {
-			box-sizing: border-box;
-			padding: 50rpx;
-			
-			overflow: hidden;
-			
-			.item {
-				float: left;
-				margin-right: 25rpx;
-				margin-bottom: 30rpx;
-				
-				width: 200rpx;
-				text-align: center;
-				.img{
-					image{
-						width: 200rpx;
-						height: 140rpx;
-					}
-					
-					.add{
-						font-size: 110rpx;
-						color: #DCDCDC;
-						text-align: center;
-						height: 140rpx;
-						line-height: 140rpx;
-						background-color: #EEEEEE;
-					}
-				}
-				.text{
-					width: 180rpx;
-					font-size: 24rpx;
-					color: #8e8e8e;
-				}
-			}
-			.item:nth-child(3n){
-				margin-right: 0;
-			}
-		}
-	}
 </style>

pages/ningdongyunying/personnel_orientation/personnel_orientation.vue

@@ -1,31 +1,36 @@
 <template>
-	<view class="content">
-
-		<view class="charts-box">
-			<qiun-data-charts type="ring" :opts="ring_1" :chartData="chartData" background="none" />
+	<view>
+		<view class="top">
+			<image src="./icon/top.jpg" mode=""></image>
 		</view>
+		<view class="content">
 
-		<view class="list">
-			<view class="item" v-for="(item,index) in 3" :key="index">
-				<view class="title">红柳煤矿</view>
-				<view class="inner">
-					<view class="box">
-						<view class="name">井下人数</view>
-						<view class="num">286个</view>
-					</view>
-					<view class="box">
-						<view class="name">矿级领导</view>
-						<view class="num">1个</view>
+			<view class="charts-box">
+				<qiun-data-charts type="ring" :opts="ring_1" :chartData="chartData" background="none" />
+			</view>
+
+			<view class="list">
+				<view class="item" v-for="(item,index) in 3" :key="index">
+					<view class="title">红柳煤矿</view>
+					<view class="inner">
+						<view class="box">
+							<view class="name">井下人数</view>
+							<view class="num">286个</view>
+						</view>
+						<view class="box">
+							<view class="name">矿级领导</view>
+							<view class="num">1个</view>
+						</view>
+						<view class="box">
+							<view class="name">公司领导</view>
+							<view class="num">0个</view>
+						</view>
 					</view>
-					<view class="box">
-						<view class="name">公司领导</view>
-						<view class="num">0个</view>
+					<view class="right_arrow">
+						<view class="text">查看详情</view>
+						<view class="icon"></view>
 					</view>
 				</view>
-				<view class="right_arrow">
-					<view class="text">查看详情</view>
-					<view class="icon"></view>
-				</view>
 			</view>
 		</view>
 	</view>
@@ -93,6 +98,13 @@
 		background-color: #F1F1F1;
 	}
 
+	.top {
+		image {
+			width: 750rpx;
+			height: 360rpx;
+		}
+	}
+
 	/* 请根据需求修改图表容器尺寸，如果父容器没有高度图表则会显示异常 */
 	.charts-box {
 		width: 100%;

pages/ningdongyunying/production_statistics/production_statistics.vue

@@ -1,38 +1,45 @@
 <template>
-	<view class="content">
-		<view class="section">
-			<view class="title" style="text-align: center;">当日集团产量</view>
-			<view class="inner">
-				<p-production-statistics-section-1></p-production-statistics-section-1>
-			</view>
-		</view>
-		<view class="section">
-			<view class="title">当日产量分布</view>
-			<view class="inner">
-				<p-production-statistics-section-2></p-production-statistics-section-2>
-			</view>
+	<view>
+
+		<view class="top">
+			<image src="./img/top.jpg" mode=""></image>
 		</view>
-		<view class="section">
-			<view class="title">
-				<view class="text">
-					<view>周产量趋势</view>
-					<view class="right_text">单位： 吨</view>
+		<view class="content">
+
+			<view class="section">
+				<view class="title" style="text-align: center;">当日集团产量</view>
+				<view class="inner">
+					<p-production-statistics-section-1></p-production-statistics-section-1>
 				</view>
 			</view>
-			<view class="inner">
-				<p-production-statistics-section-3></p-production-statistics-section-3>
+			<view class="section">
+				<view class="title">当日产量分布</view>
+				<view class="inner">
+					<p-production-statistics-section-2></p-production-statistics-section-2>
+				</view>
 			</view>
-		</view>
-		<view class="section">
-			
-			<view class="title" style="border-bottom: 1px solid #eee;">
-				<view class="text">
-					<view>各矿产量</view>
-					<view class="right_text">单位： 吨</view>
+			<view class="section">
+				<view class="title">
+					<view class="text">
+						<view>周产量趋势</view>
+						<view class="right_text">单位： 吨</view>
+					</view>
+				</view>
+				<view class="inner">
+					<p-production-statistics-section-3></p-production-statistics-section-3>
 				</view>
 			</view>
-			<view class="inner">
-				<p-production-statistics-section-4></p-production-statistics-section-4>
+			<view class="section">
+
+				<view class="title" style="border-bottom: 1px solid #eee;">
+					<view class="text">
+						<view>各矿产量</view>
+						<view class="right_text">单位： 吨</view>
+					</view>
+				</view>
+				<view class="inner">
+					<p-production-statistics-section-4></p-production-statistics-section-4>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -42,51 +49,66 @@
 	export default {
 		data() {
 			return {
-				
+
 			};
 		}
 	}
 </script>
 
 <style lang="scss">
-	page{
+	page {
 		background-color: #009FE8;
 	}
-	.content{
-		width: 749rpx;
-		
+
+	.top {
+		image {
+			width: 750rpx;
+			height: 360rpx;
+		}
+	}
+
+
+	.content {
+		width: 750rpx;
+
 		box-sizing: border-box;
-		padding: 0 24rpx;
+		padding: 0 25rpx;
 	}
-	.section{
+
+
+	.section {
 		margin: 20rpx 0;
-		
+
 		width: 700rpx;
 		background-color: #FFFFFF;
 		border-radius: 8px;
-		.title{
+
+		.title {
 			font-size: 36rpx;
 			color: #1e1e1e;
 			font-weight: 700;
-			
+
 			box-sizing: border-box;
 			padding: 30rpx 0;
 			margin: 0 20rpx;
-			.text{
+
+			.text {
 				display: flex;
 				justify-content: space-between;
 				align-items: baseline;
-				.right_text{
+
+				.right_text {
 					font-size: 24rpx;
 					color: #9a9a9a;
 					font-weight: 400;
 				}
 			}
 		}
-		.inner{
+
+		.inner {
 			// min-height: 200px;
-			
-		
+
+
 		}
 	}
 </style>

pages/ningdongyunying/risk_precontrol/risk_precontrol.vue

@@ -1,45 +1,50 @@
 <template>
-	<view class="content">
-		<view class="list">
-			<view class="item" v-for="(item,index) in 6" :key="index" @click="open_draw()">
-				<view class="inner">
-					<view class="left">
-						<view class="name">汝其沟无烟煤分公司</view>
-						<view class="text">5条隐患信息</view>
-					</view>
-					<view class="right">
-						<view class="num">0.5分</view>
-						<view class="icon">
-							<uni-icons type="arrowright"></uni-icons>
+	<view>
+		<view class="top">
+			<image src="./img/top.jpg" mode=""></image>
+		</view>
+		<view class="content">
+			<view class="list">
+				<view class="item" v-for="(item,index) in 6" :key="index" @click="open_draw()">
+					<view class="inner">
+						<view class="left">
+							<view class="name">汝其沟无烟煤分公司</view>
+							<view class="text">5条隐患信息</view>
+						</view>
+						<view class="right">
+							<view class="num">0.5分</view>
+							<view class="icon">
+								<uni-icons type="arrowright"></uni-icons>
+							</view>
 						</view>
 					</view>
 				</view>
 			</view>
-		</view>
 
 
-		<!-- 弹出层 -->
-		<uni-drawer ref="draw" mode="right" :width="300">
-			<view class="drawer">
-				<view class="title">汝其沟无烟煤分公司</view>
-				<view class="container">
-					<view class="item" v-for="(item,index) in 4" :key="index" @click="go_detail()">
-						<view class="inner">
-							<view class="left">
-								<view class="name">白芨沟矿山救护队</view>
-								<view class="text">3条隐患信息</view>
-							</view>
-							<view class="right">
-								<view class="num">0.45分</view>
-								<view class="icon">
-									<uni-icons type="arrowright"></uni-icons>
+			<!-- 弹出层 -->
+			<uni-drawer ref="draw" mode="right" :width="300">
+				<view class="drawer">
+					<view class="title">汝其沟无烟煤分公司</view>
+					<view class="container">
+						<view class="item" v-for="(item,index) in 4" :key="index" @click="go_detail()">
+							<view class="inner">
+								<view class="left">
+									<view class="name">白芨沟矿山救护队</view>
+									<view class="text">3条隐患信息</view>
+								</view>
+								<view class="right">
+									<view class="num">0.45分</view>
+									<view class="icon">
+										<uni-icons type="arrowright"></uni-icons>
+									</view>
 								</view>
 							</view>
 						</view>
 					</view>
 				</view>
-			</view>
-		</uni-drawer>
+			</uni-drawer>
+		</view>
 	</view>
 </template>
 
@@ -54,9 +59,9 @@
 			open_draw() {
 				this.$refs.draw.open()
 			},
-			go_detail(){
+			go_detail() {
 				uni.navigateTo({
-					url:"detail/detail"
+					url: "detail/detail"
 				})
 			}
 		}
@@ -64,6 +69,12 @@
 </script>
 
 <style lang="scss">
+	.top {
+		image {
+			width: 750rpx;
+			height: 360rpx;
+		}
+	}
 	.content {
 		width: 749rpx;
 	}

pages/ningdongyunying/safety_monitoring/safety_monitoring.vue

@@ -1,5 +1,8 @@
 <template>
 	<view class="content">
+		<view class="top">
+			<image src="./img/top.jpg" mode=""></image>
+		</view>
 		<view class="canva">
 			<!-- <n-safety-monitoring-canva-1></n-safety-monitoring-canva-1> -->
 		</view>
@@ -35,7 +38,7 @@
 		methods:{
 			get_code(code){
 				// 切换煤矿
-				// console.log(code)
+				console.log(code)
 				this.mine_code = code
 				// 每次切换煤矿都让当前页初始化
 				this.page = 1
@@ -58,5 +61,11 @@
 	// 	padding: 24rpx;
 	// }
 	
+	.top{
+		image{
+			width: 750rpx;
+			height: 360rpx;
+		}
+	}
 	
 </style>

pages/origanization/communication/origanization/origanization.vue

@@ -14,9 +14,13 @@
 				<view class="icon">
 					<image src="./icon/title_icon.png" mode=""></image>
 				</view>
-				<view class="text">国家能源集团枣泉煤矿</view>
+				
+				<view class="text" v-if="mine_code == 'zaoquan'">国家能源集团枣泉煤矿</view>
+
+				<view class="text" v-if="mine_code == 'ningdongyunying'">国家能源集团宁东运营部</view>
+
 			</view>
-			
+
 			<view class="section" v-for="(item,index) in list" :key="index">
 				<view class="box">
 					<view class="item">
@@ -29,7 +33,7 @@
 							</view>
 							<view class="text">{{item.title}} （{{item.user_num}}）</view>
 						</view>
-						<view class="right">
+						<view class="right" @click="go_record(item.page_id)">
 							<uni-icons type="eye"></uni-icons>
 						</view>
 					</view>
@@ -50,30 +54,39 @@
 	export default {
 		data() {
 			return {
+				// 当前煤矿编码
+				mine_code: "",
+
 				// 部门列表
 				list: [
 
 				],
 				// 当前展开部门
 				active: 99999999,
-				
+
 				// 人员列表
-				user_list:[]
+				user_list: []
 			};
 		},
+		onLoad() {
+			// 初始化当前煤矿编码
+			this.mine_code = uni.getStorageSync('mine_code')
+			
+			this.get_section_getGroupList()
+		},
 		methods: {
 			// 搜索
-			go_search(){
+			go_search() {
 				uni.navigateTo({
-					url:"./search/search",
-					animationType:"fade-in",
-					animationDuration:200
+					url: "./search/search",
+					animationType: "fade-in",
+					animationDuration: 200
 				})
 			},
 			// 获取部门列表
 			get_section_getGroupList() {
 				uni.showLoading({
-					mask:true
+					mask: true
 				})
 				this.$api.section_getGroupList({
 
@@ -81,13 +94,24 @@
 					uni.hideLoading()
 					console.log(res)
 
-					this.list = res.data.data.group.leader.data.concat(res.data.data.group.office.data.concat(res
-						.data.data.group.basic.data.concat()))
+					console.log(this.mine_code)
+					
+						
+					if(this.mine_code == 'zaoquan'){
+						this.list = res.data.data.group.leader.data.concat(res.data.data.group.office.data.concat(res
+							.data.data.group.basic.data.concat()))
+					}
+					
+					if(this.mine_code == 'ningdongyunying'){
+						this.list = res.data.data.group.basic.data.concat(res.data.data.group.office.data.concat(res
+							.data.data.group.zongbu.data.concat(res.data.data.group.weiwaidanwei.data.concat())))
+					}
+					
 					// console.log(this.list)
 				})
 			},
-			
-			change_active(index,id) {
+
+			change_active(index, id) {
 				this.user_list = []
 				if (this.active == index) {
 					this.active = 99999999
@@ -97,21 +121,34 @@
 				}
 			},
 			// 获取当前部门人员
-			get_user_list(id){
+			get_user_list(id) {
 				uni.showLoading({
-					mask:true
+					mask: true
 				})
 				this.$api.user_list({
-					id:id
-				}).then((res)=>{
+					id: id
+				}).then((res) => {
 					uni.hideLoading()
 					console.log(res)
 					this.user_list = res.data.data
 				})
+			},
+
+			go_record(page_id) {
+				console.log(page_id)
+
+				if (page_id == null) {
+					uni.showToast({
+						icon: "none",
+						title: "该部门还未关联二维码"
+					})
+				} else {
+					uni.navigateTo({
+						url: "../../index/record/record?pageId=" + page_id + "&mine_code=" + uni.getStorageSync(
+							'mine_code'),
+					})
+				}
 			}
-		},
-		onLoad() {
-			this.get_section_getGroupList()
 		}
 	}
 </script>
@@ -174,75 +211,81 @@
 				font-weight: 700;
 			}
 		}
-		
-		.section{
+
+		.section {
 			box-sizing: border-box;
 			padding: 0 20rpx;
-			
-			.box{
-				
-				.item{
+
+			.box {
+
+				.item {
 					height: 110rpx;
 					display: flex;
 					align-items: center;
 					justify-content: space-between;
-					
+
 					margin-left: 20rpx;
 					border-bottom: 1rpx solid #F3F8F7;
-					
-					.left{
+
+					.left {
 						display: flex;
 						align-items: center;
-						.icon{
+
+						.icon {
 							line-height: 110rpx;
 							width: 90rpx;
 							text-align: center;
-							image{
+
+							image {
 								width: 24rpx;
 								height: 24rpx;
 							}
 						}
-						.text{
+
+						.text {
 							font-size: 32rpx;
 						}
 					}
-					.right{
+
+					.right {
 						line-height: 110rpx;
 						width: 90rpx;
 						text-align: center;
 					}
 				}
-				
-				.list{
-					.item{
+
+				.list {
+					.item {
 						height: 110rpx;
-						
+
 						display: flex;
 						justify-content: left;
 						align-items: center;
-						
+
 						margin-left: 108rpx;
 						border-bottom: 1rpx solid #F3F8F7;
-						.icon{
+
+						.icon {
 							width: 35rpx;
 							text-align: center;
 							line-height: 35rpx;
 							border-radius: 50%;
 							border: 1rpx solid #00A1E9;
-							
+
 							font-size: 24rpx;
 							color: #00A1E9;
 						}
-						.text{
+
+						.text {
 							margin-left: 18rpx;
 							font-size: 30rpx;
-							
+
 						}
 					}
 				}
-			
+
 			}
-			
+
 		}
 
 	}

pages/production/personnel_orientation/downhole_statistics/downhole_statistics.vue

@@ -12,7 +12,7 @@
 					</view>
 				</view>
 				<view class="box">
-					<view class="text">{{box_title}}</view>
+					<view class="text" v-if="box_title">{{box_title}}</view>
 					<view class="text">需下井次数: <text style="font-size: 40rpx; color: #F0AD4E;"> {{box_paln}} </text> 次
 					</view>
 					<view class="text">已下井次数: <text style="color: #3DA7FF;"> {{box_real}} </text> 次</view>
@@ -27,20 +27,22 @@
 			</view>
 
 		</view>
-		
+
 		<!-- 月份 -->
 		<view class="month_list">
 			<scroll-view scroll-x>
 				<view class="list">
-					<view class="item" v-for="(item,index) in month_list" :key="index" @click="change_month(item,index)">
-						<view class="name" :class="index==active?'active':''">{{item.year}}年{{item.month}}月{{item.times}}次</view>
+					<view class="item" v-for="(item,index) in month_list" :key="index"
+						@click="change_month(item,index)">
+						<view class="name" :class="index==active?'active':''">
+							{{item.year}}年{{item.month}}月{{item.times}}次</view>
 					</view>
 				</view>
 			</scroll-view>
-			
-			
+
+
 		</view>
-		
+
 		<!-- 下井记录 -->
 		<view class="info_list">
 			<view class="list">
@@ -50,7 +52,8 @@
 					<view class="text text_3">上井时间</view>
 					<view class="text text_4">下井时长</view>
 				</view>
-				<view class="item" v-for="(item,index) in info_list" :key="index" @click="go_people_track(item.date,item.downtime)">
+				<view class="item" v-for="(item,index) in info_list" :key="index"
+					@click="go_people_track(item.date,item.downtime)">
 					<view class="text text_1">
 						<view>{{item.date}}</view>
 						<view>{{item.week}}</view>
@@ -64,8 +67,8 @@
 				</view>
 			</view>
 		</view>
-		
-		
+
+
 
 
 
@@ -76,7 +79,7 @@
 	export default {
 		data() {
 			return {
-				mine:"",
+				mine: "",
 				// 用户信息
 				name: "",
 				depart_name: "",
@@ -86,14 +89,15 @@
 				people_num: 0,
 
 				// 下井统计
+				box_title: "",
 				box_paln: 0,
 				box_real: 0,
 
 
 				month_list: [],
-				info_list:[],
+				info_list: [],
 
-				active:0,
+				active: 0,
 
 
 				chartData: {
@@ -121,7 +125,18 @@
 			};
 		},
 		onLoad(option) {
-			// console.log(option)
+			console.log(option)
+
+			if (option.people_num == 'undefined' || option.people_num == 'null') {
+
+				uni.redirectTo({
+					url: "../../../workbench/downhole_statistics_user/downhole_statistics_user?depart_name=" +
+						option.depart_name + "&name=" + option.name + "&mine=" + option.mine
+				})
+
+				return
+			}
+
 			this.mine = option.mine
 
 			// 设置用户信息
@@ -144,20 +159,22 @@
 			}
 
 			this.get_personnel_downwell_monthlist_once()
-			
-			
+
+
 		},
 		methods: {
 			get_personnel_downwell_monthlist_once() {
 				this.$p_api.personnel_downwell_monthlist_once({
 					staff_num: this.people_num,
-					mine:this.mine
+					mine: this.mine
 				}).then((res) => {
 					console.log(res.data.data)
 					this.month_list = res.data.data
 
-					this.get_personnel_downwell_month_once(res.data.data[0].year, res.data.data[0].month, res.data.data[0].times)
-					this.get_personnel_downwell_month_info(res.data.data[0].year, res.data.data[0].month, res.data.data[0].times)
+					this.get_personnel_downwell_month_once(res.data.data[0].year, res.data.data[0].month, res.data
+						.data[0].times)
+					this.get_personnel_downwell_month_info(res.data.data[0].year, res.data.data[0].month, res.data
+						.data[0].times)
 				})
 			},
 			// 下井统计
@@ -166,46 +183,48 @@
 					month: year + '-' + month,
 					staff_num: this.people_num,
 					downtime: downtime,
-					mine:this.mine
+					mine: this.mine
 				}).then((res) => {
 					console.log(res.data.data)
 					this.box_paln = res.data.data.plan
 					this.box_real = res.data.data.real
 					this.box_title = res.data.data.date
-					
-					this.arcbar.subtitle.name = (((parseInt(this.box_real) / parseInt(this.box_paln)).toFixed(4))*100).toFixed(2) + '%'
+
+					this.arcbar.subtitle.name = (((parseInt(this.box_real) / parseInt(this.box_paln)).toFixed(4)) *
+						100).toFixed(2) + '%'
 					console.log(parseInt(this.box_real) / parseInt(this.box_paln))
 					this.chartData.series[0].data = (parseInt(this.box_real) / parseInt(this.box_paln)).toFixed(1)
 					console.log(this.chartData.series[0].data)
 				})
 			},
-			
+
 			// 下井记录
-			get_personnel_downwell_month_info(year, month, downtime){
+			get_personnel_downwell_month_info(year, month, downtime) {
 				this.$p_api.personnel_downwell_month_info({
 					month: year + '-' + month,
 					staff_num: this.people_num,
 					downtime: downtime,
-					mine:this.mine
+					mine: this.mine
 				}).then((res) => {
 					console.log(res.data.data)
 					this.info_list = res.data.data
 				})
 			},
-			
+
 			//切换月份
-			 change_month(item,index){
-				 console.log(item)
-				 this.active = index
-				 this.get_personnel_downwell_month_info(item.year, item.month, item.times)
-			 },
-			 
-			 // 下井轨迹
-			 go_people_track(date,time){
-			 	uni.navigateTo({
-			 		url:"../people_track/people_track?people_num="+this.people_num+"&time="+date+time+"&mine="+this.mine
-			 	})
-			 }
+			change_month(item, index) {
+				console.log(item)
+				this.active = index
+				this.get_personnel_downwell_month_info(item.year, item.month, item.times)
+			},
+
+			// 下井轨迹
+			go_people_track(date, time) {
+				uni.navigateTo({
+					url: "../people_track/people_track?people_num=" + this.people_num + "&time=" + date + time +
+						"&mine=" + this.mine
+				})
+			}
 		}
 	}
 </script>
@@ -214,6 +233,7 @@
 	page {
 		background-color: #f0f0f0;
 	}
+
 	.section_info {
 		display: flex;
 		justify-content: space-between;
@@ -270,9 +290,9 @@
 		.right {
 			margin-top: 120rpx;
 			width: 300rpx;
-			
-			
-			
+
+
+
 			/* 请根据需求修改图表容器尺寸，如果父容器没有高度图表则会显示异常 */
 			.charts-box {
 				width: 100%;
@@ -280,16 +300,19 @@
 			}
 		}
 	}
-	
-	
-	.month_list{
+
+
+	.month_list {
 		box-sizing: border-box;
 		padding: 20rpx;
-		.list{
+
+		.list {
 			display: flex;
-			.item{
+
+			.item {
 				margin-right: 20rpx;
-				.name{
+
+				.name {
 					box-sizing: border-box;
 					padding: 10rpx;
 					// background-color: #009FE8;
@@ -301,35 +324,39 @@
 					font-size: 32rpx;
 					border-radius: 15rpx;
 				}
-				.active{
+
+				.active {
 					background-color: #009FE8;
 					color: #fff;
 				}
 			}
-			
+
 		}
 	}
-	
-	.info_list{
+
+	.info_list {
 		background-color: #FFFFFF;
 		margin-bottom: 50rpx;
-		.list{
+
+		.list {
 			font-size: 32rpx;
-			.item{
+
+			.item {
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
-				
-				
+
+
 				border-bottom: 1rpx solid #f0f0f0;
-				
-				.text{
+
+				.text {
 					width: 187.5rpx;
 					text-align: center;
 					padding: 15rpx 0;
 				}
 			}
-			.item:first-child{
+
+			.item:first-child {
 				color: #009FE8;
 				border-bottom: 1rpx solid #009FE8;
 				line-height: 80rpx;

pages/tabbar/index/index.vue

@@ -8,7 +8,7 @@
 		<!-- 固定入口 -->
 		<t-i-icon :iconList="iconList" :mine_code="mine_code"></t-i-icon>
 		<!-- 常用功能 -->
-		<t-i-common v-if="mine_code != 'zaoquan'"></t-i-common>
+		<!-- <t-i-common></t-i-common> -->
 		<!-- 新闻列表 -->
 		<t-i-news :newsList="newsList" :mine_code="mine_code"></t-i-news>
 

pages/tabbar/origanization/origanization.vue

@@ -3,7 +3,11 @@
 		<!-- 组织架构 -->
 		<!-- 枣泉 -->
 		<view v-if="mine_code == 'zaoquan'">
-			<t-o-communication></t-o-communication>
+			<t-o-zaoquan></t-o-zaoquan>
+		</view>
+		
+		<view v-if="mine_code == 'ningdongyunying'">
+			<t-o-ningdongyunying></t-o-ningdongyunying>
 		</view>
 		
 	</view>

pages/tabbar/workbench/workbench.vue

@@ -6,6 +6,12 @@
 			<t-w-zaoquan :mine_code="mine_code"></t-w-zaoquan>
 		</view>
 		
+		<!-- 宁东运营 -->
+		<view v-if="mine_code == 'ningdongyunying'">
+			<!-- 有问题的组件 -->
+			<t-w-ningdongyunying :mine_code="mine_code"></t-w-ningdongyunying>
+		</view>
+		
 	</view>
 </template>
 

pages/workbench/downhole_statistics_user/downhole_statistics_user.vue

@@ -0,0 +1,108 @@
+<template>
+	<view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				mine: "",
+				// 用户信息
+				name: "",
+				depart_name: "",
+				// 用户id
+				people_num: 0,
+
+				// 重名人员 原始数据
+				list: [],
+
+				// 配置参数
+				user_list: []
+			};
+		},
+		onLoad(option) {
+			console.log(option)
+			this.mine = option.mine
+
+			// 设置用户信息
+			this.name = option.name
+			this.depart_name = option.depart_name
+
+			this.get_list()
+		},
+		methods: {
+			// 获取重名人员列表参数
+			get_list() {
+				this.$api.user_getPersonnelListByName({
+					name: this.name
+					// name: "王文新"
+				}).then((res) => {
+					console.log(res.data.data)
+
+					this.list = res.data.data
+					this.list.forEach((item, index) => {
+						this.user_list.push(item.name + '-' + item.department + '-' + item.job)
+					})
+					console.log(this.list)
+					console.log(this.user_list)
+
+					this.choose_user()
+				})
+			},
+
+			// 选择人员
+			choose_user() {
+				uni.showActionSheet({
+					itemList: this.user_list,
+					success: (res) => {
+						console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
+						console.log(this.list[res.tapIndex].people_code)
+
+						this.people_num = this.list[res.tapIndex].people_code
+
+						uni.showModal({
+							title: '提示',
+							content: '你选中的是：' + this.list[res.tapIndex].name + '-' + this.list[res
+									.tapIndex].department + '-' + this.list[res.tapIndex].job +
+								"；只能选择一次，是否确认",
+							success: (res) => {
+								if (res.confirm) {
+									console.log('用户点击确定');
+
+									this.$api.user_updateUserMessage({
+										people_code: this.people_num
+									}).then((res) => {
+										console.log(res)
+									})
+
+
+									uni.setStorageSync('people_code', this.people_num)
+
+									uni.redirectTo({
+										url: "../../production/personnel_orientation/downhole_statistics/downhole_statistics?people_num=" +
+											this.people_num + "&depart_name=" + this
+											.depart_name + "&name=" + this.name +
+											"&mine=" + this.mine
+									})
+								} else if (res.cancel) {
+									this.choose_user()
+									console.log('用户点击取消');
+								}
+							}
+						});
+
+					},
+					fail: function(res) {
+						console.log(res.errMsg);
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>