枣泉：1.0.7；适配金家渠、羊场湾、清水营、物业公司

App.vue

@@ -5,10 +5,14 @@
 			// 启动初始化
 
 			// 煤矿鉴别-名称
-			uni.setStorageSync('mine_code', 'ningdongyunying');
+			// uni.setStorageSync('mine_code', 'ningdongyunying');
 			// uni.setStorageSync('mine_code', 'shicaocun');
 			// uni.setStorageSync('mine_code', 'meihuajing');
-			// uni.setStorageSync('mine_code', 'zaoquan');
+			uni.setStorageSync('mine_code', 'zaoquan');
+			// uni.setStorageSync('mine_code', 'qingshuiying');
+			// uni.setStorageSync('mine_code', 'wuyegongsi');
+			// uni.setStorageSync('mine_code', 'jinjiaqu');
+			// uni.setStorageSync('mine_code', 'yangchangwan');
 
 		},
 		onShow: function() {

common/set_base_url.js

@@ -20,6 +20,15 @@ export const set_base_url = (mine_code) => {
 		case 'xixuan':
 			return "http://xixuan.nxjiewei.com:8011/api"
 			break;
+		case 'qingshuiying':
+			return "http://qingshuiying.nxjiewei.com:8011/api"
+			break;
+		case 'wuyegongsi':
+			return "http://wuyegongsi.nxjiewei.com:8011/api"
+			break;
+		case 'jinjiaqu':
+			return "http://jinjiaqu.nxjiewei.com:8011/api"
+			break;
 		default:
 			return ""
 	}

common/vmeitime-http/api.js

@@ -522,3 +522,12 @@ export const conference_staff_vote_take = (data) => {
 		data,
 	})
 }
+
+// 宁东 拼图
+export const jigsawPuzzle_specialList = (data) => {
+	return http.request({
+		method: "POST",
+		url: '/jigsawPuzzle/specialList',
+		data,
+	})
+}

common/vmeitime-http/interface.js

