Просмотр исходного кода

交互升级:更新E信、枣泉、羊场湾、金家渠

tiandewen 3 лет назад
Родитель
Сommit
d2c2d96041
100 измененных файлов с 1753 добавлено и 94 удалено
  1. 18 5
      App.vue
  2. 9 0
      common/production-http/production-api.js
  3. 25 0
      common/set_base_url.js
  4. 48 0
      common/time.js
  5. 35 0
      common/vmeitime-http/api.js
  6. 2 2
      common/vmeitime-http/interface.js
  7. 9 4
      components/t-i-banner/t-i-banner.vue
  8. 8 7
      components/t-i-navbar/t-i-navbar.vue
  9. 1 1
      components/t-i-notice/t-i-notice.vue
  10. 4 4
      components/t-m-icon/t-m-icon.vue
  11. 4 0
      components/t-o-news-tab-1/t-o-news-tab-1.vue
  12. 4 0
      components/t-o-news-tab-2/t-o-news-tab-2.vue
  13. 2 2
      components/t-p-jinjiaqu/t-p-jinjiaqu.vue
  14. 2 2
      components/t-p-n-section-1/t-p-n-section-1.vue
  15. 28 15
      components/t-p-zaoquan/t-p-zaoquan.vue
  16. 3 3
      manifest.json
  17. 20 4
      pages.json
  18. 2 4
      pages/index/integral/integral.vue
  19. 1 1
      pages/production/personnel_orientation/downhole_statistics/downhole_statistics.vue
  20. BIN
      pages/production/statistical_analysis_table/icon/icon_1.png
  21. BIN
      pages/production/statistical_analysis_table/icon/icon_2.png
  22. BIN
      pages/production/statistical_analysis_table/icon/icon_3.png
  23. BIN
      pages/production/statistical_analysis_table/icon/icon_4.png
  24. BIN
      pages/production/statistical_analysis_table/icon/icon_5.png
  25. BIN
      pages/production/statistical_analysis_table/icon/icon_6.png
  26. BIN
      pages/production/statistical_analysis_table/icon/icon_7.png
  27. BIN
      pages/production/statistical_analysis_table/icon/icon_8.png
  28. BIN
      pages/production/statistical_analysis_table/meitan_cxl/icon/left.png
  29. BIN
      pages/production/statistical_analysis_table/meitan_cxl/icon/right.png
  30. BIN
      pages/production/statistical_analysis_table/meitan_cxl/icon/top.png
  31. 464 0
      pages/production/statistical_analysis_table/meitan_cxl/meitan_cxl.vue
  32. 143 0
      pages/production/statistical_analysis_table/statistical_analysis_table.vue
  33. 1 1
      pages/production/video_monitor/video_monitor.vue
  34. 62 15
      pages/tabbar/index/index.vue
  35. BIN
      pages/tabbar/my/icon/bg.png
  36. BIN
      pages/tabbar/my/icon/icon_1.png
  37. BIN
      pages/tabbar/my/icon/icon_2.png
  38. BIN
      pages/tabbar/my/icon/icon_3.png
  39. BIN
      pages/tabbar/my/icon/icon_4.png
  40. BIN
      pages/tabbar/my/icon/icon_5.png
  41. BIN
      pages/tabbar/my/icon/icon_6.png
  42. BIN
      pages/tabbar/my/icon/icon_7.png
  43. BIN
      pages/tabbar/my/icon/section_1.png
  44. BIN
      pages/tabbar/my/icon/section_2_inner_1.png
  45. BIN
      pages/tabbar/my/icon/section_2_inner_2.png
  46. BIN
      pages/tabbar/my/icon/section_3.png
  47. BIN
      pages/tabbar/my/icon/time.png
  48. 52 0
      pages/tabbar/my/my - 旧版个人中心.vue
  49. 791 15
      pages/tabbar/my/my.vue
  50. 2 1
      pages/workbench/downhole_statistics_user/downhole_statistics_user.vue
  51. 5 0
      uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
  52. 2 2
      unpackage/dist/build/app-plus/app-config-service.js
  53. 2 2
      unpackage/dist/build/app-plus/app-service.js
  54. 1 1
      unpackage/dist/build/app-plus/app-view.js
  55. BIN
      unpackage/dist/build/app-plus/components/t-i-navbar/icon/bg_img.jpg
  56. BIN
      unpackage/dist/build/app-plus/components/t-i-navbar/icon/ningdongyunying.png
  57. BIN
      unpackage/dist/build/app-plus/components/t-i-notice/icon/bg_img.jpg
  58. BIN
      unpackage/dist/build/app-plus/components/t-m-icon/icon/fuwudianhua.png
  59. BIN
      unpackage/dist/build/app-plus/components/t-m-icon/icon/gengxin.png
  60. BIN
      unpackage/dist/build/app-plus/components/t-m-icon/icon/jianyifankui.png
  61. BIN
      unpackage/dist/build/app-plus/components/t-m-icon/icon/qingchu.png
  62. BIN
      unpackage/dist/build/app-plus/components/t-m-icon/icon/shouxieqianming.png
  63. BIN
      unpackage/dist/build/app-plus/components/t-m-icon/icon/xiugaimima.png
  64. BIN
      unpackage/dist/build/app-plus/components/t-m-icon/icon/yunpan.png
  65. BIN
      unpackage/dist/build/app-plus/components/t-m-info/icon/tip.png
  66. BIN
      unpackage/dist/build/app-plus/components/t-m-list/icon/list_2.png
  67. BIN
      unpackage/dist/build/app-plus/components/t-m-list/icon/list_3.png
  68. 1 1
      unpackage/dist/build/app-plus/manifest.json
  69. BIN
      unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/icon/icon_1.png
  70. BIN
      unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/icon/icon_2.png
  71. BIN
      unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/icon/icon_3.png
  72. BIN
      unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/icon/icon_4.png
  73. BIN
      unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/icon/icon_5.png
  74. BIN
      unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/icon/icon_6.png
  75. BIN
      unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/icon/icon_7.png
  76. BIN
      unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/icon/icon_8.png
  77. BIN
      unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/meitan_cxl/icon/left.png
  78. BIN
      unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/meitan_cxl/icon/right.png
  79. BIN
      unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/meitan_cxl/icon/top.png
  80. BIN
      unpackage/dist/build/app-plus/pages/tabbar/my/icon/bg.png
  81. BIN
      unpackage/dist/build/app-plus/pages/tabbar/my/icon/icon_1.png
  82. BIN
      unpackage/dist/build/app-plus/pages/tabbar/my/icon/icon_2.png
  83. BIN
      unpackage/dist/build/app-plus/pages/tabbar/my/icon/icon_3.png
  84. BIN
      unpackage/dist/build/app-plus/pages/tabbar/my/icon/icon_4.png
  85. BIN
      unpackage/dist/build/app-plus/pages/tabbar/my/icon/icon_5.png
  86. BIN
      unpackage/dist/build/app-plus/pages/tabbar/my/icon/icon_6.png
  87. BIN
      unpackage/dist/build/app-plus/pages/tabbar/my/icon/icon_7.png
  88. BIN
      unpackage/dist/build/app-plus/pages/tabbar/my/icon/section_1.png
  89. BIN
      unpackage/dist/build/app-plus/pages/tabbar/my/icon/section_2_inner_1.png
  90. BIN
      unpackage/dist/build/app-plus/pages/tabbar/my/icon/section_2_inner_2.png
  91. BIN
      unpackage/dist/build/app-plus/pages/tabbar/my/icon/section_3.png
  92. BIN
      unpackage/dist/build/app-plus/pages/tabbar/my/icon/time.png
  93. 2 2
      unpackage/dist/build/h5/index.html
  94. BIN
      unpackage/dist/build/h5/static/img/bg.9b9b84f0.png
  95. BIN
      unpackage/dist/build/h5/static/img/bg.a3f4a318.png
  96. BIN
      unpackage/dist/build/h5/static/img/bg_img.aba8fc13.jpg
  97. BIN
      unpackage/dist/build/h5/static/img/btn.2cd6a501.png
  98. BIN
      unpackage/dist/build/h5/static/img/fuwudianhua.d0cbf871.png
  99. BIN
      unpackage/dist/build/h5/static/img/gengxin.329f9068.png
  100. 0 0
      unpackage/dist/build/h5/static/img/icon_1.d5972ce4.png

+ 18 - 5
App.vue

@@ -1,26 +1,39 @@
 <script>
+	import time from "@/common/time.js"
+
 	export default {
 		onLaunch: function() {
 			console.log('App Launch')
 			// 启动初始化
 
 			// 煤矿鉴别-名称
-			uni.setStorageSync('mine_code', 'ningdongyunying');
+			// uni.setStorageSync('mine_code', 'ningdongyunying');
 			// uni.setStorageSync('mine_code', 'shicaocun');
 			// uni.setStorageSync('mine_code', 'meihuajing');
-			// uni.setStorageSync('mine_code', 'zaoquan');
+			uni.setStorageSync('mine_code', 'zaoquan');
 			// uni.setStorageSync('mine_code', 'qingshuiying');
 			// uni.setStorageSync('mine_code', 'wuyegongsi');
 			// uni.setStorageSync('mine_code', 'jinjiaqu');
 			// uni.setStorageSync('mine_code', 'yangchangwan');
-			
-			
+
+
 		},
 		onShow: function() {
 			console.log('App Show')
+
+			uni.setStorageSync('onShow', new Date().format("yyyy-MM-dd h:m"))
+
 		},
 		onHide: function() {
 			console.log('App Hide')
+
+			this.$api.user_recordDuration({
+				start_date: uni.getStorageSync('onShow'),
+				end_date: new Date().format("yyyy-MM-dd h:m")
+			}).then((res) => {
+				// console.log(res)
+			})
+
 		}
 	}
 </script>
@@ -34,7 +47,7 @@
 
 	page {
 		// font-family: $tdw-base-font;
-		
+
 	}
 
 	.status_bar {

+ 9 - 0
common/production-http/production-api.js

@@ -406,3 +406,12 @@ export const messageUpdateStatus = (data) => {
 		data,
 	})
 }
+
+// 个人中心 下井统计
+export const peopleTotalNum = (data) => {
+	return http.request({
+		method: "POST",
+		url: '/personnel/people/peopleTotalNum',
+		data,
+	})
+}

+ 25 - 0
common/set_base_url.js

@@ -58,4 +58,29 @@ export const set_appName = (mine_code) => {
 		default:
 			return ""
 	}
+}
+
+export const set_mine = (mine_code) => {
+	switch (mine_code) {
+		case 'ningdongyunying':
+			return "E信管理"
+			break;
+		case 'zaoquan':
+			return "640181B0011010037723"
+			break;
+		case 'yangchangwan':
+			return "640181B0011010030750,640181B0011010032422"
+			break;
+		case 'qingshuiying':
+			return "智慧清水营"
+			break;
+		case 'wuyegongsi':
+			return "智慧物业"
+			break;
+		case 'jinjiaqu':
+			return "640323B0011010019259"
+			break;
+		default:
+			return ""
+	}
 }

+ 48 - 0
common/time.js

@@ -38,3 +38,51 @@ export const getNextDate = (date, day)=> {
 }
 
 // getNextDate("2018-09-27",10)
+
+
+// 计算两个日期时间差,天 小时 分 秒格式
+export const diffTime = (startDate,endDate)=> { 
+    startDate= new Date(startDate);
+    endDate = new Date(endDate);
+    var diff=endDate.getTime() - startDate.getTime();//时间差的毫秒数 
+   
+    //计算出相差天数 
+    var days=Math.floor(diff/(24*3600*1000)); 
+        
+    //计算出小时数 
+    var leave1=diff%(24*3600*1000);    //计算天数后剩余的毫秒数 
+    var hours=Math.floor(leave1/(3600*1000)); 
+    //计算相差分钟数 
+    var leave2=leave1%(3600*1000);        //计算小时数后剩余的毫秒数 
+    var minutes=Math.floor(leave2/(60*1000)); 
+        
+    //计算相差秒数 
+    var leave3=leave2%(60*1000);      //计算分钟数后剩余的毫秒数 
+    var seconds=Math.round(leave3/1000); 
+       
+    // var returnStr = seconds + "秒"; 
+    // if(minutes>0) { 
+    //     returnStr = minutes + "分" + returnStr; 
+    // } 
+    // if(hours>0) { 
+    //     returnStr = hours + "小时" + returnStr; 
+    // } 
+    // if(days>0) { 
+    //     returnStr = days + "天" + returnStr; 
+    // } 
+    // return returnStr; 
+	
+	var returnStr = seconds + " ";
+	if(minutes >= 0) { 
+	    returnStr = minutes + " " + returnStr; 
+	} 
+	if(hours >= 0) { 
+	    returnStr = hours + " " + returnStr; 
+	} 
+	if(days >= 0) { 
+	    returnStr = days + " " + returnStr; 
+	} 
+	return returnStr; 
+}     
+
+// var diffTimeShow = diffTime('2017-03-02 09:10','2017-03-17 04:10');

+ 35 - 0
common/vmeitime-http/api.js

@@ -739,4 +739,39 @@ export const notify_getNotifyOne = (data) => {
 		url: '/notify/getNotifyOne',
 		data,
 	})
+}
+
+// 记录APP使用时长
+export const user_recordDuration = (data) => {
+	return http.request({
+		method: "POST",
+		url: '/user/recordDuration',
+		data,
+	})
+}
+// 查询APP使用时长及次数
+export const user_selectRecordDuration = (data) => {
+	return http.request({
+		method: "POST",
+		url: '/user/selectRecordDuration',
+		data,
+	})
+}
+// 最近使用流程查询
+export const workflow_recently_used = (data) => {
+	return http.request({
+		method: "POST",
+		url: '/workflow/recently_used',
+		data,
+	})
+}
+
+
+// 生产数据 数据分析
+export const mtcxy_getMTYPHData = (data) => {
+	return http.request({
+		method: "POST",
+		url: '/mtcxy/getMTYPHData',
+		data,
+	})
 }

+ 2 - 2
common/vmeitime-http/interface.js

@@ -34,8 +34,8 @@ http.delete('user/1').then((res)=>{
 export default {
 	config: {
 		// baseUrl: "http://colliery.nxjiewei.com/api",
-		baseUrl: "http://ningdongyunying.nxjiewei.com:8011/api",
-		// baseUrl: "http://zaoquan.nxjiewei.com:8011/api",
+		// baseUrl: "http://ningdongyunying.nxjiewei.com:8011/api",
+		baseUrl: "http://zaoquan.nxjiewei.com:8011/api",
 		// baseUrl: "http://qingshuiying.nxjiewei.com:8011/api",
 		// baseUrl: "http://wuyegongsi.nxjiewei.com:8011/api",
 		// baseUrl: "http://jinjiaqu.nxjiewei.com:8011/api",

+ 9 - 4
components/t-i-banner/t-i-banner.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="banner">
-			<swiper class="box" autoplay circular>
+			<swiper class="box" autoplay circular @animationfinish="animationfinish">
 				<swiper-item v-for="(item,index) in banner" :key="item.id" @click="go_link(item.jumpURL)">
 					<view class="item">
 						<view class="img">
@@ -65,6 +65,9 @@
 				}
 
 				
+			},
+			animationfinish($event){
+				this.$emit('change_top_bg_color_img',$event.detail.current)
 			}
 		}
 	}
