E信管理(新)：消息页面完善、更新：1.0.9

App.vue

@@ -5,15 +5,16 @@
 			// 启动初始化
 
 			// 煤矿鉴别-名称
-			// 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', 'qingshuiying');
+			// uni.setStorageSync('mine_code', 'qingshuiying');
 			// uni.setStorageSync('mine_code', 'wuyegongsi');
 			// uni.setStorageSync('mine_code', 'jinjiaqu');
 			// uni.setStorageSync('mine_code', 'yangchangwan');
-
+			
+			
 		},
 		onShow: function() {
 			console.log('App Show')

common/common.js

@@ -0,0 +1,116 @@
+export const goToLink = (item,mine_code) => {
+	
+	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=" + 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: "未安装此应用"
+					})
+				})
+			} else if (link.indexOf("com.icbc") != -1) {
+				plus.runtime.launchApplication({
+					pname: 'com.icbc'
+				}, (e) => {
+					console.log('Open system default browser failed: ' + e.message)
+	
+					uni.showToast({
+						icon: "none",
+						title: "未安装此应用"
+					})
+				})
+			} else if (link.indexOf("webdevelop.nxjiewei.com/assets/html/pingce") != -1) {
+				uni.navigateTo({
+					url: "../../index/h5/h5?url=jinjiaqu_pingce"
+				})
+			} else if (link.indexOf("/yinhuanpaicha/yinhuaninfo") != -1) {
+				uni.navigateTo({
+					url: "../../index/h5/h5?url="+link
+				})
+			}
+		}
+	
+	
+		// #endif
+	
+		// #ifdef H5
+		if (link.indexOf("webdevelop.nxjiewei.com/assets/html/pingce") != -1) {
+			uni.navigateTo({
+				url: "../../index/h5/h5?url=jinjiaqu_pingce"
+			})
+		} else if (link.indexOf("/yinhuanpaicha/yinhuaninfo") != -1) {
+			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) {
+			console.log("网格排查")
+			uni.navigateTo({
+				url: "../../workbench/gridding/gridding"
+			})
+		} else if (link.indexOf("/wordorder/wordOrderGrid_win") != -1) {
+			console.log(link)
+			uni.navigateTo({
+				url: "../../index/business_approval/business_approval"
+			})
+		}
+	} else {
+		console.log(link)
+	}
+}

common/set_base_url.js

@@ -33,3 +33,29 @@ export const set_base_url = (mine_code) => {
 			return ""
 	}
 }
+
+
+export const set_appName = (mine_code) => {
+	switch (mine_code) {
+		case 'ningdongyunying':
+			return "E信管理"
+			break;
+		case 'zaoquan':
+			return "智慧枣泉"
+			break;
+		case 'yangchangwan':
+			return "智慧羊场湾"
+			break;
+		case 'qingshuiying':
+			return "智慧清水营"
+			break;
+		case 'wuyegongsi':
+			return "智慧物业"
+			break;
+		case 'jinjiaqu':
+			return "智慧金家渠"
+			break;
+		default:
+			return ""
+	}
+}

common/time.js

@@ -26,3 +26,15 @@ Date.prototype.format = function(fmt) {
 // import time from "@/common/time.js"
 
 // console.log(new Date().format("yyyy-MM-dd"))
+
+
+export const 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)

common/vmeitime-http/api.js

@@ -543,6 +543,14 @@ export const five_fixed_fiveFixed = (data) => {
 		data,
 	})
 }
+// 五定表分类
+export const five_fixed_fiveFixedCategory = (data) => {
+	return http.request({
+		method: "POST",
+		url: '/five_fixed/fiveFixedCategory',
+		data,
+	})
+}
 // 五定表详情
 export const five_fixed_fiveFixedDetail = (data) => {
 	return http.request({
@@ -551,6 +559,40 @@ export const five_fixed_fiveFixedDetail = (data) => {
 		data,
 	})
 }
+// 五定表统计项
+export const five_fixed_getTableFiledRemark = (data) => {
+	return http.request({
+		method: "POST",
+		url: '/five_fixed/getTableFiledRemark',
+		data,
+	})
+}
+// 统计项记录总数
+export const five_fixed_getTableFiledTotalNumber = (data) => {
+	return http.request({
+		method: "POST",
+		url: '/five_fixed/getTableFiledTotalNumber',
+		data,
+	})
+}
+
+// 获取记录管理列表
+export const five_fixed_getRecordDataByCategoryName = (data) => {
+	return http.request({
+		method: "POST",
+		url: '/five_fixed/getRecordDataByCategoryName',
+		data,
+	})
+}
+// 根据表名称获取记录管理数据
+export const five_fixed_getRecordDataByTableName = (data) => {
+	return http.request({
+		method: "POST",
+		url: '/five_fixed/getRecordDataByTableName',
+		data,
+	})
+}
+
 
 // 申请列表
 export const workflow_get_all_list = (data) => {
@@ -679,4 +721,22 @@ export const trouble_grid_check_detailed = (data) => {
 		url: '/trouble/grid/check/detailed',
 		data,
 	})
+}
+
+// 消息提醒-角标
+export const workflow_todo_query = (data) => {
+	return http.request({
+		method: "POST",
+		url: '/workflow/todo_query',
+		data,
+	})
+}
+
+// 金家渠 开屏通告
+export const notify_getNotifyOne = (data) => {
+	return http.request({
+		method: "POST",
+		url: '/notify/getNotifyOne',
+		data,
+	})
 }

common/vmeitime-http/interface.js

@@ -34,9 +34,9 @@ http.delete('user/1').then((res)=>{
 export default {
 	config: {
 		// baseUrl: "http://colliery.nxjiewei.com/api",
-		// baseUrl: "http://ningdongyunying.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://qingshuiying.nxjiewei.com:8011/api",
 		// baseUrl: "http://wuyegongsi.nxjiewei.com:8011/api",
 		// baseUrl: "http://jinjiaqu.nxjiewei.com:8011/api",
 		// baseUrl: "http://yangchangwan.nxjiewei.com:8011/api",

components/e-link/e-link.vue

@@ -102,6 +102,7 @@
 							// 通过eventChannel向被打开页面传送数据
 							res.eventChannel.emit('acceptDataFromOpenerPage', {
 								url: link,
+								title: item.title
 							})
 						}
 					})

components/openingNotice/openingNotice.vue

@@ -0,0 +1,107 @@
+<template>
+	<view>
+		<uni-popup ref="popup" :is-mask-click="false">
+			<view class="box">
+				<view class="content">
+					<view class="title">
+						<view class="icon">
+							<image src="./icon/icon.png" mode="scaleToFill"></image>
+						</view>
+						<view class="text">{{data.title}}</view>
+					</view>
+					<scroll-view scroll-y>
+						<view class="inner">
+							{{data.content}}
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "openingNotice",
+		data() {
+			return {
+				data: {}
+			};
+		},
+		mounted() {
+			this.get_notify_getNotifyOne()
+		},
+		methods: {
+			get_notify_getNotifyOne() {
+				this.$api.notify_getNotifyOne({
+
+				}).then((res)=>{
+					// console.log(res)
+
+					if(res.data.code == 0 && res.data.data != null){
+						this.data = res.data.data
+
+						this.$refs.popup.open('top')
+
+						setTimeout(()=>{
+							this.$refs.popup.close()
+						},10000)
+					}else{
+						// console.log("已读")
+					}
+
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.box {
+		height: 100vh;
+		display: flex;
+		align-items: center;
+	}
+
+	.content {
+		margin: 0 auto;
+		width: 700rpx;
+		background-color: #FFFFFF;
+		border-radius: 20rpx;
+
+		box-sizing: border-box;
+		padding: 25rpx;
+
+		.title {
+			position: relative;
+
+			height: 90rpx;
+			line-height: 90rpx;
+			font-size: 38rpx;
+			font-weight: 700;
+			text-align: center;
+			border-bottom: 1rpx solid #E1E5E9;
+			
+			padding-top: 20rpx;
+
+			.icon {
+				position: absolute;
+				top: -160rpx;
+				left: 0;
+
+				image {
+					width: 218rpx;
+					height: 193rpx;
+				}
+			}
+		}
+
+		.inner {
+			height: 50vh;
+			text-indent: 2rem;
+			
+			box-sizing: border-box;
+			padding: 20rpx 0;
+		}
+	}
+</style>

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

@@ -36,6 +36,7 @@
 							// 通过eventChannel向被打开页面传送数据
 							res.eventChannel.emit('acceptDataFromOpenerPage', {
 								url: link,
+								title: item.title
 							})
 						}
 					})

components/t-i-jinjiaqu/t-i-jinjiaqu.vue

@@ -6,7 +6,7 @@
 				<view class="title" @click="change_active(2)" :class="active==2?'active':''">基层区队</view>
 			</view>
 			<view class="list">
-				<view class="item" v-for="(item,index) in list.children" :key="index" @click="go_record(item.link)">
+				<view class="item" v-for="(item,index) in list.children" :key="index" @click="go_record(item)">
 					{{item.title}}
 				</view>
 			</view>
@@ -15,7 +15,7 @@
 		<!-- 图片链接 -->
 		<view class="section_2">
 			<view class="list">
-				<view class="item" v-for="(item,index) in list_3.children" :key="index" @click="go_record(item.link)">
+				<view class="item" v-for="(item,index) in list_3.children" :key="index" @click="go_record(item)">
 					<image :src="item.thumb" mode=""></image>
 				</view>
 			</view>
@@ -25,7 +25,7 @@
 		<view class="section_3">
 			<view class="title">快速通道</view>
 			<view class="list">
-				<view class="item" v-for="(item,index) in list_4.children" :key="index" @click="go_record(item.link)">
+				<view class="item" v-for="(item,index) in list_4.children" :key="index" @click="go_record(item)">
 					<image :src="item.thumb" mode=""></image>
 				</view>
 			</view>
@@ -36,6 +36,8 @@
 </template>
 
 <script>
+	import {goToLink} from "@/common/common.js"
+	
 	export default {
 		name: "t-i-jinjiaqu",
 		props: [
@@ -86,103 +88,8 @@
 					this.list_4 = res.data.data[0]
 				})
 			},
-			go_record(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")
-					// #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: "未安装此应用"
-								})
-							})
-						} else if (link.indexOf("com.icbc") != -1) {
-							plus.runtime.launchApplication({
-								pname: 'com.icbc'
-							}, (e) => {
-								console.log('Open system default browser failed: ' + e.message)
-
-								uni.showToast({
-									icon: "none",
-									title: "未安装此应用"
-								})
-							})
-						} else if (link.indexOf("webdevelop.nxjiewei.com/assets/html/pingce") != -1) {
-							uni.navigateTo({
-								url: "../../index/h5/h5?url=jinjiaqu_pingce"
-							})
-						} else if (link.indexOf("/yinhuanpaicha/yinhuaninfo") != -1) {
-							uni.navigateTo({
-								url: "../../index/h5/h5?url="+link
-							})
-						}
-					}
-
-
-					// #endif
-
-					// #ifdef H5
-					if (link.indexOf("webdevelop.nxjiewei.com/assets/html/pingce") != -1) {
-						uni.navigateTo({
-							url: "../../index/h5/h5?url=jinjiaqu_pingce"
-						})
-					} else if (link.indexOf("/yinhuanpaicha/yinhuaninfo") != -1) {
-						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) {
-						console.log("网格排查")
-						uni.navigateTo({
-							url: "../../workbench/gridding/gridding"
-						})
-					} else if (link.indexOf("/wordorder/wordOrderGrid_win") != -1) {
-						console.log(link)
-						uni.navigateTo({
-							url: "../../index/business_approval/business_approval"
-						})
-					}
-				} else {
-					console.log(link)
-				}
+			go_record(item) {
+				goToLink(item,this.mine_code)
 
 			}
 		}

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-news/t-i-news.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="title">
-			<view class="text">宁煤新闻</view>
+			<view class="text">新闻动态</view>
 			<view class="more" @click="go_more()">查看全部 <uni-icons type="arrowright" color="#999" size="11"></uni-icons>
 			</view>
 		</view>

