Forráskód Böngészése

Signed-off-by: zhaobao <528046418@qq.com>

zhaobao 1 éve
szülő
commit
d7f7ba5d63
100 módosított fájl, 3646 hozzáadás és 592 törlés
  1. 15 1
      api/danger.js
  2. 35 1
      api/disaster.js
  3. 20 1
      api/industry.js
  4. 239 0
      pages/danger/components/Create.vue
  5. 125 0
      pages/danger/components/Detail.vue
  6. 249 6
      pages/danger/index.vue
  7. 184 0
      pages/disaster/components/CreateDisaster.vue
  8. 174 0
      pages/disaster/components/CreateReservoir.vue
  9. 132 0
      pages/disaster/components/Detail.vue
  10. 278 6
      pages/disaster/index.vue
  11. 8 1
      pages/duty/index.vue
  12. 309 0
      pages/goods/components/CreateBound.vue
  13. 0 174
      pages/goods/components/Inbound.vue
  14. 0 174
      pages/goods/components/Outbound.vue
  15. 19 10
      pages/goods/components/RecordEdit.vue
  16. 27 14
      pages/goods/index.vue
  17. 2 0
      pages/goods/record.vue
  18. 1 1
      pages/index/index.vue
  19. 243 0
      pages/industry/components/Create.vue
  20. 133 0
      pages/industry/components/Detail.vue
  21. 256 6
      pages/industry/index.vue
  22. BIN
      static/images/qiye.png
  23. BIN
      static/images/time.png
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/IndexBarChart.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/UniEcCanvas.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/danger/components/Create.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/danger/components/Detail.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/danger/index.js.map
  32. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/disaster/components/Create.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/disaster/components/CreateDisaster.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/disaster/components/CreateReservoir.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/disaster/components/Detail.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/disaster/index.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/duty/components/AddForm.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/duty/index.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/components/CreateBound.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/components/Inbound.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/components/Outbound.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/components/RecordDetail.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/components/RecordEdit.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/index.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/record.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/industry/components/Create.js.map
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/industry/components/Detail.js.map
  49. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/industry/index.js.map
  50. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
  51. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/index.js.map
  52. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/personalData/personalData.js.map
  53. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/updatePassword/updatePassword.js.map
  54. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/team/components/MemberForm.js.map
  55. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/team/components/TeamForm.js.map
  56. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/team/index.js.map
  57. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map
  58. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-card/components/uni-card/uni-card.js.map
  59. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js.map
  60. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js.map
  61. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map
  62. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map
  63. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.js.map
  64. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.js.map
  65. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.js.map
  66. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.js.map
  67. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.js.map
  68. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  69. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map
  70. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map
  71. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  72. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list-item/uni-list-item.js.map
  73. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list/uni-list.js.map
  74. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
  75. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.js.map
  76. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
  77. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js.map
  78. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-section/components/uni-section/uni-section.js.map
  79. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.js.map
  80. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.js.map
  81. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.js.map
  82. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-table/components/uni-table/uni-table.js.map
  83. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-table/components/uni-td/uni-td.js.map
  84. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-table/components/uni-th/uni-th.js.map
  85. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-table/components/uni-tr/table-checkbox.js.map
  86. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-table/components/uni-tr/uni-tr.js.map
  87. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-tag/components/uni-tag/uni-tag.js.map
  88. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js.map
  89. 28 28
      unpackage/dist/dev/mp-weixin/common/main.js
  90. 0 0
      unpackage/dist/dev/mp-weixin/common/runtime.js
  91. 403 107
      unpackage/dist/dev/mp-weixin/common/vendor.js
  92. 31 33
      unpackage/dist/dev/mp-weixin/components/IndexBarChart.js
  93. 29 29
      unpackage/dist/dev/mp-weixin/components/UniEcCanvas.js
  94. 337 0
      unpackage/dist/dev/mp-weixin/pages/danger/components/Create.js
  95. 12 0
      unpackage/dist/dev/mp-weixin/pages/danger/components/Create.json
  96. 0 0
      unpackage/dist/dev/mp-weixin/pages/danger/components/Create.wxml
  97. 55 0
      unpackage/dist/dev/mp-weixin/pages/danger/components/Create.wxss
  98. 291 0
      unpackage/dist/dev/mp-weixin/pages/danger/components/Detail.js
  99. 10 0
      unpackage/dist/dev/mp-weixin/pages/danger/components/Detail.json
  100. 0 0
      unpackage/dist/dev/mp-weixin/pages/danger/components/Detail.wxml

+ 15 - 1
api/danger.js

@@ -2,7 +2,21 @@ import {request} from '@/libs/request.js'
 export default {
   // 分类统计
   counterByGroup: (data) => request({url:'/danger/statis/counterByGroup',data}),
-
   // 分类统计
   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}),
 }

+ 35 - 1
api/disaster.js

@@ -1 +1,35 @@
-import {request} from '@/libs/request.js'
+import {request} from '@/libs/request.js'
+
+export default {
+/*地质*/
+	// 分页查询
+	getDisasterLocationByPage: (data) => request({url:'/disaster/location/page',data}),
+	// 列表查询
+	getDisasterLocationByList: (data) => request({url:'/disaster/location',data}),	
+	// 基于ID查询
+	getDisasterLocationById: (id) => request({url:`/disaster/location/${id}`}),
+	// 新增
+	createDisasterLocation: (data) => request({url:'/disaster/location/add',method:"post", data}),
+	// 更新
+	updateDisasterLocation: (data) => request({url:'/disaster/location/update',method:"put", data}),
+	// 删除
+	deleteDisasterLocationById: (id) => request({url:`/disaster/location/${id}`,method:"delete"}),
+	// 规模等级列表
+	getDisasterLevelByList: (data) => request({url:'/disaster/level',data}),
+	// 灾害类型列表查询
+	getDisasterCatByList: (data) => request({url:'/disaster/cat',data}),
+/*自然*/	
+	getReservoirDamByPage: (data) => request({url:'/reservoir/dam/page',data}),
+	// 列表查询
+	getReservoirDamByList: (data) => request({url:'/reservoir/dam',data}),	
+	// 基于ID查询
+	getReservoirDamById: (id) => request({url:`/reservoir/dam/${id}`}),
+	// 新增
+	createReservoirDam: (data) => request({url:'/reservoir/dam/add',method:"post", data}),
+	// 更新
+	updateReservoirDam: (data) => request({url:'/reservoir/dam/update',method:"put", data}),
+	// 删除
+	deleteReservoirDamById: (id) => request({url:`/reservoir/dam/${id}`,method:"delete"}),
+  // 基于ID查询
+	getCameraByListWithLocation: (id) => request({url:`/camera/location/${id}`}),
+}

+ 20 - 1
api/industry.js

@@ -3,5 +3,24 @@ export default {
   // 按部门统计
   counterByGroup: (data) => request({url:'/ent/statis/counterByGroup',data}),
   // 分类统计
-  counterByCat: (data) => request({url:'/ent/statis/counterByCat',data})
+  counterByCat: (data) => request({url:'/ent/statis/counterByCat',data}),
+   
+  // 分页查询
+  getByPage: (data) => request({url:'/ent/page',data }),
+  // 列表查询
+  getByList: (data) => request({url:'/ent',data }),
+  // 基于ID查询
+  getById: (entId) => request({url:`/ent/${entId}` }),
+  // 新增
+  create: (data) => request({url:'/ent/add',method: 'POST', data}),
+  // 更新
+  update: (data) =>  request({url:'/ent/update',method: 'put', data}),
+  // 删除
+  deleteById: (entId) => request({url:`/ent/${entId}`,method: 'delete'}),  
+  
+/*cat*/  
+  getCatByList: (data) => request({url:'/ent/cat',data }),
+/*Camera*/    
+  // 基于ID查询
+  getCameraByListWithEnt: (id) => request({url:`/camera/ent/${id}`}),  
 }

+ 239 - 0
pages/danger/components/Create.vue