@@ -80,10 +83,12 @@
 			.item{
 				width: 750rpx;
 				.img{
-					
+					text-align: center;
 					image{
-						width: 750rpx;
-						height: 500rpx;
+						width: 700rpx;
+						height: 485rpx;
+						border-radius: 20rpx;
+						
 					}
 				}
 				.title{

+ 8 - 7
components/t-i-navbar/t-i-navbar.vue

@@ -1,12 +1,12 @@
 <template>
 	<view>
-		<view class="content">
+		<view class="content" :style="{backgroundColor:navbar_bg_color}">
 			<view class="status_bar">
 				<!-- 这里是状态栏 -->
 			</view>
 
 			<view class="navbar">
-				<view class="left" @click="switch_kuang()">
+				<!-- <view class="left" @click="switch_kuang()">
 					<image v-if="mine_code == 'ningdongyunying'" src="./icon/ningdongyunying.png" mode=""></image>
 					<image v-if="mine_code == 'zaoquan'" src="./icon/zaoquan.png" mode=""></image>
 					<image v-if="mine_code == 'yangchangwan'" src="@/static/switch-kuang/yangchangwan.png" mode=""></image>
@@ -17,8 +17,8 @@
 					<image v-if="mine_code == 'wuyegongsi'" src="@/static/switch-kuang/wuyegongsi.png" mode=""></image>
 					<image v-if="mine_code == 'jinjiaqu'" src="@/static/switch-kuang/jinjiaqu.png" mode=""></image>
 					<uni-icons type="arrowdown" color="#fff"></uni-icons>
-				</view>
-				<!-- <view class="left">
+				</view> -->
+				<view class="left">
 					<image v-if="mine_code == 'zaoquan'" src="./icon/zaoquan.png" mode=""></image>
 					<image v-if="mine_code == 'yangchangwan'" src="@/static/switch-kuang/yangchangwan.png" mode=""></image>
 					<image v-if="mine_code == 'meihuajing'" src="@/static/switch-kuang/meihuajing.png" mode=""></image>
@@ -27,7 +27,7 @@
 					<image v-if="mine_code == 'qingshuiying'" src="@/static/switch-kuang/qingshuiying.png" mode=""></image>
 					<image v-if="mine_code == 'wuyegongsi'" src="@/static/switch-kuang/wuyegongsi.png" mode=""></image>
 					<image v-if="mine_code == 'jinjiaqu'" src="@/static/switch-kuang/jinjiaqu.png" mode=""></image>
-				</view> -->
+				</view>
 				<view class="search" v-if="mine_code != 'qingshuiying' && mine_code != 'wuyegongsi'">
 					<view class="box">
 						<view class="left" @click="go_search()">
@@ -71,7 +71,8 @@
 	export default {
 		name: "t-i-navbar",
 		props: [
-			"mine_code"
+			"mine_code",
+			"navbar_bg_color"
 		],
 		data() {
 			return {
@@ -191,7 +192,7 @@
 
 		width: 750rpx;
 
-		background-image: url(./icon/bg_img.jpg);
+		// background-image: url(./icon/bg_img.jpg);
 		background-size: 750rpx 334rpx;
 		background-repeat: no-repeat;
 	}

+ 1 - 1
components/t-i-notice/t-i-notice.vue

@@ -139,7 +139,7 @@
 		width: 750rpx;
 		height: 244rpx;
 
-		background-image: url(./icon/bg_img.jpg);
+		// background-image: url(./icon/bg_img.jpg);
 		background-size: 750rpx 334rpx;
 		background-repeat: no-repeat;
 		background-position: bottom;

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

@@ -7,13 +7,13 @@
 				</view>
 				<view class="name">服务电话</view>
 			</view>
-			<!-- <view class="item" @click="go_m_message_reminder()">
+			<view class="item" @click="go_m_message_reminder()">
 				<view class="icon">
 					<image src="./icon/xiaoxi.png" mode=""></image>
 				</view>
 				<view class="name">消息提醒</view>
 			</view>
-			<view class="item" @click="go_business_audit()">
+			<!-- <view class="item" @click="go_business_audit()">
 				<view class="icon">
 					<image src="./icon/gongdanshenhe.png" mode=""></image>
 				</view>
@@ -24,13 +24,13 @@
 					<image src="./icon/wodegongdan.png" mode=""></image>
 				</view>
 				<view class="name">我的工单</view>
-			</view>
+			</view> -->
 			<view class="item" @click="go_user_manual()">
 				<view class="icon">
 					<image src="./icon/shiyongshouce.png" mode=""></image>
 				</view>
 				<view class="name">使用手册</view>
-			</view> -->
+			</view>
 			<view class="item" @click="go_signature()">
 				<view class="icon">
 					<image src="./icon/shouxieqianming.png" mode=""></image>

+ 4 - 0
components/t-o-news-tab-1/t-o-news-tab-1.vue

@@ -404,6 +404,10 @@
 				line-height: 120rpx;
 				font-size: 40rpx;
 				font-weight: 700;
+				
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
 			}
 
 			.btn {

+ 4 - 0
components/t-o-news-tab-2/t-o-news-tab-2.vue

@@ -178,6 +178,10 @@
 					line-height: 120rpx;
 					font-size: 40rpx;
 					font-weight: 700;
+					
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
 				}
 
 				.tip {

+ 2 - 2
components/t-p-jinjiaqu/t-p-jinjiaqu.vue

@@ -27,14 +27,14 @@
 				<view class="tip">工业视频</view>
 			</view>
 		</view>
-		<view class="item_box" style="background-color: #5175E3;" @click="go_shangtang()">
+		<!-- <view class="item_box" style="background-color: #5175E3;" @click="go_shangtang()">
 			<view class="img">
 				<image src="../t-p-icon/icon_4.png" mode=""></image>
 			</view>
 			<view class="text">
 				<view class="name">视频分析</view>
 			</view>
-		</view>
+		</view> -->
 	</view>
 </template>
 

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

@@ -108,14 +108,14 @@
 				<view class="tip">容知设备监控</view>
 			</view>
 		</view>
-		<view class="item_box" style="background-color: #5175E3;" @click="go_shangtang()">
+		<!-- <view class="item_box" style="background-color: #5175E3;" @click="go_shangtang()">
 			<view class="img">
 				<image src="../t-p-icon/icon_4.png" mode=""></image>
 			</view>
 			<view class="text">
 				<view class="name">视频分析</view>
 			</view>
-		</view>
+		</view> -->
 	</view>
 </template>
 

+ 28 - 15
components/t-p-zaoquan/t-p-zaoquan.vue

@@ -36,8 +36,7 @@
 				<view class="tip">工业视频</view>
 			</view>
 		</view>
-		<view class="item_box" style="background-color: #D3D5D8;"
-			@click="go_power_monitoring()">
+		<view class="item_box" style="background-color:#C883BF;" @click="go_power_monitoring()">
 			<view class="img">
 				<image src="../t-p-icon/icon_7.png" mode=""></image>
 			</view>
@@ -46,8 +45,7 @@
 				<view class="tip"></view>
 			</view>
 		</view>
-		<view class="item_box" style="background-color: #31B3F7;"
-			@click="go_mine_water_treatment()">
+		<view class="item_box" style="background-color: #31B3F7;" @click="go_mine_water_treatment()">
 			<view class="img">
 				<image src="../t-p-icon/icon_11.png" mode=""></image>
 			</view>
@@ -56,8 +54,7 @@
 				<view class="tip"></view>
 			</view>
 		</view>
-		<view class="item_box" style="background-color: #9CE2A6;"
-			@click="go_zdhxt('tfgl')">
+		<view class="item_box" style="background-color: #54CC65" @click="go_zdhxt('tfgl')">
 			<view class="img">
 				<image src="../t-p-icon/icon_5.png" mode=""></image>
 			</view>
@@ -66,8 +63,7 @@
 				<view class="tip"></view>
 			</view>
 		</view>
-		<view class="item_box" style="background-color: #2873FF;"
-			@click="go_zdhxt('psxt')">
+		<view class="item_box" style="background-color: #638BD5;" @click="go_zdhxt('psxt')">
 			<view class="img">
 				<image src="../t-p-icon/icon_9.png" mode=""></image>
 			</view>
@@ -76,7 +72,16 @@
 				<view class="tip"></view>
 			</view>
 		</view>
-		
+		<view class="item_box" style="background-color: #A3A2E4;" @click="go_table()">
+			<view class="img">
+				<image src="../t-p-icon/icon_1.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">数据分析</view>
+				<view class="tip"></view>
+			</view>
+		</view>
+
 	</view>
 </template>
 
@@ -115,9 +120,9 @@
 				// uni.navigateTo({
 				// 	url: "../../production/zidonghua/zidonghua?url=" + zdhxt
 				// })
-				
+
 				uni.navigateTo({
-					url:"../../production/zaoquan/zidonghua_list/zidonghua_list?zdhxt=" + zdhxt
+					url: "../../production/zaoquan/zidonghua_list/zidonghua_list?zdhxt=" + zdhxt
 				})
 			},
 			// 生产报表
@@ -146,15 +151,23 @@
 				})
 			},
 			// 电力监控
-			go_power_monitoring(){
+			go_power_monitoring() {
 				uni.navigateTo({
 					url: "../../production/zaoquan/power_monitoring/power_monitoring"
 				})
 			},
 			// 矿井水处理
-			go_mine_water_treatment(){
+			go_mine_water_treatment() {
+				uni.navigateTo({
+					url: "../../production/zaoquan/mine_water_treatment/mine_water_treatment?mine_code=" + this
+						.mine_code
+				})
+			},
+			
+			// 数据分析
+			go_table(){
 				uni.navigateTo({
-					url: "../../production/zaoquan/mine_water_treatment/mine_water_treatment?mine_code=" + this.mine_code
+					url:"../../production/statistical_analysis_table/statistical_analysis_table"
 				})
 			}
 		}
@@ -183,7 +196,7 @@
 				box-sizing: border-box;
 				padding-top: 40rpx;
 				text-align: center;
-				
+
 				image {
 					width: 140rpx;
 					height: 140rpx;

+ 3 - 3
manifest.json

@@ -1,8 +1,8 @@
 {
-    "name" : "E信管理(新)",
-    "appid" : "__UNI__0C12F60",
+    "name" : "智慧枣泉(新)",
+    "appid" : "__UNI__4B520D3",
     "description" : "",
-    "versionName" : "1.0.9",
+    "versionName" : "1.0.8",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */

+ 20 - 4
pages.json

@@ -14,9 +14,9 @@
 
 			"path": "pages/tabbar/origanization/origanization",
 			"style": {
-				// "navigationBarTitleText": "通讯录"
+				"navigationBarTitleText": "通讯录"
 				// 宁东运营 显示消息
-				"navigationBarTitleText": "消息"
+				// "navigationBarTitleText": "消息"
 			}
 
 		}, {
@@ -634,6 +634,22 @@
             }
             
         }
+        ,{
+            "path" : "pages/production/statistical_analysis_table/statistical_analysis_table",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "数据分析"
+            }
+            
+        }
+        ,{
+            "path" : "pages/production/statistical_analysis_table/meitan_cxl/meitan_cxl",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "煤炭产销量"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
@@ -651,8 +667,8 @@
 			},
 			{
 
-				// "text": "通讯录",
-				"text": "消息",
+				"text": "通讯录",
+				// "text": "消息",
 				"pagePath": "pages/tabbar/origanization/origanization",
 				"iconPath": "static/tabbar/origanization.png",
 				"selectedIconPath": "static/tabbar/origanization_active.png"

+ 2 - 4
pages/index/integral/integral.vue

@@ -56,7 +56,7 @@
 				this.$api.staff_integral_query({
 					staff_num: uni.getStorageSync('user').staff_num
 				}).then((res) => {
-					console.log(res)
+					// console.log(res)
 					
 					this.total = res.data.content.data.integral_sum
 				})
@@ -67,9 +67,7 @@
 					staff_num: uni.getStorageSync('user').staff_num,
 					integral_type: 1
 				}).then((res)=>{
-					console.log(res.data.content.data)
-					
-					
+					// console.log(res.data.content.data)
 					
 					this.is_finish = res.data.content.data.is_finish
 				})

+ 1 - 1
pages/production/personnel_orientation/downhole_statistics/downhole_statistics.vue

@@ -127,7 +127,7 @@
 		onLoad(option) {
 			console.log(option)
 
-			if (option.people_num == 'undefined' || option.people_num == 'null') {
+			if (option.people_num == 'undefined' || option.people_num == 'null' || option.people_num == "") {
 
 				uni.redirectTo({
 					url: "../../../workbench/downhole_statistics_user/downhole_statistics_user?depart_name=" +

BIN
pages/production/statistical_analysis_table/icon/icon_1.png


BIN
pages/production/statistical_analysis_table/icon/icon_2.png


BIN
pages/production/statistical_analysis_table/icon/icon_3.png


BIN
pages/production/statistical_analysis_table/icon/icon_4.png


BIN
pages/production/statistical_analysis_table/icon/icon_5.png


BIN
pages/production/statistical_analysis_table/icon/icon_6.png


BIN
pages/production/statistical_analysis_table/icon/icon_7.png


BIN
pages/production/statistical_analysis_table/icon/icon_8.png


BIN
pages/production/statistical_analysis_table/meitan_cxl/icon/left.png


BIN
pages/production/statistical_analysis_table/meitan_cxl/icon/right.png


BIN
pages/production/statistical_analysis_table/meitan_cxl/icon/top.png


+ 464 - 0
pages/production/statistical_analysis_table/meitan_cxl/meitan_cxl.vue

@@ -0,0 +1,464 @@
+<template>
+	<view>
+		<!-- 头图 -->
+		<view class="top">
+			<image src="./icon/top.png" mode="aspectFit"></image>
+		</view>
+		<!-- 时间切换 -->
+		<view class="time">
+			<view class="icon" @click="change_time('-')">
+				<image src="./icon/left.png" mode="aspectFit"></image>
+			</view>
+			<view class="text">{{year}}年{{month}}月</view>
+			<view class="icon" @click="change_time('+')">
+				<image src="./icon/right.png" mode="aspectFit"></image>
+			</view>
+		</view>
+
+		<!-- 表格区域 -->
+		<view class="table_box" v-if="data != ''">
+			<view class="item">
+				<view class="title">煤矿月平衡比对表(吨)</view>
+				<view class="box">
+					<uni-table emptyText="暂无更多数据">
+						<uni-tr>
+							<uni-th align="center"></uni-th>
+							<uni-th align="center" class="lable" v-for="(item,index) in data.yphdb.rq" :key="index">
+								{{item}}日</uni-th>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">加工原煤</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.yphdb.jgym" :key="index">{{item}}
+							</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">皮带秤合计</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.yphdb.pdc" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">入洗量</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.yphdb.rxl" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">产品产量</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.yphdb.cpcl" :key="index">{{item}}
+							</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">煤种合计量</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.yphdb.mzhj" :key="index">{{item}}
+							</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">比对平衡</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.yphdb.bdph" :key="index">{{item}}
+							</uni-td>
+						</uni-tr>
+					</uni-table>
+				</view>
+			</view>
+
+			<view class="item">
+				<view class="title">块煤</view>
+				<view class="box">
+					<uni-table emptyText="暂无更多数据">
+						<uni-tr>
+							<uni-th align="center"></uni-th>
+							<uni-th align="center"></uni-th>
+							<uni-th align="center" class="lable" v-for="(item,index) in data.km.rq" :key="index">
+								{{item}}日</uni-th>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" width="20" class="lable"></uni-td>
+							<uni-td align="center" width="80" class="lable">混煤(501)</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.km.hm501" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable" style="border-bottom: none;"></uni-td>
+							<uni-td align="center" class="lable" style="border-left: 1px #EBEEF5 solid;">小计</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.km.xj" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable" style="border-bottom: none;"></uni-td>
+							<uni-td align="center" class="lable" style="border-left: 1px #EBEEF5 solid;">精大块</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.km.jdk" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable" style="border-bottom: none;">精块</uni-td>
+							<uni-td align="center" class="lable" style="border-left: 1px #EBEEF5 solid;">精中块</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.km.jzhk" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable" style="border-bottom: none;"></uni-td>
+							<uni-td align="center" class="lable" style="border-left: 1px #EBEEF5 solid;">精粒</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.km.jl" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable" style="border-bottom: none;"></uni-td>
+							<uni-td align="center" class="lable" style="border-left: 1px #EBEEF5 solid;">限下</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.km.xx" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable"
+								style="border-bottom: none;border-bottom: 1px #EBEEF5 solid;"></uni-td>
+							<uni-td align="center" class="lable" style="border-left: 1px #EBEEF5 solid;">落地混煤</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.km.ldhm" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable"></uni-td>
+							<uni-td align="center" class="lable">比对平衡</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.km.bdph" :key="index">{{item}}</uni-td>
+						</uni-tr>
+					</uni-table>
+				</view>
+			</view>
+
+			<view class="item">
+				<view class="title">沫煤</view>
+				<view class="box">
+					<uni-table emptyText="暂无更多数据">
+						<uni-tr>
+							<uni-th align="center"></uni-th>
+							<uni-th align="center" class="lable" v-for="(item,index) in data.mm.rq" :key="index">
+								{{item}}日</uni-th>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">筛沫煤(502)</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.mm.shmm" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">筛沫</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.mm.shm" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">比对平衡</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.mm.bdph_1" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">洗精末(8203)</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.mm.xjm" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">小计</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.mm.xj" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">精末灰6</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.mm.jmh" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">精末灰10</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.mm.jmh_10" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">比对平衡</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.mm.bdph_2" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">煤泥(6220)</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.mm.mn" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">煤泥</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.mm.meini" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">比对平衡</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.mm.bdph_3" :key="index">{{item}}</uni-td>
+						</uni-tr>
+					</uni-table>
+				</view>
+			</view>
+
+			<view class="item">
+				<view class="title">矸石</view>
+				<view class="box">
+					<uni-table emptyText="暂无更多数据">
+						<uni-tr>
+							<uni-th align="center"></uni-th>
+							<uni-th align="center" class="lable" v-for="(item,index) in data.gs.rq" :key="index">
+								{{item}}日</uni-th>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">矸石秤(801)</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.gs.gsc" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">水洗矸石</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.gs.sxgs" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">比对平衡</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.gs.bdph" :key="index">{{item}}</uni-td>
+						</uni-tr>
+
+					</uni-table>
+				</view>
+			</view>
+
+			<view class="item">
+				<view class="title">1—12月份块煤产率完成情况统计表</view>
+				<view class="box">
+					<uni-table emptyText="暂无更多数据">
+						<uni-tr>
+							<uni-th align="center"></uni-th>
+							<uni-th align="center" class="lable" v-for="(item,index) in data.kmcl.rq" :key="index">
+								{{item}}月</uni-th>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">精大块</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.kmcl.jdk" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">精中块</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.kmcl.jzk" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">精粒</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.kmcl.jl" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">限下(精沫)</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.kmcl.xx" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">落地混煤</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.kmcl.ldhm" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">合计</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.kmcl.hj" :key="index">{{item}}</uni-td>
+						</uni-tr>
+						<uni-tr>
+							<uni-td align="center" class="lable">矸石</uni-td>
+							<uni-td align="center" v-for="(item,index) in data.kmcl.gs" :key="index">{{item}}</uni-td>
+						</uni-tr>
+
+					</uni-table>
+				</view>
+			</view>
+
+			<view class="item">
+				<view class="title">1—12月份块煤产率完成情况统计图</view>
+				<view class="box">
+					<scroll-view scroll-x>
+						<view class="charts-box">
+							<qiun-data-charts type="column" :chartData="chartData" :opts="column_1" tooltipFormat="column_bfb"/>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+
+
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 当前年月
+				year: "",
+				month: "",
+
+				// 表格数据
+				data: "",
+
+				// 图表数据
+				chartData: {
+					"categories": [
+						"1月",
+						"2月",
+						"3月"
+					],
+					"series": [{
+							"name": "精大块",
+							"data": [
+								35,
+								36,
+								31
+							]
+						},
+						{
+							"name": "精中块",
+							"data": [
+								35,
+								36,
+								31
+							]
+						},
+						{
+							"name": "精粒",
+							"data": [
+								35,
+								36,
+								31
+							]
+						},
+						{
+							"name": "限下(精沫)",
+							"data": [
+								35,
+								36,
+								31
+							]
+						},
+						{
+							"name": "落地混煤",
+							"data": [
+								35,
+								36,
+								31
+							]
+						},
+						{
+							"name": "合计",
+							"data": [
+								35,
+								36,
+								31
+							]
+						},
+						{
+							"name": "矸石",
+							"data": [
+								35,
+								36,
+								31
+							]
+						},
+					]
+				},
+				column_1: {
+					"dataLabel": false,
+					"legend": {
+						"position": "top",
+						"float": "left",
+						"padding": 10,
+						"margin": 15,
+						"lineHeight": 20,
+					},
+					"extra": {
+						"column": {
+							"categoryGap": 20,
+						},
+					}
+				}
+			};
+		},
+		onLoad() {
+			// 初始化年月
+			this.year = new Date().getFullYear()
+			this.month = new Date().getMonth() + 1
+
+
+			this.get_data()
+		},
+		methods: {
+			// 切换年月
+			change_time(tip) {
+				if (tip == '+') {
+					// console.log('+')
+					if (this.month < 12) {
+						this.month++
+					} else {
+						this.month = 1
+						this.year++
+					}
+				} else if (tip == '-') {
+					// console.log('-')
+					if (this.month > 1) {
+						this.month--
+					} else {
+						this.month = 12
+						this.year--
+					}
+				}
+				
+				
+				this.get_data()
+			},
+
+			get_data() {
+				uni.showLoading({
+					mask:true
+				})
+				this.$api.mtcxy_getMTYPHData({
+					// date: this.year + '-' + this.month
+					year: this.year,
+					month: this.month
+				}).then((res) => {
+					uni.hideLoading()
+					console.log(res)
+
+					this.data = res.data.content
+					
+					this.chartData = res.data.content.chartData
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		margin-bottom: 40rpx;
+	}
+
+	/* 请根据需求修改图表容器尺寸,如果父容器没有高度图表则会显示异常 */
+	.charts-box {
+		width: 300%;
+		height: 700rpx;
+	}
+
+	.top {
+		image {
+			width: 750rpx;
+			height: 360rpx;
+		}
+	}
+
+	.time {
+		height: 128rpx;
+
+		display: flex;
+		justify-content: center;
+		align-items: center;
+
+		.icon {
+			image {
+				width: 48rpx;
+				height: 48rpx;
+
+				display: block;
+			}
+		}
+
+		.text {
+			width: 300rpx;
+			text-align: center;
+			font-weight: 700;
+		}
+	}
+
+	.table_box {
+		.item {
+			.title {
+				text-align: center;
+				line-height: 80rpx;
+				font-size: 30rpx;
+				color: #FFFFFF;
+				background-color: #1C99F1;
+			}
+
+			.box {
+				.lable {
+					font-weight: 700;
+					color: #000;
+				}
+			}
+		}
+	}
+</style>

+ 143 - 0
pages/production/statistical_analysis_table/statistical_analysis_table.vue

@@ -0,0 +1,143 @@
+<template>
+	<view class="content">
+		<view class="item_box" style="background-color: #638BD5;" @click="go_meitan_cxl()">
+			<view class="img">
+				<image src="./icon/icon_1.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">煤炭产销量</view>
+				<!-- <view class="tip"></view> -->
+			</view>
+		</view>
+		<view class="item_box" style="background-color: #A3A2E4;">
+			<view class="img">
+				<image src="./icon/icon_2.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">车辆使用统计</view>
+			</view>
+		</view>
+		<view class="item_box" style="background-color: #8BC8DA;">
+			<view class="img">
+				<image src="./icon/icon_3.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">入井统计</view>
+			</view>
+		</view>
+		<view class="item_box" style="background-color: #FBB47B;">
+			<view class="img">
+				<image src="./icon/icon_4.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">天然气及矿井水</view>
+			</view>
+		</view>
+		<view class="item_box" style="background-color:#C883BF;">
+			<view class="img">
+				<image src="./icon/icon_5.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">设备管理</view>
+			</view>
+		</view>
+		<view class="item_box" style="background-color: #31B3F7;">
+			<view class="img">
+				<image src="./icon/icon_6.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">车辆运行</view>
+			</view>
+		</view>
+		<view class="item_box" style="background-color: #54CC65">
+			<view class="img">
+				<image src="./icon/icon_7.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">产销运平衡比对月度分析报告</view>
+			</view>
+		</view>
+		<view class="item_box" style="background-color: #638BD5;">
+			<view class="img">
+				<image src="./icon/icon_8.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">天然气及矿井水月度分析报告</view>
+			</view>
+		</view>
+		
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		},
+		methods:{
+			go_meitan_cxl(){
+				uni.navigateTo({
+					url:"./meitan_cxl/meitan_cxl"
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		box-sizing: border-box;
+		padding: 20rpx 25rpx 0;
+		margin-bottom: 100rpx;
+
+		overflow: hidden;
+
+		.item_box {
+			float: left;
+
+			width: 220rpx;
+			height: 280rpx;
+
+			margin-right: 20rpx;
+			margin-bottom: 20rpx;
+			border-radius: 16rpx;
+
+			.img {
+				box-sizing: border-box;
+				padding-top: 60rpx;
+				text-align: center;
+
+				image {
+					width: 90rpx;
+					height: 90rpx;
+				}
+			}
+
+			.text {
+				margin-top: 30rpx;
+				text-align: center;
+				color: #FFFFFF;
+				line-height: 40rpx;
+
+				.name {
+					font-size: 28rpx;
+				}
+
+				.tip {
+					font-size: 24rpx;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+				}
+			}
+		}
+
+		.item_box:nth-child(3n) {
+			margin-right: 0;
+		}
+
+	}
+</style>

+ 1 - 1
pages/production/video_monitor/video_monitor.vue

@@ -12,7 +12,7 @@
 			};
 		},
 		onLoad(option) {
-			this.href = "http://webdevelop.nxjiewei.com/assets/html/video/?mine_code=" + option.mine_code
+			this.href = "http://webdevelop.nxjiewei.com/assets/html/video/?mine_code=" + option.mine_code + "&time=" + Date.parse(new Date())
 		}
 	}
 </script>

+ 62 - 15
pages/tabbar/index/index.vue

@@ -1,41 +1,47 @@
 <template>
 	<view>
-		<t-i-navbar :mine_code="mine_code"></t-i-navbar>
-		<!-- notice -->
-		<t-i-notice :text="text"></t-i-notice>
-		<!-- banner -->
-		<t-i-banner :banner="banners" :mine_code="mine_code"></t-i-banner>
+		<view class="top_bg_color">
+			<view class="bg_img" :style="{backgroundImage:'url('+top_bg_color_img+')'}"></view>
+
+			<t-i-navbar :mine_code="mine_code" :navbar_bg_color="navbar_bg_color"></t-i-navbar>
+			<!-- notice -->
+			<t-i-notice :text="text"></t-i-notice>
+			<!-- banner -->
+			<t-i-banner :banner="banners" :mine_code="mine_code" @change_top_bg_color_img="change_top_bg_color_img"></t-i-banner>
+		</view>
 		<!-- 固定入口 -->
 		<t-i-icon :iconList="iconList" :mine_code="mine_code"></t-i-icon>
 		<!-- 常用功能 -->
 		<t-i-common v-if="mine_code == 'ningdongyunying'"></t-i-common>
 		<!-- 新闻列表 -->
 		<t-i-news :newsList="newsList" :mine_code="mine_code"></t-i-news>
-		
+
 		<!-- 开屏通告 -->
 		<openingNotice></openingNotice>
-		
+
 		<!-- 宁东运营 -->
 		<view v-if="mine_code == 'ningdongyunying'">
 			<t-i-ningdongyunying :mine_code="mine_code"></t-i-ningdongyunying>
 		</view>
-		
+
 		<!-- 金家渠 -->
 		<view v-if="mine_code == 'jinjiaqu'">
 			<t-i-jinjiaqu :mine_code="mine_code"></t-i-jinjiaqu>
-			
+
 		</view>
-		
+
 		<!-- 羊场湾 -->
 		<view v-if="mine_code == 'yangchangwan'">
 			<t-i-yangchangwan :mine_code="mine_code" :home_link="home_link"></t-i-yangchangwan>
 		</view>
-		
+
 	</view>
 </template>
 
 <script>
-	import {set_base_url} from '@/common/set_base_url.js'
+	import {
+		set_base_url
+	} from '@/common/set_base_url.js'
 	// 版本控制
 	import upApp from "@/uni_modules/uni-upgrade-center-app/utils/check-update"
 
@@ -58,8 +64,13 @@
 				// 固定入口
 				iconList: [],
 				// 首页链接
-				home_link:[]
+				home_link: [],
+
 
+				// 背景色
+				top_bg_color_img: "",
+				// 标题栏背景色
+				navbar_bg_color: ""
 			}
 		},
 		onPullDownRefresh() {
@@ -99,6 +110,13 @@
 			})
 
 		},
+		onPageScroll: function(e) {
+			if (e.scrollTop > 400) {
+				this.navbar_bg_color = "#009fe8"
+			} else {
+				this.navbar_bg_color = ""
+			}
+		},
 		onShow() {
 			// E信-切换矿
 			uni.$on('update_kuang', (data) => {
@@ -110,7 +128,7 @@
 
 			// 根据矿编码切换首页接口不同的请求基础路径
 			this.base_url = set_base_url(this.mine_code)
-			
+
 
 
 			// 获取轮播图
@@ -131,6 +149,7 @@
 					method: "GET",
 					success: (res) => {
 						this.banners = res.data.data.data
+						this.top_bg_color_img = this.banners[0].imgURL
 					}
 				})
 			},
@@ -156,7 +175,8 @@
 						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," ")
+							this.text = res.data.data.content.replace(/<br /g, " ").replace(/>/g, " ").replace(
+								/\//g, " ")
 							// console.log(this.text)
 						}
 					}
@@ -185,6 +205,11 @@
 				})
 			},
 
+			// 切换背景图片
+			change_top_bg_color_img(index) {
+				this.top_bg_color_img = this.banners[index].imgURL
+			}
+
 		}
 
 	}
@@ -194,4 +219,26 @@
 	page {
 		background-color: #F6FAF6;
 	}
+
+	.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;
+		}
+	}
 </style>

BIN
pages/tabbar/my/icon/bg.png


BIN
pages/tabbar/my/icon/icon_1.png


BIN
pages/tabbar/my/icon/icon_2.png


BIN
pages/tabbar/my/icon/icon_3.png


BIN
pages/tabbar/my/icon/icon_4.png


BIN
pages/tabbar/my/icon/icon_5.png


BIN
pages/tabbar/my/icon/icon_6.png


BIN
pages/tabbar/my/icon/icon_7.png


BIN
pages/tabbar/my/icon/section_1.png


BIN
pages/tabbar/my/icon/section_2_inner_1.png


BIN
pages/tabbar/my/icon/section_2_inner_2.png


BIN
pages/tabbar/my/icon/section_3.png


BIN
pages/tabbar/my/icon/time.png


+ 52 - 0
pages/tabbar/my/my - 旧版个人中心.vue

@@ -0,0 +1,52 @@
+<template>
+	<view>
+		<!-- 基本信息 -->
+		<view class="top_bg"></view>
+		<t-m-info></t-m-info>
+		
+		<!-- t-m-icon -->
+		<t-m-icon :mine_code="mine_code"></t-m-icon>
+		
+		<t-m-list></t-m-list>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 当前煤矿编码
+				mine_code: "",
+			};
+		},
+		onLoad() {
+			// 初始化当前煤矿编码
+			this.mine_code = uni.getStorageSync('mine_code')
+			// 判断会否登录、没有则跳转至登录页
+			const Authorization = uni.getStorageSync('Authorization')
+			if (Authorization == '') {
+			
+				uni.showToast({
+					icon: "none",
+					title: "用户未登录"
+				})
+			
+				setTimeout(function() {
+					uni.redirectTo({
+						url: "../../login/login"
+					})
+				}, 1000)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		margin-bottom: 80rpx;
+	}
+	.top_bg {
+		height: 60px;
+		background: #009FE8;
+	}
+</style>

+ 791 - 15
pages/tabbar/my/my.vue

@@ -1,52 +1,828 @@
 <template>
 	<view>
-		<!-- 基本信息 -->
-		<view class="top_bg"></view>
-		<t-m-info></t-m-info>
-		
-		<!-- t-m-icon -->
-		<t-m-icon :mine_code="mine_code"></t-m-icon>
-		
-		<t-m-list></t-m-list>
+		<!-- 背景图 -->
+		<view class="top">
+			<image src="./icon/bg.png" mode="aspectFill"></image>
+		</view>
+		<view class="content">
+			<view class="user">
+				<view class="left">
+					<view class="img">
+						<image v-if="user.avatar" :src="user.avatar" mode="aspectFill"></image>
+						<view class="avatar" v-if="!user.avatar" :style="{backgroundColor:bgColor[1]}">
+							{{user.name.split('').pop()}}
+						</view>
+
+					</view>
+					<view class="info">
+						<view class="name">{{user.name}}</view>
+						<view class="section">{{user.section}}</view>
+					</view>
+				</view>
+				<view class="right">
+					<view class="btn" @click="go_information()">
+						<view class="icon">
+							<uni-icons type="person-filled" color="#fff"></uni-icons>
+						</view>
+						<view class="text">个人中心</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="section_1">
+				<view class="title">本月使用信息</view>
+				<view class="box">
+					<view class="item">
+						<view class="num">{{use.h}} <text> h </text> {{use.m}} <text> min</text></view>
+						<view class="tip">使用时长</view>
+					</view>
+					<view class="item">
+						<view class="num">{{use.times || '1'}}</view>
+						<view class="tip">使用次数</view>
+					</view>
+					<view class="item">
+						<view class="num">{{use.submit_count}}</view>
+						<view class="tip">提交单据数</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="section_2">
+				<view class="inner_1">
+					<view class="title">
+						<view class="icon">
+							<image src="./icon/time.png" mode=""></image>
+						</view>
+						<view class="text">最近使用</view>
+					</view>
+					<view class="box">
+						<view class="item" v-if="recently_used.length > 0" v-for="(item,index) in recently_used" :key="index" @click="go_OA(item)">
+							<view class="name">{{item.title}}</view>
+							<view class="icon">
+								<uni-icons type="right" color="#fff" size="16"></uni-icons>
+							</view>
+						</view>
+						<view v-if="recently_used.length == 0" style="line-height: 80rpx;color: #FFFFFF;padding: 0 20rpx;font-size: 28rpx;">暂无使用记录。</view>
+					</view>
+				</view>
+				<view class="inner_2" @click="go_integral()">
+					<view class="num">{{total}}</view>
+					<view class="text">积分</view>
+				</view>
+			</view>
+
+			<view class="section_3" v-if="mine_code != 'ningdongyunying'"
+				@click="go_downhole_statistics()">
+				<view class="title">
+					<view class="icon">
+						<uni-icons type="map-pin-ellipse" color="#fff"></uni-icons>
+					</view>
+					<view class="text">当前位置:{{downhole.position}}</view>
+				</view>
+				<view class="box">
+					<view class="item">
+						<view class="num">{{downhole.h}} <text> h</text> {{downhole.m}} <text> min</text></view>
+						<view class="tip">本月下井时长</view>
+					</view>
+					<view class="item">
+						<view class="num">{{downhole.times}}</view>
+						<view class="tip">本月下井次数</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="section_4">
+				<view class="list">
+					<view class="item" @click="clear_cache()">
+						<view class="icon">
+							<image src="./icon/icon_1.png" mode="aspectFill"></image>
+						</view>
+						<view class="text">
+							清除缓存
+						</view>
+					</view>
+					<view class="item" @click="tell()">
+						<view class="icon">
+							<image src="./icon/icon_2.png" mode="aspectFill"></image>
+						</view>
+						<view class="text">服务电话</view>
+					</view>
+					<view class="item" @click="go_feedback()">
+						<view class="icon">
+							<image src="./icon/icon_3.png" mode="aspectFill"></image>
+						</view>
+						<view class="text">建议反馈</view>
+					</view>
+					<view class="item" @click="go_update_log()">
+						<view class="icon">
+							<image src="./icon/icon_4.png" mode="aspectFill"></image>
+						</view>
+						<view class="text">更新日志</view>
+					</view>
+					<view class="item" @click="go_m_repassword()">
+						<view class="icon">
+							<image src="./icon/icon_5.png" mode="aspectFill"></image>
+						</view>
+						<view class="text">修改密码</view>
+					</view>
+					<view class="item" @click="login_out()">
+						<view class="icon">
+							<image src="./icon/icon_6.png" mode="aspectFill"></image>
+						</view>
+						<view class="text">退出登陆</view>
+					</view>
+					<view class="item" @click="go_m_download()">
+						<view class="icon">
+							<image src="./icon/icon_7.png" mode="aspectFill"></image>
+						</view>
+						<view class="text">下载二维码</view>
+					</view>
+				</view>
+			</view>
+
+		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		set_mine
+	} from '@/common/set_base_url.js'
+
 	export default {
 		data() {
 			return {
 				// 当前煤矿编码
 				mine_code: "",
+
+				// 用户基本信息
+				user: {},
+				bgColor: [],
+				// 总积分
+				total: 0,
+
+				// 下井定位卡号
+				people_num: "",
+				// 矿编码
+				mine: "",
+
+				// 下井数据
+				downhole: {
+					position: "",
+					h: "",
+					m: "",
+					times: ""
+				},
+
+				// 使用时长次数
+				use: {
+					times: "-",
+					h: "-",
+					m: "-",
+					submit_count:"0"
+				},
+				
+				// 最近使用
+				recently_used:[]
 			};
 		},
 		onLoad() {
+			// console.log(set_mine(uni.getStorageSync('mine_code')))
+			this.mine = set_mine(uni.getStorageSync('mine_code'))
 			// 初始化当前煤矿编码
 			this.mine_code = uni.getStorageSync('mine_code')
 			// 判断会否登录、没有则跳转至登录页
 			const Authorization = uni.getStorageSync('Authorization')
 			if (Authorization == '') {
-			
+
 				uni.showToast({
 					icon: "none",
 					title: "用户未登录"
 				})
-			
+
 				setTimeout(function() {
 					uni.redirectTo({
 						url: "../../login/login"
 					})
 				}, 1000)
 			}
+
+			// 设置头像
+			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.user = uni.getStorageSync('user');
+			// 查询使用时长
+			this.get_user_selectRecordDuration()
+
+			//查询员工积分
+			this.get_staff_integral_query(),
+
+			// 获取个人信息
+			this.$api.user_getUinfo({
+				staff_num: uni.getStorageSync('user').staff_num
+			}).then((res) => {
+				this.people_num = res.data.data.people_code
+
+				// 获取当前位置
+				this.get_downhole()
+			})
+			
+			// 获取常用列表
+			this.get_workflow_recently_used()
+		},
+		methods: {
+			// 个人信息
+			go_information() {
+				uni.navigateTo({
+					url: "../../my/personal_information/personal_information"
+				})
+			},
+			// 查询使用时长
+			get_user_selectRecordDuration() {
+				this.$api.user_selectRecordDuration({
+
+				}).then((res) => {
+					// console.log(res.data.data)
+
+					this.use.h = res.data.data.hours
+					this.use.m = res.data.data.minutes
+					this.use.times = res.data.data.frequency
+				})
+			},
+
+
+			// 退出登录
+			login_out() {
+				uni.clearStorageSync('Authorization');
+				uni.clearStorageSync('oa_login_time');
+				uni.showToast({
+					icon: "none",
+					title: "退出登录"
+				})
+
+				// 跳转登录页
+				setTimeout(() => {
+					uni.redirectTo({
+						url: "../../my/login/login"
+					})
+				}, 1500)
+			},
+			// 拨打服务电话
+			tell() {
+				uni.makePhoneCall({
+					phoneNumber: '18152480670'
+				});
+			},
+			// 修改密码
+			go_m_repassword() {
+				uni.navigateTo({
+					url: "../../my/repassword/repassword"
+				})
+			},
+			// 清除缓存
+			clear_cache() {
+				// uni.showLoading({
+				// 	mask:true
+				// })
+				// setTimeout(()=>{
+				// 	uni.hideLoading()
+				// 	uni.showToast({
+				// 		icon:"none",
+				// 		title:"清除完成"
+				// 	})
+				// },1500)
+
+				let that = this;
+				plus.cache.calculate(function(size) {
+					let sizeCache = parseInt(size);
+					if (sizeCache == 0) {
+						that.fileSizeString = "0B";
+					} else if (sizeCache < 1024) {
+						that.fileSizeString = sizeCache + "B";
+					} else if (sizeCache < 1048576) {
+						that.fileSizeString = (sizeCache / 1024).toFixed(2) + "K";
+					} else if (sizeCache < 1073741824) {
+						that.fileSizeString = (sizeCache / 1048576).toFixed(2) + "M";
+					} else {
+						that.fileSizeString = (sizeCache / 1073741824).toFixed(2) + "G";
+					}
+
+					console.log(sizeCache)
+				});
+
+				let os = plus.os.name;
+				if (os == 'Android') {
+					let main = plus.android.runtimeMainActivity();
+					let sdRoot = main.getCacheDir();
+					let files = plus.android.invoke(sdRoot, "listFiles");
+					let len = files.length;
+					for (let i = 0; i < len; i++) {
+						let filePath = '' + files[i]; // 没有找到合适的方法获取路径,这样写可以转成文件路径
+						plus.io.resolveLocalFileSystemURL(filePath, function(entry) {
+							if (entry.isDirectory) {
+								entry.removeRecursively(function(entry) { //递归删除其下的所有文件及子目录
+									uni.showToast({
+										title: '缓存清理完成',
+										duration: 2000
+									});
+									that.getStorageSize(); // 重新计算缓存
+								}, function(e) {
+									console.log(e.message)
+								});
+							} else {
+								entry.remove();
+							}
+						}, function(e) {
+							console.log('文件路径读取失败')
+						});
+					}
+				} else { // ios
+					
+				}
+			},
+			// 建议反馈
+			go_feedback() {
+				uni.navigateTo({
+					url: "../../origanization/OA/h5/h5",
+					success: (res) => {
+						// 通过eventChannel向被打开页面传送数据
+						res.eventChannel.emit('acceptDataFromOpenerPage', {
+							url: 'http://oa_system.nxjiewei.com:8011/?m=ying&d=we&mnum=ndyybbug&show=we&hideheader=true',
+							title: "建议反馈"
+						})
+					}
+				})
+			},
+			// 更新日志
+			go_update_log() {
+				uni.navigateTo({
+					url: "../../my/version_record/version_record"
+				})
+			},
+
+			//查询员工积分
+			get_staff_integral_query() {
+				this.$api.staff_integral_query({
+					staff_num: uni.getStorageSync('user').staff_num
+				}).then((res) => {
+					// console.log(res)
+
+					this.total = res.data.content.data.integral_sum
+				})
+			},
+			// 积分详情
+			go_integral() {
+				uni.navigateTo({
+					url: "../../index/integral/integral?total=" + this.total
+				})
+			},
+
+			// 获取当前位置
+			get_downhole() {
+				this.$p_api.peopleTotalNum({
+					people_code: this.people_num,
+					mine: ""
+				}).then((res) => {
+					// console.log(res)
+
+					if (res.data.data.position == null) {
+						if(this.people_num == ""){
+							this.downhole.position = "请点击绑定定位卡"
+						}else{
+							this.downhole.position = "未在井下"
+						}
+					} else {
+						this.downhole.position = res.data.data.data.position
+					}
+
+					this.downhole.h = res.data.data.hours
+					this.downhole.m = res.data.data.minutes
+					this.downhole.times = res.data.data.total
+				})
+			},
+			go_downhole_statistics() {
+				uni.navigateTo({
+					url: "../../production/personnel_orientation/downhole_statistics/downhole_statistics?people_num=" +
+						this.people_num + "&depart_name=" + this.user.section + "&name=" + this.user.name +
+						"&mine=" + this.mine
+				})
+			},
+			
+			// 获取常用列表
+			get_workflow_recently_used(){
+				this.$api.workflow_recently_used({
+					staff_num:this.user.staff_num
+				}).then((res)=>{
+					// console.log(res.data.content.data)
+					
+					this.recently_used = res.data.content.data.list
+					this.use.submit_count = res.data.content.data.submit_count
+				})
+			},
+			
+			go_OA(item){
+				// console.log(item)
+				uni.navigateTo({
+					url: "../../origanization/OA/h5/h5",
+					success: (res) => {
+						// 通过eventChannel向被打开页面传送数据
+						res.eventChannel.emit('acceptDataFromOpenerPage', {
+							url: item.url,
+							title: item.title
+						})
+					}
+				})
+			},
+			// 下载二维码
+			go_m_download(){
+				uni.navigateTo({
+					url:"../../my/download/download"
+				})
+			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	page{
-		margin-bottom: 80rpx;
+	.top {
+		z-index: -1;
+		position: fixed;
+		top: 1;
+		left: 0;
+
+		image {
+			width: 750rpx;
+			height: 746rpx;
+		}
 	}
-	.top_bg {
-		height: 60px;
-		background: #009FE8;
+
+	.content {
+		width: 749rpx;
+
+		.user {
+			box-sizing: border-box;
+			padding-left: 25rpx;
+			padding-top: 25rpx;
+
+			display: flex;
+			justify-content: space-between;
+			align-items: baseline;
+
+			.left {
+				display: flex;
+				align-items: center;
+
+				.img {
+					width: 130rpx;
+					height: 130rpx;
+					border-radius: 50%;
+					background: #DCDCDC;
+					border: 1px solid #FFFFFF;
+					overflow: hidden;
+
+					text-align: center;
+					line-height: 130rpx;
+					font-size: 56rpx;
+					font-weight: 700;
+					color: #FFFFFF;
+
+					image {
+						width: 100%;
+						height: 100%;
+						display: block;
+					}
+
+					.avatar {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.info {
+					margin-left: 20rpx;
+					color: #fff;
+
+					.name {
+						font-size: 38rpx;
+						font-weight: 700;
+					}
+
+					.section {
+						margin-top: 20rpx;
+						font-size: 24rpx;
+					}
+				}
+			}
+
+			.right {
+				background-color: rgba(255, 255, 255, .3);
+				border-radius: 25rpx 0rpx 0rpx 25rpx;
+				padding: 5rpx 20rpx 5rpx 20rpx;
+
+				.btn {
+					display: flex;
+					align-items: center;
+
+					color: #FFFFFF;
+
+					.icon {}
+
+					.text {
+						font-size: 24rpx;
+					}
+				}
+			}
+		}
+
+		.section_1 {
+			margin-top: 40rpx;
+			width: 749rpx;
+			height: 220rpx;
+			background-image: url(./icon/section_1.png);
+			background-size: cover;
+			background-repeat: no-repeat;
+
+			box-sizing: border-box;
+			padding: 10rpx 20rpx;
+
+			.title {
+				padding-left: 20rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+
+				font-size: 28rpx;
+				color: #fff;
+				border-bottom: 1rpx solid rgba(255,255,255,.5);
+			}
+
+			.box {
+				display: flex;
+
+				.item {
+					width: 236rpx;
+					text-align: center;
+					height: 130rpx;
+
+					border-right: 1rpx solid rgba(255,255,255,.5);
+
+					color: #FFFFFF;
+
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+
+					.num {
+						font-size: 44rpx;
+						font-weight: 700;
+
+						text {
+							font-size: 24rpx;
+						}
+					}
+
+					.tip {
+						font-size: 24rpx;
+					}
+				}
+
+				.item:last-child {
+					border-right: none;
+				}
+			}
+		}
+
+		.section_2 {
+			box-sizing: border-box;
+			padding: 20rpx;
+
+			display: flex;
+			justify-content: space-between;
+
+			.inner_1 {
+				width: 510rpx;
+				height: 220rpx;
+				background-image: url(./icon/section_2_inner_1.png);
+				background-size: 100% 100%;
+				background-repeat: no-repeat;
+
+				.title {
+					display: flex;
+					align-items: center;
+
+					height: 70rpx;
+					font-size: 28rpx;
+					color: #fff;
+					padding-left: 20rpx;
+					border-bottom: 1rpx solid rgba(255,255,255,.5);
+
+					.icon {
+						image {
+							width: 28rpx;
+							height: 28rpx;
+							display: block;
+						}
+					}
+
+					.text {
+						margin-left: 10rpx;
+						font-size: 28rpx;
+					}
+				}
+
+				.box {
+					width: 510rpx;
+
+					display: flex;
+					flex-wrap: wrap;
+
+					.item {
+						width: 255rpx;
+						height: 70rpx;
+
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						color: #FFFFFF;
+
+						box-sizing: border-box;
+						padding: 0 10rpx;
+						border-bottom: 1rpx solid rgba(255,255,255,.5);
+						border-right: 1rpx solid rgba(255,255,255,.5);
+
+						.name {
+							width: 200rpx;
+							//超过一行省略号
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+
+							font-size: 28rpx;
+						}
+
+						.icon {}
+					}
+
+					.item:nth-child(2n) {
+						border-right: none;
+					}
+
+					.item:nth-child(3) {
+						border-bottom: none;
+					}
+
+					.item:nth-child(4) {
+						border-bottom: none;
+					}
+				}
+			}
+
+			.inner_2 {
+				margin-top: -4rpx;
+				margin-right: -10rpx;
+				width: 200rpx;
+				height: 250rpx;
+				background-image: url(./icon/section_2_inner_2.png);
+				background-size: 100% 100%;
+				background-repeat: no-repeat;
+
+				color: #FFFFFF;
+				text-align: center;
+
+				.num {
+					height: 140rpx;
+					line-height: 140rpx;
+					font-size: 44rpx;
+					font-weight: 700;
+				}
+
+				.text {
+					height: 50rpx;
+					line-height: 50rpx;
+					font-size: 34rpx;
+				}
+			}
+		}
+
+		.section_3 {
+			margin: -15rpx auto 0;
+
+			width: 710rpx;
+			height: 220rpx;
+			background-image: url(./icon/section_3.png);
+			background-size: 100% 100%;
+			background-repeat: no-repeat;
+
+			.title {
+				display: flex;
+				align-items: center;
+
+				height: 60rpx;
+				font-size: 24rpx;
+				color: #fff;
+				padding-left: 20rpx;
+
+				.icon {
+					image {
+						width: 28rpx;
+						height: 28rpx;
+						display: block;
+					}
+				}
+
+				.text {
+					margin-left: 10rpx;
+					font-size: 28rpx;
+				}
+			}
+
+			.box {
+				display: flex;
+
+				.item {
+					width: 355rpx;
+					text-align: center;
+					height: 140rpx;
+
+					color: #FFFFFF;
+
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+
+					.num {
+						font-size: 44rpx;
+						font-weight: 700;
+
+						text {
+							font-size: 24rpx;
+						}
+					}
+
+					.tip {
+						margin-top: 10rpx;
+						font-size: 24rpx;
+					}
+				}
+			}
+
+		}
+
+		.section_4 {
+			margin: 25rpx auto 40rpx;
+			width: 710rpx;
+			background-color: #FFFFFF;
+			box-shadow: 10rpx 10rpx 16rpx 6rpx rgba(0, 0, 0, 0.13);
+			border-radius: 20rpx;
+
+			.list {
+				overflow: hidden;
+				box-sizing: border-box;
+				padding: 30rpx 0;
+
+				.item {
+					margin-right: 30rpx;
+					margin-bottom: 30rpx;
+					float: left;
+
+					width: 155rpx;
+					text-align: center;
+
+					.icon {
+						margin: 0 auto;
+						width: 80rpx;
+						height: 80rpx;
+						border-radius: 50%;
+						overflow: hidden;
+
+						image {
+							width: 80rpx;
+							height: 80rpx;
+							display: block;
+						}
+					}
+
+					.text {
+						font-size: 28rpx;
+						color: #666666;
+					}
+				}
+
+				.item:nth-child(4n) {
+					margin-right: 0;
+				}
+			}
+		}
 	}
 </style>

+ 2 - 1
pages/workbench/downhole_statistics_user/downhole_statistics_user.vue

@@ -36,8 +36,9 @@
 			// 获取重名人员列表参数
 			get_list() {
 				this.$api.user_getPersonnelListByName({
-					name: this.name
+					name: this.name,
 					// name: "王文新"
+					mine: this.mine
 				}).then((res) => {
 					console.log(res.data.data)
 

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

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

Разница между файлами не показана из-за своего большого размера
+ 2 - 2
unpackage/dist/build/app-plus/app-config-service.js


Разница между файлами не показана из-за своего большого размера
+ 2 - 2
unpackage/dist/build/app-plus/app-service.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/build/app-plus/app-view.js


BIN
unpackage/dist/build/app-plus/components/t-i-navbar/icon/bg_img.jpg


BIN
unpackage/dist/build/app-plus/components/t-i-navbar/icon/ningdongyunying.png


BIN
unpackage/dist/build/app-plus/components/t-i-notice/icon/bg_img.jpg


BIN
unpackage/dist/build/app-plus/components/t-m-icon/icon/fuwudianhua.png


BIN
unpackage/dist/build/app-plus/components/t-m-icon/icon/gengxin.png


BIN
unpackage/dist/build/app-plus/components/t-m-icon/icon/jianyifankui.png


BIN
unpackage/dist/build/app-plus/components/t-m-icon/icon/qingchu.png


BIN
unpackage/dist/build/app-plus/components/t-m-icon/icon/shouxieqianming.png


BIN
unpackage/dist/build/app-plus/components/t-m-icon/icon/xiugaimima.png


BIN
unpackage/dist/build/app-plus/components/t-m-icon/icon/yunpan.png


BIN
unpackage/dist/build/app-plus/components/t-m-info/icon/tip.png


BIN
unpackage/dist/build/app-plus/components/t-m-list/icon/list_2.png


BIN
unpackage/dist/build/app-plus/components/t-m-list/icon/list_3.png


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/build/app-plus/manifest.json


BIN
unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/icon/icon_1.png


BIN
unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/icon/icon_2.png


BIN
unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/icon/icon_3.png


BIN
unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/icon/icon_4.png


BIN
unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/icon/icon_5.png


BIN
unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/icon/icon_6.png


BIN
unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/icon/icon_7.png


BIN
unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/icon/icon_8.png


BIN
unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/meitan_cxl/icon/left.png


BIN
unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/meitan_cxl/icon/right.png


BIN
unpackage/dist/build/app-plus/pages/production/statistical_analysis_table/meitan_cxl/icon/top.png


BIN
unpackage/dist/build/app-plus/pages/tabbar/my/icon/bg.png


BIN
unpackage/dist/build/app-plus/pages/tabbar/my/icon/icon_1.png


BIN
unpackage/dist/build/app-plus/pages/tabbar/my/icon/icon_2.png


BIN
unpackage/dist/build/app-plus/pages/tabbar/my/icon/icon_3.png


BIN
unpackage/dist/build/app-plus/pages/tabbar/my/icon/icon_4.png


BIN
unpackage/dist/build/app-plus/pages/tabbar/my/icon/icon_5.png


BIN
unpackage/dist/build/app-plus/pages/tabbar/my/icon/icon_6.png


BIN
unpackage/dist/build/app-plus/pages/tabbar/my/icon/icon_7.png


BIN
unpackage/dist/build/app-plus/pages/tabbar/my/icon/section_1.png


BIN
unpackage/dist/build/app-plus/pages/tabbar/my/icon/section_2_inner_1.png


BIN
unpackage/dist/build/app-plus/pages/tabbar/my/icon/section_2_inner_2.png


BIN
unpackage/dist/build/app-plus/pages/tabbar/my/icon/section_3.png


BIN
unpackage/dist/build/app-plus/pages/tabbar/my/icon/time.png


Разница между файлами не показана из-за своего большого размера
+ 2 - 2
unpackage/dist/build/h5/index.html


BIN
unpackage/dist/build/h5/static/img/bg.9b9b84f0.png


BIN
unpackage/dist/build/h5/static/img/bg.a3f4a318.png


BIN
unpackage/dist/build/h5/static/img/bg_img.aba8fc13.jpg


BIN
unpackage/dist/build/h5/static/img/btn.2cd6a501.png


BIN
unpackage/dist/build/h5/static/img/fuwudianhua.d0cbf871.png


BIN
unpackage/dist/build/h5/static/img/gengxin.329f9068.png


+ 0 - 0
unpackage/dist/build/h5/static/img/icon_1.d5972ce4.png


Некоторые файлы не были показаны из-за большого количества измененных файлов