components/t-i-ningdongyunying/t-i-ningdongyunying.vue

@@ -0,0 +1,221 @@
+<template>
+	<view class="content">
+		<view class="section_1">
+			<view class="tab">
+				<view class="title active">科室部门</view>
+			</view>
+			<view class="list">
+				<view class="item" v-for="(item,index) in list_1.children" :key="index" @click="go_record(item)">
+					{{item.title}}
+				</view>
+			</view>
+		</view>
+
+		<!-- 图片链接 -->
+		<view class="section_2">
+			<view class="title">图片链接</view>
+			<view class="list">
+				<view class="item" v-for="(item,index) in list_2.children" :key="index" @click="go_record(item)">
+					<image :src="item.thumb" mode=""></image>
+				</view>
+			</view>
+		</view>
+
+		<!-- 快速通道 -->
+		<view class="section_3">
+			<view class="title">快速通道</view>
+			<view class="list">
+				<view class="item" v-for="(item,index) in list_3.children" :key="index" @click="go_record(item)">
+					<image :src="item.thumb" mode=""></image>
+				</view>
+			</view>
+		</view>
+		
+		<view class="bottom" @click="go_h5()">
+			<image src="./icon/bottom.png" mode="aspectFit"></image>
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+	import {goToLink} from "@/common/common.js"
+	
+	export default {
+		name: "t-i-ningdongyunying",
+		props: [
+			"mine_code"
+		],
+		data() {
+			return {
+				active: 1,
+				list_1: [],
+				// 图片链接
+				list_2: [],
+				// 快速通道
+				list_3: [],
+			};
+		},
+		created() {
+			this.get_home_link()
+		},
+		methods: {
+			get_home_link() {
+				this.$api.home_link({
+
+				}).then((res) => {
+					// console.log(res.data.data)
+
+					// 科室部门
+					this.list_1 = res.data.data[0].children[0]
+					// 图片链接
+					this.list_2 = res.data.data[2]
+
+					// 快速通道
+					this.list_3 = res.data.data[3]
+				})
+			},
+			go_record(item) {
+				goToLink(item,this.mine_code)
+			},
+			go_h5(){
+				uni.navigateTo({
+					url:"../../index/h5/h5?url=" + "http://ningdongyunying.nxjiewei.com:8011/web/monitor/dispatch/center"
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		margin-top: 20rpx;
+		padding-bottom: 40rpx;
+		background-color: #FFFFFF;
+	}
+
+	.section_1 {
+		box-sizing: border-box;
+		padding: 25rpx;
+
+		.tab {
+			display: flex;
+			
+			padding-left: 10rpx;
+			.title {
+				line-height: 80rpx;
+				font-weight: 700;
+			}
+
+			.active {
+				color: #009fe8;
+				border-bottom: 6rpx solid #009fe8;
+			}
+		}
+
+		.list {
+			margin-top: 30rpx;
+			overflow: hidden;
+
+			.item {
+				float: left;
+				margin-right: 20rpx;
+				margin-bottom: 30rpx;
+
+				width: 160rpx;
+				box-sizing: border-box;
+				border: 2rpx solid #009fe8;
+				border-radius: 20rpx;
+				font-size: 28rpx;
+				line-height: 70rpx;
+				//超过一行省略号
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+
+				padding: 0 10rpx;
+				background-color: #66C7F218;
+				color: #009FE8;
+
+				text-align: center;
+			}
+
+			.item:nth-child(4n) {
+				margin-right: 0;
+			}
+		}
+
+	}
+
+	.section_2 {
+		box-sizing: border-box;
+		padding: 0 25rpx;
+		
+		.title {
+			line-height: 120rpx;
+			font-size: 36rpx;
+			font-weight: 700;
+		}
+
+		.list {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+
+			.item {
+				margin-bottom: 20rpx;
+				width: 340rpx;
+				height: 180rpx;
+
+				border-radius: 20rpx;
+				overflow: hidden;
+
+				image {
+					width: 340rpx;
+					height: 180rpx;
+				}
+			}
+		}
+	}
+
+	.section_3 {
+		box-sizing: border-box;
+		padding: 0 25rpx;
+
+		.title {
+			line-height: 120rpx;
+			font-size: 36rpx;
+			font-weight: 700;
+		}
+
+		.list {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+
+			.item {
+				margin-bottom: 20rpx;
+				width: 340rpx;
+				height: 220rpx;
+
+				border-radius: 20rpx;
+				overflow: hidden;
+
+				image {
+					width: 340rpx;
+					height: 220rpx;
+				}
+			}
+		}
+	}
+
+	.bottom{
+		margin-top: 10rpx;
+		text-align: center;
+		image{
+			width: 700rpx;
+			height: 240rpx;
+		}
+	}
+</style>

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

@@ -7,7 +7,7 @@
 				</view>
 				<view class="name">服务电话</view>
 			</view>
-			<view class="item" @click="go_m_message_reminder()">
+			<!-- <view class="item" @click="go_m_message_reminder()">
 				<view class="icon">
 					<image src="./icon/xiaoxi.png" mode=""></image>
 				</view>
@@ -30,7 +30,7 @@
 					<image src="./icon/shiyongshouce.png" mode=""></image>
 				</view>
 				<view class="name">使用手册</view>
-			</view>
+			</view> -->
 			<view class="item" @click="go_signature()">
 				<view class="icon">
 					<image src="./icon/shouxieqianming.png" mode=""></image>
@@ -85,7 +85,7 @@
 			};
 		},
 		created() {
-			console.log(this.mine_code)
+			// console.log(this.mine_code)
 		},
 		methods:{
 			// 拨打服务电话
@@ -143,13 +143,17 @@
 			},
 			// 更新日志
 			go_update_log(){
-				if(this.mine_code == 'zaoquan'){
-					uni.navigateTo({
-						url:"../../index/record/record?pageId=982d321d1fd64894a4a22c8f940ed7cc&mine_code=" + this.mine_code,
-					})
-				}else{
+				// if(this.mine_code == 'zaoquan'){
+				// 	uni.navigateTo({
+				// 		url:"../../index/record/record?pageId=982d321d1fd64894a4a22c8f940ed7cc&mine_code=" + this.mine_code,
+				// 	})
+				// }else{
 					
-				}
+				// }
+				
+				uni.navigateTo({
+					url:"../../my/version_record/version_record"
+				})
 			},
 			// 工单审核
 			go_business_audit(){

components/t-m-info/t-m-info.vue

@@ -44,7 +44,7 @@
 			};
 		},
 		created() {
-			console.log(uni.getStorageSync('user'))
+			// console.log(uni.getStorageSync('user'))
 			// 获取用户基本信息
 			this.user = uni.getStorageSync('user');
 			this.mobile = uni.getStorageSync('mobile');

components/t-m-list/t-m-list.vue

@@ -40,6 +40,7 @@
 			// 退出登录
 			logout(){
 				uni.clearStorageSync('Authorization');
+				uni.clearStorageSync('oa_login_time');
 				uni.showToast({
 					icon:"none",
 					title:"退出登录"

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

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

@@ -1,27 +1,20 @@
 <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>
+		<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>
+			</view>
+		</scroll-view>
 
 		<view class="list">
-			<view class="item" v-for="(item,index) in list" :key="index">
+			<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="暂无更多数据">
@@ -31,14 +24,22 @@
 						<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.data" :key="index_2">
-						<uni-td align="center">
+					<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 align="center" v-for="(item_3,index_3) in item_2" :key="index_3">{{item_3}}</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>
@@ -47,45 +48,277 @@
 					<view class="icon">
 						<image src="./icon/btn.png" mode=""></image>
 					</view>
-					<view class="btn_text" @click="go_all_list(item.title,item.table)">点击查看全部信息</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: 1,
-				list:[]
+				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.get_list()
+			this.date_start = getNextDate(this.date_end, -30)
+			this.get_five_fixed_fiveFixedCategory()
 		},
 		methods: {
-			change_active(item) {
-				this.active = item
+			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() {
+			// 五定表列表
+			get_list(category_name) {
+				uni.showLoading({
+					mask: true
+				})
 				this.$api.five_fixed_fiveFixed({
-					
-				}).then((res)=>{
-					console.log(res.data.content.data)
-					
+					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) {
+			go_all_list(title, table,num) {
 				uni.navigateTo({
-					url: "../../origanization/news/tab_1/all_list/all_list?title="+title+"&table="+table
+					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>
@@ -102,17 +335,28 @@
 
 	.tab {
 		display: flex;
-		justify-content: space-around;
-		align-items: center;
 
-		background-color: #FFFFFF;
 		margin-bottom: 20rpx;
-		height: 90rpx;
+		background-color: #FFFFFF;
+
+		box-sizing: border-box;
+		padding: 0 20rpx;
 
 		.item {
-			position: relative;
+			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;
 			}
@@ -120,19 +364,9 @@
 			.active {
 				font-weight: 700;
 				color: #000000;
+				border-bottom: 4rpx solid #009FE8;
 			}
 
-			.line {
-				position: absolute;
-				bottom: -15rpx;
-				left: 50%;
-
-				transform: translateX(-30rpx);
-
-				width: 60rpx;
-				height: 4rpx;
-				background-color: #009FE8;
-			}
 		}
 	}
 
@@ -141,6 +375,8 @@
 		padding: 0 25rpx;
 
 		.item {
+			position: relative;
+
 			margin-bottom: 20rpx;
 			width: 700rpx;
 			background-color: #FFFFFF;
@@ -150,6 +386,18 @@
 			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;
@@ -198,4 +446,84 @@
 			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-2/t-o-news-tab-2-UI备份.vue

@@ -0,0 +1,259 @@
+<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 class="text">车辆管理</view>
+					<view class="tip">24</view>
+				</view>
+				<view class="inner">
+					<view class="left">
+						<view class="user">
+							<image
+								src="https://cdn.colorhub.me/X-ec79ZLNkBQcrD3tH7tRV-nrSrcZDvlEdM-c_-pAWA/rs:fill:280:280:0/g:sm/bG9jYWw6Ly8vODcv/ZWIvZDlkMmNkZDkz/MjBkZTI0ZDUxZWE4/MTQyYmQzNThhNmY4/MWU0ODdlYi5qcGVn.jpg"
+								mode="aspectFill"></image>
+						</view>
+					</view>
+					<view class="right">
+						<view class="name">李建中<text>信息化站</text></view>
+						<view class="text">
+							在“车辆管理”中“司机出车记录”内新增内容。
+						</view>
+						<view class="img_box">
+							<view class="img" v-for="item in 4">
+								<image
+									src="https://cdn.colorhub.me/8pIGfpKGL2VzBVaKPEX0htM1Cy0xMjOPtWV8HDbDQKs/rs:fill:280:280:0/g:sm/bG9jYWw6Ly8vYjIv/ZmMvZmI4Mjc4YmE5/NzJhNzVhZWYwYzZh/NzE1OTMzMjk0MWU5/ODVhYjJmYy5qcGVn.jpg"
+									mode="aspectFill"></image>
+							</view>
+						</view>
+						<view class="time">2021-12-14 08:32:56</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>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "t-o-news-tab-2",
+		data() {
+			return {
+				active: 1,
+			};
+		},
+		methods: {
+			change_active(item) {
+				this.active = item
+			},
+			go_all_list() {
+				uni.navigateTo({
+					url: "../../origanization/news/tab_2/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;
+
+			.title {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.text {
+					text-align: center;
+					height: 120rpx;
+					line-height: 120rpx;
+					font-size: 40rpx;
+					font-weight: 700;
+				}
+
+				.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%;
+						}
+					}
+				}
+
+				.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 {
+						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,40 +1,49 @@
 <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 in 2">
+			<view class="item" v-for="(item,index) in list" :key="index" v-if="item.data.length > 0">
 				<view class="title">
-					<view class="text">车辆管理</view>
-					<view class="tip">24</view>
+					<view class="text">{{item.title}}</view>
+					<view class="tip" v-if="item.count > 0">{{item.count}}</view>
 				</view>
-				<view class="inner">
+				<view class="inner" v-for="(item_2,index_2) in item.data">
 					<view class="left">
 						<view class="user">
-							<image
-								src="https://cdn.colorhub.me/OLRn1jRkVXSyDzRLt-5hqPSEhOiCBanlo1pfEgG44dE/rs:fill:280:280:0/g:sm/bG9jYWw6Ly8vM2Iv/NTAvMTliNzNiMDY5/MjQ0YThlMDgyMzE0/MzcyMjg1ZWMxYTJh/YzRiM2I1MC5qcGVn.jpg"
-								mode="aspectFill"></image>
+							<image :src="item_2.face" mode="aspectFill"></image>
 						</view>
 					</view>
 					<view class="right">
-						<view class="name">李建中<text>信息化站</text></view>
+						<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 class="img" v-for="item in 4">
-								<image
-									src="https://cdn.colorhub.me/nxoruPZz2k8PIvdAOR7RPo_kI_o87nj9CEksLl_KUSE/rs:fill:280:280:0/g:sm/bG9jYWw6Ly8vNzIv/YWQvZmY2NzYzNWNh/ZGU3NTM1NTA5MzI0/MzAwYmI0M2QzZmNm/MDNkNzJhZC5qcGVn.jpg"
-									mode="aspectFill"></image>
-							</view>
-						</view>
-						<view class="time">2021-12-14 08:32:56</view>
-						<view class="btn">
-							<view class="icon">
-								<image src="./icon/btn.png" mode=""></image>
+							<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>
 							</view>
-							<view class="btn_text" @click="go_all_list()">点击查看全部信息</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>
@@ -45,20 +54,104 @@
 		name: "t-o-news-tab-2",
 		data() {
 			return {
+				active: 0,
+				// 五定表分类
+				fiveFixedCategory: [],
 
+				list: []
 			};
 		},
-		methods:{
-			go_all_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"
+					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;
@@ -71,7 +164,9 @@
 
 			box-sizing: border-box;
 			padding: 0 25rpx;
-
+			
+			padding-bottom: 20rpx;
+			
 			.title {
 				display: flex;
 				justify-content: center;
@@ -161,38 +256,41 @@
 					}
 
 					.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;
-						}
+					
+				}
+			}
+			
+			.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;
+				}
 			}
 		}
 	}

components/t-o-news-tab-3/t-o-news-tab-3 - 新版UI副本.vue

@@ -0,0 +1,171 @@
+<template>
+	<view>
+		<view class="list">
+			<view class="item" v-for="(item,index) in list" :key="index" @click="go_h5(item.id)">
+				<view class="left">
+					<image
+						src="https://cdn.colorhub.me/WVXVGE4diOu9Yss0DxCy_j-YfGBA4xDRwsos4PyE_Jk/rs:auto:280:0:0/g:ce/bG9jYWw6Ly8vOTkv/N2QvMGVjMDQ0MGY4/ZDkyZWU4ZTdmMDg0/YjM4MzUxNDI5MTMz/ZGM5OTk3ZC5qcGVn.jpg"
+						mode="aspectFill"></image>
+				</view>
+				<view class="right">
+					<view class="title">
+						<view class="name">{{item.name}}</view>
+						<view class="tip">拼图</view>
+					</view>
+					<view class="text"></view>
+					<view class="content">
+						<view class="time">{{item.start_time}}</view>
+						<view class="box">
+							<view class="line">
+								<view class="line_box" :style="{width: + item.percent_complete + '%'}"></view>
+							</view>
+							<view class="num">{{item.percent_complete}}%</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	export default {
+		name: "t-o-news-tab-3",
+		data() {
+			return {
+				list: []
+			};
+		},
+		created() {
+			this.get_jigsawPuzzle_specialList()
+		},
+		methods: {
+			get_jigsawPuzzle_specialList() {
+				this.$api.jigsawPuzzle_specialList({
+
+				}).then((res) => {
+					console.log(res.data.data)
+
+					const data = res.data.data
+
+					data.forEach((item, index) => {
+						this.list = this.list.concat(item.special_list)
+					})
+				})
+			},
+			go_h5(id) {
+				uni.navigateTo({
+					url: "../../origanization/news/tab_3/h5/h5?id="+id
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.list {
+		box-sizing: border-box;
+		padding: 0 25rpx;
+
+		.item {
+			width: 700rpx;
+			margin-bottom: 20rpx;
+
+			box-sizing: border-box;
+			padding: 20rpx;
+			padding-top: 24rpx;
+
+			background-color: #FFFFFF;
+			display: flex;
+
+			.left {
+				width: 180rpx;
+
+				image {
+					width: 180rpx;
+					height: 180rpx;
+
+					border-radius: 10rpx;
+				}
+			}
+
+			.right {
+				width: 450rpx;
+				margin-left: 20rpx;
+
+				.title {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+
+					.name {
+						font-size: 26rpx;
+						color: #f39800;
+
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+					}
+
+					.tip {
+						width: 75rpx;
+						text-align: center;
+						font-size: 24rpx;
+						color: #f39800;
+						border: 1rpx solid #f39800;
+						border-radius: 10rpx;
+					}
+				}
+
+				.text {
+					height: 80rpx;
+					margin-top: 8rpx;
+					font-size: 28rpx;
+
+					text-overflow: -o-ellipsis-lastline;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					line-clamp: 2;
+					-webkit-box-orient: vertical;
+				}
+
+				.content {
+
+					.time {
+						margin-right: 60rpx;
+						text-align: right;
+						font-size: 24rpx;
+						color: #999999;
+					}
+
+					.box {
+						display: flex;
+						align-items: center;
+
+						.line {
+							width: 400rpx;
+							height: 6rpx;
+							background-color: #E4E4E4;
+							border-radius: 10rpx;
+
+							.line_box {
+								width: 36%;
+								height: 6rpx;
+								background-color: #009FE8;
+								border-radius: 10rpx;
+							}
+						}
+
+						.num {
+							margin-left: 10rpx;
+							font-size: 24rpx;
+							color: #009FE8;
+						}
+					}
+
+				}
+			}
+		}
+	}
+</style>

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

@@ -1,25 +1,24 @@
 <template>
 	<view>
 		<view class="list">
-			<view class="item" v-for="(item,index) in list" :key="index" @click="go_h5(item.id)">
-				<view class="left">
-					<image
-						src="https://cdn.colorhub.me/139XSdzUuzRcgRk1ghrmwbWetE762tokLPfgdsEoE94/rs:auto:280:0:0/g:ce/bG9jYWw6Ly8vOWYv/ZTQvMzE3OTEzMzcy/ZWU5ODI4OTU5MDgw/MmVjMjViNWI2YjQy/MzNkOWZlNC5qcGVn.jpg"
-						mode="aspectFill"></image>
-				</view>
-				<view class="right">
-					<view class="title">
-						<view class="name">{{item.name}}</view>
-						<view class="tip">拼图</view>
-					</view>
-					<view class="text"></view>
-					<view class="content">
-						<view class="time">{{item.start_time}}</view>
-						<view class="box">
+			<view class="item" v-for="(item,index) in list" :key="index">
+				<view class="title">{{item.title}}</view>
+				<view class="box">
+					<view class="box_item" v-for="(item_2,index_2) in item.special_list" :key="index_2" @click="go_h5(item_2.id)">
+						<view class="time">有效时间：{{item_2.start_time}}——{{item_2.end_time}}</view>
+						<view class="inner">
+							<view class="left">
+								{{item_2.name}}
+							</view>
+							<view class="right">
+								<image src="./icon/btn.png"></image>
+							</view>
+						</view>
+						<view class="bottom">
 							<view class="line">
-								<view class="line_box" :style="{width: + item.percent_complete + '%'}"></view>
+								<view class="line_box" :style="{width: + item_2.percent_complete + '%'}"></view>
 							</view>
-							<view class="num">{{item.percent_complete}}%</view>
+							<view class="num">{{item_2.percent_complete}}%</view>
 						</view>
 					</view>
 				</view>
@@ -43,18 +42,20 @@
 				this.$api.jigsawPuzzle_specialList({
 
 				}).then((res) => {
-					console.log(res.data.data)
+					// console.log(res.data.data)
 
 					const data = res.data.data
 
-					data.forEach((item, index) => {
-						this.list = this.list.concat(item.special_list)
-					})
+					// data.forEach((item, index) => {
+					// 	this.list = this.list.concat(item.special_list)
+					// })
+					this.list = res.data.data
+					// console.log(this.list)
 				})
 			},
 			go_h5(id) {
 				uni.navigateTo({
-					url: "../../origanization/news/tab_3/h5/h5"
+					url: "../../origanization/news/tab_3/h5/h5?id="+id
 				})
 			}
 		}
@@ -67,103 +68,109 @@
 		padding: 0 25rpx;
 
 		.item {
+			margin-top: 60rpx;
 			width: 700rpx;
 			margin-bottom: 20rpx;
 
 			box-sizing: border-box;
 			padding: 20rpx;
-			padding-top: 24rpx;
-
-			background-color: #FFFFFF;
-			display: flex;
-
-			.left {
-				width: 180rpx;
-
-				image {
-					width: 180rpx;
-					height: 180rpx;
-
-					border-radius: 10rpx;
-				}
+			
+			padding-top: 60rpx;
+
+			background: #FFFFFF;
+			border: 3rpx solid #202492;
+			border-radius: 20rpx;
+			
+			position: relative;
+
+			.title{
+				position: absolute;
+				top: -35rpx;
+				left: 50rpx;
+				
+				width: 250rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+				border-radius: 10rpx;
+				
+				background-image: url(./icon/title.png);
+				background-size: cover;
+				background-repeat: no-repeat;
+				
+				text-align: center;
+				
+				font-size: 42rpx;
+				font-family: FZLanTingHeiS-B-GB;
+				font-weight: 700;
+				color: #00A0E8;
+				text-shadow: 3rpx 5rpx 4rpx rgba(0, 103, 150, 0.76);
+				-webkit-text-stroke: 1rpx #FFFFFF;
+				text-stroke: 1rpx #FFFFFF;
 			}
-
-			.right {
-				width: 450rpx;
-				margin-left: 20rpx;
-
-				.title {
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-
-					.name {
-						font-size: 26rpx;
-						color: #f39800;
-
-						overflow: hidden;
-						white-space: nowrap;
-						text-overflow: ellipsis;
-					}
-
-					.tip {
-						width: 75rpx;
-						text-align: center;
+			.box{
+				.box_item{
+					margin-bottom: 20rpx;
+					background-image: url(./icon/bg.png);
+					background-size: 100% 100%;
+					background-repeat: no-repeat;
+					
+					box-sizing: border-box;
+					padding: 20rpx 30rpx;
+					
+					.time{
+						display: inline-block;
+						
+						background-color: #FBDF33;
+						box-sizing: border-box;
+						padding: 5rpx 10rpx;
 						font-size: 24rpx;
-						color: #f39800;
-						border: 1rpx solid #f39800;
-						border-radius: 10rpx;
+						
+						border: 1rpx solid #000000;
+						box-shadow: 0rpx 3rpx 0rpx 0rpx rgba(0, 76, 110, 0.61);
+						border-radius: 20rpx;
 					}
-				}
-
-				.text {
-					height: 80rpx;
-					margin-top: 8rpx;
-					font-size: 28rpx;
-
-					text-overflow: -o-ellipsis-lastline;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					-webkit-line-clamp: 2;
-					line-clamp: 2;
-					-webkit-box-orient: vertical;
-				}
-
-				.content {
-
-					.time {
-						margin-right: 60rpx;
-						text-align: right;
-						font-size: 24rpx;
-						color: #999999;
+					.inner{
+						margin-top: 20rpx;
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						.left{
+							color: #FFFFFF;
+						}
+						.right{
+							margin-left: 20rpx;
+							image{
+								width: 76rpx;
+								height: 76rpx;
+								display: block;
+							}
+						}
 					}
-
-					.box {
+					.bottom {
+						margin-top: 20rpx;
 						display: flex;
 						align-items: center;
-
+					
 						.line {
-							width: 400rpx;
+							width:520rpx;
 							height: 6rpx;
 							background-color: #E4E4E4;
 							border-radius: 10rpx;
-
+					
 							.line_box {
 								width: 36%;
 								height: 6rpx;
-								background-color: #009FE8;
+								background-color: #00FFFF;
 								border-radius: 10rpx;
 							}
 						}
-
+					
 						.num {
 							margin-left: 10rpx;
 							font-size: 24rpx;
-							color: #009FE8;
+							color: #FFFFFF;
 						}
 					}
-
 				}
 			}
 		}

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

@@ -27,6 +27,14 @@
 				<view class="tip">工业视频</view>
 			</view>
 		</view>
+		<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>
 </template>
 
@@ -68,6 +76,13 @@
 				uni.navigateTo({
 					url:"../../production/video_monitor/video_monitor?mine_code=" + this.mine_code
 				})
+			},
+			
+			// 商汤
+			go_shangtang(){
+				uni.navigateTo({
+					url:"../../production/shangtang/shangtang"
+				})
 			}
 		}
 	}

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

@@ -1,12 +1,11 @@
 <template>
 	<view class="content">
-		<view class="item_box" style="background-color: #009FE8;" @click="go_h5('http://ningdongyunying.nxjiewei.com:8011/web/monitor/performanceRanking/performanceRanking')">
+		<view class="item_box" style="background-color: #34495D;" @click="go_zdhxt('xdt')">
 			<view class="img">
-				<image src="../t-p-icon/icon_1.png" mode=""></image>
+				<image src="../t-p-icon/icon_13.png" mode=""></image>
 			</view>
 			<view class="text">
-				<view class="name">绩效排名</view>
-				<view class="tip">绩效考核分数统计</view>
+				<view class="name">巷道图</view>
 			</view>
 		</view>
 		<view class="item_box" style="background-color: #638BD5;" @click="go_production_statistics()">
@@ -55,7 +54,7 @@
 				<view class="tip">工业视频</view>
 			</view>
 		</view>
-		<view class="item_box" style="background-color: #FA8B89;" @click="go_risk_precontr0l()">
+		<!-- <view class="item_box" style="background-color: #FA8B89;" @click="go_risk_precontr0l()">
 			<view class="img">
 				<image src="../t-p-icon/icon_7.png" mode=""></image>
 			</view>
@@ -63,6 +62,15 @@
 				<view class="name">风险预控</view>
 				<view class="tip">分数统计</view>
 			</view>
+		</view> -->
+		<view class="item_box" style="background-color: #009FE8;" @click="go_h5('http://ningdongyunying.nxjiewei.com:8011/web/monitor/performanceRanking/performanceRanking')">
+			<view class="img">
+				<image src="../t-p-icon/icon_1.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">绩效排名</view>
+				<view class="tip">绩效考核分数统计</view>
+			</view>
 		</view>
 		<view class="item_box" style="background-color: #2C3E50;" @click="go_zdhxt('zys')">
 			<view class="img">
@@ -100,12 +108,12 @@
 				<view class="tip">容知设备监控</view>
 			</view>
 		</view>
-		<view class="item_box" style="background-color: #BD5A79;" @click="go_shangtang()">
+		<view class="item_box" style="background-color: #5175E3;" @click="go_shangtang()">
 			<view class="img">
-				<image src="../t-p-icon/icon_11.png" mode=""></image>
+				<image src="../t-p-icon/icon_4.png" mode=""></image>
 			</view>
 			<view class="text">
-				<view class="name">商汤</view>
+				<view class="name">视频分析</view>
 			</view>
 		</view>
 	</view>

manifest.json

@@ -1,8 +1,8 @@
 {
-    "name" : "智慧清水营",
-    "appid" : "__UNI__91286B5",
+    "name" : "E信管理(新)",
+    "appid" : "__UNI__0C12F60",
     "description" : "",
-    "versionName" : "1.0.2",
+    "versionName" : "1.0.9",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
@@ -97,6 +97,9 @@
                     "xxhdpi" : "static/star.png"
                 }
             }
+        },
+        "uniStatistics" : {
+            "enable" : true
         }
     },
     /* 快应用特有相关 */

pages.json

@@ -14,9 +14,9 @@
 
 			"path": "pages/tabbar/origanization/origanization",
 			"style": {
-				"navigationBarTitleText": "通讯录"
+				// "navigationBarTitleText": "通讯录"
 				// 宁东运营 显示消息
-				// "navigationBarTitleText": "消息"
+				"navigationBarTitleText": "消息"
 			}
 
 		}, {
@@ -442,232 +442,191 @@
 				"navigationBarTitleText": "会议安排"
 			}
 
+		}, {
+			"path": "pages/workbench/meeting_arrangements/detail/detail",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/workbench/meeting_arrangements/detail/should_list/should_list",
+			"style": {
+				"navigationBarTitleText": "签到详情"
+			}
+
+		}
+
+		, {
+			"path": "pages/origanization/news/tab_1/all_list/all_list",
+			"style": {
+				"navigationBarTitleText": "五定表"
+			}
+
+		}, {
+			"path": "pages/origanization/news/tab_2/all_list/all_list",
+			"style": {
+				"navigationBarTitleText": "车辆管理"
+			}
+
+		}, {
+			"path": "pages/origanization/news/tab_3/h5/h5",
+			"style": {
+				"navigationBarBackgroundColor": "#3399FF"
+			}
+
+		}, {
+			"path": "pages/index/h5/h5",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/index/business_approval/business_approval",
+			"style": {
+				"navigationBarTitleText": "业务审批"
+			}
+
+		}, {
+			"path": "pages/index/business_approval/apply/apply",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/workbench/vehicle_approval/apply_vehicle/apply_vehicle",
+			"style": {
+				"navigationBarTitleText": "申请用车"
+			}
+
+		}, {
+			"path": "pages/workbench/vehicle_approval/vehicle_history/vehicle_history",
+			"style": {
+				"navigationBarTitleText": "用车历史"
+			}
+
+		}, {
+			"path": "pages/origanization/OA/approval_list/approval_list",
+			"style": {
+				"navigationBarTitleText": "流程待办"
+			}
+
+		}, {
+			"path": "pages/origanization/OA/approval_list/detail/detail",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+
+		}, {
+			"path": "pages/origanization/OA/approval_list/approval/approval",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+
+		}, {
+			"path": "pages/origanization/OA/application_list/application_list",
+			"style": {
+				"navigationBarTitleText": "OA审批"
+			}
+
+		}, {
+			"path": "pages/origanization/OA/application_list/search/search",
+			"style": {
+				"navigationBarTitleText": "OA审批"
+			}
+
+		}, {
+			"path": "pages/origanization/OA/application_list/detail_apply/detail_apply",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+
+		}, {
+			"path": "pages/my/personal_information/job_record/job_record",
+			"style": {
+				"navigationBarTitleText": "工作经历"
+			}
+
+		}, {
+			"path": "pages/my/personal_information/honor/honor",
+			"style": {
+				"navigationBarTitleText": "荣誉及证书"
+			}
+
+		}, {
+			"path": "pages/workbench/gridding/timeline_details/timeline_details",
+			"style": {
+				"navigationBarTitleText": "网格化时间线"
+			}
+
+		}, {
+			"path": "pages/workbench/gridding/timeline_details/detail/detail",
+			"style": {
+				"navigationBarTitleText": "记录详情"
+			}
+
+		}, {
+			"path": "pages/workbench/gridding/chart_statistics/chart_statistics",
+			"style": {
+				"navigationBarTitleText": "网格化图表统计"
+			}
+
+		}, {
+			"path": "pages/workbench/gridding/grid_query/grid_query",
+			"style": {
+				"navigationBarTitleText": "网格化巡查记录"
+			}
+
+		}, {
+			"path": "pages/workbench/gridding/grid_query/detail/detail",
+			"style": {
+				"navigationBarTitleText": "巡检详情"
+			}
+
+		}, {
+			"path": "pages/production/qingshuiying/zidonghua_list/zidonghua_list",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+
+		}, {
+			"path": "pages/production/qingshuiying/zidonghua_list/detail/detail",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#397CCA"
+			}
+
+		}, {
+			"path": "pages/origanization/OA/apply_list/apply_list",
+			"style": {
+				"navigationBarTitleText": "流程申请"
+			}
+
+		}, {
+			"path": "pages/origanization/OA/h5/h5",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/production/shangtang/shangtang",
+			"style": {
+				"navigationBarTitleText": "视频分析",
+				"navigationBarBackgroundColor": "#596ED5"
+			}
+
+		}, {
+			"path": "pages/my/version_record/version_record",
+			"style": {
+				"navigationBarTitleText": "更新日志"
+			}
+
 		}
 	    ,{
-            "path" : "pages/workbench/meeting_arrangements/detail/detail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/workbench/meeting_arrangements/detail/should_list/should_list",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "签到详情"
-            }
-            
-        }
-       
-        ,{
-            "path" : "pages/origanization/news/tab_1/all_list/all_list",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "五定表"
-            }
-            
-        }
-        ,{
-            "path" : "pages/origanization/news/tab_2/all_list/all_list",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "车辆管理"
-            }
-            
-        }
-        ,{
-            "path" : "pages/origanization/news/tab_3/h5/h5",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/h5/h5",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/business_approval/business_approval",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "业务审批"
-            }
-            
-        }
-        ,{
-            "path" : "pages/index/business_approval/apply/apply",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/workbench/vehicle_approval/apply_vehicle/apply_vehicle",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "申请用车"
-            }
-            
-        }
-        ,{
-            "path" : "pages/workbench/vehicle_approval/vehicle_history/vehicle_history",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "用车历史"
-            }
-            
-        }
-        ,{
-            "path" : "pages/origanization/OA/approval_list/approval_list",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "流程待办"
-            }
-            
-        }
-        ,{
-            "path" : "pages/origanization/OA/approval_list/detail/detail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": ""
-            }
-            
-        }
-        ,{
-            "path" : "pages/origanization/OA/approval_list/approval/approval",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": ""
-            }
-            
-        }
-        ,{
-            "path" : "pages/origanization/OA/application_list/application_list",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "OA审批"
-            }
-            
-        }
-        ,{
-            "path" : "pages/origanization/OA/application_list/search/search",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "OA审批"
-            }
-            
-        }
-        ,{
-            "path" : "pages/origanization/OA/application_list/detail_apply/detail_apply",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": ""
-            }
-            
-        }
-        ,{
-            "path" : "pages/my/personal_information/job_record/job_record",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "工作经历"
-            }
-            
-        }
-        ,{
-            "path" : "pages/my/personal_information/honor/honor",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "荣誉及证书"
-            }
-            
-        }
-        ,{
-            "path" : "pages/workbench/gridding/timeline_details/timeline_details",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "网格化时间线"
-            }
-            
-        }
-        ,{
-            "path" : "pages/workbench/gridding/timeline_details/detail/detail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "记录详情"
-            }
-            
-        }
-        ,{
-            "path" : "pages/workbench/gridding/chart_statistics/chart_statistics",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "网格化图表统计"
-            }
-            
-        }
-        ,{
-            "path" : "pages/workbench/gridding/grid_query/grid_query",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "网格化巡查记录"
-            }
-            
-        }
-        ,{
-            "path" : "pages/workbench/gridding/grid_query/detail/detail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "巡检详情"
-            }
-            
-        }
-        ,{
-            "path" : "pages/production/qingshuiying/zidonghua_list/zidonghua_list",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": ""
-            }
-            
-        }
-        ,{
-            "path" : "pages/production/qingshuiying/zidonghua_list/detail/detail",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-				"navigationBarBackgroundColor":"#397CCA"
-            }
-            
-        }
-        ,{
-            "path" : "pages/origanization/OA/apply_list/apply_list",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "流程申请"
-            }
-            
-        }
-        ,{
-            "path" : "pages/origanization/OA/h5/h5",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        ,{
-            "path" : "pages/production/shangtang/shangtang",
+            "path" : "pages/origanization/news/tab_2/all_list/detail/detail",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "",
@@ -692,8 +651,8 @@
 			},
 			{
 
-				"text": "通讯录",
-				// "text": "消息",
+				// "text": "通讯录",
+				"text": "消息",
 				"pagePath": "pages/tabbar/origanization/origanization",
 				"iconPath": "static/tabbar/origanization.png",
 				"selectedIconPath": "static/tabbar/origanization_active.png"

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

@@ -46,7 +46,7 @@
 		</view>
 
 		<view class="tips">
-			<text @click="back()">记起来了？请点击这登陆</text>
+			<text @click="back()">记起来了？请点击这里登陆</text>
 		</view>
 
 		<view class="change_btn" @click="changeBtn()">
@@ -74,10 +74,6 @@
 			this.mine_code = uni.getStorageSync('mine_code')
 		},
 		methods: {
-			changeBtn() {
-				
-
-			},
 			back(){
 				uni.navigateTo({
 					url:"../login/login"
@@ -116,7 +112,7 @@
 						}else if(res.data.code == 3003){
 							uni.showToast({
 								icon:"none",
-								title:"请填写绑定的手机号"
+								title:res.data.message
 							})
 							this.send_text = "发送验证码"
 						}else if(res.data.code == 0){

pages/my/personal_information/personal_information.vue

@@ -252,7 +252,7 @@
 				this.$api.user_getUinfo({
 					staff_num: uni.getStorageSync('user').staff_num
 				}).then((res) => {
-					console.log(res.data.data)
+					// console.log(res.data.data)
 					this.info = res.data.data
 					this.info.work_experience = JSON.parse(res.data.data.work_experience)
 					this.info.honor = JSON.parse(res.data.data.honor)

pages/my/version_record/version_record.vue

@@ -0,0 +1,125 @@
+<template>
+	<view>
+		<view class="list">
+			<view class="item" v-for="(item,index) in list" :key="index">
+				<view class="title">{{item.title}}</view>
+				<view class="box">
+					<view class="left">
+						<view class="line">更新类型：{{item.type | set_type}}</view>
+						<view class="line">更新内容：{{item.contents}}</view>
+						<view class="line">更新时间：{{item.create_date | conversion}}</view>
+					</view>
+				</view>
+				<view class="tip">{{item.version}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		set_appName
+	} from '@/common/set_base_url.js'
+
+	export default {
+		data() {
+			return {
+				appName: "",
+				list: []
+			};
+		},
+		onLoad() {
+			this.appName = set_appName(uni.getStorageSync('mine_code'))
+
+			this.get_list()
+		},
+		methods: {
+			get_list() {
+				uni.showLoading({
+					mask:true
+				})
+				uniCloud.callFunction({
+					name: "get_version_record",
+					data: {
+						appName: this.appName
+					}
+				}).then((res) => {
+					uni.hideLoading()
+					console.log(res.result.data)
+
+					this.list = res.result.data
+				})
+			}
+		},
+		filters: {
+			conversion: function(value) {
+				return new Date(value).toLocaleString();
+			},
+			set_type: function(value) {
+				if(value == 'wgt'){
+					return "资源包更新"
+				}else if(value == 'native_app'){
+					return "APP版本更新"
+				}
+			},
+		},
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F2FAF7;
+
+		box-sizing: border-box;
+		padding: 20rpx 25rpx;
+	}
+
+	.list {
+		.item {
+			position: relative;
+			overflow: hidden;
+			background-color: #FFFFFF;
+			
+			box-sizing: border-box;
+			padding: 25rpx;
+
+			border-radius: 15rpx;
+			margin-bottom: 30rpx;
+			
+			.title{
+				height: 70rpx;
+				line-height: 70rpx;
+				font-size: 36rpx;
+				font-weight: 700;
+			}
+			.box{
+				margin-top: 10rpx;
+				.left {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					.line{
+						margin-top: 10rpx;
+						line-height: 40rpx;
+						font-size: 28rpx;
+						color: #7f7f7f;
+					}
+				}
+			}
+			.tip{
+				transform: rotate(45deg);
+				
+				background-color: #04A0E6;
+				color: #FFFFFF;
+				
+				position: absolute;
+				top: -14rpx;
+				right: -46rpx;
+				
+				font-size: 24rpx;
+				padding: 30rpx 40rpx 10rpx;
+				
+			}
+		}
+	}
+</style>

pages/origanization/OA/h5/h5 - 使用的uni版本.vue

@@ -0,0 +1,44 @@
+<template>
+	<view>
+		<web-view :src="href"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				href: ""
+			};
+		},
+		onLoad(option) {
+			// #ifndef APP-NVUE
+			const eventChannel = this.getOpenerEventChannel();
+			// #endif
+			// 监听acceptDataFromOpenerPage事件，获取上一页面通过eventChannel传送到当前页面的数据
+			eventChannel.on('acceptDataFromOpenerPage', (data) => {
+				console.log(data)
+				
+				uni.setNavigationBarTitle({
+					title:data.title
+				})
+				
+				let url = escape(data.url)
+					console.log(url)
+					console.log(unescape(url))
+					
+				let title = escape(data.title)
+					console.log(title)
+					console.log(unescape(title))
+				
+				this.href = "http://oa_system.nxjiewei.com:8011/oa_login?staff_num=" + uni.getStorageSync('user').staff_num + "&url=" + url + "&title=" + title
+	
+			})
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/origanization/OA/h5/h5-token过期验证.vue

@@ -0,0 +1,83 @@
+<template>
+	<view>
+		<web-view :src="href"></web-view>
+	</view>
+</template>
+
+<script>
+	import "@/common/time.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('2022-02-26'))
+
+	export default {
+		data() {
+			return {
+				url: "",
+				href: ""
+			};
+		},
+		onLoad() {
+			// #ifndef APP-NVUE
+			const eventChannel = this.getOpenerEventChannel();
+			// #endif
+			// 监听acceptDataFromOpenerPage事件，获取上一页面通过eventChannel传送到当前页面的数据
+			eventChannel.on('acceptDataFromOpenerPage', (data) => {
+				console.log(data)
+
+				this.url = escape(data.url)
+			})
+
+
+			if (!uni.getStorageSync("oa_login_time")) {
+				// 第一次登录
+				console.log("第一次登陆")
+
+				let oa_login_time = "2010-01-01"
+
+				uni.setStorageSync("oa_login_time", new Date().format("yyyy-MM-dd"))
+
+				this.href = "http://oa_system.nxjiewei.com:8011/oa_login.html?staff_num=" + uni.getStorageSync('user')
+					.staff_num + "&url=" + this.url + "&oa_login_time=" + oa_login_time
+			} else {
+				// 有登录记录
+				console.log("有登录记录")
+
+				let oa_login_time = uni.getStorageSync("oa_login_time")
+
+				if (daysComputed(oa_login_time) > 5) {
+					uni.setStorageSync("oa_login_time", new Date().format("yyyy-MM-dd"))
+					
+					console.log(">5",uni.getStorageSync("oa_login_time"))
+					this.href = "http://oa_system.nxjiewei.com:8011/oa_login.html?staff_num=" + uni.getStorageSync('user')
+						.staff_num + "&url=" + this.url + "&oa_login_time=" + uni.getStorageSync("oa_login_time")
+
+				} else {
+					console.log("<5",oa_login_time)
+					
+					this.href = "http://oa_system.nxjiewei.com:8011/oa_login.html?staff_num=" + uni.getStorageSync('user')
+						.staff_num + "&url=" + this.url + "&oa_login_time=" + oa_login_time
+				}
+
+
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/origanization/OA/h5/h5.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<web-view update-title :src="href"></web-view>
+		<web-view :src="href"></web-view>
 	</view>
 </template>
 
@@ -18,20 +18,23 @@
 			// 监听acceptDataFromOpenerPage事件，获取上一页面通过eventChannel传送到当前页面的数据
 			eventChannel.on('acceptDataFromOpenerPage', (data) => {
 				console.log(data)
-				
+
+				uni.setNavigationBarTitle({
+					title: data.title
+				})
+
 				let url = escape(data.url)
-					console.log(url)
-					console.log(unescape(url))
-				
-				// this.href = "http://oa_system.nxjiewei.com:8011/oa_login?staff_num=" + uni.getStorageSync('user').staff_num + "&url=" + url
-				
-				
-				this.href = "http://webdevelop.nxjiewei.com/assets/html/zhks-quankuang/ningdongyunying/download/oa_login/?staff_num=" + uni.getStorageSync('user').staff_num + "&url=" + url
-				
-				// this.href = "http://oa_system.nxjiewei.com:8011/?m=ying&d=we&mnum=carmrese&show=we&hideheader=true"
+				console.log(url)
+				console.log(unescape(url))
+
+				let title = escape(data.title)
+				console.log(url)
+				console.log(unescape(title))
+
+				this.href = "http://oa_system.nxjiewei.com:8011/oa_login?staff_num=" + uni.getStorageSync('user')
+					.staff_num + "&url=" + url + "&title=" + title
 			})
-			
-			// this.href = "http://oa_system.nxjiewei.com:8011/oa_login?staff_num=" + uni.getStorageSync('user').staff_num + "&url=" + escape("http://oa_system.nxjiewei.com:8011/?m=ying&d=we&num=flow&hideheader=true")
+
 		}
 	}
 </script>

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

@@ -1,28 +1,38 @@
 <template>
 	<view>
-		<view class="content" v-if="list != ''">
+		<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 list.name" :key="index">{{item}}</uni-th>
-					<uni-th align="center">查看</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 list.data.data" :key="index">
-					<uni-td align="center">
+				<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>
+							<!-- <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 align="center" v-for="(item_2,index_2) in item" :key="index_2">{{item_2}}</uni-td>
-					<uni-td align="center">
-						<view @click="chakan()">查看</view>
+					<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>
 
@@ -30,38 +40,57 @@
 	export default {
 		data() {
 			return {
-				table:"",
-				
-				page:1,
-				pageSize:30,
+				table: "",
+				num:"",
+
+				page: 1,
+				pageSize: 30,
 				
-				list:""
+				name:[],
+				data:[]
 			};
 		},
 		onLoad(option) {
 			uni.setNavigationBarTitle({
-				title:option.title
+				title: option.title
 			})
-			
+			this.num = option.num
 			this.table = option.table
 			this.get_five_fixed_fiveFixedDetail()
 		},
-		methods:{
-			chakan(){
-				uni.navigateTo({
-					url:"../../../OA/approval_list/approval_list"
-				})
-			},
-			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)=>{
+					table: this.table,
+					page: this.page,
+					pageSize: this.pageSize
+				}).then((res) => {
 					console.log(res.data.content.data)
 					
-					
-					this.list = 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
 				})
 			}
 		}
@@ -69,22 +98,30 @@
 </script>
 
 <style lang="scss">
-	.uni-table-th.table--border{
+	.uni-table-th.table--border {
 		color: #000000;
 		background-color: #D8D8D8;
 	}
-	.uni-table-td.table--border{
+
+	.uni-table-td.table--border {
 		color: #666666;
 	}
 
-	
-	.icon{
+
+	.icon {
 		position: relative;
 		top: 0;
 		right: 0;
-		image{
+
+		image {
 			width: 33rpx;
 			height: 18rpx;
 		}
 	}
+
+	image {
+		width: 80rpx;
+		height: 80rpx;
+		display: block;
+	}
 </style>

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

@@ -1,28 +1,26 @@
 <template>
 	<view>
 		<view class="list">
-			<view class="item" v-for="item in 7">
+			<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">
-							<image
-								src="https://cdn.colorhub.me/OLRn1jRkVXSyDzRLt-5hqPSEhOiCBanlo1pfEgG44dE/rs:fill:280:280:0/g:sm/bG9jYWw6Ly8vM2Iv/NTAvMTliNzNiMDY5/MjQ0YThlMDgyMzE0/MzcyMjg1ZWMxYTJh/YzRiM2I1MC5qcGVn.jpg"
-								mode="aspectFill"></image>
+							<image :src="item.face" mode="aspectFill"></image>
 						</view>
 					</view>
 					<view class="right">
-						<view class="name">李建中<text>信息化站</text></view>
+						<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 class="img" v-for="item in 5">
-								<image
-									src="https://cdn.colorhub.me/nxoruPZz2k8PIvdAOR7RPo_kI_o87nj9CEksLl_KUSE/rs:fill:280:280:0/g:sm/bG9jYWw6Ly8vNzIv/YWQvZmY2NzYzNWNh/ZGU3NTM1NTA5MzI0/MzAwYmI0M2QzZmNm/MDNkNzJhZC5qcGVn.jpg"
-									mode="aspectFill"></image>
+							<view class="img" 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">2021-12-14 08:32:56</view>
+						<view class="time">{{item.optdt}}</view>
 						
 					</view>
 				</view>
@@ -35,8 +33,53 @@
 	export default {
 		data() {
 			return {
-
+				table: "",
+				num:"",
+
+				page: 1,
+				pageSize: 10,
+				
+				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>
@@ -46,7 +89,7 @@
 		box-sizing: border-box;
 		padding: 25rpx;
 		.item {
-			border-bottom: 1rpx solid #CCCCCC;
+			border-bottom: 1rpx solid #f0f0f0;
 			margin-bottom: 40rpx;
 			.inner {
 				margin-bottom: 40rpx;
@@ -75,7 +118,7 @@
 
 						text {
 							margin-left: 20rpx;
-							font-size: 26rpx;
+							font-size: 28rpx;
 							color: #3a3a3a;
 						}
 					}
@@ -83,7 +126,7 @@
 					.text {
 						width: 600rpx;
 						margin-top: 10rpx;
-						font-size: 28rpx;
+						font-size: 30rpx;
 					}
 
 					.img_box {
@@ -111,7 +154,7 @@
 					}
 
 					.time {
-						font-size: 24rpx;
+						font-size: 26rpx;
 						color: #999999;
 					}
 

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

@@ -0,0 +1,28 @@
+<template>
+	<view>
+		<web-view :src="href"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				href: ""
+			};
+		},
+		onLoad(option) {
+			console.log(option)
+			
+			let url = "http://oa_system.nxjiewei.com:8011/task.php?a=x&num="+ option.table +"&mid="+option.id+"&show=we&hideheader=true"
+			
+			this.href = "http://oa_system.nxjiewei.com:8011/oa_login?staff_num=" + uni.getStorageSync('user')
+				.staff_num + "&url=" + escape(url)
+		
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/origanization/news/tab_3/h5/h5.vue

@@ -12,7 +12,10 @@
 			};
 		},
 		onLoad(option) {
-			this.href = 'http://web.nxjiewei.com/#/ningdongyunying/puzzle/puzzles?token=' + uni.getStorageSync('Authorization')
+			// this.href = 'http://web.nxjiewei.com/#/ningdongyunying/puzzle/puzzles?token=' + uni.getStorageSync('Authorization')
+			// this.href = 'http://webdevelop.nxjiewei.com/assets/html/zhks-quankuang/ceshi/?token=' + uni.getStorageSync('Authorization')
+		
+			this.href = "http://web.nxjiewei.com/#/ningdongyunying/puzzle/puzzle-info?id="+ option.id +"&token=" + uni.getStorageSync('Authorization')
 		}
 	}
 </script>

pages/production/safety_monitoring/safety_monitoring - 副本.vue

@@ -1,160 +0,0 @@
-<template>
-	<view>
-		<!-- navbar -->
-		<p-safety-monitoring-navbar :mine="mine"></p-safety-monitoring-navbar>
-		
-		<view style="margin-bottom: 200rpx;">
-			<!-- 模拟量 -->
-			<view v-if="active == 1">
-				<p-safety-monitoring-content-1 :mine="mine" :simulation="simulation" :simulationList="simulationList"></p-safety-monitoring-content-1>
-			</view>
-			<!-- 开关量 -->
-			<view v-if="active == 2">
-				<p-safety-monitoring-content-2 :mine="mine" :sluice="sluice" :sluiceList="sluiceList"></p-safety-monitoring-content-2>
-			</view>
-		</view>
-		
-		<!-- tabbar -->
-		<view class="tabbar">
-			<view class="list_item">
-				<view class="item" :class="active === 1 ? 'active':''" @click="click_item(1)">
-					<view class="item_icon icon_one"></view>
-					<view class="item_name">
-						模拟量
-					</view>
-				</view>
-				<view class="item" :class="active === 2 ? 'active':''" @click="click_item(2)">
-					<view class="item_icon icon_two"></view>
-					<view class="item_name">
-						开关量
-					</view>
-				</view>
-			</view>
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				mine:"",
-				
-				active:1,
-				
-				// 模拟量
-				// 监测统计
-				simulation:[],
-				simulationList:[],
-				
-				
-				// 开关量
-				sluice:[],
-				sluiceList:[],
-			};
-		},
-		onLoad(option) {
-			this.mine = option.mine
-			
-			
-			// 模拟量统计
-			this.getSimulation()
-			
-			
-			// 开关量统计
-			this.getSluice()
-			
-		},
-		methods:{
-			click_item(item){
-				this.active = item
-			
-			},
-			// 模拟量统计
-			getSimulation(){
-				uni.showLoading()
-				this.$p_api.jt_safety_simulation_total({
-					mine:this.mine,
-					mine_code:this.mine
-				}).then((res)=>{
-					uni.hideLoading()
-					// console.log(res)
-					this.simulation = res.data.content.total
-					this.simulationList = res.data.content.data
-				})
-			},
-			
-			// 开关量统计
-			getSluice(){
-				uni.showLoading()
-				this.$p_api.jt_safety_sluice_total({
-					mine:this.mine,
-					mine_code:this.mine
-				}).then((res)=>{
-					uni.hideLoading()
-					// console.log(res.data.content)
-					this.sluice = res.data.content.total
-					this.sluiceList = res.data.content.data
-				})
-				
-			},
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-	.tabbar{
-		z-index: 999;
-		background-color: #fff;
-		position: fixed;
-		bottom: 0;
-		width: 750rpx;
-		.list_item{
-			width: 100%;
-			border-top: 2rpx solid #f3f3f3;
-			box-sizing: border-box;
-			padding: 12rpx 0;
-			
-			.item{
-				float: left;
-				width: 50%;
-				.item_icon{
-					margin: 0 auto;
-					width: 45rpx;
-					height: 45rpx;
-					
-					background-size: cover;
-					background-repeat: no-repeat;
-				}
-				.icon_one{
-					background-image: url(icon/ss1.png);
-				}
-				.icon_two{
-					background-image: url(icon/work.png);
-				}
-				.item_name{
-					text-align: center;
-					font-size: 25rpx;
-					font-family: PingFangSC-Regular, PingFang SC;
-					font-weight: 400;
-					color: #929292;
-					line-height: 40rpx;
-
-				}
-			}
-			.active{
-				.icon_one{
-					background-image: url(icon/ss2.png);
-				}
-				.icon_two{
-					background-image: url(icon/work_active.png);
-				}
-				.item_name{
-					color: #3498DB;
-				}
-			}
-		}
-	}
-</style>

pages/production/safety_monitoring/safety_monitoring.vue

@@ -3,7 +3,35 @@
 		<!-- navbar -->
 		<p-safety-monitoring-navbar :mine="mine"></p-safety-monitoring-navbar>
 		
-		678
+		<view style="margin-bottom: 200rpx;">
+			<!-- 模拟量 -->
+			<view v-if="active == 1">
+				<p-safety-monitoring-content-1 :mine="mine" :simulation="simulation" :simulationList="simulationList"></p-safety-monitoring-content-1>
+			</view>
+			<!-- 开关量 -->
+			<view v-if="active == 2">
+				<p-safety-monitoring-content-2 :mine="mine" :sluice="sluice" :sluiceList="sluiceList"></p-safety-monitoring-content-2>
+			</view>
+		</view>
+		
+		<!-- tabbar -->
+		<view class="tabbar">
+			<view class="list_item">
+				<view class="item" :class="active === 1 ? 'active':''" @click="click_item(1)">
+					<view class="item_icon icon_one"></view>
+					<view class="item_name">
+						模拟量
+					</view>
+				</view>
+				<view class="item" :class="active === 2 ? 'active':''" @click="click_item(2)">
+					<view class="item_icon icon_two"></view>
+					<view class="item_name">
+						开关量
+					</view>
+				</view>
+			</view>
+		</view>
+		
 	</view>
 </template>
 
@@ -77,6 +105,56 @@
 </script>
 
 <style lang="scss">
-	
+	.tabbar{
+		z-index: 999;
+		background-color: #fff;
+		position: fixed;
+		bottom: 0;
+		width: 750rpx;
+		.list_item{
+			width: 100%;
+			border-top: 2rpx solid #f3f3f3;
+			box-sizing: border-box;
+			padding: 12rpx 0;
+			
+			.item{
+				float: left;
+				width: 50%;
+				.item_icon{
+					margin: 0 auto;
+					width: 45rpx;
+					height: 45rpx;
+					
+					background-size: cover;
+					background-repeat: no-repeat;
+				}
+				.icon_one{
+					background-image: url(icon/ss1.png);
+				}
+				.icon_two{
+					background-image: url(icon/work.png);
+				}
+				.item_name{
+					text-align: center;
+					font-size: 25rpx;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: #929292;
+					line-height: 40rpx;
 
+				}
+			}
+			.active{
+				.icon_one{
+					background-image: url(icon/ss2.png);
+				}
+				.icon_two{
+					background-image: url(icon/work_active.png);
+				}
+				.item_name{
+					color: #3498DB;
+				}
+			}
+		}
+	}
 </style>

pages/production/shangtang/shangtang.vue

@@ -16,7 +16,15 @@
 		},
 		onLoad() {
 			this.staff_num = uni.getStorageSync('user').staff_num
-			this.mine_code = uni.getStorageSync('mine_code')
+			// this.mine_code = uni.getStorageSync('mine_code')
+			
+			let mine_code = uni.getStorageSync('mine_code')
+			
+			if(mine_code == 'ningdongyunying'){
+				this.mine_code = "ningdongyunying"
+			}else if(mine_code == 'jinjiaqu'){
+				this.mine_code = "640323B0011010019259"
+			}
 
 			this.get_token()
 		},

pages/tabbar/index/index.vue

@@ -12,16 +12,25 @@
 		<!-- 新闻列表 -->
 		<t-i-news :newsList="newsList" :mine_code="mine_code"></t-i-news>
 		
+		<!-- 开屏通告 -->
+		<openingNotice></openingNotice>
+		
+		<!-- 宁东运营 -->
+		<view v-if="mine_code == 'ningdongyunying'">
+			<t-i-ningdongyunying :mine_code="mine_code"></t-i-ningdongyunying>
+		</view>
+		
 		<!-- 金家渠 -->
 		<view v-if="mine_code == 'jinjiaqu'">
 			<t-i-jinjiaqu :mine_code="mine_code"></t-i-jinjiaqu>
+			
 		</view>
 		
 		<!-- 羊场湾 -->
 		<view v-if="mine_code == 'yangchangwan'">
 			<t-i-yangchangwan :mine_code="mine_code" :home_link="home_link"></t-i-yangchangwan>
 		</view>
-
+		
 	</view>
 </template>
 

pages/tabbar/workbench/workbench - 副本 (2).vue

@@ -0,0 +1,309 @@
+<template>
+	<view class="headers">
+		<view class="headers_img">
+			<image :src="header" mode="aspectFill"></image>
+		</view>
+		<view class="headers_nav">
+			<view class="headers_ul">
+				<view class="headers_li" v-for="(item,index) in nav" :key="index" @click="go_link(item)">
+					<view class="headers_li_img">
+						<image :src="item.icon" mode=""></image>
+					</view>
+					<view class="headers_li_text">
+						{{item.title}}
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view class="headers_list" v-for="(item,index) in module" :key="index">
+			<view class="headers_title">
+				<text class="headers_title_h1">
+					{{item.title}}
+				</text>
+			</view>
+			<view class="headers_ul">
+				<view class="headers_li" v-for="(items,index) in item.children" :key="index"
+					@click="go_link(items)">
+					<view class="headers_li_img">
+						<image :src="items.icon" mode=""></image>
+					</view>
+					<view class="headers_li_text">
+						{{items.title}}
+					</view>
+
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 当前煤矿编码
+				mine_code: "",
+
+				module: [],
+				nav: [],
+				header: "",
+			};
+		},
+		onLoad() {
+			// 初始化当前煤矿编码
+			this.mine_code = uni.getStorageSync('mine_code')
+
+			this.getworkbench()
+		},
+		methods: {
+			getworkbench() {
+				this.$api.workbench_index({
+
+				}).then((res) => {
+					console.log(res)
+					this.header = res.data.data.header
+					this.nav = res.data.data.nav
+					this.module = res.data.data.module
+
+				})
+			},
+
+			go_link(item) {
+				// console.log(item)
+				
+				let link = item.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,
+							})
+						}
+					})
+					
+					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) {
+					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: "未安装此应用"
+								})
+							})
+						} else if (link.indexOf("com.icbc") != -1) {
+							plus.runtime.launchApplication({
+								pname: 'com.icbc'
+							}, (e) => {
+								console.log('Open system default browser failed: ' + e.message)
+					
+								uni.showToast({
+									icon: "none",
+									title: "未安装此应用"
+								})
+							})
+						} else {
+							uni.navigateTo({
+								url: "../../workbench/h5/h5?url=" + link
+							})
+						}
+					
+					
+					}
+					
+					// #endif
+					
+					// #ifdef H5
+					uni.navigateTo({
+						url: "../../workbench/h5/h5?url=" + link
+					})
+					// #endif
+				}
+
+				// 原生
+				if (link.indexOf("pageId") == -1 && link.indexOf("app:") != -1) {
+					console.log("原生")
+
+					console.log(link)
+					// 发票助手
+					if (link.indexOf("/workBench/invoice") != -1) {
+						console.log("发票助手")
+						uni.navigateTo({
+							url: "../../workbench/invoice_assistant/invoice_assistant"
+						})
+					} else if (link.indexOf("/news/news_win") != -1) {
+						console.log("通知公告")
+
+						uni.navigateTo({
+							url: "../../my/message-reminder/message-reminder"
+						})
+					} else if (link.indexOf("/workBench/getDuty") != -1) {
+						console.log("值班信息")
+
+						uni.navigateTo({
+							url: "../../workbench/duty_information/duty_information"
+						})
+					} else if (link.indexOf("/workBench/huiyiList") != -1) {
+						console.log("会议列表")
+						uni.navigateTo({
+							url: "../../workbench/meeting_arrangements/meeting_arrangements"
+						})
+					} else if (link.indexOf("/workBench/lifeCircleWin") != -1) {
+						console.log("生活圈")
+
+						uni.showToast({
+							icon: "none",
+							title: "暂未开通"
+						})
+					} else if (link.indexOf("/productionData/logging") != -1) {
+						console.log("下井记录")
+						// people_num 特殊值
+						if (!uni.getStorageSync('people_code')) {
+							uni.navigateTo({
+								url: "../../production/personnel_orientation/downhole_statistics/downhole_statistics?people_num=null&depart_name=" +
+									uni.getStorageSync('user').section + "&name=" + uni.getStorageSync('user')
+									.name + "&mine=640323B0011010019259"
+							})
+						} else {
+							uni.navigateTo({
+								url: "../../production/personnel_orientation/downhole_statistics/downhole_statistics?people_num=" +
+									uni.getStorageSync('user').people_code + "&depart_name=" + uni.getStorageSync(
+										'user').section + "&name=" + uni.getStorageSync('user').name +
+									"&mine=640323B0011010019259"
+							})
+						}
+
+					}else if(link.indexOf("/browseQrcode/gridSubmitItem_win") != -1){
+						console.log("网格排查")
+						uni.navigateTo({
+							url:"../../workbench/gridding/gridding"
+						})
+					}else if(link.indexOf("/workBench/evaluate") != -1){
+						console.log("干部评测")
+						uni.navigateTo({
+							url:"../../workbench/h5/h5?mine_code=zaoquan&workBench=pingce"
+						})
+					} else {
+						uni.showToast({
+							icon: "none",
+							title: "暂未开通"
+						})
+					}
+				}
+			}
+
+		},
+
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F5F5F5;
+	}
+
+	.headers {
+		width: 100%;
+		background-color: #F5F5F5;
+	}
+
+	.headers_img>image {
+		width: 100%;
+		height: 360rpx;
+	}
+
+	.headers_nav {
+		width: 100%;
+		background-color: #FFFFFF;
+		margin-bottom: 25rpx;
+	}
+
+	.headers_ul {
+		width: 100%;
+		/* display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between; */
+		margin-top: 10rpx;
+		overflow: hidden;
+	}
+
+	.headers_ul::after {
+		content: '';
+		width: 25%;
+	}
+
+	.headers_title {
+		margin-left: 40rpx;
+		padding-top: 30rpx;
+		padding-bottom: 5rpx;
+	}
+
+	.headers_li {
+		float: left;
+
+		width: 25%;
+		text-align: center;
+		margin-bottom: 25rpx;
+		margin-top: 25rpx;
+	}
+
+	.headers_li_img>image {
+		width: 100rpx;
+		height: 100rpx;
+		margin-bottom: 10rpx;
+	}
+
+	.headers_li_text {
+		font-size: 14px;
+	}
+
+	.headers_title_h1 {
+		font-weight: 800;
+	}
+
+	.headers_list {
+		width: 100%;
+		background-color: #fff;
+	}
+
+	.ly-tree-node__label {
+		color: #000000;
+	}
+</style>

pages/tabbar/workbench/workbench-新版样式.vue

@@ -0,0 +1,328 @@
+<template>
+	<view>
+		<!-- 工作台头图 -->
+		<view class="top">
+			<image :src="header"></image>
+		</view>
+		
+		<!-- nav -->
+		<view class="section">
+			<view class="title"></view>
+			<view class="list">
+				<view class="item" v-for="(item,index) in nav" :key="index"  @click="go_link(item)">
+					<view class="icon">
+						<view class="num" v-if="item.link.indexOf('http://oa_system.nxjiewei.com:8011/?m=ying&d=we&num=daiban&hideheader=true') != -1 && num_1 > 0">{{num_1}}</view>
+						<view class="num" v-if="item.link.indexOf('http://oa_system.nxjiewei.com:8011/?m=ying&d=we&num=todo&hideheader=true') != -1 && num_2 > 0">{{num_2}}</view>
+						<image :src="item.icon" mode=""></image>
+					</view>
+					<view class="name">{{item.title}}</view>
+				</view>
+			</view>
+		</view>
+		
+		<view class="section" v-for="(item,index) in module" :key="index">
+			<view class="title">{{item.title}}</view>
+			<view class="list">
+				<view class="item" v-for="(item_2,index_2) in item.children" :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>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 当前煤矿编码
+				mine_code: "",
+				
+				// 头部图片
+				header:"",
+				nav: [],
+				module: [],
+				
+				num_1:0,
+				num_2:0
+			};
+		},
+		onLoad() {
+			// 初始化当前煤矿编码
+			this.mine_code = uni.getStorageSync('mine_code')
+
+			this.get_workbench_index()
+			
+			this.get_workflow_todo_query_1()
+			this.get_workflow_todo_query_2()
+		},
+		methods: {
+			// 获取基础数据
+			get_workbench_index(){
+				this.$api.workbench_index({
+				
+				}).then((res) => {
+					// console.log(res.data.data)
+					
+					this.header = res.data.data.header
+					this.nav = res.data.data.nav
+					this.module = res.data.data.module
+				})
+			},
+			
+			// 获取消息提醒数量
+			get_workflow_todo_query_1(){
+				this.$api.workflow_todo_query({
+					staff_num: uni.getStorageSync('user').staff_num,
+					query_type: 2
+				}).then((res)=>{
+					console.log(res.data.content.data)
+					
+					this.num_1 = res.data.content.data
+				})
+			},
+			get_workflow_todo_query_2(){
+				this.$api.workflow_todo_query({
+					staff_num: uni.getStorageSync('user').staff_num,
+					query_type: 1
+				}).then((res)=>{
+					console.log(res.data.content.data)
+					
+					this.num_2 = res.data.content.data
+				})
+			},
+
+			go_link(item) {
+				// console.log(item)
+				
+				let link = item.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,
+							})
+						}
+					})
+					
+					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) {
+					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: "未安装此应用"
+								})
+							})
+						} else if (link.indexOf("com.icbc") != -1) {
+							plus.runtime.launchApplication({
+								pname: 'com.icbc'
+							}, (e) => {
+								console.log('Open system default browser failed: ' + e.message)
+					
+								uni.showToast({
+									icon: "none",
+									title: "未安装此应用"
+								})
+							})
+						} else {
+							uni.navigateTo({
+								url: "../../workbench/h5/h5?url=" + link
+							})
+						}
+					
+					
+					}
+					
+					// #endif
+					
+					// #ifdef H5
+					uni.navigateTo({
+						url: "../../workbench/h5/h5?url=" + link
+					})
+					// #endif
+				}
+
+				// 原生
+				if (link.indexOf("pageId") == -1 && link.indexOf("app:") != -1) {
+					console.log("原生")
+
+					console.log(link)
+					// 发票助手
+					if (link.indexOf("/workBench/invoice") != -1) {
+						console.log("发票助手")
+						uni.navigateTo({
+							url: "../../workbench/invoice_assistant/invoice_assistant"
+						})
+					} else if (link.indexOf("/news/news_win") != -1) {
+						console.log("通知公告")
+
+						uni.navigateTo({
+							url: "../../my/message-reminder/message-reminder"
+						})
+					} else if (link.indexOf("/workBench/getDuty") != -1) {
+						console.log("值班信息")
+
+						uni.navigateTo({
+							url: "../../workbench/duty_information/duty_information"
+						})
+					} else if (link.indexOf("/workBench/huiyiList") != -1) {
+						console.log("会议列表")
+						uni.navigateTo({
+							url: "../../workbench/meeting_arrangements/meeting_arrangements"
+						})
+					} else if (link.indexOf("/workBench/lifeCircleWin") != -1) {
+						console.log("生活圈")
+
+						uni.showToast({
+							icon: "none",
+							title: "暂未开通"
+						})
+					} else if (link.indexOf("/productionData/logging") != -1) {
+						console.log("下井记录")
+						// people_num 特殊值
+						if (!uni.getStorageSync('people_code')) {
+							uni.navigateTo({
+								url: "../../production/personnel_orientation/downhole_statistics/downhole_statistics?people_num=null&depart_name=" +
+									uni.getStorageSync('user').section + "&name=" + uni.getStorageSync('user')
+									.name + "&mine=640323B0011010019259"
+							})
+						} else {
+							uni.navigateTo({
+								url: "../../production/personnel_orientation/downhole_statistics/downhole_statistics?people_num=" +
+									uni.getStorageSync('user').people_code + "&depart_name=" + uni.getStorageSync(
+										'user').section + "&name=" + uni.getStorageSync('user').name +
+									"&mine=640323B0011010019259"
+							})
+						}
+
+					}else if(link.indexOf("/browseQrcode/gridSubmitItem_win") != -1){
+						console.log("网格排查")
+						uni.navigateTo({
+							url:"../../workbench/gridding/gridding"
+						})
+					}else if(link.indexOf("/workBench/evaluate") != -1){
+						console.log("干部评测")
+						uni.navigateTo({
+							url:"../../workbench/h5/h5?mine_code=zaoquan&workBench=pingce"
+						})
+					} else {
+						uni.showToast({
+							icon: "none",
+							title: "暂未开通"
+						})
+					}
+				}
+			}
+
+		},
+
+	}
+</script>
+
+
+<style lang="scss">
+	page{
+		background-color: #F2FAF7;
+	}
+	.top{
+		image{
+			width: 750rpx;
+			height: 270rpx;
+			display: block;
+		}
+	}
+	
+	.section{
+		margin-top: 20rpx;
+		background-color: #FFFFFF;
+		
+		box-sizing: border-box;
+		padding: 25rpx;
+		.title{
+			font-weight: 700;
+			font-size: 34rpx;
+		}
+		
+		.list{
+			margin-top: 30rpx;
+			width: 700rpx;
+			overflow: hidden;
+			.item{
+				float: left;
+				margin-right: 20rpx;
+				margin-bottom: 30rpx;
+				
+				width: 160rpx;
+				text-align: center;
+				.icon{
+					position: relative;
+					margin-bottom: 10rpx;
+					image{
+						width: 100rpx;
+						height: 100rpx;
+					}
+					
+					.num{
+						z-index: 999;
+						position: absolute;
+						top: 0;
+						right: 10rpx;
+						
+						width: 40rpx;
+						line-height: 40rpx;
+						background-color: #F56C6C;
+						border-radius: 50%;
+						color: #FFF;
+						font-size: 26rpx;
+					}
+				}
+				.name{
+					font-size: 30rpx;
+				}
+			}
+			.item:nth-child(4n){
+				margin-right: 0;
+			}
+		}
+	}
+</style>

pages/tabbar/workbench/workbench.vue

@@ -1,38 +1,44 @@
 <template>
-	<view class="headers">
-		<view class="headers_img">
-			<image :src="header" mode="aspectFill"></image>
+	<view>
+		<!-- 工作台头图 -->
+		<view class="top">
+			<image :src="header"></image>
 		</view>
-		<view class="headers_nav">
-			<view class="headers_ul">
-				<view class="headers_li" v-for="(item,index) in nav" :key="index" @click="go_link(item)">
-					<view class="headers_li_img">
+		
+		<!-- nav -->
+		<view class="section">
+			<view class="list">
+				<view class="item" v-for="(item,index) in nav" :key="index"  @click="go_link(item)">
+					<view class="icon">
 						<image :src="item.icon" mode=""></image>
 					</view>
-					<view class="headers_li_text">
-						{{item.title}}
+					<view class="name">
+						<view class="num" v-if="item.link.indexOf('http://oa_system.nxjiewei.com:8011/?m=ying&d=we&num=daiban&hideheader=true') != -1 && num_1 > 0">{{num_1}}</view>
+						<view class="num" v-if="item.link.indexOf('http://oa_system.nxjiewei.com:8011/?m=ying&d=we&num=todo&hideheader=true') != -1 && num_2 > 0">{{num_2}}</view>
+						
+						<view class="name_title">{{item.title}}</view>
+						<view class="sub_title">{{item.sub_title}}</view>
 					</view>
 				</view>
 			</view>
 		</view>