@@ -0,0 +1,239 @@
+<template>
+	<uni-drawer ref="drawer" mode="left" :mask-click="false" width="85%" :maskClick='true'>
+		<scroll-view class="scroll-view" scroll-y="true">
+			<uni-section :title="(type==='add'?'新增':'编辑') +'企业' " type="line"></uni-section>
+			<view class="form-wrap" >
+				<uni-forms ref="form" label-position="top" :rules="rules" :model="form" :label-width="300">
+					<uni-forms-item label="企业名称" name="entName"  required>
+						<uni-easyinput v-model="form.entName" placeholder="请输入企业名称"  />
+					</uni-forms-item>	
+					<uni-forms-item label="隐患分类" name="entCatId" required>
+						<uni-data-select  v-model="form.entCatId" :localdata="entCats" placeholder="请选择企业分类" :clear="false"></uni-data-select>
+					</uni-forms-item>
+					<uni-forms-item label="隐患等级" name="dangerLevel" required>
+						<uni-data-select  v-model="form.dangerLevel" :localdata="dangerLevelOptions" placeholder="请选择隐患等级" :clear="false"></uni-data-select>
+					</uni-forms-item>
+					<uni-forms-item label="统一信用编码">
+						<uni-easyinput v-model="form.entUscc" placeholder="请输入统一信用编码"  />
+					</uni-forms-item>
+					<uni-forms-item label="法定代表人">
+						<uni-easyinput v-model="form.entLegalRepresentative" placeholder="请输入法定代表人"  />
+					</uni-forms-item>	
+					<uni-forms-item label="隐患描述">
+						<uni-easyinput type="textarea" :maxlength="300"
+						 v-model="form.dangerDesc" autoHeight 
+						placeholder="请输入隐患描述"></uni-easyinput>
+						<view class="word-limit">{{form.dangerDesc.length||0}}/300</view>
+					</uni-forms-item>									
+					<uni-forms-item label="生产经营地址">
+						<uni-easyinput v-model="form.entAddress" placeholder="请输入生产经营地址"  />
+					</uni-forms-item>								
+					<uni-forms-item label="负责人">
+						<uni-easyinput v-model="form.charger" placeholder="请输入负责人"  />
+					</uni-forms-item>													
+					<uni-forms-item label="负责人电话">
+						<uni-easyinput v-model="form.chargerPhone" type="number" placeholder="请输入负责人电话"  />
+					</uni-forms-item>														
+					<uni-forms-item label="安全负责人">
+						<uni-easyinput v-model="form.safetyManager" placeholder="请输入安全负责人"  />
+					</uni-forms-item>	
+					<uni-forms-item label="安全负责人电话">
+						<uni-easyinput v-model="form.safetyManagerPhone" type="number" placeholder="请输入安全负责人电话"  />
+					</uni-forms-item>																		
+					<uni-forms-item label="从业人员数量">
+						<uni-easyinput v-model="form.staffNum" type="number" placeholder="请输入从业人员数量"  />
+					</uni-forms-item>																						
+					<uni-forms-item label="特种作业人员数量">
+						<uni-easyinput v-model="form.staffSpecialNum" type="number" placeholder="请输入特种作业人员数量"  />
+					</uni-forms-item>	
+					<uni-forms-item label="专职安全生产管理人员数量">
+						<uni-easyinput v-model="form.staffSafetyNum" type="number" placeholder="请输入专职安全生产管理人员数量"  />
+					</uni-forms-item>																													
+					<uni-forms-item label="注册安全工程师人员数">
+						<uni-easyinput v-model="form.staffCertifiedEngineerNum" type="number" placeholder="请输入注册安全工程师人员数"  />
+					</uni-forms-item>																																																			
+					<uni-forms-item label="安全标准化等级">
+						<uni-data-select  v-model="form.safetyStandardLevel" :localdata="standardLevelOptions" placeholder="请选择企业分类" :clear="false"></uni-data-select>
+					</uni-forms-item>	
+					<uni-forms-item label="安全许可证号码">
+						<uni-easyinput v-model="form.staffSafetyNum" placeholder="请输入安全许可证号码"  />
+					</uni-forms-item>	
+					<uni-forms-item label="是否重点企业">
+						<uni-data-checkbox v-model="form.isMajor" :localdata="isMajors" />
+					</uni-forms-item>																																																																									
+				</uni-forms>
+				<view class="handle-container">
+					<button class="save" type="primary" @click="onSubmit">保存</button>
+					<button class="cancel" type="default" @click="close">取消</button>
+				</view>
+			</view>	
+		</scroll-view>
+	</uni-drawer>
+</template>
+
+<script>
+	import dangerApi from '@/api/industry.js'
+	export default{
+		name:"CreateDanger",
+		computed:{
+			entCats(){
+				let entCats=uni.getStorageSync('entCats')
+				if(!entCats)return []
+				return entCats.map(item=>{
+					return{
+						value:item.entCatId,
+						text:item.entCatTitle
+					}
+				})
+			}						
+		},
+		data(){
+			return{
+				type:undefined,
+				rules:{
+					entName:{
+						rules:[
+							{
+								required: true,
+								errorMessage:"请输入企业名称"
+							}					
+						],
+						validateTrigger:'submit'
+					},
+					entCatId:{
+						rules:[
+							{
+								required: true,
+								errorMessage:"请选择企业分类"
+							}					
+						],
+						validateTrigger:'submit'
+					}
+				},
+				dangerLevelOptions:[
+				  { value: 0, text: '末知' },
+				  { value: 1, text: '重大' },
+				  { value: 2, text: '较大' },
+				  { value: 3, text: '一般' },
+				  { value: 4, text: '较小' }
+				],
+				statusOptions:[
+				  { value: 0, text: '处理中' },
+				  { value: 1, text: '已整改' }
+				],
+				isMajors:[
+					{value:1,text:'是'},
+					{value:0,text:'否'},
+				],
+				form:{
+					entId: undefined,
+					dangerId: 0,
+					dangerCatId: 1,
+					dangerCatTitle: '',
+					dangerTitle: '',
+					dangerCode: '',
+					dangerLocation: '',
+					dangerLevel: 2,
+					dangerDesc: '',
+					submitTime: '',
+					submitRemark: '',
+					dangerDeadLine: '',
+					rectifyTime: '',
+					dangerReason: '',
+					rectifyCat: 1,
+					rectifyRemark: '',
+					acceptTime: '',
+					acceptRemark: '',
+					finishTime: '',
+					status: 0,
+					attachList: []
+				}
+			}
+		},
+		methods:{
+			resetForm(){
+				this.form={
+					entId: undefined,
+					dangerId: 0,
+					dangerCatId: 1,
+					dangerCatTitle: '',
+					dangerTitle: '',
+					dangerCode: '',
+					dangerLocation: '',
+					dangerLevel: 2,
+					dangerDesc: '',
+					submitTime: '',
+					submitRemark: '',
+					dangerDeadLine: '',
+					rectifyTime: '',
+					dangerReason: '',
+					rectifyCat: 1,
+					rectifyRemark: '',
+					acceptTime: '',
+					acceptRemark: '',
+					finishTime: '',
+					status: 0,
+					attachList: []
+				}
+			},
+			onSubmit(){
+				this.$refs.form.validate().then(res=>{
+					let submitFx=this.type==='add'?dangerApi.create:dangerApi.update
+					submitFx(this.form).then(()=>{
+						uni.showToast({
+							icon:"none",
+							title:"成功!!"
+						})
+						this.$emit('success')
+						this.close();
+					})
+
+				}).catch(err =>{
+					uni.showToast({
+						icon:"none",
+						title:"请检查填写信息!"
+					})
+				})
+			},
+			show({type,item}){
+				this.resetForm()
+				this.form={...this.form,...item}
+				this.type=type
+				this.$refs.drawer.open()
+			},
+			close(){
+				this.$refs.drawer.close()
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.scroll-view {
+		height: 100%;
+		padding: 20rpx;
+		box-sizing: border-box;
+		.form-wrap{
+			padding:40rpx;
+			.handle-container{
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				button{
+					width: 160rpx;
+					padding: 20rpx 16rpx;
+					line-height: 1;
+					font-size: 28rpx;
+					&.save{
+						background-color: #007aff;
+					}
+				}
+			}
+			.word-limit{
+				text-align: right;
+				padding: 10rpx 0;
+				color: #999;
+				font-size: 26rpx;
+			}
+		}
+	}
+</style>

+ 125 - 0
pages/danger/components/Detail.vue

@@ -0,0 +1,125 @@
+<template>
+	<uni-popup ref="popup" type="top">
+		<uni-section type="line"  :title="type==='dl'?'地质灾害点详情':'水库淤堤坝详情'">
+			<template v-slot:right>
+				<uni-icons type="closeempty" size="24" color="#999" @click="close"></uni-icons>
+			</template>		
+		</uni-section>
+		<view class="detail-cont">
+			<uni-list >
+				<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="formatDangerLevel(viewData.dangerLevel)" title ="经营范围"></uni-list-item>													
+				<uni-list-item :rightText="viewData.dangerLocation" title ="发现位置"></uni-list-item>													
+				<uni-list-item  title ="现场照片" v-if="viewData.attachList&&viewData.attachList.length>0">
+					<view class="attachbox">
+						<view class="attach"  v-for="(attach, index) in viewData.attachList" :key="index" @click="preview(viewData.attachList)">
+							<image :src="attach.attachUrl"></image>
+						</view>
+					</view>
+				</uni-list-item>																		
+				<uni-list-item :note="viewData.dangerDesc" title ="隐患描述" v-if="viewData.dangerDesc"></uni-list-item>																			
+				<uni-list-item :note="viewData.submitRemark" title ="登记说明" v-if="viewData.submitRemark"></uni-list-item>						
+				<uni-list-item :rightText="viewData.dangerDeadLine" title ="整改期限" v-if="viewData.dangerDeadLine"></uni-list-item>																																	
+				<uni-list-item :rightText="viewData.rectifyTime" title ="整改时间" v-if="viewData.rectifyTime"></uni-list-item>																										
+				<uni-list-item :note="viewData.dangerReason" title ="原因分析" v-if="viewData.dangerReason"></uni-list-item>						
+				<uni-list-item :rightText="viewData.rectifyMeasure" title ="整改措施" v-if="viewData.rectifyMeasure"></uni-list-item>																																		
+				<uni-list-item :rightText="formatRectifyCat(viewData.rectifyCat)" title ="整改方式" v-if="viewData.rectifyCat"></uni-list-item>																																																										
+				<uni-list-item :note="viewData.rectifyRemark" title ="整改说明" v-if="viewData.rectifyRemark"></uni-list-item>		
+				<uni-list-item :rightText="viewData.acceptTime" title ="验收时间" v-if="viewData.acceptTime"></uni-list-item>						
+				<uni-list-item :note="viewData.acceptRemark" title ="验收说明" v-if="viewData.acceptRemark"></uni-list-item>																	
+			</uni-list>			
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	export default{
+		name:"DisasteDetail",
+		props:{
+			type:{
+				type:[String,Number],
+				default:'dl'
+			}
+		},
+		data(){
+			return{
+				viewData:{
+					entId: undefined,
+					dangerId: 0,
+					dangerCatId: 1,
+					dangerCatTitle: '',
+					dangerTitle: '',
+					dangerCode: '',
+					dangerLocation: '',
+					dangerLevel: 2,
+					dangerDesc: '',
+					submitTime: '',
+					submitRemark: '',
+					dangerDeadLine: '',
+					rectifyTime: '',
+					dangerReason: '',
+					rectifyCat: 1,
+					rectifyRemark: '',
+					acceptTime: '',
+					acceptRemark: '',
+					finishTime: '',
+					status: 0,
+					attachList: []
+				}
+			}
+		},
+		methods:{
+			formatDangerLevel(val){
+				let dangerLevelOptions=['末知','重大','较大','一般','较小'];
+				return dangerLevelOptions[val]
+			},
+			formatRectifyCat(val){
+				let dangerLevelOptions=['自行整改','外协整改'];
+				return dangerLevelOptions[val]
+			},
+			show(item){
+				this.$refs.popup.open('bottom')
+				this.viewData={...item}
+			},
+			preview(urls=[]){
+				if(urls.length>0){
+					urls=urls.map(item=>item.attachUrl);
+					uni.previewImage({
+						urls
+					})	
+				}
+			},
+			close(){
+				this.$refs.popup.close()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.detail-cont{
+		&{
+			max-height: 80vh;
+			overflow-y: auto;
+		}
+		.attachbox{
+			display: flex;
+			flex-wrap: wrap;
+			.attach{
+				border: 1rpx solid #ccc;
+				padding: 20rpx;
+				box-shadow: rgba(0,0,0,0.6);
+				border-radius: 10px;
+				overflow: hidden;
+				image{
+					display: block;
+					width: 200rpx;
+					height: 200rpx;
+				}
+			}
+		}
+	}
+</style>

+ 249 - 6
pages/danger/index.vue

@@ -1,22 +1,265 @@
 <template>
-	<view>
-		
+	<view class="page-wrap">
+		<view class="head">
+			<uni-card padding="0" margin="5px 0">
+				<uni-search-bar @confirm="search" v-model="keywords" @clear="search"></uni-search-bar>
+			</uni-card>
+			<view class="addbt" @click="handle({type:'add'})">
+				<view class="word"><uni-icons type="plusempty" size="30" color="#fff"></uni-icons></view>
+			</view>
+		</view>	
+		<view class="pageMain">
+			<uni-swipe-action class="item-action-box">
+				<uni-card padding="10px 0" margin="5px 0" v-for="(item,idx) in items" :key="item.entId">
+					<uni-swipe-action-item class="item-action" :auto-close="true">
+						<template v-slot:right>
+							<view class="slot-button">
+								<view class="bt edit" @click="handle({type:'edit',item})"><text class="slot-button-text">编辑</text></view>
+								<view class="bt del" @click="handle({type:'del',item})"><text class="slot-button-text">删除</text></view>
+							</view>
+						</template>
+						<view class="item" @click="handle({type:'detail',item})">
+							<view class="title">
+								<view class="name">{{item.dangerTitle}}</view>									
+							</view>
+							<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 :text="formatDangerLevel(item.dangerLevel)" type="success"></uni-tag>
+							</view>						
+							<view class="item-row space-between">
+								<view class="icon-item">
+									<uni-icons type="location-filled" size="16" color="#999"></uni-icons>
+									<text class="word">{{item.dangerLocation||'--'}}</text>
+								</view>
+								<uni-tag :inverted="true" :text="formatDangerStatus(item.status)" :type="item.status>0?'error':'warning'"></uni-tag>
+							</view>
+							<view class="bottom">
+								<view class="icon-item">
+									<image class="icon" src="/static/images/qiye.png" mode="widthFix"></image>
+									<text class="word">{{item.entName}}</text>
+								</view>
+								<view class="icon-item">
+									<image class="icon" src="/static/images/time.png" mode="widthFix"></image>
+									<text class="word">{{item.submitTime}}</text>
+								</view>	
+								<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>
+					</uni-swipe-action-item>
+				</uni-card>
+			</uni-swipe-action>
+		</view>
+		<Create ref="danger" @success="search"></Create>	
+		<Detail ref="detail"></Detail>
 	</view>
 </template>
 
 <script>
+	import dangerApi from '@/api/danger.js'
+	import Create from './components/Create.vue'
+	import Detail from './components/Detail.vue'				
 	export default {
+		components:{
+			Create,
+			Detail
+		},
 		data() {
 			return {
-				
+				items:[],
+				page:1,
+				limit:10,
+				total:0,	
+				keywords: ""
 			}
 		},
+		onShow() {
+			this.getData();
+			this.init()
+		},
 		methods: {
-			
+			init(){		
+				// if(!uni.getStorageSync('entCats')){
+				// 	dangerApi.getCatByList().then((res)=>{
+				// 		uni.setStorageSync('entCats',res.data)
+				// 	})
+				// }
+			},
+			search(){
+				this.resetFilter();
+				this.getData()
+			},
+			getData(){
+				dangerApi.getByPage({
+					page:this.page,
+					limit:this.limit,
+					keywords:this.keywords
+				}).then((res)=>{
+					this.items=this.items.concat(res.data)
+				})
+			},
+			handle({type,item}){
+				const self=this;
+				if(type==='detail'){					
+					this.$refs.detail.show(item)
+				}else if(type==='del'){
+					uni.showModal({
+						title: '提示',
+						content: '是否确定删除',
+						success: function (res) {
+							if (res.confirm) {
+								industryApi.deleteById(item.entId).then(()=>{
+									uni.showToast({
+										title:'删除成功!',
+										icon:'none'
+									})
+									self.search()
+								})					
+							}
+						}
+					});					
+				}else{
+					this.$refs.industry.show({type,item})										
+				}
+			},
+			formatDangerLevel(val){
+				let dangerLevelOptions=['末知','重大','较大','一般','较小'];
+				return dangerLevelOptions[val]
+			},
+			formatDangerStatus(val){
+				let status=['未整改','已整改'];
+				return status[val]
+			},
+			resetFilter(){
+				this.page = 1
+				this.limit = 10
+				this.total = 0
+				this.items=[]
+			}
+		},
+		onReachBottom() {
+			if(this.total>this.size*this.page){
+				this.page++
+				this.getData()				
+			}
 		}
 	}
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+.page-wrap{
+	padding:0 20rpx;
+	.pageTabs{
+		background-color: #fff;
+	}
+	.head{
+		margin-top: 20rpx;
+		.handle{
+			display: inline-block;
+			// background-color: #007aff;
+			color: #777777;
+			text-align: center;
+			padding:16rpx 20rpx;
+			border-radius: 30rpx;
+			// border: 1px solid #007aff;
+			font-size: 28rpx;
+			line-height: 1;
+			box-shadow: 0 0 4px rgba(0, 0, 0, 0.3);
+		}
+		.addbt{
+			width: 100rpx;
+			height: 100rpx;
+			border-radius: 50%;
+			color: #fff;
+			background-color: rgba(64,158,255,0.6);			
+			box-shadow:0 0 10rpx rgba(0,0,0,0.6);
+			position: fixed;
+			right: 10rpx;
+			bottom: 20%;
+			z-index: 99;
+			text-align: center;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			.word{
+				width: 80rpx;
+				height: 80rpx;
+				border-radius: 50%;
+				margin: 5rpx auto;
+				font-size: 28rpx;
+				letter-spacing: 2px;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+	}
+	.pageMain{
+		margin-top: 20rpx;
+		background-color: #f5f5f5;
+		padding-bottom: 50rpx;
+		.slot-button{
+			width: 400rpx;
+			height: 100%;
+			display: flex;
+			flex-direction: row;
+			justify-content: center;
+			align-items: center;
+			color: #fff;
+			padding-left: 10px;
+			.bt{
+				width: 50%;
+				height: 100%;
+				font-size: 30rpx;
+				box-sizing: border-box;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				&.edit{
+				    background-color:#007aff;
+				}
+				&.del{
+					background-color:#F56C6C;
+				}
+				&.detail{
+					background-color: #e6a23c;
+				}
+			}
+		}
+		.item{
+			color: #666;
+			.name{
+				font-size: 32rpx;
+				color: #222222;
+				line-height: 1;
+				padding-bottom: 10rpx;
+			}
+			image{
+				&.icon{
+					width: 30rpx;
+					height: 30rpx;
+					display: block;
+				}
+			}
+			.item-row{
+				display: flex;
+				align-items: center;
+				padding-top: 14rpx;
+				&.space-between{
+					justify-content: space-between;
+				}
+			}
+			.icon-item{
+				display: flex;
+				align-items: center;
+				.word{
+					margin-left: 8rpx;
+					font-size: 24rpx;
+				}
+			}
+		}
+	}
+}
 </style>

+ 184 - 0
pages/disaster/components/CreateDisaster.vue

@@ -0,0 +1,184 @@
+<template>
+	<uni-drawer ref="drawer" mode="left" :mask-click="false" width="85%" :maskClick='true'>
+		<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-easyinput v-model="form.dlName" placeholder="请输入地质灾害点名称" :clearable="false" />
+						</uni-forms-item>													
+						<uni-forms-item label="地理位置" name="dlAddress" required>
+							<uni-easyinput v-model="form.dlAddress" placeholder="请输入地理位置" :clearable="false" />
+						</uni-forms-item>							
+						<uni-forms-item label="灾害类别" name="dlCatId" required>
+							<uni-data-select  v-model="form.dlCatId" :localdata="disasterCats" placeholder="请选择入库人员" :clear="false"></uni-data-select>
+						</uni-forms-item>
+						<uni-forms-item label="规模等级" name="dlLevelId"  required>
+							<uni-data-select  v-model="form.dlLevelId" :localdata="disasterLevels" placeholder="请选择入库类型" :clear="false"></uni-data-select>
+						</uni-forms-item>
+						<uni-forms-item label="威胁人数" label-position="left" required>
+							<uni-easyinput v-model="form.dlPeopleNum" placeholder="请输入威胁人数" :clearable="false" />
+						</uni-forms-item>						
+						<uni-forms-item label="威胁房屋" >
+							<uni-easyinput v-model="form.dlHouseNum"  placeholder="请输入威胁房屋"></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>
+				</uni-forms>
+				<view class="handle-container">
+					<button class="save" type="primary" @click="onSubmit">保存</button>
+					<button class="cancel" type="default" @click="close">取消</button>
+				</view>
+			</view>	
+		</scroll-view>
+	</uni-drawer>
+</template>
+
+<script>
+	import disasterApi from '@/api/disaster.js'	
+	export default{
+		name:"CreateDisaster",
+		computed:{
+			accountInfo(){
+				let accountInfo=uni.getStorageSync('accountInfo')
+				if(!accountInfo) return {}
+				return accountInfo
+			},			
+			disasterLevels(){
+				let disasterLevels=uni.getStorageSync('disasterLevels')
+				if(!disasterLevels)return []
+				return disasterLevels.map(item=>{
+					return{
+						value:item.disasterLevelId,
+						text:item.disasterLevelTitle
+					}
+				})
+			},	
+			disasterCats(){
+				let disasterCats=uni.getStorageSync('disasterCats')
+				if(!disasterCats)return []
+				return disasterCats.map(item=>{
+					return{
+						value:item.disasterCatId,
+						text:item.disasterCatTitle
+					}
+				})
+			}
+		},
+		data(){
+			return{
+				type:undefined,
+				rules:{
+					dlCatId:{
+						rules:[
+							{
+								required: true,
+								errorMessage:"请选择灾害类别"
+							}					
+						],
+						validateTrigger:'submit'
+					},
+					dlLevelId:{
+						rules:[
+							{
+								required: true,
+								errorMessage:"请选择规模等级"
+							}					
+						],
+						validateTrigger:'submit'
+					}
+				},
+				form:{
+					ocId: 0,
+					groupId: 0,	
+					dlId: 0,
+					dlName: '',
+					dlAddress: '',
+					dlCatId: 1,
+					dlLevelId: 1,
+					dlPeopleNum: 0,
+					dlHouseNum: 0,
+					remark: ''
+				}
+			}
+		},
+		methods:{
+			resetForm(){
+				this.form={
+					ocId: 0,
+					groupId: 0,	
+					dlId: 0,
+					dlName: '',
+					dlAddress: '',
+					dlCatId: 1,
+					dlLevelId: 1,
+					dlPeopleNum: 0,
+					dlHouseNum: 0,
+					remark: ''
+				}
+			},
+			onSubmit(){
+				this.$refs.form.validate().then(res=>{
+					let submitFx=this.type==='create'?disasterApi.createDisasterLocation:disasterApi.updateDisasterLocation
+					this.form.ocId= this.accountInfo.ocId,
+					this.form.groupId= this.accountInfo.groupId
+					submitFx(this.form).then(()=>{
+						uni.showToast({
+							icon:"none",
+							title:"成功!!"
+						})
+						this.$emit('success')
+						this.close();
+					})
+
+				}).catch(err =>{
+					uni.showToast({
+						icon:"none",
+						title:"请检查填写信息!"
+					})
+				})
+			},
+			show(type,item){
+				this.resetForm()
+				this.form={...this.form,...item}
+				this.type=type
+				this.$refs.drawer.open()
+			},
+			close(){
+				this.$refs.drawer.close()
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.scroll-view {
+		height: 100%;
+		padding: 20rpx;
+		box-sizing: border-box;
+		.form-wrap{
+			padding:40rpx;
+			.handle-container{
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				button{
+					width: 160rpx;
+					padding: 20rpx 16rpx;
+					line-height: 1;
+					font-size: 28rpx;
+					&.save{
+						background-color: #007aff;
+					}
+				}
+			}
+			.word-limit{
+				text-align: right;
+				padding: 10rpx 0;
+				color: #999;
+				font-size: 26rpx;
+			}
+		}
+	}
+</style>

+ 174 - 0
pages/disaster/components/CreateReservoir.vue

@@ -0,0 +1,174 @@
+<template>
+	<uni-drawer ref="drawer" mode="left" :mask-click="false" width="85%" :maskClick='true'>
+		<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-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>
+				</uni-forms>
+				<view class="handle-container">
+					<button class="save" type="primary" @click="onSubmit">保存</button>
+					<button class="cancel" type="default" @click="close">取消</button>
+				</view>
+			</view>	
+		</scroll-view>
+	</uni-drawer>
+</template>
+
+<script>
+	import disasterApi from '@/api/disaster.js'	
+	export default{
+		name:"CreateDisaster",
+		computed:{
+			accountInfo(){
+				let accountInfo=uni.getStorageSync('accountInfo')
+				if(!accountInfo) return {}
+				return accountInfo
+			},			
+			disasterLevels(){
+				let disasterLevels=uni.getStorageSync('disasterLevels')
+				if(!disasterLevels)return []
+				return disasterLevels.map(item=>{
+					return{
+						value:item.disasterLevelId,
+						text:item.disasterLevelTitle
+					}
+				})
+			},	
+			disasterCats(){
+				let disasterCats=uni.getStorageSync('disasterCats')
+				if(!disasterCats)return []
+				return disasterCats.map(item=>{
+					return{
+						value:item.disasterCatId,
+						text:item.disasterCatTitle
+					}
+				})
+			}
+		},
+		data(){
+			return{
+				type:undefined,
+				rules:{
+					rdName:{
+						rules:[
+							{
+								required: true,
+								errorMessage:"请输入水库名称"
+							}					
+						],
+						validateTrigger:'submit'
+					},
+					respName:{
+						rules:[
+							{
+								required: true,
+								errorMessage:"请输入巡查责任人"
+							}					
+						],
+						validateTrigger:'submit'
+					}
+				},
+				form:{
+					ocId: 0,
+					rdId: 0,
+					groupId: 0,
+					rdName: '',
+					rdAddress: '',
+					respName: '',
+					respPhone: '',
+					remark: ''
+				}
+			}
+		},
+		methods:{
+			resetForm(){
+				this.form={
+					ocId: 0,
+					rdId: 0,
+					groupId: 0,
+					rdName: '',
+					rdAddress: '',
+					respName: '',
+					respPhone: '',
+					remark: ''
+				}
+			},
+			onSubmit(){
+				this.$refs.form.validate().then(res=>{
+					let submitFx=this.type==='create'?disasterApi.createReservoirDam:disasterApi.updateReservoirDam
+					this.form.ocId= this.accountInfo.ocId,
+					this.form.groupId= this.accountInfo.groupId
+					submitFx(this.form).then(()=>{
+						uni.showToast({
+							icon:"none",
+							title:"成功!!"
+						})
+						this.$emit('success')
+						this.close();
+					})
+
+				}).catch(err =>{
+					uni.showToast({
+						icon:"none",
+						title:"请检查填写信息!"
+					})
+				})
+			},
+			show(type,item){
+				this.resetForm()
+				this.form={...this.form,...item}
+				this.type=type
+				this.$refs.drawer.open()
+			},
+			close(){
+				this.$refs.drawer.close()
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.scroll-view {
+		height: 100%;
+		padding: 20rpx;
+		box-sizing: border-box;
+		.form-wrap{
+			padding:40rpx;
+			.handle-container{
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				button{
+					width: 160rpx;
+					padding: 20rpx 16rpx;
+					line-height: 1;
+					font-size: 28rpx;
+					&.save{
+						background-color: #007aff;
+					}
+				}
+			}
+			.word-limit{
+				text-align: right;
+				padding: 10rpx 0;
+				color: #999;
+				font-size: 26rpx;
+			}
+		}
+	}
+</style>

+ 132 - 0
pages/disaster/components/Detail.vue

@@ -0,0 +1,132 @@
+<template>
+	<uni-popup ref="popup" type="top">
+		<uni-section type="line"  :title="type==='dl'?'地质灾害点详情':'水库淤堤坝详情'">
+			<template v-slot:right>
+				<uni-icons type="closeempty" size="24" color="#999" @click="close"></uni-icons>
+			</template>		
+		</uni-section>
+		<view class="detail-cont">
+			<uni-list v-if="type==='dl'">
+				<uni-list-item title="地质灾害点名称" :rightText="viewData.dlName"></uni-list-item>
+				<uni-list-item title="地理位置" :rightText="viewData.dlAddress"></uni-list-item>
+				<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="备注" :note="viewData.remark"></uni-list-item>														
+			</uni-list>	
+			<uni-list v-if="type==='rd'">
+				<uni-list-item title="监管单位" :rightText="viewData.groupName"></uni-list-item>
+				<uni-list-item title="水库堤坝名称" :rightText="viewData.rdName"></uni-list-item>
+				<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="描述" :note="viewData.remark"></uni-list-item>															
+			</uni-list>	
+			<view class="camerasbox">
+				<view class="item" v-for="item in cameras" :key="item.cameraId">
+					<view class="item-card">
+						<view class="title" v-if="item.cameraTitle">{{item.cameraTitle}}</view>
+						<uni-icons type="videocam-filled" size="40" color="#999" @click="showCamera"></uni-icons>
+					</view>		
+				</view>		
+			</view>			
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	import disasterApi from '@/api/disaster.js'
+	export default{
+		name:"DisasteDetail",
+		props:{
+			type:{
+				type:[String,Number],
+				default:'dl'
+			}
+		},
+		data(){
+			return{
+				viewData:{
+					groupId: 0,
+					groupName: '',
+					dlName: '',
+					dlAddress: '',
+					dlCatId: 1,
+					dlLevelId: 1,
+					dlPeopleNum: 0,
+					dlHouseNum: 0,
+					remark: '',
+					//水库淤堤坝详情
+					rdId: 0,
+					rdName: '',
+					rdAddress: '',
+					respName: '',
+					respPhone: ''
+				},
+				cameras:[]
+			}
+		},
+		methods:{
+			showCamera(){
+				
+			},
+			show(item){
+				this.$refs.popup.open('bottom')
+				this.viewData={...item}
+				if(item.cameraNum>0){
+					this.getCameras()
+				}
+			},
+			getCameras(){
+				const id=this.type==='dl'?this.viewData.dlId:this.viewData.rdId;
+				disasterApi.getCameraByListWithLocation(id).then((res)=>{
+					this.cameras=res.data;
+				})
+			},
+			close(){
+				this.$refs.popup.close()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.detail-cont{
+		&{
+			max-height: 80vh;
+			overflow-y: auto;
+		}
+		.camerasbox{
+			width:100%;
+			display: flex;
+			align-items: center;
+			flex-wrap: wrap;
+			background-color: #fff;
+			.item{
+				width: 33.33%;		
+				padding: 20rpx;
+				background-color: #fff;
+				box-sizing: border-box;
+				.item-card{
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					flex-direction: column;
+					box-shadow: 0 0 1px rgba(0,0,0,0.6);
+					padding: 20rpx;
+					.title{
+						width: 100%;
+						font-size: 24rpx;
+						color: #424242;
+						line-height: 1.4;
+						padding-bottom: 15rpx;
+						overflow:hidden;
+						text-overflow:ellipsis;
+						white-space:nowrap;
+					}
+				}
+			}
+		}		
+	}
+</style>

+ 278 - 6
pages/disaster/index.vue

@@ -1,22 +1,294 @@
 <template>
-	<view>
-		自然灾害
+	<view class="page-wrap">
+		<view class="pageTabs">
+			<uni-segmented-control :current="tabIdx" :values="tabs" style-type="text" active-color="#007aff" @clickItem="changeTab" />	
+		</view>	
+		<view class="head">
+			<uni-card padding="0" margin="5px 0">
+				<uni-search-bar @confirm="search" :focus="true" v-model="keywords" @clear="search"></uni-search-bar>
+			</uni-card>
+			<view class="addbt" @click="handle('create')">
+				<view class="word"><uni-icons type="plusempty" size="30" color="#fff"></uni-icons></view>
+			</view>
+		</view>	
+		<view class="pageMain">
+			<uni-swipe-action class="item-action-box" v-if="tabIdx===0">
+				<uni-card padding="10px 0" margin="5px 0" v-for="(item,idx) in items" :key="item.dlId">
+					<uni-swipe-action-item class="item-action" :auto-close="true">
+						<template v-slot:right>
+							<view class="slot-button">
+								<view class="bt edit" @click="handle({type:'edit',item})"><text class="slot-button-text">编辑</text></view>
+								<view class="bt del" @click="handle({type:'del',item})"><text class="slot-button-text">删除</text></view>
+							</view>
+						</template>
+						<view class="item" @click="handle({type:'detail',item})">
+							<view class="title">
+								<view class="name">{{item.dlName}}</view>									
+							</view>
+							<view class="item-row space-between">
+								<uni-tag :text="item.disasterLevelTitle" custom-style="background-color: #ecf5ff; border-color: #d9ecff; color: #409eff;"></uni-tag>
+								<uni-tag :text="item.disasterCatTitle" type="warning"></uni-tag>
+							</view>
+							<view class="bottom">
+								<view class="item-row space-between">
+									<view class="icon-item">
+										<uni-icons type="person-filled" size="15" color="#999"></uni-icons>
+										<text class="word">{{item.dlPeopleNum}}</text>
+									</view>
+									<view class="icon-item">
+										<uni-icons type="home-filled" size="15" color="#999"></uni-icons>
+										<text class="word">{{item.dlHouseNum}}</text>
+									</view>
+								</view>
+								<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>
+					</uni-swipe-action-item>
+				</uni-card>
+			</uni-swipe-action>
+			<uni-swipe-action class="item-action-box" v-if="tabIdx===1">
+				<uni-card padding="10px 0" margin="5px 0" v-for="(item,idx) in items" :key="item.rdId">
+					<uni-swipe-action-item class="item-action" :auto-close="true">
+						<template v-slot:right>
+							<view class="slot-button">
+								<view class="bt edit" @click="handle({type:'edit',item})"><text class="slot-button-text">编辑</text></view>
+								<view class="bt del" @click="handle({type:'del',item})"><text class="slot-button-text">删除</text></view>
+							</view>
+						</template>
+						<view class="item" @click="handle({type:'detail',item})">
+							<view class="title">
+								<view class="name">{{item.rdName}}</view>									
+							</view>
+							<view class="item-row space-between">
+								<view class="icon-item">
+									<uni-icons type="location-filled" size="15" color="#999"></uni-icons>
+									<text class="word">{{item.rdAddress}}</text>
+								</view>
+							</view>
+							<view class="bottom">
+								<view class="item-row space-between">
+									<view class="icon-item">
+										<uni-icons type="person-filled" size="15" color="#999"></uni-icons>
+										<text class="word">{{item.respName}}</text>
+									</view>
+									<view class="icon-item">
+										<uni-icons type="phone-filled" size="15" color="#999"></uni-icons>
+										<text class="word">{{item.respPhone}}</text>
+									</view>
+								</view>
+								<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>
+					</uni-swipe-action-item>
+				</uni-card>
+			</uni-swipe-action>
+		</view>
+		<CreateDisaster ref="disaster" @success="getData"></CreateDisaster>
+		<CreateReservoir ref="reservoir" @success="getData"></CreateReservoir>		
+		<Detail ref="detail" :type="tabIdx===0?'dl':'rd'" ></Detail>
 	</view>
 </template>
 
 <script>
+	import disasterApi from '@/api/disaster.js'
+	import CreateDisaster from './components/CreateDisaster.vue'
+	import CreateReservoir from './components/CreateReservoir.vue'
+	import Detail from './components/Detail.vue'				
 	export default {
+		components:{
+			CreateDisaster,
+			CreateReservoir,
+			Detail
+		},
 		data() {
 			return {
-				
+				tabIdx:0,			
+				tabs:['地质灾害点','水库淤堤坝'],
+				items:[],
+				keywords: ""
 			}
 		},
+		onShow() {
+			this.getData();
+			this.init()
+		},
 		methods: {
-			
+			changeTab({currentIndex}){
+				if (this.tabIdx !== currentIndex) {
+					this.tabIdx = currentIndex	
+					this.getData()
+				}
+			},
+			init(){		
+				if(!uni.getStorageSync('disasterLevels')){
+					disasterApi.getDisasterLevelByList().then((res)=>{
+						uni.setStorageSync('disasterLevels',res.data)
+					})
+					disasterApi.getDisasterCatByList().then((res)=>{
+						uni.setStorageSync('disasterCats',res.data)
+					})
+				}
+			},
+			search(){
+				this.getData()
+			},
+			getData(){
+				const getDataList=this.tabIdx===0?disasterApi.getDisasterLocationByList:disasterApi.getReservoirDamByPage
+				getDataList({keywords:this.keywords}).then((res)=>{
+					this.items=res.data
+				})
+			},
+			handle({type,item}){
+				if(type==='detail'){					
+					this.$refs.detail.show(item)
+				}else if(type==='del'){
+					const deleteById=this.tabIdx===0?disasterApi.deleteDisasterLocationById:disasterApi.deleteReservoirDamById;
+					const id=this.tabIdx===0?item.dlId:item.rdId
+					uni.showModal({
+						title: '提示',
+						content: '是否确定删除',
+						success: function (res) {
+							if (res.confirm) {
+								deleteBoundById(id).then(()=>{
+									uni.showToast({
+										title:'删除成功!',
+										icon:'none'
+									})
+									self.getData()
+								})					
+							}
+						}
+					});					
+				}else{
+					if(this.tabIdx===0){
+						this.$refs.disaster.show(type,item)	
+					}else{
+						this.$refs.reservoir.show(type,item)	
+					}									
+				}
+			}
 		}
 	}
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+.page-wrap{
+	padding:0 20rpx;
+	.pageTabs{
+		background-color: #fff;
+	}
+	.head{
+		margin-top: 20rpx;
+		.handle{
+			display: inline-block;
+			// background-color: #007aff;
+			color: #777777;
+			text-align: center;
+			padding:16rpx 20rpx;
+			border-radius: 30rpx;
+			// border: 1px solid #007aff;
+			font-size: 28rpx;
+			line-height: 1;
+			box-shadow: 0 0 4px rgba(0, 0, 0, 0.3);
+		}
+		.addbt{
+			width: 100rpx;
+			height: 100rpx;
+			border-radius: 50%;
+			color: #fff;
+			background-color: rgba(64,158,255,0.6);			
+			box-shadow:0 0 10rpx rgba(0,0,0,0.6);
+			position: fixed;
+			right: 10rpx;
+			bottom: 20%;
+			z-index: 99;
+			text-align: center;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			.word{
+				width: 80rpx;
+				height: 80rpx;
+				border-radius: 50%;
+				margin: 5rpx auto;
+				font-size: 28rpx;
+				letter-spacing: 2px;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+	}
+	.pageMain{
+		margin-top: 20rpx;
+		background-color: #f5f5f5;
+		padding-bottom: 50rpx;
+		.slot-button{
+			width: 400rpx;
+			height: 100%;
+			display: flex;
+			flex-direction: row;
+			justify-content: center;
+			align-items: center;
+			color: #fff;
+			padding-left: 10px;
+			.bt{
+				width: 50%;
+				height: 100%;
+				font-size: 30rpx;
+				box-sizing: border-box;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				&.edit{
+				    background-color:#007aff;
+				}
+				&.del{
+					background-color:#F56C6C;
+				}
+				&.detail{
+					background-color: #e6a23c;
+				}
+			}
+		}
+		.item{
+			color: #666;
+			.name{
+				font-size: 32rpx;
+				color: #222222;
+				line-height: 1;
+				padding-bottom: 10rpx;
+			}
+			image{
+				&.icon{
+					width: 30rpx;
+					height: 30rpx;
+					display: block;
+				}
+			}
+			.item-row{
+				display: flex;
+				align-items: center;
+				padding-top: 14rpx;
+				&.space-between{
+					justify-content: space-between;
+				}
+			}
+			.icon-item{
+				display: flex;
+				align-items: center;
+				.word{
+					margin-left: 8rpx;
+					font-size: 24rpx;
+				}
+			}
+		}
+	}
+}
 </style>

+ 8 - 1
pages/duty/index.vue

@@ -48,7 +48,11 @@
 				</uni-swipe-action-item>
 			</uni-swipe-action>
 		</uni-list>
-		<div class="addbt" @click="onAdd">+</div>
+		<div class="addbt" @click="onAdd">
+			<view class="word">
+				<uni-icons type="plusempty" size="30" color="#fff"></uni-icons>
+			</view>
+		</div>
 		<AddForm ref="add" @success='getData' />
 	</view>
 </template>
@@ -180,6 +184,9 @@
 	top: 50%;
 	z-index: 99;
 	font-size: 60rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
 }
 .slot-button{
 	width: 260rpx;

+ 309 - 0
pages/goods/components/CreateBound.vue

@@ -0,0 +1,309 @@
+<template>
+	<uni-drawer ref="drawer" mode="left" :mask-click="false" width="85%" :maskClick='true'>
+		<scroll-view class="scroll-view" scroll-y="true">
+			<uni-section :title="'新增物资:' + (type==='in'?'入库':'出库')" type="line"></uni-section>
+			<view class="form-wrap" >
+				<uni-forms ref="form" label-position="top" :rules="rules" :model="form">					
+					<view class="inbound" v-if="type==='in'">
+						<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="inboundType" required>
+							<uni-data-select  v-model="form.inboundType" :localdata="inboundTypeList" placeholder="请选择入库类型" :clear="false"></uni-data-select>
+						</uni-forms-item>
+						<uni-forms-item label="物资种类" name="goodsCatId" required>
+							<uni-data-select v-model="form.goodsCatId" :localdata="goodsCats" placeholder="请选择物资种类" :clear="false"></uni-data-select>
+						</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 v-model="form.goodsNo" placeholder="请输入物资编号" :clearable="false" />
+						</uni-forms-item>													
+						<uni-forms-item label="存放位置" name="inboundLocation">
+							<uni-easyinput v-model="form.inboundLocation" placeholder="请输入存放位置" :clearable="false" />
+						</uni-forms-item>
+						<uni-forms-item label="物资名称" >
+							<uni-easyinput v-model="form.goodsTitle"  ></uni-easyinput>
+						</uni-forms-item>		
+						<uni-forms-item label="生产日期">
+							<uni-datetime-picker type="date" v-model="form.goodsPdDate" />
+						</uni-forms-item>
+						<uni-forms-item label="过期时间">
+							<uni-datetime-picker type="date" v-model="form.goodsExpDate"/>
+						</uni-forms-item>
+						<uni-forms-item label="物资说明">
+							<uni-easyinput type="textarea" :maxlength="1000" v-model="form.goodsDesc" placeholder="请输入物资说明" autoHeight ></uni-easyinput>
+							<view class="word-limit">{{form.goodsDesc.length||0}}/1000</view>
+						</uni-forms-item>
+					</view>
+					<view class="outbound" v-if="type==='out'">
+						<uni-card margin="10px 0">
+							<uni-list>
+								<uni-list-item  title="物资种类" >
+									<template v-slot:footer><uni-tag  :text="form.goodsCatTitle" type="success"></uni-tag></template>
+								</uni-list-item>
+								<uni-list-item  title="库存数量" >
+									<template v-slot:footer><uni-tag  :text="`${form.qty}`" type="primary"></uni-tag></template>
+								</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>
+					</view>
+					<uni-forms-item label="备注">
+						<uni-easyinput type="textarea" :maxlength="500"
+						 v-model="form.remark" autoHeight 
+						placeholder="请输入备注"></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>
+					<button class="cancel" type="default" @click="close">取消</button>
+				</view>
+			</view>	
+		</scroll-view>
+	</uni-drawer>
+</template>
+
+<script>
+	import goodsApi from '@/api/goods.js'	
+	import { parseTime } from '@/libs'
+	export default{
+		name:"CreateBound",
+		computed:{
+			ocId(){
+				let accountInfo=uni.getStorageSync('accountInfo')
+				if(!accountInfo)return undefined
+				return accountInfo.ocId
+			},
+			goodsCats(){
+				let goodsCats=uni.getStorageSync('goodsCats')
+				if(!goodsCats)return []
+				return goodsCats.map(item=>{
+					return{
+						value:item.goodsCatId,
+						text:item.goodsCatTitle
+					}
+				})
+			},
+			userList(){
+				let groupUser=uni.getStorageSync('groupUser')
+				let userList=[]
+				groupUser.map((item,index)=>{
+					userList.push({...item,value:`root-${index+1}`,text:item.name,disable:true})
+					if(Array.isArray(item.children)&&item.children.length>0){
+						userList=userList.concat(item.children.map(item=>{return{...item,value:item.accountId,text:item.accountName}}))
+					}			
+				})
+				return userList
+			}						
+		},
+		data(){
+			return{
+				type:undefined,
+				rules:{
+					accountId:{
+						rules:[
+							{
+								required: true,
+								errorMessage:this.type==='in'?'入库人员':'出库人员'
+							}					
+						],
+						validateTrigger:'submit'
+					},
+					intboundType:{
+						rules:[
+							{
+								required: true,
+								errorMessage:"请选择入库类型"
+							}					
+						],
+						validateTrigger:'submit'
+					},
+					outboundType:{
+						rules:[
+							{
+								required: true,
+								errorMessage:"请选择出库类型"
+							}					
+						],
+						validateTrigger:'submit'
+					},				
+					goodsCatId:{
+						rules:[
+							{
+								required: true,
+								errorMessage: '请选择物资种类',
+							}
+						],
+						validateTrigger:'submit'
+					},
+				},
+				inboundTypeList:[
+					{ value: 1, text: '正常入库' },
+					{ value: 2, text: '报溢' },
+				],
+				outboundTypeList:[
+					{ value: 1, text: '正常出库' },
+					{ value: 2, text: '报损' },
+					{ value: 3, text: '过期' },		
+				],
+				form:{
+					groupId: undefined,
+					groupName: undefined,
+					inboundId: 0,
+					inboundType: 1,
+					inboundTime: '',
+					inboundLocation: '',
+					accountId: "",
+					accountName:"",
+					goodsType: "",
+					goodsCatId: 1,
+					goodsCatTitle: '',
+					qty: 1,
+					goodsNo: '',
+					goodsTitle: '',
+					goodsPdDate: '',
+					goodsExpDate: '',
+					goodsDesc: '',
+					remark: '',
+					//out
+					outboundId: 0,
+					outboundType: 1,
+					outboundTime: '',
+					outboundLocation: ''
+				}
+			}
+		},
+		methods:{
+			resetForm(){
+				this.form={
+					groupId: undefined,
+					groupName: undefined,
+					inboundId: 0,
+					inboundType: 1,
+					inboundTime: '',
+					inboundLocation: '',
+					accountId: "",
+					accountName:"",
+					goodsType: "",
+					goodsCatId: 1,
+					goodsCatTitle: '',
+					qty: 1,
+					goodsNo: '',
+					goodsTitle: '',
+					goodsPdDate: '',
+					goodsExpDate: '',
+					goodsDesc: '',
+					remark: '',
+					//out
+					outboundId: 0,
+					outboundType: 1,
+					outboundTime: '',
+					outboundLocation: ''
+				}
+			},
+			onSubmit(){
+				this.$refs.form.validate().then(res=>{
+					let submitFx=this.type==='in'?goodsApi.createInbound:goodsApi.createOutbound
+					let user=this.userList.find(item=>this.form.accountId===item.accountId)
+					let goodsCat=this.goodsCats.find(item=>this.form.goodsCatId===item.value)
+					let params={
+						accountId: user.accountId,
+						accountName: user.accountName,
+						positionId: user.positionId,
+						positionName: user.positionName,
+						ocId:this.ocId,					
+						goodsType: this.form.goodsType,
+						goodsCatId: goodsCat.value,
+						goodsCatTitle:goodsCat.text,
+						qty: this.form.qty,
+						remark: this.form.remark
+					}
+					if(this.type==='in'){
+						params={...params,
+							goodsNo:this.form.goodsNo,
+							goodsTitle: this.form.goodsTitle,
+							goodsPdDate:this.form.goodsPdDate,
+							goodsExpDate: this.form.goodsExpDate,
+							goodsDesc: this.form.goodsDesc,
+							inboundId: this.form.inboundId,
+							inboundType: this.form.inboundType,
+							inboundTime: this.form.inboundTime,
+							inboundLocation: this.form.inboundLocation,
+						}
+					}else{
+						params={...params,
+							outboundId: this.form.outboundId,
+							outboundType: this.form.outboundType,
+							outboundTime: this.form.outboundTime,
+							outboundLocation: this.form.outboundLocation,
+						}
+					}
+					submitFx(params).then(()=>{
+						uni.showToast({
+							icon:"none",
+							title:"成功!!"
+						})
+						this.$emit('success',this.type==='in'?1:2)
+						this.close();
+					})
+
+				}).catch(err =>{
+					uni.showToast({
+						icon:"none",
+						title:"请检查填写信息!"
+					})
+				})
+			},
+			show({type,item}){
+				this.resetForm()
+				this.form={...this.form,...item}
+				this.type=type
+				this.$refs.drawer.open()
+			},
+			close(){
+				this.$refs.drawer.close()
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.scroll-view {
+		height: 100%;
+		padding: 20rpx;
+		box-sizing: border-box;
+		.form-wrap{
+			padding:40rpx;
+			.handle-container{
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				button{
+					width: 160rpx;
+					padding: 20rpx 16rpx;
+					line-height: 1;
+					font-size: 28rpx;
+					&.save{
+						background-color: #007aff;
+					}
+				}
+			}
+			.word-limit{
+				text-align: right;
+				padding: 10rpx 0;
+				color: #999;
+				font-size: 26rpx;
+			}
+		}
+	}
+</style>

+ 0 - 174
pages/goods/components/Inbound.vue

@@ -1,174 +0,0 @@
-<template>
-	<uni-drawer ref="drawer" mode="left" :mask-click="false" width="85%" :maskClick='true'>
-		<scroll-view class="scroll-view" scroll-y="true">
-			<view class="form-wrap" >
-				<uni-forms ref="form" label-position="top" :rules="rules" :model="form">
-					<uni-forms-item label="队伍名称" name="teamName" required>
-						<uni-easyinput v-model="form.teamName" placeholder="请输入队伍名称" :clearable="false" />
-					</uni-forms-item>
-					<uni-forms-item label="队伍类别" name="teamCatId" required>
-						<uni-data-select  v-model="form.teamCatId" :localdata="teamCats" placeholder="请选择值班人员" :clear="false"></uni-data-select>
-					</uni-forms-item>
-					<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="职责说明">
-						<uni-easyinput type="textarea" :maxlength="1000" v-model="form.teamDuty" placeholder="请输入职责说明" autoHeight ></uni-easyinput>
-						<view class="word-limit">{{form.teamDuty.length||0}}/1000</view>
-					</uni-forms-item>
-					<uni-forms-item label="说明">
-						<uni-easyinput type="textarea" :maxlength="500"
-						 v-model="form.teamDesc" autoHeight 
-						placeholder="请输入职责说明"></uni-easyinput>
-						<view class="word-limit">{{form.teamDesc.length||0}}/500</view>
-					</uni-forms-item>
-					<uni-forms-item label="排序" v-model="form.sortNo">
-						<uni-number-box :min="1"></uni-number-box>
-					</uni-forms-item>
-				</uni-forms>
-				<view class="handle-container">
-					<button class="save" type="primary" @click="onSubmit">保存</button>
-					<button class="cancel" type="default" @click="close">取消</button>
-				</view>
-			</view>	
-		</scroll-view>
-	</uni-drawer>
-</template>
-
-<script>
-	import teamApi from '@/api/team.js'	
-	export default{
-		name:"Inbound",
-		computed:{
-			teamCats(){
-				let teamCats=uni.getStorageSync('teamCat')
-				return teamCats.map(item=>{
-					return{
-						value:item.teamCatId,
-						text:item.teamCatTitle
-					}
-				})
-			},
-			userList(){
-				let groupUser=uni.getStorageSync('groupUser')
-				let userList=[]
-				groupUser.map((item,index)=>{
-					userList.push({...item,value:`root-${index+1}`,text:item.name,disable:true})
-					if(Array.isArray(item.children)&&item.children.length>0){
-						userList=userList.concat(item.children.map(item=>{return{...item,value:item.accountId,text:item.accountName}}))
-					}			
-				})
-				return userList
-			}			
-		},
-		data(){
-			return{
-				type:undefined,
-				rules:{
-					teamName:{
-						rules:[
-							{
-								required: true,
-								errorMessage: '请输入队伍名称'
-							}					
-						],
-						validateTrigger:'submit'
-					},
-					teamCatId:{
-						rules:[
-							{
-								required: true,
-								errorMessage: '请选择队伍类别',
-							}
-						],
-						validateTrigger:'submit'
-					},
-				},
-				form:{
-					teamId: 0,
-					teamName: '',
-					teamType: 1,
-					teamCatId: 1,
-					teamDuty: '',
-					teamDesc: '',
-					sortNo: 1
-				}
-			}
-		},
-		methods:{
-			resetForm(){
-				this.form={
-					teamId: 0,
-					teamName: '',
-					teamType: 1,
-					teamCatId: 1,
-					teamDuty: '',
-					teamDesc: '',
-					sortNo: 1
-				}
-			},
-			onSubmit(){
-				this.$refs.form.validate().then(res=>{
-					let submitFx=this.type==='add'?teamApi.create:teamApi.update
-					submitFx(this.form).then(()=>{
-						uni.showToast({
-							icon:"none",
-							title:"成功!!"
-						})
-						this.$emit('success')
-						this.close();
-					})
-
-				}).catch(err =>{
-					uni.showToast({
-						icon:"none",
-						title:"请检查填写信息!"
-					})
-				})
-			},
-			show(type,item){
-				this.resetForm()
-				if(type==='edit'){
-					this.form={...item}
-				}else{
-					this.form.teamType=item
-				}
-				this.type=type
-				this.$refs.drawer.open()
-			},
-			close(){
-				this.$refs.drawer.close()
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.scroll-view {
-		height: 100%;
-		padding: 20rpx;
-		box-sizing: border-box;
-		.form-wrap{
-			padding:40rpx;
-			.handle-container{
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				button{
-					width: 160rpx;
-					padding: 20rpx 16rpx;
-					line-height: 1;
-					font-size: 28rpx;
-					&.save{
-						background-color: #007aff;
-					}
-				}
-			}
-			.word-limit{
-				text-align: right;
-				padding: 10rpx 0;
-				color: #999;
-				font-size: 26rpx;
-			}
-		}
-	}
-</style>

+ 0 - 174
pages/goods/components/Outbound.vue

@@ -1,174 +0,0 @@
-<template>
-	<uni-drawer ref="drawer" mode="left" :mask-click="false" width="85%" :maskClick='true'>
-		<scroll-view class="scroll-view" scroll-y="true">
-			<view class="form-wrap" >
-				<uni-forms ref="form" label-position="top" :rules="rules" :model="form">
-					<uni-forms-item label="队伍名称" name="teamName" required>
-						<uni-easyinput v-model="form.teamName" placeholder="请输入队伍名称" :clearable="false" />
-					</uni-forms-item>
-					<uni-forms-item label="队伍类别" name="teamCatId" required>
-						<uni-data-select  v-model="form.teamCatId" :localdata="teamCats" placeholder="请选择值班人员" :clear="false"></uni-data-select>
-					</uni-forms-item>
-					<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="职责说明">
-						<uni-easyinput type="textarea" :maxlength="1000" v-model="form.teamDuty" placeholder="请输入职责说明" autoHeight ></uni-easyinput>
-						<view class="word-limit">{{form.teamDuty.length||0}}/1000</view>
-					</uni-forms-item>
-					<uni-forms-item label="说明">
-						<uni-easyinput type="textarea" :maxlength="500"
-						 v-model="form.teamDesc" autoHeight 
-						placeholder="请输入职责说明"></uni-easyinput>
-						<view class="word-limit">{{form.teamDesc.length||0}}/500</view>
-					</uni-forms-item>
-					<uni-forms-item label="排序" v-model="form.sortNo">
-						<uni-number-box :min="1"></uni-number-box>
-					</uni-forms-item>
-				</uni-forms>
-				<view class="handle-container">
-					<button class="save" type="primary" @click="onSubmit">保存</button>
-					<button class="cancel" type="default" @click="close">取消</button>
-				</view>
-			</view>	
-		</scroll-view>
-	</uni-drawer>
-</template>
-
-<script>
-	import teamApi from '@/api/team.js'	
-	export default{
-		name:"Inbound",
-		computed:{
-			teamCats(){
-				let teamCats=uni.getStorageSync('teamCat')
-				return teamCats.map(item=>{
-					return{
-						value:item.teamCatId,
-						text:item.teamCatTitle
-					}
-				})
-			},
-			userList(){
-				let groupUser=uni.getStorageSync('groupUser')
-				let userList=[]
-				groupUser.map((item,index)=>{
-					userList.push({...item,value:`root-${index+1}`,text:item.name,disable:true})
-					if(Array.isArray(item.children)&&item.children.length>0){
-						userList=userList.concat(item.children.map(item=>{return{...item,value:item.accountId,text:item.accountName}}))
-					}			
-				})
-				return userList
-			}			
-		},
-		data(){
-			return{
-				type:undefined,
-				rules:{
-					teamName:{
-						rules:[
-							{
-								required: true,
-								errorMessage: '请输入队伍名称'
-							}					
-						],
-						validateTrigger:'submit'
-					},
-					teamCatId:{
-						rules:[
-							{
-								required: true,
-								errorMessage: '请选择队伍类别',
-							}
-						],
-						validateTrigger:'submit'
-					},
-				},
-				form:{
-					teamId: 0,
-					teamName: '',
-					teamType: 1,
-					teamCatId: 1,
-					teamDuty: '',
-					teamDesc: '',
-					sortNo: 1
-				}
-			}
-		},
-		methods:{
-			resetForm(){
-				this.form={
-					teamId: 0,
-					teamName: '',
-					teamType: 1,
-					teamCatId: 1,
-					teamDuty: '',
-					teamDesc: '',
-					sortNo: 1
-				}
-			},
-			onSubmit(){
-				this.$refs.form.validate().then(res=>{
-					let submitFx=this.type==='add'?teamApi.create:teamApi.update
-					submitFx(this.form).then(()=>{
-						uni.showToast({
-							icon:"none",
-							title:"成功!!"
-						})
-						this.$emit('success')
-						this.close();
-					})
-
-				}).catch(err =>{
-					uni.showToast({
-						icon:"none",
-						title:"请检查填写信息!"
-					})
-				})
-			},
-			show(type,item){
-				this.resetForm()
-				if(type==='edit'){
-					this.form={...item}
-				}else{
-					this.form.teamType=item
-				}
-				this.type=type
-				this.$refs.drawer.open()
-			},
-			close(){
-				this.$refs.drawer.close()
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-	.scroll-view {
-		height: 100%;
-		padding: 20rpx;
-		box-sizing: border-box;
-		.form-wrap{
-			padding:40rpx;
-			.handle-container{
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				button{
-					width: 160rpx;
-					padding: 20rpx 16rpx;
-					line-height: 1;
-					font-size: 28rpx;
-					&.save{
-						background-color: #007aff;
-					}
-				}
-			}
-			.word-limit{
-				text-align: right;
-				padding: 10rpx 0;
-				color: #999;
-				font-size: 26rpx;
-			}
-		}
-	}
-</style>

+ 19 - 10
pages/goods/components/RecordEdit.vue

@@ -8,7 +8,7 @@
 						<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="inboundType" v-if="type==='in'" required>
+						<uni-forms-item label="入库类型" name="inboundType"  required>
 							<uni-data-select  v-model="form.inboundType" :localdata="inboundTypeList" placeholder="请选择入库类型" :clear="false"></uni-data-select>
 						</uni-forms-item>
 						<uni-forms-item label="物资种类" name="goodsCatId" required>
@@ -17,6 +17,9 @@
 						<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 v-model="form.goodsNo" placeholder="请输入物资编号" :clearable="false" />
+						</uni-forms-item>	
 						<uni-forms-item label="存放位置" name="inboundLocation" required>
 							<uni-easyinput v-model="form.inboundLocation" placeholder="请输入存放位置" :clearable="false" />
 						</uni-forms-item>
@@ -58,7 +61,7 @@
 					<uni-forms-item label="备注">
 						<uni-easyinput type="textarea" :maxlength="500"
 						 v-model="form.remark" autoHeight 
-						placeholder="remark"></uni-easyinput>
+						placeholder="请输入备注"></uni-easyinput>
 						<view class="word-limit">{{form.remark.length||0}}/500</view>
 					</uni-forms-item>
 				</uni-forms>
@@ -77,6 +80,11 @@
 	export default{
 		name:"RecordEdit",
 		computed:{
+			ocId(){
+				let accountInfo=uni.getStorageSync('accountInfo')
+				if(!accountInfo)return undefined
+				return accountInfo.ocId
+			},
 			goodsCats(){
 				let goodsCats=uni.getStorageSync('goodsCats')
 				if(!goodsCats)return []
@@ -213,20 +221,21 @@
 						accountId: user.accountId,
 						accountName: user.accountName,
 						positionId: user.positionId,
-						positionName: user.positionName,					
+						positionName: user.positionName,
+						ocId:this.ocId,												
 						goodsType: this.form.goodsType,
 						goodsCatId: goodsCat.value,
 						goodsCatTitle:goodsCat.text,
-						qty: this.form.inboundId,
-						goodsNo:this.form.goodsNo,
-						goodsTitle: this.form.goodsTitle,
-						goodsPdDate:this.form.goodsPdDate,
-						goodsExpDate: this.form.goodsExpDate,
-						goodsDesc: this.form.goodsDesc,
-						remark: this.form.remark,
+						qty: this.form.qty,
+						remark: this.form.remark
 					}
 					if(this.type==='in'){
 						params={...params,
+							goodsNo:this.form.goodsNo,
+							goodsTitle: this.form.goodsTitle,
+							goodsPdDate:this.form.goodsPdDate,
+							goodsExpDate: this.form.goodsExpDate,
+							goodsDesc: this.form.goodsDesc,
 							inboundId: this.form.inboundId,
 							inboundType: this.form.inboundType,
 							inboundTime: this.form.inboundTime,

+ 27 - 14
pages/goods/index.vue

@@ -31,27 +31,28 @@
 				</view>			
 			</uni-card>
 		</view>
-		<Inbound ref="inbound"></Inbound>
-		<Outbound ref="outbound"></Outbound>
+		<CreateBound ref="bound" @success="onBoundSuccess"></CreateBound>
 	</view>
 </template>
 
 <script>
-	import Inbound from './components/Inbound.vue'
-	import Outbound from './components/Outbound.vue'
+	import CreateBound from './components/CreateBound.vue'
 	
 	import goodsApi from '@/api/goods.js'	
 	export default {
 		components:{
-			Inbound,
-			Outbound
+			CreateBound
+		},
+		computed:{
+			goodsType(){
+				return this.tabIdx+1
+			}
 		},
 		data() {
 			return {
 				tabIdx:0,			
 				tabs:['行业物质','镇办物资'],
 				items:[],
-				goodsType: 1,
 				keywords: ""
 			}
 		},
@@ -79,10 +80,18 @@
 				})
 			},
 			onInbound(){
-				this.$refs.inbound.show()
+				this.$refs.bound.show({type:'in',item:{goodsType:this.tabIdx+1}})
+			},
+			onOutbound(item){
+				this.$refs.bound.show({type:'out',item:{
+					...item,
+					goodsType:this.tabIdx+1
+				}})
 			},
-			onOutbound(){
-				this.$refs.outbound.show()
+			onBoundSuccess(type){
+				uni.navigateTo({
+					url:`/pages/goods/record?type=${type}`
+				})
 			},
 			linkToRecord(){
 				uni.navigateTo({
@@ -103,13 +112,14 @@
 		margin-top: 20rpx;
 		.handle{
 			display: inline-block;
-			background-color: #007aff;
-			color: #fff;
+			// background-color: #007aff;
+			color: #777777;
 			text-align: center;
 			padding:16rpx 20rpx;
-			border-radius: 6rpx;
-			border: 1px solid #007aff;
+			border-radius: 30rpx;
+			// border: 1px solid #007aff;
 			font-size: 28rpx;
+			line-height: 1;
 			box-shadow: 0 0 4px rgba(0, 0, 0, 0.3);
 		}
 		.addbt{
@@ -134,6 +144,9 @@
 				margin: 5rpx auto;
 				font-size: 28rpx;
 				letter-spacing: 2px;
+				display: flex;
+				justify-content: center;
+				align-items: center;
 			}
 		}
 	}

+ 2 - 0
pages/goods/record.vue

@@ -60,6 +60,8 @@
 		},
 		onLoad({type}) {
 			this.goodsType=type
+			this.tabIdx=type- 1
+			this.resetFilter()
 			this.getData()
 		},
 		methods: {

+ 1 - 1
pages/index/index.vue

@@ -61,7 +61,7 @@
 					<uni-icons type="right" color="#777" size="30"></uni-icons>
 				</view>
 			</view>
-			<view class="duty-item" v-for="(duty,index) in dutys" :key="`${duty.accountId+index}`">
+			<view class="duty-item" v-for="(duty,index) in dutys" :key="duty.accountId">
 					<view class="avatar">
 						<image class="icon" src="/static/images/avatar.png" mode=""></image>
 					</view>

+ 243 - 0
pages/industry/components/Create.vue

@@ -0,0 +1,243 @@
+<template>
+	<uni-drawer ref="drawer" mode="left" :mask-click="false" width="85%" :maskClick='true'>
+		<scroll-view class="scroll-view" scroll-y="true">
+			<uni-section :title="(type==='add'?'新增':'编辑') +'企业' " type="line"></uni-section>
+			<view class="form-wrap" >
+				<uni-forms ref="form" label-position="top" :rules="rules" :model="form" :label-width="300">
+					<uni-forms-item label="企业名称" name="entName"  required>
+						<uni-easyinput v-model="form.entName" placeholder="请输入企业名称"  />
+					</uni-forms-item>	
+					<uni-forms-item label="企业分类" name="entCatId" required>
+						<uni-data-select  v-model="form.entCatId" :localdata="entCats" placeholder="请选择企业分类" :clear="false"></uni-data-select>
+					</uni-forms-item>
+					<uni-forms-item label="统一信用编码">
+						<uni-easyinput v-model="form.entUscc" placeholder="请输入统一信用编码"  />
+					</uni-forms-item>
+					<uni-forms-item label="法定代表人">
+						<uni-easyinput v-model="form.entLegalRepresentative" placeholder="请输入法定代表人"  />
+					</uni-forms-item>	
+					<uni-forms-item label="经营范围">
+						<uni-easyinput type="textarea" :maxlength="300"
+						 v-model="form.entBusinessScope" autoHeight 
+						placeholder="请输入经营范围"></uni-easyinput>
+						<view class="word-limit">{{form.entBusinessScope.length||0}}/300</view>
+					</uni-forms-item>									
+					<uni-forms-item label="生产经营地址">
+						<uni-easyinput v-model="form.entAddress" placeholder="请输入生产经营地址"  />
+					</uni-forms-item>								
+					<uni-forms-item label="负责人">
+						<uni-easyinput v-model="form.charger" placeholder="请输入负责人"  />
+					</uni-forms-item>													
+					<uni-forms-item label="负责人电话">
+						<uni-easyinput v-model="form.chargerPhone" type="number" placeholder="请输入负责人电话"  />
+					</uni-forms-item>														
+					<uni-forms-item label="安全负责人">
+						<uni-easyinput v-model="form.safetyManager" placeholder="请输入安全负责人"  />
+					</uni-forms-item>	
+					<uni-forms-item label="安全负责人电话">
+						<uni-easyinput v-model="form.safetyManagerPhone" type="number" placeholder="请输入安全负责人电话"  />
+					</uni-forms-item>																		
+					<uni-forms-item label="是否设置安全机构">							
+						<uni-data-checkbox v-model="form.ifSafetyDepartment" :localdata="[{value:1,text:'有'},{value:0,text:'无'}]" />
+					</uni-forms-item>	
+					<uni-forms-item label="从业人员数量">
+						<uni-easyinput v-model="form.staffNum" type="number" placeholder="请输入从业人员数量"  />
+					</uni-forms-item>																						
+					<uni-forms-item label="特种作业人员数量">
+						<uni-easyinput v-model="form.staffSpecialNum" type="number" placeholder="请输入特种作业人员数量"  />
+					</uni-forms-item>	
+					<uni-forms-item label="专职安全生产管理人员数量">
+						<uni-easyinput v-model="form.staffSafetyNum" type="number" placeholder="请输入专职安全生产管理人员数量"  />
+					</uni-forms-item>																													
+					<uni-forms-item label="注册安全工程师人员数">
+						<uni-easyinput v-model="form.staffCertifiedEngineerNum" type="number" placeholder="请输入注册安全工程师人员数"  />
+					</uni-forms-item>																																																			
+					<uni-forms-item label="安全标准化等级">
+						<uni-data-select  v-model="form.safetyStandardLevel" :localdata="standardLevelOptions" placeholder="请选择企业分类" :clear="false"></uni-data-select>
+					</uni-forms-item>	
+					<uni-forms-item label="安全许可证号码">
+						<uni-easyinput v-model="form.staffSafetyNum" placeholder="请输入安全许可证号码"  />
+					</uni-forms-item>	
+					<uni-forms-item label="是否重点企业">
+						<uni-data-checkbox v-model="form.isMajor" :localdata="isMajors" />
+					</uni-forms-item>																																																																									
+					<uni-forms-item label="说明">
+						<uni-easyinput type="textarea" :maxlength="500"
+						 v-model="form.remark" autoHeight 
+						placeholder="请输入备注"></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>
+					<button class="cancel" type="default" @click="close">取消</button>
+				</view>
+			</view>	
+		</scroll-view>
+	</uni-drawer>
+</template>
+
+<script>
+	import industryApi from '@/api/industry.js'
+	export default{
+		name:"CreateIndustry",
+		computed:{
+			entCats(){
+				let entCats=uni.getStorageSync('entCats')
+				if(!entCats)return []
+				return entCats.map(item=>{
+					return{
+						value:item.entCatId,
+						text:item.entCatTitle
+					}
+				})
+			}						
+		},
+		data(){
+			return{
+				type:undefined,
+				rules:{
+					entName:{
+						rules:[
+							{
+								required: true,
+								errorMessage:"请输入企业名称"
+							}					
+						],
+						validateTrigger:'submit'
+					},
+					entCatId:{
+						rules:[
+							{
+								required: true,
+								errorMessage:"请选择企业分类"
+							}					
+						],
+						validateTrigger:'submit'
+					}
+				},
+				standardLevelOptions:[
+					{ value: 0, text: '末达标' },
+					{ value: 1, text: '一级' },
+					{ value: 2, text: '二级' },
+					{ value: 3, text: '三级' }
+				],
+				ifSafetyDepartments:[
+					{value:1,text:'有'},
+					{value:0,text:'无'},
+				],
+				isMajors:[
+					{value:1,text:'是'},
+					{value:0,text:'否'},
+				],
+				form:{
+					entId: 0,
+					entCatId: 1,
+					entName: '',
+					entUscc: '',
+					entLegalRepresentative: '',
+					entBusinessScope: '',
+					entAddress: '',
+					charger: '',
+					chargerPhone: '',
+					safetyManager: '',
+					safetyManagerPhone: '',
+					ifSafetyDepartment: 0,
+					staffNum: 0,
+					staffSpecialNum: 0,
+					staffSafetyNum: 0,
+					staffCertifiedEngineerNum: 0,
+					safetyStandardLevel: 0,
+					safetyCertNo: '',
+					remark: '',
+					isMajor: 0
+				}
+			}
+		},
+		methods:{
+			resetForm(){
+				this.form={
+					entId: 0,
+					entCatId: 1,
+					entName: '',
+					entUscc: '',
+					entLegalRepresentative: '',
+					entBusinessScope: '',
+					entAddress: '',
+					charger: '',
+					chargerPhone: '',
+					safetyManager: '',
+					safetyManagerPhone: '',
+					ifSafetyDepartment: 0,
+					staffNum: 0,
+					staffSpecialNum: 0,
+					staffSafetyNum: 0,
+					staffCertifiedEngineerNum: 0,
+					safetyStandardLevel: 0,
+					safetyCertNo: '',
+					remark: '',
+					isMajor: 0
+				}
+			},
+			onSubmit(){
+				this.$refs.form.validate().then(res=>{
+					let submitFx=this.type==='add'?industryApi.create:industryApi.update
+					submitFx(this.form).then(()=>{
+						uni.showToast({
+							icon:"none",
+							title:"成功!!"
+						})
+						this.$emit('success')
+						this.close();
+					})
+
+				}).catch(err =>{
+					console.log(err)
+					uni.showToast({
+						icon:"none",
+						title:"请检查填写信息!"
+					})
+				})
+			},
+			show({type,item}){
+				this.resetForm()
+				this.form={...this.form,...item}
+				this.type=type
+				this.$refs.drawer.open()
+			},
+			close(){
+				this.$refs.drawer.close()
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.scroll-view {
+		height: 100%;
+		padding: 20rpx;
+		box-sizing: border-box;
+		.form-wrap{
+			padding:40rpx;
+			.handle-container{
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				button{
+					width: 160rpx;
+					padding: 20rpx 16rpx;
+					line-height: 1;
+					font-size: 28rpx;
+					&.save{
+						background-color: #007aff;
+					}
+				}
+			}
+			.word-limit{
+				text-align: right;
+				padding: 10rpx 0;
+				color: #999;
+				font-size: 26rpx;
+			}
+		}
+	}
+</style>

+ 133 - 0
pages/industry/components/Detail.vue

@@ -0,0 +1,133 @@
+<template>
+	<uni-popup ref="popup" type="top">
+		<uni-section type="line"  :title="type==='dl'?'地质灾害点详情':'水库淤堤坝详情'">
+			<template v-slot:right>
+				<uni-icons type="closeempty" size="24" color="#999" @click="close"></uni-icons>
+			</template>		
+		</uni-section>
+		<view class="detail-cont">
+			<uni-list >
+				<uni-list-item :rightText="viewData.entName" title ="企业名称" ></uni-list-item>						
+				<uni-list-item :rightText="viewData.entCatTitle" title ="企业分类" ></uni-list-item>
+				<uni-list-item :rightText="viewData.entUscc" title ="统一信用编码"></uni-list-item>		
+				<uni-list-item :rightText="viewData.entLegalRepresentative" title ="法定代表人"></uni-list-item>						
+				<uni-list-item :rightText="viewData.entBusinessScope" title ="经营范围"></uni-list-item>													
+				<uni-list-item :rightText="viewData.entAddress" title ="生产经营地址"></uni-list-item>													
+				<uni-list-item :rightText="viewData.charger" title ="负责人"></uni-list-item>																		
+				<uni-list-item :rightText="viewData.chargerPhone" title ="负责人电话"></uni-list-item>																			
+				<uni-list-item :rightText="viewData.safetyManager" title ="安全负责人"></uni-list-item>						
+				<uni-list-item :rightText="viewData.safetyManagerPhone" title ="安全负责人电话"></uni-list-item>																																	
+				<uni-list-item :rightText="viewData.staffNum" title ="从业人员数量"></uni-list-item>																										
+				<uni-list-item :rightText="viewData.staffSpecialNum" title ="特种作业人员数量"></uni-list-item>						
+				<uni-list-item :rightText="viewData.staffSafetyNum" title ="专职安全生产管理人员数量"></uni-list-item>																																		
+				<uni-list-item :rightText="viewData.staffCertifiedEngineerNum" title ="注册安全工程师人员数"></uni-list-item>																																																							
+<!-- 				<uni-list-item :rightText="viewData.safetyStandardLevel" title ="安全标准化等级">	</uni-list-item>	 -->				
+				<uni-list-item :rightText="viewData.staffSafetyNum" title ="安全许可证号码"></uni-list-item>												
+				<uni-list-item title="备注" :note="viewData.remark"></uni-list-item>														
+			</uni-list>	
+			<view class="camerasbox">
+				<view class="item" v-for="item in cameras" :key="item.cameraId">
+					<view class="item-card">
+						<view class="title" v-if="item.cameraTitle">{{item.cameraTitle}}</view>
+						<uni-icons type="videocam-filled" size="40" color="#999" @click="showCamera"></uni-icons>
+					</view>		
+				</view>		
+			</view>			
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	import industry from '@/api/industry.js'
+	export default{
+		name:"DisasteDetail",
+		props:{
+			type:{
+				type:[String,Number],
+				default:'dl'
+			}
+		},
+		data(){
+			return{
+				viewData:{
+					groupId: 0,
+					groupName: '',
+					dlName: '',
+					dlAddress: '',
+					dlCatId: 1,
+					dlLevelId: 1,
+					dlPeopleNum: 0,
+					dlHouseNum: 0,
+					remark: '',
+					//水库淤堤坝详情
+					rdId: 0,
+					rdName: '',
+					rdAddress: '',
+					respName: '',
+					respPhone: ''
+				},
+				cameras:[]
+			}
+		},
+		methods:{
+			showCamera(){
+
+			},
+			show(item){
+				this.$refs.popup.open('bottom')
+				this.viewData={...item}
+				if(item.cameraNum>0){
+					this.getCameras()
+				}
+			},
+			getCameras(){
+				industry.getCameraByListWithEnt(this.viewData.entId).then((res)=>{
+					this.cameras=res.data;
+				})
+			},
+			close(){
+				this.$refs.popup.close()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.detail-cont{
+		&{
+			max-height: 80vh;
+			overflow-y: auto;
+		}
+		.camerasbox{
+			width:100%;
+			display: flex;
+			align-items: center;
+			flex-wrap: wrap;
+			background-color: #fff;
+			.item{
+				width: 33.33%;		
+				padding: 20rpx;
+				background-color: #fff;
+				box-sizing: border-box;
+				.item-card{
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					flex-direction: column;
+					box-shadow: 0 0 1px rgba(0,0,0,0.6);
+					padding: 20rpx;
+					.title{
+						width: 100%;
+						font-size: 24rpx;
+						color: #424242;
+						line-height: 1.4;
+						padding-bottom: 15rpx;
+						overflow:hidden;
+						text-overflow:ellipsis;
+						white-space:nowrap;
+					}
+				}
+			}
+		}		
+	}
+</style>

+ 256 - 6
pages/industry/index.vue

@@ -1,22 +1,272 @@
 <template>
-	<view>
-		
+	<view class="page-wrap">
+		<view class="head">
+			<uni-card padding="0" margin="5px 0">
+				<uni-search-bar @confirm="search" v-model="keywords" @clear="search"></uni-search-bar>
+			</uni-card>
+			<view class="addbt" @click="handle({type:'add'})">
+				<view class="word"><uni-icons type="plusempty" size="30" color="#fff"></uni-icons></view>
+			</view>
+		</view>	
+		<view class="pageMain">
+			<uni-swipe-action class="item-action-box">
+				<uni-card padding="10px 0" margin="5px 0" v-for="(item,idx) in items" :key="item.entId">
+					<uni-swipe-action-item class="item-action" :auto-close="true">
+						<template v-slot:right>
+							<view class="slot-button">
+								<view class="bt edit" @click="handle({type:'edit',item})"><text class="slot-button-text">编辑</text></view>
+								<view class="bt del" @click="handle({type:'del',item})"><text class="slot-button-text">删除</text></view>
+							</view>
+						</template>
+						<view class="item" @click="handle({type:'detail',item})">
+							<view class="title">
+								<view class="name">{{item.entName}}</view>									
+							</view>
+							<view class="item-row space-between">
+								<view class="icon-item">
+									<uni-icons type="location-filled" size="15" color="#999"></uni-icons>
+									<text class="word">{{item.entAddress||'--'}}</text>
+								</view>
+							</view>
+							<view class="item-row space-between">
+								<uni-tag :text="item.entCatTitle" custom-style="background-color: #ecf5ff; border-color: #d9ecff; color: #409eff;"></uni-tag>
+							</view>
+							<view class="bottom">
+								<view class="item-row space-between">
+									<view class="icon-item">
+										<uni-icons type="person-filled" size="15" color="#999"></uni-icons>
+										<text class="word">{{item.charger||'--'}}【负责人】</text>
+									</view>
+									<view class="icon-item">
+										<uni-icons type="phone-filled" size="15" color="#999"></uni-icons>
+										<text class="word">{{item.chargerPhone||'--'}}</text>
+									</view>
+								</view>
+								<view class="item-row space-between">
+									<view class="icon-item">
+										<uni-icons type="auth-filled" size="15" color="#999"></uni-icons>
+										<text class="word">{{item.safetyManager||'--'}}【安全负责人】</text>
+									</view>
+									<view class="icon-item">
+										<uni-icons type="phone-filled" size="15" color="#999"></uni-icons>
+										<text class="word">{{item.safetyManagerPhone||'--'}}</text>
+									</view>
+								</view>
+								<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>
+					</uni-swipe-action-item>
+				</uni-card>
+			</uni-swipe-action>
+		</view>
+		<Create ref="industry" @success="search"></Create>	
+		<Detail ref="detail"></Detail>
 	</view>
 </template>
 
 <script>
+	import industryApi from '@/api/industry.js'
+	import Create from './components/Create.vue'
+	import Detail from './components/Detail.vue'				
 	export default {
+		components:{
+			Create,
+			Detail
+		},
 		data() {
 			return {
-				
+				items:[],
+				page:1,
+				limit:10,
+				total:0,	
+				keywords: ""
 			}
 		},
+		onShow() {
+			this.getData();
+			this.init()
+		},
 		methods: {
-			
+			init(){		
+				if(!uni.getStorageSync('entCats')){
+					industryApi.getCatByList().then((res)=>{
+						uni.setStorageSync('entCats',res.data)
+					})
+				}
+			},
+			search(){
+				this.resetFilter();
+				this.getData()
+			},
+			getData(){
+				industryApi.getByPage({
+					page:this.page,
+					limit:this.limit,
+					keywords:this.keywords
+				}).then((res)=>{
+					this.items=this.items.concat(res.data)
+				})
+			},
+			handle({type,item}){
+				const self=this;
+				if(type==='detail'){					
+					this.$refs.detail.show(item)
+				}else if(type==='del'){
+					uni.showModal({
+						title: '提示',
+						content: '是否确定删除',
+						success: function (res) {
+							if (res.confirm) {
+								industryApi.deleteById(item.entId).then(()=>{
+									uni.showToast({
+										title:'删除成功!',
+										icon:'none'
+									})
+									self.search()
+								})					
+							}
+						}
+					});					
+				}else{
+					this.$refs.industry.show({type,item})										
+				}
+			},
+			resetFilter(){
+				this.page = 1
+				this.limit = 10
+				this.total = 0
+				this.items=[]
+			}
+		},
+		onReachBottom() {
+			if(this.total>this.size*this.page){
+				this.page++
+				this.getData()				
+			}
 		}
 	}
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+.page-wrap{
+	padding:0 20rpx;
+	// position: fixed;
+	// left: 0;
+	// right: 0;
+	// height: 100%;
+	overflow-y: auto;
+	.pageTabs{
+		background-color: #fff;
+	}
+	.head{
+		margin-top: 20rpx;
+		.handle{
+			display: inline-block;
+			// background-color: #007aff;
+			color: #777777;
+			text-align: center;
+			padding:16rpx 20rpx;
+			border-radius: 30rpx;
+			// border: 1px solid #007aff;
+			font-size: 28rpx;
+			line-height: 1;
+			box-shadow: 0 0 4px rgba(0, 0, 0, 0.3);
+		}
+		.addbt{
+			width: 100rpx;
+			height: 100rpx;
+			border-radius: 50%;
+			color: #fff;
+			background-color: rgba(64,158,255,0.6);			
+			box-shadow:0 0 10rpx rgba(0,0,0,0.6);
+			position: fixed;
+			right: 10rpx;
+			bottom: 20%;
+			z-index: 99;
+			text-align: center;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			.word{
+				width: 80rpx;
+				height: 80rpx;
+				border-radius: 50%;
+				margin: 5rpx auto;
+				font-size: 28rpx;
+				letter-spacing: 2px;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+		}
+	}
+	.pageMain{
+		margin-top: 20rpx;
+		background-color: #f5f5f5;
+		padding-bottom: 50rpx;
+		.slot-button{
+			width: 400rpx;
+			height: 100%;
+			display: flex;
+			flex-direction: row;
+			justify-content: center;
+			align-items: center;
+			color: #fff;
+			padding-left: 10px;
+			.bt{
+				width: 50%;
+				height: 100%;
+				font-size: 30rpx;
+				box-sizing: border-box;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				&.edit{
+				    background-color:#007aff;
+				}
+				&.del{
+					background-color:#F56C6C;
+				}
+				&.detail{
+					background-color: #e6a23c;
+				}
+			}
+		}
+		.item{
+			color: #666;
+			.name{
+				font-size: 32rpx;
+				color: #222222;
+				line-height: 1;
+				padding-bottom: 10rpx;
+			}
+			image{
+				&.icon{
+					width: 30rpx;
+					height: 30rpx;
+					display: block;
+				}
+			}
+			.item-row{
+				display: flex;
+				align-items: center;
+				padding-top: 14rpx;
+				&.space-between{
+					justify-content: space-between;
+				}
+			}
+			.icon-item{
+				display: flex;
+				align-items: center;
+				.word{
+					margin-left: 8rpx;
+					font-size: 24rpx;
+				}
+			}
+		}
+	}
+}
 </style>

BIN
static/images/qiye.png


BIN
static/images/time.png


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/IndexBarChart.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/UniEcCanvas.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/danger/components/Create.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/danger/components/Detail.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/danger/index.js.map


+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/disaster/components/Create.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"names":[],"mappings":"","file":"pages/disaster/components/Create.js","sourceRoot":""}

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/disaster/components/CreateDisaster.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/disaster/components/CreateReservoir.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/disaster/components/Detail.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/disaster/index.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/duty/components/AddForm.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/duty/index.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/components/CreateBound.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/components/Inbound.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/components/Outbound.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/components/RecordDetail.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/components/RecordEdit.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/index.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/record.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/industry/components/Create.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/industry/components/Detail.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/industry/index.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/index.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/personalData/personalData.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/myCenter/updatePassword/updatePassword.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/team/components/MemberForm.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/team/components/TeamForm.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/team/index.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-card/components/uni-card/uni-card.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-drawer/components/uni-drawer/uni-drawer.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list-item/uni-list-item.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list/uni-list.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-section/components/uni-section/uni-section.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-segmented-control/components/uni-segmented-control/uni-segmented-control.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-table/components/uni-table/uni-table.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-table/components/uni-td/uni-td.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-table/components/uni-th/uni-th.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-table/components/uni-tr/table-checkbox.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-table/components/uni-tr/uni-tr.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-tag/components/uni-tag/uni-tag.js.map


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js.map


+ 28 - 28
unpackage/dist/dev/mp-weixin/common/main.js

@@ -1,9 +1,9 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["common/main"],{
 
 /***/ 0:
-/*!************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/main.js ***!
-  \************************************************/
+/*!**********************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/main.js ***!
+  \**********************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -29,9 +29,9 @@ createApp(app).$mount();
 /***/ }),
 
 /***/ 27:
-/*!************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/App.vue ***!
-  \************************************************/
+/*!**********************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/App.vue ***!
+  \**********************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -40,7 +40,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./App.vue?vue&type=script&lang=js& */ 28);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
 /* harmony import */ var _App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./App.vue?vue&type=style&index=0&lang=css& */ 38);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 40);
+/* harmony import */ var _software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 40);
 var render, staticRenderFns, recyclableRender, components
 var renderjs
 
@@ -50,7 +50,7 @@ var renderjs
 
 /* normalize component */
 
-var component = Object(_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
+var component = Object(_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
   _App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__["default"],
   render,
   staticRenderFns,
@@ -69,25 +69,25 @@ component.options.__file = "App.vue"
 /***/ }),
 
 /***/ 28:
-/*!*************************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/App.vue?vue&type=script&lang=js& ***!
-  \*************************************************************************/
+/*!***********************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/App.vue?vue&type=script&lang=js& ***!
+  \***********************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=script&lang=js& */ 29);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
- /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
+/* harmony import */ var _software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../software/HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=script&lang=js& */ 29);
+/* harmony import */ var _software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+ /* harmony default export */ __webpack_exports__["default"] = (_software_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
 /***/ 29:
-/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/Work/ZHCX/emergencyManagement/App.vue?vue&type=script&lang=js& ***!
-  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/work/Project_newGit/emergencyManagement/App.vue?vue&type=script&lang=js& ***!
+  \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -119,25 +119,25 @@ exports.default = _default;
 /***/ }),
 
 /***/ 38:
-/*!*********************************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/App.vue?vue&type=style&index=0&lang=css& ***!
-  \*********************************************************************************/
+/*!*******************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/App.vue?vue&type=style&index=0&lang=css& ***!
+  \*******************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../../HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!../../../HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--6-oneOf-1-3!../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=style&index=0&lang=css& */ 39);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__);
-/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
- /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 
+/* harmony import */ var _software_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_software_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_software_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../software/HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../../software/HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!../../../software/HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--6-oneOf-1-3!../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./App.vue?vue&type=style&index=0&lang=css& */ 39);
+/* harmony import */ var _software_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_software_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_software_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_software_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_software_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_software_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _software_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_software_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_software_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _software_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_software_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_software_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+ /* harmony default export */ __webpack_exports__["default"] = (_software_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_software_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_software_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_App_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
 /***/ 39:
-/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
-  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!./node_modules/postcss-loader/src??ref--6-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/Work/ZHCX/emergencyManagement/App.vue?vue&type=style&index=0&lang=css& ***!
-  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!./node_modules/postcss-loader/src??ref--6-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!E:/work/Project_newGit/emergencyManagement/App.vue?vue&type=style&index=0&lang=css& ***!
+  \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/mp-weixin/common/runtime.js


+ 403 - 107
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -164,9 +164,9 @@ module.exports = _construct, module.exports.__esModule = true, module.exports["d
 /***/ }),
 
 /***/ 151:
-/*!********************************************************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js ***!
-  \********************************************************************************************************/
+/*!******************************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-icons/components/uni-icons/uniicons_file_vue.js ***!
+  \******************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -2251,7 +2251,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"zhcxWXMIniProgram","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"zhcxWXMIniProgram","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败,请尽量确保 data 函数中不访问 vm 对象,否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -17479,7 +17479,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"zhcxWXMIniProgram","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"zhcxWXMIniProgram","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -17500,14 +17500,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"zhcxWXMIniProgram","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"zhcxWXMIniProgram","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"zhcxWXMIniProgram","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"zhcxWXMIniProgram","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -17603,7 +17603,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"zhcxWXMIniProgram","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"zhcxWXMIniProgram","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -18023,9 +18023,9 @@ internalMixin(Vue);
 /***/ }),
 
 /***/ 250:
-/*!********************************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/pages.json?{"type":"origin-pages-json"} ***!
-  \********************************************************************************/
+/*!******************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/pages.json?{"type":"origin-pages-json"} ***!
+  \******************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -18140,9 +18140,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 251:
-/*!*******************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/pages.json?{"type":"stat"} ***!
-  \*******************************************************************/
+/*!*****************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/pages.json?{"type":"stat"} ***!
+  \*****************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -18161,9 +18161,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 26:
-/*!***************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/pages.json ***!
-  \***************************************************/
+/*!*************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/pages.json ***!
+  \*************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 
@@ -18172,9 +18172,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 264:
-/*!***************************************************************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js ***!
-  \***************************************************************************************************************/
+/*!*************************************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpwxs.js ***!
+  \*************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -18251,9 +18251,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 265:
-/*!******************************************************************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js ***!
-  \******************************************************************************************************************/
+/*!****************************************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-swipe-action/components/uni-swipe-action-item/bindingx.js ***!
+  \****************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -18271,9 +18271,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 266:
-/*!*****************************************************************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js ***!
-  \*****************************************************************************************************************/
+/*!***************************************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-swipe-action/components/uni-swipe-action-item/mpother.js ***!
+  \***************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -18322,9 +18322,9 @@ module.exports = g;
 /***/ }),
 
 /***/ 30:
-/*!****************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/api/duty.js ***!
-  \****************************************************/
+/*!**************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/api/duty.js ***!
+  \**************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -18416,9 +18416,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 31:
-/*!********************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/libs/request.js ***!
-  \********************************************************/
+/*!******************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/libs/request.js ***!
+  \******************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -18549,9 +18549,9 @@ module.exports = runtime;
 /***/ }),
 
 /***/ 325:
-/*!***********************************************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/uni_modules/uni-forms/components/uni-forms/validate.js ***!
-  \***********************************************************************************************/
+/*!*********************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-forms/components/uni-forms/validate.js ***!
+  \*********************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -19241,9 +19241,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 326:
-/*!********************************************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/uni_modules/uni-forms/components/uni-forms/utils.js ***!
-  \********************************************************************************************/
+/*!******************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-forms/components/uni-forms/utils.js ***!
+  \******************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -19940,9 +19940,9 @@ module.exports = _asyncToGenerator, module.exports.__esModule = true, module.exp
 /***/ }),
 
 /***/ 35:
-/*!********************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/config/index.js ***!
-  \********************************************************/
+/*!******************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/config/index.js ***!
+  \******************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -19972,9 +19972,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 36:
-/*!*****************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/libs/auth.js ***!
-  \*****************************************************/
+/*!***************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/libs/auth.js ***!
+  \***************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -20004,9 +20004,9 @@ function removeToken() {
 /***/ }),
 
 /***/ 360:
-/*!***************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/static/js/wx-canvas.js ***!
-  \***************************************************************/
+/*!*************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/static/js/wx-canvas.js ***!
+  \*************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -20152,9 +20152,9 @@ exports.default = WxCanvas;
 /***/ }),
 
 /***/ 361:
-/*!*************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/static/js/echarts.js ***!
-  \*************************************************************/
+/*!***********************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/static/js/echarts.js ***!
+  \***********************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -38617,9 +38617,9 @@ exports.default = WxCanvas;
 /***/ }),
 
 /***/ 37:
-/*!******************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/api/system.js ***!
-  \******************************************************/
+/*!****************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/api/system.js ***!
+  \****************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -38726,9 +38726,9 @@ function selectGroupAllUser() {
 /***/ }),
 
 /***/ 376:
-/*!****************************************************************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/uni_modules/uni-transition/components/uni-transition/createAnimation.js ***!
-  \****************************************************************************************************************/
+/*!**************************************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-transition/components/uni-transition/createAnimation.js ***!
+  \**************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -39009,9 +39009,9 @@ function normalizeComponent (
 /***/ }),
 
 /***/ 403:
-/*!*********************************************************************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js ***!
-  \*********************************************************************************************************************/
+/*!*******************************************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js ***!
+  \*******************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -39036,9 +39036,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 404:
-/*!********************************************************************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json ***!
-  \********************************************************************************************************************/
+/*!******************************************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json ***!
+  \******************************************************************************************************************************/
 /*! exports provided: uni-datetime-picker.selectDate, uni-datetime-picker.selectTime, uni-datetime-picker.selectDateTime, uni-datetime-picker.startDate, uni-datetime-picker.endDate, uni-datetime-picker.startTime, uni-datetime-picker.endTime, uni-datetime-picker.ok, uni-datetime-picker.clear, uni-datetime-picker.cancel, uni-datetime-picker.year, uni-datetime-picker.month, uni-calender.MON, uni-calender.TUE, uni-calender.WED, uni-calender.THU, uni-calender.FRI, uni-calender.SAT, uni-calender.SUN, uni-calender.confirm, default */
 /***/ (function(module) {
 
@@ -39047,9 +39047,9 @@ module.exports = JSON.parse("{\"uni-datetime-picker.selectDate\":\"select date\"
 /***/ }),
 
 /***/ 405:
-/*!*************************************************************************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json ***!
-  \*************************************************************************************************************************/
+/*!***********************************************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json ***!
+  \***********************************************************************************************************************************/
 /*! exports provided: uni-datetime-picker.selectDate, uni-datetime-picker.selectTime, uni-datetime-picker.selectDateTime, uni-datetime-picker.startDate, uni-datetime-picker.endDate, uni-datetime-picker.startTime, uni-datetime-picker.endTime, uni-datetime-picker.ok, uni-datetime-picker.clear, uni-datetime-picker.cancel, uni-datetime-picker.year, uni-datetime-picker.month, uni-calender.SUN, uni-calender.MON, uni-calender.TUE, uni-calender.WED, uni-calender.THU, uni-calender.FRI, uni-calender.SAT, uni-calender.confirm, default */
 /***/ (function(module) {
 
@@ -39058,9 +39058,9 @@ module.exports = JSON.parse("{\"uni-datetime-picker.selectDate\":\"选择日期\
 /***/ }),
 
 /***/ 406:
-/*!*************************************************************************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json ***!
-  \*************************************************************************************************************************/
+/*!***********************************************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json ***!
+  \***********************************************************************************************************************************/
 /*! exports provided: uni-datetime-picker.selectDate, uni-datetime-picker.selectTime, uni-datetime-picker.selectDateTime, uni-datetime-picker.startDate, uni-datetime-picker.endDate, uni-datetime-picker.startTime, uni-datetime-picker.endTime, uni-datetime-picker.ok, uni-datetime-picker.clear, uni-datetime-picker.cancel, uni-datetime-picker.year, uni-datetime-picker.month, uni-calender.SUN, uni-calender.MON, uni-calender.TUE, uni-calender.WED, uni-calender.THU, uni-calender.FRI, uni-calender.SAT, uni-calender.confirm, default */
 /***/ (function(module) {
 
@@ -39069,9 +39069,9 @@ module.exports = JSON.parse("{\"uni-datetime-picker.selectDate\":\"選擇日期\
 /***/ }),
 
 /***/ 407:
-/*!***************************************************************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js ***!
-  \***************************************************************************************************************/
+/*!*************************************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js ***!
+  \*************************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -39520,9 +39520,9 @@ function fixIosDateFormat(value) {
 /***/ }),
 
 /***/ 41:
-/*!*****************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/uni.promisify.adaptor.js ***!
-  \*****************************************************************/
+/*!***************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni.promisify.adaptor.js ***!
+  \***************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -39545,9 +39545,9 @@ uni.addInterceptor({
 /***/ }),
 
 /***/ 415:
-/*!*********************************************************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js ***!
-  \*********************************************************************************************************/
+/*!*******************************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js ***!
+  \*******************************************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -39572,9 +39572,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 416:
-/*!********************************************************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json ***!
-  \********************************************************************************************************/
+/*!******************************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json ***!
+  \******************************************************************************************************************/
 /*! exports provided: uni-load-more.contentdown, uni-load-more.contentrefresh, uni-load-more.contentnomore, default */
 /***/ (function(module) {
 
@@ -39583,9 +39583,9 @@ module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"Pull up to show mo
 /***/ }),
 
 /***/ 417:
-/*!*************************************************************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json ***!
-  \*************************************************************************************************************/
+/*!***********************************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json ***!
+  \***********************************************************************************************************************/
 /*! exports provided: uni-load-more.contentdown, uni-load-more.contentrefresh, uni-load-more.contentnomore, default */
 /***/ (function(module) {
 
@@ -39594,9 +39594,9 @@ module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"上拉显示更多
 /***/ }),
 
 /***/ 418:
-/*!*************************************************************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json ***!
-  \*************************************************************************************************************/
+/*!***********************************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json ***!
+  \***********************************************************************************************************************/
 /*! exports provided: uni-load-more.contentdown, uni-load-more.contentrefresh, uni-load-more.contentnomore, default */
 /***/ (function(module) {
 
@@ -39605,9 +39605,9 @@ module.exports = JSON.parse("{\"uni-load-more.contentdown\":\"上拉顯示更多
 /***/ }),
 
 /***/ 48:
-/*!****************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/api/team.js ***!
-  \****************************************************/
+/*!**************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/api/team.js ***!
+  \**************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -39775,9 +39775,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 49:
-/*!*****************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/api/goods.js ***!
-  \*****************************************************/
+/*!***************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/api/goods.js ***!
+  \***************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -39980,9 +39980,9 @@ module.exports = _slicedToArray, module.exports.__esModule = true, module.export
 /***/ }),
 
 /***/ 50:
-/*!********************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/api/industry.js ***!
-  \********************************************************/
+/*!******************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/api/industry.js ***!
+  \******************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -40008,16 +40008,133 @@ var _default = {
       url: '/ent/statis/counterByCat',
       data: data
     });
+  },
+  // 分页查询
+  getByPage: function getByPage(data) {
+    return (0, _request.request)({
+      url: '/ent/page',
+      data: data
+    });
+  },
+  // 列表查询
+  getByList: function getByList(data) {
+    return (0, _request.request)({
+      url: '/ent',
+      data: data
+    });
+  },
+  // 基于ID查询
+  getById: function getById(entId) {
+    return (0, _request.request)({
+      url: "/ent/".concat(entId)
+    });
+  },
+  // 新增
+  create: function create(data) {
+    return (0, _request.request)({
+      url: '/ent/add',
+      method: 'POST',
+      data: data
+    });
+  },
+  // 更新
+  update: function update(data) {
+    return (0, _request.request)({
+      url: '/ent/update',
+      method: 'put',
+      data: data
+    });
+  },
+  // 删除
+  deleteById: function deleteById(entId) {
+    return (0, _request.request)({
+      url: "/ent/".concat(entId),
+      method: 'delete'
+    });
+  },
+  /*cat*/
+  getCatByList: function getCatByList(data) {
+    return (0, _request.request)({
+      url: '/ent/cat',
+      data: data
+    });
+  },
+  /*Camera*/
+  // 基于ID查询
+  getCameraByListWithEnt: function getCameraByListWithEnt(id) {
+    return (0, _request.request)({
+      url: "/camera/ent/".concat(id)
+    });
   }
 };
 exports.default = _default;
 
 /***/ }),
 
+/***/ 500:
+/*!*********************************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-search-bar/components/uni-search-bar/i18n/index.js ***!
+  \*********************************************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _en = _interopRequireDefault(__webpack_require__(/*! ./en.json */ 501));
+var _zhHans = _interopRequireDefault(__webpack_require__(/*! ./zh-Hans.json */ 502));
+var _zhHant = _interopRequireDefault(__webpack_require__(/*! ./zh-Hant.json */ 503));
+var _default = {
+  en: _en.default,
+  'zh-Hans': _zhHans.default,
+  'zh-Hant': _zhHant.default
+};
+exports.default = _default;
+
+/***/ }),
+
+/***/ 501:
+/*!********************************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-search-bar/components/uni-search-bar/i18n/en.json ***!
+  \********************************************************************************************************************/
+/*! exports provided: uni-search-bar.cancel, uni-search-bar.placeholder, default */
+/***/ (function(module) {
+
+module.exports = JSON.parse("{\"uni-search-bar.cancel\":\"cancel\",\"uni-search-bar.placeholder\":\"Search enter content\"}");
+
+/***/ }),
+
+/***/ 502:
+/*!*************************************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hans.json ***!
+  \*************************************************************************************************************************/
+/*! exports provided: uni-search-bar.cancel, uni-search-bar.placeholder, default */
+/***/ (function(module) {
+
+module.exports = JSON.parse("{\"uni-search-bar.cancel\":\"取消\",\"uni-search-bar.placeholder\":\"请输入搜索内容\"}");
+
+/***/ }),
+
+/***/ 503:
+/*!*************************************************************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json ***!
+  \*************************************************************************************************************************/
+/*! exports provided: uni-search-bar.cancel, uni-search-bar.placeholder, default */
+/***/ (function(module) {
+
+module.exports = JSON.parse("{\"uni-search-bar.cancel\":\"取消\",\"uni-search-bar.placeholder\":\"請輸入搜索內容\"}");
+
+/***/ }),
+
 /***/ 51:
-/*!******************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/api/danger.js ***!
-  \******************************************************/
+/*!****************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/api/danger.js ***!
+  \****************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -40043,6 +40160,185 @@ var _default = {
       url: '/danger/statis/counterByCat',
       data: data
     });
+  },
+  // 分页查询
+  getByPage: function getByPage(data) {
+    return (0, _request.request)({
+      url: '/danger/page',
+      data: data
+    });
+  },
+  // 列表查询
+  getByList: function getByList(data) {
+    return (0, _request.request)({
+      url: '/danger',
+      data: data
+    });
+  },
+  // 基于ID查询
+  getById: function getById(dangerId) {
+    return (0, _request.request)({
+      url: "/danger/".concat(dangerId)
+    });
+  },
+  // 新增
+  create: function create(data) {
+    return (0, _request.request)({
+      url: '/danger/add',
+      method: 'POST',
+      data: data
+    });
+  },
+  // 更新
+  update: function update(data) {
+    return (0, _request.request)({
+      url: '/danger/update',
+      method: 'put',
+      data: data
+    });
+  },
+  // 删除
+  deleteById: function deleteById(dangerId) {
+    return (0, _request.request)({
+      url: "/danger/".concat(dangerId),
+      method: 'delete'
+    });
+  },
+  // 新增
+  batchCreate: function batchCreate(data) {
+    return (0, _request.request)({
+      url: '/danger/batch/add',
+      method: 'POST',
+      data: data
+    });
+  }
+};
+exports.default = _default;
+
+/***/ }),
+
+/***/ 515:
+/*!******************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/api/disaster.js ***!
+  \******************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _request = __webpack_require__(/*! @/libs/request.js */ 31);
+var _default = {
+  /*地质*/
+  // 分页查询
+  getDisasterLocationByPage: function getDisasterLocationByPage(data) {
+    return (0, _request.request)({
+      url: '/disaster/location/page',
+      data: data
+    });
+  },
+  // 列表查询
+  getDisasterLocationByList: function getDisasterLocationByList(data) {
+    return (0, _request.request)({
+      url: '/disaster/location',
+      data: data
+    });
+  },
+  // 基于ID查询
+  getDisasterLocationById: function getDisasterLocationById(id) {
+    return (0, _request.request)({
+      url: "/disaster/location/".concat(id)
+    });
+  },
+  // 新增
+  createDisasterLocation: function createDisasterLocation(data) {
+    return (0, _request.request)({
+      url: '/disaster/location/add',
+      method: "post",
+      data: data
+    });
+  },
+  // 更新
+  updateDisasterLocation: function updateDisasterLocation(data) {
+    return (0, _request.request)({
+      url: '/disaster/location/update',
+      method: "put",
+      data: data
+    });
+  },
+  // 删除
+  deleteDisasterLocationById: function deleteDisasterLocationById(id) {
+    return (0, _request.request)({
+      url: "/disaster/location/".concat(id),
+      method: "delete"
+    });
+  },
+  // 规模等级列表
+  getDisasterLevelByList: function getDisasterLevelByList(data) {
+    return (0, _request.request)({
+      url: '/disaster/level',
+      data: data
+    });
+  },
+  // 灾害类型列表查询
+  getDisasterCatByList: function getDisasterCatByList(data) {
+    return (0, _request.request)({
+      url: '/disaster/cat',
+      data: data
+    });
+  },
+  /*自然*/
+  getReservoirDamByPage: function getReservoirDamByPage(data) {
+    return (0, _request.request)({
+      url: '/reservoir/dam/page',
+      data: data
+    });
+  },
+  // 列表查询
+  getReservoirDamByList: function getReservoirDamByList(data) {
+    return (0, _request.request)({
+      url: '/reservoir/dam',
+      data: data
+    });
+  },
+  // 基于ID查询
+  getReservoirDamById: function getReservoirDamById(id) {
+    return (0, _request.request)({
+      url: "/reservoir/dam/".concat(id)
+    });
+  },
+  // 新增
+  createReservoirDam: function createReservoirDam(data) {
+    return (0, _request.request)({
+      url: '/reservoir/dam/add',
+      method: "post",
+      data: data
+    });
+  },
+  // 更新
+  updateReservoirDam: function updateReservoirDam(data) {
+    return (0, _request.request)({
+      url: '/reservoir/dam/update',
+      method: "put",
+      data: data
+    });
+  },
+  // 删除
+  deleteReservoirDamById: function deleteReservoirDamById(id) {
+    return (0, _request.request)({
+      url: "/reservoir/dam/".concat(id),
+      method: "delete"
+    });
+  },
+  // 基于ID查询
+  getCameraByListWithLocation: function getCameraByListWithLocation(id) {
+    return (0, _request.request)({
+      url: "/camera/location/".concat(id)
+    });
   }
 };
 exports.default = _default;
@@ -40050,9 +40346,9 @@ exports.default = _default;
 /***/ }),
 
 /***/ 52:
-/*!******************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/libs/index.js ***!
-  \******************************************************/
+/*!****************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/libs/index.js ***!
+  \****************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -40235,9 +40531,9 @@ module.exports = _unsupportedIterableToArray, module.exports.__esModule = true,
 /***/ }),
 
 /***/ 81:
-/*!******************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/api/upload.js ***!
-  \******************************************************/
+/*!****************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/api/upload.js ***!
+  \****************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -40293,9 +40589,9 @@ exports.upload = upload;
 /***/ }),
 
 /***/ 82:
-/*!*****************************************************************!*\
-  !*** D:/Work/ZHCX/emergencyManagement/static/images/avatar.png ***!
-  \*****************************************************************/
+/*!***************************************************************************!*\
+  !*** E:/work/Project_newGit/emergencyManagement/static/images/avatar.png ***!
+  \***************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports) {
 

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 31 - 33
unpackage/dist/dev/mp-weixin/components/IndexBarChart.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 29 - 29
unpackage/dist/dev/mp-weixin/components/UniEcCanvas.js


A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 337 - 0
unpackage/dist/dev/mp-weixin/pages/danger/components/Create.js


+ 12 - 0
unpackage/dist/dev/mp-weixin/pages/danger/components/Create.json

@@ -0,0 +1,12 @@
+{
+  "usingComponents": {
+    "uni-drawer": "/uni_modules/uni-drawer/components/uni-drawer/uni-drawer",
+    "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-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select",
+    "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox"
+  },
+  "component": true
+}

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/danger/components/Create.wxml


+ 55 - 0
unpackage/dist/dev/mp-weixin/pages/danger/components/Create.wxss

@@ -0,0 +1,55 @@
+@charset "UTF-8";
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场(https://ext.dcloud.net.cn)上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者,建议你使用scss预处理,并在插件代码中直接使用这些变量(无需 import 这个文件),方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者(插件使用者),你可以通过修改这些变量来定制自己的插件主题,实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理,你也可以直接在你的 scss 代码中使用如下变量,同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.scroll-view.data-v-0c869c42 {
+  height: 100%;
+  padding: 20rpx;
+  box-sizing: border-box;
+}
+.scroll-view .form-wrap.data-v-0c869c42 {
+  padding: 40rpx;
+}
+.scroll-view .form-wrap .handle-container.data-v-0c869c42 {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.scroll-view .form-wrap .handle-container button.data-v-0c869c42 {
+  width: 160rpx;
+  padding: 20rpx 16rpx;
+  line-height: 1;
+  font-size: 28rpx;
+}
+.scroll-view .form-wrap .handle-container button.save.data-v-0c869c42 {
+  background-color: #007aff;
+}
+.scroll-view .form-wrap .word-limit.data-v-0c869c42 {
+  text-align: right;
+  padding: 10rpx 0;
+  color: #999;
+  font-size: 26rpx;
+}
+

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 291 - 0
unpackage/dist/dev/mp-weixin/pages/danger/components/Detail.js


+ 10 - 0
unpackage/dist/dev/mp-weixin/pages/danger/components/Detail.json

@@ -0,0 +1,10 @@
+{
+  "usingComponents": {
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
+    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
+    "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item"
+  },
+  "component": true
+}

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/danger/components/Detail.wxml


Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott