10 月之前 · 551486ef97
--- a/App.vue
+++ b/App.vue
@@ -1,18 +1,8 @@
 
				 <script>
			
 
				-	import dutyApi from '@/api/duty.js'	
			
 
				-	import {selectGroupUser} from '@/api/system.js'
			
 
				+
			
 
				 	export default {
			
 
				 		onLaunch: function() {
			
 
				 
			
 
				-		},
			
 
				-		onShow: function() {
			
 
				-			if(uni.getStorageSync('dutys')) return
			
 
				-			dutyApi.getByList().then((res)=>{
			
 
				-				uni.setStorageSync("dutys",res.data)
			
 
				-			})
			
 
				-			selectGroupUser().then((res)=>{
			
 
				-				uni.setStorageSync("groupUser",res.data)
			
 
				-			})
			
 
				 		}
			
 
				 	}
			
 
				 
			
--- a/api/danger.js
+++ b/api/danger.js
@@ -5,20 +5,30 @@ export default {
 
				   // 分类统计
			
 
				   counterByCat: (data) => request({url:'/danger/statis/counterByCat',data}),
			
 
				   
			
 
				-  // 分页查询
			
 
				-  getByPage: (data) => request({url:'/danger/page',data }),
			
 
				-  // 列表查询
			
 
				-  getByList: (data) => request({url:'/danger',data }),
			
 
				-  // 基于ID查询
			
 
				-  getById: (dangerId) => request({url:`/danger/${dangerId}` }),
			
 
				-  // 新增
			
 
				-  create: (data) => request({url:'/danger/add',method: 'POST', data}),
			
 
				-  // 更新
			
 
				-  update: (data) =>  request({url:'/danger/update',method: 'put', data}),
			
 
				-  // 删除
			
 
				-  deleteById: (dangerId) => request({url:`/danger/${dangerId}`,method: 'delete'}),  
			
 
				-  // 新增
			
 
				-  batchCreate: (data) => request({url:'/danger/batch/add',method: 'POST', data}),
			
 
				- //cat 
			
 
				-  getCatByList: (data) => request({url:'/danger',data }),
			
 
				+	// 分页查询
			
 
				+	getByPage: (data) => request({url:'/danger/page',data }),
			
 
				+	// 列表查询
			
 
				+	getByList: (data) => request({url:'/danger',data }),
			
 
				+	// 基于ID查询
			
 
				+	getById: (dangerId) => request({url:`/danger/${dangerId}` }),
			
 
				+	// 新增
			
 
				+	create: (data) => request({url:'/danger/add',method: 'POST', data}),
			
 
				+	// 更新
			
 
				+	update: (data) =>  request({url:'/danger/update',method: 'put', data}),
			
 
				+	// 删除
			
 
				+	deleteById: (dangerId) => request({url:`/danger/${dangerId}`,method: 'delete'}),  
			
 
				+	// 新增
			
 
				+	batchCreate: (data) => request({url:'/danger/batch/add',method: 'POST', data}),
			
 
				+	//cat 
			
 
				+	getCatByList: (data) => request({url:'/danger',data }),
			
 
				+
			
 
				+	getSupervisorListById: (dangerId) => request({url:`/danger/supervisor/${dangerId}`}),
			
 
				+	// 基于ID查询
			
 
				+	getSupervisorById: (dangerId, supervisorId) => request({url:`/danger/supervisor/${dangerId}/${supervisorId}`}),
			
 
				+	// 新增
			
 
				+	createSupervisor: (data) => request({url:'/danger/supervisor/add',method: 'POST', data}), 
			
 
				+	// 更新
			
 
				+	updateSupervisor: (data) =>  request({url:'/danger/supervisor/update',method: 'put', data}),
			
 
				+	// 删除
			
 
				+	deleteSupervisorById: (dangerId, supervisorId) => request({url:`/danger/supervisor/${dangerId}/${supervisorId}`,method: 'delete'})
			
 
				 }
			
--- a/api/duty.js
+++ b/api/duty.js
@@ -21,4 +21,5 @@ export default {
 
				   deleteWeekRecordById: (year, week, accountId) => request({url:`/duty/record/week/${year}/${week}/${accountId}`,method: 'delete'}),
			
 
				     // 列表查询 ALL
			
 
				   getAllByList: (data) => request({url:'/duty/record/all',data }),
			
 
				+  getRecordByList: (data) => request({url:'/duty/record',data }),  
			
 
				 }
			