-
-
-		<view class="headers_list" v-for="(item,index) in module" :key="index">
-			<view class="headers_title">
-				<text class="headers_title_h1">
-					{{item.title}}
-				</text>
+		
+		<view class="section" v-for="(item,index) in module" :key="index">
+			<view class="title">
+				<view class="icon">
+					<image :src="item.icon" mode=""></image>
+				</view>
+				<view class="text">{{item.title}}</view>
 			</view>
-			<view class="headers_ul">
-				<view class="headers_li" v-for="(items,index) in item.children" :key="index"
-					@click="go_link(items)">
-					<view class="headers_li_img">
-						<image :src="items.icon" mode=""></image>
+			<view class="list">
+				<view class="item" v-for="(item_2,index_2) in item.children" :key="index_2"  @click="go_link(item_2)">
+					<view class="icon">
+						<image :src="item_2.icon" mode=""></image>
 					</view>
-					<view class="headers_li_text">
-						{{items.title}}
+					<view class="name">
+						<view class="name_title">{{item_2.title}}</view>
+						<view class="sub_title">{{item_2.sub_title}}</view>
 					</view>
-
 				</view>
 			</view>
 		</view>
@@ -45,28 +51,55 @@
 			return {
 				// 当前煤矿编码
 				mine_code: "",
-
-				module: [],
+				
+				// 头部图片
+				header:"",
 				nav: [],
-				header: "",
+				module: [],
+				
+				num_1:0,
+				num_2:0
 			};
 		},
 		onLoad() {
 			// 初始化当前煤矿编码
 			this.mine_code = uni.getStorageSync('mine_code')
 
-			this.getworkbench()
+			this.get_workbench_index()
+			
+			this.get_workflow_todo_query_1()
+			this.get_workflow_todo_query_2()
 		},
 		methods: {
-			getworkbench() {
+			// 获取基础数据
+			get_workbench_index(){
 				this.$api.workbench_index({
-
+				
 				}).then((res) => {
-					console.log(res)
+					
 					this.header = res.data.data.header
 					this.nav = res.data.data.nav
 					this.module = res.data.data.module
-
+				})
+			},
+			
+			// 获取消息提醒数量
+			get_workflow_todo_query_1(){
+				this.$api.workflow_todo_query({
+					staff_num: uni.getStorageSync('user').staff_num,
+					query_type: 2
+				}).then((res)=>{
+					
+					this.num_1 = res.data.content.data
+				})
+			},
+			get_workflow_todo_query_2(){
+				this.$api.workflow_todo_query({
+					staff_num: uni.getStorageSync('user').staff_num,
+					query_type: 1
+				}).then((res)=>{
+					
+					this.num_2 = res.data.content.data					
 				})
 			},
 
@@ -83,6 +116,7 @@
 							// 通过eventChannel向被打开页面传送数据
 							res.eventChannel.emit('acceptDataFromOpenerPage', {
 								url: link,
+								title: item.title
 							})
 						}
 					})
@@ -220,6 +254,10 @@
 						uni.navigateTo({
 							url:"../../workbench/h5/h5?mine_code=zaoquan&workBench=pingce"
 						})
+					}else if(link.indexOf("/productionData/persnoalLocation") != -1){
+						uni.navigateTo({
+							url:"../../production/personnel_orientation/personnel_orientation?mine=640181B0011010030750"
+						})
 					} else {
 						uni.showToast({
 							icon: "none",
@@ -234,76 +272,105 @@
 	}
 </script>
 
-<style>
-	page {
-		background-color: #F5F5F5;
-	}
 
-	.headers {
-		width: 100%;
-		background-color: #F5F5F5;
+<style lang="scss">
+	page{
+		background-color: #F2FAF7;
+		margin-bottom: 20rpx;
 	}
-
-	.headers_img>image {
-		width: 100%;
-		height: 360rpx;
+	.top{
+		image{
+			width: 750rpx;
+			height: 270rpx;
+			display: block;
+		}
 	}
-
-	.headers_nav {
-		width: 100%;
+	
+	.section{
+		margin-top: 20rpx;
 		background-color: #FFFFFF;
-		margin-bottom: 25rpx;
-	}
-
-	.headers_ul {
-		width: 100%;
-		/* display: flex;
-		flex-wrap: wrap;
-		justify-content: space-between; */
-		margin-top: 10rpx;
-		overflow: hidden;
-	}
-
-	.headers_ul::after {
-		content: '';
-		width: 25%;
-	}
-
-	.headers_title {
-		margin-left: 40rpx;
-		padding-top: 30rpx;
-		padding-bottom: 5rpx;
-	}
-
-	.headers_li {
-		float: left;
-
-		width: 25%;
-		text-align: center;
-		margin-bottom: 25rpx;
-		margin-top: 25rpx;
-	}
-
-	.headers_li_img>image {
-		width: 100rpx;
-		height: 100rpx;
-		margin-bottom: 10rpx;
-	}
-
-	.headers_li_text {
-		font-size: 14px;
-	}
-
-	.headers_title_h1 {
-		font-weight: 800;
-	}
-
-	.headers_list {
-		width: 100%;
-		background-color: #fff;
-	}
-
-	.ly-tree-node__label {
-		color: #000000;
+		
+		padding: 25rpx;
+		.title{
+			display: flex;
+			align-items: center;
+			height: 90rpx;
+			.icon{
+				margin-right: 20rpx;
+				image{
+					width: 50rpx;
+					height: 50rpx;
+					display: block;
+				}
+			}
+			.text{
+				font-weight: 700;
+				font-size: 34rpx;
+			}
+		}
+		
+		.list{
+			margin-top: 30rpx;
+			width: 700rpx;
+			overflow: hidden;
+			.item{
+				
+				float: left;
+				margin-bottom: 30rpx;
+				
+				width: 350rpx;
+				
+				display: flex;
+				align-items: center;
+				height: 140rpx;
+				
+				.icon{
+					margin-bottom: 10rpx;
+					image{
+						width: 90rpx;
+						height: 90rpx;
+						display: block;
+					}
+					
+					
+				}
+				.name{
+					position: relative;
+					
+					margin-left: 20rpx;
+					.num{
+						z-index: 10;
+						position: absolute;
+						top: -10rpx;
+						right: -50rpx;
+						
+						width: 40rpx;
+						text-align: center;
+						line-height: 40rpx;
+						background-color: #F56C6C;
+						border-radius: 50%;
+						color: #FFF;
+						font-size: 26rpx;
+					}
+					.name_title{
+						font-size: 28rpx;
+						margin-bottom: 10rpx;
+					}
+					.sub_title{
+						font-size: 24rpx;
+						color: #999;
+					}
+				}
+			}
+			
+			.item:nth-child(2n){
+				box-sizing: border-box;
+				border-left: 1rpx solid #F2FAF7;
+				
+				padding-left: 40rpx;
+				
+			}
+			
+		}
 	}
-</style>
+</style>

pages/workbench/gridding/timeline_details/timeline_details.vue

@@ -46,11 +46,12 @@
 				})
 				
 				this.$api.trouble_grid_timeline({
-					page: this.page
+					page: this.page,
 				}).then((res)=>{
 					uni.hideLoading()
 					console.log(res.data.data)
-					this.list = this.list.concat(res.data.data)
+					
+					this.list = res.data.data
 				})
 			},
 			

uniCloud-aliyun/cloudfunctions/get_version_record/index.js

@@ -0,0 +1,23 @@
+'use strict';
+// 获取数据库的引用
+const db = uniCloud.database()
+exports.main = async (event, context) => {
+	//event为客户端上传的参数
+	console.log('event : ', event)
+
+	const {
+		appName
+	} = event
+
+	// 获取版本记录
+	let version_list = await db.collection('opendb-app-versions').where({
+		name: appName
+	}).get()
+
+	//返回数据给客户端
+	return {
+		code: 200,
+		msg: '数据请求成功',
+		data: version_list.data
+	}
+};

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

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

uni_modules/uni-table/components/uni-tr/uni-tr.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- #ifdef H5 -->
-	<tr class="uni-table-tr">
+	<tr class="uni-table-tr" @click="getRow">
 		<th v-if="selection === 'selection' && ishead" class="checkbox" :class="{ 'tr-table--border': border }">
 			<table-checkbox :checked="checked" :indeterminate="indeterminate" :disabled="disabled" @checkboxSelected="checkboxSelected"></table-checkbox>
 		</th>
@@ -9,7 +9,7 @@
 	</tr>
 	<!-- #endif -->
 	<!-- #ifndef H5 -->
-	<view class="uni-table-tr">
+	<view class="uni-table-tr" @click="getRow">
 		<view v-if="selection === 'selection' " class="checkbox" :class="{ 'tr-table--border': border }">
 			<table-checkbox :checked="checked" :indeterminate="indeterminate" :disabled="disabled" @checkboxSelected="checkboxSelected"></table-checkbox>
 		</view>
@@ -89,6 +89,10 @@ export default {
 	},
 	// #endif
 	methods: {
+		getRow(){
+			this.$emit("row-click")
+		},
+		
 		minWidthUpdate(width) {
 			this.widthThArr.push(width)
 		},