@@ -34,8 +34,12 @@ http.delete('user/1').then((res)=>{
 export default {
 	config: {
 		// baseUrl: "http://colliery.nxjiewei.com/api",
-		baseUrl: "http://ningdongyunying.nxjiewei.com:8011/api",
-		// baseUrl: "http://zaoquan.nxjiewei.com:8011/api",
+		// baseUrl: "http://ningdongyunying.nxjiewei.com:8011/api",
+		baseUrl: "http://zaoquan.nxjiewei.com:8011/api",
+		// baseUrl: "http://qingshuiying.nxjiewei.com:8011/api",
+		// baseUrl: "http://wuyegongsi.nxjiewei.com:8011/api",
+		// baseUrl: "http://jinjiaqu.nxjiewei.com:8011/api",
+		// baseUrl: "http://yangchangwan.nxjiewei.com:8011/api",
 		header: {
 			"Content-Type":"multipart/form-data",
 			'Content-Type':'application/json;charset=UTF-8',

components/e-browse/e-browse.vue

@@ -93,8 +93,8 @@
 					margin-right: 10rpx;
 
 					image {
-						width: 30rpx;
-						height: 30rpx;
+						width: 70rpx;
+						height: 70rpx;
 					}
 				}
 			}

components/t-i-icon/t-i-icon - 固定五个.vue

@@ -0,0 +1,87 @@
+<template>
+	<view class="content">
+		<view class="list">
+			<view class="item" v-for="(item,index) in iconList" :key="index" @click="go_link(item.link)">
+				<view class="icon">
+					<image :src="item.icon" mode=""></image>
+				</view>
+				<view class="name">{{item.title}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"t-i-icon",
+		props: [
+			"iconList",
+			"mine_code"
+		],
+		data() {
+			return {
+				
+			};
+		},
+		methods:{
+			go_link(link){
+				// console.log(link.split('=')[3].split('&')[0])
+				// let pageId = link.split('=')[3].split('&')[0]
+				console.log(link)
+				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,
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content{
+		margin-bottom: 30rpx;
+		background-color: #FFFFFF;
+		
+		box-sizing: border-box;
+		padding: 50rpx 25rpx;
+	}
+	
+	.list{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		.item{
+			width: 120rpx;
+			.icon{
+				width: 120rpx;
+				text-align: center;
+				image{
+					width: 104rpx;
+					height: 104rpx;
+				}
+			}
+			.name{
+				width: 120rpx;
+				text-align: center;
+				font-size: 30rpx;
+				
+				white-space:nowrap;
+				overflow:hidden;
+				text-overflow:ellipsis;
+			}
+		}
+	}
+</style>

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

@@ -1,34 +1,37 @@
 <template>
 	<view class="content">
-		<view class="list">
-			<view class="item" v-for="(item,index) in iconList" :key="index" @click="go_link(item.link)">
-				<view class="icon">
-					<image :src="item.icon" mode=""></image>
+		<scroll-view scroll-x="true">
+			<view class="list">
+				<view class="item" v-for="(item,index) in iconList" :key="index" @click="go_link(item.link)">
+					<view class="icon">
+						<image :src="item.icon" mode=""></image>
+					</view>
+					<view class="name">{{item.title}}</view>
 				</view>
-				<view class="name">{{item.title}}</view>
 			</view>
-		</view>
+		</scroll-view>
 	</view>
 </template>
 
 <script>
 	export default {
-		name:"t-i-icon",
+		name: "t-i-icon",
 		props: [
 			"iconList",
 			"mine_code"
 		],
 		data() {
 			return {
-				
+
 			};
 		},
-		methods:{
-			go_link(link){
+		methods: {
+			go_link(link) {
 				// console.log(link.split('=')[3].split('&')[0])
 				// let pageId = link.split('=')[3].split('&')[0]
 				console.log(link)
 				let pageId = ""
+
 				function GetQueryString(name) {
 					var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
 					var r = link.match(reg);
@@ -41,9 +44,9 @@
 				} else {
 					pageId = link.split('=')[1]
 				}
-				
+
 				uni.navigateTo({
-					url:"../../index/record/record?pageId=" + pageId + "&mine_code=" + this.mine_code,
+					url: "../../index/record/record?pageId=" + pageId + "&mine_code=" + this.mine_code,
 				})
 			}
 		}
@@ -51,37 +54,43 @@
 </script>
 
 <style lang="scss">
-	.content{
+	.content {
 		margin-bottom: 30rpx;
 		background-color: #FFFFFF;
-		
+
 		box-sizing: border-box;
 		padding: 50rpx 25rpx;
 	}
-	
-	.list{
+
+	.list {
 		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		.item{
+
+		.item {
+			margin-right: 25rpx;
 			width: 120rpx;
-			.icon{
+			.icon {
 				width: 120rpx;
 				text-align: center;
-				image{
+
+				image {
 					width: 104rpx;
 					height: 104rpx;
 				}
 			}
-			.name{
+
+			.name {
 				width: 120rpx;
 				text-align: center;
 				font-size: 30rpx;
-				
-				white-space:nowrap;
-				overflow:hidden;
-				text-overflow:ellipsis;
+
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
 			}
 		}
+
+		.item:last-child {
+			margin-right: 0;
+		}
 	}
 </style>

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

@@ -0,0 +1,233 @@
+<template>
+	<view class="content">
+		<view class="section_1">
+			<view class="tab">
+				<view class="title" @click="change_active(1)" :class="active==1?'active':''">机关部室</view>
+				<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)">
+					{{item.title}}
+				</view>
+			</view>
+		</view>
+		
+		<!-- 图片链接 -->
+		<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)">
+					<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_4.children" :key="index" @click="go_record(item.link)">
+					<image :src="item.thumb" mode=""></image>
+				</view>
+			</view>
+		</view>
+		
+
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "t-i-jinjiaqu",
+		props:[
+			"mine_code"
+		],
+		data() {
+			return {
+				active: 1,
+				list: [],
+				list_1: [],
+				list_2: [],
+				
+				// 图片链接
+				list_3:[],
+				// 快速通道
+				list_4:[]
+			};
+		},
+		created() {
+			this.get_home_link()
+		},
+		methods: {
+			change_active(item) {
+				this.active = item
+
+				if (item == 1) {
+					this.list = this.list_1
+				} else if (item == 2) {
+					this.list = this.list_2
+				}
+			},
+
+			get_home_link() {
+				this.$api.home_link({
+
+				}).then((res) => {
+					// console.log(res.data.data)
+
+					// 机关部室
+					this.list = res.data.data[2]
+					this.list_1 = res.data.data[2]
+					// 基层区队
+					this.list_2 = res.data.data[3]
+					
+					// 图片链接
+					this.list_3 = res.data.data[1]
+					// 快速通道
+					this.list_4 = res.data.data[0]
+				})
+			},
+			go_record(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,
+					})
+				}else if(link.indexOf("webdevelop.nxjiewei.com/assets/html/pingce") != -1){
+					uni.navigateTo({
+						url:"../../index/h5/h5?url=jinjiaqu_pingce"
+					})
+				}else if(link.indexOf("/wordorder/wordOrderGrid_win") != -1){
+					console.log(link)
+					uni.navigateTo({
+						url:"../../index/business_approval/business_approval"
+					})
+				}else{
+					console.log(link)
+				}
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		margin-top: 20rpx;
+		background-color: #FFFFFF;
+	}
+
+	.section_1 {
+		box-sizing: border-box;
+		padding: 25rpx;
+
+		.tab {
+			display: flex;
+			justify-content: space-around;
+
+			.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;
+		.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;
+				}
+			}
+		}
+	}
+</style>

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

@@ -6,16 +6,29 @@
 			</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>
 					<image v-if="mine_code == 'meihuajing'" src="@/static/switch-kuang/meihuajing.png" mode=""></image>
 					<image v-if="mine_code == 'jinfeng'" src="@/static/switch-kuang/jinfeng.png" mode=""></image>
 					<image v-if="mine_code == 'xixuan'" src="@/static/switch-kuang/xixuan.png" mode=""></image>
+					<image v-if="mine_code == 'qingshuiying'" src="@/static/switch-kuang/qingshuiying.png" mode=""></image>
+					<image v-if="mine_code == 'wuyegongsi'" src="@/static/switch-kuang/wuyegongsi.png" mode=""></image>
+					<image v-if="mine_code == 'jinjiaqu'" src="@/static/switch-kuang/jinjiaqu.png" mode=""></image>
 					<uni-icons type="arrowdown" color="#fff"></uni-icons>
+				</view> -->
+				<view class="left">
+					<image v-if="mine_code == 'zaoquan'" src="./icon/zaoquan.png" mode=""></image>
+					<image v-if="mine_code == 'yangchangwan'" src="@/static/switch-kuang/yangchangwan.png" mode=""></image>
+					<image v-if="mine_code == 'meihuajing'" src="@/static/switch-kuang/meihuajing.png" mode=""></image>
+					<image v-if="mine_code == 'jinfeng'" src="@/static/switch-kuang/jinfeng.png" mode=""></image>
+					<image v-if="mine_code == 'xixuan'" src="@/static/switch-kuang/xixuan.png" mode=""></image>
+					<image v-if="mine_code == 'qingshuiying'" src="@/static/switch-kuang/qingshuiying.png" mode=""></image>
+					<image v-if="mine_code == 'wuyegongsi'" src="@/static/switch-kuang/wuyegongsi.png" mode=""></image>
+					<image v-if="mine_code == 'jinjiaqu'" src="@/static/switch-kuang/jinjiaqu.png" mode=""></image>
 				</view>
-				<view class="search">
+				<view class="search" v-if="mine_code != 'qingshuiying' && mine_code != 'wuyegongsi'">
 					<view class="box">
 						<view class="left" @click="go_search()">
 							<view class="icon">
@@ -45,6 +58,7 @@
 					</swiper>
 
 				</view>
+				
 			</view>
 		</view>
 

components/t-i-yangchangwan/t-i-yangchangwan.vue

@@ -0,0 +1,111 @@
+<template>
+	<view class="content">
+		<view class="section" v-for="(item,index) in list" :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_record(item_2.link)">
+					{{item_2.title}}
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "t-i-yangchangwan",
+		props:[
+			"mine_code"
+		],
+		data() {
+			return {
+				list: [],
+			};
+		},
+		created() {
+			this.get_home_link()
+		},
+		methods: {
+			get_home_link() {
+				this.$api.home_link({
+
+				}).then((res) => {
+					console.log(res.data.data)
+
+					this.list = res.data.data
+				})
+			},
+			go_record(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,
+					})
+				}else{
+					console.log(link)
+				}
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		margin-top: 20rpx;
+		background-color: #FFFFFF;
+		
+		padding-top: 20rpx;
+	}
+	
+	.section{
+		box-sizing: border-box;
+		padding: 0 25rpx;
+		
+		margin-top: 10rpx;
+	}
+	
+	.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;
+		}
+	}
+</style>

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

@@ -62,7 +62,7 @@
 				<view class="name">清除缓存</view>
 			</view>
 			
-			<view class="item" @click="go_cloud_disk()">
+			<view class="item" @click="go_cloud_disk()" v-if="mine_code == 'ningdongyunying'">
 				<view class="icon">
 					<image src="./icon/yunpan.png" mode=""></image>
 				</view>
@@ -108,7 +108,9 @@
 			},
 			// 清除缓存
 			clear_cache(){
-				uni.showLoading()
+				uni.showLoading({
+					mask:true
+				})
 				setTimeout(()=>{
 					uni.hideLoading()
 					uni.showToast({

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

@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<view class="user" @click="go_information()">
-			<view class="left">
+			<view class="left" v-if="user.name">
 				<view class="img">
 					<image v-if="user.avatar" :src="user.avatar" mode="aspectFill"></image>
 					<view class="avatar" v-if="!user.avatar" :style="{backgroundColor:bgColor[1]}">{{user.name.split('').pop()}}</view>
@@ -11,7 +11,7 @@
 					<view class="section">{{user.section}}</view>
 				</view>
 			</view>
-			<view class="right">
+			<view class="right" v-if="user.name">
 				<uni-icons type="arrowright" size="24"></uni-icons>
 			</view>
 		</view>

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

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="list">
-			<view class="item" v-for="item in 4">
+			<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"
@@ -9,17 +9,17 @@
 				</view>
 				<view class="right">
 					<view class="title">
-						<view class="name">梅花井煤矿</view>
+						<view class="name">{{item.name}}</view>
 						<view class="tip">拼图</view>
 					</view>
-					<view class="text">标题标题标题标题标题标题标题标题标题标题标题</view>
+					<view class="text"></view>
 					<view class="content">
-						<view class="time">2021.12.03</view>
+						<view class="time">{{item.start_time}}</view>
 						<view class="box">
 							<view class="line">
-								<view class="line_box"></view>
+								<view class="line_box" :style="{width: + item.percent_complete + '%'}"></view>
 							</view>
-							<view class="num">36%</view>
+							<view class="num">{{item.percent_complete}}%</view>
 						</view>
 					</view>
 				</view>
@@ -27,14 +27,36 @@
 		</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"
+				})
+			}
 		}
 	}
 </script>

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

@@ -5,7 +5,14 @@
 				<view class="icon">
 					<image src="./icon/title_icon.png" mode=""></image>
 				</view>
-				<view class="text">国家能源集团宁东运营部</view>
+				
+				<view class="text" v-if="mine_code == 'zaoquan'">国家能源集团枣泉煤矿</view>
+				<view class="text" v-if="mine_code == 'ningdongyunying'">国家能源集团宁东运营部</view>
+				<view class="text" v-if="mine_code == 'qingshuiying'">国家能源集团清水营煤矿</view>
+				<view class="text" v-if="mine_code == 'wuyegongsi'">物业公司</view>
+				<view class="text" v-if="mine_code == 'jinjiaqu'">国家能源集团金家渠煤矿</view>
+				<view class="text" v-if="mine_code == 'yangchangwan'">国家能源集团羊场湾煤矿</view>
+				
 			</view>
 			<view class="box">
 				<view class="item" @click="go_communication_origanization()">
@@ -27,31 +34,18 @@
 
 <script>
 	export default {
-		name:"t-o-ningdongyunying",
+		name:"t-o-origanization",
 		data() {
 			return {
-				list:[]
+				// 当前煤矿编码
+				mine_code: "",
 			};
 		},
 		created() {
-			this.get_worksheet_classify_list()
+			// 初始化当前煤矿编码
+			this.mine_code = uni.getStorageSync('mine_code')
 		},
 		methods:{
-			// 获取分类
-			get_worksheet_classify_list(){
-				this.$api.worksheet_classify_list({
-					
-				}).then((res)=>{
-					console.log(res.data.data)
-					this.list = res.data.data
-				})
-			},
-			// 工单列表
-			go_business(id,title){
-				uni.navigateTo({
-					url:"../../workbench/business_classfication/business_classfication?id="+id+"&title="+title
-				})
-			},
 			go_communication_origanization(){
 				uni.navigateTo({
 					url:"../../origanization/communication/origanization/origanization"

components/t-o-zaoquan/t-o-zaoquan.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
-		<view class="list">
-			<view class="item" v-for="(item,index) in list" :key="index" @click="go_business(item.id,item.title)">
+		<!-- <view class="list"> -->
+			<!-- <view class="item" v-for="(item,index) in list" :key="index" @click="go_business(item.id,item.title)">
 				<view class="icon">
 					<image v-if="item.title == '办公品领用'" src="./icon/bangong.png" mode=""></image>
 					<image v-if="item.title == '用印申请'" src="./icon/yongyin.png" mode=""></image>
@@ -9,7 +9,7 @@
 					<image v-if="item.title == '其他申请'" src="./icon/qita.png" mode=""></image>
 				</view>
 				<view class="text">{{item.title}}</view>
-			</view>
+			</view> -->
 			<!-- <view class="item" @click="go_business()">
 				<view class="icon">
 					<image src="./icon/yongyin.png" mode=""></image>
@@ -28,7 +28,7 @@
 				</view>
 				<view class="text">其他申请</view>
 			</view> -->
-		</view>
+		<!-- </view> -->
 		
 		<view class="content">
 			<view class="title">

components/t-p-yangchangwan/t-p-yangchangwan.vue

@@ -0,0 +1,161 @@
+<template>
+	<view class="content">
+		<view class="item_box" style="background-color: #FBB47B;" @click="go_video_monitor()">
+			<view class="img">
+				<image src="../t-p-icon/icon_6.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">视频监控</view>
+				<view class="tip">工业视频</view>
+			</view>
+		</view>
+		<view class="item_box" style="background-color: #638BD5;" @click="go_production_report('640181B0011010030750','1003-1')">
+			<view class="img">
+				<image src="../t-p-icon/icon_2.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">生产报表</view>
+				<view class="tip">一分区</view>
+			</view>
+		</view>
+		<view class="item_box" style="background-color: #5684AC;" @click="go_production_report('640181B0011010032422','1003-2')">
+			<view class="img">
+				<image src="../t-p-icon/icon_2.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">生产报表</view>
+				<view class="tip">二分区</view>
+			</view>
+		</view>
+		<view class="item_box" style="background-color: #A3A2E4;" @click="go_personnel_orientation('640181B0011010030750')">
+			<view class="img">
+				<image src="../t-p-icon/icon_3.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">人员定位</view>
+				<view class="tip">一分区</view>
+			</view>
+		</view>
+		<view class="item_box" style="background-color: #EDD2F3;" @click="go_personnel_orientation('640181B0011010032422')">
+			<view class="img">
+				<image src="../t-p-icon/icon_3.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">人员定位</view>
+				<view class="tip">二分区</view>
+			</view>
+		</view>
+		<view class="item_box" style="background-color: #8BC8DA;" @click="go_safety_monitoring('640181B0011010030750')">
+			<view class="img">
+				<image src="../t-p-icon/icon_4.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">安全监测</view>
+				<view class="tip">一分区</view>
+			</view>
+		</view>
+		<view class="item_box" style="background-color: #95D1CC;" @click="go_safety_monitoring('640181B0011010032422')">
+			<view class="img">
+				<image src="../t-p-icon/icon_4.png" mode=""></image>
+			</view>
+			<view class="text">
+				<view class="name">安全监测</view>
+				<view class="tip">二分区</view>
+			</view>
+		</view>
+		
+	
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "t-p-yangchangwanyifenqu",
+		data() {
+			return {
+				mine_code:"yangchangwan",
+				
+			};
+		},
+		methods: {
+			// 生产报表
+			go_production_report(mine,org_num) {
+				uni.navigateTo({
+					url: "../../production/production_report/production_report?mine=" + mine + "&org_num=" + org_num,
+				})
+			},
+			// 安全监测
+			go_safety_monitoring(mine) {
+				uni.navigateTo({
+					url: "../../production/safety_monitoring/safety_monitoring?mine=" + mine
+				})
+			},
+			//人员定位
+			go_personnel_orientation(mine) {
+				uni.navigateTo({
+					url:"../../production/personnel_orientation/personnel_orientation?mine=" + mine
+				})
+			},
+			// 视频监控
+			go_video_monitor(){
+				uni.navigateTo({
+					url:"../../production/video_monitor/video_monitor?mine_code=" + this.mine_code
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		box-sizing: border-box;
+		padding: 20rpx 25rpx 0;
+		margin-bottom: 100rpx;
+
+		overflow: hidden;
+		.item_box {
+			float: left;
+
+			width: 220rpx;
+			height: 280rpx;
+
+			margin-right: 20rpx;
+			margin-bottom: 20rpx;
+			border-radius: 16rpx;
+
+			.img {
+				box-sizing: border-box;
+				padding-top: 40rpx;
+				text-align: center;
+
+				image {
+					width: 140rpx;
+					height: 140rpx;
+				}
+			}
+
+			.text {
+				text-align: center;
+				color: #FFFFFF;
+				line-height: 40rpx;
+
+				.name {
+					font-size: 28rpx;
+				}
+
+				.tip {
+					font-size: 24rpx;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+				}
+			}
+		}
+
+		.item_box:nth-child(3n) {
+			margin-right: 0;
+		}
+
+	}
+</style>

components/t-w-jinjiaqu/t-w-jinjiaqu.vue

@@ -0,0 +1,272 @@
+<template>
+	<view class="headers">
+		<view class="headers_img">
+			<image :src="header" mode="aspectFill"></image>
+		</view>
+		<view class="headers_nav">
+			<view class="headers_ul">
+				<view class="headers_li" v-for="(item,index) in nav" :key="index" @click="getnav(item.link)">
+					<view class="headers_li_img">
+						<image :src="item.icon" mode=""></image>
+					</view>
+					<view class="headers_li_text">
+						{{item.title}}
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view class="headers_list" v-for="(item,index) in module" :key="index">
+			<view class="headers_title">
+				<text class="headers_title_h1">
+					{{item.title}}
+				</text>
+			</view>
+			<view class="headers_ul">
+				<view class="headers_li" v-for="(items,index) in item.children" :key="index"
+					@click="getmodule(items.link)">
+					<view class="headers_li_img">
+						<image :src="items.icon" mode=""></image>
+					</view>
+					<view class="headers_li_text">
+						{{items.title}}
+					</view>
+
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: [
+			"mine_code"
+		],
+		data() {
+			return {
+				module: [],
+				nav: [],
+				header: "",
+			};
+		},
+		created() {
+			this.getworkbench()
+		},
+		methods: {
+			getworkbench() {
+				this.$api.workbench_index({
+
+				}).then((res) => {
+					// console.log(res)
+					this.header = res.data.data.header
+					this.nav = res.data.data.nav
+					this.module = res.data.data.module
+
+				})
+			},
+			getnav(link) {
+				console.log(link)
+
+				// 二维码
+				if (link.indexOf("pageId") != -1 && link.indexOf("app:") == -1) {
+					let pageId = ""
+
+					function GetQueryString(name) {
+						var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+						var r = link.match(reg);
+						if (r != null) return unescape(r[2]);
+						return null;
+					}
+					console.log(GetQueryString("pageId"))
+					if (GetQueryString("pageId")) {
+						pageId = GetQueryString("pageId")
+					} else {
+						pageId = link.split('=')[1]
+					}
+
+					// uni.navigateTo({
+					// 	url: "../../index/record/record?pageId=" + pageId + "&mine_code=" + this.mine_code,
+					// })
+				}
+				// h5
+				if (link.indexOf("pageId") == -1 && link.indexOf("app:") == -1) {
+					// uni.navigateTo({
+					// 	url: "../../workbench/h5/h5?url=" + link
+					// })
+				}
+				// 原生
+				if (link.indexOf("pageId") == -1 && link.indexOf("app:") != -1) {
+					console.log("原生")
+					
+					if(link.indexOf("/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) {
+						uni.navigateTo({
+							url:"../../workbench/meeting_arrangements/meeting_arrangements"
+						})
+					}else{
+						uni.showToast({
+							icon:"none",
+							title:"暂未开通"
+						})
+					}
+
+				}
+
+			},
+			getmodule(link) {
+				console.log(link)
+				console.log(this.mine_code)
+
+				// 二维码
+				if (link.indexOf("pageId") != -1 && link.indexOf("app:") == -1) {
+					let pageId = ""
+
+					function GetQueryString(name) {
+						var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+						var r = link.match(reg);
+						if (r != null) return unescape(r[2]);
+						return null;
+					}
+					console.log(GetQueryString("pageId"))
+					if (GetQueryString("pageId")) {
+						pageId = GetQueryString("pageId")
+					} else {
+						pageId = link.split('=')[1]
+					}
+
+					uni.navigateTo({
+						url: "../../index/record/record?pageId=" + pageId + "&mine_code=" + this.mine_code,
+					})
+				}
+				// h5
+				if (link.indexOf("pageId") == -1 && link.indexOf("app:") == -1) {
+					uni.navigateTo({
+						url: "../../workbench/h5/h5?url=" + link
+					})
+
+				}
+				// 原生
+				if (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("/productionData/logging") != -1){
+						console.log("下井记录")
+						// uni.navigateTo({
+						// 	url:"../../production/personnel_orientation/downhole_statistics/downhole_statistics?people_num="+people_num+"&depart_name="+depart_name+"&name="+name+"&mine="+this.mine
+						// })
+						
+						// 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{
+						uni.showToast({
+							icon:"none",
+							title:"暂未开通"
+						})
+					}
+
+				}
+
+			}
+		},
+
+	}
+</script>
+
+<style>
+	.headers {
+		width: 100%;
+		background-color: #F5F5F5;
+	}
+
+	.headers_img>image {
+		width: 100%;
+		height: 360rpx;
+	}
+
+	.headers_nav {
+		width: 100%;
+		background-color: #FFFFFF;
+		margin-bottom: 25rpx;
+	}
+
+	.headers_ul {
+		width: 100%;
+		/* display: flex;
+		flex-wrap: wrap;
+		justify-content: space-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>

components/t-w-yangchangwan/t-w-yangchangwan.vue

@@ -0,0 +1,293 @@
+<template>
+	<view class="headers">
+		<view class="headers_img">
+			<image :src="header" mode="aspectFill"></image>
+		</view>
+		<view class="headers_nav">
+			<view class="headers_ul">
+				<view class="headers_li" v-for="(item,index) in nav" :key="index" @click="getnav(item.link)">
+					<view class="headers_li_img">
+						<image :src="item.icon" mode=""></image>
+					</view>
+					<view class="headers_li_text">
+						{{item.title}}
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view class="headers_list" v-for="(item,index) in module" :key="index">
+			<view class="headers_title">
+				<text class="headers_title_h1">
+					{{item.title}}
+				</text>
+			</view>
+			<view class="headers_ul">
+				<view class="headers_li" v-for="(items,index) in item.children" :key="index"
+					@click="getmodule(items.link)">
+					<view class="headers_li_img">
+						<image :src="items.icon" mode=""></image>
+					</view>
+					<view class="headers_li_text">
+						{{items.title}}
+					</view>
+
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: [
+			"mine_code"
+		],
+		data() {
+			return {
+				module: [],
+				nav: [],
+				header: "",
+			};
+		},
+		created() {
+			this.getworkbench()
+		},
+		methods: {
+			getworkbench() {
+				this.$api.workbench_index({
+
+				}).then((res) => {
+					// console.log(res)
+					this.header = res.data.data.header
+					this.nav = res.data.data.nav
+					this.module = res.data.data.module
+
+				})
+			},
+			getnav(link) {
+				console.log(link)
+
+				// 二维码
+				if (link.indexOf("pageId") != -1 && link.indexOf("app:") == -1) {
+					let pageId = ""
+
+					function GetQueryString(name) {
+						var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+						var r = link.match(reg);
+						if (r != null) return unescape(r[2]);
+						return null;
+					}
+					console.log(GetQueryString("pageId"))
+					if (GetQueryString("pageId")) {
+						pageId = GetQueryString("pageId")
+					} else {
+						pageId = link.split('=')[1]
+					}
+
+					// uni.navigateTo({
+					// 	url: "../../index/record/record?pageId=" + pageId + "&mine_code=" + this.mine_code,
+					// })
+				}
+				// h5
+				if (link.indexOf("pageId") == -1 && link.indexOf("app:") == -1) {
+					// uni.navigateTo({
+					// 	url: "../../workbench/h5/h5?url=" + link
+					// })
+				}
+				// 原生
+				if (link.indexOf("pageId") == -1 && link.indexOf("app:") != -1) {
+					console.log("原生")
+					
+					if(link.indexOf("/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) {
+						uni.navigateTo({
+							url:"../../workbench/meeting_arrangements/meeting_arrangements"
+						})
+					}else{
+						uni.showToast({
+							icon:"none",
+							title:"暂未开通"
+						})
+					}
+
+				}
+
+			},
+			getmodule(link) {
+				console.log(link)
+				console.log(this.mine_code)
+
+				// 二维码
+				if (link.indexOf("pageId") != -1 && link.indexOf("app:") == -1) {
+					let pageId = ""
+
+					function GetQueryString(name) {
+						var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+						var r = link.match(reg);
+						if (r != null) return unescape(r[2]);
+						return null;
+					}
+					console.log(GetQueryString("pageId"))
+					if (GetQueryString("pageId")) {
+						pageId = GetQueryString("pageId")
+					} else {
+						pageId = link.split('=')[1]
+					}
+
+					uni.navigateTo({
+						url: "../../index/record/record?pageId=" + pageId + "&mine_code=" + this.mine_code,
+					})
+				}
+				// h5
+				if (link.indexOf("pageId") == -1 && link.indexOf("app:") == -1) {
+					uni.navigateTo({
+						url: "../../workbench/h5/h5?url=" + link
+					})
+
+				}
+				// 原生
+				if (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("/productionData/logging") != -1){
+						console.log("下井记录")
+						// uni.navigateTo({
+						// 	url:"../../production/personnel_orientation/downhole_statistics/downhole_statistics?people_num="+people_num+"&depart_name="+depart_name+"&name="+name+"&mine="+this.mine
+						// })
+						
+						// 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("/productionData/persnoalLocation") != -1){
+						// 人员定位
+						uni.navigateTo({
+							url:"../../production/personnel_orientation/personnel_orientation?mine=640181B0011010030750"
+						})
+						
+					}else if(link.indexOf("/sendCars/addSendCarOrder_frm") != -1){
+						// 申请用车
+						uni.navigateTo({
+							url:"../../workbench/vehicle_approval/apply_vehicle/apply_vehicle"
+						})
+						
+					}else if(link.indexOf("/sendCars/userCarApproval_frm_his") != -1){
+						// 用车历史
+						uni.navigateTo({
+							url:"../../workbench/vehicle_approval/vehicle_history/vehicle_history"
+						})
+						
+					}else if(link.indexOf("/sendCars/userCarApproval_frm") != -1){
+						// 用车 单据审批
+						
+					}else{
+						uni.showToast({
+							icon:"none",
+							title:"暂未开通"
+						})
+					}
+
+				}
+
+			}
+		},
+
+	}
+</script>
+
+<style>
+	.headers {
+		width: 100%;
+		background-color: #F5F5F5;
+	}
+
+	.headers_img>image {
+		width: 100%;
+		height: 360rpx;
+	}
+
+	.headers_nav {
+		width: 100%;
+		background-color: #FFFFFF;
+		margin-bottom: 25rpx;
+	}
+
+	.headers_ul {
+		width: 100%;
+		/* display: flex;
+		flex-wrap: wrap;
+		justify-content: space-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>

manifest.json

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

pages.json

@@ -477,6 +477,57 @@
             }
             
         }
+        ,{
+            "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": "用车历史"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",

pages/index/business_approval/apply/apply.vue

@@ -0,0 +1,40 @@
+<template>
+	<view>
+		<web-view :src="href"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				href:"",
+				mine_code:""
+			};
+		},
+		onLoad(option) {
+			// 初始化当前煤矿编码
+			this.mine_code = uni.getStorageSync('mine_code')
+			this.Authorization = uni.getStorageSync('Authorization')
+
+			// 设置标题
+			uni.setNavigationBarTitle({
+				title: option.title
+			})
+			
+			this.href = "http://webdevelop.nxjiewei.com/assets/html/zhks-quankuang/apply?id=" + option.id + "&token=" + this.Authorization + "&mine_code=" + this.mine_code
+
+		},
+		
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		width: 749rpx;
+		box-sizing: border-box;
+		padding: 30px 24rpx;
+	}
+
+	
+</style>

pages/index/business_approval/business_approval.vue

@@ -0,0 +1,236 @@
+<template>
+	<view>
+		<view class="content">
+			<view class="section" v-for="(item,index) in list" :key="index">
+				<view class="box">
+					<view class="item">
+						<view class="left">
+							<view class="icon" v-if="active == index" @click.stop="change_active(index,item.id)">
+								<image src="./icon/close.png" mode=""></image>
+							</view>
+							<view class="icon" v-if="active != index" @click.stop="change_active(index,item.id)">
+								<image src="./icon/open.png" mode=""></image>
+							</view>
+							<view class="text">{{item.title}}</view>
+						</view>
+					</view>
+					<view class="list" v-if="active == index">
+						<view class="item" v-for="(item_2,index_2) in list_2" :key="index_2"
+							@click="go_detail_apply(item_2.title,item_2.id)">
+							<view class="left">
+								<view class="text">{{item_2.title}}</view>
+							</view>
+							<view class="right">
+								<uni-icons type="compose"></uni-icons>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [],
+				// 当前展开
+				active: 99999999,
+				
+				// 可申请列表
+				list_2:[]
+
+			};
+		},
+		onLoad() {
+			this.get_list()
+		},
+		methods: {
+			get_list() {
+				this.$api.worksheet_classify_list({
+					
+				}).then((res)=>{
+					console.log(res.data.data)
+					
+					this.list = res.data.data
+				})
+			},
+			change_active(index, id) {
+				this.list_2 = []
+				if (this.active == index) {
+					this.active = 99999999
+				} else {
+					this.active = index
+					
+					uni.showLoading({
+						mask:true
+					})
+					this.$api.worksheet_design_list({
+						id:id
+					}).then((res)=>{
+						uni.hideLoading()
+						console.log(res.data.data)
+						
+						this.list_2 = res.data.data
+					})
+				}
+				
+			},
+			
+			go_detail_apply(title,id) {
+				uni.navigateTo({
+					url: "./apply/apply?title=" + title + "&id=" + id
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F3F8F7;
+	}
+
+	.search {
+		margin-bottom: 20rpx;
+		background-color: #FFFFFF;
+		box-sizing: border-box;
+		padding: 25rpx 30rpx;
+
+		.box {
+			height: 80rpx;
+			background-color: #F4F4F4;
+			border-radius: 50rpx;
+
+			display: flex;
+			align-items: center;
+
+			box-sizing: border-box;
+			padding: 0 25rpx;
+
+			.icon {
+				margin-right: 10rpx;
+			}
+
+			.text {
+				font-size: 30rpx;
+				color: #BBBBBB;
+			}
+		}
+	}
+
+	.content {
+		background-color: #FFFFFF;
+
+		.title {
+			height: 110rpx;
+			display: flex;
+			align-items: center;
+
+			box-sizing: border-box;
+			padding: 0 25rpx;
+			border-bottom: 1rpx solid #F3F8F7;
+
+			.tab {
+				width: 350rpx;
+				line-height: 110rpx;
+				position: relative;
+
+				.text {
+					text-align: center;
+				}
+
+				.line {
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+
+					transform: translateX(-40rpx);
+
+					width: 80rpx;
+					height: 4rpx;
+					background-color: #00A0E8;
+				}
+
+				.active {
+					color: #00A0E8;
+					font-weight: 700;
+				}
+			}
+		}
+
+		.section {
+			box-sizing: border-box;
+			padding: 0 20rpx;
+
+			.box {
+
+				.item {
+					height: 110rpx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					margin-left: 20rpx;
+					border-bottom: 1rpx solid #F3F8F7;
+
+					.left {
+						display: flex;
+						align-items: center;
+
+						.icon {
+							line-height: 110rpx;
+							width: 90rpx;
+							text-align: center;
+
+							image {
+								width: 24rpx;
+								height: 24rpx;
+							}
+						}
+
+						.text {
+							font-size: 32rpx;
+						}
+					}
+
+				}
+
+				.list {
+					.item {
+						height: 110rpx;
+
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+
+						margin-left: 80rpx;
+						border-bottom: 1rpx solid #F3F8F7;
+
+						.left {
+							width: 450rpx;
+							.text {
+								margin-left: 18rpx;
+								font-size: 30rpx;
+
+							}
+						}
+
+						.right {
+							line-height: 110rpx;
+							width: 90rpx;
+							text-align: center;
+						}
+
+					}
+				}
+
+			}
+
+		}
+
+	}
+</style>

pages/index/h5/h5.vue

@@ -0,0 +1,24 @@
+<template>
+	<view>
+		<web-view :src="href"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				href: ""
+			};
+		},
+		onLoad(option) {
+			if (option.url == 'jinjiaqu_pingce') {
+				this.href = 'http://webdevelop.nxjiewei.com/assets/html/pingce/?mine_code=jinjiaqu&token=' + uni.getStorageSync('Authorization') + '#/'
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/index/search/search.vue

@@ -36,6 +36,7 @@
 </template>
 
 <script>
+	import {set_base_url} from '@/common/set_base_url.js'
 	export default {
 		data() {
 			return {
@@ -57,20 +58,9 @@
 			this.statusBarHeight = info.statusBarHeight
 
 			console.log(this.mine_code)
+			
 			// 根据矿编码切换首页接口不同的请求基础路径
-			switch (this.mine_code) {
-				case 'ningdongyunying':
-					this.base_url = "http://ningdongyunying.nxjiewei.com:8011/api"
-					break;
-				case 'meihuajing':
-					this.base_url = "http://meihuajing.nxjiewei.com:8011/api"
-					break;
-				case 'zaoquan':
-					this.base_url = "http://zaoquan.nxjiewei.com:8011/api"
-					break;
-				default:
-					this.base_url = ""
-			}
+			this.base_url = set_base_url(this.mine_code)
 		},
 		methods: {
 			click_left() {

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

@@ -8,15 +8,12 @@
 			<view class="item" v-for="(item,index) in list" :key="index" v-if="item.staff_state == 0">
 				<view class="top">
 					<view class="user">
-						<!-- <view class="img">
-							<image :src="item.staff_avatar" mode="aspectFill"></image>
-						</view> -->
 						<view class="info">
 							<view class="text">{{item.name}}</view>
-							<view class="text">编号:#{{item.id}} {{item.created_at}}</view>
+							<view class="text">编号: #{{item.id}} {{item.created_at}}</view>
 						</view>
 					</view>
-					<view class="state" v-if="item.staff_state == 0">待审核</view>
+					<view class="state">{{item.status}}</view>
 				</view>
 				<view class="inner">
 					<view class="class_name">{{item.classify}}</view>
@@ -32,15 +29,12 @@
 			<view class="item" v-for="(item,index) in list" :key="index"  v-if="item.staff_state == 1" :style="item.state == 3?'border-top: 2px solid red;':''">
 				<view class="top">
 					<view class="user">
-						<!-- <view class="img">
-							<image :src="item.staff_avatar" mode="aspectFill"></image>
-						</view> -->
 						<view class="info">
 							<view class="text">{{item.name}}</view>
-							<view class="text">编号:#{{item.id}} {{item.created_at}}</view>
+							<view class="text">编号: #{{item.id}} {{item.created_at}}</view>
 						</view>
 					</view>
-					<view class="state" v-if="item.state == 1 && item.staff_state == 1" style="color: #00D983;">已审核</view>
+					
 					<view class="state" v-if="item.state == 2" style="color: #00D983;">{{item.status}}</view>
 					<view class="state" v-if="item.state == 3" style="color: red;">{{item.status}}</view>
 				</view>
@@ -49,10 +43,7 @@
 					<view class="name">{{item.title}}</view>
 					<view class="tip">{{item.introduce}}</view>
 				</view>
-				<view class="bottom" v-if="active_item == 1">
-					<view class="btn" @click="go_shenhe(item.id,item.title)">审核</view>
-				</view>
-				<view class="bottom" v-if="active_item == 2">
+				<view class="bottom">
 					<view class="btn" style="background-color: #009FE8;" @click="go_chakan(item.id,item.title)">查看</view>
 				</view>
 			</view>
@@ -69,7 +60,7 @@
 				
 				
 				page:1,
-				page_size:10,
+				page_size:20,
 				state:0
 			};
 		},
@@ -77,10 +68,15 @@
 			// this.get_worksheet_check_listmei()
 		},
 		onShow() {
+			// this.active_item = 0
+			// this.state = 0
+			
+			console.log(this.state)
+			this.page = 1
+			this.list = []
 			this.get_worksheet_check_listmei()
 		},
 		onReachBottom(){
-			console.log("++")
 			this.page++
 			this.get_worksheet_check_listmei()
 		},
@@ -93,11 +89,7 @@
 				this.list = []
 				
 				// 刷新数据
-				if(item == 0){
-					this.get_worksheet_check_listmei()
-				}else if(item == 1){
-					this.get_worksheet_check_listmei()
-				}
+				this.get_worksheet_check_listmei()
 			},
 			go_shenhe(id,title){
 				uni.navigateTo({
@@ -110,7 +102,9 @@
 				})
 			},
 			get_worksheet_check_listmei(){
-				uni.showLoading()
+				uni.showLoading({
+					mask:true
+				})
 				
 				this.$api.worksheet_check_listmei({
 					page:this.page,

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

@@ -134,15 +134,7 @@
 				this.page = 1
 				this.list = []
 				// 刷新数据
-				if(item == 0){
-					this.get_worksheet_apply_listmei()
-				}else if(item == 1){
-					this.get_worksheet_apply_listmei()
-				}else if(item == 2){
-					this.get_worksheet_apply_listmei()
-				}else if(item == 3){
-					this.get_worksheet_apply_listmei()
-				}
+				this.get_worksheet_apply_listmei()
 			},
 			go_chakan(id,title){
 				console.log(id,title)
@@ -160,7 +152,11 @@
 					state:this.state,
 				}).then((res)=>{
 					// console.log(res.data.data)
-					this.list = this.list.concat(res.data.data)
+					if(this.page == 1 && res.data.data == 0){
+						this.list = []
+					}else{
+						this.list = this.list.concat(res.data.data)
+					}
 					
 					uni.hideLoading()
 				})

pages/my/download/download.vue

@@ -11,6 +11,18 @@
 				<image v-if="mine_code == 'ningdongyunying'"
 					src="http://webdevelop.nxjiewei.com/assets/html/zhks-quankuang/ningdongyunying/download/download.png"
 					mode=""></image>
+				<image v-if="mine_code == 'qingshuiying'"
+					src="http://webdevelop.nxjiewei.com/assets/html/zhks-quankuang/qingshuiying/download/download.png"
+					mode=""></image>
+				<image v-if="mine_code == 'wuyegongsi'"
+					src="http://webdevelop.nxjiewei.com/assets/html/zhks-quankuang/wuyegongsi/download/download.png"
+					mode=""></image>
+				<image v-if="mine_code == 'jinjiaqu'"
+					src="http://webdevelop.nxjiewei.com/assets/html/zhks-quankuang/jinjiaqu/download/download.png"
+					mode=""></image>
+				<image v-if="mine_code == 'yangchangwan'"
+					src="http://webdevelop.nxjiewei.com/assets/html/zhks-quankuang/yangchangwan/download/download.png"
+					mode=""></image>
 			</view>
 			<view class="card_tips">
 				扫一扫下载

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

@@ -7,6 +7,10 @@
 		<view class="title">
 			<text v-if="mine_code == 'ningdongyunying'">E信管理</text>
 			<text v-if="mine_code == 'zaoquan'">枣泉煤矿</text>
+			<text v-if="mine_code == 'qingshuiying'">清水营煤矿</text>
+			<text v-if="mine_code == 'wuyegongsi'">智慧物业</text>
+			<text v-if="mine_code == 'jinjiaqu'">金家渠煤矿</text>
+			<text v-if="mine_code == 'yangchangwan'">羊场湾煤矿</text>
 		</view>
 		<view class="change_box">
 			<view class="item">

pages/my/login/login.vue

@@ -7,6 +7,10 @@
 		<view class="title">
 			<text v-if="mine_code == 'ningdongyunying'">E信管理</text>
 			<text v-if="mine_code == 'zaoquan'">枣泉煤矿</text>
+			<text v-if="mine_code == 'qingshuiying'">清水营煤矿</text>
+			<text v-if="mine_code == 'wuyegongsi'">智慧物业</text>
+			<text v-if="mine_code == 'jinjiaqu'">金家渠煤矿</text>
+			<text v-if="mine_code == 'yangchangwan'">羊场湾煤矿</text>
 		</view>
 		<view class="login_box">
 			<view class="item">

pages/origanization/communication/origanization/origanization.vue

@@ -18,6 +18,10 @@
 				<view class="text" v-if="mine_code == 'zaoquan'">国家能源集团枣泉煤矿</view>
 
 				<view class="text" v-if="mine_code == 'ningdongyunying'">国家能源集团宁东运营部</view>
+				<view class="text" v-if="mine_code == 'qingshuiying'">国家能源集团清水营煤矿</view>
+				<view class="text" v-if="mine_code == 'wuyegongsi'">物业公司</view>
+				<view class="text" v-if="mine_code == 'jinjiaqu'">国家能源集团金家渠煤矿</view>
+				<view class="text" v-if="mine_code == 'yangchangwan'">国家能源集团羊场湾煤矿</view>
 
 			</view>
 
@@ -102,14 +106,17 @@
 					console.log(this.mine_code)
 					
 						
-					if(this.mine_code == 'zaoquan'){
-						this.list = res.data.data.group.leader.data.concat(res.data.data.group.office.data.concat(res
-							.data.data.group.basic.data.concat()))
-					}
+					// if(this.mine_code == 'zaoquan'){
+					// 	this.list = res.data.data.group.leader.data.concat(res.data.data.group.office.data.concat(res
+					// 		.data.data.group.basic.data.concat()))
+					// }
 					
 					if(this.mine_code == 'ningdongyunying'){
 						this.list = res.data.data.group.basic.data.concat(res.data.data.group.office.data.concat(res
 							.data.data.group.zongbu.data.concat(res.data.data.group.weiwaidanwei.data.concat())))
+					}else{
+						this.list = res.data.data.group.leader.data.concat(res.data.data.group.office.data.concat(res
+							.data.data.group.basic.data.concat()))
 					}
 					
 					// console.log(this.list)
@@ -285,6 +292,7 @@
 						border-bottom: 1rpx solid #F3F8F7;
 						
 						.left{
+							width: 500rpx;
 							.icon {
 								width: 35rpx;
 								text-align: center;
@@ -297,6 +305,7 @@
 							}
 							
 							.text {
+								width: 450rpx;
 								margin-left: 18rpx;
 								font-size: 30rpx;
 							

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

@@ -7,7 +7,7 @@
 				</view>
 				<view class="text">
 					<input type="text" v-model="search_text" value="" placeholder="搜索" confirm-type="search"
-						placeholder-style="font-size: 30rpx;color: #BBBBBB;" @input="get_list()"/>
+						placeholder-style="font-size: 30rpx;color: #BBBBBB;" @input="get_list()" />
 				</view>
 			</view>
 		</view>
@@ -17,7 +17,13 @@
 				<view class="icon">
 					<image src="./icon/title_icon.png" mode=""></image>
 				</view>
-				<view class="text">国家能源集团枣泉煤矿</view>
+				<view class="text" v-if="mine_code == 'zaoquan'">国家能源集团枣泉煤矿</view>
+
+				<view class="text" v-if="mine_code == 'ningdongyunying'">国家能源集团宁东运营部</view>
+				<view class="text" v-if="mine_code == 'qingshuiying'">国家能源集团清水营煤矿</view>
+				<view class="text" v-if="mine_code == 'wuyegongsi'">物业公司</view>
+				<view class="text" v-if="mine_code == 'jinjiaqu'">国家能源集团金家渠煤矿</view>
+				<view class="text" v-if="mine_code == 'yangchangwan'">国家能源集团羊场湾煤矿</view>
 			</view>
 
 			<view class="list">
@@ -43,6 +49,7 @@
 	export default {
 		data() {
 			return {
+				mine_code: "",
 				search_text: "",
 				// 人员列表
 				list: [
@@ -51,6 +58,10 @@
 
 			};
 		},
+		onLoad() {
+			// 初始化当前煤矿编码
+			this.mine_code = uni.getStorageSync('mine_code')
+		},
 		methods: {
 			get_list() {
 				this.$api.user_search({
@@ -60,15 +71,15 @@
 					this.list = res.data.data
 				})
 			},
-			go_user_info(staff_num){
+			go_user_info(staff_num) {
 				uni.navigateTo({
-					url:"../personal_information/personal_information?staff_num=" + staff_num
+					url: "../personal_information/personal_information?staff_num=" + staff_num
 				})
 			},
-			phone(mobile){
-				if(mobile != null){
+			phone(mobile) {
+				if (mobile != null) {
 					uni.makePhoneCall({
-					    phoneNumber: mobile
+						phoneNumber: mobile
 					});
 				}
 			},
@@ -150,28 +161,28 @@
 				margin-left: 58rpx;
 				border-bottom: 1rpx solid #F3F8F7;
 
-				.left{
+				.left {
 					display: flex;
+
 					.icon {
 						width: 35rpx;
 						text-align: center;
 						line-height: 35rpx;
 						border-radius: 50%;
 						border: 1rpx solid #00A1E9;
-					
+
 						font-size: 24rpx;
 						color: #00A1E9;
 					}
-					
+
 					.text {
 						margin-left: 18rpx;
 						font-size: 30rpx;
-					
+
 					}
 				}
-				.right{
-					
-				}
+
+				.right {}
 			}
 
 		}

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

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		<web-view :src="href"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				href: ""
+			};
+		},
+		onLoad(option) {
+			this.href = 'http://web.nxjiewei.com/#/ningdongyunying/puzzle/puzzles?token=' + uni.getStorageSync('Authorization')
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/tabbar/index/index.vue

@@ -11,6 +11,16 @@
 		<t-i-common v-if="mine_code == 'ningdongyunying'"></t-i-common>
 		<!-- 新闻列表 -->
 		<t-i-news :newsList="newsList" :mine_code="mine_code"></t-i-news>
+		
+		<!-- 金家渠 -->
+		<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"></t-i-yangchangwan>
+		</view>
 
 	</view>
 </template>
@@ -145,7 +155,8 @@
 					url: this.base_url + "/homeNav/list",
 					method: "GET",
 					success: (res) => {
-						this.iconList = res.data.data.data.slice(0, 5)
+						// this.iconList = res.data.data.data.slice(0, 5)
+						this.iconList = res.data.data.data
 					}
 				})
 			}

pages/tabbar/origanization/origanization.vue

@@ -6,12 +6,13 @@
 			<t-o-zaoquan></t-o-zaoquan>
 		</view>
 		
-		<view v-if="mine_code == 'ningdongyunying'">
-			<t-o-ningdongyunying></t-o-ningdongyunying>
-			
-			<!-- <t-o-news></t-o-news> -->
+		<view v-if="mine_code != 'zaoquan' && mine_code != 'ningdongyunying'">
+			<t-o-origanization></t-o-origanization>
 		</view>
 		
+		<view v-if="mine_code == 'ningdongyunying'">
+			<t-o-news></t-o-news>
+		</view>
 	</view>
 </template>
 

pages/tabbar/production/production.vue

@@ -12,8 +12,18 @@
 		<view v-if="mine_code == 'zaoquan'">
 			<t-p-zaoquan></t-p-zaoquan>
 		</view>
-		
-		
+		<!-- 清水营 -->
+		<view v-if="mine_code == 'qingshuiying'">
+			<t-p-qingshuiying></t-p-qingshuiying>
+		</view>
+		<!-- 金家渠 -->
+		<view v-if="mine_code == 'jinjiaqu'">
+			<t-p-jinjiaqu></t-p-jinjiaqu>
+		</view>
+		<!-- 羊场湾 -->
+		<view v-if="mine_code == 'yangchangwan'">
+			<t-p-yangchangwan></t-p-yangchangwan>
+		</view>
 	</view>
 </template>
 

pages/tabbar/workbench/workbench.vue

@@ -12,6 +12,18 @@
 			<t-w-ningdongyunying :mine_code="mine_code"></t-w-ningdongyunying>
 		</view>
 		
+		<!-- 金家渠 -->
+		<view v-if="mine_code == 'jinjiaqu'">
+			<!-- 有问题的组件 -->
+			<t-w-jinjiaqu :mine_code="mine_code"></t-w-jinjiaqu>
+		</view>
+		
+		<!-- 羊场湾 -->
+		<view v-if="mine_code == 'yangchangwan'">
+			<!-- 有问题的组件 -->
+			<t-w-yangchangwan :mine_code="mine_code"></t-w-yangchangwan>
+		</view>
+		
 	</view>
 </template>
 

pages/workbench/vehicle_approval/apply_vehicle/apply_vehicle.vue

@@ -0,0 +1,238 @@
+<template>
+	<view>
+		<view class="content">
+
+			<view class="info_inner">
+				<view class="input_box">
+					<view class="label"><text> * </text>姓名：</view>
+					<view class="box">
+						{{user.name}}
+					</view>
+				</view>
+				<view class="input_box">
+					<view class="label"><text> * </text>单位：</view>
+					<view class="box">
+
+					</view>
+				</view>
+				<view class="input_box">
+					<view class="label"><text> * </text>用车日期：</view>
+					<view class="box">
+						<uni-datetime-picker v-model="datetimerange" type="datetimerange" rangeSeparator="至" />
+					</view>
+				</view>
+			</view>
+
+			<view class="info_list">
+				<view class="info_item" v-for="(item,index) in list" :key="index">
+					<view class="del" v-if="index > 0" @click="del_item(index)">
+						<uni-icons type="clear" size="24" color="#666"></uni-icons>
+					</view>
+					<view class="input_box">
+						<view class="label"><text> * </text>用车明细（单选）：</view>
+						<view class="box" @click="change_mingxi(index)">
+							{{item.array_text_mingxi}}
+						</view>
+					</view>
+					<view class="input_box">
+						<view class="label"><text> * </text>用车数量：</view>
+						<view class="box">
+							<input type="number" v-model="item.num" />
+						</view>
+					</view>
+					<view class="input_box">
+						<view class="label">申请事由：</view>
+						<view class="box">
+							<textarea v-model="item.inner" auto-height placeholder="请输入申请事由" />
+						</view>
+					</view>
+				</view>
+				<view class="add_item" @click="add_item()">
+					+
+				</view>
+			</view>
+
+
+			<view class="btn" @click="tijiao()">提交</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				user: {},
+				// 时间范围
+				datetimerange: [],
+
+				// 用车单数组
+				list: [{
+					array_text_mingxi: "",
+					num: 1,
+					inner: ""
+				}],
+
+
+				array_mingxi: ['下方', '回收', '转运'],
+				array_text_mingxi: ""
+			};
+		},
+		onLoad() {
+			this.user = uni.getStorageSync('user')
+		},
+		watch: {
+			datetimerange(newval) {
+				console.log("范围选:", this.datetimerange);
+			},
+		},
+		methods: {
+			change_mingxi(index) {
+				uni.showActionSheet({
+					itemList: this.array_mingxi,
+					success: (res) => {
+						console.log(res)
+
+						// 当前显示的名称
+						this.list[index].array_text_mingxi = this.array_mingxi[res.tapIndex]
+					},
+				})
+			},
+
+			add_item() {
+				console.log('+++')
+
+				this.list.push({
+					array_text_mingxi: "",
+					num: 1,
+					inner: ""
+				})
+			},
+			
+			del_item(index){
+				this.list.splice(index,1)
+			},
+			
+			tijiao(){
+				console.log(this.list)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content {
+		background-color: #F2FAF7;
+		padding-bottom: 80rpx;
+
+		.info_inner {
+			background-color: #FFFFFF;
+			box-sizing: border-box;
+			padding: 25rpx;
+		}
+
+		.info_list {
+			.info_item {
+				margin-top: 20rpx;
+				background-color: #FFFFFF;
+				box-sizing: border-box;
+				padding: 25rpx;
+				
+				position: relative;
+				
+				.del{
+					position: absolute;
+					top: 20rpx;
+					right: 20rpx;
+				}
+			}
+
+			.add_item {
+
+				margin: 0 auto;
+				margin-top: 50rpx;
+				width: 80rpx;
+				height: 80rpx;
+				border-radius: 50%;
+				border: 4rpx solid #009fe8;
+
+				color: #009fe8;
+				font-size: 80rpx;
+				text-align: center;
+				line-height: 70rpx;
+			}
+
+		}
+
+		.input_box {
+			margin-bottom: 20rpx;
+			font-size: 32rpx;
+
+			.label {
+				min-height: 80rpx;
+				line-height: 80rpx;
+				color: #6C6F74;
+
+				text {
+					color: red;
+				}
+			}
+
+			.box {
+				width: 700rpx;
+				min-height: 90rpx;
+				line-height: 90rpx;
+				background: #FFFFFF;
+				border-radius: 8rpx;
+				border: 2rpx solid #E9EBF2;
+
+				box-sizing: border-box;
+				padding: 0 25rpx;
+
+				input {
+					height: 90rpx;
+				}
+
+				textarea {
+					min-height: 160rpx;
+					width: 650rpx;
+					box-sizing: border-box;
+					padding: 20rpx 0;
+				}
+
+				/deep/.uni-date-editor--x {
+					.uniui-clear {
+						display: none;
+					}
+
+					.uniui-calendar {
+						display: none;
+					}
+				}
+
+				/deep/.uni-date-x--border {
+					box-sizing: border-box;
+					border-radius: 4px;
+					border: none;
+				}
+
+				/deep/.uni-date-x {
+					padding: 0;
+				}
+			}
+		}
+
+	}
+
+
+	.btn {
+		width: 700rpx;
+		margin: 0 auto;
+		margin-top: 80rpx;
+		background-color: #009FE8;
+		box-sizing: border-box;
+		padding: 25rpx 0;
+		color: #FFFFFF;
+		text-align: center;
+	}
+</style>

pages/workbench/vehicle_approval/vehicle_history/vehicle_history.vue

@@ -0,0 +1,128 @@
+<template>
+	<view>
+		<view class="tab">
+			<view class="title" :class="active == 1?'active':''" @click="change_active(1)">
+				未完成
+			</view>
+			<view class="title" :class="active == 2?'active':''" @click="change_active(2)">
+				已完成
+			</view>
+		</view>
+		
+		<view class="list">
+			<view class="item">
+				<view class="info">
+					<view class="name">
+						宁夏杰唯
+					</view>
+					<view class="tip">已完成</view>
+				</view>
+				<view class="line">
+					<view class="icon">
+						<image src="../icon/icon_1.png" mode=""></image>
+					</view>
+					<view class="text">矿领导</view>
+				</view>
+				<view class="line">
+					<view class="icon">
+						<image src="../icon/icon_2.png" mode=""></image>
+					</view>
+					<view class="text">2021-01-09 08:30-20:30</view>
+				</view>
+				<view class="line">
+					<view class="icon">
+						<image src="../icon/icon_3.png" mode=""></image>
+					</view>
+					<view class="text">2021-01-08 09:56:07</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				active:1
+			};
+		},
+		methods:{
+			change_active(item){
+				this.active = item
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		background-color: #F2FAF7;
+	}
+	.tab {
+		background-color: #FFFFFF;
+		display: flex;
+
+		.title {
+			width: 375rpx;
+			text-align: center;
+			height: 85rpx;
+			line-height: 85rpx;
+			
+		}
+		.active{
+			color: #16a085;
+			
+			box-sizing: border-box;
+			border-bottom: 4rpx solid #16a085;
+		}
+	}
+	
+	.list{
+		box-sizing: border-box;
+		padding: 25rpx;
+		.item{
+			margin-bottom: 20rpx;
+			width: 700rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			
+			box-sizing: border-box;
+			padding: 25rpx;
+			.info{
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				
+				height: 60rpx;
+				margin-bottom: 20rpx;
+				.name{
+					font-size: 34rpx;
+					font-weight: 700;
+				}
+				.tip{
+					box-sizing: border-box;
+					padding: 5rpx 14rpx;
+					font-size: 26rpx;
+					color: #FFFFFF;
+					background-color: #35E657;
+					border-radius: 6rpx;
+				}
+			}
+			.line{
+				display: flex;
+				align-items: center;
+				height: 60rpx;
+				.icon{
+					image{
+						width: 32rpx;
+						height: 32rpx;
+					}
+				}
+				.text{
+					margin-left: 20rpx;
+				}
+			}
+		}
+	}
+</style>

read.md

@@ -18,7 +18,12 @@
 	1.修改manifest.json文件中的应用名称（应用名称修改为当前需更新的APP客户端名称）
 	2.修改App.vue文件中煤矿编码（修改为当前需更新客户端的矿编码）
 	3.修改基础业务接口封装文件中的基础路径
-	
+	4.修改组织架构 t-o-origanization 中的组织名称
+	5.修改communication：origanization 中的组织名称
+	6.修改t-navbar中的标题
+	7.修改forget-password 中的标题
+	8.修改下载二维码
+	9.修改communication：origanization - search 中的标题
 	
 ## 关于接口封装文件问题