更新：E信管理-1.0.3

App.vue

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

common/vmeitime-http/interface.js

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

components/e-link/e-link.vue

@@ -110,6 +110,7 @@
 			// }
 			
 			go_page(link){
+				console.log(link)
 				// 二维码
 				if(link.indexOf("pageId") != -1 && link.indexOf("app:") == -1){
 					let pageId = ""
@@ -132,9 +133,15 @@
 				}
 				// h5
 				if(link.indexOf("pageId") == -1 && link.indexOf("app:") == -1){
-					uni.navigateTo({
-						url: "../../index/record/h5/h5?url=" + link
-					})
+					if(link.indexOf("huiyiList") != -1){
+						uni.navigateTo({
+							url:"../../workbench/meeting_arrangements/meeting_arrangements"
+						})
+					}else{
+						uni.navigateTo({
+							url: "../../index/record/h5/h5?url=" + link
+						})
+					}
 				}
 				// 原生
 				if(link.indexOf("pageId") == -1 && link.indexOf("app:") != -1){

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

@@ -62,12 +62,12 @@
 				<view class="name">清除缓存</view>
 			</view>
 			
-			<!-- <view class="item" @click="go_cloud_disk()">
+			<view class="item" @click="go_cloud_disk()">
 				<view class="icon">
-					<image src="./icon/qingchu.png" mode=""></image>
+					<image src="./icon/yunpan.png" mode=""></image>
 				</view>
 				<view class="name">我的云盘</view>
-			</view> -->
+			</view>
 			
 		</view>
 	</view>

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

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

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

@@ -0,0 +1,199 @@
+<template>
+	<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/OLRn1jRkVXSyDzRLt-5hqPSEhOiCBanlo1pfEgG44dE/rs:fill:280:280:0/g:sm/bG9jYWw6Ly8vM2Iv/NTAvMTliNzNiMDY5/MjQ0YThlMDgyMzE0/MzcyMjg1ZWMxYTJh/YzRiM2I1MC5qcGVn.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/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>
+							<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 {
+
+			};
+		},
+		methods:{
+			go_all_list(){
+				uni.navigateTo({
+					url:"../../origanization/news/tab_2/all_list/all_list"
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.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-3/t-o-news-tab-3.vue

@@ -0,0 +1,149 @@
+<template>
+	<view>
+		<view class="list">
+			<view class="item" v-for="item in 4">
+				<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">梅花井煤矿</view>
+						<view class="tip">拼图</view>
+					</view>
+					<view class="text">标题标题标题标题标题标题标题标题标题标题标题</view>
+					<view class="content">
+						<view class="time">2021.12.03</view>
+						<view class="box">
+							<view class="line">
+								<view class="line_box"></view>
+							</view>
+							<view class="num">36%</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "t-o-news-tab-3",
+		data() {
+			return {
+
+			};
+		}
+	}
+</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/t-o-news.vue

@@ -0,0 +1,117 @@
+<template>
+	<view>
+		<!-- tab -->
+		<view class="tab">
+			<view class="item" @click="change_active(1)">
+				<view class="icon">
+					<image v-if="active != 1" src="./icon/icon_1.png" mode=""></image>
+					<image v-if="active == 1" src="./icon/icon_1_active.png" style="width: 115rpx;height: 80rpx;"
+						mode=""></image>
+				</view>
+				<view class="title">
+					<view class="text" :style="active==1?'color:#009FE8;font-weight:700;':'' ">闭环管理</view>
+					<view class="tip" :style="active==1?'color:#3a3a3a;':'' ">PDCA循环管理</view>
+				</view>
+			</view>
+			<view class="item" @click="change_active(2)">
+				<view class="icon">
+					<image v-if="active != 2" src="./icon/icon_2.png" mode=""></image>
+					<image v-if="active == 2" src="./icon/icon_2_active.png" style="width: 115rpx;height: 80rpx;"
+						mode=""></image>
+				</view>
+				<view class="title">
+					<view class="text" :style="active==2?'color:#009FE8;font-weight:700;':'' ">记录管理</view>
+					<view class="tip" :style="active==2?'color:#3a3a3a;':'' ">全部消息一览</view>
+				</view>
+			</view>
+			<view class="item" @click="change_active(3)">
+				<view class="icon">
+					<image v-if="active != 3" src="./icon/icon_3.png" mode=""></image>
+					<image v-if="active == 3" src="./icon/icon_3_active.png" style="width: 115rpx;height: 80rpx;"
+						mode=""></image>
+				</view>
+				<view class="title">
+					<view class="text" :style="active==3?'color:#009FE8;font-weight:700;':'' ">宣传展板</view>
+					<view class="tip" :style="active==3?'color:#3a3a3a;':'' ">企业文化宣传展示</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- content -->
+		<view class="content">
+			<view v-if="active == 1">
+				<t-o-news-tab-1></t-o-news-tab-1>
+			</view>
+			<view v-if="active == 2">
+				<t-o-news-tab-2></t-o-news-tab-2>
+			</view>
+			<view v-if="active == 3">
+				<t-o-news-tab-3></t-o-news-tab-3>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "t-o-news",
+		data() {
+			return {
+				active: 1
+			};
+		},
+		methods: {
+			change_active(item) {
+				this.active = item
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F2FAF7;
+	}
+
+	.tab {
+		background-color: #FFFFFF;
+		box-sizing: border-box;
+		padding: 25rpx 50rpx;
+
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		.item {
+			text-align: center;
+
+			.icon {
+				height: 80rpx;
+
+				image {
+					width: 95rpx;
+					height: 66rpx;
+				}
+			}
+
+			.title {
+				margin-top: 10rpx;
+
+				.text {
+					font-size: 30rpx;
+					color: #727272;
+				}
+
+				.tip {
+					margin-top: 5rpx;
+					font-size: 24rpx;
+					color: #979797;
+				}
+			}
+		}
+	}
+	
+	.content{
+		margin-top: 20rpx;
+	}
+</style>

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

@@ -45,7 +45,8 @@
 				<view class="tip">共40个通风机</view>
 			</view>
 		</view>
-		<view class="item_box" style="background-color: #FBB47B;" @click="go_h5('http://nmjt.nxjiewei.com:8011/web/monitor/video/videoList?mine_code=')">
+		<!-- <view class="item_box" style="background-color: #FBB47B;" @click="go_h5('http://nmjt.nxjiewei.com:8011/web/monitor/video/videoList?mine_code=')"> -->
+		<view class="item_box" style="background-color: #FBB47B;" @click="go_h5('http://webdevelop.nxjiewei.com/assets/html/video/?mine_code=')">
 			<view class="img">
 				<image src="../t-p-icon/icon_6.png" mode=""></image>
 			</view>

manifest.json

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

pages.json

@@ -15,6 +15,8 @@
 			"path": "pages/tabbar/origanization/origanization",
 			"style": {
 				"navigationBarTitleText": "通讯录"
+				// 宁东运营 显示消息
+				// "navigationBarTitleText": "消息"
 			}
 
 		}, {
@@ -458,6 +460,23 @@
             }
             
         }
+       
+        ,{
+            "path" : "pages/origanization/news/tab_1/all_list/all_list",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "五定表"
+            }
+            
+        }
+        ,{
+            "path" : "pages/origanization/news/tab_2/all_list/all_list",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "车辆管理"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
@@ -476,6 +495,7 @@
 			{
 
 				"text": "通讯录",
+				// "text": "消息",
 				"pagePath": "pages/tabbar/origanization/origanization",
 				"iconPath": "static/tabbar/origanization.png",
 				"selectedIconPath": "static/tabbar/origanization_active.png"

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

@@ -4,7 +4,7 @@
 			<view class="item" v-for="(item,index) in browse" :key="index" @click="click(item)">
 				<view class="img">
 					<view v-if="item.img">
-						<image :src="item.img" mode=""></image>
+						<image :src="item.img" mode="aspectFill"></image>
 					</view>
 					<view v-if="!item.img">
 						<view class="img_tip" :style="{backgroundColor:bgColor[index]}">
@@ -21,7 +21,7 @@
 			<view class="popup_box">
 				<view class="img">
 					<view v-if="user.img">
-						<image :src="user.img" mode=""></image>
+						<image :src="user.img" mode="aspectFill"></image>
 					</view>
 					<view v-if="!user.img">
 						<view class="img_tip" :style="{backgroundColor:bgColor[Math.ceil(Math.random()*10)]}">

pages/my/cloud_disk/cloud_disk.vue

@@ -20,7 +20,7 @@
 		methods: {
 			set_user() {
 
-				this.url = "http://pan.nxjiewei.com/index.php/login?staff_num=" + this.staff_num
+				this.url = "http://pan.nxjiewei.com/index.php/login?user=" + this.staff_num
 
 			}
 		}

pages/origanization/communication/origanization/personal_information/personal_information.vue

@@ -47,14 +47,16 @@
 			<view class="list_1" v-if="active == 1">
 				<view class="item" @click="binding_phone()">
 					<view class="label">手机号</view>
-					<view class="text">{{info.monile}}</view>
+					<view class="text">{{info.mobile}}</view>
 					<view class="right">
 						<!-- <uni-icons type="arrowright"></uni-icons> -->
 					</view>
 				</view>
 				<view class="item" @click="binding_phone()">
 					<view class="label">手写签名</view>
-					<view class="text"></view>
+					<view class="text">
+						<image :src="info.base_img" style="width: 300rpx;height: 120rpx;" mode="aspectFill"></image>
+					</view>
 					<view class="right">
 						<!-- <uni-icons type="arrowright"></uni-icons> -->
 					</view>
@@ -274,7 +276,7 @@
 		position: relative;
 		background-color: #FFFFFF;
 		width: 750rpx;
-		height: 490rpx;
+		min-height: 490rpx;
 
 		background-image: url(./icon/top.png);
 		background-size: 100% 100%;
@@ -452,36 +454,41 @@
 
 			.item {
 				float: left;
-				margin-right: 25rpx;
+				margin-right: 50rpx;
 				margin-bottom: 30rpx;
 
-				width: 200rpx;
+				width: 300rpx;
 				text-align: center;
 
 				.img {
 					image {
-						width: 200rpx;
-						height: 140rpx;
+						width: 300rpx;
+						height: 180rpx;
 					}
 
 					.add {
-						font-size: 110rpx;
+						font-size: 140rpx;
 						color: #DCDCDC;
 						text-align: center;
-						height: 140rpx;
-						line-height: 140rpx;
+						height: 180rpx;
+						line-height: 160rpx;
 						background-color: #EEEEEE;
 					}
 				}
 
 				.text {
-					width: 180rpx;
-					font-size: 24rpx;
+					width: 260rpx;
+					font-size: 30rpx;
 					color: #8e8e8e;
+
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+
 				}
 			}
 
-			.item:nth-child(3n) {
+			.item:nth-child(2n) {
 				margin-right: 0;
 			}
 		}

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

@@ -0,0 +1,189 @@
+<template>
+	<view class="content">
+		<view class="list">
+			<view class="item">
+				<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 16">
+							<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>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.list {
+		.item {
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			.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;
+							padding: 0 10rpx;
+						}
+	
+						.text_7 {
+							width: 500rpx;
+							padding: 0 10rpx;
+						}
+	
+						.text_8 {
+							width: 200rpx;
+						}
+	
+						.text_9 {
+							width: 200rpx;
+						}
+					}
+	
+				}
+	
+				.line:nth-child(1) {
+					.box {
+						height: 80rpx;
+						background-color: #D8D8D8;
+	
+						.text {
+							font-size: 28rpx;
+							color: #000000;
+						}
+					}
+				}
+	
+			}
+	
+			
+		}
+	}
+</style>

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