--- a/api/system.js
+++ b/api/system.js
@@ -78,6 +78,9 @@ export function selectGroupUser() {
 
				 export function selectGroupAllUser() {
			
 
				   return request({url: '/group/user/select/all'})
			
 
				 }
			
 
				+export function getGroupView() {
			
 
				+  return request({url: '/group/view'})
			
 
				+}
			
 
				 export function getVideoInfo(cameraId){
			
 
				   return request({url:`/camera/view/${cameraId}`})
			
 
				 }
			
--- a/index.html
+++ b/index.html
@@ -16,7 +16,5 @@
 
				   <body>
			
 
				     <div id="app"><!--app-html--></div>
			
 
				     <script type="module" src="/main.js"></script>
			
 
				-	<script type="module" src="https://registry.npmmirror.com/echarts/5.5.1/files/dist/echarts.min.js"></script>
			
 
				-	
			
 
				   </body>
			
 
				 </html>
			
--- a/libs/request.js
+++ b/libs/request.js
@@ -17,13 +17,16 @@ export async function request(parmas) {
 
				 					let code = data.code;
			
 
				 					let msg = data.msg
			
 
				 					if (code === 200) {
			
 
				+						uni.hideLoading();						
			
 
				 						resolve(data)
			
 
				 					} else {
			
 
				 						if (code === 401) {
			
 
				+							uni.hideLoading();
			
 
				 							uni.showToast({
			
 
				 								title: msg || "登录失效！",
			
 
				 								mask: true,
			
 
				 								icon: "none",
			
 
				+								duration:2000,
			
 
				 								complete() {
			
 
				 									uni.reLaunch({
			
 
				 										url: '/pages/login/index'
			
@@ -33,24 +36,25 @@ export async function request(parmas) {
 
				 
			
 
				 						} else {
			
 
				 							reject(data)
			
 
				+							uni.hideLoading();
			
 
				 							uni.showToast({
			
 
				 								title: msg,
			
 
				 								mask: true,
			
 
				+								duration:2000,								
			
 
				 								icon: "none"
			
 
				 							})
			
 
				 						}
			
 
				 					}
			
 
				 				},
			
 
				 				fail(res) {
			
 
				+					uni.hideLoading();
			
 
				 					uni.showToast({
			
 
				 						title: res.errMsg,
			
 
				 						mask: true,
			
 
				+						duration:2000,							
			
 
				 						icon: "none"
			
 
				 					})
			
 
				 					reject(res)
			
 
				-				},
			
 
				-				complete(res) {
			
 
				-					uni.hideLoading();
			
 
				 				}
			
 
				 			})
			
 
				 		} catch (err) {
			
--- a/packageA/pages/danger/components/Create.vue
+++ b/packageA/pages/danger/components/Create.vue
@@ -11,9 +11,13 @@
 
				 						<uni-forms-item  label ="隐患标题">
			
 
				 							<uni-easyinput v-model="form.dangerTitle" placeholder="请输入隐患标题"  />
			
 
				 						</uni-forms-item>	
			
 
				-						<uni-forms-item  label ="隐患分类" >
			
 
				+<!-- 						<uni-forms-item  label ="隐患分类" >
			
 
				 							<uni-data-select  v-model="form.dangerCatId" :localdata="dangerCats" placeholder="请选择隐患分类" :clear="false"></uni-data-select>
			
 
				-						</uni-forms-item>	
			
 
				+						</uni-forms-item> -->	
			
 
				+						
			
 
				+						<uni-forms-item  label ="分类标签" >
			
 
				+							<uni-easyinput v-model="form.dangerTags" placeholder="请输入分类标签"  />
			
 
				+						</uni-forms-item>
			
 
				 						<uni-forms-item  label ="隐患等级" >
			
 
				 							<uni-data-select  v-model="form.dangerLevel" :localdata="dangerLevelOptions" placeholder="请选择隐患等级" :clear="false"></uni-data-select>
			
 
				 						</uni-forms-item>																									
			
@@ -96,7 +100,7 @@
 
				 		name:"CreateDanger",
			
 
				 		computed:{
			
 
				 			entCats(){
			
 
				-				let entCats=uni.getStorageSync('entCats')
			
 
				+				let entCats=this.ent
			
 
				 				if(!entCats)return []
			
 
				 				return entCats.map(item=>{
			
 
				 					return{
			
@@ -106,7 +110,7 @@
 
				 				})
			
 
				 			},
			
 
				 			dangerCats(){
			
 
				-				let dangerCats=uni.getStorageSync('dangerCats')
			
 
				+				let dangerCats=this.danger
			
 
				 				if(!dangerCats)return []
			
 
				 				return dangerCats.map(item=>{
			
 
				 					return{
			
@@ -116,6 +120,16 @@
 
				 				})
			
 
				 			},						
			
 
				 		},
			
 
				+		props:{
			
 
				+			ent:{
			
 
				+				type:Array,
			
 
				+				default:()=>[]
			
 
				+			},
			
 
				+			danger:{
			
 
				+				type:Array,
			
 
				+				default:()=>[]
			
 
				+			}
			
 
				+		},
			
 
				 		data(){
			
 
				 			return{
			
 
				 				type:undefined,
			
@@ -156,6 +170,7 @@
 
				 					dangerCatId: 1,
			
 
				 					dangerCatTitle: '',
			
 
				 					dangerTitle: '',
			
 
				+					dangerTags:'',
			
 
				 					dangerCode: '',
			
 
				 					dangerLocation: '',
			
 
				 					dangerLevel: 2,
			
@@ -183,6 +198,7 @@
 
				 					dangerCatId: 1,
			
 
				 					dangerCatTitle: '',
			
 
				 					dangerTitle: '',
			
 
				+					dangerTags:'',					
			
 
				 					dangerCode: '',
			
 
				 					dangerLocation: '',
			
 
				 					dangerLevel: 2,
			
--- a/packageA/pages/danger/components/Detail.vue
+++ b/packageA/pages/danger/components/Detail.vue
@@ -10,7 +10,7 @@
 
				 				<uni-list-item :rightText="viewData.groupName" title ="监管单位" ></uni-list-item>						
			
 
				 				<uni-list-item :rightText="viewData.entName" title ="企业单位" ></uni-list-item>
			
 
				 				<uni-list-item :rightText="viewData.dangerTitle" title ="隐患名称"></uni-list-item>		
			
 
				-				<uni-list-item :rightText="viewData.dangerCatTitle" title ="分类" ></uni-list-item>						
			
 
				+				<uni-list-item :rightText="viewData.dangerTags" title ="分类标签" ></uni-list-item>						
			
 
				 				<uni-list-item :rightText="formatDangerLevel(viewData.dangerLevel)" title ="经营范围"></uni-list-item>													
			
 
				 				<uni-list-item :rightText="viewData.dangerLocation" title ="发现位置" v-if="viewData.dangerLocation"></uni-list-item>													
			
 
				 				<view class="attach-list-item" v-if="viewData.attachList&&viewData.attachList.length>0">
			
@@ -54,6 +54,7 @@
 
				 					dangerCatId: 1,
			
 
				 					dangerCatTitle: '',
			
 
				 					dangerTitle: '',
			
 
				+					dangerTags:'',
			
 
				 					dangerCode: '',
			
 
				 					dangerLocation: '',
			
 
				 					dangerLevel: 2,
			
--- a/packageA/pages/danger/components/SupervisorList.vue
+++ b/packageA/pages/danger/components/SupervisorList.vue
@@ -0,0 +1,178 @@
 
				+<template>
			
 
				+	<uni-drawer ref="drawer" mode="left" :mask-click="false" width="100%" :maskClick='true'>
			
 
				+		<view class="head">
			
 
				+			<view class="name">{{dangerTitle}}</view>
			
 
				+			<view class="close" @click="close()">
			
 
				+				<uni-icons type="closeempty" size="24" color="#999" @click="close"></uni-icons>
			
 
				+			</view>
			
 
				+		</view>
			
 
				+		<scroll-view class="scroll-view" scroll-y="true">
			
 
				+			<uni-section title="隐患责任主体" type="line">
			
 
				+				<template v-slot:right>
			
 
				+					<view class="add" @click="create">
			
 
				+						<uni-icons type="plusempty" size="20" color="#ccc"></uni-icons>
			
 
				+					</view>
			
 
				+				</template>
			
 
				+			</uni-section>
			
 
				+			<view class="form-wrap" >
			
 
				+				<uni-forms ref="form" :model="form" :label-width="100">
			
 
				+					<uni-card padding="2px 0" margin="5px 0" v-for="(item,index) in form" :key="index">
			
 
				+						<uni-forms-item label ="责任部门">
			
 
				+							<uni-easyinput v-model="item.supervisorGroupName" placeholder="请输入责任部门" :clearable="false"  />
			
 
				+						</uni-forms-item>
			
 
				+						<uni-forms-item label="责任人员">
			
 
				+							<uni-easyinput v-model="item.supervisorName" placeholder="请输入责任人员" :clearable="false" />
			
 
				+						</uni-forms-item>					
			
 
				+						<uni-forms-item label="联系电话">
			
 
				+							<uni-easyinput v-model="item.supervisorPhone" type="number" placeholder="请输入联系电话" :clearable="false" />
			
 
				+						</uni-forms-item>	
			
 
				+						<view class="handle-container">
			
 
				+							<button class="save" type="primary" @click="onSubmit(item)">保存</button>
			
 
				+							<button class="del" type="default" @click="delItem(index,item)">删除</button>
			
 
				+						</view>																																																																														
			
 
				+					</uni-card>																																																																																																																																																																
			
 
				+				</uni-forms>
			
 
				+			</view>	
			
 
				+		</scroll-view>
			
 
				+	</uni-drawer>
			
 
				+</template>
			
 
				+
			
 
				+<script>
			
 
				+	import dangerApi from '@/api/danger.js'
			
 
				+	export default{
			
 
				+		name:"SupervisorList",
			
 
				+		data(){
			
 
				+			return{
			
 
				+				dangerId:undefined,
			
 
				+				dangerTitle:undefined,
			
 
				+				form:{},				
			
 
				+			}
			
 
				+		},
			
 
				+		methods:{
			
 
				+			resetForm(){
			
 
				+				this.form={}
			
 
				+			},
			
 
				+			create(){
			
 
				+				let item={
			
 
				+					dangerId:this.dangerId,
			
 
				+					supervisorGroupName: '',
			
 
				+					supervisorName: '',
			
 
				+					supervisorPhone: '',
			
 
				+				}
			
 
				+				this.form.push(item)
			
 
				+			},
			
 
				+			delItem(index,item){
			
 
				+				if(!item.supervisorId){
			
 
				+					this.form=this.form.filter((item,idx)=>index!==idx)
			
 
				+				}else{
			
 
				+					const self=this;
			
 
				+					uni.showModal({
			
 
				+						title: '提示',
			
 
				+						content: '是否确定删除',
			
 
				+						success: function (res) {
			
 
				+							if (res.confirm) {
			
 
				+								dangerApi.deleteSupervisorById(item.dangerId,item.supervisorId).then(()=>{
			
 
				+									uni.showToast({
			
 
				+										title:'删除成功！',
			
 
				+										icon:'none'
			
 
				+									})
			
 
				+									self.getDataList()
			
 
				+									self.$emit('success')
			
 
				+								})			
			
 
				+							}
			
 
				+						}
			
 
				+					});	
			
 
				+
			
 
				+				}
			
 
				+			},
			
 
				+			onSubmit(item){
			
 
				+				this.$refs.form.validate().then(res=>{
			
 
				+					let submitFx=item.supervisorId?dangerApi.updateSupervisor:dangerApi.createSupervisor
			
 
				+					submitFx({dangerId:this.dangerId,...item}).then(()=>{
			
 
				+						uni.showToast({
			
 
				+							icon:"none",
			
 
				+							title:"成功！！"
			
 
				+						})
			
 
				+						this.getDataList()
			
 
				+						this.$emit('success')
			
 
				+					})
			
 
				+
			
 
				+				}).catch(err =>{
			
 
				+					uni.showToast({
			
 
				+						icon:"none",
			
 
				+						title:"请检查填写信息！"
			
 
				+					})
			
 
				+				})
			
 
				+			},
			
 
				+			getDataList(){
			
 
				+				dangerApi.getSupervisorListById(this.dangerId).then((res)=>{					
			
 
				+					this.form=res.data||[]
			
 
				+				})
			
 
				+			},
			
 
				+			show(item){
			
 
				+				this.resetForm()
			
 
				+				this.dangerId=item.dangerId
			
 
				+				this.dangerTitle=item.dangerTitle
			
 
				+				this.getDataList()
			
 
				+				this.$refs.drawer.open()				
			
 
				+			},
			
 
				+			close(){
			
 
				+				this.$refs.drawer.close()
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+</script>
			
 
				+<style lang="scss" scoped>
			
 
				+	.head{
			
 
				+		height: 80rpx;		
			
 
				+		display: flex;
			
 
				+		justify-content: space-between;
			
 
				+		align-items: center;
			
 
				+		padding:0 10rpx;
			
 
				+		background-color: #f5f5f5;
			
 
				+		.name{
			
 
				+			font-size: 30rpx;
			
 
				+			color: #222222;
			
 
				+			font-weight: 500;
			
 
				+			line-height: 1;
			
 
				+			padding-left: 30rpx;
			
 
				+		}
			
 
				+		.close{
			
 
				+			height: 100%;
			
 
				+			display: flex;
			
 
				+			justify-content: center;
			
 
				+			align-items: center;
			
 
				+			padding:0 30rpx;
			
 
				+		}
			
 
				+	}
			
 
				+	.scroll-view {
			
 
				+		height: calc(100% - 130rpx);
			
 
				+		padding:0 20rpx 20rpx;
			
 
				+		box-sizing: border-box;
			
 
				+		.add{
			
 
				+			padding: 10rpx 30rpx;
			
 
				+		}
			
 
				+		.form-wrap{
			
 
				+			padding:40rpx 20rpx;
			
 
				+			.handle-container{
			
 
				+				display: flex;
			
 
				+				justify-content: center;
			
 
				+				align-items: center;
			
 
				+				padding-bottom: 10rpx;
			
 
				+				button{
			
 
				+					width: 160rpx;
			
 
				+					padding: 20rpx 16rpx;
			
 
				+					line-height: 1;
			
 
				+					font-size: 28rpx;
			
 
				+					&.save{
			
 
				+						background-color: #007aff;
			
 
				+					}
			
 
				+					&.del{
			
 
				+						background-color: #f56c6c;
			
 
				+						color: #fff;
			
 
				+					}
			
 
				+				}
			
 
				+			}
			
 
				+		}
			
 
				+	}
			
 
				+</style>
			
--- a/packageA/pages/danger/index.vue
+++ b/packageA/pages/danger/index.vue
@@ -25,7 +25,10 @@
 
				 							<view class="item-row space-between">
			
 
				 								<uni-tag :text="item.dangerCatTitle" custom-style="background-color: #ecf5ff; border-color: #d9ecff; color: #409eff;"></uni-tag>
			
 
				 								<uni-tag :inverted="true" :text="formatDangerLevel(item.dangerLevel)" type="success"></uni-tag>
			
 
				-							</view>						
			
 
				+							</view>	
			
 
				+							<view class="item-row space-between" v-if="item.dangerTags">
			
 
				+								<uni-tag :text="item.dangerTags" custom-style="background-color: #ecf5ff; border-color: #d9ecff; color: #409eff;"></uni-tag>
			
 
				+							</view>	
			
 
				 							<view class="item-row space-between">
			
 
				 								<view class="icon-item">
			
 
				 									<uni-icons type="location-filled" size="16" color="#999"></uni-icons>
			
@@ -45,15 +48,31 @@
 
				 								<view class="icon-item">
			
 
				 									<image class="icon" src="/static/images/admin_icon.png" mode="widthFix"></image>
			
 
				 									<text class="word">{{item.groupName}}</text>
			
 
				-								</view>							
			
 
				+								</view>	
			
 
				+								<view class="icon-item" @click.stop="showSuperVisor(item)">
			
 
				+									<image class="icon" src="/static/images/admin_icon.png" mode="widthFix"></image>
			
 
				+									<text>(责任单位)</text>
			
 
				+									<template>
			
 
				+										<view class="supervisor" v-if="item.supervisorGroupList" >	
			
 
				+											<view class="supervisor-item" v-for="(supervisor,supervisoridx) in formatsupervisorGroupList(item.supervisorGroupList)" :key="supervisoridx">
			
 
				+												<uni-tag :text="supervisor" custom-style="background-color: #ecf5ff; border-color: #d9ecff; color: #409eff;"></uni-tag>
			
 
				+											</view>
			
 
				+										</view>
			
 
				+										<view class="supervisor" v-else>
			
 
				+											<uni-icons type="plusempty" size="20" color="#ccc"></uni-icons>
			
 
				+										</view>
			
 
				+									</template>
			
 
				+
			
 
				+								</view>														
			
 
				 							</view>
			
 
				 						</view>
			
 
				 					</uni-swipe-action-item>
			
 
				 				</uni-card>
			
 
				 			</uni-swipe-action>
			
 
				 		</view>
			
 
				-		<Create ref="danger" @success="search"></Create>	
			
 
				+		<Create ref="danger" @success="search" :ent="entCats" :danger="dangerCats"></Create>	
			
 
				 		<Detail ref="detail"></Detail>
			
 
				+		<SupervisorList ref="SupervisorList" @success="search"></SupervisorList>		
			
 
				 	</view>
			
 
				 </template>
			
 
				 
			
@@ -61,11 +80,13 @@
 
				 	import industryApi from '@/api/industry.js'
			
 
				 	import dangerApi from '@/api/danger.js'
			
 
				 	import Create from './components/Create.vue'
			
 
				-	import Detail from './components/Detail.vue'				
			
 
				+	import Detail from './components/Detail.vue'	
			
 
				+	import SupervisorList from './components/SupervisorList.vue'						
			
 
				 	export default {
			
 
				 		components:{
			
 
				 			Create,
			
 
				-			Detail
			
 
				+			Detail,
			
 
				+			SupervisorList
			
 
				 		},
			
 
				 		data() {
			
 
				 			return {
			
@@ -73,7 +94,9 @@
 
				 				page:1,
			
 
				 				limit:10,
			
 
				 				total:0,	
			
 
				-				keywords: ""
			
 
				+				keywords: "",
			
 
				+				entCats:uni.getStorageSync('entCats')||[],
			
 
				+				dangerCats:uni.getStorageSync('dangerCats')||[]
			
 
				 			}
			
 
				 		},
			
 
				 		onShow() {
			
@@ -85,9 +108,11 @@
 
				 				if(!uni.getStorageSync('dangerCats')){
			
 
				 					industryApi.getByList().then((res)=>{
			
 
				 						uni.setStorageSync('entCats',res.data)
			
 
				+						this.entCats=res.data
			
 
				 					})
			
 
				 					dangerApi.getCatByList().then((res)=>{
			
 
				 						uni.setStorageSync('dangerCats',res.data)
			
 
				+						this.dangerCats=res.data
			
 
				 					})					
			
 
				 				}
			
 
				 			},
			
@@ -102,6 +127,7 @@
 
				 					keywords:this.keywords
			
 
				 				}).then((res)=>{
			
 
				 					this.items=this.items.concat(res.data)
			
 
				+					this.total=res.total
			
 
				 				})
			
 
				 			},
			
 
				 			handle({type,item}){
			
@@ -128,6 +154,9 @@
 
				 					this.$refs.danger.show({type,item})										
			
 
				 				}
			
 
				 			},
			
 
				+			showSuperVisor(item){
			
 
				+				this.$refs.SupervisorList.show(item)
			
 
				+			},
			
 
				 			formatDangerLevel(val){
			
 
				 				let dangerLevelOptions=['末知','重大','较大','一般','较小'];
			
 
				 				return dangerLevelOptions[val]
			
@@ -136,6 +165,9 @@
 
				 				let status=['未整改','已整改'];
			
 
				 				return status[val]
			
 
				 			},
			
 
				+			formatsupervisorGroupList(val){
			
 
				+				return val.split(',')
			
 
				+			},			
			
 
				 			resetFilter(){
			
 
				 				this.page = 1
			
 
				 				this.limit = 10
			
@@ -144,7 +176,7 @@
 
				 			}
			
 
				 		},
			
 
				 		onReachBottom() {
			
 
				-			if(this.total>this.size*this.page){
			
 
				+			if(this.total>this.limit*this.page){
			
 
				 				this.page++
			
 
				 				this.getData()				
			
 
				 			}
			
@@ -262,6 +294,15 @@
 
				 					margin-left: 8rpx;
			
 
				 					font-size: 24rpx;
			
 
				 				}
			
 
				+				.supervisor{
			
 
				+					width: 500rpx;
			
 
				+					flex-shrink: 0;
			
 
				+					display: flex;
			
 
				+					flex-wrap: wrap;
			
 
				+					.supervisor-item{
			
 
				+						margin: 4rpx;
			
 
				+					}
			
 
				+				}
			
 
				 			}
			
 
				 		}
			
 
				 	}
			
--- a/packageA/pages/disaster/components/CreateDisaster.vue
+++ b/packageA/pages/disaster/components/CreateDisaster.vue
@@ -3,8 +3,8 @@
 
				 		<scroll-view class="scroll-view" scroll-y="true">
			
 
				 			<uni-section :title="(type==='edit'?'编辑':'新增')+'地质灾害点'" type="line"></uni-section>
			
 
				 			<view class="form-wrap" >
			
 
				-				<uni-forms ref="form" label-position="top" :rules="rules" :model="form">	
			
 
				-						<uni-forms-item label="地质灾害点名称" :label-width='200' required>
			
 
				+				<uni-forms ref="form" label-position="top" :rules="rules" :model="form" label-width='300px'>	
			
 
				+						<uni-forms-item label="地质灾害点名称"  required>
			
 
				 							<uni-easyinput v-model="form.dlName" placeholder="请输入地质灾害点名称" :clearable="false" />
			
 
				 						</uni-forms-item>													
			
 
				 						<uni-forms-item label="地理位置" name="dlAddress" required>
			
@@ -21,7 +21,31 @@
 
				 						</uni-forms-item>						
			
 
				 						<uni-forms-item label="威胁房屋" >
			
 
				 							<uni-easyinput v-model="form.dlHouseNum"  placeholder="请输入威胁房屋"></uni-easyinput>
			
 
				-						</uni-forms-item>		
			
 
				+						</uni-forms-item>	
			
 
				+						<uni-card  padding="0" margin="5px 0">
			
 
				+							<uni-forms-item label="巡检责任人" >
			
 
				+								<uni-easyinput v-model="form.inspectorName"  placeholder="请输入巡检责任人"></uni-easyinput>
			
 
				+							</uni-forms-item>	
			
 
				+							<uni-forms-item label="巡检责任人电话" >
			
 
				+								<uni-easyinput v-model="form.inspectorPhone" type="number"  placeholder="请输入巡检责任人电话"></uni-easyinput>
			
 
				+							</uni-forms-item>
			
 
				+						</uni-card>
			
 
				+						<uni-card  padding="0" margin="5px 0">
			
 
				+							<uni-forms-item label="行政责任人" >
			
 
				+								<uni-easyinput v-model="form.administratorName"  placeholder="请输入行政责任人"></uni-easyinput>
			
 
				+							</uni-forms-item>	
			
 
				+							<uni-forms-item label="行政责任人电话" >
			
 
				+								<uni-easyinput v-model="form.administratorPhone" type="number"  placeholder="请输入行政责任人电话"></uni-easyinput>
			
 
				+							</uni-forms-item>
			
 
				+						</uni-card>						
			
 
				+						<uni-card  padding="0" margin="5px 0">
			
 
				+							<uni-forms-item label="技术责任人" >
			
 
				+								<uni-easyinput v-model="form.technicianName"  placeholder="请输入技术责任人"></uni-easyinput>
			
 
				+							</uni-forms-item>	
			
 
				+							<uni-forms-item label="技术责任人电话" >
			
 
				+								<uni-easyinput v-model="form.technicianPhone" type="number"  placeholder="请输入技术责任人电话"></uni-easyinput>
			
 
				+							</uni-forms-item>
			
 
				+						</uni-card>													
			
 
				 						<uni-forms-item label="备注说明">
			
 
				 							<uni-easyinput type="textarea" :maxlength="500" v-model="form.remark" placeholder="请输入备注说明" autoHeight ></uni-easyinput>
			
 
				 							<view class="word-limit">{{form.remark.length||0}}/500</view>
			
@@ -47,7 +71,8 @@
 
				 				return accountInfo
			
 
				 			},			
			
 
				 			disasterLevels(){
			
 
				-				let disasterLevels=uni.getStorageSync('disasterLevels')
			
 
				+				let disasterLevels=this.levels
			
 
				+				//uni.getStorageSync('disasterLevels')
			
 
				 				if(!disasterLevels)return []
			
 
				 				return disasterLevels.map(item=>{
			
 
				 					return{
			
@@ -57,7 +82,8 @@
 
				 				})
			
 
				 			},	
			
 
				 			disasterCats(){
			
 
				-				let disasterCats=uni.getStorageSync('disasterCats')
			
 
				+				let disasterCats=this.cats
			
 
				+				//uni.getStorageSync('disasterCats')
			
 
				 				if(!disasterCats)return []
			
 
				 				return disasterCats.map(item=>{
			
 
				 					return{
			
@@ -67,6 +93,16 @@
 
				 				})
			
 
				 			}
			
 
				 		},
			
 
				+		props:{
			
 
				+			cats:{
			
 
				+				type:Array,
			
 
				+				default:()=>[]
			
 
				+			},
			
 
				+			levels:{
			
 
				+				type:Array,
			
 
				+				default:()=>[]
			
 
				+			}
			
 
				+		},
			
 
				 		data(){
			
 
				 			return{
			
 
				 				type:undefined,
			
@@ -100,6 +136,12 @@
 
				 					dlLevelId: 1,
			
 
				 					dlPeopleNum: 0,
			
 
				 					dlHouseNum: 0,
			
 
				+					inspectorName: '',
			
 
				+					inspectorPhone: '',
			
 
				+					administratorName: '',
			
 
				+					administratorPhone: '',
			
 
				+					technicianName: '',
			
 
				+					technicianPhone: '',
			
 
				 					remark: ''
			
 
				 				}
			
 
				 			}
			
@@ -116,6 +158,12 @@
 
				 					dlLevelId: 1,
			
 
				 					dlPeopleNum: 0,
			
 
				 					dlHouseNum: 0,
			
 
				+					inspectorName: '',
			
 
				+					inspectorPhone: '',
			
 
				+					administratorName: '',
			
 
				+					administratorPhone: '',
			
 
				+					technicianName: '',
			
 
				+					technicianPhone: '',
			
 
				 					remark: ''
			
 
				 				}
			
 
				 			},
			
--- a/packageA/pages/disaster/components/CreateReservoir.vue
+++ b/packageA/pages/disaster/components/CreateReservoir.vue
@@ -3,23 +3,47 @@
 
				 		<scroll-view class="scroll-view" scroll-y="true">
			
 
				 			<uni-section :title="(type==='edit'?'编辑':'新增')+'水库淤堤坝'" type="line"></uni-section>
			
 
				 			<view class="form-wrap" >
			
 
				-				<uni-forms ref="form" label-position="top" :rules="rules" :model="form" :label-width='200' >	
			
 
				-						<uni-forms-item label="水库名称" name="rdName" required>
			
 
				-							<uni-easyinput v-model="form.rdName" placeholder="请输入水库名称" :clearable="false" />
			
 
				+				<uni-forms ref="form" label-position="top" :rules="rules" :model="form" label-width='300px' >	
			
 
				+					<uni-forms-item label="水库名称" name="rdName" required>
			
 
				+						<uni-easyinput v-model="form.rdName" placeholder="请输入水库名称" :clearable="false" />
			
 
				+					</uni-forms-item>	
			
 
				+					<uni-forms-item label="巡查责任人" name="respName" required>
			
 
				+						<uni-easyinput v-model="form.respName"  placeholder="请输入巡查责任人" :clearable="false"></uni-easyinput>
			
 
				+					</uni-forms-item>																		
			
 
				+					<uni-forms-item label="地址" >
			
 
				+						<uni-easyinput v-model="form.rdAddress" placeholder="请输入地址" :clearable="false" />
			
 
				+					</uni-forms-item>							
			
 
				+					<uni-forms-item label="联系电话" >
			
 
				+						<uni-easyinput v-model="form.respPhone"  placeholder="请输入联系电话" :clearable="false"></uni-easyinput>
			
 
				+					</uni-forms-item>		
			
 
				+					<uni-card  padding="0" margin="5px 0">
			
 
				+						<uni-forms-item label="巡检责任人" >
			
 
				+							<uni-easyinput v-model="form.inspectorName"  placeholder="请输入巡检责任人"></uni-easyinput>
			
 
				 						</uni-forms-item>	
			
 
				-						<uni-forms-item label="巡查责任人" name="respName" required>
			
 
				-							<uni-easyinput v-model="form.respName"  placeholder="请输入巡查责任人" :clearable="false"></uni-easyinput>
			
 
				-						</uni-forms-item>																		
			
 
				-						<uni-forms-item label="地址" >
			
 
				-							<uni-easyinput v-model="form.rdAddress" placeholder="请输入地址" :clearable="false" />
			
 
				-						</uni-forms-item>							
			
 
				-						<uni-forms-item label="联系电话" >
			
 
				-							<uni-easyinput v-model="form.respPhone"  placeholder="请输入联系电话" :clearable="false"></uni-easyinput>
			
 
				-						</uni-forms-item>							
			
 
				-						<uni-forms-item label="备注说明">
			
 
				-							<uni-easyinput type="textarea" :maxlength="500" v-model="form.remark" placeholder="请输入备注说明" autoHeight ></uni-easyinput>
			
 
				-							<view class="word-limit">{{form.remark.length||0}}/500</view>
			
 
				+						<uni-forms-item label="巡检责任人电话" >
			
 
				+							<uni-easyinput v-model="form.inspectorPhone" type="number"  placeholder="请输入巡检责任人电话"></uni-easyinput>
			
 
				 						</uni-forms-item>
			
 
				+					</uni-card>
			
 
				+					<uni-card  padding="0" margin="5px 0">
			
 
				+						<uni-forms-item label="行政责任人" >
			
 
				+							<uni-easyinput v-model="form.administratorName"  placeholder="请输入行政责任人"></uni-easyinput>
			
 
				+						</uni-forms-item>	
			
 
				+						<uni-forms-item label="行政责任人电话" >
			
 
				+							<uni-easyinput v-model="form.administratorPhone" type="number"  placeholder="请输入行政责任人电话"></uni-easyinput>
			
 
				+						</uni-forms-item>
			
 
				+					</uni-card>						
			
 
				+					<uni-card  padding="0" margin="5px 0">
			
 
				+						<uni-forms-item label="技术责任人" >
			
 
				+							<uni-easyinput v-model="form.technicianName"  placeholder="请输入技术责任人"></uni-easyinput>
			
 
				+						</uni-forms-item>	
			
 
				+						<uni-forms-item label="技术责任人电话" >
			
 
				+							<uni-easyinput v-model="form.technicianPhone" type="number"  placeholder="请输入技术责任人电话"></uni-easyinput>
			
 
				+						</uni-forms-item>
			
 
				+					</uni-card>													
			
 
				+					<uni-forms-item label="备注说明">
			
 
				+						<uni-easyinput type="textarea" :maxlength="500" v-model="form.remark" placeholder="请输入备注说明" autoHeight ></uni-easyinput>
			
 
				+						<view class="word-limit">{{form.remark.length||0}}/500</view>
			
 
				+					</uni-forms-item>
			
 
				 				</uni-forms>
			
 
				 				<view class="handle-container">
			
 
				 					<button class="save" type="primary" @click="onSubmit">保存</button>
			
@@ -41,7 +65,8 @@
 
				 				return accountInfo
			
 
				 			},			
			
 
				 			disasterLevels(){
			
 
				-				let disasterLevels=uni.getStorageSync('disasterLevels')
			
 
				+				let disasterLevels=this.levels
			
 
				+				//uni.getStorageSync('disasterLevels')
			
 
				 				if(!disasterLevels)return []
			
 
				 				return disasterLevels.map(item=>{
			
 
				 					return{
			
@@ -51,7 +76,7 @@
 
				 				})
			
 
				 			},	
			
 
				 			disasterCats(){
			
 
				-				let disasterCats=uni.getStorageSync('disasterCats')
			
 
				+				let disasterCats=this.cats
			
 
				 				if(!disasterCats)return []
			
 
				 				return disasterCats.map(item=>{
			
 
				 					return{
			
@@ -61,6 +86,16 @@
 
				 				})
			
 
				 			}
			
 
				 		},
			
 
				+		props:{
			
 
				+			cats:{
			
 
				+				type:Array,
			
 
				+				default:()=>[]
			
 
				+			},
			
 
				+			levels:{
			
 
				+				type:Array,
			
 
				+				default:()=>[]
			
 
				+			}
			
 
				+		},
			
 
				 		data(){
			
 
				 			return{
			
 
				 				type:undefined,
			
@@ -92,6 +127,12 @@
 
				 					rdAddress: '',
			
 
				 					respName: '',
			
 
				 					respPhone: '',
			
 
				+					inspectorName: '',
			
 
				+					inspectorPhone: '',
			
 
				+					administratorName: '',
			
 
				+					administratorPhone: '',
			
 
				+					technicianName: '',
			
 
				+					technicianPhone: '',	
			
 
				 					remark: ''
			
 
				 				}
			
 
				 			}
			
@@ -106,6 +147,12 @@
 
				 					rdAddress: '',
			
 
				 					respName: '',
			
 
				 					respPhone: '',
			
 
				+					inspectorName: '',
			
 
				+					inspectorPhone: '',
			
 
				+					administratorName: '',
			
 
				+					administratorPhone: '',
			
 
				+					technicianName: '',
			
 
				+					technicianPhone: '',
			
 
				 					remark: ''
			
 
				 				}
			
 
				 			},
			
--- a/packageA/pages/disaster/components/Detail.vue
+++ b/packageA/pages/disaster/components/Detail.vue
@@ -13,7 +13,25 @@
 
				 					<uni-list-item title="灾害类别" :rightText="viewData.disasterCatTitle"></uni-list-item>
			
 
				 					<uni-list-item title="规模等级" :rightText="viewData.disasterLevelTitle"></uni-list-item>
			
 
				 					<uni-list-item title="威胁人数" :rightText="viewData.dlPeopleNum"></uni-list-item>
			
 
				-					<uni-list-item title="威胁房屋" :rightText="viewData.dlHouseNum"></uni-list-item>		
			
 
				+					<uni-list-item title="威胁房屋" :rightText="viewData.dlHouseNum"></uni-list-item>							
			
 
				+					<uni-list-item title="巡检">
			
 
				+						<template v-slot:footer>
			
 
				+							<text v-if="viewData.inspectorName">{{viewData.inspectorName}}}</text>
			
 
				+							<text v-if="viewData.inspectorPhone">({{viewData.inspectorPhone}})</text>
			
 
				+						</template>
			
 
				+					</uni-list-item>
			
 
				+					<uni-list-item title="行政">
			
 
				+						<template v-slot:footer>
			
 
				+							<text v-if="viewData.administratorName">{{viewData.administratorName}}}</text>
			
 
				+							<text v-if="viewData.administratorPhone">({{viewData.administratorPhone}})</text>
			
 
				+						</template>
			
 
				+					</uni-list-item>
			
 
				+					<uni-list-item title="技术">
			
 
				+						<template v-slot:footer>
			
 
				+							<text v-if="viewData.technicianName">{{viewData.technicianName}}}</text>
			
 
				+							<text v-if="viewData.technicianPhone">({{viewData.technicianPhone}})</text>
			
 
				+						</template>
			
 
				+					</uni-list-item>						
			
 
				 					<uni-list-item title="备注" :note="viewData.remark"></uni-list-item>														
			
 
				 				</uni-list>	
			
 
				 				<uni-list v-if="type==='rd'">
			
@@ -22,6 +40,24 @@
 
				 					<uni-list-item title="地址" :rightText="viewData.rdAddress"></uni-list-item>
			
 
				 					<uni-list-item title="责任人" :rightText="viewData.respName"></uni-list-item>
			
 
				 					<uni-list-item title="责任人电话" :rightText="viewData.respPhone"></uni-list-item>
			
 
				+					<uni-list-item title="巡检">
			
 
				+						<template v-slot:footer>
			
 
				+							<text v-if="viewData.inspectorName">{{viewData.inspectorName}}}</text>
			
 
				+							<text v-if="viewData.inspectorPhone">({{viewData.inspectorPhone}})</text>
			
 
				+						</template>
			
 
				+					</uni-list-item>
			
 
				+					<uni-list-item title="行政">
			
 
				+						<template v-slot:footer>
			
 
				+							<text v-if="viewData.administratorName">{{viewData.administratorName}}}</text>
			
 
				+							<text v-if="viewData.administratorPhone">({{viewData.administratorPhone}})</text>
			
 
				+						</template>
			
 
				+					</uni-list-item>
			
 
				+					<uni-list-item title="技术">
			
 
				+						<template v-slot:footer>
			
 
				+							<text v-if="viewData.technicianName">{{viewData.technicianName}}}</text>
			
 
				+							<text v-if="viewData.technicianPhone">({{viewData.technicianPhone}})</text>
			
 
				+						</template>
			
 
				+					</uni-list-item>
			
 
				 					<uni-list-item title="描述" :note="viewData.remark"></uni-list-item>															
			
 
				 				</uni-list>	
			
 
				 				<view class="camerasbox">
			
@@ -64,6 +100,12 @@
 
				 					dlLevelId: 1,
			
 
				 					dlPeopleNum: 0,
			
 
				 					dlHouseNum: 0,
			
 
				+					inspectorName: '',
			
 
				+					inspectorPhone: '',
			
 
				+					administratorName: '',
			
 
				+					administratorPhone: '',
			
 
				+					technicianName: '',
			
 
				+					technicianPhone: '',
			
 
				 					remark: '',
			
 
				 					//水库淤堤坝详情
			
 
				 					rdId: 0,
			
--- a/packageA/pages/disaster/index.vue
+++ b/packageA/pages/disaster/index.vue
@@ -24,7 +24,7 @@
 
				 						<view class="item" @click="handle({type:'detail',item})">
			
 
				 							<view class="title">
			
 
				 								<view class="name">{{item.dlName}}</view>
			
 
				-								<view class="camera" @click.stop="showCamera">
			
 
				+								<view class="camera">
			
 
				 									<uni-icons v-if='item.cameraNum>0' type="videocam-filled" size="20" color="#007aff" ></uni-icons>
			
 
				 								</view>								
			
 
				 							</view>
			
@@ -64,7 +64,7 @@
 
				 						<view class="item" @click="handle({type:'detail',item})">
			
 
				 							<view class="title">
			
 
				 								<view class="name">{{item.rdName}}</view>	
			
 
				-								<view class="camera" @click.stop="showCamera">
			
 
				+								<view class="camera">
			
 
				 									<uni-icons v-if='item.cameraNum>0' type="videocam-filled" size="20" color="#007aff" ></uni-icons>
			
 
				 								</view>																	
			
 
				 							</view>
			
