枣泉：1.0.1

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

@@ -63,7 +63,7 @@
 				url:"http://api.k780.com/?app=weather.today&weaId=286&appkey=10003&sign=b59bc3ef6191eb9f747dd4e83c99f2a4&format=json",
 				method:"GET",
 				success:(res)=> {
-					console.log(res.data.result.temperature_curr)
+					// console.log(res.data.result.temperature_curr)
 					this.temperature_curr = res.data.result.temperature_curr
 				}
 			})

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

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

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

@@ -41,7 +41,7 @@
 					</view>
 					<view class="text">组织架构</view>
 				</view>
-				<view class="item">
+				<view class="item" @click="go_my_department()">
 					<view class="icon">
 						<image src="./icon/bumen.png" mode=""></image>
 					</view>
@@ -65,6 +65,11 @@
 				uni.navigateTo({
 					url:"../../origanization/zaoquan/origanization/origanization"
 				})
+			},
+			go_my_department(){
+				// uni.navigateTo({
+				// 	url:"../../origanization/zaoquan/origanization/my_department/my_department"
+				// })
 			}
 		}
 	}

components/t-w-zaoquan/t-w-zaoquan.vue

@@ -58,7 +58,7 @@
 				this.$api.workbench_index({
 		
 				}).then((res)=>{
-					console.log(res)
+					// console.log(res)
 					this.header=res.data.data.header
 					this.nav=res.data.data.nav
 					this.module=res.data.data.module

manifest.json

@@ -2,7 +2,7 @@
     "name" : "智慧枣泉",
     "appid" : "__UNI__4B520D3",
     "description" : "",
-    "versionName" : "1.0.0",
+    "versionName" : "1.0.1",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */

pages.json

@@ -298,6 +298,22 @@
             }
             
         }
+        ,{
+            "path" : "pages/origanization/zaoquan/origanization/search/search",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "组织架构"
+            }
+            
+        }
+        ,{
+            "path" : "pages/origanization/zaoquan/origanization/my_department/my_department",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "我的部门"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",

pages/origanization/zaoquan/origanization/my_department/my_department.vue

@@ -0,0 +1,249 @@
+<template>
+	<view>
+		<view class="search">
+			<view class="box" @click="go_search()">
+				<view class="icon">
+					<uni-icons type="search" size="16" color="#BBBBBB"></uni-icons>
+				</view>
+				<view class="text">搜索</view>
+			</view>
+		</view>
+
+		<view class="content">
+			<view class="title">
+				<view class="icon">
+					<image src="./icon/title_icon.png" mode=""></image>
+				</view>
+				<view class="text">国家能源集团枣泉煤矿</view>
+			</view>
+			
+			<view class="section" 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}} （{{item.user_num}}）</view>
+						</view>
+						<view class="right">
+							<uni-icons type="eye"></uni-icons>
+						</view>
+					</view>
+					<view class="list" v-if="active == index">
+						<view class="item" v-for="(item_2,index_2) in user_list" :key="index_2">
+							<view class="icon">{{item_2.name.charAt(0)}}</view>
+							<view class="text">{{item_2.name}} {{item_2.position_name}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 部门列表
+				list: [
+
+				],
+				// 当前展开部门
+				active: 99999999,
+				
+				// 人员列表
+				user_list:[]
+			};
+		},
+		methods: {
+			// 搜索
+			go_search(){
+				uni.navigateTo({
+					url:"./search/search",
+					animationType:"fade-in",
+					animationDuration:200
+				})
+			},
+			// 获取部门列表
+			get_section_getGroupList() {
+				uni.showLoading({
+					mask:true
+				})
+				this.$api.section_getGroupList({
+
+				}).then((res) => {
+					uni.hideLoading()
+					console.log(res)
+
+					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)
+				})
+			},
+			
+			change_active(index,id) {
+				this.user_list = []
+				if (this.active == index) {
+					this.active = 99999999
+				} else {
+					this.active = index
+					this.get_user_list(id)
+				}
+			},
+			// 获取当前部门人员
+			get_user_list(id){
+				uni.showLoading({
+					mask:true
+				})
+				this.$api.user_list({
+					id:id
+				}).then((res)=>{
+					uni.hideLoading()
+					console.log(res)
+					this.user_list = res.data.data
+				})
+			}
+		},
+		onLoad() {
+			this.get_section_getGroupList()
+		}
+	}
+</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 36rpx;
+			border-bottom: 1rpx solid #F3F8F7;
+
+			.icon {
+				image {
+					width: 48rpx;
+					height: 36rpx;
+				}
+			}
+
+			.text {
+				margin-left: 20rpx;
+				font-size: 36rpx;
+				font-weight: 700;
+			}
+		}
+		
+		.section{
+			box-sizing: border-box;
+			padding: 0 20rpx;
+			
+			.box{
+				
+				.item{
+					height: 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;
+						}
+					}
+					.right{
+						line-height: 110rpx;
+						width: 90rpx;
+						text-align: center;
+					}
+				}
+				
+				.list{
+					.item{
+						height: 110rpx;
+						
+						display: flex;
+						justify-content: left;
+						align-items: center;
+						
+						margin-left: 108rpx;
+						border-bottom: 1rpx solid #F3F8F7;
+						.icon{
+							width: 35rpx;
+							text-align: center;
+							line-height: 35rpx;
+							border-radius: 50%;
+							border: 1rpx solid #00A1E9;
+							
+							font-size: 24rpx;
+							color: #00A1E9;
+						}
+						.text{
+							margin-left: 18rpx;
+							font-size: 30rpx;
+							
+						}
+					}
+				}
+			
+			}
+			
+		}
+
+	}
+</style>

pages/origanization/zaoquan/origanization/origanization.vue

@@ -1,9 +1,9 @@
 <template>
 	<view>
 		<view class="search">
-			<view class="box">
+			<view class="box" @click="go_search()">
 				<view class="icon">
-					<uni-icons type="search" size="14" color="#BBBBBB"></uni-icons>
+					<uni-icons type="search" size="16" color="#BBBBBB"></uni-icons>
 				</view>
 				<view class="text">搜索</view>
 			</view>
@@ -62,6 +62,14 @@
 			};
 		},
 		methods: {
+			// 搜索
+			go_search(){
+				uni.navigateTo({
+					url:"./search/search",
+					animationType:"fade-in",
+					animationDuration:200
+				})
+			},
 			// 获取部门列表
 			get_section_getGroupList() {
 				uni.showLoading({
@@ -120,7 +128,7 @@
 		padding: 25rpx 30rpx;
 
 		.box {
-			height: 60rpx;
+			height: 80rpx;
 			background-color: #F4F4F4;
 			border-radius: 50rpx;
 
@@ -135,7 +143,7 @@
 			}
 
 			.text {
-				font-size: 24rpx;
+				font-size: 30rpx;
 				color: #BBBBBB;
 			}
 		}
@@ -145,7 +153,7 @@
 		background-color: #FFFFFF;
 
 		.title {
-			height: 95rpx;
+			height: 110rpx;
 			display: flex;
 			align-items: center;
 
@@ -174,7 +182,7 @@
 			.box{
 				
 				.item{
-					height: 95rpx;
+					height: 110rpx;
 					display: flex;
 					align-items: center;
 					justify-content: space-between;
@@ -186,7 +194,7 @@
 						display: flex;
 						align-items: center;
 						.icon{
-							line-height: 95rpx;
+							line-height: 110rpx;
 							width: 90rpx;
 							text-align: center;
 							image{
@@ -195,11 +203,11 @@
 							}
 						}
 						.text{
-							font-size: 28rpx;
+							font-size: 32rpx;
 						}
 					}
 					.right{
-						line-height: 95rpx;
+						line-height: 110rpx;
 						width: 90rpx;
 						text-align: center;
 					}
@@ -207,7 +215,7 @@
 				
 				.list{
 					.item{
-						height: 95rpx;
+						height: 110rpx;
 						
 						display: flex;
 						justify-content: left;
@@ -227,7 +235,7 @@
 						}
 						.text{
 							margin-left: 18rpx;
-							font-size: 28rpx;
+							font-size: 30rpx;
 							
 						}
 					}

pages/origanization/zaoquan/origanization/search/search.vue

@@ -0,0 +1,144 @@
+<template>
+	<view>
+		<view class="search">
+			<view class="box">
+				<view class="icon">
+					<uni-icons type="search" size="16" color="#BBBBBB"></uni-icons>
+				</view>
+				<view class="text">
+					<input type="text" value="" placeholder="搜索" confirm-type="search" placeholder-style="font-size: 30rpx;color: #BBBBBB;" />
+				</view>
+			</view>
+		</view>
+
+		<view class="content">
+			<view class="title">
+				<view class="icon">
+					<image src="./icon/title_icon.png" mode=""></image>
+				</view>
+				<view class="text">国家能源集团枣泉煤矿</view>
+			</view>
+			
+			<view class="list">
+				<view class="item" v-for="(item,index) in list" :key="index">
+					<view class="icon">{{item.name.charAt(0)}}</view>
+					<view class="text">{{item.name}} {{item.position_name}}</view>
+				</view>
+				
+				<view v-if="list.length == 0" style="font-size: 32rpx;text-align: center;line-height: 400rpx;">暂无搜索结果</view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				// 人员列表
+				list: [
+
+				]
+			};
+		},
+		methods: {
+			
+		}
+	}
+</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 36rpx;
+			border-bottom: 1rpx solid #F3F8F7;
+
+			.icon {
+				image {
+					width: 48rpx;
+					height: 36rpx;
+				}
+			}
+
+			.text {
+				margin-left: 20rpx;
+				font-size: 36rpx;
+				font-weight: 700;
+			}
+		}
+		
+		.list{
+			box-sizing: border-box;
+			padding: 0 20rpx;
+			
+			.item{
+				height: 110rpx;
+				
+				display: flex;
+				justify-content: left;
+				align-items: center;
+				
+				margin-left: 108rpx;
+				border-bottom: 1rpx solid #F3F8F7;
+				.icon{
+					width: 35rpx;
+					text-align: center;
+					line-height: 35rpx;
+					border-radius: 50%;
+					border: 1rpx solid #00A1E9;
+					
+					font-size: 24rpx;
+					color: #00A1E9;
+				}
+				.text{
+					margin-left: 18rpx;
+					font-size: 30rpx;
+					
+				}
+			}
+			
+		}
+
+	}
+</style>

pages/production/zaoquan/power_monitoring/power_monitoring.vue

@@ -34,7 +34,7 @@
 								</view>
 								<view class="item_content_list_item_content">
 									<view class="inner_list">
-										<view class="inner_list_item"  v-for="list in item.ycpara">{{list.name}}：{{list.val}} {{list.unit}}</view>
+										<view class="inner_list_item"  v-for="(list,index) in item.ycpara" :key="index">{{list.name}}：{{list.val}} {{list.unit}}</view>
 									</view>
 								</view>
 							</view>

unpackage/dist/build/app-plus/__uniappview.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var __UniViewStartTime__ = Date.now();
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title>View</title>
+    <link rel="stylesheet" href="view.css" />
+  </head>
+
+  <body>
+    <div id="app"></div>
+    <script src="__uniappes6.js"></script>
+    <script src="view.umd.min.js"></script>
+    <script src="app-view.js"></script>
+  </body>
+
+</html>