@@ -0,0 +1,123 @@
+<template>
+	<view>
+		<view class="list">
+			<view class="item" v-for="item in 7">
+				<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>
+						</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 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>
+						</view>
+						<view class="time">2021-12-14 08:32:56</view>
+						
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.list {
+		box-sizing: border-box;
+		padding: 25rpx;
+		.item {
+			border-bottom: 1rpx solid #CCCCCC;
+			margin-bottom: 40rpx;
+			.inner {
+				margin-bottom: 40rpx;
+				width: 700rpx;
+				display: flex;
+
+				.left {
+					.user {
+						image {
+							width: 90rpx;
+							height: 90rpx;
+
+							border-radius: 50%;
+						}
+					}
+				}
+
+				.right {
+					margin-left: 20rpx;
+
+					width: 650rpx;
+
+					.name {
+						margin-top: 5rpx;
+						font-size: 32rpx;
+
+						text {
+							margin-left: 20rpx;
+							font-size: 26rpx;
+							color: #3a3a3a;
+						}
+					}
+
+					.text {
+						width: 600rpx;
+						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;
+					}
+
+					
+				}
+			}
+		}
+	}
+</style>

pages/tabbar/origanization/origanization.vue

@@ -8,6 +8,8 @@
 		
 		<view v-if="mine_code == 'ningdongyunying'">
 			<t-o-ningdongyunying></t-o-ningdongyunying>
+			
+			<!-- <t-o-news></t-o-news> -->
 		</view>
 		
 	</view>

pages/workbench/meeting_arrangements/detail/detail.vue

@@ -79,7 +79,7 @@
 
 				</view>
 			</view>
-			<view class="section section_3">
+			<view class="section section_3" v-if="vote_list">
 				<view class="title">投票详情</view>
 				<view class="tip">投票项目：{{vote_list.title}}</view>
 				<view class="tip">表决决议：{{vote_list.remark}}</view>
@@ -144,7 +144,9 @@
 
 
 				// 投票详情
-				vote_list: {},
+				vote_list: {
+					title:""
+				},
 
 				// 当前状态
 				status: " ",
@@ -183,6 +185,7 @@
 			};
 		},
 		onLoad(option) {
+			console.log(typeof(this.vote_list))
 			// 设置会议标题
 			uni.setNavigationBarTitle({
 				title: option.title