@@ -95,8 +95,8 @@
 
				 				</uni-card>
			
 
				 			</uni-swipe-action>
			
 
				 		</view>
			
 
				-		<CreateDisaster ref="disaster" @success="getData"></CreateDisaster>
			
 
				-		<CreateReservoir ref="reservoir" @success="getData"></CreateReservoir>		
			
 
				+		<CreateDisaster ref="disaster" @success="getData" :cats="disasterCats" :levels="disasterLevels"></CreateDisaster>
			
 
				+		<CreateReservoir ref="reservoir" @success="getData" :cats="disasterCats" :levels="disasterLevels"></CreateReservoir>		
			
 
				 		<Detail ref="detail" :type="tabIdx===0?'dl':'rd'" ></Detail>
			
 
				 	</view>
			
 
				 </template>
			
@@ -117,7 +117,9 @@
 
				 				tabIdx:0,			
			
 
				 				tabs:['地质灾害点','水库淤堤坝'],
			
 
				 				items:[],
			
 
				-				keywords: ""
			
 
				+				keywords: "",
			
 
				+				disasterLevels:[],
			
 
				+				disasterCats:[]
			
 
				 			}
			
 
				 		},
			
 
				 		onShow() {
			
@@ -135,10 +137,18 @@
 
				 				if(!uni.getStorageSync('disasterLevels')){
			
 
				 					disasterApi.getDisasterLevelByList().then((res)=>{
			
 
				 						uni.setStorageSync('disasterLevels',res.data)
			
 
				+						this.disasterLevels=res.data
			
 
				 					})
			
 
				+				}else{
			
 
				+					this.disasterLevels=uni.getStorageSync('disasterLevels')
			
 
				+				}
			
 
				+				if(!uni.getStorageSync('disasterCats')){
			
 
				 					disasterApi.getDisasterCatByList().then((res)=>{
			
 
				 						uni.setStorageSync('disasterCats',res.data)
			
 
				+						this.disasterCats=res.data					
			
 
				 					})
			
 
				+				}else{
			
 
				+					this.disasterCats=uni.getStorageSync('disasterCats')
			
 
				 				}
			
 
				 			},
			
 
				 			search(){
			
@@ -150,9 +160,6 @@
 
				 					this.items=res.data
			
 
				 				})
			
 
				 			},
			
 
				-			showCamera(item){
			
 
				-				
			
 
				-			},
			
 
				 			handle({type,item}){
			
 
				 				if(type==='detail'){					
			
 
				 					this.$refs.detail.show(item)
			
--- a/packageA/pages/goods/components/CreateBound.vue
+++ b/packageA/pages/goods/components/CreateBound.vue
@@ -48,14 +48,23 @@
 
				 								</uni-list-item>
			
 
				 							</uni-list>
			
 
				 						</uni-card>
			
 
				-						<uni-forms-item label="出库人员" name="accountId" required>
			
 
				-							<uni-data-select  v-model="form.accountId" :localdata="userList" placeholder="请选择出库人员" :clear="false"></uni-data-select>
			
 
				-						</uni-forms-item>
			
 
				 						<uni-forms-item label="出库类型" name="outboundType" v-if="type==='out'" required>
			
 
				 							<uni-data-select  v-model="form.outboundType" :localdata="outboundTypeList" placeholder="请选择出库类型" :clear="false"></uni-data-select>
			
 
				 						</uni-forms-item>
			
 
				-						<uni-forms-item label="出库地点" name="outboundLocation">
			
 
				-							<uni-easyinput v-model="form.outboundLocation" placeholder="请输入存放位置" :clearable="false" />
			
 
				+						<uni-forms-item label="出库人员" name="accountId" required>
			
 
				+							<uni-data-select  v-model="form.accountId" :localdata="userList" placeholder="请选择出库人员" :clear="false"></uni-data-select>
			
 
				+						</uni-forms-item>						
			
 
				+						<uni-forms-item label="物资名称" label-position="left" required>
			
 
				+							<uni-easyinput v-model="form.goodsTitle" placeholder="请输物资名称" :clearable="false" />
			
 
				+						</uni-forms-item>	
			
 
				+						<uni-forms-item label="出库数量" label-position="left" required>
			
 
				+							<uni-easyinput v-model="form.qty" placeholder="请输出库数量" :clearable="false" />
			
 
				+						</uni-forms-item>	
			
 
				+						<uni-forms-item label="出库地点">
			
 
				+							<uni-easyinput type="textarea" :maxlength="100"
			
 
				+							 v-model="form.outboundLocation" autoHeight 
			
 
				+							placeholder="请输入出库地点"></uni-easyinput>
			
 
				+							<view class="word-limit">{{form.outboundLocation.length||0}}/100</view>
			
 
				 						</uni-forms-item>
			
 
				 					</view>
			
 
				 					<uni-forms-item label="备注">
			
@@ -86,7 +95,7 @@
 
				 				return accountInfo.ocId
			
 
				 			},
			
 
				 			goodsCats(){
			
 
				-				let goodsCats=uni.getStorageSync('goodsCats')
			
 
				+				let goodsCats=this.cats
			
 
				 				if(!goodsCats)return []
			
 
				 				return goodsCats.map(item=>{
			
 
				 					return{
			
@@ -107,6 +116,12 @@
 
				 				return userList
			
 
				 			}						
			
 
				 		},
			
 
				+		props:{
			
 
				+			cats:{
			
 
				+				type:Array,
			
 
				+				default:()=>[]
			
 
				+			}
			
 
				+		},
			
 
				 		data(){
			
 
				 			return{
			
 
				 				type:undefined,
			
--- a/packageA/pages/goods/components/RecordEdit.vue
+++ b/packageA/pages/goods/components/RecordEdit.vue
@@ -86,7 +86,7 @@
 
				 				return accountInfo.ocId
			
 
				 			},
			
 
				 			goodsCats(){
			
 
				-				let goodsCats=uni.getStorageSync('goodsCats')
			
 
				+				let goodsCats=this.cats;
			
 
				 				if(!goodsCats)return []
			
 
				 				return goodsCats.map(item=>{
			
 
				 					return{
			
@@ -107,6 +107,12 @@
 
				 				return userList
			
 
				 			}						
			
 
				 		},
			
 
				+		props:{
			
 
				+			cats:{
			
 
				+				type:Array,
			
 
				+				default:()=>[]
			
 
				+			}
			
 
				+		},
			
 
				 		data(){
			
 
				 			return{
			
 
				 				type:undefined,
			
--- a/packageA/pages/goods/index.vue
+++ b/packageA/pages/goods/index.vue
@@ -31,13 +31,12 @@
 
				 				</view>			
			
 
				 			</uni-card>
			
 
				 		</view>
			
 
				-		<CreateBound ref="bound" @success="onBoundSuccess"></CreateBound>
			
 
				+		<CreateBound ref="bound" @success="onBoundSuccess" :cats="goodsCats"></CreateBound>
			
 
				 	</view>
			
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				 	import CreateBound from './components/CreateBound.vue'
			
 
				-	
			
 
				 	import goodsApi from '@/api/goods.js'	
			
 
				 	export default {
			
 
				 		components:{
			
@@ -53,6 +52,7 @@
 
				 				tabIdx:0,			
			
 
				 				tabs:['行业物质','镇办物资'],
			
 
				 				items:[],
			
 
				+				goodsCats:uni.getStorageSync('goodsCats')||[],
			
 
				 				keywords: ""
			
 
				 			}
			
 
				 		},
			
@@ -71,6 +71,7 @@
 
				 				if(!uni.getStorageSync('goodsCats')){
			
 
				 					goodsApi.getCatByList().then((res)=>{
			
 
				 						uni.setStorageSync('goodsCats',res.data)
			
 
				+						this.goodsCats=res.data
			
 
				 					})
			
 
				 				}
			
 
				 			},
			
--- a/packageA/pages/goods/record.vue
+++ b/packageA/pages/goods/record.vue
@@ -20,8 +20,13 @@
 
				 									<uni-tag :text="`${item.qty}`" custom-style="background-color: #ecf5ff; border-color: #d9ecff; color: #409eff;"></uni-tag>
			
 
				 								</view>
			
 
				 							</view>
			
 
				-							<view class="tagbox">
			
 
				-								<uni-tag :text="item.goodsCatTitle" custom-style="background-color: #ecf5ff; border-color: #d9ecff; color: #409eff;"></uni-tag>
			
 
				+							<view class="tagbox">								
			
 
				+								<uni-tag :text="item.goodsTitle" type="success"></uni-tag>
			
 
				+								<uni-tag :text="item.goodsCatTitle" custom-style="background-color: #ecf5ff; border-color: #d9ecff; color: #409eff;"></uni-tag>								
			
 
				+							</view>
			
 
				+							<view class="location">
			
 
				+								<uni-icons type="location-filled" size="15" color="#999"></uni-icons>
			
 
				+								<text class="word">{{item.location}}</text>
			
 
				 							</view>
			
 
				 							<view class="bottom">
			
 
				 								<view class="time">{{item.time}}</view>
			
@@ -32,7 +37,7 @@
 
				 			</uni-swipe-action>
			
 
				 		</view>
			
 
				 		<RecordDetail ref="detail"></RecordDetail>
			
 
				-		<RecordEdit ref="edit" @success="reload"></RecordEdit>		
			
 
				+		<RecordEdit ref="edit" @success="reload" :cats="goodsCats"></RecordEdit>		
			
 
				 	</view>
			
 
				 </template>
			
 
				 
			
@@ -51,6 +56,7 @@
 
				 				tabIdx:0,
			
 
				 				tabs:['入库记录','出库记录'],	
			
 
				 				items:[],
			
 
				+				goodsCats:uni.getStorageSync('goodsCats')||[],
			
 
				 				goodsType:undefined,
			
 
				 				page:1,	
			
 
				 				limit:10,
			
@@ -76,6 +82,14 @@
 
				 				this.resetFilter()
			
 
				 				this.getData()
			
 
				 			},
			
 
				+			init(){
			
 
				+				if(!uni.getStorageSync('goodsCats')){
			
 
				+					goodsApi.getCatByList().then((res)=>{
			
 
				+						uni.setStorageSync('goodsCats',res.data)
			
 
				+						this.goodsCats=res.data
			
 
				+					})
			
 
				+				}
			
 
				+			},
			
 
				 			getData(){
			
 
				 				const getByPage=this.tabIdx===0?goodsApi.getInboundByPage:goodsApi.getOutboundByPage
			
 
				 				const items=JSON.parse(JSON.stringify(this.items))
			
@@ -88,7 +102,7 @@
 
				 						return{
			
 
				 							...item,
			
 
				 							time:this.tabIdx===0?item.inboundTime:item.outboundTime,
			
 
				-							
			
 
				+							location:this.tabIdx===0?item.inboundLocation:item.outboundLocation,
			
 
				 						}
			
 
				 					})
			
 
				 					this.items=items.concat(data)
			
@@ -171,6 +185,13 @@
 
				 				font-size: 24rpx;
			
 
				 				color: #666666;
			
 
				 				padding: 14rpx 0;
			
 
				+				display: flex;
			
 
				+				justify-content: space-between;
			
 
				+				align-items: center;
			
 
				+			}
			
 
				+			.location{
			
 
				+				display: flex;
			
 
				+				align-items: center;
			
 
				 			}
			
 
				 			.bottom{
			
 
				 				.time{
			
--- a/packageA/pages/industry/components/Create.vue
+++ b/packageA/pages/industry/components/Create.vue
@@ -83,7 +83,7 @@
 
				 		name:"CreateIndustry",
			
 
				 		computed:{
			
 
				 			entCats(){
			
 
				-				let entCats=uni.getStorageSync('entCats')
			
 
				+				let entCats=this.cats
			
 
				 				if(!entCats)return []
			
 
				 				return entCats.map(item=>{
			
 
				 					return{
			
@@ -93,6 +93,12 @@
 
				 				})
			
 
				 			}						
			
 
				 		},
			
 
				+		props:{
			
 
				+			cats:{
			
 
				+				type:Array,
			
 
				+				default:()=>[]
			
 
				+			}
			
 
				+		},
			
 
				 		data(){
			
 
				 			return{
			
 
				 				type:undefined,
			
--- a/packageA/pages/industry/index.vue
+++ b/packageA/pages/industry/index.vue
@@ -65,7 +65,7 @@
 
				 				</uni-card>
			
 
				 			</uni-swipe-action>
			
 
				 		</view>
			
 
				-		<Create ref="industry" @success="search"></Create>	
			
 
				+		<Create ref="industry" @success="search" :cats="entCats"></Create>	
			
 
				 		<Detail ref="detail"></Detail>
			
 
				 	</view>
			
 
				 </template>
			
@@ -85,7 +85,8 @@
 
				 				page:1,
			
 
				 				limit:10,
			
 
				 				total:0,	
			
 
				-				keywords: ""
			
 
				+				keywords: "",
			
 
				+				entCats:[]
			
 
				 			}
			
 
				 		},
			
 
				 		onShow() {
			
@@ -97,7 +98,10 @@
 
				 				if(!uni.getStorageSync('entCats')){
			
 
				 					industryApi.getCatByList().then((res)=>{
			
 
				 						uni.setStorageSync('entCats',res.data)
			
 
				+						this.entCats=res.data
			
 
				 					})
			
 
				+				}else{
			
 
				+					this.entCats=uni.getStorageSync('entCats')
			
 
				 				}
			
 
				 			},
			
 
				 			search(){
			
--- a/packageA/pages/team/components/TeamForm.vue
+++ b/packageA/pages/team/components/TeamForm.vue
@@ -38,7 +38,7 @@
 
				 		name:"TeamForm",
			
 
				 		computed:{
			
 
				 			teamCats(){
			
 
				-				let teamCats=uni.getStorageSync('teamCat')
			
 
				+				let teamCats=this.cats;
			
 
				 				if(!teamCats) return[];
			
 
				 				return teamCats.map(item=>{
			
 
				 					return{
			
@@ -48,6 +48,12 @@
 
				 				})
			
 
				 			}			
			
 
				 		},
			
 
				+		props:{
			
 
				+			cats:{
			
 
				+				type:Array,
			
 
				+				default:()=>[]
			
 
				+			}
			
 
				+		},
			
 
				 		data(){
			
 
				 			return{
			
 
				 				type:undefined,
			
--- a/packageA/pages/team/index.vue
+++ b/packageA/pages/team/index.vue
@@ -81,7 +81,7 @@
 
				 			</uni-card>
			
 
				 		</view>
			
 
				 		<MemberForm ref="member" @success="getData"></MemberForm>
			
 
				-		<TeamForm ref="team" @success="getData"></TeamForm>
			
 
				+		<TeamForm ref="team" @success="getData" :cats="teamCats"></TeamForm>
			
 
				 	</view>
			
 
				 </template>
			
 
				 
			
@@ -98,7 +98,8 @@
 
				 			return {
			
 
				 				tabIdx:0,
			
 
				 				tabs:['专业救援队伍','行业救援队伍','综合抢险队伍'],
			
 
				-				teamItems:[]
			
 
				+				teamItems:[],
			
 
				+				teamCats:uni.getStorageSync('teamCat')||[]
			
 
				 			}
			
 
				 		},
			
 
				 		onShow() {
			
@@ -159,6 +160,7 @@
 
				 				if(!uni.getStorageSync('teamCat')){
			
 
				 					teamApi.getCatByList().then((res)=>{
			
 
				 						uni.setStorageSync('teamCat',res.data)
			
 
				+						this.teamCats=res.data
			
 
				 					})	
			
 
				 				}
			
 
				 			}			
			
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -52,6 +52,11 @@
 
				 					<image class="icon" src="/static/images/duty_icon.png"></image>
			
 
				 				</view>
			
 
				 			</template>
			
 
				+			<template v-slot:right>
			
 
				+				<view style="width: 200px;">
			
 
				+					<uni-data-select   v-model="dutyGroupId" :localdata="groupList" placeholder="请选择部门" :clear="false" @change="getdutyData"></uni-data-select>
			
 
				+				</view>
			
 
				+			</template>
			
 
				 			<view class="filter-box">
			
 
				 				<view class="bt lf" @click="changeDate(-1)">
			
 
				 					<uni-icons type="left" color="#777" size="30"></uni-icons>
			
@@ -139,15 +144,36 @@
 
				 	import industryApi from '@/api/industry.js'	
			
 
				     import dangerApi from '@/api/danger.js'			
			
 
				 	import {parseTime} from '@/libs/index.js'
			
 
				+	import {selectGroupUser,getGroupView} from '@/api/system.js'
			
 
				 	export default {
			
 
				 		components:{
			
 
				 			StatisticsChart
			
 
				 		},
			
 
				+		computed:{
			
 
				+			groupList(){
			
 
				+				let groupView=this.groupView;
			
 
				+				if(groupView&&groupView.length>0){
			
 
				+					let groupList=[]
			
 
				+					groupView.map((item,index)=>{
			
 
				+						groupList.push({...item,value:item.groupId,text:item.groupName})
			
 
				+						if(Array.isArray(item.children)&&item.children.length>0){
			
 
				+							groupList=groupList.concat(item.children.map(item=>{return{...item,value:item.groupId,text:item.groupName}}))
			
 
				+						}			
			
 
				+					})
			
 
				+					this.dutyGroupId=groupList[0].value				
			
 
				+					return groupList	
			
 
				+				}else{
			
 
				+					return[]
			
 
				+				}
			
 
				+			}	
			
 
				+		},
			
 
				 		data() {
			
 
				 			return {
			
 
				 				dutys: [],
			
 
				+				groupView:[],
			
 
				 				statisticsIdx:0,
			
 
				 				dutyDate:parseTime(new Date(),'{y}-{m}-{d}'),
			
 
				+				dutyGroupId:undefined,
			
 
				 				statisticsTabs: ['队伍建设', '物资储备', '行业管理', '隐患管理'],
			
 
				 				statisticsData:{
			
 
				 					name:"救援队",unit:"人数",
			
@@ -162,7 +188,8 @@
 
				 		methods: {
			
 
				 			init(){
			
 
				 				this.getdutyData();
			
 
				-				this.getStatisticsData()				
			
 
				+				this.getStatisticsData()	
			
 
				+				this.getBaseData()
			
 
				 			},
			
 
				 			changeDate(step){
			
 
				 				let date=new Date(this.dutyDate)
			
@@ -171,9 +198,25 @@
 
				 				this.getdutyData()
			
 
				 			},
			
 
				 			getdutyData(){
			
 
				-				dutyApi.getAllByList({dutyDate:this.dutyDate}).then((res)=>{
			
 
				+				dutyApi.getRecordByList({dutyDate:this.dutyDate,groupId:this.dutyGroupId}).then((res)=>{
			
 
				 					this.dutys=res.data
			
 
				-				})			
			
 
				+				})
			
 
				+			},
			
 
				+			getBaseData(){
			
 
				+				if(uni.getStorageSync('dutys')){
			
 
				+					this.groupView=uni.getStorageSync("groupView")
			
 
				+				}else{
			
 
				+					dutyApi.getByList().then((res)=>{
			
 
				+						uni.setStorageSync("dutys",res.data)
			
 
				+					})
			
 
				+					selectGroupUser().then((res)=>{
			
 
				+						uni.setStorageSync("groupUser",res.data)
			
 
				+					})
			
 
				+					getGroupView().then((res)=>{
			
 
				+						uni.setStorageSync("groupView",res.data)
			
 
				+						this.groupView=res.data
			
 
				+					})	
			
 
				+				}
			
 
				 			},
			
 
				 			getStatisticsData(){		
			
 
				 				if(this.statisticsIdx===0){
			
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -1,5 +1,6 @@
 
				 <template>
			
 
				-	<div class="body">		
			
 
				+	<div class="body">	
			
 
				+		<view class="head"> 铜川市印台区综合应急管理平台</view>
			
 
				 		<uni-forms ref="form" label-position="top" :rules="rules" :model="form">
			
 
				 			<uni-forms-item label="账号" name="username" clearable>
			
 
				 				<uni-easyinput v-model="form.username" placeholder="请输入账号" trim></uni-easyinput>
			
@@ -68,7 +69,15 @@
 
				 
			
 
				 <style lang="scss" scoped>
			
 
				 .body{
			
 
				-	padding:224upx 90upx 0;
			
 
				+	padding:160upx 90upx 0;
			
 
				+	.head{
			
 
				+		text-align: center;
			
 
				+		line-height: 1;
			
 
				+		font-size: 36rpx;
			
 
				+		font-weight: 600;
			
 
				+		color: #000000;
			
 
				+		padding: 40rpx 0;
			
 
				+	}
			
 
				 	.login-BT{
			
 
				 		margin-top:110upx;
			
 
				 		// background: #8DA6FF;
			
--- a/pages/myCenter/personalData/personalData.vue
+++ b/pages/myCenter/personalData/personalData.vue
@@ -21,7 +21,8 @@
 
				 			<div class="uni-popup-modal">
			
 
				 				<view class="uni-popup-title">请输入修改内容</view>
			
 
				 				<div class="uni-popup-content">
			
 
				-					<uni-easyinput type="text" v-model="updateValue" trim 
			
 
				+					<uni-easyinput type="textarea" v-model="updateValue" trim 
			
 
				+					autoHeight
			
 
				 					@confirm="confirm(updateValue)"
			
 
				 					placeholder="请输入内容"></uni-easyinput>					
			
 
				 				</div>
			
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/danger/components/Create.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/danger/components/Create.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/danger/components/Detail.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/danger/components/Detail.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/danger/components/SupervisorList.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/danger/components/SupervisorList.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/danger/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/danger/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/disaster/components/CreateDisaster.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/disaster/components/CreateDisaster.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/disaster/components/CreateReservoir.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/disaster/components/CreateReservoir.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/disaster/components/Detail.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/disaster/components/Detail.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/disaster/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/disaster/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/goods/components/CreateBound.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/goods/components/CreateBound.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/goods/components/RecordEdit.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/goods/components/RecordEdit.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/goods/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/goods/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/goods/record.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/goods/record.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/industry/components/Create.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/industry/components/Create.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/industry/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/industry/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/team/components/TeamForm.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/team/components/TeamForm.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/team/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/packageA/pages/team/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/personalData/personalData.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/personalData/personalData.js.map
--- a/unpackage/dist/dev/mp-weixin/common/main.js
+++ b/unpackage/dist/dev/mp-weixin/common/main.js
--- a/unpackage/dist/dev/mp-weixin/common/main.wxss
+++ b/unpackage/dist/dev/mp-weixin/common/main.wxss
@@ -9,16 +9,6 @@
 
				 
			
 
				 
			
 
				 
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				 /*每个页面公共css */
			
 
				 page{
			
 
				 	background-color: #f5f5f5;
			
--- a/unpackage/dist/dev/mp-weixin/common/runtime.js
+++ b/unpackage/dist/dev/mp-weixin/common/runtime.js
--- a/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/unpackage/dist/dev/mp-weixin/common/vendor.js
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/danger/components/Create.js
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/danger/components/Create.js
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/danger/components/Create.wxml
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/danger/components/Create.wxml
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/danger/components/Detail.js
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/danger/components/Detail.js
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/danger/components/Detail.wxml
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/danger/components/Detail.wxml
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/danger/components/SupervisorList.js
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/danger/components/SupervisorList.js
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/danger/components/SupervisorList.json
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/danger/components/SupervisorList.json
@@ -0,0 +1,12 @@
 
				+{
			
 
				+  "component": true,
			
 
				+  "usingComponents": {
			
 
				+    "uni-drawer": "/uni_modules/uni-drawer/components/uni-drawer/uni-drawer",
			
 
				+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
			
 
				+    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
			
 
				+    "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
			
 
				+    "uni-card": "/uni_modules/uni-card/components/uni-card/uni-card",
			
 
				+    "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
			
 
				+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput"
			
 
				+  }
			
 
				+}
			
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/danger/components/SupervisorList.wxml
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/danger/components/SupervisorList.wxml
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/danger/components/SupervisorList.wxss
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/danger/components/SupervisorList.wxss
@@ -0,0 +1,79 @@
 
				+@charset "UTF-8";
			
 
				+/**
			
 
				+ * 这里是uni-app内置的常用样式变量
			
 
				+ *
			
 
				+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
			
 
				+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
			
 
				+ *
			
 
				+ */
			
 
				+/**
			
 
				+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
			
 
				+ *
			
 
				+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
			
 
				+ */
			
 
				+/* 颜色变量 */
			
 
				+/* 行为相关颜色 */
			
 
				+/* 文字基本颜色 */
			
 
				+/* 背景颜色 */
			
 
				+/* 边框颜色 */
			
 
				+/* 尺寸变量 */
			
 
				+/* 文字尺寸 */
			
 
				+/* 图片尺寸 */
			
 
				+/* Border Radius */
			
 
				+/* 水平间距 */
			
 
				+/* 垂直间距 */
			
 
				+/* 透明度 */
			
 
				+/* 文章场景相关 */
			
 
				+.head.data-v-06370bd8 {
			
 
				+  height: 80rpx;
			
 
				+  display: flex;
			
 
				+  justify-content: space-between;
			
 
				+  align-items: center;
			
 
				+  padding: 0 10rpx;
			
 
				+  background-color: #f5f5f5;
			
 
				+}
			
 
				+.head .name.data-v-06370bd8 {
			
 
				+  font-size: 30rpx;
			
 
				+  color: #222222;
			
 
				+  font-weight: 500;
			
 
				+  line-height: 1;
			
 
				+  padding-left: 30rpx;
			
 
				+}
			
 
				+.head .close.data-v-06370bd8 {
			
 
				+  height: 100%;
			
 
				+  display: flex;
			
 
				+  justify-content: center;
			
 
				+  align-items: center;
			
 
				+  padding: 0 30rpx;
			
 
				+}
			
 
				+.scroll-view.data-v-06370bd8 {
			
 
				+  height: calc(100% - 130rpx);
			
 
				+  padding: 0 20rpx 20rpx;
			
 
				+  box-sizing: border-box;
			
 
				+}
			
 
				+.scroll-view .add.data-v-06370bd8 {
			
 
				+  padding: 10rpx 30rpx;
			
 
				+}
			
 
				+.scroll-view .form-wrap.data-v-06370bd8 {
			
 
				+  padding: 40rpx 20rpx;
			
 
				+}
			
 
				+.scroll-view .form-wrap .handle-container.data-v-06370bd8 {
			
 
				+  display: flex;
			
 
				+  justify-content: center;
			
 
				+  align-items: center;
			
 
				+  padding-bottom: 10rpx;
			
 
				+}
			
 
				+.scroll-view .form-wrap .handle-container button.data-v-06370bd8 {
			
 
				+  width: 160rpx;
			
 
				+  padding: 20rpx 16rpx;
			
 
				+  line-height: 1;
			
 
				+  font-size: 28rpx;
			
 
				+}
			
 
				+.scroll-view .form-wrap .handle-container button.save.data-v-06370bd8 {
			
 
				+  background-color: #007aff;
			
 
				+}
			
 
				+.scroll-view .form-wrap .handle-container button.del.data-v-06370bd8 {
			
 
				+  background-color: #f56c6c;
			
 
				+  color: #fff;
			
 
				+}
			
 
				+
			
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/danger/index.js
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/danger/index.js
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/danger/index.json
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/danger/index.json
@@ -8,6 +8,7 @@
 
				     "uni-swipe-action-item": "/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item",
			
 
				     "uni-tag": "/uni_modules/uni-tag/components/uni-tag/uni-tag",
			
 
				     "create": "/packageA/pages/danger/components/Create",
			
 
				-    "detail": "/packageA/pages/danger/components/Detail"
			
 
				+    "detail": "/packageA/pages/danger/components/Detail",
			
 
				+    "supervisor-list": "/packageA/pages/danger/components/SupervisorList"
			
 
				   }
			
 
				 }
			
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/danger/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/danger/index.wxml
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/danger/index.wxss
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/danger/index.wxss
@@ -133,4 +133,13 @@
 
				   margin-left: 8rpx;
			
 
				   font-size: 24rpx;
			
 
				 }
			
 
				+.page-wrap .pageMain .item .icon-item .supervisor.data-v-3a7c3cf2 {
			
 
				+  width: 500rpx;
			
 
				+  flex-shrink: 0;
			
 
				+  display: flex;
			
 
				+  flex-wrap: wrap;
			
 
				+}
			
 
				+.page-wrap .pageMain .item .icon-item .supervisor .supervisor-item.data-v-3a7c3cf2 {
			
 
				+  margin: 4rpx;
			
 
				+}
			
 
				 
			
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/components/CreateDisaster.js
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/components/CreateDisaster.js
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/components/CreateDisaster.json
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/components/CreateDisaster.json
@@ -6,6 +6,7 @@
 
				     "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
			
 
				     "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
			
 
				     "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
			
 
				-    "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select"
			
 
				+    "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select",
			
 
				+    "uni-card": "/uni_modules/uni-card/components/uni-card/uni-card"
			
 
				   }
			
 
				 }
			
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/components/CreateDisaster.wxml
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/components/CreateDisaster.wxml
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/components/CreateReservoir.js
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/components/CreateReservoir.js
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/components/CreateReservoir.json
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/components/CreateReservoir.json
@@ -5,6 +5,7 @@
 
				     "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
			
 
				     "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
			
 
				     "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
			
 
				-    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput"
			
 
				+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
			
 
				+    "uni-card": "/uni_modules/uni-card/components/uni-card/uni-card"
			
 
				   }
			
 
				 }
			
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/components/CreateReservoir.wxml
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/components/CreateReservoir.wxml
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/components/Detail.js
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/components/Detail.js
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/components/Detail.wxml
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/components/Detail.wxml
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/index.js
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/index.js
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/disaster/index.wxml
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/goods/components/CreateBound.js
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/goods/components/CreateBound.js
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/goods/components/CreateBound.wxml
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/goods/components/CreateBound.wxml
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/goods/components/RecordEdit.js
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/goods/components/RecordEdit.js
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/goods/index.js
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/goods/index.js
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/goods/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/goods/index.wxml
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/goods/record.js
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/goods/record.js
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/goods/record.json
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/goods/record.json
@@ -6,6 +6,7 @@
 
				     "uni-card": "/uni_modules/uni-card/components/uni-card/uni-card",
			
 
				     "uni-swipe-action-item": "/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item",
			
 
				     "uni-tag": "/uni_modules/uni-tag/components/uni-tag/uni-tag",
			
 
				+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
			
 
				     "record-detail": "/packageA/pages/goods/components/RecordDetail",
			
 
				     "record-edit": "/packageA/pages/goods/components/RecordEdit"
			
 
				   }
			
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/goods/record.wxml
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/goods/record.wxml
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/goods/record.wxss
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/goods/record.wxss
@@ -53,6 +53,13 @@
 
				   font-size: 24rpx;
			
 
				   color: #666666;
			
 
				   padding: 14rpx 0;
			
 
				+  display: flex;
			
 
				+  justify-content: space-between;
			
 
				+  align-items: center;
			
 
				+}
			
 
				+.page-wrap .pageMain .item .location.data-v-7e1beacb {
			
 
				+  display: flex;
			
 
				+  align-items: center;
			
 
				 }
			
 
				 .page-wrap .pageMain .item .bottom .time.data-v-7e1beacb {
			
 
				   font-size: 24rpx;
			
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/industry/components/Create.js
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/industry/components/Create.js
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/industry/index.js
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/industry/index.js
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/industry/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/industry/index.wxml
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/team/components/TeamForm.js
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/team/components/TeamForm.js
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/team/index.js
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/team/index.js
--- a/unpackage/dist/dev/mp-weixin/packageA/pages/team/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/packageA/pages/team/index.wxml
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.json
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.json
@@ -2,6 +2,7 @@
 
				   "navigationBarTitleText": "首页",
			
 
				   "usingComponents": {
			
 
				     "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
			
 
				+    "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select",
			
 
				     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
			
 
				     "uni-tag": "/uni_modules/uni-tag/components/uni-tag/uni-tag",
			
 
				     "uni-segmented-control": "/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control",
			
--- a/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/index/index.wxml
--- a/unpackage/dist/dev/mp-weixin/pages/login/index.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/login/index.wxml
@@ -1 +1 @@
 
				-<view class="body _div data-v-4586967a"><uni-forms vue-id="6b4b36ba-1" label-position="top" rules="{{rules}}" model="{{form}}" data-ref="form" class="data-v-4586967a vue-ref" bind:__l="__l" vue-slots="{{['default']}}"><uni-forms-item vue-id="{{('6b4b36ba-2')+','+('6b4b36ba-1')}}" label="账号" name="username" clearable="{{true}}" class="data-v-4586967a" bind:__l="__l" vue-slots="{{['default']}}"><uni-easyinput bind:input="__e" vue-id="{{('6b4b36ba-3')+','+('6b4b36ba-2')}}" placeholder="请输入账号" trim="{{true}}" value="{{form.username}}" data-event-opts="{{[['^input',[['__set_model',['$0','username','$event',[]],['form']]]]]}}" class="data-v-4586967a" bind:__l="__l"></uni-easyinput></uni-forms-item><uni-forms-item vue-id="{{('6b4b36ba-4')+','+('6b4b36ba-1')}}" label="密码" name="password" class="data-v-4586967a" bind:__l="__l" vue-slots="{{['default']}}"><uni-easyinput bind:input="__e" vue-id="{{('6b4b36ba-5')+','+('6b4b36ba-4')}}" type="password" placeholder="请输入密码" trim="{{true}}" value="{{form.password}}" data-event-opts="{{[['^input',[['__set_model',['$0','password','$event',[]],['form']]]]]}}" class="data-v-4586967a" bind:__l="__l"></uni-easyinput></uni-forms-item></uni-forms><button class="login-BT data-v-4586967a" type="default" data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" bindtap="__e">登录</button></view>
			
 
				+<view class="body _div data-v-4586967a"><view class="head data-v-4586967a">铜川市印台区综合应急管理平台</view><uni-forms vue-id="6b4b36ba-1" label-position="top" rules="{{rules}}" model="{{form}}" data-ref="form" class="data-v-4586967a vue-ref" bind:__l="__l" vue-slots="{{['default']}}"><uni-forms-item vue-id="{{('6b4b36ba-2')+','+('6b4b36ba-1')}}" label="账号" name="username" clearable="{{true}}" class="data-v-4586967a" bind:__l="__l" vue-slots="{{['default']}}"><uni-easyinput bind:input="__e" vue-id="{{('6b4b36ba-3')+','+('6b4b36ba-2')}}" placeholder="请输入账号" trim="{{true}}" value="{{form.username}}" data-event-opts="{{[['^input',[['__set_model',['$0','username','$event',[]],['form']]]]]}}" class="data-v-4586967a" bind:__l="__l"></uni-easyinput></uni-forms-item><uni-forms-item vue-id="{{('6b4b36ba-4')+','+('6b4b36ba-1')}}" label="密码" name="password" class="data-v-4586967a" bind:__l="__l" vue-slots="{{['default']}}"><uni-easyinput bind:input="__e" vue-id="{{('6b4b36ba-5')+','+('6b4b36ba-4')}}" type="password" placeholder="请输入密码" trim="{{true}}" value="{{form.password}}" data-event-opts="{{[['^input',[['__set_model',['$0','password','$event',[]],['form']]]]]}}" class="data-v-4586967a" bind:__l="__l"></uni-easyinput></uni-forms-item></uni-forms><button class="login-BT data-v-4586967a" type="default" data-event-opts="{{[['tap',[['submit',['$event']]]]]}}" bindtap="__e">登录</button></view>
			
--- a/unpackage/dist/dev/mp-weixin/pages/login/index.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/login/index.wxss
@@ -25,7 +25,15 @@
 
				 /* 透明度 */
			
 
				 /* 文章场景相关 */
			
 
				 .body.data-v-4586967a {
			
 
				-  padding: 224rpx 90rpx 0;
			
 
				+  padding: 160rpx 90rpx 0;
			
 
				+}
			
 
				+.body .head.data-v-4586967a {
			
 
				+  text-align: center;
			
 
				+  line-height: 1;
			
 
				+  font-size: 36rpx;
			
 
				+  font-weight: 600;
			
 
				+  color: #000000;
			
 
				+  padding: 40rpx 0;
			
 
				 }
			
 
				 .body .login-BT.data-v-4586967a {
			
 
				   margin-top: 110rpx;
			
--- a/unpackage/dist/dev/mp-weixin/pages/myCenter/personalData/personalData.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/myCenter/personalData/personalData.wxml