E信管理(新)：整改完成；更新：1.0.12

App.vue

@@ -7,10 +7,10 @@
 			// 启动初始化
 
 			// 煤矿鉴别-名称
-			// 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');

common/common.js

@@ -1,12 +1,12 @@
-export const goToLink = (item,mine_code) => {
-	
+export const goToLink = (item, mine_code) => {
+
 	let link = item.link
 	console.log(link)
 	// OA系统
-	if(link.indexOf("oa_system.nxjiewei.com") != -1 ){
+	if (link.indexOf("oa_system.nxjiewei.com") != -1) {
 		uni.navigateTo({
-			url:"../../origanization/OA/h5/h5",
-			success: (res) =>{
+			url: "../../origanization/OA/h5/h5",
+			success: (res) => {
 				// 通过eventChannel向被打开页面传送数据
 				res.eventChannel.emit('acceptDataFromOpenerPage', {
 					url: link,
@@ -14,14 +14,14 @@ export const goToLink = (item,mine_code) => {
 				})
 			}
 		})
-		
+
 		return
 	}
-	
+
 	// 二维码
 	if (link.indexOf("pageId") != -1 && link.indexOf("app:") == -1) {
 		let pageId = ""
-	
+
 		function GetQueryString(name) {
 			var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
 			var r = link.match(reg);
@@ -34,24 +34,24 @@ export const goToLink = (item,mine_code) => {
 		} else {
 			pageId = link.split('=')[1]
 		}
-	
+
 		uni.navigateTo({
 			url: "../../index/record/record?pageId=" + pageId + "&mine_code=" + mine_code,
 		})
 	}
-	
+
 	// h5
 	if (link.indexOf("pageId") == -1 && link.indexOf("app:") == -1) {
 		console.log("H5")
 		// #ifdef APP
 		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: "未安装此应用"
@@ -62,7 +62,7 @@ export const goToLink = (item,mine_code) => {
 					pname: 'com.icbc'
 				}, (e) => {
 					console.log('Open system default browser failed: ' + e.message)
-	
+
 					uni.showToast({
 						icon: "none",
 						title: "未安装此应用"
@@ -74,14 +74,18 @@ export const goToLink = (item,mine_code) => {
 				})
 			} else if (link.indexOf("/yinhuanpaicha/yinhuaninfo") != -1) {
 				uni.navigateTo({
-					url: "../../index/h5/h5?url="+link
+					url: "../../index/h5/h5?url=" + link
+				})
+			} else {
+				uni.navigateTo({
+					url: "../../index/h5/h5?url=" + link
 				})
 			}
 		}
-	
-	
+
+
 		// #endif
-	
+
 		// #ifdef H5
 		if (link.indexOf("webdevelop.nxjiewei.com/assets/html/pingce") != -1) {
 			uni.navigateTo({
@@ -89,14 +93,18 @@ export const goToLink = (item,mine_code) => {
 			})
 		} else if (link.indexOf("/yinhuanpaicha/yinhuaninfo") != -1) {
 			uni.navigateTo({
-				url: "../../index/h5/h5?url="+link
+				url: "../../index/h5/h5?url=" + link
+			})
+		} else {
+			uni.navigateTo({
+				url: "../../index/h5/h5?url=" + link
 			})
 		}
 		// #endif
 	}
-	
-	
-	
+
+
+	// 原生
 	if (link.indexOf("pageId") == -1 && link.indexOf("app:") != -1) {
 		console.log("原生")
 		if (link.indexOf("/browseQrcode/gridSubmitItem_win") != -1) {

common/vmeitime-http/api.js

@@ -54,7 +54,13 @@ export const test = (data) => {
 // 	this.res = '请求结果 : ' + JSON.stringify(res);
 // }
 
-
+// 首页风格切换
+export const home_style_setting = (data) => {
+	return http.request({
+		url: '/home/style_setting',
+		data,
+	})
+}
 
 // 请求首页分类链接
 export const home_link = (data) => {
@@ -531,6 +537,15 @@ export const jigsawPuzzle_specialList = (data) => {
 		data,
 	})
 }
+// 拼图排行
+export const jigsawPuzzle_getRankingById = (data) => {
+	return http.request({
+		method: "POST",
+		url: '/jigsawPuzzle/getRankingById',
+		data,
+	})
+}
+
 
 
 // OA 审批流
@@ -575,6 +590,16 @@ export const five_fixed_getTableFiledTotalNumber = (data) => {
 		data,
 	})
 }
+// 根据表表名称获取已完成未完成数据
+export const five_fixed_getYesOrNoDataByTableName = (data) => {
+	return http.request({
+		method: "POST",
+		url: '/five_fixed/getYesOrNoDataByTableName',
+		data,
+	})
+}
+
+
 
 // 获取记录管理列表
 export const five_fixed_getRecordDataByCategoryName = (data) => {

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",

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

@@ -0,0 +1,114 @@
+<template>
+	<view>
+		<view class="banner">
+			<swiper class="box" autoplay circular>
+				<swiper-item v-for="(item,index) in banner" :key="item.id" @click="go_link(item.jumpURL)">
+					<view class="item">
+						<view class="img">
+							<image :src="item.imgURL"></image>
+						</view>
+						<view class="title">
+							<view>{{item.title}}</view>
+							<view class="num">
+								— <text> {{index+1}} </text> —
+							</view>
+						</view>
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"t-i-banner-2",
+		props: [
+			"banner",
+			"mine_code"
+		],
+		data() {
+			return {
+				
+			}
+		},
+		methods:{
+			go_link(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) {
+					console.log("H5")
+					uni.navigateTo({
+						url:"../../index/h5/h5?url=" + link
+					})
+				}
+
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.banner{
+		margin-top: -60rpx;
+		.box{
+			width: 750rpx;
+			height: 620rpx;
+			
+			.item{
+				width: 750rpx;
+				.img{
+					text-align: center;
+					image{
+						width: 750rpx;
+						height: 485rpx;
+						
+					}
+				}
+				.title{
+					box-sizing: border-box;
+					padding: 0 25rpx;
+					width: 750rpx;
+					height: 130rpx;
+					
+					line-height: 1.5;
+					font-size: 32rpx;
+					
+					position: relative;
+					
+					.num{
+						position: absolute;
+						bottom: 35rpx;
+						right: 25rpx;
+						color: #ACB0AC;
+						text{
+							color: #23A2EE;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>

components/t-i-icon/t-i-icon - 一行五个.vue

@@ -0,0 +1,123 @@
+<template>
+	<view class="content">
+		<view class="list">
+			<view class="item" v-for="(item,index) in iconList" :key="index" @click="go_link(item)">
+				<view class="icon">
+					<image :src="item.icon" mode=""></image>
+				</view>
+				<view class="name">{{item.title}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "t-i-icon",
+		props: [
+			"iconList",
+			"mine_code"
+		],
+		data() {
+			return {
+
+			};
+		},
+		methods: {
+			go_link(item) {
+				let link = item.link
+				console.log(link)
+				
+				// OA系统
+				if(link.indexOf("oa_system.nxjiewei.com") != -1 ){
+					uni.navigateTo({
+						url:"../../origanization/OA/h5/h5",
+						success: (res) =>{
+							// 通过eventChannel向被打开页面传送数据
+							res.eventChannel.emit('acceptDataFromOpenerPage', {
+								url: link,
+								title: item.title
+							})
+						}
+					})
+					
+					return
+				}
+				
+				// 二维码
+				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:"../../index/h5/h5?url="+link
+					})
+				}
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		margin-bottom: 30rpx;
+		background-color: #FFFFFF;
+
+		box-sizing: border-box;
+		padding: 50rpx 25rpx 25rpx 25rpx;
+	}
+
+	.list {
+		overflow: hidden;
+
+		.item {
+			float: left;
+			margin-right: 25rpx;
+			margin-bottom: 30rpx;
+			width: 120rpx;
+			.icon {
+				width: 120rpx;
+				text-align: center;
+
+				image {
+					width: 104rpx;
+					height: 104rpx;
+					border-radius: 50%;
+				}
+			}
+
+			.name {
+				width: 120rpx;
+				text-align: center;
+				font-size: 30rpx;
+
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+		}
+
+		.item:nth-child(5n) {
+			margin-right: 0;
+		}
+	}
+</style>

components/t-i-icon/t-i-icon.vue

@@ -1,13 +1,26 @@
 <template>
 	<view class="content">
-		<view class="list">
-			<view class="item" v-for="(item,index) in iconList" :key="index" @click="go_link(item)">
+		<view class="nav">
+			<view class="item" v-for="(item,index) in iconList.arr" :key="index">
 				<view class="icon">
 					<image :src="item.icon" mode=""></image>
 				</view>
 				<view class="name">{{item.title}}</view>
 			</view>
 		</view>
+		<view class="section" v-for="(item,index) in iconList.data" :key="index">
+			<view v-if="item.data.length > 0">
+				<view class="title">{{item.category_name}}</view>
+				<view class="list">
+					<view class="item" v-for="(item_2,index_2) in item.data" :key="index_2" @click="go_link(item_2)">
+						<view class="icon">
+							<image :src="item_2.icon" mode=""></image>
+						</view>
+						<view class="name">{{item_2.title}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -24,15 +37,16 @@
 			};
 		},
 		methods: {
+
 			go_link(item) {
 				let link = item.link
 				console.log(link)
-				
+
 				// OA系统
-				if(link.indexOf("oa_system.nxjiewei.com") != -1 ){
+				if (link.indexOf("oa_system.nxjiewei.com") != -1) {
 					uni.navigateTo({
-						url:"../../origanization/OA/h5/h5",
-						success: (res) =>{
+						url: "../../origanization/OA/h5/h5",
+						success: (res) => {
 							// 通过eventChannel向被打开页面传送数据
 							res.eventChannel.emit('acceptDataFromOpenerPage', {
 								url: link,
@@ -40,14 +54,14 @@
 							})
 						}
 					})
-					
+
 					return
 				}
-				
+
 				// 二维码
 				if (link.indexOf("pageId") != -1 && link.indexOf("app:") == -1) {
 					let pageId = ""
-				
+
 					function GetQueryString(name) {
 						var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
 						var r = link.match(reg);
@@ -60,7 +74,7 @@
 					} else {
 						pageId = link.split('=')[1]
 					}
-				
+
 					uni.navigateTo({
 						url: "../../index/record/record?pageId=" + pageId + "&mine_code=" + this.mine_code,
 					})
@@ -68,10 +82,10 @@
 				// h5
 				if (link.indexOf("pageId") == -1 && link.indexOf("app:") == -1) {
 					uni.navigateTo({
-						url:"../../index/h5/h5?url="+link
+						url: "../../index/h5/h5?url=" + link
 					})
 				}
-				
+
 			}
 		}
 	}
@@ -83,25 +97,26 @@
 		background-color: #FFFFFF;
 
 		box-sizing: border-box;
-		padding: 50rpx 25rpx 25rpx 25rpx;
+		padding: 50rpx 25rpx 15rpx;
 	}
 
-	.list {
+	.nav {
 		overflow: hidden;
 
 		.item {
 			float: left;
+			width: 120rpx;
+
 			margin-right: 25rpx;
 			margin-bottom: 30rpx;
-			width: 120rpx;
+
 			.icon {
 				width: 120rpx;
 				text-align: center;
 
 				image {
-					width: 104rpx;
-					height: 104rpx;
-					border-radius: 50%;
+					width: 100rpx;
+					height: 100rpx;
 				}
 			}
 
@@ -120,4 +135,50 @@
 			margin-right: 0;
 		}
 	}
+
+	.section {
+		margin-top: 20rpx;
+
+		.title {
+			font-size: 36rpx;
+			margin-bottom: 40rpx;
+		}
+
+		.list {
+			overflow: hidden;
+
+			.item {
+				float: left;
+				width: 148rpx;
+
+				margin-right: 36rpx;
+				margin-bottom: 30rpx;
+
+				.icon {
+					width: 148rpx;
+					text-align: center;
+
+					image {
+						width: 104rpx;
+						height: 104rpx;
+					}
+				}
+
+				.name {
+					width: 148rpx;
+					text-align: center;
+					font-size: 30rpx;
+
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+				}
+			}
+
+			.item:nth-child(4n) {
+				margin-right: 0;
+			}
+		}
+
+	}
 </style>

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

@@ -0,0 +1,308 @@
+<template>
+	<view>
+		<view class="content">
+			<view class="status_bar">
+				<!-- 这里是状态栏 -->
+			</view>
+
+			<view class="navbar">
+				<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>
+					<image v-if="mine_code == 'meihuajing'" src="@/static/switch-kuang/meihuajing.png" mode=""></image>
+					<image v-if="mine_code == 'jinfeng'" src="@/static/switch-kuang/jinfeng.png" mode=""></image>
+					<image v-if="mine_code == 'xixuan'" src="@/static/switch-kuang/xixuan.png" mode=""></image>
+					<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>
+					<uni-icons type="arrowdown" color="#fff"></uni-icons>
+				</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>
+					<image v-if="mine_code == 'jinfeng'" src="@/static/switch-kuang/jinfeng.png" mode=""></image>
+					<image v-if="mine_code == 'xixuan'" src="@/static/switch-kuang/xixuan.png" mode=""></image>
+					<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 class="search" v-if="mine_code != 'qingshuiying' && mine_code != 'wuyegongsi'">
+					<view class="box">
+						<view class="left" @click="go_search()">
+							<view class="icon">
+								<image src="./icon/search.png" mode=""></image>
+							</view>
+							<view class="text">搜索</view>
+						</view>
+						<view class="scan" @click="scan()">
+							<image src="./icon/saoma.png" mode=""></image>
+						</view>
+					</view>
+				</view>
+				<view class="right">
+					<swiper class="box" autoplay circular vertical :interval="4000" :duration="1000">
+						<swiper-item class="item">
+							<view class="icon">
+								<image src="./icon/day.png" mode=""></image>
+							</view>
+							<view class="num">{{temperature_curr}}</view>
+						</swiper-item>
+						<swiper-item class="item" @click="go_integral()">
+							<view class="icon" style="margin-right: 4rpx;">
+								积分
+							</view>
+							<view class="num">{{total}} 分</view>
+						</swiper-item>
+					</swiper>
+
+				</view>
+				
+			</view>
+		</view>
+
+		<view class="status_bar"></view>
+		<view style="height: 88rpx;"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "t-i-navbar-2",
+		props: [
+			"mine_code",
+			"navbar_bg_color"
+		],
+		data() {
+			return {
+				// 当前温度
+				temperature_curr: "",
+
+				// 总积分
+				total: 0
+			};
+		},
+		created() {
+			// 当前温度
+			uni.request({
+				url: "http://api.k780.com/?app=weather.today&weaId=286&appkey=10003&sign=b59bc3ef6191eb9f747dd4e83c99f2a4&format=json",
+				method: "GET",
+				success: (res) => {
+					// console.log(res.data.result.temperature_curr)
+					this.temperature_curr = res.data.result.temperature_curr
+				}
+			})
+
+			// 登录签到
+			this.add_staff_integral_increase()
+			//查询员工积分
+			this.get_staff_integral_query()
+
+		},
+		methods: {
+			switch_kuang() {
+				uni.navigateTo({
+					url: "../../index/switch-kuang/switch-kuang"
+				})
+			},
+			go_search() {
+				uni.navigateTo({
+					url: "../../index/search/search?mine_code=" + this.mine_code,
+					animationType: "fade-in",
+					animationDuration: 500
+				})
+			},
+			scan() {
+				// 只允许通过相机扫码
+				uni.scanCode({
+					onlyFromCamera: true,
+					success: function(res) {
+						// console.log('条码类型：' + res.scanType);
+						// console.log('条码内容：' + res.result);
+
+						let pageId = ""
+
+						function GetQueryString(name) {
+							var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+							var r = res.match(reg);
+							if (r != null) return unescape(r[2]);
+							return null;
+						}
+						console.log(GetQueryString("pageId"))
+						if (GetQueryString("pageId")) {
+							pageId = GetQueryString("pageId")
+						} else {
+							pageId = res.split('=')[1]
+						}
+
+						uni.navigateTo({
+							url: "../../index/record/record?pageId=" + pageId + "&mine_code=" + this
+								.mine_code,
+						})
+					}
+				})
+			},
+
+			// 添加员工积分 登录签到
+			add_staff_integral_increase() {
+				this.$api.staff_integral_increase({
+					staff_num: uni.getStorageSync('user').staff_num,
+					integral_type: 1,
+					integral_num: 1
+				}).then((res) => {
+					// console.log(res)
+
+					if (res.data.content.is_exists == 0) {
+						uni.showToast({
+							icon: "none",
+							title: "签到成功！"
+						})
+					}
+				})
+			},
+			//查询员工积分
+			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
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		position: fixed;
+		top: 0;
+		left: 0;
+
+		z-index: 999;
+
+
+		width: 750rpx;
+
+		background-image: url(./icon/bg_img.jpg);
+		background-size: 750rpx 334rpx;
+		background-repeat: no-repeat;
+	}
+
+	.navbar {
+		box-sizing: border-box;
+		padding: 10rpx 25rpx;
+
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		height: 88rpx;
+
+		.left {
+			display: flex;
+			align-items: center;
+
+			width: 170rpx;
+
+			image {
+				width: 165rpx;
+				height: 48rpx;
+
+				margin-right: 10rpx;
+			}
+		}
+
+		.search {
+			width: 370rpx;
+
+			.box {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				height: 68rpx;
+
+				background-color: rgba(255, 255, 255, .4);
+				border-radius: 50rpx;
+
+				box-sizing: border-box;
+				padding: 0 20rpx;
+
+				.left {
+					display: flex;
+					height: 68rpx;
+					width: 300rpx;
+
+					.icon {
+						image {
+							width: 21rpx;
+							height: 21rpx;
+						}
+					}
+
+					.text {
+						color: #FFFFFF;
+						font-size: 24rpx;
+					}
+
+				}
+
+				.scan {
+					width: 68rpx;
+					text-align: right;
+					line-height: 68rpx;
+
+					image {
+						width: 27rpx;
+						height: 25rpx;
+					}
+				}
+			}
+		}
+
+		.right {
+			white-space: nowrap;
+			color: #FFFFFF;
+			font-size: 24rpx;
+			width: 124rpx;
+			margin-left: 20rpx;
+			border-left: 2rpx solid #FFFFFF;
+			box-sizing: border-box;
+			padding-left: 20rpx;
+			height: 40rpx;
+
+			.box {
+				width: 124rpx;
+				height: 40rpx;
+
+				.item {
+					display: flex;
+					align-items: center;
+
+					.icon {
+						margin-right: 10rpx;
+
+						image {
+							width: 40rpx;
+							height: 40rpx;
+						}
+					}
+
+					.num {
+						color: #FFFFFF;
+						font-size: 24rpx;
+					}
+				}
+			}
+		}
+	}
+</style>

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

@@ -6,7 +6,7 @@
 			</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()">

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

@@ -0,0 +1,180 @@
+<template>
+	<view class="content">
+		<view class="box">
+			<!-- 文字滚动 -->
+			<uni-notice-bar scrollable="true" :speed="30" background-color="#ffffff00" color="#fff" single="true"
+				:text="text_time">
+			</uni-notice-bar>
+
+			<!-- 文字滚动 -->
+			<uni-notice-bar scrollable="true" :speed="20" background-color="#ffffff00" color="#fff" single="true"
+				:text="text"></uni-notice-bar>
+				
+			<!-- <view class="more" @click="go_duty_information()">
+				<uni-icons type="more-filled" color="#fff"></uni-icons>
+			</view> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		sloarToLunar,
+		getYearMonthDay
+	} from "../../components/Toling-DateSelect/computedLunarDate.js";
+
+	// 返回指定日期距今多少天
+	const daysComputed = time => {
+		let oldTimeFormat = new Date(time)
+		let nowDate = new Date()
+		if (nowDate.getTime() - oldTimeFormat.getTime() > 0) {
+			let times = nowDate.getTime() - oldTimeFormat.getTime()
+			let days = parseInt(times / (60 * 60 * 24 * 1000))
+			return days
+		} else {
+			throw ('传入时间不能大于当前日期')
+		}
+	}
+	// console.log(daysComputed('2006-04-28'))
+
+	// 返回指定日期前/后多少天的日期
+	function getNextDate(date, day) {
+		var dd = new Date(date);
+		dd.setDate(dd.getDate() + day);
+		var y = dd.getFullYear();
+		var m = dd.getMonth() + 1 < 10 ? "0" + (dd.getMonth() + 1) : dd.getMonth() + 1;
+		var d = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate();
+		return y + "-" + m + "-" + d;
+	};
+
+	// getNextDate("2018-09-27",10)
+	export default {
+		name: "t-i-notice-2",
+		props: [
+			"text",
+			"mine_code"
+		],
+		data() {
+			return {
+				text_time: "",
+
+
+				year: 0,
+				month: 0,
+				today: 0,
+
+				lunarStr2: "",
+				days: 0
+			};
+		},
+		created() {
+
+			this.year = new Date().getFullYear();
+			this.month = new Date().getMonth() + 1;
+			this.today = new Date().getDate();
+
+			this.lunarStr2 = "  农历： " + sloarToLunar(this.year, this.month.toString().padStart(2, '0'), this.today)
+				.lunarStr2
+			// console.log(sloarToLunar(this.year, this.month.toString().padStart(2, '0'), this.today))
+
+			// console.log(getNextDate("2022-01-04",-5730))
+
+			this.days = daysComputed('2006-04-28')
+			// console.log(daysComputed('2006-04-28'))
+			this.getCurrentDate()
+		},
+		methods: {
+			getCurrentDate() {
+				var myDate = new Date();
+				var year = myDate.getFullYear(); //年
+				var month = myDate.getMonth() + 1; //月
+				var day = myDate.getDate(); //日
+				var days = myDate.getDay();
+				switch (days) {
+					case 1:
+						days = '星期一';
+						break;
+					case 2:
+						days = '星期二';
+						break;
+					case 3:
+						days = '星期三';
+						break;
+					case 4:
+						days = '星期四';
+						break;
+					case 5:
+						days = '星期五';
+						break;
+					case 6:
+						days = '星期六';
+						break;
+					case 0:
+						days = '星期日';
+						break;
+				}
+
+				var str = "今日 " + " " + year + "年" + month + "月" + day + "日  " + days;
+				
+				if (uni.getStorageSync('mine_code') == 'zaoquan') {
+					this.text_time = str + " " + this.lunarStr2 + " 累计安全生产 " + this.days + " 天"
+				} else {
+					this.text_time = str + " " + this.lunarStr2
+				}
+
+			},
+
+		
+			go_duty_information(){
+				uni.navigateTo({
+					url:"../../workbench/duty_information/duty_information"
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		width: 750rpx;
+		height: 244rpx;
+
+		background-image: url(./icon/bg_img.jpg);
+		background-size: 750rpx 334rpx;
+		background-repeat: no-repeat;
+		background-position: bottom;
+
+		box-sizing: border-box;
+		padding-top: 20rpx;
+	}
+
+	.box {
+		margin: 0 auto;
+		width: 700rpx;
+		// height: 200rpx;
+		background-color: rgba(255, 255, 255, .4);
+		border-radius: 20rpx;
+
+		box-sizing: border-box;
+		padding: 0 20rpx;
+		
+		position: relative;
+
+		/deep/.uni-noticebar {
+			margin-bottom: 0;
+		}
+
+		/deep/.uni-noticebar:nth-child(2) {
+			padding-top: 0;
+		}
+		
+		
+		.more{
+			transform: rotate(90deg);
+			
+			position: absolute;
+			top: 42rpx;
+			right: 5rpx;
+		}
+	}
+</style>

components/t-o-news-tab-1/t-o-news-tab-1 - 初始版本备份.vue

@@ -0,0 +1,533 @@
+<template>
+	<view>
+		<scroll-view scroll-x>
+			<view class="tab">
+				<view class="item" @click="change_active(index,item)" v-for="(item,index) in fiveFixedCategory"
+					:key="index">
+					<view class="text" :class="active == index?'active':''">{{item}}</view>
+				</view>
+
+			</view>
+		</scroll-view>
+
+		<view class="list">
+			<view class="item" v-for="(item,index) in list" :key="index" v-if="item.table_data.length > 0">
+				<view class="icon_tubiao" @click="popup_tubiao(item)">
+					<image src="./icon/icon_tubiao.png" mode=""></image>
+				</view>
+				<view class="title">{{item.title}}</view>
+
+				<uni-table border emptyText="暂无更多数据">
+					<!-- 表头行 -->
+					<uni-tr>
+						<uni-th align="center" width="60">序号</uni-th>
+						<uni-th align="center" v-for="(item_2,index_2) in item.name">{{item_2}}</uni-th>
+					</uni-tr>
+					<!-- 表格数据行 -->
+					<uni-tr v-for="(item_2,index_2) in item.table_data" :key="index_2">
+						<uni-td style="vertical-align: middle;" align="center">
+							<view class="icon">
+								<image v-if="index_2 < 3" src="./icon/new.png" mode=""></image> <text
+									style="margin-left: 10rpx;">{{index_2+1}}</text>
+								<!-- <text style="margin-left: 10rpx;">{{index_2+1}}</text> -->
+							</view>
+						</uni-td>
+						<uni-td style="vertical-align: middle;" align="center" v-for="(item_3,index_3) in item_2" :key="index_3">
+							<view v-if="typeof(item_3) == 'object'" style="display: flex;align-items: center;">
+								<image style="margin-right: 10rpx;" v-for="(item_4,index_4) in item_3" :src="item_4"
+									:key="index_4">
+								</image>
+							</view>
+							<view v-else>{{item_3}}</view>
+						</uni-td>
+					</uni-tr>
+
+				</uni-table>
+
+				<view class="btn">
+					<view class="icon">
+						<image src="./icon/btn.png" mode=""></image>
+					</view>
+					<view class="btn_text" @click="go_all_list(item.title,item.table,item.num)">点击查看全部信息</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view class="popup_tubiao">
+			<uni-popup ref="popup_tubiao">
+				<view class="tubiao">
+					<view class="tubiao_title">
+						<view class="icon"></view>
+						<view class="text">{{tubiao.title}}</view>
+					</view>
+					<view class="tubiao_box">
+						<view class="charts-box">
+							<qiun-data-charts type="pie" :opts="pie_1" :chartData="chartData"
+								tooltipFormat="column_1" />
+						</view>
+					</view>
+					<view class="tubiao_line">
+						<view class="line">
+							<view class="lable">起始时间</view>
+							<picker mode="date" :value="date_start" @change="bindDateChange_start">
+								<view class="text">
+									<view>{{date_start}}</view>
+									<view>
+										<uni-icons type="arrowdown" size="14" color="#999"></uni-icons>
+									</view>
+								</view>
+							</picker>
+						</view>
+						<view class="line">
+							<view class="lable">结束时间</view>
+							<picker mode="date" :value="date_end" @change="bindDateChange_end">
+								<view class="text">
+									<view>{{date_end}}</view>
+									<view>
+										<uni-icons type="arrowdown" size="14" color="#999"></uni-icons>
+									</view>
+								</view>
+							</picker>
+						</view>
+						<view class="line">
+							<view class="lable">统计项</view>
+							<view class="text" @click="change_census_type()">
+								<view>
+									{{tubiao_census_type}}
+								</view>
+								<view>
+									<uni-icons type="arrowdown" size="14" color="#999"></uni-icons>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+			</uni-popup>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getNextDate
+	} from "@/common/time.js"
+
+
+	export default {
+		name: "t-o-news-tab-1",
+		data() {
+			const currentDate_end = this.getDate({
+				format: true
+			})
+			return {
+				active: 0,
+
+				// 五定表分类
+				fiveFixedCategory: [],
+				// 五定表列表
+				list: [],
+				// 图表数据
+				tubiao: {},
+
+
+				// 图表数据
+				chartData: {
+					"series": [{
+						// "data": [{
+						// 		"name": "一班 (50)",
+						// 		"value": 50
+						// 	}, {
+						// 		"name": "二班",
+						// 		"value": 30
+						// 	},
+						// 	{
+						// 		"name": "三班",
+						// 		"value": 20
+						// 	},
+						// 	{
+						// 		"name": "二班",
+						// 		"value": 30
+						// 	},
+						// ]
+						"data": []
+					}]
+				},
+				pie_1: {
+					"dataLabel": false,
+					"legend": {
+						// "show":false,
+						"position": "bottom",
+						"float": "center",
+						"lineHeight": 20,
+					},
+					"title": {
+						"name": " "
+					},
+					"subtitle": {
+						"name": " "
+					},
+				},
+
+				// 起始时间
+				date_start: "",
+				// 结束时间
+				date_end: currentDate_end,
+				// 图标统计项
+				tubiao_census_type: "",
+				tubiao_census_type_fields: "",
+
+				// 统计项配置参数
+				TableFiledRemark: [],
+
+				TableFiledRemark_name: []
+
+			};
+		},
+		mounted() {
+			this.date_start = getNextDate(this.date_end, -30)
+			this.get_five_fixed_fiveFixedCategory()
+		},
+		methods: {
+			change_active(index, item) {
+				this.active = index
+
+				this.get_list(item)
+			},
+			// 五定表分类
+			get_five_fixed_fiveFixedCategory() {
+				this.$api.five_fixed_fiveFixedCategory({
+
+				}).then((res) => {
+					// console.log(res)
+
+					this.fiveFixedCategory = res.data.content.data
+
+					this.get_list(res.data.content.data[0])
+				})
+			},
+			// 五定表列表
+			get_list(category_name) {
+				uni.showLoading({
+					mask: true
+				})
+				this.$api.five_fixed_fiveFixed({
+					category_name: category_name
+				}).then((res) => {
+					uni.hideLoading()
+					// console.log(res.data.content.data)
+
+					this.list = res.data.content.data
+				})
+			},
+			go_all_list(title, table,num) {
+				uni.navigateTo({
+					url: "../../origanization/news/tab_1/all_list/all_list?title=" + title + "&table=" + table + "&num=" + num
+				})
+			},
+
+			popup_tubiao(item) {
+				// console.log(item)
+				this.tubiao = item
+
+				this.chartData.series[0].data = []
+				this.tubiao_census_type = ""
+
+				this.$refs.popup_tubiao.open()
+
+				this.get_five_fixed_getTableFiledRemark(item.table)
+			},
+			bindDateChange_start: function(e) {
+				this.date_start = e.target.value
+				this.get_five_fixed_getTableFiledTotalNumber()
+			},
+			bindDateChange_end: function(e) {
+				this.date_end = e.target.value
+				this.get_five_fixed_getTableFiledTotalNumber()
+			},
+			getDate(type) {
+				const date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1;
+				let day = date.getDate();
+
+				if (type === 'start') {
+					year = year - 60;
+				} else if (type === 'end') {
+					year = year + 2;
+				}
+				month = month > 9 ? month : '0' + month;
+				day = day > 9 ? day : '0' + day;
+				return `${year}-${month}-${day}`;
+			},
+
+			// 获取统计项参数配置
+			get_five_fixed_getTableFiledRemark(table) {
+				uni.showLoading({
+					mask: true
+				})
+				this.TableFiledRemark_name = []
+				this.$api.five_fixed_getTableFiledRemark({
+					table_name: table
+				}).then((res) => {
+					uni.hideLoading()
+					this.TableFiledRemark = res.data.content.data
+
+					let data = res.data.content.data
+
+					data.forEach((item, index) => {
+						this.TableFiledRemark_name.push(item.name)
+					})
+
+					this.tubiao_census_type = this.TableFiledRemark[0].name
+
+					this.tubiao_census_type_fields = this.TableFiledRemark[0].fields
+
+					this.get_five_fixed_getTableFiledTotalNumber()
+
+				})
+
+			},
+
+			// 改变统计项
+			change_census_type() {
+				uni.showActionSheet({
+					itemList: this.TableFiledRemark_name,
+					success: (res) => {
+						// console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
+						this.tubiao_census_type = this.TableFiledRemark[res.tapIndex].name
+
+						this.tubiao_census_type_fields = this.TableFiledRemark[res.tapIndex].fields
+
+						this.get_five_fixed_getTableFiledTotalNumber()
+					}
+				});
+			},
+
+			// 刷新获取图表数据
+			get_five_fixed_getTableFiledTotalNumber() {
+				this.$api.five_fixed_getTableFiledTotalNumber({
+					table_name: this.tubiao.table,
+					field_name: this.tubiao_census_type_fields,
+					start_date: this.date_start,
+					end_date: this.date_end
+				}).then((res) => {
+					// console.log(res)
+
+					this.chartData.series[0].data = res.data.content.data
+				})
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-table-th.table--border {
+		color: #000000;
+		background-color: #D8D8D8;
+	}
+
+	.uni-table-td.table--border {
+		color: #666666;
+	}
+
+	.tab {
+		display: flex;
+
+		margin-bottom: 20rpx;
+		background-color: #FFFFFF;
+
+		box-sizing: border-box;
+		padding: 0 20rpx;
+
+		.item {
+			background-color: #FFFFFF;
+
+			.text {
+				box-sizing: border-box;
+
+				height: 90rpx;
+				line-height: 90rpx;
+
+				width: 188rpx;
+				text-align: center;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+
+				font-size: 30rpx;
+				color: #666666;
+			}
+
+			.active {
+				font-weight: 700;
+				color: #000000;
+				border-bottom: 4rpx solid #009FE8;
+			}
+
+		}
+	}
+
+	.list {
+		box-sizing: border-box;
+		padding: 0 25rpx;
+
+		.item {
+			position: relative;
+
+			margin-bottom: 20rpx;
+			width: 700rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+
+			box-sizing: border-box;
+			padding: 0 25rpx;
+			padding-bottom: 20rpx;
+
+			.icon_tubiao {
+				position: absolute;
+				top: 40rpx;
+				right: 30rpx;
+
+				image {
+					width: 46rpx;
+					height: 46rpx;
+					display: block;
+				}
+			}
+
+			.title {
+				text-align: center;
+				height: 120rpx;
+				line-height: 120rpx;
+				font-size: 40rpx;
+				font-weight: 700;
+				
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+			}
+
+			.btn {
+				margin: 20rpx auto;
+				width: 400rpx;
+				height: 50rpx;
+
+				background-color: #69BBFA;
+				border-radius: 50rpx;
+
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				.icon {
+					image {
+						width: 23rpx;
+						height: 24rpx;
+
+						display: block;
+					}
+				}
+
+				.btn_text {
+					margin-left: 10rpx;
+					font-size: 28rpx;
+					color: #FFFFFF;
+				}
+			}
+		}
+	}
+
+	.icon {
+		position: relative;
+		top: 0;
+		right: 0;
+
+		image {
+			width: 33rpx;
+			height: 18rpx;
+		}
+	}
+
+	image {
+		width: 80rpx;
+		height: 80rpx;
+		display: block;
+	}
+
+	.tubiao {
+		position: relative;
+		width: 700rpx;
+		background-color: #FFFFFF;
+		// height: 900rpx;
+
+		border-radius: 20rpx;
+		box-sizing: border-box;
+		padding: 25rpx;
+
+		.tubiao_title {
+			height: 90rpx;
+			display: flex;
+			align-items: center;
+
+			.icon {
+				width: 6rpx;
+				height: 40rpx;
+				background-color: #009fe8;
+			}
+
+			.text {
+				margin-left: 20rpx;
+				font-size: 36rpx;
+				font-weight: 700;
+			}
+		}
+
+		.tubiao_box {
+			width: 650rpx;
+			height: 640rpx;
+
+			display: flex;
+			justify-content: center;
+			align-items: top;
+
+			.charts-box {
+				width: 100%;
+				height: 640rpx;
+			}
+		}
+
+		.tubiao_line {
+			padding-top: 20rpx;
+			width: 650rpx;
+			border-top: 2rpx solid #f7f7f7;
+
+			.line {
+				display: flex;
+				align-items: center;
+
+				font-size: 30rpx;
+				margin-bottom: 10rpx;
+
+				.lable {
+					color: #666666;
+					width: 200rpx;
+				}
+
+				.text {
+					width: 400rpx;
+					border-radius: 8rpx;
+					border: 2rpx solid #E9EBF2;
+
+					box-sizing: border-box;
+					padding: 10rpx 25rpx;
+
+					display: flex;
+					justify-content: space-between;
+				}
+			}
+		}
+	}
+</style>

components/t-o-news-tab-1/t-o-news-tab-1 - 副本.vue

@@ -1,309 +0,0 @@
-<template>
-	<view>
-		<view class="tab">
-			<view class="item" @click="change_active(1)">
-				<view class="text" :class="active == 1?'active':''">安全管理</view>
-				<view class="line" v-if="active == 1"></view>
-			</view>
-			<view class="item" @click="change_active(2)">
-				<view class="text" :class="active == 2?'active':''">巡检维护</view>
-				<view class="line" v-if="active == 2"></view>
-			</view>
-			<view class="item" @click="change_active(3)">
-				<view class="text" :class="active == 3?'active':''">党建经营</view>
-				<view class="line" v-if="active == 3"></view>
-			</view>
-			<view class="item" @click="change_active(4)">
-				<view class="text" :class="active == 4?'active':''">其他</view>
-				<view class="line" v-if="active == 4"></view>
-			</view>
-
-		</view>
-
-		<view class="list">
-			<view class="item" v-for="item in 2">
-				<view class="title">五定表</view>
-				<scroll-view scroll-x>
-					<view class="inner">
-						<view class="line">
-							<view class="box">
-								<view class="text text_1">序号</view>
-							</view>
-							<view class="box">
-								<view class="text text_2">检查时间</view>
-							</view>
-							<view class="box">
-								<view class="text text_3">检查地点</view>
-							</view>
-							<view class="box">
-								<view class="text text_4">检查人</view>
-							</view>
-							<view class="box">
-								<view class="text text_5">问题类型</view>
-							</view>
-							<view class="box">
-								<view class="text text_6">问题或隐患描述</view>
-							</view>
-							<view class="box">
-								<view class="text text_7">整改措施</view>
-							</view>
-							<view class="box">
-								<view class="text text_8">完成日期</view>
-							</view>
-							<view class="box">
-								<view class="text text_9">详情</view>
-							</view>
-						</view>
-						<view class="line" v-for="item in 5">
-							<view class="icon">
-								<image src="./icon/new.png" mode=""></image>
-							</view>
-							<view class="box">
-								<view class="text text_1">{{item}}</view>
-							</view>
-							<view class="box">
-								<view class="text text_2">2021-12-25</view>
-							</view>
-							<view class="box">
-								<view class="text text_3">红柳机房</view>
-							</view>
-							<view class="box">
-								<view class="text text_4">李建中、牛之星、李雅婷</view>
-							</view>
-							<view class="box">
-								<view class="text text_5">标准化</view>
-							</view>
-							<view class="box">
-								<view class="text text_6">问题或隐患描述问题或隐患描述问题或隐患描述问题或隐患描述问题或隐患描述问题或隐患描述问题或隐患描述问题或隐患描述
-								</view>
-							</view>
-							<view class="box">
-								<view class="text text_7">整改措施整改措施整改措施整改措施整改措施整改措施</view>
-							</view>
-							<view class="box">
-								<view class="text text_8">2021-12-31</view>
-							</view>
-							<view class="box">
-								<view class="text text_9">查看</view>
-							</view>
-						</view>
-
-
-					</view>
-				</scroll-view>
-				<view class="btn">
-					<view class="icon">
-						<image src="./icon/btn.png" mode=""></image>
-					</view>
-					<view class="btn_text" @click="go_all_list()">点击查看全部信息</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "t-o-news-tab-1",
-		data() {
-			return {
-				active: 1
-			};
-		},
-		methods: {
-			change_active(item) {
-				this.active = item
-			},
-			get_list(){
-				
-			},
-			go_all_list(){
-				uni.navigateTo({
-					url:"../../origanization/news/tab_1/all_list/all_list"
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.tab {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-
-		background-color: #FFFFFF;
-		margin-bottom: 20rpx;
-		height: 90rpx;
-
-		.item {
-			position: relative;
-
-			.text {
-				font-size: 30rpx;
-				color: #666666;
-			}
-
-			.active {
-				font-weight: 700;
-				color: #000000;
-			}
-
-			.line {
-				position: absolute;
-				bottom: -15rpx;
-				left: 50%;
-
-				transform: translateX(-30rpx);
-
-				width: 60rpx;
-				height: 4rpx;
-				background-color: #009FE8;
-			}
-		}
-	}
-
-	.list {
-		box-sizing: border-box;
-		padding: 0 25rpx;
-
-		.item {
-			margin-bottom: 20rpx;
-			width: 700rpx;
-			background-color: #FFFFFF;
-			border-radius: 20rpx;
-
-			box-sizing: border-box;
-			padding: 0 25rpx;
-			padding-bottom: 20rpx;
-
-			.title {
-				text-align: center;
-				height: 120rpx;
-				line-height: 120rpx;
-				font-size: 40rpx;
-				font-weight: 700;
-			}
-
-			.inner {
-				.line {
-					display: flex;
-					align-items: center;
-					
-					position: relative;
-					
-					.icon{
-						position: absolute;
-						top: -10rpx;
-						right: 0;
-						image{
-							width: 33rpx;
-							height: 18rpx;
-						}
-					}
-
-					.box {
-						display: flex;
-						align-items: center;
-						height: 90rpx;
-						box-sizing: border-box;
-						border: 1rpx solid #D9D9D9;
-
-						.text {
-							font-size: 26rpx;
-							color: #333333;
-							text-align: center;
-
-							text-overflow: -o-ellipsis-lastline;
-							overflow: hidden;
-							text-overflow: ellipsis;
-							display: -webkit-box;
-							-webkit-line-clamp: 2;
-							line-clamp: 2;
-							-webkit-box-orient: vertical;
-						}
-
-						.text_1 {
-							width: 80rpx;
-						}
-
-						.text_2 {
-							width: 220rpx;
-						}
-
-						.text_3 {
-							width: 200rpx;
-						}
-
-						.text_4 {
-							width: 400rpx;
-						}
-
-						.text_5 {
-							width: 200rpx;
-						}
-
-						.text_6 {
-							width: 500rpx;
-						}
-
-						.text_7 {
-							width: 500rpx;
-						}
-
-						.text_8 {
-							width: 200rpx;
-						}
-
-						.text_9 {
-							width: 200rpx;
-						}
-					}
-
-
-				}
-
-				.line:nth-child(1) {
-					.box {
-						height: 80rpx;
-						background-color: #D8D8D8;
-
-						.text {
-							font-size: 28rpx;
-							color: #000000;
-						}
-					}
-				}
-
-			}
-
-			.btn {
-				margin: 20rpx auto;
-				width: 400rpx;
-				height: 50rpx;
-
-				background-color: #69BBFA;
-				border-radius: 50rpx;
-
-				display: flex;
-				align-items: center;
-				justify-content: center;
-
-				.icon {
-					image {
-						width: 23rpx;
-						height: 24rpx;
-
-						display: block;
-					}
-				}
-
-				.btn_text {
-					margin-left: 10rpx;
-					font-size: 28rpx;
-					color: #FFFFFF;
-				}
-			}
-		}
-	}
-</style>

components/t-o-news-tab-1/t-o-news-tab-1 - 滚动选项.vue

@@ -1,321 +0,0 @@
-<template>
-	<view>
-		<scroll-view scroll-x>
-			<view class="tab">
-				<view class="item" @click="change_active(1)">
-					<view class="text" :class="active == 1?'active':''">安全管理</view>
-				</view>
-				<view class="item" @click="change_active(2)">
-					<view class="text" :class="active == 2?'active':''">巡检维护</view>
-				</view>
-				<view class="item" @click="change_active(3)">
-					<view class="text" :class="active == 3?'active':''">党建经营</view>
-				</view>
-				<view class="item" @click="change_active(4)">
-					<view class="text" :class="active == 4?'active':''">其他</view>
-				</view>
-				<view class="item" @click="change_active(4)">
-					<view class="text" :class="active == 4?'active':''">其他</view>
-				</view>
-				<view class="item" @click="change_active(4)">
-					<view class="text" :class="active == 4?'active':''">其他</view>
-				</view>
-				<view class="item" @click="change_active(4)">
-					<view class="text" :class="active == 4?'active':''">其他</view>
-				</view>
-				<view class="item" @click="change_active(4)">
-					<view class="text" :class="active == 4?'active':''">其他</view>
-				</view>
-
-			</view>
-		</scroll-view>
-
-		<view class="list">
-			<view class="item" v-for="item in 2">
-				<view class="title">五定表</view>
-				<scroll-view scroll-x>
-					<view class="inner">
-						<view class="line">
-							<view class="box">
-								<view class="text text_1">序号</view>
-							</view>
-							<view class="box">
-								<view class="text text_2">检查时间</view>
-							</view>
-							<view class="box">
-								<view class="text text_3">检查地点</view>
-							</view>
-							<view class="box">
-								<view class="text text_4">检查人</view>
-							</view>
-							<view class="box">
-								<view class="text text_5">问题类型</view>
-							</view>
-							<view class="box">
-								<view class="text text_6">问题或隐患描述</view>
-							</view>
-							<view class="box">
-								<view class="text text_7">整改措施</view>
-							</view>
-							<view class="box">
-								<view class="text text_8">完成日期</view>
-							</view>
-							<view class="box">
-								<view class="text text_9">详情</view>
-							</view>
-						</view>
-						<view class="line" v-for="item in 5">
-							<view class="icon">
-								<image src="./icon/new.png" mode=""></image>
-							</view>
-							<view class="box">
-								<view class="text text_1">{{item}}</view>
-							</view>
-							<view class="box">
-								<view class="text text_2">2021-12-25</view>
-							</view>
-							<view class="box">
-								<view class="text text_3">红柳机房</view>
-							</view>
-							<view class="box">
-								<view class="text text_4">李建中、牛之星、李雅婷</view>
-							</view>
-							<view class="box">
-								<view class="text text_5">标准化</view>
-							</view>
-							<view class="box">
-								<view class="text text_6">问题或隐患描述问题或隐患描述问题或隐患描述问题或隐患描述问题或隐患描述问题或隐患描述问题或隐患描述问题或隐患描述
-								</view>
-							</view>
-							<view class="box">
-								<view class="text text_7">整改措施整改措施整改措施整改措施整改措施整改措施</view>
-							</view>
-							<view class="box">
-								<view class="text text_8">2021-12-31</view>
-							</view>
-							<view class="box">
-								<view class="text text_9">查看</view>
-							</view>
-						</view>
-
-
-					</view>
-				</scroll-view>
-				<view class="btn">
-					<view class="icon">
-						<image src="./icon/btn.png" mode=""></image>
-					</view>
-					<view class="btn_text" @click="go_all_list()">点击查看全部信息</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "t-o-news-tab-1",
-		data() {
-			return {
-				active: 1
-			};
-		},
-		methods: {
-			change_active(item) {
-				this.active = item
-			},
-			get_list() {
-
-			},
-			go_all_list() {
-				uni.navigateTo({
-					url: "../../origanization/news/tab_1/all_list/all_list"
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.tab {
-		display: flex;
-
-		margin-bottom: 20rpx;
-		background-color: #FFFFFF;
-
-		box-sizing: border-box;
-		padding: 0 20rpx;
-
-		.item {
-			background-color: #FFFFFF;
-
-			.text {
-				box-sizing: border-box;
-
-				height: 90rpx;
-				line-height: 90rpx;
-
-				width: 188rpx;
-				text-align: center;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
-
-				font-size: 30rpx;
-				color: #666666;
-			}
-
-			.active {
-				font-weight: 700;
-				color: #000000;
-				border-bottom: 4rpx solid #009FE8;
-			}
-
-		}
-	}
-
-	.list {
-		box-sizing: border-box;
-		padding: 0 25rpx;
-
-		.item {
-			margin-bottom: 20rpx;
-			width: 700rpx;
-			background-color: #FFFFFF;
-			border-radius: 20rpx;
-
-			box-sizing: border-box;
-			padding: 0 25rpx;
-			padding-bottom: 20rpx;
-
-			.title {
-				text-align: center;
-				height: 120rpx;
-				line-height: 120rpx;
-				font-size: 40rpx;
-				font-weight: 700;
-			}
-
-			.inner {
-				.line {
-					display: flex;
-					align-items: center;
-
-					position: relative;
-
-					.icon {
-						position: absolute;
-						top: -10rpx;
-						right: 0;
-
-						image {
-							width: 33rpx;
-							height: 18rpx;
-						}
-					}
-
-					.box {
-						display: flex;
-						align-items: center;
-						height: 90rpx;
-						box-sizing: border-box;
-						border: 1rpx solid #D9D9D9;
-
-						.text {
-							font-size: 26rpx;
-							color: #333333;
-							text-align: center;
-
-							text-overflow: -o-ellipsis-lastline;
-							overflow: hidden;
-							text-overflow: ellipsis;
-							display: -webkit-box;
-							-webkit-line-clamp: 2;
-							line-clamp: 2;
-							-webkit-box-orient: vertical;
-						}
-
-						.text_1 {
-							width: 80rpx;
-						}
-
-						.text_2 {
-							width: 220rpx;
-						}
-
-						.text_3 {
-							width: 200rpx;
-						}
-
-						.text_4 {
-							width: 400rpx;
-						}
-
-						.text_5 {
-							width: 200rpx;
-						}
-
-						.text_6 {
-							width: 500rpx;
-						}
-
-						.text_7 {
-							width: 500rpx;
-						}
-
-						.text_8 {
-							width: 200rpx;
-						}
-
-						.text_9 {
-							width: 200rpx;
-						}
-					}
-
-
-				}
-
-				.line:nth-child(1) {
-					.box {
-						height: 80rpx;
-						background-color: #D8D8D8;
-
-						.text {
-							font-size: 28rpx;
-							color: #000000;
-						}
-					}
-				}
-
-			}
-
-			.btn {
-				margin: 20rpx auto;
-				width: 400rpx;
-				height: 50rpx;
-
-				background-color: #69BBFA;
-				border-radius: 50rpx;
-
-				display: flex;
-				align-items: center;
-				justify-content: center;
-
-				.icon {
-					image {
-						width: 23rpx;
-						height: 24rpx;
-
-						display: block;
-					}
-				}
-
-				.btn_text {
-					margin-left: 10rpx;
-					font-size: 28rpx;
-					color: #FFFFFF;
-				}
-			}
-		}
-	}
-</style>

components/t-o-news-tab-1/t-o-news-tab-1.vue

@@ -12,11 +12,43 @@
 
 		<view class="list">
 			<view class="item" v-for="(item,index) in list" :key="index" v-if="item.table_data.length > 0">
-				<view class="icon_tubiao" @click="popup_tubiao(item)">
-					<image src="./icon/icon_tubiao.png" mode=""></image>
-				</view>
+
 				<view class="title">{{item.title}}</view>
 
+				<view class="tubiao">
+					<view class="tubiao_box">
+						<view class="charts-box">
+							<qiun-data-charts type="pie" :opts="pie_1" :chartData="item.chartData" @getIndex="legend_click($event,item.title,item.table,item.num,index)" tooltipFormat="column_1" />
+						</view>
+					</view>
+					<view class="tubiao_line">
+						<view class="line">
+							<view class="lable">起始时间</view>
+							<picker mode="date" :value="item.date_start" @change="bindDateChange_start($event,index,item.table)">
+								<view class="text">
+									<view>{{item.date_start}}</view>
+									<view>
+										<uni-icons type="arrowdown" size="14" color="#999"></uni-icons>
+									</view>
+								</view>
+							</picker>
+						</view>
+						<view class="line">
+							<view class="lable">结束时间</view>
+							<picker mode="date" :value="item.date_end" @change="bindDateChange_end($event,index,item.table)">
+								<view class="text">
+									<view>{{item.date_end}}</view>
+									<view>
+										<uni-icons type="arrowdown" size="14" color="#999"></uni-icons>
+									</view>
+								</view>
+							</picker>
+						</view>
+					</view>
+				</view>
+
+
+
 				<uni-table border emptyText="暂无更多数据">
 					<!-- 表头行 -->
 					<uni-tr>
@@ -24,7 +56,7 @@
 						<uni-th align="center" v-for="(item_2,index_2) in item.name">{{item_2}}</uni-th>
 					</uni-tr>
 					<!-- 表格数据行 -->
-					<uni-tr v-for="(item_2,index_2) in item.table_data" :key="index_2">
+					<uni-tr v-for="(item_2,index_2) in item.table_data" :key="index_2" @row-click="go_detail(item.num,item_2.id)">
 						<uni-td style="vertical-align: middle;" align="center">
 							<view class="icon">
 								<image v-if="index_2 < 3" src="./icon/new.png" mode=""></image> <text
@@ -32,7 +64,8 @@
 								<!-- <text style="margin-left: 10rpx;">{{index_2+1}}</text> -->
 							</view>
 						</uni-td>
-						<uni-td style="vertical-align: middle;" align="center" v-for="(item_3,index_3) in item_2" :key="index_3">
+						<uni-td style="vertical-align: middle;" align="center" v-for="(item_3,index_3) in item_2"
+							:key="index_3" v-if="typeof(item_3) == 'string' || typeof(item_3) == 'object'">
 							<view v-if="typeof(item_3) == 'object'" style="display: flex;align-items: center;">
 								<image style="margin-right: 10rpx;" v-for="(item_4,index_4) in item_3" :src="item_4"
 									:key="index_4">
@@ -54,58 +87,7 @@
 		</view>
 
 
-		<view class="popup_tubiao">
-			<uni-popup ref="popup_tubiao">
-				<view class="tubiao">
-					<view class="tubiao_title">
-						<view class="icon"></view>
-						<view class="text">{{tubiao.title}}</view>
-					</view>
-					<view class="tubiao_box">
-						<view class="charts-box">
-							<qiun-data-charts type="pie" :opts="pie_1" :chartData="chartData"
-								tooltipFormat="column_1" />
-						</view>
-					</view>
-					<view class="tubiao_line">
-						<view class="line">
-							<view class="lable">起始时间</view>
-							<picker mode="date" :value="date_start" @change="bindDateChange_start">
-								<view class="text">
-									<view>{{date_start}}</view>
-									<view>
-										<uni-icons type="arrowdown" size="14" color="#999"></uni-icons>
-									</view>
-								</view>
-							</picker>
-						</view>
-						<view class="line">
-							<view class="lable">结束时间</view>
-							<picker mode="date" :value="date_end" @change="bindDateChange_end">
-								<view class="text">
-									<view>{{date_end}}</view>
-									<view>
-										<uni-icons type="arrowdown" size="14" color="#999"></uni-icons>
-									</view>
-								</view>
-							</picker>
-						</view>
-						<view class="line">
-							<view class="lable">统计项</view>
-							<view class="text" @click="change_census_type()">
-								<view>
-									{{tubiao_census_type}}
-								</view>
-								<view>
-									<uni-icons type="arrowdown" size="14" color="#999"></uni-icons>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
 
-			</uni-popup>
-		</view>
 	</view>
 </template>
 
@@ -128,34 +110,26 @@
 				fiveFixedCategory: [],
 				// 五定表列表
 				list: [],
-				// 图表数据
-				tubiao: {},
 
 
 				// 图表数据
-				chartData: {
-					"series": [{
-						// "data": [{
-						// 		"name": "一班 (50)",
-						// 		"value": 50
-						// 	}, {
-						// 		"name": "二班",
-						// 		"value": 30
-						// 	},
-						// 	{
-						// 		"name": "三班",
-						// 		"value": 20
-						// 	},
-						// 	{
-						// 		"name": "二班",
-						// 		"value": 30
-						// 	},
-						// ]
-						"data": []
-					}]
-				},
+				// chartData: {
+				// 	"series": [{
+				// 		"data": [{
+				// 			"name": "已完成",
+				// 			"value": 23
+				// 		}, {
+				// 			"name": "未完成",
+				// 			"value": 30
+				// 		}]
+				// 	}]
+				// },
 				pie_1: {
-					"dataLabel": false,
+					"color": [
+						"#1890FF",
+						"#EE6666"
+					],
+					"dataLabel": true,
 					"legend": {
 						// "show":false,
 						"position": "bottom",
@@ -169,20 +143,11 @@
 						"name": " "
 					},
 				},
-
+				
 				// 起始时间
 				date_start: "",
 				// 结束时间
 				date_end: currentDate_end,
-				// 图标统计项
-				tubiao_census_type: "",
-				tubiao_census_type_fields: "",
-
-				// 统计项配置参数
-				TableFiledRemark: [],
-
-				TableFiledRemark_name: []
-
 			};
 		},
 		mounted() {
@@ -216,35 +181,28 @@
 					category_name: category_name
 				}).then((res) => {
 					uni.hideLoading()
-					// console.log(res.data.content.data)
-
 					this.list = res.data.content.data
 				})
 			},
-			go_all_list(title, table,num) {
+			go_all_list(title, table, num) {
 				uni.navigateTo({
-					url: "../../origanization/news/tab_1/all_list/all_list?title=" + title + "&table=" + table + "&num=" + num
+					url: "../../origanization/news/tab_1/all_list/all_list?title=" + title + "&table=" + table + "&num=" + num + "&status=" + ''
 				})
 			},
 
-			popup_tubiao(item) {
-				// console.log(item)
-				this.tubiao = item
-
-				this.chartData.series[0].data = []
-				this.tubiao_census_type = ""
-
-				this.$refs.popup_tubiao.open()
-
-				this.get_five_fixed_getTableFiledRemark(item.table)
-			},
-			bindDateChange_start: function(e) {
-				this.date_start = e.target.value
-				this.get_five_fixed_getTableFiledTotalNumber()
+			bindDateChange_start($event,index,table){
+				// console.log($event.detail.value,index,table)
+				
+				this.date_start = $event.detail.value
+				this.list[index].date_start = $event.detail.value
+				this.get_five_fixed_getYesOrNoDataByTableName(index,table)
 			},
-			bindDateChange_end: function(e) {
-				this.date_end = e.target.value
-				this.get_five_fixed_getTableFiledTotalNumber()
+			bindDateChange_end($event,index,table){
+				// console.log($event.detail.value,index,table)
+				
+				this.date_end = $event.detail.value
+				this.list[index].date_end = $event.detail.value
+				this.get_five_fixed_getYesOrNoDataByTableName(index,table)
 			},
 			getDate(type) {
 				const date = new Date();
@@ -262,60 +220,31 @@
 				return `${year}-${month}-${day}`;
 			},
 
-			// 获取统计项参数配置
-			get_five_fixed_getTableFiledRemark(table) {
-				uni.showLoading({
-					mask: true
-				})
-				this.TableFiledRemark_name = []
-				this.$api.five_fixed_getTableFiledRemark({
-					table_name: table
+			// 刷新获取图表数据
+			get_five_fixed_getYesOrNoDataByTableName(index,table) {
+				this.$api.five_fixed_getYesOrNoDataByTableName({
+					table_name: table,
+					date_start: this.date_start,
+					date_end: this.date_end
 				}).then((res) => {
-					uni.hideLoading()
-					this.TableFiledRemark = res.data.content.data
-
-					let data = res.data.content.data
-
-					data.forEach((item, index) => {
-						this.TableFiledRemark_name.push(item.name)
-					})
-
-					this.tubiao_census_type = this.TableFiledRemark[0].name
-
-					this.tubiao_census_type_fields = this.TableFiledRemark[0].fields
-
-					this.get_five_fixed_getTableFiledTotalNumber()
+					console.log(res)
 
+					this.list[index].chartData = res.data.content.data[0].chartData
 				})
-
 			},
-
-			// 改变统计项
-			change_census_type() {
-				uni.showActionSheet({
-					itemList: this.TableFiledRemark_name,
-					success: (res) => {
-						// console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
-						this.tubiao_census_type = this.TableFiledRemark[res.tapIndex].name
-
-						this.tubiao_census_type_fields = this.TableFiledRemark[res.tapIndex].fields
-
-						this.get_five_fixed_getTableFiledTotalNumber()
-					}
-				});
+			
+			go_detail(num,id){
+				console.log(num,id)
+				uni.navigateTo({
+					url:"../../origanization/news/tab_2/all_list/detail/detail?table=" + num + "&id=" + id
+				})
 			},
-
-			// 刷新获取图表数据
-			get_five_fixed_getTableFiledTotalNumber() {
-				this.$api.five_fixed_getTableFiledTotalNumber({
-					table_name: this.tubiao.table,
-					field_name: this.tubiao_census_type_fields,
-					start_date: this.date_start,
-					end_date: this.date_end
-				}).then((res) => {
-					// console.log(res)
-
-					this.chartData.series[0].data = res.data.content.data
+			
+			legend_click($event,title,table,num,index){
+				console.log($event.currentIndex)
+				let status = $event.currentIndex+1
+				uni.navigateTo({
+					url: "../../origanization/news/tab_1/all_list/all_list?title=" + title + "&table=" + table + "&num=" + num + "&status=" + status + "&date_start=" + this.list[index].date_start + "&date_end=" + this.list[index].date_end
 				})
 			}
 
@@ -386,25 +315,13 @@
 			padding: 0 25rpx;
 			padding-bottom: 20rpx;
 
-			.icon_tubiao {
-				position: absolute;
-				top: 40rpx;
-				right: 30rpx;
-
-				image {
-					width: 46rpx;
-					height: 46rpx;
-					display: block;
-				}
-			}
-
 			.title {
 				text-align: center;
 				height: 120rpx;
 				line-height: 120rpx;
 				font-size: 40rpx;
 				font-weight: 700;
-				
+
 				overflow: hidden;
 				white-space: nowrap;
 				text-overflow: ellipsis;
@@ -459,7 +376,7 @@
 
 	.tubiao {
 		position: relative;
-		width: 700rpx;
+		width: 640rpx;
 		background-color: #FFFFFF;
 		// height: 900rpx;
 
@@ -467,26 +384,8 @@
 		box-sizing: border-box;
 		padding: 25rpx;
 
-		.tubiao_title {
-			height: 90rpx;
-			display: flex;
-			align-items: center;
-
-			.icon {
-				width: 6rpx;
-				height: 40rpx;
-				background-color: #009fe8;
-			}
-
-			.text {
-				margin-left: 20rpx;
-				font-size: 36rpx;
-				font-weight: 700;
-			}
-		}
-
 		.tubiao_box {
-			width: 650rpx;
+			width: 640rpx;
 			height: 640rpx;
 
 			display: flex;

components/t-o-news-tab-2/t-o-news-tab-2 - 大分类备份.vue

@@ -0,0 +1,318 @@
+<template>
+	<view>
+		<scroll-view scroll-x>
+			<view class="tab">
+				<view class="item" @click="change_active(index,item)" v-for="(item,index) in fiveFixedCategory"
+					:key="index">
+					<view class="text" :class="active == index?'active':''">{{item}}</view>
+				</view>
+
+			</view>
+		</scroll-view>
+
+
+		<view class="list">
+			<view class="item" v-for="(item,index) in list" :key="index" v-if="item.data.length > 0">
+				<view class="title">
+					<view class="text">{{item.title}}</view>
+					<view class="tip" v-if="item.count > 0">{{item.count}}</view>
+				</view>
+				<view class="inner" v-for="(item_2,index_2) in item.data">
+					<view class="left">
+						<view class="user" v-if="item_2.face != 'http://localhost/storage/avatar/avatar_15042504.png' && item_2.face != 'upload/face/1.jpg'">
+							<image :src="item_2.face" mode="aspectFill"></image>
+						</view>
+						<view class="user" v-if="item_2.face == 'http://localhost/storage/avatar/avatar_15042504.png' || item_2.face == 'upload/face/1.jpg'">
+							<view class="avatar">{{item_2.optname.split('')[0]}}</view>
+						</view>
+					</view>
+					<view class="right">
+						<view class="name">{{item_2.optname}}<text>{{item_2.depart}}</text></view>
+						<view class="text">
+							<view v-html="item_2.str"></view>
+						</view>
+						<view class="img_box">
+							<view v-for="(item_3,index_3) in item_2.picture" :key="index_3">
+								<view class="img" v-for="(item_4,index_4) in item_3" :key="index_4">
+									<image :src="item_4" mode="aspectFill" @click.stop="img_chakan(item_4)"></image>
+								</view>
+							</view>
+						</view>
+						<view class="time">{{item_2.optdt}}</view>
+					</view>
+				</view>
+				<view class="btn">
+					<view class="icon">
+						<image src="./icon/btn.png" mode=""></image>
+					</view>
+					<view class="btn_text" @click="go_all_list(item.table,item.title,item.num)">点击查看全部信息</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "t-o-news-tab-2",
+		data() {
+			return {
+				active: 0,
+				// 五定表分类
+				fiveFixedCategory: [],
+
+				list: []
+			};
+		},
+		mounted() {
+			this.get_five_fixed_fiveFixedCategory()
+		},
+		methods: {
+			change_active(index, item) {
+				this.active = index
+				
+				this.get_five_fixed_getRecordDataByCategoryName(item)
+			},
+			// 记录管理分类
+			get_five_fixed_fiveFixedCategory() {
+				this.$api.five_fixed_fiveFixedCategory({
+
+				}).then((res) => {
+					this.fiveFixedCategory = res.data.content.data
+
+					this.get_five_fixed_getRecordDataByCategoryName(res.data.content.data[0])
+				})
+			},
+			// 获取记录管理列表
+			get_five_fixed_getRecordDataByCategoryName(category_name) {
+				uni.showLoading({
+					mask: true
+				})
+				this.$api.five_fixed_getRecordDataByCategoryName({
+					category_name: category_name
+				}).then((res) => {
+					uni.hideLoading()
+					
+					// console.log(res.data.content.data)
+					
+					this.list = res.data.content.data
+				})
+			},
+
+			go_all_list(table,title,num) {
+				uni.navigateTo({
+					url: "../../origanization/news/tab_2/all_list/all_list?table=" + table + "&title=" + title + "&num=" + num
+				})
+			},
+			
+			img_chakan(url) {
+			
+				let data = []
+				data[0] = url
+				uni.previewImage({
+					urls: data
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.tab {
+		display: flex;
+
+		margin-bottom: 20rpx;
+		background-color: #FFFFFF;
+
+		box-sizing: border-box;
+		padding: 0 20rpx;
+
+		.item {
+			background-color: #FFFFFF;
+
+			.text {
+				box-sizing: border-box;
+
+				height: 90rpx;
+				line-height: 90rpx;
+
+				width: 188rpx;
+				text-align: center;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+
+				font-size: 30rpx;
+				color: #666666;
+			}
+
+			.active {
+				font-weight: 700;
+				color: #000000;
+				border-bottom: 4rpx solid #009FE8;
+			}
+
+		}
+	}
+
+	.list {
+		box-sizing: border-box;
+		padding: 0 25rpx;
+
+		.item {
+			margin-bottom: 20rpx;
+			width: 700rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+
+			box-sizing: border-box;
+			padding: 0 25rpx;
+			
+			padding-bottom: 20rpx;
+			
+			.title {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.text {
+					text-align: center;
+					height: 120rpx;
+					line-height: 120rpx;
+					font-size: 40rpx;
+					font-weight: 700;
+					
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
+
+				.tip {
+					margin-left: 10rpx;
+					width: 64rpx;
+					height: 30rpx;
+					color: red;
+					text-align: right;
+					font-size: 24rpx;
+
+					background-image: url(./icon/new.png);
+					background-size: 43rpx 30rpx;
+					background-repeat: no-repeat;
+				}
+			}
+
+			.inner {
+				width: 650rpx;
+				display: flex;
+
+				.left {
+					.user {
+						image {
+							width: 90rpx;
+							height: 90rpx;
+
+							border-radius: 50%;
+						}
+					}
+					
+					.avatar{
+						width: 90rpx;
+						height: 90rpx;
+						text-align: center;
+						line-height: 90rpx;
+						border-radius: 50%;
+						background-color: #7EB1A0;
+						color: #FFFFFF;
+						font-size: 36rpx;
+						font-weight: 700;
+					}
+				}
+
+				.right {
+					margin-left: 20rpx;
+
+					width: 600rpx;
+
+					.name {
+						margin-top: 5rpx;
+						font-size: 32rpx;
+
+						text {
+							margin-left: 20rpx;
+							font-size: 26rpx;
+							color: #3a3a3a;
+						}
+					}
+
+					.text {
+						width: 550rpx;
+						margin-top: 10rpx;
+						font-size: 28rpx;
+					}
+
+					.img_box {
+						margin-top: 20rpx;
+
+						width: 550rpx;
+						overflow: hidden;
+
+						.img {
+							margin-bottom: 10rpx;
+							float: left;
+							margin-right: 20rpx;
+							
+							image {
+								width: 170rpx;
+								height: 170rpx;
+
+								border-radius: 10rpx;
+							}
+						}
+
+						.img:nth-child(3n) {
+							margin-right: 0;
+						}
+					}
+
+					.time {
+						margin-top: 20rpx;
+						font-size: 24rpx;
+						color: #999999;
+					}
+
+					
+				}
+			}
+			
+			.btn {
+				margin: 20rpx auto;
+				width: 400rpx;
+				height: 50rpx;
+			
+				background-color: #69BBFA;
+				border-radius: 50rpx;
+			
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			
+				.icon {
+					image {
+						width: 23rpx;
+						height: 24rpx;
+			
+						display: block;
+					}
+				}
+			
+				.btn_text {
+					margin-left: 10rpx;
+					font-size: 28rpx;
+					color: #FFFFFF;
+				}
+			}
+		}
+	}
+
+
+</style>

components/t-o-news-tab-2/t-o-news-tab-2.vue

@@ -1,48 +1,111 @@
 <template>
 	<view>
-		<scroll-view scroll-x>
-			<view class="tab">
-				<view class="item" @click="change_active(index,item)" v-for="(item,index) in fiveFixedCategory"
-					:key="index">
-					<view class="text" :class="active == index?'active':''">{{item}}</view>
+		<!-- 标题 -->
+		<view class="title" @click="open_menu()">
+			<view class="left">
+				<view class="icon">
+					<image src="./icon/menu.png" mode=""></image>
+				</view>
+				<view class="text">{{title}}</view>
+			</view>
+			<view class="right">
+				<view class="icon">
+					<image src="./icon/right_icon.png" mode=""></image>
 				</view>
-
 			</view>
-		</scroll-view>
+		</view>
 
+		<view class="menu" v-show="menu">
+			<view class="menu_item">
+				<view class="left">
+					<view class="item" v-for="(item,index) in menu_1" :key="index" @click="change_active_1(index)"
+						:class="active_1 == index ? 'active' : ''">{{item}}</view>
+				</view>
+				<view class="right">
+					<view class="item" v-for="(item,index) in menu_2" :key="index" @click="change_active_2(index)">
+						<view class="icon" v-if="active_2 == index">
+							<image src="./icon/active.png" mode=""></image>
+						</view>
+						<view class="text" :style="{color: active_2 == index ? '#000' : ''}">{{item.title}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
 
 		<view class="list">
-			<view class="item" v-for="(item,index) in list" :key="index" v-if="item.data.length > 0">
-				<view class="title">
-					<view class="text">{{item.title}}</view>
-					<view class="tip" v-if="item.count > 0">{{item.count}}</view>
+			<view class="tubiao" v-if="title != '全部'">
+				<view class="tubiao_title">
+					<view class="text">{{tubiao_title}}</view>
 				</view>
-				<view class="inner" v-for="(item_2,index_2) in item.data">
+				<view class="tubiao_box">
+					<view class="charts-box">
+						<qiun-data-charts type="pie" :opts="pie_1" :chartData="chartData"
+							@getIndex="legend_click($event)" tooltipFormat="column_1" />
+					</view>
+				</view>
+				<view class="tubiao_line">
+					<view class="line">
+						<view class="lable">起始时间</view>
+						<picker mode="date" :value="date_start" @change="bindDateChange_start">
+							<view class="text">
+								<view>{{date_start}}</view>
+								<view>
+									<uni-icons type="arrowdown" size="14" color="#999"></uni-icons>
+								</view>
+							</view>
+						</picker>
+					</view>
+					<view class="line">
+						<view class="lable">结束时间</view>
+						<picker mode="date" :value="date_end" @change="bindDateChange_end">
+							<view class="text">
+								<view>{{date_end}}</view>
+								<view>
+									<uni-icons type="arrowdown" size="14" color="#999"></uni-icons>
+								</view>
+							</view>
+						</picker>
+					</view>
+					<view class="line">
+						<view class="lable">统计项</view>
+						<view class="text" @click="change_census_type()">
+							<view>
+								{{tubiao_census_type}}
+							</view>
+							<view>
+								<uni-icons type="arrowdown" size="14" color="#999"></uni-icons>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="item" v-for="(item,index) in data" :key="index" @click="go_detail(item.num,item.id)">
+				<view class="inner">
 					<view class="left">
-						<view class="user">
-							<image :src="item_2.face" mode="aspectFill"></image>
+						<view class="user"
+							v-if="item.face != 'http://localhost/storage/avatar/avatar_15042504.png' && item.face != 'upload/face/1.jpg'">
+							<image :src="item.face" mode="aspectFill"></image>
+						</view>
+						<view class="user"
+							v-if="item.face == 'http://localhost/storage/avatar/avatar_15042504.png' || item.face == 'upload/face/1.jpg'">
+							<view class="avatar">{{item.optname.split('')[0]}}</view>
 						</view>
 					</view>
 					<view class="right">
-						<view class="name">{{item_2.optname}}<text>{{item_2.depart}}</text></view>
+						<view class="name">{{item.optname}}<text>{{item.depart}}</text></view>
 						<view class="text">
-							<view v-html="item_2.str"></view>
+							<view v-html="item.str"></view>
 						</view>
 						<view class="img_box">
-							<view class="img" v-for="(item_3,index_3) in item_2.picture" :key="index_3">
-								<view class="" v-for="(item_4,index_4) in item_3" :key="index_4">
-									<image :src="item_4" mode="aspectFill" @click.stop="img_chakan(item_4)"></image>
+							<view v-for="(item_2,index_2) in item.picture" :key="index_2">
+								<view class="img" v-for="(item_3,index_3) in item_2" :key="index_3">
+									<image :src="item_3" mode="aspectFill" @click.stop="img_chakan(item_3)"></image>
 								</view>
 							</view>
 						</view>
-						<view class="time">{{item_2.optdt}}</view>
-					</view>
-				</view>
-				<view class="btn">
-					<view class="icon">
-						<image src="./icon/btn.png" mode=""></image>
+						<view class="time">{{item.optdt}}</view>
+
 					</view>
-					<view class="btn_text" @click="go_all_list(item.table,item.title,item.num)">点击查看全部信息</view>
 				</view>
 			</view>
 		</view>
@@ -50,32 +113,119 @@
 </template>
 
 <script>
+	import {
+		getNextDate
+	} from "@/common/time.js"
 	export default {
 		name: "t-o-news-tab-2",
 		data() {
+			const currentDate_end = this.getDate({
+				format: true
+			})
 			return {
-				active: 0,
-				// 五定表分类
-				fiveFixedCategory: [],
+				title: "全部",
+				menu: false,
+				menu_1: [],
+				menu_2: [],
+
+				active_1: 0,
+				active_2: 0,
+
+				// list
+				table: "",
+
+				page: 1,
+				pageSize: 20,
+
+				name: [],
+				data: [],
+
+
+				// 图表数据
+				tubiao_title: "",
+
+				// 图表数据
+				chartData: {
+					"series": [{
+						"data": []
+					}]
+				},
+				pie_1: {
+					"dataLabel": false,
+					"legend": {
+						// "show":false,
+						"position": "bottom",
+						"float": "center",
+						"lineHeight": 20,
+					},
+					"title": {
+						"name": " "
+					},
+					"subtitle": {
+						"name": " "
+					},
+				},
+
+				// 起始时间
+				date_start: "",
+				// 结束时间
+				date_end: currentDate_end,
+				// 图标统计项
+				tubiao_census_type: "",
+				tubiao_census_type_fields: "",
+
+				// 统计项配置参数
+				TableFiledRemark: [],
+
+				TableFiledRemark_name: []
 
-				list: []
 			};
 		},
 		mounted() {
 			this.get_five_fixed_fiveFixedCategory()
+			this.get_five_fixed_getRecordDataByTableName()
+
+			this.date_start = getNextDate(this.date_end, -30)
 		},
 		methods: {
-			change_active(index, item) {
-				this.active = index
-				
-				this.get_five_fixed_getRecordDataByCategoryName(item)
+			// 翻页
+			nextPage() {
+				this.page++
+				this.get_five_fixed_getRecordDataByTableName()
+			},
+			open_menu() {
+				this.menu = !this.menu
+			},
+			change_active_1(index) {
+				this.active_1 = index
+				this.active_2 = 0
+
+				this.title = this.menu_1[index]
+				this.get_five_fixed_getRecordDataByCategoryName(this.menu_1[index])
+			},
+			change_active_2(index) {
+				this.active_2 = index
+				this.title = this.menu_2[index].title
+				this.tubiao_title = this.menu_2[index].title
+
+				// 当前详情参数
+				this.table = this.menu_2[index].table
+				// 获取图表数据
+				this.date_end = this.getDate()
+				this.date_start = getNextDate(this.date_end, -30)
+				this.get_five_fixed_getTableFiledRemark()
+				// 获取列表
+				this.page = 1
+				this.data = []
+				this.get_five_fixed_getRecordDataByTableName()
+				this.open_menu()
 			},
 			// 记录管理分类
 			get_five_fixed_fiveFixedCategory() {
 				this.$api.five_fixed_fiveFixedCategory({
 
 				}).then((res) => {
-					this.fiveFixedCategory = res.data.content.data
+					this.menu_1 = res.data.content.data
 
 					this.get_five_fixed_getRecordDataByCategoryName(res.data.content.data[0])
 				})
@@ -89,117 +239,240 @@
 					category_name: category_name
 				}).then((res) => {
 					uni.hideLoading()
-					
-					// console.log(res.data.content.data)
-					
-					this.list = res.data.content.data
+
+					this.menu_2 = res.data.content.data
 				})
 			},
-
-			go_all_list(table,title,num) {
-				uni.navigateTo({
-					url: "../../origanization/news/tab_2/all_list/all_list?table=" + table + "&title=" + title + "&num=" + num
+			// 获取该分类下的列表详情
+			get_five_fixed_getRecordDataByTableName() {
+				console.log(this.table)
+				this.$api.five_fixed_getRecordDataByTableName({
+					table_name: this.table,
+					page: this.page,
+					pageSize: this.pageSize
+				}).then((res) => {
+					this.data = this.data.concat(res.data.content.data.table_data.data)
 				})
 			},
-			
 			img_chakan(url) {
-			
 				let data = []
 				data[0] = url
 				uni.previewImage({
 					urls: data
 				});
 			},
+			go_detail(num, id) {
+				uni.navigateTo({
+					url: "../../origanization/news/tab_2/all_list/detail/detail?table=" + num + "&id=" + id
+				})
+			},
+
+
+			bindDateChange_start: function(e) {
+				this.date_start = e.target.value
+				this.get_five_fixed_getTableFiledTotalNumber()
+			},
+			bindDateChange_end: function(e) {
+				this.date_end = e.target.value
+				this.get_five_fixed_getTableFiledTotalNumber()
+			},
+			getDate(type) {
+				const date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1;
+				let day = date.getDate();
+
+				if (type === 'start') {
+					year = year - 60;
+				} else if (type === 'end') {
+					year = year + 2;
+				}
+				month = month > 9 ? month : '0' + month;
+				day = day > 9 ? day : '0' + day;
+				return `${year}-${month}-${day}`;
+			},
+
+			// 获取统计项参数配置
+			get_five_fixed_getTableFiledRemark() {
+				uni.showLoading({
+					mask: true
+				})
+				this.TableFiledRemark_name = []
+				this.$api.five_fixed_getTableFiledRemark({
+					table_name: this.table
+				}).then((res) => {
+					uni.hideLoading()
+					this.TableFiledRemark = res.data.content.data
+
+					let data = res.data.content.data
+
+					data.forEach((item, index) => {
+						this.TableFiledRemark_name.push(item.name)
+					})
+
+					this.tubiao_census_type = this.TableFiledRemark[0].name
+
+					this.tubiao_census_type_fields = this.TableFiledRemark[0].fields
+
+					this.get_five_fixed_getTableFiledTotalNumber()
+
+				})
+
+			},
+
+			// 改变统计项
+			change_census_type() {
+				uni.showActionSheet({
+					itemList: this.TableFiledRemark_name,
+					success: (res) => {
+						this.tubiao_census_type = this.TableFiledRemark[res.tapIndex].name
+						this.tubiao_census_type_fields = this.TableFiledRemark[res.tapIndex].fields
+						this.get_five_fixed_getTableFiledTotalNumber()
+					}
+				});
+			},
+
+			// 获取图表数据
+			get_five_fixed_getTableFiledTotalNumber() {
+				this.$api.five_fixed_getTableFiledTotalNumber({
+					table_name: this.table,
+					field_name: this.tubiao_census_type_fields,
+					start_date: this.date_start,
+					end_date: this.date_end
+				}).then((res) => {
+					this.chartData.series[0].data = res.data.content.data
+				})
+			},
+
+			legend_click($event) {
+				uni.navigateTo({
+					url: "../../origanization/news/tab_2/all_list/all_list?title=" + this.title + "&table=" + this
+						.table + "&tubiao_census_type_fields=" + this.tubiao_census_type_fields +
+						"&tubiao_census_type_fields_value=" + this.chartData.series[0].data[$event.currentIndex]
+						.name.split('(')[0] + "&date_start=" + this.date_start + "&date_end=" + this.date_end
+				})
+			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	.tab {
-		display: flex;
-
-		margin-bottom: 20rpx;
-		background-color: #FFFFFF;
-
+	.title {
 		box-sizing: border-box;
-		padding: 0 20rpx;
-
-		.item {
-			background-color: #FFFFFF;
+		padding: 0 25rpx;
+		height: 90rpx;
 
-			.text {
-				box-sizing: border-box;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
 
-				height: 90rpx;
-				line-height: 90rpx;
+		.left {
+			display: flex;
 
-				width: 188rpx;
-				text-align: center;
-				overflow: hidden;
-				white-space: nowrap;
-				text-overflow: ellipsis;
+			.icon {
+				image {
+					width: 30rpx;
+					height: 30rpx;
+				}
+			}
 
+			.text {
+				margin-left: 18rpx;
 				font-size: 30rpx;
-				color: #666666;
+				color: #009fe8;
 			}
+		}
 
-			.active {
-				font-weight: 700;
-				color: #000000;
-				border-bottom: 4rpx solid #009FE8;
-			}
+		.right {
+			text-align: right;
+			width: 50rpx;
 
+			.icon {
+				image {
+					width: 18rpx;
+					height: 18rpx;
+				}
+			}
 		}
 	}
 
-	.list {
-		box-sizing: border-box;
-		padding: 0 25rpx;
+	.menu {
+		background-color: #FFFFFF;
+		border-radius: 20rpx;
 
-		.item {
-			margin-bottom: 20rpx;
-			width: 700rpx;
-			background-color: #FFFFFF;
-			border-radius: 20rpx;
-
-			box-sizing: border-box;
-			padding: 0 25rpx;
-			
-			padding-bottom: 20rpx;
-			
-			.title {
-				display: flex;
-				justify-content: center;
-				align-items: center;
+		margin: 0 25rpx;
+		width: 700rpx;
 
-				.text {
+		margin-bottom: 40rpx;
+
+		overflow: hidden;
+
+		.menu_item {
+			display: flex;
+
+			.left {
+				.item {
+					width: 260rpx;
 					text-align: center;
-					height: 120rpx;
 					line-height: 120rpx;
-					font-size: 40rpx;
-					font-weight: 700;
-					
-					overflow: hidden;
-					white-space: nowrap;
-					text-overflow: ellipsis;
+					color: #8C8C8C;
+					box-sizing: border-box;
 				}
 
-				.tip {
-					margin-left: 10rpx;
-					width: 64rpx;
-					height: 30rpx;
-					color: red;
-					text-align: right;
-					font-size: 24rpx;
+				.active {
+					background-color: #F8FDFF;
+					color: #00A0E8;
+					border-left: 4rpx solid #00A0E8;
+				}
+			}
+
+			.right {
+				width: 420rpx;
+				box-sizing: border-box;
+				border-left: 4rpx solid #EEEEEE;
+
+				.item {
+					position: relative;
+					line-height: 120rpx;
+
+					display: flex;
+
+					.icon {
+						position: absolute;
+						left: 0;
+						top: 0;
+
+						image {
+							width: 14rpx;
+							height: 26rpx;
+						}
+					}
+
+					.text {
+						margin-left: 48rpx;
+						color: #8C8C8C;
 
-					background-image: url(./icon/new.png);
-					background-size: 43rpx 30rpx;
-					background-repeat: no-repeat;
+						white-space: nowrap;
+						overflow: hidden;
+						text-overflow: ellipsis;
+					}
 				}
 			}
+		}
+	}
+
+	.list {
+		background-color: #FFFFFF;
+		box-sizing: border-box;
+		padding: 25rpx;
+
+		.item {
+			border-bottom: 1rpx solid #f0f0f0;
+			margin-bottom: 40rpx;
 
 			.inner {
-				width: 650rpx;
+				margin-bottom: 40rpx;
+				width: 700rpx;
 				display: flex;
 
 				.left {
@@ -210,13 +483,25 @@
 
 							border-radius: 50%;
 						}
+
+						.avatar {
+							width: 90rpx;
+							height: 90rpx;
+							text-align: center;
+							line-height: 90rpx;
+							border-radius: 50%;
+							background-color: #7EB1A0;
+							color: #FFFFFF;
+							font-size: 36rpx;
+							font-weight: 700;
+						}
 					}
 				}
 
 				.right {
 					margin-left: 20rpx;
 
-					width: 600rpx;
+					width: 650rpx;
 
 					.name {
 						margin-top: 5rpx;
@@ -224,15 +509,15 @@
 
 						text {
 							margin-left: 20rpx;
-							font-size: 26rpx;
+							font-size: 28rpx;
 							color: #3a3a3a;
 						}
 					}
 
 					.text {
-						width: 550rpx;
+						width: 600rpx;
 						margin-top: 10rpx;
-						font-size: 28rpx;
+						font-size: 30rpx;
 					}
 
 					.img_box {
@@ -260,40 +545,80 @@
 					}
 
 					.time {
-						margin-top: 20rpx;
-						font-size: 24rpx;
+						font-size: 26rpx;
 						color: #999999;
 					}
 
-					
+
 				}
 			}
-			
-			.btn {
-				margin: 20rpx auto;
-				width: 400rpx;
-				height: 50rpx;
-			
-				background-color: #69BBFA;
-				border-radius: 50rpx;
-			
+		}
+	}
+
+	.tubiao {
+		position: relative;
+		width: 700rpx;
+		background-color: #FFFFFF;
+		// height: 900rpx;
+
+		border-radius: 20rpx;
+		box-sizing: border-box;
+		padding: 25rpx;
+
+		border-bottom: 2rpx solid #EEEEEE;
+		margin-bottom: 40rpx;
+
+		.tubiao_title {
+			text-align: center;
+			height: 90rpx;
+
+			.text {
+				font-size: 38rpx;
+				font-weight: 700;
+			}
+		}
+
+		.tubiao_box {
+			width: 650rpx;
+			height: 640rpx;
+
+			display: flex;
+			justify-content: center;
+			align-items: top;
+
+			.charts-box {
+				width: 100%;
+				height: 640rpx;
+			}
+		}
+
+		.tubiao_line {
+			padding-top: 20rpx;
+			width: 650rpx;
+			border-top: 2rpx solid #f7f7f7;
+
+			.line {
 				display: flex;
 				align-items: center;
-				justify-content: center;
-			
-				.icon {
-					image {
-						width: 23rpx;
-						height: 24rpx;
-			
-						display: block;
-					}
+
+				font-size: 30rpx;
+				margin-bottom: 10rpx;
+
+				.lable {
+					color: #666666;
+					width: 200rpx;
 				}
-			
-				.btn_text {
-					margin-left: 10rpx;
-					font-size: 28rpx;
-					color: #FFFFFF;
+
+				.text {
+					width: 400rpx;
+					border-radius: 8rpx;
+					border: 2rpx solid #E9EBF2;
+
+					box-sizing: border-box;
+					padding: 10rpx 25rpx;
+
+					display: flex;
+					justify-content: space-between;
 				}
 			}
 		}

components/t-o-news-tab-3/t-o-news-tab-3.vue

@@ -10,7 +10,7 @@
 							<view class="left">
 								{{item_2.name}}
 							</view>
-							<view class="right">
+							<view class="right" @click.stop="go_rank(item_2.id)">
 								<image src="./icon/btn.png"></image>
 							</view>
 						</view>
@@ -57,6 +57,11 @@
 				uni.navigateTo({
 					url: "../../origanization/news/tab_3/h5/h5?id="+id
 				})
+			},
+			go_rank(id){
+				uni.navigateTo({
+					url:"../../origanization/news/tab_3/ranking/ranking?id="+id
+				})
 			}
 		}
 	}

components/t-o-news/t-o-news.vue

@@ -43,12 +43,16 @@
 				<t-o-news-tab-1></t-o-news-tab-1>
 			</view>
 			<view v-if="active == 2">
-				<t-o-news-tab-2></t-o-news-tab-2>
+				<t-o-news-tab-2 ref="tab_2"></t-o-news-tab-2>
 			</view>
 			<view v-if="active == 3">
 				<t-o-news-tab-3></t-o-news-tab-3>
 			</view>
 		</view>
+		
+		<view class="go_top" @click="go_top">
+			<uni-icons type="top" size="22"></uni-icons>
+		</view>
 	</view>
 </template>
 
@@ -63,6 +67,21 @@
 		methods: {
 			change_active(item) {
 				this.active = item
+			},
+			
+			tab_2_onReachBottom(){
+				console.log('tab_2_onReachBottom')
+				
+				if(this.active == 2){
+					this.$refs.tab_2.nextPage();
+				}
+			},
+			
+			go_top(){
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 200
+				});
 			}
 		}
 	}
@@ -114,4 +133,21 @@
 	.content{
 		margin-top: 20rpx;
 	}
+	
+	.go_top{
+		z-index: 999;
+		position: fixed;
+		bottom: 150rpx;
+		right: 50rpx;
+		
+		width: 100rpx;
+		height: 100rpx;
+		line-height: 100rpx;
+		text-align: center;
+		// background-color: #FFFFFF;
+		background-color: #EEEEEE;
+		border-radius: 50%;
+		
+		font-weight: 700;
+	}
 </style>

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>
 

manifest.json

@@ -1,8 +1,8 @@
 {
-    "name" : "智慧枣泉(新)",
-    "appid" : "__UNI__4B520D3",
+    "name" : "E信管理(新)",
+    "appid" : "__UNI__0C12F60",
     "description" : "",
-    "versionName" : "1.0.8",
+    "versionName" : "1.0.12",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
@@ -119,7 +119,10 @@
         "usingComponents" : true
     },
     "mp-toutiao" : {
-        "usingComponents" : true
+        "usingComponents" : true,
+        "uniStatistics" : {
+            "enable" : true
+        }
     },
     "uniStatistics" : {
         "enable" : false

pages.json

@@ -14,9 +14,9 @@
 
 			"path": "pages/tabbar/origanization/origanization",
 			"style": {
-				"navigationBarTitleText": "通讯录"
+				// "navigationBarTitleText": "通讯录"
 				// 宁东运营 显示消息
-				// "navigationBarTitleText": "消息"
+				"navigationBarTitleText": "消息"
 			}
 
 		}, {
@@ -643,10 +643,10 @@
             
         }
         ,{
-            "path" : "pages/production/statistical_analysis_table/meitan_cxl/meitan_cxl",
+            "path" : "pages/origanization/news/tab_3/ranking/ranking",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "煤炭产销量"
+                "navigationBarTitleText": "排行榜"
             }
             
         }
@@ -667,8 +667,8 @@
 			},
 			{
 
-				"text": "通讯录",
-				// "text": "消息",
+				// "text": "通讯录",
+				"text": "消息",
 				"pagePath": "pages/tabbar/origanization/origanization",
 				"iconPath": "static/tabbar/origanization.png",
 				"selectedIconPath": "static/tabbar/origanization_active.png"

pages/origanization/OA/apply_list/apply_list.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="list">
-			<view class="item" v-for="item in 6">
+			<view class="item" v-for="(item,index) in 6" :key="index">
 				<view class="title">用车申请</view>
 				<view class="box">
 					<view class="left">

pages/origanization/OA/approval_list/approval_list - UI页面.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="list">
-			<view class="item" v-for="item in 6">
+			<view class="item" v-for="(item,index) in 6" :key="index">
 				<view class="title">用车申请</view>
 				<view class="box">
 					<view class="left">

pages/origanization/OA/approval_list/detail/detail.vue

@@ -167,7 +167,7 @@
 			<view class="approval_box">
 				<view class="title">审批</view>
 				<view class="list">
-					<view class="item" v-for="item in 6">
+					<view class="item" v-for="(item,index) in 6" :key="index">
 						<view class="left">
 							<view class="img">
 								<image

pages/origanization/communication/origanization/origanization - 二级列表.vue

@@ -1,203 +0,0 @@
-<template>
-	<view>
-		<view class="search">
-			<view class="box">
-				<view class="icon">
-					<uni-icons type="search" size="14" color="#BBBBBB"></uni-icons>
-				</view>
-				<view class="text">搜索</view>
-			</view>
-		</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="section">
-				<view class="box">
-					<view class="item">
-						<view class="left">
-							<view class="icon">
-								<image src="./icon/open.png" mode=""></image>
-							</view>
-							<view class="text">党群工作部 （9）</view>
-						</view>
-						<view class="right">
-							<uni-icons type="eye"></uni-icons>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="section">
-				<view class="box">
-					<view class="item">
-						<view class="left">
-							<view class="icon">
-								<image src="./icon/close.png" mode=""></image>
-							</view>
-							<view class="text">生产技术部 （10）</view>
-						</view>
-						<view class="right">
-							<uni-icons type="eye"></uni-icons>
-						</view>
-					</view>
-				</view>
-				<view class="inner_list">
-					<view class="item" v-for="item in 6">
-						<view class="icon">杨</view>
-						<view class="text">杨名一 部长</view>
-					</view>
-				</view>
-			</view>
-			
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				// 组织架构
-				list:[]
-			};
-		},
-		methods:{
-			// 获取组织架构数据
-			get_section_getlisttree(){
-				this.$api.section_getlisttree({
-					
-				}).then((res)=>{
-					console.log(res.data.data)
-					this.list = res.data.data
-				})
-			}
-		},
-		onLoad() {
-			this.get_section_getlisttree()
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #F3F8F7;
-	}
-	.search{
-		margin-bottom: 20rpx;
-		background-color: #FFFFFF;
-		box-sizing: border-box;
-		padding: 25rpx 30rpx;
-		
-		.box{
-			height: 60rpx;
-			background-color: #F4F4F4;
-			border-radius: 50rpx;
-			
-			display: flex;
-			align-items: center;
-			
-			box-sizing: border-box;
-			padding: 0 25rpx;
-			.icon{
-				margin-right: 10rpx;
-			}
-			.text{
-				font-size: 24rpx;
-				color: #BBBBBB;
-			}
-		}
-	}
-	
-	.content{
-		background-color: #FFFFFF;
-		.title{
-			height: 95rpx;
-			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: 36rpx;
-				font-weight: 700;
-			}
-		}
-		.section{
-			box-sizing: border-box;
-			padding: 0 20rpx;
-			
-			.box{
-				
-				.item{
-					height: 95rpx;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					
-					margin-left: 20rpx;
-					border-bottom: 1rpx solid #F3F8F7;
-					
-					.left{
-						display: flex;
-						align-items: center;
-						.icon{
-							line-height: 95rpx;
-							width: 90rpx;
-							text-align: center;
-							image{
-								width: 24rpx;
-								height: 24rpx;
-							}
-						}
-						.text{
-							font-size: 28rpx;
-						}
-					}
-					.right{
-						line-height: 95rpx;
-						width: 90rpx;
-						text-align: center;
-					}
-				}
-			}
-			.inner_list{
-				.item{
-					height: 95rpx;
-					
-					display: flex;
-					align-items: center;
-					
-					margin-left: 108rpx;
-					border-bottom: 1rpx solid #F3F8F7;
-					.icon{
-						width: 35rpx;
-						text-align: center;
-						line-height: 35rpx;
-						border-radius: 50%;
-						border: 1rpx solid #00A1E9;
-						
-						font-size: 24rpx;
-						color: #00A1E9;
-					}
-					.text{
-						margin-left: 18rpx;
-						font-size: 28rpx;
-						
-					}
-				}
-			}
-		}
-	}
-</style>

pages/origanization/communication/origanization/origanization - 单独部门列表.vue

@@ -1,203 +0,0 @@
-<template>
-	<view>
-		<view class="search">
-			<view class="box">
-				<view class="icon">
-					<uni-icons type="search" size="14" color="#BBBBBB"></uni-icons>
-				</view>
-				<view class="text">搜索</view>
-			</view>
-		</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="section">
-				<view class="box">
-					<view class="item">
-						<view class="left">
-							<view class="icon">
-								<image src="./icon/open.png" mode=""></image>
-							</view>
-							<view class="text">党群工作部 （9）</view>
-						</view>
-						<view class="right">
-							<uni-icons type="eye"></uni-icons>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="section">
-				<view class="box">
-					<view class="item">
-						<view class="left">
-							<view class="icon">
-								<image src="./icon/close.png" mode=""></image>
-							</view>
-							<view class="text">生产技术部 （10）</view>
-						</view>
-						<view class="right">
-							<uni-icons type="eye"></uni-icons>
-						</view>
-					</view>
-				</view>
-				<view class="inner_list">
-					<view class="item" v-for="item in 6">
-						<view class="icon">杨</view>
-						<view class="text">杨名一 部长</view>
-					</view>
-				</view>
-			</view>
-			
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			};
-		},
-		onLoad() {
-			// 获取部门
-			this.get_section_getGroupList()
-		},
-		methods:{
-			get_section_getGroupList(){
-				this.$api.section_getGroupList({
-					
-				}).then((res)=>{
-					console.log(res)
-				})
-			}
-			
-		}
-		
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #F3F8F7;
-	}
-	.search{
-		margin-bottom: 20rpx;
-		background-color: #FFFFFF;
-		box-sizing: border-box;
-		padding: 25rpx 30rpx;
-		
-		.box{
-			height: 60rpx;
-			background-color: #F4F4F4;
-			border-radius: 50rpx;
-			
-			display: flex;
-			align-items: center;
-			
-			box-sizing: border-box;
-			padding: 0 25rpx;
-			.icon{
-				margin-right: 10rpx;
-			}
-			.text{
-				font-size: 24rpx;
-				color: #BBBBBB;
-			}
-		}
-	}
-	
-	.content{
-		background-color: #FFFFFF;
-		.title{
-			height: 95rpx;
-			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: 36rpx;
-				font-weight: 700;
-			}
-		}
-		.section{
-			box-sizing: border-box;
-			padding: 0 20rpx;
-			
-			.box{
-				
-				.item{
-					height: 95rpx;
-					display: flex;
-					align-items: center;
-					justify-content: space-between;
-					
-					margin-left: 20rpx;
-					border-bottom: 1rpx solid #F3F8F7;
-					
-					.left{
-						display: flex;
-						align-items: center;
-						.icon{
-							line-height: 95rpx;
-							width: 90rpx;
-							text-align: center;
-							image{
-								width: 24rpx;
-								height: 24rpx;
-							}
-						}
-						.text{
-							font-size: 28rpx;
-						}
-					}
-					.right{
-						line-height: 95rpx;
-						width: 90rpx;
-						text-align: center;
-					}
-				}
-			}
-			.inner_list{
-				.item{
-					height: 95rpx;
-					
-					display: flex;
-					align-items: center;
-					
-					margin-left: 108rpx;
-					border-bottom: 1rpx solid #F3F8F7;
-					.icon{
-						width: 35rpx;
-						text-align: center;
-						line-height: 35rpx;
-						border-radius: 50%;
-						border: 1rpx solid #00A1E9;
-						
-						font-size: 24rpx;
-						color: #00A1E9;
-					}
-					.text{
-						margin-left: 18rpx;
-						font-size: 28rpx;
-						
-					}
-				}
-			}
-		}
-	}
-</style>

pages/origanization/communication/origanization/origanization - 递归.vue

@@ -1,107 +0,0 @@
-<template>
-	<view>
-		<view class="search">
-			<view class="box">
-				<view class="icon">
-					<uni-icons type="search" size="14" color="#BBBBBB"></uni-icons>
-				</view>
-				<view class="text">搜索</view>
-			</view>
-		</view>
-		
-		<view class="content">
-			<view class="title">
-				<view class="icon">
-					<image src="./icon/title_icon.png" mode=""></image>
-				</view>
-				<view class="text">国家能源集团枣泉煤矿</view>
-			</view>
-			
-			<origanizationTree :list="list"></origanizationTree>
-			
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				// 组织架构
-				list:[
-					
-				]
-			};
-		},
-		methods:{
-			// 获取组织架构数据
-			get_section_getlisttree(){
-				this.$api.section_getlisttree({
-					
-				}).then((res)=>{
-					console.log(res.data.data)
-					this.list = res.data.data
-				})
-			}
-		},
-		onLoad() {
-			this.get_section_getlisttree()
-		}
-	}
-</script>
-
-<style lang="scss">
-	page{
-		background-color: #F3F8F7;
-	}
-	.search{
-		margin-bottom: 20rpx;
-		background-color: #FFFFFF;
-		box-sizing: border-box;
-		padding: 25rpx 30rpx;
-		
-		.box{
-			height: 60rpx;
-			background-color: #F4F4F4;
-			border-radius: 50rpx;
-			
-			display: flex;
-			align-items: center;
-			
-			box-sizing: border-box;
-			padding: 0 25rpx;
-			.icon{
-				margin-right: 10rpx;
-			}
-			.text{
-				font-size: 24rpx;
-				color: #BBBBBB;
-			}
-		}
-	}
-	
-	.content{
-		background-color: #FFFFFF;
-		.title{
-			height: 95rpx;
-			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: 36rpx;
-				font-weight: 700;
-			}
-		}
-		
-	}
-</style>

pages/origanization/news/tab_1/all_list/all_list-竖屏表格.vue

@@ -0,0 +1,127 @@
+<template>
+	<view>
+		<view class="content" v-if="name != ''">
+			<uni-table border emptyText="暂无更多数据">
+				<!-- 表头行 -->
+				<uni-tr>
+					<uni-th align="center" width="60">序号</uni-th>
+					<uni-th align="center" v-for="(item,index) in name" :key="index">{{item}}</uni-th>
+					<!-- <uni-th align="center">查看</uni-th> -->
+				</uni-tr>
+				<!-- 表格数据行 -->
+				<uni-tr v-for="(item,index) in data" :key="index" @row-click="go_detail(item.id)">
+					<uni-td style="vertical-align: middle;" align="center">
+						<view class="icon">
+							<!-- <image src="./icon/new.png" mode=""></image> <text style="margin-left: 10rpx;">{{index+1}}</text> -->
+							<text style="margin-left: 10rpx;">{{index+1}}</text>
+						</view>
+					</uni-td>
+					<uni-td style="vertical-align: middle;" align="center" v-for="(item_2,index_2) in item" :key="index_2" v-if="typeof(item_2) == 'string' || typeof(item_2) == 'object'">
+						<view v-if="typeof(item_2) == 'object'" style="display: flex;align-items: center;">
+							<image @click.stop="img_chakan(item_3)" style="margin-right: 10rpx;"
+								v-for="(item_3,index_3) in item_2" :src="item_3" :key="index_3">
+							</image>
+						</view>
+						<view v-else>{{item_2}}</view>
+					</uni-td>
+					
+					<!-- <uni-td align="center">
+						<view @click="chakan()">查看</view>
+					</uni-td> -->
+				</uni-tr>
+
+			</uni-table>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				table: "",
+				num:"",
+
+				page: 1,
+				pageSize: 30,
+				
+				name:[],
+				data:[]
+			};
+		},
+		onLoad(option) {
+			uni.setNavigationBarTitle({
+				title: option.title
+			})
+			this.num = option.num
+			this.table = option.table
+			this.get_five_fixed_fiveFixedDetail()
+		},
+		onReachBottom(){
+			this.page++
+			this.get_five_fixed_fiveFixedDetail()
+		},
+		methods: {
+			// chakan(){
+			// 	console.log(78)
+			// },
+			get_five_fixed_fiveFixedDetail() {
+				this.$api.five_fixed_fiveFixedDetail({
+					table: this.table,
+					page: this.page,
+					pageSize: this.pageSize
+				}).then((res) => {
+					console.log(res.data.content.data)
+					
+					this.name = res.data.content.data.name
+					this.data = this.data.concat(res.data.content.data.table_data.data)
+				})
+			},
+			img_chakan(url) {
+				console.log(url)
+
+				let data = []
+				data[0] = url
+				uni.previewImage({
+					urls: data
+				});
+			},
+			go_detail(id){
+				console.log(id)
+				uni.navigateTo({
+					url:"../../tab_2/all_list/detail/detail?table=" + this.num + "&id=" + id
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-table-th.table--border {
+		color: #000000;
+		background-color: #D8D8D8;
+	}
+
+	.uni-table-td.table--border {
+		color: #666666;
+	}
+
+
+	.icon {
+		position: relative;
+		top: 0;
+		right: 0;
+
+		image {
+			width: 33rpx;
+			height: 18rpx;
+		}
+	}
+
+	image {
+		width: 80rpx;
+		height: 80rpx;
+		display: block;
+	}
+</style>

pages/origanization/news/tab_1/all_list/all_list.vue

@@ -5,7 +5,7 @@
 				<!-- 表头行 -->
 				<uni-tr>
 					<uni-th align="center" width="60">序号</uni-th>
-					<uni-th align="center" v-for="(item,index) in name" :key="index">{{item}}</uni-th>
+					<uni-th align="center" @click.native="filter_change(item)" v-for="(item,index) in name" :key="index">{{item}}</uni-th>
 					<!-- <uni-th align="center">查看</uni-th> -->
 				</uni-tr>
 				<!-- 表格数据行 -->
@@ -31,6 +31,7 @@
 				</uni-tr>
 
 			</uni-table>
+		
 		</view>
 		
 	</view>
@@ -42,6 +43,11 @@
 			return {
 				table: "",
 				num:"",
+				status:"",
+				// 起始时间
+				date_start: "",
+				// 结束时间
+				date_end: "",
 
 				page: 1,
 				pageSize: 30,
@@ -50,16 +56,30 @@
 				data:[]
 			};
 		},
+		onShow() {
+			// #ifdef APP-PLUS
+			plus.screen.lockOrientation('landscape-primary');
+			// #endif
+		},
+		onUnload() {
+			// #ifdef APP-PLUS
+			plus.screen.lockOrientation('portrait-primary');
+			// #endif
+		},
 		onLoad(option) {
 			uni.setNavigationBarTitle({
 				title: option.title
 			})
+			this.status = option.status
 			this.num = option.num
 			this.table = option.table
+			this.date_start = option.date_start
+			this.date_end = option.date_end
 			this.get_five_fixed_fiveFixedDetail()
 		},
 		onReachBottom(){
 			this.page++
+			console.log(this.page)
 			this.get_five_fixed_fiveFixedDetail()
 		},
 		methods: {
@@ -70,7 +90,10 @@
 				this.$api.five_fixed_fiveFixedDetail({
 					table: this.table,
 					page: this.page,
-					pageSize: this.pageSize
+					pageSize: this.pageSize,
+					status:this.status,
+					date_start:this.date_start,
+					date_end:this.date_end
 				}).then((res) => {
 					console.log(res.data.content.data)
 					
@@ -79,7 +102,7 @@
 				})
 			},
 			img_chakan(url) {
-				console.log(url)
+				// console.log(url)
 
 				let data = []
 				data[0] = url
@@ -92,12 +115,29 @@
 				uni.navigateTo({
 					url:"../../tab_2/all_list/detail/detail?table=" + this.num + "&id=" + id
 				})
+			},
+			
+			filter_change(item){
+				console.log(item)
+				
+				// uni.showActionSheet({
+				// 	itemList: ['A', 'B', 'C'],
+				// 	success: function (res) {
+				// 		console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
+				// 	},
+				// 	fail: function (res) {
+				// 		console.log(res.errMsg);
+				// 	}
+				// });
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
+	.content{
+		width: 100%;
+	}
 	.uni-table-th.table--border {
 		color: #000000;
 		background-color: #D8D8D8;

pages/origanization/news/tab_2/all_list/all_list - 分类下的全部列表备份.vue

@@ -0,0 +1,181 @@
+<template>
+	<view>
+		<view class="list">
+			<view class="item" v-for="(item,index) in data" :key="index" @click="go_detail(item.id)">
+				<view class="inner">
+					<view class="left">
+						<view class="user" v-if="item.face != 'http://localhost/storage/avatar/avatar_15042504.png' && item.face != 'upload/face/1.jpg'">
+							<image :src="item.face" mode="aspectFill"></image>
+						</view>
+						<view class="user" v-if="item.face == 'http://localhost/storage/avatar/avatar_15042504.png' || item.face == 'upload/face/1.jpg'">
+							<view class="avatar">{{item.optname.split('')[0]}}</view>
+						</view>
+					</view>
+					<view class="right">
+						<view class="name">{{item.optname}}<text>{{item.depart}}</text></view>
+						<view class="text">
+							<view v-html="item.str"></view>
+						</view>
+						<view class="img_box">
+							<view v-for="(item_2,index_2) in item.picture" :key="index_2">
+								<view class="img" v-for="(item_3,index_3) in item_2" :key="index_3">
+									<image :src="item_3" mode="aspectFill" @click.stop="img_chakan(item_3)"></image>
+								</view>
+							</view>
+						</view>
+						<view class="time">{{item.optdt}}</view>
+						
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				table: "",
+				num:"",
+
+				page: 1,
+				pageSize: 20,
+				
+				name:[],
+				data:[]
+			};
+		},
+		onLoad(option) {
+			uni.setNavigationBarTitle({
+				title: option.title
+			})
+			this.num = option.num
+			this.table = option.table
+			this.get_five_fixed_getRecordDataByTableName()
+		},
+		onReachBottom(){
+			this.page++
+			this.get_five_fixed_getRecordDataByTableName()
+		},
+		methods: {
+			get_five_fixed_getRecordDataByTableName() {
+				this.$api.five_fixed_getRecordDataByTableName({
+					table_name: this.table,
+					page: this.page,
+					pageSize: this.pageSize
+				}).then((res) => {
+					console.log(res.data.content.data.table_data.data)
+					this.data = this.data.concat(res.data.content.data.table_data.data)
+				})
+			},
+			img_chakan(url) {
+
+				let data = []
+				data[0] = url
+				uni.previewImage({
+					urls: data
+				});
+			},
+			go_detail(id){
+				uni.navigateTo({
+					url:"./detail/detail?table=" + this.num + "&id=" + id
+				})
+			}
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.list {
+		box-sizing: border-box;
+		padding: 25rpx;
+		.item {
+			border-bottom: 1rpx solid #f0f0f0;
+			margin-bottom: 40rpx;
+			.inner {
+				margin-bottom: 40rpx;
+				width: 700rpx;
+				display: flex;
+
+				.left {
+					.user {
+						image {
+							width: 90rpx;
+							height: 90rpx;
+
+							border-radius: 50%;
+						}
+						
+						.avatar{
+							width: 90rpx;
+							height: 90rpx;
+							text-align: center;
+							line-height: 90rpx;
+							border-radius: 50%;
+							background-color: #7EB1A0;
+							color: #FFFFFF;
+							font-size: 36rpx;
+							font-weight: 700;
+						}
+					}
+				}
+
+				.right {
+					margin-left: 20rpx;
+
+					width: 650rpx;
+
+					.name {
+						margin-top: 5rpx;
+						font-size: 32rpx;
+
+						text {
+							margin-left: 20rpx;
+							font-size: 28rpx;
+							color: #3a3a3a;
+						}
+					}
+
+					.text {
+						width: 600rpx;
+						margin-top: 10rpx;
+						font-size: 30rpx;
+					}
+
+					.img_box {
+						margin-top: 20rpx;
+
+						width: 550rpx;
+						overflow: hidden;
+
+						.img {
+							margin-bottom: 10rpx;
+							float: left;
+							margin-right: 20rpx;
+
+							image {
+								width: 170rpx;
+								height: 170rpx;
+
+								border-radius: 10rpx;
+							}
+						}
+
+						.img:nth-child(3n) {
+							margin-right: 0;
+						}
+					}
+
+					.time {
+						font-size: 26rpx;
+						color: #999999;
+					}
+
+					
+				}
+			}
+		}
+	}
+</style>

pages/origanization/news/tab_2/all_list/all_list.vue

@@ -1,12 +1,17 @@
 <template>
 	<view>
 		<view class="list">
-			<view class="item" v-for="(item,index) in data" :key="index" @click="go_detail(item.id)">
+			<view class="item" v-for="(item,index) in data" :key="index" @click="go_detail(item.num,item.id)">
 				<view class="inner">
 					<view class="left">
-						<view class="user">
+						<view class="user"
+							v-if="item.face != 'http://localhost/storage/avatar/avatar_15042504.png' && item.face != 'upload/face/1.jpg'">
 							<image :src="item.face" mode="aspectFill"></image>
 						</view>
+						<view class="user"
+							v-if="item.face == 'http://localhost/storage/avatar/avatar_15042504.png' || item.face == 'upload/face/1.jpg'">
+							<view class="avatar">{{item.optname.split('')[0]}}</view>
+						</view>
 					</view>
 					<view class="right">
 						<view class="name">{{item.optname}}<text>{{item.depart}}</text></view>
@@ -14,14 +19,14 @@
 							<view v-html="item.str"></view>
 						</view>
 						<view class="img_box">
-							<view class="img" v-for="(item_2,index_2) in item.picture" :key="index_2">
+							<view v-for="(item_2,index_2) in item.picture" :key="index_2">
 								<view class="img" v-for="(item_3,index_3) in item_2" :key="index_3">
 									<image :src="item_3" mode="aspectFill" @click.stop="img_chakan(item_3)"></image>
 								</view>
 							</view>
 						</view>
 						<view class="time">{{item.optdt}}</view>
-						
+
 					</view>
 				</view>
 			</view>
@@ -34,24 +39,32 @@
 		data() {
 			return {
 				table: "",
-				num:"",
+				tubiao_census_type_fields: "",
+				tubiao_census_type_fields_value: "",
+				date_start: "",
+				date_end: "",
 
 				page: 1,
-				pageSize: 10,
-				
-				name:[],
-				data:[]
+				pageSize: 20,
+
+				name: [],
+				data: []
 			};
 		},
 		onLoad(option) {
 			uni.setNavigationBarTitle({
 				title: option.title
 			})
-			this.num = option.num
 			this.table = option.table
+			this.tubiao_census_type_fields = option.tubiao_census_type_fields
+			this.tubiao_census_type_fields_value = option.tubiao_census_type_fields_value
+			this.date_start = option.date_start
+			this.date_end = option.date_end
+
+
 			this.get_five_fixed_getRecordDataByTableName()
 		},
-		onReachBottom(){
+		onReachBottom() {
 			this.page++
 			this.get_five_fixed_getRecordDataByTableName()
 		},
@@ -59,6 +72,11 @@
 			get_five_fixed_getRecordDataByTableName() {
 				this.$api.five_fixed_getRecordDataByTableName({
 					table_name: this.table,
+					field_name: this.tubiao_census_type_fields,
+					field_value: this.tubiao_census_type_fields_value,
+					start_date: this.date_start,
+					end_date: this.date_end,
+					
 					page: this.page,
 					pageSize: this.pageSize
 				}).then((res) => {
@@ -74,12 +92,12 @@
 					urls: data
 				});
 			},
-			go_detail(id){
+			go_detail(num, id) {
 				uni.navigateTo({
-					url:"./detail/detail?table=" + this.num + "&id=" + id
+					url: "./detail/detail?table=" + num + "&id=" + id
 				})
 			}
-			
+
 		}
 	}
 </script>
@@ -88,9 +106,11 @@
 	.list {
 		box-sizing: border-box;
 		padding: 25rpx;
+
 		.item {
 			border-bottom: 1rpx solid #f0f0f0;
 			margin-bottom: 40rpx;
+
 			.inner {
 				margin-bottom: 40rpx;
 				width: 700rpx;
@@ -104,6 +124,18 @@
 
 							border-radius: 50%;
 						}
+
+						.avatar {
+							width: 90rpx;
+							height: 90rpx;
+							text-align: center;
+							line-height: 90rpx;
+							border-radius: 50%;
+							background-color: #7EB1A0;
+							color: #FFFFFF;
+							font-size: 36rpx;
+							font-weight: 700;
+						}
 					}
 				}
 
@@ -158,7 +190,7 @@
 						color: #999999;
 					}
 
-					
+
 				}
 			}
 		}

pages/origanization/news/tab_2/all_list/detail/detail.vue

@@ -11,6 +11,11 @@
 				href: ""
 			};
 		},
+		onShow() {
+			// #ifdef APP-PLUS
+			plus.screen.lockOrientation('portrait-primary');
+			// #endif
+		},
 		onLoad(option) {
 			console.log(option)
 			

pages/origanization/news/tab_3/ranking/ranking.vue

@@ -0,0 +1,187 @@
+<template>
+	<view>
+		<view class="content">
+			<view class="title">
+				<view class="label label_1">排名</view>
+				<view class="label label_2">姓名</view>
+				<view class="label label_3">完成数</view>
+				<view class="label label_4">总用时</view>
+			</view>
+			<scroll-view scroll-y @scrolltolower="scrolltolower">
+				<view class="list">
+					<view class="item" v-for="(item,index) in list" :key="index">
+						<view class="label label_1">
+							<view class="index" v-if="index == 0" style="background-color: #FFCE30;">
+								{{index+1}}
+							</view>
+							<view class="index" v-else-if="index == 1" style="background-color: #BABABA;">
+								{{index+1}}
+							</view>
+							<view class="index" v-else-if="index == 2" style="background-color: #CF892E;">
+								{{index+1}}
+							</view>
+							<view class="index" v-else>
+								{{index+1}}
+							</view>
+						</view>
+						<view class="label label_2">
+							<view class="img">
+								<image :src="item.sign" mode="aspectFill"></image>
+							</view>
+							<view class="name">{{item.name}}</view>
+						</view>
+						<view class="label label_3">
+							<view class="num">{{item.num}}</view>
+						</view>
+						<view class="label label_4">
+							<view class="time">{{Math.floor(item.completion_time/60)}}分钟{{item.completion_time%60}}秒</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list:[]
+			};
+		},
+		onLoad(option) {
+			console.log(option)
+			this.get_jigsawPuzzle_getRankingById(option.id)
+		},
+		methods:{
+			scrolltolower(){
+				console.log('++')
+			},
+			get_jigsawPuzzle_getRankingById(id){
+				this.$api.jigsawPuzzle_getRankingById({
+					special_id:id
+				}).then((res)=>{
+					console.log(res.data.data)
+					
+					this.list = res.data.data
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		box-sizing: border-box;
+		padding: 25rpx;
+
+		background-color: #009FE8;
+	}
+
+	.content {
+		width: 700rpx;
+		// height: 100vh;
+		height: calc(100vh - 140rpx);
+		background-image: url(./icon/bg.png);
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+	}
+	
+	.title{
+		width: 700rpx;
+		box-sizing: border-box;
+		padding: 50rpx 25rpx 25rpx;
+		
+		display: flex;
+		justify-content: space-between;
+		.label{
+			color: #CBA164;
+			font-size: 28rpx;
+			text-align: center;
+			font-weight: 700;
+		}
+		.label_1{
+			width: 70rpx;
+		}
+		.label_2{
+			width: 200rpx;
+		}
+		.label_3{
+			width: 90rpx;
+		}
+		.label_4{
+			width: 190rpx;
+		}
+	}
+	
+	.list{
+		height: calc(100vh - 320rpx);
+		
+		width: 700rpx;
+		box-sizing: border-box;
+		padding: 0 25rpx;
+		
+		.item{
+			margin-bottom: 10rpx;
+			width: 650rpx;
+			height: 100rpx;
+			
+			background-image: url(./icon/item.png);
+			background-size: 100% 100%;
+			background-repeat: no-repeat;
+			
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			
+			text-align: center;
+			font-size: 28rpx;
+			color: #3A230A;
+			.label_1{
+				padding-left: 15rpx;
+				width: 70rpx;
+				color: #FFFFFF;
+				font-weight: 700;
+				
+				.index{
+					width:55rpx;
+					height:55rpx;
+					line-height:55rpx;
+					border-radius: 50%;
+				}
+			}
+			.label_2{
+				width: 190rpx;
+				display: flex;
+				align-items: center;
+				.img{
+					margin-right: 15rpx;
+					image{
+						border: 4rpx solid #FFFFFF;
+						width: 60rpx;
+						height: 60rpx;
+						display: block;
+						border-radius: 50%;
+					}
+				}
+				.name{
+					overflow:hidden;
+					text-overflow:ellipsis;
+					white-space:nowrap;
+					
+					font-size: 36rpx;
+					font-weight: 700;
+					color: #FFFFFF;
+					text-shadow: 0rpx 4rpx 0rpx #3A230A;
+				}
+			}
+			.label_3{
+				width: 90rpx;
+			}
+			.label_4{
+				width: 190rpx;
+			}
+		}
+	}
+</style>

pages/production/statistical_analysis_table/meitan_cxl/meitan_cxl.vue

@@ -1,464 +0,0 @@
-<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>

pages/production/statistical_analysis_table/statistical_analysis_table.vue

@@ -1,72 +1,6 @@
 <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>
+		<web-view :src="href"></web-view>
 	</view>
 </template>
 
@@ -74,70 +8,16 @@
 	export default {
 		data() {
 			return {
-				
+				href: ""
 			};
 		},
-		methods:{
-			go_meitan_cxl(){
-				uni.navigateTo({
-					url:"./meitan_cxl/meitan_cxl"
-				})
-			}
+		onLoad(option) {
+			this.href = 'http://webdevelop.nxjiewei.com/assets/html/zhks-quankuang/zaoquan/shujufenxi/?token=' + uni.getStorageSync('Authorization')
+			
 		}
 	}
 </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>

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 + "&time=" + Date.parse(new Date())
+			this.href = "http://webdevelop.nxjiewei.com/assets/html/video/?mine_code=" + option.mine_code
 		}
 	}
 </script>

pages/tabbar/index/index.vue

@@ -1,14 +1,20 @@
 <template>
 	<view>
-		<view class="top_bg_color">
+		<!-- 首页风格切换-1-切换风格 -->
+		<view class="top_bg_color" v-if="index_type == 1">
 			<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>
+		<!-- 首页风格切换-2-默认风格 -->
+		<view v-if="index_type == 2">
+			<t-i-navbar-2 :mine_code="mine_code"></t-i-navbar-2>
+			<t-i-notice-2 :text="text"></t-i-notice-2>
+			<t-i-banner-2 :banner="banners" :mine_code="mine_code" @change_top_bg_color_img="change_top_bg_color_img"></t-i-banner-2>
+		</view>
+
 		<!-- 固定入口 -->
 		<t-i-icon :iconList="iconList" :mine_code="mine_code"></t-i-icon>
 		<!-- 常用功能 -->
@@ -66,11 +72,12 @@
 				// 首页链接
 				home_link: [],
 
-
 				// 背景色
 				top_bg_color_img: "",
 				// 标题栏背景色
-				navbar_bg_color: ""
+				navbar_bg_color: "",
+				
+				index_type:1
 			}
 		},
 		onPullDownRefresh() {
@@ -83,6 +90,14 @@
 
 		},
 		onLoad() {
+			// 风格定义
+			this.$api.home_style_setting({
+				
+			}).then((res)=>{
+				// console.log(res.data.data)
+				
+				this.index_type = res.data.data.value
+			})
 			// 初始化当前煤矿编码
 			this.mine_code = uni.getStorageSync('mine_code')
 
@@ -99,11 +114,14 @@
 						icon: "none",
 						title: "登录失效、请重新登录"
 					})
+
+					uni.clearStorageSync('Authorization');
+
 					setTimeout(function() {
 						uni.redirectTo({
 							url: "../../my/login/login"
 						})
-					}, 2000)
+					}, 1500)
 				} else {
 					// console.log(res)
 				}
@@ -111,7 +129,7 @@
 
 		},
 		onPageScroll: function(e) {
-			if (e.scrollTop > 400) {
+			if (e.scrollTop > 350) {
 				this.navbar_bg_color = "#009fe8"
 			} else {
 				this.navbar_bg_color = ""
@@ -184,12 +202,22 @@
 			},
 			// 固定入口
 			get_list() {
+				// uni.request({
+				// 	url: this.base_url + "/homeNav/list",
+				// 	method: "GET",
+				// 	success: (res) => {
+				// 		// this.iconList = res.data.data.data.slice(0, 5)
+				// 		this.iconList = res.data.data.data
+				// 	}
+				// })
+				
 				uni.request({
-					url: this.base_url + "/homeNav/list",
+					url: this.base_url + "/homeNav/listByCategory",
 					method: "GET",
 					success: (res) => {
-						// this.iconList = res.data.data.data.slice(0, 5)
-						this.iconList = res.data.data.data
+						// console.log(res.data)
+						
+						this.iconList = res.data.data
 					}
 				})
 			},
@@ -222,7 +250,7 @@
 
 	.top_bg_color {
 		position: relative;
-		
+
 		width: 750rpx;
 		overflow: hidden;
 

pages/tabbar/my/my.vue

@@ -5,7 +5,7 @@
 			<image src="./icon/bg.png" mode="aspectFill"></image>
 		</view>
 		<view class="content">
-			<view class="user">
+			<view class="user" v-if="user">
 				<view class="left">
 					<view class="img">
 						<image v-if="user.avatar" :src="user.avatar" mode="aspectFill"></image>
@@ -71,8 +71,7 @@
 				</view>
 			</view>
 
-			<view class="section_3" v-if="mine_code != 'ningdongyunying'"
-				@click="go_downhole_statistics()">
+			<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>
@@ -91,6 +90,10 @@
 				</view>
 			</view>
 
+			
+		</view>
+		
+		<view class="content">
 			<view class="section_4">
 				<view class="list">
 					<view class="item" @click="clear_cache()">
@@ -139,7 +142,7 @@
 					</view>
 				</view>
 			</view>
-
+			
 		</view>
 	</view>
 </template>
@@ -168,17 +171,17 @@
 
 				// 下井数据
 				downhole: {
-					position: "",
-					h: "",
-					m: "",
-					times: ""
+					position: "-",
+					h: "0",
+					m: "0",
+					times: "0"
 				},
 
 				// 使用时长次数
 				use: {
-					times: "-",
-					h: "-",
-					m: "-",
+					times: "0",
+					h: "0",
+					m: "0",
 					submit_count:"0"
 				},
 				
@@ -202,9 +205,9 @@
 
 				setTimeout(function() {
 					uni.redirectTo({
-						url: "../../login/login"
+						url: "../../my/login/login"
 					})
-				}, 1000)
+				}, 1500)
 			}
 
 			// 设置头像
@@ -266,7 +269,6 @@
 			// 退出登录
 			login_out() {
 				uni.clearStorageSync('Authorization');
-				uni.clearStorageSync('oa_login_time');
 				uni.showToast({
 					icon: "none",
 					title: "退出登录"
@@ -277,7 +279,7 @@
 					uni.redirectTo({
 						url: "../../my/login/login"
 					})
-				}, 1500)
+				}, 1000)
 			},
 			// 拨打服务电话
 			tell() {
@@ -472,6 +474,7 @@
 		width: 749rpx;
 
 		.user {
+			margin-bottom: 40rpx;
 			box-sizing: border-box;
 			padding-left: 25rpx;
 			padding-top: 25rpx;
@@ -547,7 +550,6 @@
 		}
 
 		.section_1 {
-			margin-top: 40rpx;
 			width: 749rpx;
 			height: 220rpx;
 			background-image: url(./icon/section_1.png);

pages/tabbar/origanization/origanization.vue

@@ -5,13 +5,13 @@
 		<view v-if="mine_code == 'zaoquan'">
 			<t-o-zaoquan></t-o-zaoquan>
 		</view>
-		
+
 		<view v-if="mine_code != 'zaoquan' && mine_code != 'ningdongyunying'">
 			<t-o-origanization></t-o-origanization>
 		</view>
-		
+
 		<view v-if="mine_code == 'ningdongyunying'">
-			<t-o-news></t-o-news>
+			<t-o-news ref="tONews"></t-o-news>
 			<!-- <t-o-origanization></t-o-origanization> -->
 		</view>
 	</view>
@@ -22,10 +22,8 @@
 		data() {
 			return {
 				// 当前煤矿编码
-				mine_code:"",
-				
-				
-				
+				mine_code: "",
+
 			}
 		},
 		onLoad() {
@@ -33,6 +31,11 @@
 			this.mine_code = uni.getStorageSync('mine_code')
 			
 		},
+		onReachBottom() {
+			console.log('++')
+			
+			this.$refs.tONews.tab_2_onReachBottom();
+		},
 		methods: {
 
 		}
@@ -40,7 +43,7 @@
 </script>
 
 <style lang="scss">
-	page{
+	page {
 		background-color: #F3F8F7;
 	}
 </style>