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

README.md

@@ -1 +1,2 @@
-设计图地址[app](https://www.figma.com/file/SbKMCyiaBZyDd7tRFc4VTI/%E6%99%BA%E6%85%A7%E5%88%9B%E6%96%B0%E9%A1%B9%E7%9B%AE?type=design&node-id=108-14&mode=design&t=fQtiYX2Vjx2B3GFc-0)
+设计图地址[app](https://www.figma.com/file/SbKMCyiaBZyDd7tRFc4VTI/%E6%99%BA%E6%85%A7%E5%88%9B%E6%96%B0%E9%A1%B9%E7%9B%AE?type=design&node-id=108-14&mode=design&t=fQtiYX2Vjx2B3GFc-0)
+[设计图地址](https://www.figma.com/file/4d6u4Xoo7OYKSTPjrbiek9/%E6%99%BA%E6%85%A7%E5%88%9B%E6%96%B0%E9%A1%B9%E7%9B%AE~2024?type=design&node-id=0%3A1&mode=design&t=8TsQTQIrG5BhAabu-1)

api/aqpt/alertApi.js

@@ -0,0 +1,112 @@
+import {request} from '@/utils/request.js'
+/**
+ * 分页查询
+ */
+export function getAlertByPage(data) {
+  return request({
+    url: '/alert/page',
+    method: 'GET',
+    data
+  })
+}
+
+/**
+ * 列表查询
+ */
+export function getAlertByList(data) {
+  return request({
+    url: '/alert',
+    method: 'GET',
+    data
+  })
+}
+
+/**
+ * 列表查询待处理告警
+ */
+export function getAlertWaitingByList(data) {
+  return request({
+    url: '/alert/waiting',
+    method: 'GET',
+    data
+  })
+}
+
+/**
+ * 基于ID查询Alert
+ */
+export function getAlertById(alertId) {
+  return request({
+    url: `/alert/${alertId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 完成处理
+ * @param data
+ * @returns
+ */
+export function completeAlert(data) {
+  return request({
+    url: `/alert/complete`,
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 转交他人
+ * @param alertId
+ * @param data
+ * @returns
+ */
+export function transferAlert(alertId, data) {
+  return request({
+    url: `/alert/transfer/${alertId}`,
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 撤消
+ * @param alertId
+ * @returns
+ */
+export function cancelAlert(alertId) {
+  return request({
+    url: `/alert/cancel/${alertId}`,
+    method: 'GET'
+  })
+}
+/**
+ * 删除
+ */
+export function deleteAlertById(alertId) {
+  return request({
+    url: `/alert/${alertId}`,
+    method: 'DELETE'
+  })
+}
+
+/**
+ * 查询统计结果
+ */
+export function counterByStatus(data) {
+  return request({
+    url: '/alert/statis/counterByStatus',
+    method: 'GET',
+    data
+  })
+}
+
+/**
+ * 查询统计结果
+ */
+export function getAlertCounter() {
+  return request({
+    url: '/alert/statis/getCounter',
+    method: 'GET'
+  })
+}

api/aqpt/checkTaskApi.js

@@ -0,0 +1,131 @@
+import {request} from '@/utils/request.js'
+
+/**
+ * 分页查询CheckTask
+ * @param data
+
+ */
+export function getCheckTaskByPage(data) {
+  return request({
+    url: '/check/task/page',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 列表查询CheckTask
+ * @param data
+ */
+export function getCheckTaskByList(data) {
+  return request({
+    url: '/check/task',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * @param checkTaskId
+
+ */
+export function getCheckTaskById(checkTaskId) {
+  return request({
+    url: `/check/task/${checkTaskId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 获取任务视图
+ * @param taskId
+ */
+export function getCheckTaskViewById(taskId) {
+  return request({
+    url: `/check/task/view/${taskId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 添加一次性临时CheckTask
+ * @param data
+
+ */
+export function createCheckTask(data) {
+  return request({
+    url: `/check/task/once/add`,
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 更新CheckTask
+ * @param data
+
+ */
+export function updateCheckTask(data) {
+  return request({
+    url: `/check/task/update`,
+    method: 'PUT',
+    data
+  })
+}
+
+/**
+ * 删除CheckTask
+ * @param taskId
+ */
+export function deleteCheckTaskById(taskId) {
+  return request({
+    url: `/check/task/${taskId}`,
+    method: 'DELETE'
+  })
+}
+
+/**
+ * Handle CheckTask
+ * @param taskId
+ */
+export function handleCheckTask(taskId) {
+  return request({
+    url: `/check/task/handle/${taskId}`,
+    method: 'PUT'
+  })
+}
+
+/**
+ * Transfer CheckTask
+ * @param data
+ */
+export function transferCheckTask(data) {
+  return request({
+    url: `/check/task/transfer`,
+    method: 'PUT',
+    data
+  })
+}
+
+/**
+ * Cancel CheckTask
+
+ * @param taskId
+ */
+export function cancelCheckTask(taskId) {
+  return request({
+    url: `/check/task/cancel/${taskId}`,
+    method: 'PUT'
+  })
+}
+
+/**
+ * Complete CheckTask
+ * @param taskId
+ */
+export function completeCheckTask(taskId) {
+  return request({
+    url: `/check/task/complete/${taskId}`,
+    method: 'PUT'
+  })
+}

api/aqpt/checklistRecordHazardApi.js

@@ -0,0 +1,16 @@
+import {request} from '@/utils/request.js'
+
+export function getChecklistHazardRecordView(recordId) {
+  return request({
+    url: `/checklist/hazard/record/view/${recordId}`,
+    method: 'GET'
+  })
+}
+
+export function initChecklistHazardRecordView(data) {
+  return request({
+    url: '/checklist/hazard/record/init',
+    method: 'POST',
+    data
+  })
+}

api/aqpt/dangerCatApi.js

@@ -0,0 +1,76 @@
+import {request} from '@/utils/request.js'
+
+/**
+ * 分页查询Danger Category
+ * @param data
+ * @returns
+ */
+export function getDangerCatByPage(data) {
+  return request({
+    url: '/danger/cat/page',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 列表查询Danger Category
+ * @returns
+ */
+export function getDangerCatByList() {
+  return request({
+    url: '/danger/cat',
+    method: 'GET'
+  })
+}
+
+/**
+ * 基于Id查询Danger Category
+ * @param dangerCatId
+ * @returns
+ */
+export function getDangerCatById(dangerCatId) {
+  return request({
+    url: `/danger/cat/${dangerCatId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 添加Danger Category
+ * @param data
+ * @returns
+ */
+export function createDangerCat(data) {
+  return request({
+    url: `/danger/cat/add`,
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 更新Danger Category
+ * @param data
+ * @returns
+ */
+export function updateDangerCat(data) {
+  return request({
+    url: `/danger/cat/update`,
+    method: 'PUT',
+    data
+  })
+}
+
+/**
+ * 删除Danger Category
+ * @param dangerCatId
+ * @returns
+ */
+export function deleteDangerCat(dangerCatId) {
+  return request({
+    url: `/danger/cat/${dangerCatId}`,
+    method: 'DELETE'
+  })
+}
+

api/aqpt/riskPointApi.js

@@ -0,0 +1,98 @@
+import {request} from '@/utils/request.js'
+/**
+ * 列表查询
+ * @returns
+ */
+export function getRiskPointByList(data) {
+  return request({
+    url: '/riskPoint',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 分页查询
+ * @returns
+ */
+export function getRiskPointByPage(data) {
+  return request({
+    url: '/riskPoint/page',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 基于ID查询
+ * @returns
+ */
+export function getRiskPointById(riskPointId) {
+  return request({
+    url: `/riskPoint/${riskPointId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 添加风险单元
+ * @param data
+ * @returns
+ */
+export function createRiskPoint(data) {
+  return request({
+    url: `/riskPoint/add`,
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 修改风险单元
+ * @param data
+ * @returns
+ */
+export function updateRiskPoint(data) {
+  return request({
+    url: `/riskPoint/update`,
+    method: 'PUT',
+    data
+  })
+}
+
+/**
+ * 删除风险单元
+ * @returns
+ * @param riskPointId
+ */
+export function deleteRiskPointById(riskPointId) {
+  return request({
+    url: `/riskPoint/${riskPointId}`,
+    method: 'DELETE'
+  })
+}
+
+/**
+ * 批量操作激活或未激活风险单元
+ * @param data
+ * @returns
+ */
+export function batchUpdateRiskPoint(data) {
+  return request({
+    url: `/riskPoint/batchUpdate`,
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * 基于等级统计
+ * @returns
+ */
+export function getRiskPointCounterByLevel(data) {
+  return request({
+    url: '/riskPoint/statis/getCounterByLevel',
+    method: 'GET',
+    params: data
+  })
+}

api/aqpt/taskApi.js

@@ -0,0 +1,150 @@
+import {request} from '@/utils/request.js'
+
+/**
+ * 分页查询Task
+ * @param data
+ * @returns
+ */
+export function getTaskByPage(data) {
+  return request({
+    url: '/task/page',
+    method: 'GET',
+    data
+  })
+}
+
+/**
+ * 列表查询Task
+ * @param data
+ * @returns
+ */
+export function getTaskByList(data) {
+  return request({
+    url: '/task',
+    method: 'GET',
+    data
+  })
+}
+
+/**
+ * 列表查询未执行Task
+ * @param data
+ * @returns
+ */
+export function getWaitingTaskByList(data) {
+  return request({
+    url: '/task/waiting',
+    method: 'GET',
+    data
+  })
+}
+
+/**
+ * 列表查询Task: 50笔
+ * @param data
+ * @returns
+ */
+export function getRecentTaskByList(data) {
+  return request({
+    url: '/task/recent',
+    method: 'GET',
+    data
+  })
+}
+
+/**
+ * @param taskId
+ * @returns
+ */
+export function getTaskById(taskId) {
+  return request({
+    url: `/task/${taskId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 添加Task
+ * @param data
+ * @returns
+ */
+export function createTask(data) {
+  return request({
+    url: `/task/add`,
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 更新Task
+ * @param data
+ * @returns
+ */
+export function updateTask(data) {
+  return request({
+    url: `/task/update`,
+    method: 'PUT',
+    data
+  })
+}
+
+/**
+ * 删除Task
+ * @param taskId
+ * @returns
+ */
+export function deleteTaskById(taskId) {
+  return request({
+    url: `/task/${taskId}`,
+    method: 'DELETE'
+  })
+}
+
+/**
+ * Handle Task
+ * @param taskId
+ * @returns
+ */
+export function handleTask(taskId) {
+  return request({
+    url: `/task/handle/${taskId}`,
+    method: 'PUT'
+  })
+}
+
+/**
+ * Transfer Task
+ * @param data
+ * @returns
+ */
+export function transferTask(data) {
+  return request({
+    url: `/task/transfer`,
+    method: 'PUT',
+    data
+  })
+}
+
+/**
+ * Cancel Task
+ * @param taskId
+ * @returns
+ */
+export function cancelTask(taskId) {
+  return request({
+    url: `/task/cancel/${taskId}`,
+    method: 'PUT'
+  })
+}
+/**
+ * 列表查询我的待办Task:
+ * @param limit待办数目
+ * @returns
+ */
+export function getMyWaitingTaskTop(limit) {
+  return request({
+    url: `/task/myWaiting/top/${limit}`,
+    method: 'GET'
+  })
+}

api/aqpt/warning.js

@@ -0,0 +1,20 @@
+import {request} from '@/utils/request.js'
+/**
+ * 我的待处理告警TOP
+ */
+export function getMyWarningWaitingTop(limit) {
+  return request({
+    url: `/warning/myWaiting/top/${limit}`,
+    method: 'GET'
+  })
+}
+/**
+ * 分页查询告警
+ */
+export function getWarningByPage(data) {
+  return request({
+    url: '/warning/page',
+    method: 'GET',
+    data
+  })
+}

api/aqpt/warningApi.js

@@ -0,0 +1,103 @@
+import {request} from '@/utils/request.js'
+
+/**
+ * 分页查询告警
+ */
+export function getWarningByPage(data) {
+  return request({
+    url: '/warning/page',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 列表查询告警
+ */
+export function getWarningByList(data) {
+  return request({
+    url: '/warning',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 列表查询待处理告警
+ */
+export function getWarningWaitingByList(data) {
+  return request({
+    url: '/warning/waiting',
+    method: 'GET',
+    params: data
+  })
+}
+
+/**
+ * 我的待处理告警TOP
+ */
+export function getMyWarningWaitingTop(limit) {
+  return request({
+    url: `/warning/myWaiting/top/${limit}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 基于ID查询告警
+ */
+export function getWarningById(warnId) {
+  return request({
+    url: `/warning/${warnId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 完成处理
+ * @param data
+ * @returns
+ */
+export function completeWarning(data) {
+  return request({
+    url: `/warning/complete`,
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 转交他人
+ * @param warnId
+ * @param data
+ * @returns
+ */
+export function transferWarning(warnId, data) {
+  return request({
+    url: `/warning/transfer/${warnId}`,
+    method: 'POST',
+    data
+  })
+}
+
+/**
+ * 撤消
+ * @param warnId
+ * @returns
+ */
+export function cancelWarning(warnId) {
+  return request({
+    url: `/warning/cancel/${warnId}`,
+    method: 'GET'
+  })
+}
+
+/**
+ * 删除
+ */
+export function deleteWarningById(warnId) {
+  return request({
+    url: `/warning/${warnId}`,
+    method: 'DELETE'
+  })
+}

config/index.js

@@ -1,7 +1,7 @@
 export default {
     base: {
-      dev: 'https://api.xazhyc.com',
-	  // dev: 'http://1.15.92.205:7001',
+      // dev: 'https://api.xazhyc.com',
+	  dev: 'http://1.15.92.205:7001',
 	  // dev: 'http://192.168.3.253:7001',
       pro: 'https://api.xazhyc.com'
     },

pages.json

@@ -176,7 +176,7 @@
             "path" : "pages/app_views/problem_feedback/form/form",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "反馈处理",
+                "navigationBarTitleText": "问题反馈处理",
                 "enablePullDownRefresh": false
             }
             
@@ -198,7 +198,87 @@
                 "enablePullDownRefresh": false
             }
             
-        }
+        },
+        {
+        	"path" : "pages/index/detail/detail",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "快捷操作",
+        		"enablePullDownRefresh" : false
+        	}
+        },
+        {
+        	"path" : "pages/index/handle/danger/index/index",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "隐患处理",
+        		"enablePullDownRefresh" : false
+        	}
+        },
+		{
+			"path" : "pages/index/handle/danger/index/submit",
+			"style" : 
+			{
+				"navigationBarTitleText" : "隐患登记",
+				"enablePullDownRefresh" : false
+			}
+		},
+        {
+        	"path" : "pages/index/handle/task/task",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "任务处理",
+        		"enablePullDownRefresh" : false
+        	}
+        },
+		{
+			"path" : "pages/index/handle/task/checkList/form/form",
+			"style" : 
+			{
+				"navigationBarTitleText" : "任务检查表处理",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/index/handle/alert/alert",
+			"style" : 
+			{
+				"navigationBarTitleText" : "预警处理",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/index/handle/warning/warning",
+			"style" : 
+			{
+				"navigationBarTitleText" : "告警处理",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/index/handle/task/checkList/form/transferCheckTask",
+			"style" : 
+			{
+				"navigationBarTitleText" : "转交任务",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/index/handle/task/hazardRecord/hazardRecord",
+			"style" : 
+			{
+				"navigationBarTitleText" : "处理任务",
+				"enablePullDownRefresh" : false
+			}
+		},
+		{
+			"path" : "pages/index/handle/task/hazardRecord/form",
+			"style" : 
+			{
+				"navigationBarTitleText" : "处理检查",
+				"enablePullDownRefresh" : false
+			}
+		}		
     ],
 	"tabBar": {
 		"color": "#7A7E83",

pages/app_views/checkList/form/form.vue

@@ -24,7 +24,7 @@
 
 <script>
 	import {upload} from '@/api/system/upload.js'	
-	import {updateChecklistPoint,getchecklistRecord} from '@/api/aqpt/checklistPoint.js'
+	import {updateChecklistPoint,getchecklistRecord,checklistComplete} from '@/api/aqpt/checklistPoint.js'
 	export default {
 		data() {
 			return {
@@ -135,23 +135,39 @@
 				// 	}
 				// })
 				// this.goOnNext();	
+				let idx=this.itemList.findIndex(item=>item.pointId===point.pointId)
+				this.itemList[idx].checkResult=this.formData.checkResult
 				this.batchHandle()
 			},
 			// 批量处理未处理的
 			batchHandle(){
 				let point=uni.getStorageSync('point')
 				if(this.handles.length<1){
-					uni.showToast({
-						icon:'none',
-						title:"处理完毕",
-						duration:1000,
-						complete() {
-							uni.redirectTo({
-								url:`/pages/app_views/checkList/index/index?type=form&id=${point.checklistId}&recordId=${point.recordId}`
+					const key=this.itemList.find(item=>item.checkResult===-1)
+					if(!key){
+						checklistComplete(point.recordId,point.checklistId).then(()=>{
+							uni.$emit('type',1)						
+							uni.switchTab({
+								url:'/pages/history/history'
 							})
-						}
-					})	
-					return					
+						}).catch(()=>{
+							uni.showToast({
+								icon:"none",
+								title:"操作失败"
+							})
+						})
+					}else{
+						uni.showToast({
+							icon:'none',
+							title:"处理完毕请核实！",
+							duration:1000,
+							complete() {
+								uni.redirectTo({
+									url:`/pages/app_views/checkList/index/index?type=form&id=${point.checklistId}&recordId=${point.recordId}`
+								})
+							}
+						})
+					}				
 				}
 				let nextPoint=this.handles[0]
 				this.formData={
@@ -203,9 +219,9 @@
 				this.formData.attachList=attachList
 			},			
 		},
-		// onUnload() {			
-		// 	uni.removeStorageSync('point')
-		// }
+		onUnload() {			
+			uni.removeStorageSync('point')
+		}
 	}
 </script>
 

pages/app_views/checkList/index/index.vue

@@ -74,14 +74,15 @@
 				this.handleVisiable=true
 			}else{
 				this.getchecklistRecord(id,recordId)			
-			}
-			uni.removeStorageSync('point')			
-		},
-		onShow() {
-			let point=uni.getStorageSync('point')
-			if(!point)return			
-			this.getchecklistRecord(point.checklistId,point.recordId)	
+			}		
 		},
+		// onShow() {
+		// 	let point=uni.getStorageSync('point')
+		// 	if(!point)return	
+		// 	this.handleVisiable=true					
+		// 	this.getchecklistRecord(point.checklistId,point.recordId)
+		// 	uni.removeStorageSync('point')
+		// },
 		methods: {
 			async initCheckList(checklistId){
 				let qrcode=uni.getStorageSync('qrcode')	

pages/app_views/problem_feedback/record/record.vue

@@ -81,7 +81,9 @@
 				})
 			},
 			handle(){
-				
+				uni.redirectTo({
+					url:`/pages/app_views/problem_feedback/form/form?id=${this.snapshotId}`
+				})
 			}
 		}
 	}

pages/index/detail/detail.vue

@@ -0,0 +1,584 @@
+<template>
+	
+	<view class="index-detail-page">
+		<view class="container">
+			<view class="tab-cont">
+				<view class="part" v-if="type==='task'">
+<!-- 					<view class="tab">
+						<view class="tab-item" :class="activeTab===1?'active':''" @click="tabChange(0,1)">待处理</view>
+						<view class="tab-item" :class="activeTab===2?'active':''" @click="tabChange(1,2)">已完成</view>
+						<view class="tab-item" :class="activeTab===3?'active':''" @click="tabChange(-1,3)">已撤销</view>
+					</view> -->
+					<view class="part-cont">
+						<view class="item" v-for="(item,taskIdx) in items" :key="item.taskId" @click="handle('task',item)">
+							<view class="index">
+								{{taskIdx+1}}
+							</view>							
+							<view class="title">
+								<view class="name">{{item.taskTitle}}</view>
+								<view class="state">{{taskStatus(item.status)}}</view>
+							</view>
+							<view class="tags">
+								<text class="tag">{{taskPriority(item.taskPriority)}}</text>
+								<text class="tag">{{item.taskCatTitle}}</text>
+								<text class="tag">{{taskType(item.taskTypeId)}}</text>
+							</view>
+							<view class="time">
+								预期结束时间：{{item.expectedEndTime}}
+							</view>
+							<view class="bottom">
+								<view class="user">
+									<image class="avatar" src="/static/index/user.png" mode="widthFix"></image>
+									处理人：{{item.handleAccountName}}
+								</view>		
+								<view class="hand-time">
+									{{item.launchTime}}
+								</view>																
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="part" v-if="type==='warn'">
+<!-- 					<view class="tab">
+						<view class="tab-item" :class="activeTab===1?'active':''" @click="tabChange(0,1)">待处理</view>
+						<view class="tab-item" :class="activeTab===2?'active':''" @click="tabChange(1,2)">已处理</view>
+						<view class="tab-item" :class="activeTab===3?'active':''" @click="tabChange(-1,3)">已撤销</view>
+					</view> -->
+					<view class="part-cont">
+						<view class="item" v-for="(item,warnIdx) in items" :key="item.warnId" @click="handle('warn',item)">
+							<view class="index">
+								{{warnIdx+1}}
+							</view>
+							<view class="title">
+								<view class="name">{{item.warnTitle}}</view>
+								<view class="state">{{warningStatus(item.status)}}</view>
+							</view>
+							<view class="tags">
+								<text class="tag">{{alertLevel(item.warnLevel)}}</text>
+							</view>
+							<view class="time">
+								发生时间：{{item.warnTime}}
+							</view>
+							<view class="bottom" v-if="item.handleAccountName">
+								<view class="user">
+									<image class="avatar" src="/static/index/user.png" mode="widthFix"></image>
+									处理人：{{item.handleAccountName}}
+								</view>		
+								<view class="hand-time">
+									{{item.handleTime}}
+								</view>																
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="part" v-if="type==='alert'">
+<!-- 					<view class="tab">
+						<view class="tab-item" :class="activeTab===1?'active':''" @click="tabChange(0,1)">活动</view>
+						<view class="tab-item" :class="activeTab===2?'active':''" @click="tabChange(1,2)">已解除</view>
+						<view class="tab-item" :class="activeTab===3?'active':''" @click="tabChange(-1,3)">已撤销</view>
+					</view> -->
+					<view class="part-cont">
+						<view class="item" v-for="(item,alertIdx) in items" :key="item.alertId" @click="handle('alert',item)">
+							<view class="index">
+								{{alertIdx+1}}
+							</view>
+							<view class="title">
+								<view class="name">{{item.alertTitle}}</view>
+								<view class="state">{{alertStatus(item.status)}}</view>
+							</view>
+							<view class="tags">
+								<text class="tag">{{alertLevel(item.alertLevel)}}</text>
+							</view>
+							<view class="time">
+								发生时间：{{item.alertTime}}
+							</view>
+							<view class="bottom" v-if="item.clearTime">		
+								<view class="hand-time">
+									解除时间：{{item.clearTime}}
+								</view>																
+							</view>
+							<view class="bottom" v-if="item.alertContent">
+								<view class="alertContent">
+									内容：{{item.alertContent}}
+								</view>																
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="part" v-if="type==='danger'">
+<!-- 					<view class="tab">
+						<view class="tab-item" :class="activeTab===1?'active':''" @click="tabChange(0,1)">待处理</view>
+						<view class="tab-item" :class="activeTab===2?'active':''" @click="tabChange(1,2)">我提交</view>
+						<view class="tab-item" :class="activeTab===3?'active':''" @click="tabChange(2,3)">我处理</view>
+						<view class="tab-item" :class="activeTab===4?'active':''" @click="tabChange(-1,4)">我撤销</view>
+					</view> -->
+					<view class="part-cont">
+						<view class="item" v-for="(item,dangerIdx) in items" :key="item.dangerId" @click="handle('danger',item)">
+							<view class="index">
+								{{dangerIdx+1}}
+							</view>
+							<view class="title">
+								<view class="name">{{item.dangerTitle}}</view>
+								<view class="state">{{dangerStatus(item.status)}}</view>
+							</view>
+							<view class="tags">
+								<text class="tag">{{dangerLevel(item.dangerLevel)}}</text>
+								<text class="tag">{{item.dangerCatTitle}}</text>
+							</view>
+							<view class="time">
+								预期结束时间：{{item.dangerDeadLine}}
+							</view>
+							<view class="supervise">
+								<span class="supervise-item">督办部门：{{item.superviseGroupName}}</span>
+								<span class="supervise-item">督办人员：{{item.superviseAccountName}}</span>
+							</view>					
+							<view class="bottom">
+								<view class="user">
+									<image class="avatar" src="/static/index/user.png" mode="widthFix"></image>
+									处理人：{{item.curAccountName}}
+								</view>		
+								<view class="hand-time">
+									{{item.submitTime}}
+								</view>																
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>										
+		</view>
+		<template v-if="total<1">
+			<view class="isEmpty" >
+				<p class="word">没有数据 ^_^ </p>
+			</view>
+		</template>
+		<uni-popup ref="alertpopup" is-mask-click>
+			<view class="alert-container">
+				<uni-list>
+					<uni-list-item title="名称" :rightText="alertView.alertTitle"></uni-list-item>
+					<uni-list-item title="等级" :rightText="alertView.level"></uni-list-item>
+					<uni-list-item title="责任主体" :rightText="alertView.gpainfo"></uni-list-item>
+					<uni-list-item title="名称" :rightText="alertView.alertTitle"></uni-list-item>
+					<uni-list-item title="发生时间" :rightText="alertView.alertTime" v-if="alertView.alertTime"></uni-list-item>
+					<uni-list-item title="解除时间" :rightText="alertView.clearTime" v-if="alertView.clearTime"></uni-list-item>
+					<uni-list-item title="详情" :note="alertView.alertContent"></uni-list-item>		
+					<uni-list-item>
+						<template v-slot:body>
+							<view class="list-item-handle">
+								<button type="default" class="handle-bt del" @click="handAlert">删除</button>
+								<button type="default" class="handle-bt cancel" @click="cancelAlert">取消</button>
+							</view>	
+						</template>
+					</uni-list-item>
+				</uni-list>	
+	
+			</view>
+		</uni-popup>		
+	</view>
+</template>
+
+<script>
+	import { getAlertByPage,deleteAlertById } from '@/api/aqpt/alertApi.js';
+	import { getDangerByPage } from '@/api/aqpt/dangerApi.js';
+	import { getTaskByPage } from '@/api/aqpt/taskApi.js';
+	import { getWarningByPage } from '@/api/aqpt/warning.js';	
+	import { handleCheckTask } from '@/api/aqpt/checkTaskApi'
+	import{
+		taskStatus,taskPriority,taskType,
+		alertLevel,alertStatus,
+		dangerStatus,dangerLevel,
+		warningLevel,warningStatus
+	} from '@/utils/enum.js';	
+	export default {
+		data() {
+			return {
+				type:undefined,
+				activeTab:1,
+				user:{},
+			    conditions: {
+					page: 1,
+					limit: 10,
+					status:0
+			    },
+				total:0,
+				items:[],
+				alertView:{}		
+			}
+		},
+		onLoad({type,name,rid}) {
+			this.type=type
+			this.riskPointId=rid
+			let user=uni.getStorageSync('accountInfo');
+			this.user=user
+			uni.setNavigationBarTitle({
+				title:`${name||'详情'}`
+			})
+			this.tabChange(0,1)
+		},
+		methods: {
+			taskStatus,taskPriority,taskType,
+			alertLevel,alertStatus,
+			dangerStatus,dangerLevel,
+			warningLevel,warningStatus,
+			getData(){
+				if(this.type==='task'){
+					this.getTaskByPage()
+				}
+				if(this.type==='danger'){
+					delete this.conditions.status
+					this.getDangerByPage()
+				}				
+				if(this.type==='alert'){
+					this.getAlertByPage()
+				}
+				if(this.type==='warn'){
+					this.getWarningByPage()
+				}
+				
+			},
+			getWarningByPage(){
+				let items=JSON.parse(JSON.stringify(this.items))
+				getWarningByPage(this.conditions).then((res)=>{
+					this.items=items.concat(res.data)
+					this.total=res.total
+				})				
+			},
+			getAlertByPage(){
+				let items=JSON.parse(JSON.stringify(this.items))
+				getAlertByPage(this.conditions).then((res)=>{
+					this.items=items.concat(res.data)
+					this.total=res.total
+				})				
+			},
+			getDangerByPage(){
+				let items=JSON.parse(JSON.stringify(this.items))
+				getDangerByPage(this.conditions).then((res)=>{
+					this.items=items.concat(res.data)
+					this.total=res.total
+				})				
+			},
+			getTaskByPage(){
+				let items=JSON.parse(JSON.stringify(this.items))
+				getTaskByPage(this.conditions).then((res)=>{
+					this.items=items.concat(res.data)
+					this.total=res.total
+				})				
+			},
+			tabChange(value,index){
+				this.activeTab=index
+				this.total=0,
+				this.items=[]
+				this.conditions= {page: 1,limit: 10}
+				if(this.type==='task'||this.type==='alert'||this.type==='warn'){
+					this.conditions.status=value
+				}
+				if(this.type==='danger'){
+					  if (index === 1) {
+						this.conditions.curAccountId = this.user.userId
+					  } else if (index === 2) {
+						this.conditions.submitAccountId = this.user.userId
+					  } else if (index === 3) {
+						this.conditions.handleAccountId = this.user.userId
+					  } else if (index === 4) {
+						this.conditions.submitAccountId = this.user.userId
+						this.conditions.status = -1
+					  }
+				}
+	            this.conditions.riskPointId=this.riskPointId								
+				this.getData()
+			},
+			handle(type,item){			
+				let url=""
+				if(type==='danger'){				
+					// uni.navigateTo({
+					// 	url:`/pages/webview/webview?href=${this.$h5}/danger/views/detail.html&dangerId=539241&name=隐患处理`
+					// })	
+					uni.navigateTo({
+						url:`/pages/index/handle/danger/index/index?id=${item.dangerId}`
+					})					
+										
+					return
+				}
+				if(type==='task'){this.handTask(item);return};
+				if(type==='warn'){	
+					if(this.conditions.status!==0) return;
+					// if(item.handleAccountId!==this.user.userId) return;
+					url=`/pages/index/handle/warning/warning?id=${item.warnId}`
+				}	
+				if(type==='alert'){					
+					  const levelstrs = [
+					    '未知',
+					    '1级',
+					    '2级',
+					    '3级',
+					    '4级',
+					    '5级',
+					    '6级'
+					  ]
+					item.gpainfo=`${item.groupName}${item.positionName}${item.accountName}`
+					item.level=levelstrs[item.alertLevel]
+					this.alertView=item
+					this.$refs.alertpopup.open('bottom')
+					return
+				}
+				uni.navigateTo({
+					url
+				})				
+			},
+			handTask(item){
+				// if(item.handleAccountId!==this.user.userId) return;
+				if(this.conditions.status!==0) return;				
+				handleCheckTask(item.taskId).then((res)=>{
+					const { checklistId, checklistTypeId } = res.data //recordId-taskId
+					if (checklistTypeId === 1) {// HazardRecordView
+						uni.navigateTo({
+							url:`/pages/index/handle/task/hazardRecord/hazardRecord?rid=${item.taskId}&cid=${checklistId}&title=${item.taskTitle}`
+						})															  
+					} else if (checklistTypeId === 2) {// PointRecordView
+						uni.navigateTo({
+							url:`/pages/index/handle/task/task?rid=${item.taskId}&cid=${checklistId}&title=${item.taskTitle}`
+						})																  
+					} else if (checklistTypeId === 3) {// ScoreRecordView	
+						uni.navigateTo({
+							url:`/pages/index/handle/task/task?rid=${item.taskId}&cid=${checklistId}&title=${item.taskTitle}`
+						})															  
+					}
+				})
+			
+			},
+			cancelAlert(){
+				this.alertView={}
+				this.$refs.alertpopup.close()
+			},
+			handAlert(){
+				  const { alertId } = this.alertView
+				  const self=this;
+					uni.showModal({
+						title: '提示！',
+						content: '此操作将永久删除, 是否继续?',
+						success: function (res) {
+							if (res.confirm) {
+								deleteAlertById(alertId).then((resp) => {
+									const {msg,code}=resp	
+									self.$refs.alertpopup.close()
+									self.getData()
+									uni.showToast({
+										icon:"none",
+										title:msg
+									})																	
+								})
+							} else if (res.cancel) {
+							  uni.showToast({
+								icon:"none",
+								title:"已取消删除！"
+							  })
+							}
+						}
+					});
+			},
+			onPullDownRefresh() {					
+				this.tabChange(this.conditions.status||0,this.activeTab)
+				uni.stopPullDownRefresh()
+			},
+			onReachBottom() {
+				if(this.total>=this.conditions.page*this.conditions.limit){
+					this.conditions.page++
+					this.getData()
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.index-detail-page {
+		min-height: 100vh;
+		padding-bottom: 100rpx;
+		background-color: rgba(245, 246, 248, 1);
+		padding-top: 6rpx;
+		.container{	
+			.tab-cont{				
+				.part{
+					.tab{
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						overflow-x: auto;
+						background-color: #fff;
+						padding:32rpx;
+						.tab-item{
+							display: inline-block;
+							padding: 0 36rpx;
+							background-color: #fff;
+							text-align: center;      
+							flex-shrink: 0;
+							line-height: 1;
+							font-size: 32rpx;
+							color: #333;
+							box-sizing: border-box;
+							border-bottom: 4rpx solid transparent;
+							&.active{
+								// background-color: #1e80ff;
+								// color: #fff;
+								// border-color: #1e80ff;
+								color: #1e80ff;
+								font-weight: 800;
+							}
+						}
+					}
+					.part-cont{
+						padding: 0 32rpx;
+						.item{
+							background-color: #fff;
+							border-radius: 12rpx;
+							margin-top: 16rpx;
+							padding: 24rpx 20rpx 24rpx 55rpx;
+							position: relative;
+							.index{
+								width: 44rpx;
+								height: 44rpx;
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								border-radius: 50%;
+								color:#ea8259;
+								background-color:#fbf1ed;
+								font-size:18rpx;
+								position: absolute;
+								left: 4rpx;
+								top: 26rpx;
+								word-break: break-all;
+							}							
+							.title{
+								display: flex;
+								justify-content: space-between;
+								align-items: center;
+								.name{
+									font-size: 32rpx;
+									color: rgba(0, 0, 0, 0.8);
+								}
+								.state{
+									font-size: 30rpx;
+									color: rgba(250, 139, 55, 1);
+								}
+							}
+							.tags{
+								padding-top: 24rpx;
+								.tag{
+									background: rgba(245, 246, 248, 1);	
+									font-size: 20rpx;
+									margin-left: 10rpx;
+									padding: 10rpx 20rpx;
+									&:nth-child(1){
+										color: rgba(234, 130, 89, 1);
+										background: rgba(251, 241, 237, 1);
+									}
+								}
+							}
+							.time{
+								padding-top: 20rpx;
+								font-size: 28rpx;									
+								color:rgba(241, 57, 57, 0.8);
+							}
+								
+							.supervise{
+								font-size: 24rpx;
+								color: rgba(0, 0, 0, 1);
+								padding: 10rpx 0;
+								.supervise-item{
+									padding-right: 10rpx;
+								}
+							}
+							.bottom{
+								display: flex;
+								justify-content: space-between;
+								align-items: center;
+								padding-top: 20rpx;
+								.user{
+									display: flex;
+									align-items: center;
+									font-size: 24rpx;
+									color: rgba(0, 0, 0, 1);
+									.avatar{
+										width: 44rpx;
+										margin-right: 10rpx;
+									}
+								}
+								.hand-time{
+									font-size: 24rpx;
+									color: rgba(0, 0, 0, 1);
+								}
+							}
+							.alertContent{
+								font-size: 26rpx;
+								color: #666;
+								line-height: 1.5;
+								text-overflow: ellipsis;
+								overflow: hidden;
+								word-break: break-all;
+								display: -webkit-box;
+								-webkit-box-orient: vertical;
+								-webkit-line-clamp: 2;
+							}
+						}
+					}
+				}
+			}
+		}
+		.isEmpty{
+			width: 100%;
+			height: 100vh;
+			background-image: url(data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgNzkgODYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzPjxsaW5lYXJHcmFkaWVudCBpZD0iYSIgeDE9IjM4Ljg1JSIgeTE9IjAlIiB4Mj0iNjEuMTUlIiB5Mj0iMTAwJSI+PHN0b3Agc3RvcC1jb2xvcj0iI0ZDRkNGRCIgb2Zmc2V0PSIwJSIvPjxzdG9wIHN0b3AtY29sb3I9IiNFRUVGRjMiIG9mZnNldD0iMTAwJSIvPjwvbGluZWFyR3JhZGllbnQ+PGxpbmVhckdyYWRpZW50IGlkPSJiIiB4MT0iMCUiIHkxPSI5LjUlIiB5Mj0iOTAuNSUiPjxzdG9wIHN0b3AtY29sb3I9IiNGQ0ZDRkQiIG9mZnNldD0iMCUiLz48c3RvcCBzdG9wLWNvbG9yPSIjRTlFQkVGIiBvZmZzZXQ9IjEwMCUiLz48L2xpbmVhckdyYWRpZW50PjxwYXRoIGlkPSJjIiBkPSJNMCAwaDE3djM2SDB6Ii8+PC9kZWZzPjxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+PHBhdGggZD0iTTM5LjUgODZDNjEuMzE1IDg2IDc5IDgzLjkxIDc5IDgxLjMzM1M1Ny4zMTUgNzggMzUuNSA3OCAwIDc4Ljc1NiAwIDgxLjMzM0MwIDgzLjkxMSAxNy42ODUgODYgMzkuNSA4NnoiIGZpbGw9IiNGN0Y4RkMiLz48cGF0aCBmaWxsPSIjRTVFN0U5IiBkPSJNMTMgNDVoNDBMNDIgNThIMnpNNjUuNTUxIDI5Ljk4bC0xNi4zMTMtNy42MDctMi44NDEtNS43MzggMTYuMzEzIDcuNjA3eiIvPjxwYXRoIGZpbGw9IiNFREVFRjIiIGQ9Ik02NS41NTEgMjkuOThsLTM0LjQ0LTE2LjA1OS0xNS4yMTQgMzIuNjI3IDM0LjQ0IDE2LjA2eiIvPjxwYXRoIGZpbGw9InVybCgjYSkiIHRyYW5zZm9ybT0icm90YXRlKDI1IDI3LjQ0NiAtNDMuNDE2KSIgZD0iTTM4IDdoMTd2MzZIMzh6Ii8+PHBhdGggZmlsbD0iI0Y4RjlGQiIgZD0iTTE1LjcwNSA2LjczN2wxNS40MDcgNy4xODQgMTUuNjQ2LS40MjctMTUuNDA3LTcuMTg1eiIvPjxwYXRoIGZpbGw9InVybCgjYikiIGQ9Ik0xMyA0NWg0MHYzNkgxM3oiLz48ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSg1MyA0NSkiPjxtYXNrIGlkPSJkIiBmaWxsPSIjZmZmIj48dXNlIHhsaW5rOmhyZWY9IiNjIi8+PC9tYXNrPjx1c2UgZmlsbD0iI0UwRTNFOSIgdHJhbnNmb3JtPSJtYXRyaXgoLTEgMCAwIDEgMTcgMCkiIHhsaW5rOmhyZWY9IiNjIi8+PHBhdGggZmlsbD0iI0Q1RDdERSIgbWFzaz0idXJsKCNkKSIgdHJhbnNmb3JtPSJtYXRyaXgoLTEgMCAwIDEgMjQgMCkiIGQ9Ik03IDBoMTdsLTQgMTgtMjAtMnoiLz48L2c+PHBhdGggZmlsbD0iI0Y4RjlGQiIgZD0iTTcwIDQ1SDUzbDkgMTNoMTd6Ii8+PC9nPjwvc3ZnPg==);
+			background-size: contain;
+			background-repeat: no-repeat;
+			position: relative;
+			background-color: #fff;
+			/* #ifndef MP-WEIXIN */
+				height: calc( 100vh - 100px);	
+			/* #endif */
+			.word{
+				width: 100%;
+				text-align: center;
+				position: absolute;
+				top: 80vh;
+				left: 0;
+				color: #999;
+				font-size: 28rpx;
+				letter-spacing: 2rpx;
+			}
+		}
+		.handle-bt{
+			display:inline-block;
+			color: #222;
+			padding: 15rpx 20rpx;
+			box-sizing: border-box;
+			border: 1rpx solid #eaeaea;
+			font-size: 26rpx;
+			text-align: center;
+			border-radius: 50rpx;
+			margin: 0 10rpx;
+			&.del{
+				background-color: #FA5B41;	
+				color: #fff;						
+			}
+			&.submit{
+				background-color: #3384FF;	
+				color: #fff;
+				padding: 18rpx 38rpx;
+			}
+		}
+		.list-item-handle{
+			width: 100%;
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			.handle-bt{
+				min-width: 120rpx;
+				padding: 0;
+				&.cancel{
+					margin: 0 20rpx;
+				}
+			}
+		}
+	}
+
+</style>

pages/index/handle/alert/alert.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/index/handle/danger/index/index.vue

@@ -0,0 +1,371 @@
+<template>
+	<view class="danger-form">
+		<uni-collapse>
+			<uni-collapse-item :title="baseInfo.dangerTitle">
+				<view class="content">
+					<uni-list-item title="隐患编码" :rightText="baseInfo.dangerCode" ></uni-list-item>					
+					<uni-list-item title="隐患状态" :rightText="dangerStatus(baseInfo.status)" ></uni-list-item>
+					<uni-list-item title="隐患类别" :rightText="baseInfo.dangerCatTitle" ></uni-list-item>
+					<uni-list-item title="隐患等级" :rightText="baseInfo.dangerLevel===1?'一般':'重大'" ></uni-list-item>
+					<uni-list-item title="所在位置" :rightText="baseInfo.dangerLocation" v-if="baseInfo.dangerLocation"></uni-list-item>
+					<uni-list-item title="描述" :rightText="baseInfo.dangerDesc" ></uni-list-item>
+					<uni-list-item title="所在部门" :rightText="baseInfo.curGroupName" v-if="baseInfo.curGroupName"></uni-list-item>
+					<uni-list-item title="整改人员" :rightText="baseInfo.curAccountName"  v-if="baseInfo.curAccountName"></uni-list-item>
+<!-- 					<uni-list-item title="所在部门" :rightText="baseInfo.submitGroupName" v-if="baseInfo.submitGroupName"></uni-list-item>
+					<uni-list-item title="整改人员" :rightText="baseInfo.submitAccountName"  v-if="baseInfo.submitAccountName"></uni-list-item>
+					<uni-list-item title="所在部门" :rightText="baseInfo.rectifyGroupName" v-if="baseInfo.rectifyGroupName"></uni-list-item>
+					<uni-list-item title="整改人员" :rightText="baseInfo.rectifyAccountName"  v-if="baseInfo.rectifyAccountName"></uni-list-item> -->
+					<uni-list-item title="整改措施" :rightText="baseInfo.rectifyMeasure" v-if="baseInfo.rectifyMeasure"></uni-list-item>
+					<uni-list-item title="整改说明" :rightText="baseInfo.rectifyRemark" v-if="baseInfo.rectifyRemark"></uni-list-item>
+				</view>
+				<uni-section title="附件" type="line">
+					<div class="attach-wrap">
+						<image @click="showImage(attachindex)" class="attach" :src="attach.fileUrl" v-for="(attach,attachindex) in baseInfo.attachList" :key="attachindex"></image>						
+					</div>
+				</uni-section>
+			</uni-collapse-item>
+		</uni-collapse>
+		<div class="form-container">
+			<uni-forms ref="form" :modelValue="formData" :rules="rules" :label-width="300" label-position="top">
+				<uni-forms-item label="处理动作" name="actionDefId" required v-if="actionDefList&&actionDefList.length>0">
+					<div class="uni-data-checkbox-wrap">
+						 <view class="action" v-for="(action,index) in actionDefList" :key="index" 
+							  :class="formData.actionDefId===action.value?'active':''"
+							  @click="changeAction(action)">
+						 	<text>{{action.text}}</text>
+						 </view>
+					</div>
+				</uni-forms-item>
+				<uni-forms-item label="描述建议" name="dangerDesc">
+				  <uni-easyinput v-model="formData.dangerDesc" type="textarea" :maxlength="-1" autoHeight placeholder="描述" />
+				</uni-forms-item>
+				<uni-forms-item label="执行部门" name="groupId" required>
+				  <uni-data-select v-model="formData.groupId" :localdata="groupList" @change="changeGroup" :clear="false"></uni-data-select>
+				</uni-forms-item>	
+				<uni-forms-item label="执行人" name="accountId" required>
+				  <uni-data-select v-model="formData.accountId" :localdata="userList"></uni-data-select>
+				</uni-forms-item>	
+			</uni-forms>
+			<uni-section title="上传附件" type="line">
+				<view class="example-body">
+					<uni-file-picker  v-model="formData.attachList" 
+					 fileMediatype="image" 
+					 title="请上传附件"
+					 limit="1"
+					 @select="uploadSuccess"
+					 @delete="deleteFile"></uni-file-picker>
+				</view>
+			</uni-section>
+		</div>
+<!-- 		<view class="button-container" @click="onSubmit" v-if="flowData.activityInsTitle">
+			<text>{{flowData.activityInsTitle}}</text>
+		</view> -->
+		<view class="button-container" @click="onSubmit">
+			<text>提交</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {getDangerById} from '@/api/aqpt/dangerApi.js'
+	import {getWorkflowById,handleWorkflow} from '@/api/system/wfApi.js'
+	import {getUserList,selectUserByGroupId} from '@/api/system/user.js'	
+	import {getGroupByList} from '@/api/system/groupApi.js'
+	import { handleDanger } from '@/api/system/dangerApi.js'
+	import {upload} from '@/api/system/upload.js'
+	export default {
+		data() {
+			return {
+				dangerId:undefined,
+				baseInfo:{
+					
+				},
+				actionDefList:[],
+				userList:[],
+				groupList:[],
+				flowData:{},
+				formData:{
+					dangerDesc:"",
+					accountId:"",
+					actionDefId:"",
+					groupId:"",
+					attachList:[]
+				},
+				rules:{
+					
+				}
+			}
+		},
+		onLoad(options) {
+			this.init(options.id)
+		},
+		methods: {
+			dangerStatus(i) {
+			  if (i >= 0) {
+			    const strs = ['提交','评审','整改','验收','已完成']
+			    return strs[i]
+			  } else {
+			    return '已撤销'
+			  }
+			},
+			init(dangerId){
+				this.dangerId=dangerId
+				getDangerById(dangerId).then((res)=>{
+					this.baseInfo=res.data
+				})
+				this.getUserList()
+				this.getGroupList()
+				this.get(dangerId)
+			},
+			// 获取流程
+			get(wfInsId) {
+				getWorkflowById(wfInsId).then((resp) => {
+				  const { data } = resp
+				  this.flowData = data
+				  this.formData.wfDefId = data.wfDefId
+				  this.formData.wfInsId = data.wfInsId
+				  this.formData.activityDefId = data.activityDefId
+				  this.formData.activityInsId = data.activityInsId
+				  this.formData.activityCode = data.activityCode
+				  this.formData.actionInsId = data.actionInsId
+				  if(data.wfInsTitle){
+					  uni.setNavigationBarTitle({
+						  title:`${data.activityInsTitle}流程`
+					  })
+				  }
+				  this.actionDefList=this.flowData.actionDefList.map(item=>{
+					  return{
+						  ...item,
+						  text:item.actionTitle,
+						  value:item.actionDefId
+					  }
+				  })
+				  if(this.actionDefList.length>0){
+					  this.formData.actionDefId=this.actionDefList[0].actionDefId
+				  }				  
+				}).catch(()=>{
+					uni.showToast({
+						icon:"none",
+						title:"流程初始化失败"
+					})
+				})
+			},
+			changeGroup(groupId){
+				if(!groupId){
+					this.getUserList()
+					return
+				}
+				selectUserByGroupId(groupId).then((res)=>{
+					var userList=[]
+					this.formData.accountId=""
+					for (var i = 0; i < res.data.length; i++) {
+						userList.push({
+								value: -i, 
+								text: res.data[i].name,
+								disable:true
+						})
+						for(let j = 0; j < res.data[i].children.length; j++){
+							userList.push({
+								...res.data[i].children[j],
+								value: res.data[i].children[j].accountId, 
+								text: res.data[i].children[j].accountName
+							})							
+						}
+					}
+					this.userList=userList
+				})				
+			},
+			getGroupList(){
+				getGroupByList().then((res)=>{
+					this.groupList=res.data.map((item)=>{
+						return{
+							value:item.groupId, 
+							text: item.groupName,							
+						}
+					})
+				})	
+			},	
+			getUserList(){
+				getUserList().then((res)=>{
+					var userList=[]
+					for (var i = 0; i < res.data.length; i++) {
+						userList.push({
+								value: -i, 
+								text: res.data[i].name,
+								disable:true
+						})
+						for(let j = 0; j < res.data[i].children.length; j++){
+							userList.push({
+								...res.data[i].children[j],
+								value: res.data[i].children[j].accountId, 
+								text: res.data[i].children[j].accountName
+							})							
+						}
+					}
+					this.userList=userList
+				})
+			},
+			showImage(index){
+				uni.previewImage({
+					urls:this.baseInfo.attachList.map(item=>item.fileUrl),
+					current:index
+				})
+			},
+			onSubmit(){
+				let dangerId=this.dangerId
+				let action=this.actionDefList.filter(item=>item.actionDefId===this.formData.actionDefId)[0]
+				let user=this.userList.filter(item=>this.formData.accountId===item.accountId)[0]
+				let activityCode=this.formData.activityCode
+				let res={
+					...this.flowData,
+					"formCode": activityCode,
+					"dangerId": dangerId,
+					[activityCode+"Remark"]: this.formData.dangerDesc
+				}
+				let workflowForm={				
+					"wfDefId": 1,
+					"wfInsId": dangerId,
+					"activityDefId": this.formData.activityDefId,
+					"activityInsId": this.formData.activityInsId,
+					"activityCode": activityCode,
+					"actionId": 1,
+					"actionCode": action.actionCode,
+					"actionInsId": this.formData.actionInsId,
+					"actionDefId": action.actionDefId,					
+					"actionRemark": this.formData.dangerDesc,
+					"groupIdTo": user.groupId,
+					"positionIdTo": user.positionId,
+					"accountIdTo": user.accountId,
+					"accountNameTo": user.accountName,
+					"groupNameTo": user.groupName,
+					"positionNameTo": user.positionName
+				}
+				this.handleSubmit({res,workflowForm})
+			},
+			async handleSubmit({res,workflowForm}) {
+				let attachList=[]
+				for(let i=0;i<this.formData.attachList.length;i++){
+					let filePath=this.formData.attachList[i].url
+					let fileresq=await upload({filePath})
+					fileresq=JSON.parse(fileresq)
+					attachList.push(fileresq.data)
+				}
+				let {data}=await handleWorkflow({...workflowForm,attachList}).catch(()=>{uni.showToast({icon:'none',title:"提交失败！"})})
+				let status=this.getStatusByActivityCode(data.activityCode,data.status)
+				let resq=await handleDanger({...res,attachList,status}).catch(()=>{uni.showToast({icon:'none',title:"提交失败！"})})
+				uni.showToast({
+					icon:'none',
+					title:"提交成功！",
+					complete() {
+						uni.navigateBack()
+					}
+				})
+			},	
+			getStatusByActivityCode(activityCode, wfStatus) {
+			  let iRet = 0
+			  if (wfStatus === 0) {
+				if (activityCode === 'submit') {
+				  iRet = 0
+				} else if (activityCode === 'review') {
+				  iRet = 1
+				} else if (activityCode === 'rectify') {
+				  iRet = 2
+				} else if (activityCode === 'accept') {
+				  iRet = 3
+				}
+			  } else if (wfStatus === 1) {
+				iRet = 4
+			  } else {
+				iRet = -1
+			  }
+			  return iRet
+			},
+			changeAction(item){
+				this.formData.actionDefId=item.value
+			},
+			uploadSuccess(e){
+				let attachList=JSON.parse(JSON.stringify(this.formData.attachList))
+				attachList.push(e.tempFiles[0])
+				this.formData.attachList=attachList
+			},
+			deleteFile(e){							
+				let attachList=JSON.parse(JSON.stringify(this.formData.attachList))
+				attachList.filter(item=>item.uuid!==e.tempFile.uuid)
+				this.formData.attachList=attachList
+			},			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.danger-form{
+		padding: 20rpx 20rpx 160rpx 20rpx;
+		margin-bottom: 120rpx;
+		 .attach-wrap{
+			display: flex;
+			flex-wrap: wrap;
+			.attach{
+				display: block;
+				width: 100rpx;
+				height: 100rpx;
+				margin: 10rpx;
+				border: 1px solid #ccc;
+			}
+		}
+		.form-container{
+			padding: 10rpx;
+			// box-shadow: 0px 0px 3px 1px rgba(0, 0, 0, 0.08);
+			margin-top: 20rpx;
+		}
+		.submit_bt{
+			width: 600rpx;
+			height: 72rpx;
+			line-height: 72rpx;
+			box-sizing: border-box;
+			border-radius: 16upx;
+			margin-top: 50upx;
+			background-color:#3384FF;
+			font-size: 32rpx;
+			color: #fff;
+		}
+		.button-container{
+			width: 750rpx;
+			height:88rpx;
+			line-height:88rpx;
+			color: #4D73FF;
+			text-align: center;
+			font-size: 32rpx;
+			padding-bottom: 68rpx;
+			background-color: #fff;
+			position: fixed;
+			left: 0;
+			bottom: 0;
+			z-index: 2;
+			box-shadow: 0px 0px 12px 0px #0000000A;
+			border-radius: 8px 8px 0px 0px
+		}
+		::v-deep .uni-forms-item{
+			.uni-forms-item__content{
+				.uni-data-checkbox-wrap{
+					height: 100%;
+					display: flex;
+					align-items: center;
+					.action{
+						padding: 22rpx 32rpx;
+						background-color: #fff;
+						border-radius: 2px;
+						margin-right: 20rpx;
+						font-size: 28rpx;
+						line-height: 1;
+						&.active{
+							background: rgba(77, 115, 255, 0.16);
+							color: #4D73FF;
+						}
+					}
+				}
+
+			}		
+		}
+	}
+
+</style>

pages/index/handle/danger/index/submit.vue

@@ -0,0 +1,439 @@
+<template>
+	<view class="danger-form">
+		<div class="form-container">
+			<uni-forms ref="form" :modelValue="formData" :rules="rules" :label-width="300" label-position="top">
+				<uni-forms-item label="隐患标题" name="dangerTitle" required>
+					<uni-easyinput type="text" v-model="formData.dangerTitle" placeholder="请输入姓名" />
+				</uni-forms-item>
+				<uni-forms-item label="所属部门" name="groupId" required>
+				  <uni-data-select v-model="formData.groupId" :localdata="groupList" :clear="false"></uni-data-select>
+				</uni-forms-item>	
+				<uni-forms-item label="发生位置" name="riskPointId" required>
+				  <uni-data-select v-model="formData.riskPointId" :localdata="riskList" :clear="false"></uni-data-select>
+				</uni-forms-item>	
+				<uni-forms-item label="隐患类别" name="dangerCatId" required>
+				  <uni-data-select v-model="formData.dangerCatId" :localdata="dangerCats" :clear="false"></uni-data-select>
+				</uni-forms-item>											
+				<uni-forms-item label="隐患来源" name="dangerSource" required>
+				  <uni-data-select v-model="formData.dangerSource" :localdata="dangerSources" :clear="false"></uni-data-select>
+				</uni-forms-item>	
+				<uni-forms-item label="隐患等级" name="dangerLevel" required>
+				  <uni-data-select v-model="formData.dangerLevel" :localdata="dangerLevels" :clear="false"></uni-data-select>
+				</uni-forms-item>	
+				<uni-forms-item label="整改截止时间" name="dangerDeadLine" required>		 
+					<uni-datetime-picker type="date" :clear-icon="false" v-model="formData.dangerDeadLine" />			
+				</uni-forms-item>																			
+				<uni-forms-item label="描述建议" name="dangerDesc">
+				  <uni-easyinput v-model="formData.dangerDesc" type="textarea" :maxlength="-1" autoHeight placeholder="描述" />
+				</uni-forms-item>
+				<uni-forms-item label="执行部门" name="groupId" required>
+				  <uni-data-select v-model="formData.handgroupId" :localdata="groupList" @change="changeGroup" :clear="false"></uni-data-select>
+				</uni-forms-item>	
+				<uni-forms-item label="执行人" name="accountIdTo" required>
+				  <uni-data-select v-model="formData.accountIdTo" :localdata="userList"></uni-data-select>
+				</uni-forms-item>	
+			</uni-forms>
+			<uni-section title="上传附件" type="line">
+				<view class="example-body">
+					<uni-file-picker  v-model="formData.attachList" 
+					 fileMediatype="image" 
+					 title="请上传附件"
+					 limit="1"
+					 @select="uploadSuccess"
+					 @delete="deleteFile"></uni-file-picker>
+				</view>
+			</uni-section>
+		</div>
+		<view class="button-container" @click="onSubmit">
+			<text>提交</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {getDangerById} from '@/api/aqpt/dangerApi.js'
+	import {startWorkflow,getWorkflowById,handleWorkflow} from '@/api/system/wfApi.js'
+	import {getUserList,selectUserByGroupId} from '@/api/system/user.js'	
+	import {getGroupByList} from '@/api/system/groupApi.js'
+	import { handleDanger } from '@/api/system/dangerApi.js'
+	import {upload} from '@/api/system/upload.js'
+	import { getRiskPointByList } from '@/api/aqpt/riskPointApi.js'
+	import { getDangerCatByList } from '@/api/aqpt/dangerCatApi.js'
+	export default {
+		data() {
+			return {
+				dangerId:undefined,
+				baseInfo:{
+					
+				},
+				actionDefList:[],
+				userList:[],
+				groupList:[],
+				riskList:[],
+				dangerLevels:[
+					{text:"重大隐患",value:1},
+					{text:"较大隐患",value:2},
+					{text:"严重隐患",value:3},
+					{text:"一般隐患",value:4},
+				],
+				dangerSources:[
+					{text:"自查",value:0},
+					{text:"内部反馈",value:1},
+					{text:"上级检查",value:2},
+					{text:"政府执法",value:3},
+				],
+				dangerCats:[],
+				flowData:{},
+				formData:{
+					dangerTitle:"",
+					riskPointId:undefined,
+					dangerCatId:undefined,
+					dangerSource:undefined,
+					dangerLevel:undefined,
+					dangerDesc:"",
+					accountIdTo:"",
+					actionDefId:"",
+					groupId:"",
+					attachList:[]
+				},
+				rules:{
+					
+				}
+			}
+		},
+		onLoad() {
+			this.init()
+		},
+		methods: {
+			dangerStatus(i) {
+			  if (i >= 0) {
+			    const strs = ['提交','评审','整改','验收','已完成']
+			    return strs[i]
+			  } else {
+			    return '已撤销'
+			  }
+			},
+			init(){
+				this.getUserList()
+				this.getGroupList()
+				this.start()
+				this.getRiskPoints()
+				this.getDangerCats()
+			},
+			start(){
+				startWorkflow(1).then((res)=>{
+					this.flowData=res.data
+					this.dangerId=res.data.wfInsId
+				})
+			},
+			// 获取流程
+			get(wfInsId) {
+				getWorkflowById(wfInsId).then((resp) => {
+				  const { data } = resp
+				  this.flowData = data
+				  this.formData.wfDefId = data.wfDefId
+				  this.formData.wfInsId = data.wfInsId
+				  this.formData.activityDefId = data.activityDefId
+				  this.formData.activityInsId = data.activityInsId
+				  this.formData.activityCode = data.activityCode
+				  this.formData.actionInsId = data.actionInsId
+				  if(data.wfInsTitle){
+					  uni.setNavigationBarTitle({
+						  title:`${data.activityInsTitle}流程`
+					  })
+				  }
+				  this.actionDefList=this.flowData.actionDefList.map(item=>{
+					  return{
+						  ...item,
+						  text:item.actionTitle,
+						  value:item.actionDefId
+					  }
+				  })
+				  if(this.actionDefList.length>0){
+					  this.formData.actionDefId=this.actionDefList[0].actionDefId
+				  }				  
+				}).catch(()=>{
+					uni.showToast({
+						icon:"none",
+						title:"流程初始化失败"
+					})
+				})
+			},
+			changeGroup(groupId){
+				if(!groupId){
+					this.getUserList()
+					return
+				}
+				selectUserByGroupId(groupId).then((res)=>{
+					var userList=[]
+					this.formData.accountIdTo=""
+					for (var i = 0; i < res.data.length; i++) {
+						userList.push({
+								value: -i, 
+								text: res.data[i].name,
+								disable:true
+						})
+						for(let j = 0; j < res.data[i].children.length; j++){
+							userList.push({
+								...res.data[i].children[j],
+								value: res.data[i].children[j].accountId, 
+								text: res.data[i].children[j].accountName
+							})							
+						}
+					}
+					this.userList=userList
+				})				
+			},
+			getDangerCats(){
+				getDangerCatByList().then((res)=>{
+					this.dangerCats=res.data.map((item)=>{
+						return{
+							value:item.dangerCatId, 
+							text: item.dangerCatTitle,							
+						}
+					})
+				}) 				
+			},
+			getRiskPoints(){
+				getRiskPointByList().then((res)=>{
+					this.riskList=res.data.map((item)=>{
+						return{
+							value:item.riskPointId, 
+							text: item.riskPointTitle,							
+						}
+					})
+				})					
+			},
+			getGroupList(){
+				getGroupByList().then((res)=>{
+					this.groupList=res.data.map((item)=>{
+						return{
+							value:item.groupId, 
+							text: item.groupName,							
+						}
+					})
+				})	
+			},	
+			getUserList(){
+				getUserList().then((res)=>{
+					var userList=[]
+					for (var i = 0; i < res.data.length; i++) {
+						userList.push({
+								value: -i, 
+								text: res.data[i].name,
+								disable:true
+						})
+						for(let j = 0; j < res.data[i].children.length; j++){
+							userList.push({
+								...res.data[i].children[j],
+								value: res.data[i].children[j].accountId, 
+								text: res.data[i].children[j].accountName
+							})							
+						}
+					}
+					this.userList=userList
+				})
+			},
+			showImage(index){
+				uni.previewImage({
+					urls:this.baseInfo.attachList.map(item=>item.fileUrl),
+					current:index
+				})
+			},
+			onSubmit(){
+				let user=this.userList.filter(item=>this.formData.accountId===item.accountId)[0]
+				const arr = this.flowData.actionDefList
+				const action = arr[0]
+				this.handleUserSelect()
+				let workflowForm={				
+					"wfDefId": this.flowData.wfDefId,
+					"wfInsId": this.flowData.wfInsId,
+					"activityDefId": this.flowData.activityDefId,
+					"activityInsId":this.flowData.activityInsId,
+					"activityCode": "submit",
+					"actionId": 1,
+					"actionCode":  action.actionCode,
+					"actionRemark": this.flowData.dangerDesc,
+					"attachList": this.formData.attachList,
+					"actionInsId": this.flowData.actionInsId,
+					"actionDefId": action.actionDefId,
+					"groupIdTo": this.formData.groupIdTo,
+					"positionIdTo": this.formData.positionIdTo,
+					"accountIdTo": this.formData.accountIdTo,
+					"accountNameTo": this.formData.accountNameTo,
+					"groupNameTo": this.formData.groupNameTo,
+					"positionNameTo": this.formData.positionNameTo
+				}
+				this.handleSubmit(workflowForm)
+			},
+			async handleSubmit({res,workflowForm}) {
+				let attachList=[]
+				for(let i=0;i<this.formData.attachList.length;i++){
+					let filePath=this.formData.attachList[i].url
+					let fileresq=await upload({filePath})
+					fileresq=JSON.parse(fileresq)
+					attachList.push(fileresq.data)
+				}
+				let scenePhoto= attach[0].fileUrl
+				let sceneIcon= attach[0].fileIcon
+				let {data}=await handleWorkflow(workflowForm).catch(()=>{uni.showToast({icon:'none',title:"提交失败！"})})
+				let dangerLocation=this.riskList.find(item=>item.riskPointId===this.formData.riskPointId)[0].riskPointTitle;
+				let resq=await handleDanger({
+					"formCode": "submit",
+					"dangerId": this.flowData.wfInsId,
+					"scenePhoto":scenePhoto,
+					"sceneIcon": sceneIcon,
+					"groupId": this.formData.groupId,
+					"riskPointId": this.formData.riskPointId,
+					"dangerCode": this.formData.dangerCode,
+					"dangerTitle": this.formData.dangerTitle,
+					"dangerCatId": this.formData.dangerCatId,
+					"dangerLevel": this.formData.dangerLevel,
+					"dangerDesc": this.formData.dangerDesc,
+					"dangerLocation":dangerLocation,
+					"dangerDeadLine": this.formData.dangerDeadLine,
+					"dangerSource": this.formData.dangerSource,
+					"submitRemark": this.flowData.dangerDesc,
+					"curGroupId": this.formData.groupIdTo,
+					"curGroupName": this.formData.groupNameTo,
+					"curPositionId": this.formData.positionIdTo,
+					"curPositionName": this.formData.positionNameTo,
+					"curAccountId": this.formData.accountIdTo,
+					"curAccountName": this.formData.accountIdTo,
+					"status": 1,
+					"attachList": []					
+				}).catch(()=>{uni.showToast({icon:'none',title:"提交失败！"})})
+				uni.showToast({
+					icon:'none',
+					title:"提交成功！",
+					complete() {
+						uni.redirectTo({
+							url:'/pages/index/detail/detail?type=danger&name=隐患管理'
+						})
+					}
+				})
+			},	
+			// 选择执行人员
+			handleUserSelect() {
+				const accountId=this.formData.accountIdTo
+				const self=this;
+				this.userList.forEach((obj) => {
+					if (obj.accountId === accountId) {
+						self.form.groupIdTo= obj.groupId
+						self.form.positionIdTo= obj.positionId
+						self.form.accountIdTo= obj.accountId
+	
+						self.form.groupNameTo= obj.groupName,
+						self.form.positionNameTo=obj.positionName
+						self.form.accountNameTo= obj.accountName
+					}
+				})
+			}, 
+			getStatusByActivityCode(activityCode, wfStatus) {
+			  let iRet = 0
+			  if (wfStatus === 0) {
+				if (activityCode === 'submit') {
+				  iRet = 0
+				} else if (activityCode === 'review') {
+				  iRet = 1
+				} else if (activityCode === 'rectify') {
+				  iRet = 2
+				} else if (activityCode === 'accept') {
+				  iRet = 3
+				}
+			  } else if (wfStatus === 1) {
+				iRet = 4
+			  } else {
+				iRet = -1
+			  }
+			  return iRet
+			},
+			changeAction(item){
+				this.formData.actionDefId=item.value
+			},
+			uploadSuccess(e){
+				let attachList=JSON.parse(JSON.stringify(this.formData.attachList))
+				attachList.push(e.tempFiles[0])
+				this.formData.attachList=attachList
+			},
+			deleteFile(e){							
+				let attachList=JSON.parse(JSON.stringify(this.formData.attachList))
+				attachList.filter(item=>item.uuid!==e.tempFile.uuid)
+				this.formData.attachList=attachList
+			},			
+		}
+	}
+</script>
+<!-- 当不提供接口获取对应的处理地址，又强制要求动态去做隐患处理时使用 -->
+<style lang="scss" scoped>
+	.danger-form{
+		padding: 20rpx 20rpx 160rpx 20rpx;
+		margin-bottom: 120rpx;
+		 .attach-wrap{
+			display: flex;
+			flex-wrap: wrap;
+			.attach{
+				display: block;
+				width: 100rpx;
+				height: 100rpx;
+				margin: 10rpx;
+				border: 1px solid #ccc;
+			}
+		}
+		.form-container{
+			padding: 10rpx;
+			// box-shadow: 0px 0px 3px 1px rgba(0, 0, 0, 0.08);
+			margin-top: 20rpx;
+		}
+		.submit_bt{
+			width: 600rpx;
+			height: 72rpx;
+			line-height: 72rpx;
+			box-sizing: border-box;
+			border-radius: 16upx;
+			margin-top: 50upx;
+			background-color:#3384FF;
+			font-size: 32rpx;
+			color: #fff;
+		}
+		.button-container{
+			width: 750rpx;
+			height:88rpx;
+			line-height:88rpx;
+			color: #4D73FF;
+			text-align: center;
+			font-size: 32rpx;
+			padding-bottom: 68rpx;
+			background-color: #fff;
+			position: fixed;
+			left: 0;
+			bottom: 0;
+			z-index: 2;
+			box-shadow: 0px 0px 12px 0px #0000000A;
+			border-radius: 8px 8px 0px 0px
+		}
+		::v-deep .uni-forms-item{
+			.uni-forms-item__content{
+				.uni-data-checkbox-wrap{
+					height: 100%;
+					display: flex;
+					align-items: center;
+					.action{
+						padding: 22rpx 32rpx;
+						background-color: #fff;
+						border-radius: 2px;
+						margin-right: 20rpx;
+						font-size: 28rpx;
+						line-height: 1;
+						&.active{
+							background: rgba(77, 115, 255, 0.16);
+							color: #4D73FF;
+						}
+					}
+				}
+
+			}		
+		}
+	}
+
+</style>

pages/index/handle/task/checkList/detail/detail.vue

@@ -0,0 +1,129 @@
+<template>
+	<view class="wrap">
+		<uni-section :title="point.pointContent" type="line">
+			<uni-forms ref="form" :modelValue="formData" :rules="rules" :label-width="300" label-position="top">
+				<uni-forms-item label="检查结果" name="checkResult" required>
+					<view class="uni-data-checkbox-wrap">{{checkResult}}</view>	
+				</uni-forms-item>	
+				<uni-forms-item label="备注" name="remark">
+				  <uni-easyinput disabled v-model="formData.remark" type="textarea" :maxlength="-1" autoHeight placeholder="备注" />
+				</uni-forms-item>
+				<template v-if="formData.attachList.length>0">
+					<view class="attach-box" @click="preview(attach,index)" v-for="(attach,index) in formData.attachList" :key="index">	
+						<image class="attach" :src="attach.fileUrl" mode="widthFix"></image>					 
+					</view>
+				</template>
+			</uni-forms>
+		</uni-section>
+	</view>
+</template>
+
+<script>
+	import {upload} from '@/api/system/upload.js'	
+	import {updateChecklistPoint,getPoint} from '@/api/aqpt/checklistPoint.js'
+	export default {
+		data() {
+			return {
+				checkResults:[
+					{text:"通过",value:1},
+					{text:"不通过",value:-1},
+				],
+				checkResult:"",
+				formData:{
+					checkResult:1,	
+					remark:"",
+					attachList:[]
+				},
+				rules:{},
+				point:{}
+			}
+		},
+		onBackPress() {
+
+		},
+		onLoad() {
+			this.init()
+		},
+		methods: {
+			init(){
+				let point=uni.getStorageSync('point');
+				this.point=point;
+				this.getPoint()
+			},
+			getPoint(){
+				let point=uni.getStorageSync('point');
+				let checklistId=point.checklistId;
+				let itemId=point.itemId;
+				let recordId=point.recordId;
+				let pointId=point.pointId;
+				getPoint(checklistId,itemId,recordId,pointId).then((res)=>{
+					this.formData=res.data
+					for(let i=0;i<this.checkResults.length;i++){
+						if(this.checkResults[i].value===res.data.checkResult){
+							this.checkResult=this.checkResults[i].text
+						}
+					}
+				})
+			},
+		    preview(attach,index){
+				uni.previewImage({
+					urls:[attach.fileUrl],
+					current:index
+				})
+			}
+		},
+		onUnload() {			
+			uni.removeStorageSync('point')
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.wrap{
+	padding: 20rpx;
+	position: relative;
+	// &::after{
+	// 	content: "";
+	// 	width: 100%;
+	// 	height: 100vh;
+	// 	position: fixed;
+	// 	left: 0;
+	// 	top: 0;
+	// 	background-color: rgba(0,0,0,0);
+	// 	z-index: 999;
+	// }
+	.submit-BT {
+		width: 750rpx;
+		color: #4D73FF;
+		text-align: center;
+		font-size: 32rpx;
+		padding-bottom: 68rpx;
+		background-color: #fff;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		z-index: 99;
+		box-shadow: 0px 0px 12px 0px #0000000A;
+		border-radius: 8px 8px 0px 0px
+	}
+	::v-deep .uni-forms-item{
+		.uni-forms-item__content{
+			.uni-data-checkbox-wrap{
+				height: 100%;
+				display: flex;
+				align-items: center;					
+			}
+	
+		}		
+	}
+	.attach-box{
+		&,.attach{
+			width: 200rpx;
+			height: 200rpx;
+			margin-right: 10rpx;
+			border: 1px solid #333;			
+		}
+
+	}
+}
+</style>

pages/index/handle/task/checkList/form/form.vue

@@ -0,0 +1,226 @@
+<template>
+	<view class="wrap">
+		<uni-section :title="point.pointContent" type="line">
+			<uni-forms ref="form" :modelValue="formData" :rules="rules" :label-width="300" label-position="top">
+				<uni-forms-item label="检查结果" name="checkResult" required>
+					<view class="uni-data-checkbox-wrap">
+						<uni-data-checkbox v-model="formData.checkResult" :localdata="checkResults" />				
+					</view>
+				</uni-forms-item>	
+				<uni-forms-item label="备注" name="remark">
+				  <uni-easyinput v-model="formData.remark" type="textarea" :maxlength="-1" autoHeight placeholder="备注" />
+				</uni-forms-item>
+				<uni-file-picker  v-model="formData.attachList" 
+				 fileMediatype="image" 
+				 title="请上传附件"
+				 limit="1"
+				 @select="uploadSuccess"
+				 @delete="deleteFile"></uni-file-picker>	
+			</uni-forms>
+		</uni-section>
+		<button type="primary" @click="onSubmit" class="submit-BT">提交</button>		
+	</view>
+</template>
+
+<script>
+	import {upload} from '@/api/system/upload.js'	
+	import {updateChecklistPoint,getchecklistRecord} from '@/api/aqpt/checklistPoint.js'
+	import {completeCheckTask} from '@/api/aqpt/task.js'	
+	export default {
+		data() {
+			return {
+				checkResults:[
+					{text:"通过",value:1},
+					{text:"不通过",value:-1},
+				],
+				formData:{
+					checkResult:1,	
+					remark:"",
+					attachList:[]
+				},
+				rules:{},
+				point:{},
+				itemList:[]
+			}
+		},
+		onLoad() {
+			this.init()
+		},
+		methods: {
+			init(){
+				let point=uni.getStorageSync('point');
+				this.point=point;
+				this.getchecklistRecord()
+				this.getLocation()
+			},
+			getchecklistRecord(){
+				let {checklistId,recordId}=uni.getStorageSync('point');
+				if(!checklistId)return
+				getchecklistRecord(checklistId,recordId).then((res)=>{
+					let itemList=res.data.itemList
+					let point=null
+					let points=[]
+					for(let i=0;i<itemList.length;i++){
+						if(itemList[i].children){
+							itemList[i].children.map(child=>{
+								child.recordList.map(pointitem=>{
+									points.push(pointitem)
+								})
+							})
+						}else{
+							itemList[i].recordList.map(pointitem=>{
+									points.push(pointitem)
+							})
+							
+						}						
+					}
+					this.itemList=points
+					this.handles=points.filter(item=>(!item.checkResult&&item.pointId!==this.point.pointId))
+				})
+			},
+			getLocation(){
+				const self=this;
+				uni.getLocation({
+					type: 'wgs84',
+					success: function (res) {
+						self.formData.dutyLongitude=res.longitude
+						self.formData.dutyLatitude=res.latitude
+					}
+				});		
+			},
+			async onSubmit() {
+				let point=uni.getStorageSync('point')
+				let attachList=[]
+				for(let i=0;i<this.formData.attachList.length;i++){
+					let filePath=this.formData.attachList[i].url
+					let fileresq=await upload({filePath,formData:{
+						additions: `经度:${this.formData.dutyLongitude};纬度:${this.formData.dutyLatitude}`
+					}}).catch(()=>{
+						uni.showToast({
+							icon:'none',
+							title:"提交失败！"
+						})	
+					})
+					if(fileresq.includes('html')){
+						uni.showToast({
+							icon:'none',
+							title:"图片上传异常"
+						})
+						return
+					}					
+					fileresq=JSON.parse(fileresq)
+					attachList.push(fileresq.data)		
+				}
+				await updateChecklistPoint({
+					recordId:point.recordId,
+					checklistId:point.checklistId,
+					itemId:point.itemId,
+					pointId:point.pointId,
+					checkResult:this.formData.checkResult,
+					remark:this.formData.remark,
+					attachList,
+				}).catch(()=>{
+					uni.showToast({
+						icon:'none',
+						title:"提交失败！"
+					})				
+				})
+				let idx=this.itemList.findIndex(item=>item.pointId===point.pointId)
+				this.itemList[idx].checkResult=this.formData.checkResult				
+				this.batchHandle()
+			},
+			// 批量处理未处理的
+			batchHandle(){
+				let point=uni.getStorageSync('point')
+				if(this.handles.length<1){
+					const key=this.itemList.find(item=>item.checkResult===-1)
+					if(!key){
+						completeCheckTask(point.recordId).then(()=>{
+							uni.showToast({
+								icon:'none',
+								title:"处理完毕",
+								duration:1000,
+								complete() {
+									uni.redirectTo({
+										url:`/pages/index/detail/detail?type=task&name=待办任务`
+									})
+								}
+							})	
+						}).catch(()=>{
+							uni.showToast({
+								icon:"none",
+								title:"操作失败"
+							})
+						})							
+					}else{
+						let cid=point.checklistId;
+						let rid=point.recordId;
+						uni.showToast({
+							icon:'none',
+							title:"处理完毕",
+							duration:1000,
+							complete() {
+								uni.redirectTo({
+									url:`/pages/index/handle/task/hazardRecord/hazardRecord?rid=${rid}&cid=${cid}&title=${measure.hazardTitle}`
+								})
+							}
+						})						
+					}				
+					return					
+				}
+				let nextPoint=this.handles[0]
+				this.formData={
+					checkResult:1,	
+					remark:"",
+					attachList:[]
+				}
+				this.handles.shift()
+				uni.setStorageSync('point',nextPoint);
+				this.point=nextPoint;	
+			},
+			uploadSuccess(e){
+				let attachList=JSON.parse(JSON.stringify(this.formData.attachList))
+				attachList.push(e.tempFiles[0])
+				this.formData.attachList=attachList
+			},
+			deleteFile(e){							
+				let attachList=JSON.parse(JSON.stringify(this.formData.attachList))
+				attachList.filter(item=>item.uuid!==e.tempFile.uuid)
+				this.formData.attachList=attachList
+			},			
+		},
+		onUnload() {			
+			uni.removeStorageSync('point')
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.wrap{
+	padding: 20rpx;
+	.submit-BT {
+		width: 750rpx;
+		color: #4D73FF;
+		text-align: center;
+		font-size: 32rpx;
+		padding-bottom: 68rpx;
+		background-color: #fff;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		z-index: 99;
+		box-shadow: 0px 0px 12px 0px #0000000A;
+		border-radius: 8px 8px 0px 0px
+	}
+	::v-deep .uni-forms-item{
+		.uni-forms-item__content{
+			.uni-data-checkbox-wrap{
+				height: 100%;
+				display: flex;
+				align-items: center;					
+			}
+	
+		}		
+	}
+}
+</style>

pages/index/handle/task/checkList/form/transferCheckTask.vue

@@ -0,0 +1,136 @@
+<template>
+	<view class="wrap">
+		<uni-section :title="title" type="line">
+			<uni-forms ref="form" :modelValue="formData" :rules="rules" :label-width="300" label-position="top">
+				<uni-forms-item label="执行人" name="accountId" required>
+				  <uni-data-select v-model="accountId" :localdata="userList"></uni-data-select>
+				</uni-forms-item>				
+				<uni-forms-item label="备注" name="remark">
+				  <uni-easyinput v-model="formData.taskDesc" type="textarea" :maxlength="-1" autoHeight placeholder="备注" />
+				</uni-forms-item>
+			</uni-forms>
+		</uni-section>
+		<button type="primary" @click="onSubmit" class="submit-BT">提交</button>		
+	</view>
+</template>
+
+<script>
+	import {transferCheckTask} from '@/api/aqpt/task.js'
+	import {getUserList,} from '@/api/system/user.js'	
+	export default {
+		data() {
+			return {
+				userList:[],
+				accountId:undefined,						
+				formData:{
+					taskId: undefined,
+					groupIdTo: undefined,
+					positionIdTo: undefined,
+					accountIdTo: undefined, // 执行人
+					groupNameTo: undefined,
+					positionNameTo: undefined,
+					accountNameTo: undefined,
+					taskDesc:""
+				},
+				rules:{},
+				title:"任务转交"
+			}
+		},
+		onBackPress() {
+
+		},
+		onLoad({tid,title}) {
+			this.formData.taskId=tid;
+			this.title=title;
+			this.getUserList()
+		},
+		methods: {
+			getUserList(){
+				getUserList().then((res)=>{
+					var userList=[]
+					for (var i = 0; i < res.data.length; i++) {
+						userList.push({
+								value: -i, 
+								text: res.data[i].name,
+								disable:true
+						})
+						for(let j = 0; j < res.data[i].children.length; j++){
+							userList.push({
+								...res.data[i].children[j],
+								value: res.data[i].children[j].accountId, 
+								text: res.data[i].children[j].accountName
+							})							
+						}
+					}
+					this.userList=userList
+				})
+			},			
+			async onSubmit() {
+				let user=this.userList.filter(item=>this.accountId===item.accountId)[0]
+				this.handleUser(user)					
+				if(!this.accountId){
+					uni.showToast({
+						icon:'none',
+						title:"请选择转交人员"
+					})	
+					return
+				}
+				await transferCheckTask(this.formData).then(()=>{
+					uni.showToast({
+						icon:'none',
+						title:"转交成功！",
+						complete() {
+							uni.switchTab({
+								url:'/pages/index/index'
+							})
+						}
+					})					
+				})
+				.catch(()=>{
+					uni.showToast({
+						icon:'none',
+						title:"提交失败！"
+					})				
+				})
+			},
+			handleUser(user){
+				this.formData.groupIdTo=user.groupId,
+				this.formData.positionIdTo=user.positionId
+				this.formData.accountIdTo=user.accountId
+				this.formData.groupNameTo=user.groupName
+				this.formData.positionNameTo=user.positionName
+				this.formData.accountNameTo=user.accountName			
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.wrap{
+	padding: 20rpx;
+	.submit-BT {
+		width: 750rpx;
+		color: #4D73FF;
+		text-align: center;
+		font-size: 32rpx;
+		padding-bottom: 68rpx;
+		background-color: #fff;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		z-index: 99;
+		box-shadow: 0px 0px 12px 0px #0000000A;
+		border-radius: 8px 8px 0px 0px
+	}
+	::v-deep .uni-forms-item{
+		.uni-forms-item__content{
+			.uni-data-checkbox-wrap{
+				height: 100%;
+				display: flex;
+				align-items: center;					
+			}
+	
+		}		
+	}
+}
+</style>

pages/index/handle/task/hazardRecord/form.vue

@@ -0,0 +1,236 @@
+<template>
+	<view class="wrap">
+		<uni-section :title="measure.hazardTitle" type="line">
+			<uni-forms ref="form" :modelValue="formData" :rules="rules" :label-width="300" label-position="top">
+				<uni-forms-item label="检查内容" required>
+				  {{measure.measureContent}}
+				</uni-forms-item>				
+				<uni-forms-item label="检查结果" name="checkResult" required>
+					<view class="uni-data-checkbox-wrap">
+						<uni-data-checkbox v-model="formData.checkResult" :localdata="checkResults" />				
+					</view>
+				</uni-forms-item>	
+				<uni-forms-item label="备注" name="remark">
+				  <uni-easyinput v-model="formData.remark" type="textarea" :maxlength="-1" autoHeight placeholder="备注" />
+				</uni-forms-item>
+				<uni-file-picker  v-model="formData.attachList" 
+				 fileMediatype="image" 
+				 title="请上传附件"
+				 limit="1"
+				 @select="uploadSuccess"
+				 @delete="deleteFile"></uni-file-picker>	
+			</uni-forms>
+		</uni-section>
+		<button type="primary" @click="onSubmit" class="submit-BT">提交</button>		
+	</view>
+</template>
+
+<script>
+import {upload} from '@/api/system/upload.js'	
+import { getChecklistHazardRecordById,updateChecklistHazardRecordDoing} from '@/api/aqpt/checklistHazardRecordApi'
+import { getChecklistHazardRecordView } from '@/api/aqpt/checklistRecordHazardApi'
+import {completeCheckTask} from '@/api/aqpt/task.js'	
+	export default {
+		data() {
+			return {
+				checkResults:[
+					{text:"通过",value:1},
+					{text:"不通过",value:-1},
+				],
+				formData:{
+					checkResult:1,	
+					remark:"",
+					attachList:[]
+				},
+				rules:{},
+				measure:{},
+				handles:[],
+				itemList:[]
+			}
+		},
+		created() {
+			this.init()
+		},
+		methods: {
+			init(){
+				let measure=uni.getStorageSync('measure');
+				this.measure=measure;
+				this.getLocation()
+				this.getchecklist()
+			},
+			getchecklist(){
+				getChecklistHazardRecordView(this.measure.recordId).then((res)=>{
+					let itemList=res.data.hazardList
+					let measures=[]						
+					for(let i=0;i<itemList.length;i++){
+						if(itemList[i].riskList){
+							itemList[i].riskList.map(child=>{
+								child.recordList.map(measure=>{
+									measures.push(measure)
+								})
+							})
+						}						
+					}
+					let index=measures.findIndex(item=>item.measureId===this.measure.measureId)
+					if(index>0){
+						let temp=measures[0];
+						measures[0]=JSON.parse(JSON.stringify(this.measure))
+						measures[index]=temp
+					}	
+					this.itemList=measures									
+					this.handles=measures					
+				})
+			},
+			getLocation(){
+				const self=this;
+				uni.getLocation({
+					type: 'wgs84',
+					success: function (res) {
+						self.formData.dutyLongitude=res.longitude
+						self.formData.dutyLatitude=res.latitude
+					}
+				});		
+			},
+			async onSubmit() {
+				let measure=uni.getStorageSync('measure')
+				let attachList=[]
+				for(let i=0;i<this.formData.attachList.length;i++){
+					let filePath=this.formData.attachList[i].url
+					let fileresq=await upload({filePath,formData:{
+						additions: `经度:${this.formData.dutyLongitude};纬度:${this.formData.dutyLatitude}`
+					}}).catch(()=>{
+						uni.showToast({
+							icon:'none',
+							title:"提交失败！"
+						})	
+					})
+					if(fileresq.includes('html')){
+						uni.showToast({
+							icon:'none',
+							title:"图片上传异常"
+						})
+						return
+					}					
+					fileresq=JSON.parse(fileresq)
+					attachList.push(fileresq.data)		
+				}
+				await updateChecklistHazardRecordDoing({
+					recordId:measure.recordId,
+					checklistId:measure.checklistId,
+					riskId:measure.riskId,
+					hazardId:measure.hazardId,
+					measureId:measure.measureId,
+					checkResult:this.formData.checkResult,
+					remark:this.formData.remark,
+					attachList,
+				}).catch(()=>{
+					uni.showToast({
+						icon:'none',
+						title:"提交失败！"
+					})				
+				})
+				let idx=this.itemList.findIndex(item=>item.measureId==measure.measureId)
+				this.itemList[idx].checkResult=this.formData.checkResult
+				this.batchHandle()
+			},
+			// 批量处理未处理的
+			batchHandle(){
+				let measure=uni.getStorageSync('measure')
+				let handles=JSON.parse(JSON.stringify(this.handles))
+				handles.shift()	
+				this.handles=handles
+				if(handles.length<1){
+					const key=this.itemList.find(item=>item.checkResult===-1)
+					console.log({
+						"this.itemList":this.itemList,
+						key
+					})
+					if(!key){
+						completeCheckTask(measure.recordId).then(()=>{
+							uni.showToast({
+								icon:'none',
+								title:"处理完毕",
+								duration:1000,
+								complete() {
+									uni.redirectTo({
+										url:`/pages/index/detail/detail?type=task&name=待办任务`
+									})
+								}
+							})	
+						}).catch(()=>{
+							uni.showToast({
+								icon:"none",
+								title:"操作失败"
+							})
+						})						
+					}else{
+						let cid=measure.checklistId;
+						let rid=measure.recordId;
+						uni.showToast({
+							icon:'none',
+							title:"处理完毕",
+							duration:1000,
+							complete() {
+								uni.redirectTo({
+									url:`/pages/index/handle/task/hazardRecord/hazardRecord?rid=${rid}&cid=${cid}&title=${measure.hazardTitle}`
+								})
+							}
+						})							
+					}
+					return					
+				}
+				this.formData={
+					checkResult:1,	
+					remark:"",
+					attachList:[]
+				}
+				uni.setStorageSync('measure',handles[0]);
+				this.measure=handles[0];								
+			},
+			uploadSuccess(e){
+				let attachList=JSON.parse(JSON.stringify(this.formData.attachList))
+				attachList.push(e.tempFiles[0])
+				this.formData.attachList=attachList
+			},
+			deleteFile(e){							
+				let attachList=JSON.parse(JSON.stringify(this.formData.attachList))
+				attachList.filter(item=>item.uuid!==e.tempFile.uuid)
+				this.formData.attachList=attachList
+			},			
+		},
+		onUnload() {			
+			uni.removeStorageSync('point')
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.wrap{
+	padding: 20rpx;
+	padding-bottom: 200rpx;
+	.submit-BT {
+		width: 750rpx;
+		color: #4D73FF;
+		text-align: center;
+		font-size: 32rpx;
+		padding-bottom: 68rpx;
+		background-color: #fff;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		z-index: 99;
+		box-shadow: 0px 0px 12px 0px #0000000A;
+		border-radius: 8px 8px 0px 0px
+	}
+	::v-deep .uni-forms-item{
+		.uni-forms-item__content{
+			.uni-data-checkbox-wrap{
+				height: 100%;
+				display: flex;
+				align-items: center;					
+			}
+	
+		}		
+	}
+}
+</style>

pages/index/handle/task/hazardRecord/hazardRecord.vue

@@ -0,0 +1,377 @@
+<template>
+	<view class="page">
+		<view class="wrap">
+			<template v-if="itemList.length>0">
+				<view class="checklist" v-for="(hazardlist,idx) in itemList" :key="idx">
+					<view class="title more">{{hazardlist.hazardTitle}}</view>
+					<view class="item-cont" v-if="hazardlist.riskList&&hazardlist.riskList.length>0">
+						<view class="checklistItem" v-for="(riskItem,itemIdx) in hazardlist.riskList" :key="itemIdx">
+							<view class="itemTitle more"> {{riskItem.riskTitle}}</view>
+							<view  class="point-cont" v-if="riskItem.recordList&&riskItem.recordList.length>0">
+								<view class="point" v-for="(measure,measureIdx) in riskItem.recordList" :key="measureIdx" @click="check(measure)">
+									<view class="pointContent">
+											<text style="padding-right: 5px;">{{measureIdx+1}})</text>
+											<text>{{measure.measureContent}}</text>
+									</view>
+									<view class="status">【<span class="text">{{measure.checkResult|checkResultFilter}}</span>】</view>
+								</view>
+							</view>
+						</view>				
+					</view>				
+				</view>
+				<view class="handle-container">	
+					<view class="handle" @click="handleSubmit(1)">全部通过</view>
+					<view class="handle" @click="handleSubmit(2)">全不通过</view>
+					<view class="handle submit" @click="handleSubmit(3)" v-if="submit_bt_state">提交</view>
+<!-- 					<view class="handle danger" @click="handleSubmit('danger')" v-if="danger_bt_state">登记隐患</view> -->
+					<view class="more" @mouseenter="hover(1)" @mouseleave="hover">
+						<text class="text">更多</text>
+						<view class="list" v-if="showMore">
+							<view class="hand-item-box">
+								<view class="handle-item" @click="handleSubmit(4)">撤销</view>
+								<view class="handle-item" @click="handleSubmit(5)">转交</view>																	
+							</view>						
+						</view>						
+					</view>
+				</view>
+			</template>
+			<template v-else>没有可处理的清单^-_-^</template>
+		</view>		
+	</view>
+</template>
+<script>	
+import { getChecklistHazardRecordView } from '@/api/aqpt/checklistRecordHazardApi'
+import { batchUpdateChecklistHazardRecordDoing } from '@/api/aqpt/checklistHazardRecordApi'
+import {cancelCheckTask,completeCheckTask} from '@/api/aqpt/task.js'	
+	export default {
+		data() {
+			return {
+				defaultProps: {
+					id: 'itemId', 
+					children: 'children',
+					label: 'itemTitle'
+				},
+				accountInfo:{},
+				divider: false,
+				edit: true,
+				danger_bt_state:false,
+				submit_bt_state:false,
+				itemList:[],
+				recordId:undefined,
+				checklistId:undefined,
+				handleVisiable:false,
+				type:undefined,
+				status:undefined,
+				taskTitle:"",
+				showMore:false
+			}
+		},
+		  filters: {
+		    checkResultFilter(i) {
+			  if (i >= 0) {
+			    const strs = [
+			      '未检查',
+			      '通过'
+			    ]
+			    return strs[i]
+			  } else {
+			    if (i === -1) {
+			      return '未通过'
+			    } else if (i === -2) {
+			      return '发现隐患'
+			    }
+			  }
+		    }
+		  },
+		onLoad({rid,cid,title}) {
+			this.checklistId=cid	
+			this.recordId=rid	
+			let accountInfo=uni.getStorageSync('accountInfo')
+			this.accountInfo=accountInfo
+			this.taskTitle=title
+			this.getchecklistRecord(rid)
+		},
+		methods: {
+			getchecklistRecord(recordId){
+				getChecklistHazardRecordView(recordId).then((res)=>{
+					if(!res.data.hazardList)return					
+					this.itemList=res.data.hazardList
+					this.status=res.data.status		
+					let items=[]						
+					for(let i=0;i<this.itemList.length;i++){
+						if(this.itemList[i].riskList){
+							this.itemList[i].riskList.map(child=>{
+								child.recordList.map(measure=>{
+									items.push(measure)
+								})
+							})
+						}						
+					}
+					let index=items.findIndex(item=>item.checkResult===-1)
+					let _index=items.findIndex(item=>item.checkResult===0)	
+					this.submit_bt_state=_index<0								
+					this.danger_bt_state=index>-1?true:false
+				})
+			},
+			check(measure){		
+				uni.setStorageSync("measure",measure)
+				uni.redirectTo({
+					url:"/pages/index/handle/task/hazardRecord/form"
+				})								
+			},
+			handleSubmit(type){
+				let recordId=this.recordId;
+				let checklistId=this.checklistId;
+				const self=this;				
+				if(type===1){
+					batchUpdateChecklistHazardRecordDoing(recordId,1).then(()=>{
+						this.getchecklistRecord(recordId)
+					})
+				}
+				if(type===2){
+					batchUpdateChecklistHazardRecordDoing(recordId,-1).then(()=>{
+						this.getchecklistRecord(recordId)
+					})
+				}				
+				if(type===3){//完成
+					if(this.danger_bt_state){
+						uni.showModal({
+							title: '提示',
+							content: '本次检查有未通过项，是否需要登记隐患？',
+							success: function (res) {
+								if (res.confirm) {
+									self.submitDanger(recordId)
+								} else if (res.cancel) {
+									self.completeTask(recordId)
+								}
+							}
+						});
+					}else{
+						this.completeTask(recordId)
+					}
+				}
+				if(type===4){//放弃
+					cancelCheckTask(recordId).then(()=>{
+						uni.reLaunch({
+							url:'/pages/index/index'
+						})
+					}).catch(()=>{
+						uni.showToast({
+							icon:"none",
+							title:"操作失败"
+						})
+					})
+				}	
+				if(type===5){//转交
+					let taskTitle=this.taskTitle;
+					uni.redirectTo({
+						url:`/pages/index/handle/task/checkList/form/transferCheckTask?tid=${recordId}&title=${taskTitle}`
+					})
+				}
+				if(type==="danger"){
+					let href=`${this.$h5}/danger/views/create.html`;
+					let name= '登记隐患'
+					completeCheckTask(recordId).then(()=>{
+						uni.reLaunch({
+							url:`/pages/webview/webview?href=${href}&name=${name}`
+						})
+					}).catch(()=>{
+						uni.reLaunch({
+							url:`/pages/webview/webview?href=${href}&name=${name}`
+						})
+						uni.showToast({
+							icon:"none",
+							title:"操作失败"
+						})
+					})
+				}
+			},
+			completeTask(recordId){
+				completeCheckTask(recordId).then(()=>{				
+					uni.reLaunch({
+						url:'/pages/index/index'
+					})
+				}).catch(()=>{
+					uni.showToast({
+						icon:"none",
+						title:"操作失败"
+					})
+				})					
+			},
+			submitDanger(recordId){
+				let href=`${this.$h5}/danger/views/create.html`;
+				let name= '登记隐患'	
+				uni.reLaunch({
+					url:`/pages/webview/webview?href=${href}&name=${name}`
+				})	
+				completeCheckTask(recordId)								
+			},
+			hover(state){
+				this.showMore=state===1
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page{
+		background-color: #F5F6F8;
+		padding: 20rpx;
+		min-height: 100vh;
+		box-sizing: border-box;
+		padding-bottom: 120rpx;
+		.page-head{
+			text-align: right;
+			padding-bottom: 10rpx;
+			.handle{
+				display: inline-block;
+				background-color: #3384FF;
+				color: #fff;
+				padding: 10rpx 15rpx;
+				box-sizing: border-box;
+				border-right: 1rpx solid #eaeaea;
+				font-size: 30rpx;
+				text-align: center;
+				&:nth-child(4){
+					border: 0;
+				}
+			}
+		}
+	}	
+	.wrap{
+		padding: 20rpx;
+		background-color: #fff;
+		.checklist{
+			.title{
+				color: #222222;
+				font-size: 32rpx;
+				height: 98rpx;
+				line-height: 98rpx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				border-bottom: 1px dashed #E8E8E8;				
+			}
+			.more{
+				background-image: url('/static/tree_more.png');
+				background-size: 30rpx 30rpx;
+				padding-left: 40rpx;
+				background-position: center left;
+				background-repeat: no-repeat;
+			}
+			.item-cont{
+				padding-left: 20rpx;
+				border-bottom: 1px dashed #E8E8E8;	
+				.checklistItem{
+					.itemTitle{
+						color: #222222;
+						font-size: 32rpx;	
+						height: 98rpx;
+						line-height: 98rpx;
+					}
+				}
+				.point-cont{
+					padding-left: 30rpx;
+					.point{
+						display: flex;						
+						color: #666;
+						font-size: 28rpx;	
+						// height: 98rpx;
+						// line-height: 98rpx;
+						.pointContent{
+							flex: 1;
+						}
+						.status{
+							.text{
+								color: #3384FF;
+								font-weight: 800;
+							}
+						}
+					}
+				}
+			}
+		}
+			
+		.handle-container{
+			position: fixed;
+			width: 100%;
+			left: 0;
+			bottom: 0;
+			background-color: #fff;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-top: 1rpx solid #eaeaea;
+			padding: 15rpx 0;
+			.handle{
+				display:inline-block;
+				color: #222;
+				padding: 15rpx 20rpx;
+				box-sizing: border-box;
+				border: 1rpx solid #eaeaea;
+				font-size: 26rpx;
+				text-align: center;
+				border-radius: 50rpx;
+				margin: 0 10rpx;
+				&.danger{
+					background-color: #FA5B41;	
+					color: #fff;						
+				}
+				&.submit{
+					background-color: #3384FF;	
+					color: #fff;
+				   padding: 18rpx 38rpx;
+				}
+			}
+			.more{
+				position: relative;
+				padding: 15rpx 20rpx;
+				// .text:hover{
+				// 	&+.list>.hand-item-box{
+				// 		display: block;
+				// 	}
+				// }
+				.list{
+					position: absolute;
+					bottom: 100rpx;
+					right: 0;
+					box-shadow: 0px 2px 12px 0px #0000001F;
+					padding:0 20rpx;
+					background-color: #fff;
+					.hand-item-box{
+						position: relative;
+						// display: none;
+						&.show{
+							display: block;
+						}
+						&::after{
+							width: 0;
+							height: 0;
+							content: "";
+							display: block;
+							border-width: 26rpx 26rpx 0 0;
+							border-color: #fff transparent;
+							border-style: solid;
+							position: absolute;
+							bottom: -20rpx;
+							right: -20rpx;
+						}
+						.handle-item{
+							width: 180rpx;
+							height: 50rpx;
+							font-size: 26rpx;
+							line-height: 50rpx;
+							background-color: #fff;
+							text-align: center;
+							border-bottom: 1px solid #ccc;
+							padding:10rpx 0;
+							&:last-child{
+								border: 0;
+							}
+						}						
+					}
+
+				}
+			}
+		}
+	}
+</style>

pages/index/handle/task/task.vue

@@ -0,0 +1,371 @@
+<template>
+	<view class="page">
+<!-- 		<view class="page-head">
+			<view class="handle" @click="handleSubmit(1)">全部通过</view>
+			<view class="handle" @click="handleSubmit(2)">全不通过</view>				
+		</view> -->
+		<view class="wrap">
+			<template v-if="itemList.length>0">
+				<view class="checklist" v-for="(checklist,idx) in itemList" :key="idx">
+					<view class="title more">{{checklist.itemTitle}}</view>
+					<view class="item-cont" v-if="checklist.children&&checklist.children.length>0">
+						<view class="checklistItem" v-for="(checklistItem,itemIdx) in checklist.children" :key="itemIdx">
+							<view class="itemTitle more">{{checklistItem.itemTitle}}</view>
+							<view  class="point-cont" v-if="checklistItem.recordList&&checklistItem.recordList.length>0">
+								<view class="point" v-for="(point,pointIdx) in checklistItem.recordList" :key="pointIdx" @click="check(point)">
+									<view class="pointContent">{{point.pointContent}}</view>
+									<view class="status" v-if="point.checkResult===1">【<span class="text">通过</span>】</view>
+									<view class="status" v-if="point.checkResult===-1">【<span class="text">不通过</span>】</view>
+								</view>
+							</view>
+						</view>				
+					</view>
+					<view class="item-cont" v-if="checklist.recordList&&checklist.recordList.length>0">
+						<view class="checklistItem" v-for="(checklistItem,itemIdx) in checklist.recordList" :key="itemIdx">
+							<view  class="point-cont">
+								<view class="point" @click="check(checklistItem)">
+									<view class="pointContent">{{checklistItem.pointContent}}</view>
+									<view class="status" v-if="checklistItem.checkResult===1">【<span class="text">通过</span>】</view>
+									<view class="status" v-if="checklistItem.checkResult===-1">【<span class="text">不通过</span>】</view>
+								</view>
+							</view>
+						</view>				
+					</view>					
+				</view>
+				<view class="handle-container" v-if="handleVisiable">
+					<view class="handle" @click="handleSubmit(1)">全部通过</view>
+					<view class="handle" @click="handleSubmit(2)">全不通过</view>	
+					<view class="handle submit" @click="handleSubmit(3)" v-if="submit_bt_state">提交</view>
+<!-- 					<view class="handle danger" @click="handleSubmit('danger')">登记隐患</view> -->
+					<view class="more" @mouseenter="hover(1)" @mouseleave="hover">
+						<text class="text">更多</text>
+						<view class="list" v-if="showMore">
+							<view class="hand-item-box">
+								<view class="handle-item" @click="handleSubmit(4)">撤销</view>
+								<view class="handle-item" @click="handleSubmit(5)">转交</view>																	
+							</view>						
+						</view>						
+					</view>
+				</view>
+			</template>
+			<template v-else>没有可处理的清单^-_-^</template>
+		</view>		
+	</view>
+</template>
+<script>
+	import {
+		getchecklistRecord,
+		checklistComplete,
+		checklistCancel,
+		checklistBatchUpdate,
+	} from '@/api/aqpt/checklistPoint.js'
+	import {cancelCheckTask,completeCheckTask} from '@/api/aqpt/task.js'	
+	export default {
+		data() {
+			return {
+				defaultProps: {
+					id: 'itemId', 
+					children: 'children',
+					label: 'itemTitle'
+				},
+				danger_bt_state:false,
+				submit_bt_state:false,
+				accountInfo:{},
+				divider: false,
+				edit: true,
+				itemList:[],
+				recordId:undefined,
+				checklistId:undefined,
+				handleVisiable:false,
+				type:undefined,
+				status:undefined,
+				taskTitle:"",
+				showMore:false
+			}
+		},
+		onLoad({rid,cid,title}) {
+			this.checklistId=cid	
+			this.recordId=rid	
+			let accountInfo=uni.getStorageSync('accountInfo')
+			this.accountInfo=accountInfo
+			this.taskTitle=title
+			this.getchecklistRecord(cid,rid)
+		},
+		methods: {
+			getchecklistRecord(checklistId,recordId){
+				getchecklistRecord(checklistId,recordId).then((res)=>{
+					if(!res.data.itemList)return
+					this.itemList=res.data.itemList
+					this.status=res.data.status
+					this.handleVisiable=(res.data.status===0||res.data.status===1)&&(res.data.accountId===this.accountInfo.userId)
+					let items=[]
+					for(let i=0;i<itemList.length;i++){
+						if(itemList[i].children){
+							itemList[i].children.map(child=>{
+								child.recordList.map(pointitem=>{
+									items.push(point)
+								})
+							})
+						}else{
+							itemList[i].recordList.map(pointitem=>{
+								items.push(pointitem)
+							})							
+						}						
+					}
+					let index=items.findIndex(item=>item.checkResult===-1)
+					let _index=items.findIndex(item=>item.checkResult===0)
+					this.submit_bt_state=_index<0
+					this.danger_bt_state=index>-1?true:false
+				})
+			},
+			check(point){		
+				if(!this.handleVisiable) return	
+				uni.setStorageSync("point",point)
+				uni.navigateTo({
+					url:"/pages/index/handle/task/checkList/form/form"
+				})								
+			},
+			handleSubmit(type){
+				let recordId=this.recordId;
+				let checklistId=this.checklistId;
+				const self=this;
+				if(type===1){
+					checklistBatchUpdate(recordId,1).then(()=>{
+						this.getchecklistRecord(checklistId,recordId)
+					})
+				}
+				if(type===2){
+					checklistBatchUpdate(recordId,-1).then(()=>{
+						this.getchecklistRecord(checklistId,recordId)
+					})
+				}				
+				if(type===3){//完成
+					if(this.danger_bt_state){
+						uni.showModal({
+							title: '提示',
+							content: '本次检查有未通过项，是否需要登记隐患？',
+							success: function (res) {
+								if (res.confirm) {
+									self.submitDanger(recordId)
+								} else if (res.cancel) {
+									self.completeTask(recordId)
+								}
+							}
+						});
+					}else{
+						this.completeTask(recordId)
+					}
+				}
+				if(type===4){//放弃
+					cancelCheckTask(recordId).then(()=>{
+						uni.switchTab({
+							url:'/pages/index/index'
+						})
+					}).catch(()=>{
+						uni.showToast({
+							icon:"none",
+							title:"操作失败"
+						})
+					})
+				}	
+				if(type===5){//转交
+					let taskTitle=this.taskTitle;
+					uni.navigateTo({
+						url:`/pages/index/handle/task/checkList/form/transferCheckTask?tid=${recordId}&title=${taskTitle}`
+					})
+				}
+				if(type==="danger"){
+					this.submitDanger(recordId)
+				}
+			},
+			completeTask(recordId){
+				completeCheckTask(recordId).then(()=>{				
+					uni.reLaunch({
+						url:'/pages/index/index'
+					})
+				}).catch(()=>{
+					uni.reLaunch({
+						url:`/pages/webview/webview?href=${href}&name=${name}`
+					})
+					uni.showToast({
+						icon:"none",
+						title:"操作失败"
+					})
+				})					
+			},
+			submitDanger(recordId){
+				let href=`${this.$h5}/danger/views/create.html`;
+				let name= '登记隐患'	
+				uni.reLaunch({
+					url:`/pages/webview/webview?href=${href}&name=${name}`
+				})
+				completeCheckTask(recordId)							
+			},
+			hover(state){
+				this.showMore=state===1
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page{
+		background-color: #F5F6F8;
+		padding: 20rpx;
+		min-height: 100vh;
+		box-sizing: border-box;
+		margin-bottom: 100rpx;
+		.page-head{
+			text-align: right;
+			padding-bottom: 10rpx;
+			.handle{
+				display: inline-block;
+				background-color: #3384FF;
+				color: #fff;
+				padding: 10rpx 15rpx;
+				box-sizing: border-box;
+				border-right: 1rpx solid #eaeaea;
+				font-size: 30rpx;
+				text-align: center;
+				&:nth-child(4){
+					border: 0;
+				}
+			}
+		}
+	}	
+	.wrap{
+		padding: 20rpx;
+		background-color: #fff;
+		.checklist{
+			.title{
+				color: #222222;
+				font-size: 32rpx;
+				height: 98rpx;
+				line-height: 98rpx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				border-bottom: 1px dashed #E8E8E8;				
+			}
+			.more{
+				background-image: url('/static/tree_more.png');
+				background-size: 30rpx 30rpx;
+				padding-left: 40rpx;
+				background-position: center left;
+				background-repeat: no-repeat;
+			}
+			.item-cont{
+				padding-left: 20rpx;
+				border-bottom: 1px dashed #E8E8E8;	
+				.checklistItem{
+					.itemTitle{
+						color: #222222;
+						font-size: 32rpx;	
+						height: 98rpx;
+						line-height: 98rpx;
+					}
+				}
+				.point-cont{
+					padding-left: 30rpx;
+					.point{
+						display: flex;						
+						color: #666;
+						font-size: 28rpx;	
+						height: 98rpx;
+						line-height: 98rpx;
+						.pointContent{
+							flex: 1;
+						}
+						.status{
+							.text{
+								color: #3384FF;
+								font-weight: 800;
+							}
+						}
+					}
+				}
+			}
+		}
+			
+		.handle-container{
+			position: fixed;
+			width: 100%;
+			left: 0;
+			bottom: 0;
+			background-color: #fff;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			border-top: 1rpx solid #eaeaea;
+			padding: 15rpx 0;
+			.handle{
+				display:inline-block;
+				color: #222;
+				padding: 15rpx 20rpx;
+				box-sizing: border-box;
+				border: 1rpx solid #eaeaea;
+				font-size: 26rpx;
+				text-align: center;
+				border-radius: 50rpx;
+				margin: 0 10rpx;
+				&.danger{
+					background-color: #FA5B41;	
+					color: #fff;						
+				}
+				&.submit{
+					background-color: #3384FF;	
+					color: #fff;
+				}
+			}
+			.more{
+				position: relative;
+				padding: 15rpx 20rpx;
+				.text:hover{
+					&+.list>.hand-item-box{
+						display: block;
+					}
+				}
+				.list{
+					position: absolute;
+					bottom: 100rpx;
+					right: 0;
+					box-shadow: 0px 2px 12px 0px #0000001F;
+					padding:0 20rpx;
+					background-color: #fff;
+					.hand-item-box{
+						position: relative;
+						display: none;
+						&.show{
+							display: block;
+						}
+						&::after{
+							width: 0;
+							height: 0;
+							content: "";
+							display: block;
+							border-width: 26rpx 26rpx 0 0;
+							border-color: #fff transparent;
+							border-style: solid;
+							position: absolute;
+							bottom: -20rpx;
+							right: -20rpx;
+						}
+						.handle-item{
+							width: 180rpx;
+							height: 50rpx;
+							font-size: 26rpx;
+							line-height: 50rpx;
+							background-color: #fff;
+							text-align: center;
+							border-bottom: 1px solid #ccc;
+							padding:10rpx 0;
+							&:last-child{
+								border: 0;
+							}
+						}						
+					}
+
+				}
+			}
+		}
+	}
+</style>

pages/index/handle/warning/warning.vue

@@ -0,0 +1,202 @@
+<template>
+	<view class="warning-handle-page">
+	  <uni-forms ref="form" :modelValue="formData" :rules="rules" :label-width="300" label-position="top">
+		<uni-forms-item label="处理动作"  required >
+			<div class="uni-data-checkbox-wrap">
+				 <view class="action":class="action===1?'active':''" @click="changeAction(1)">  
+					<text>完成处理</text>
+				 </view>
+				 <view class="action":class="action===2?'active':''" @click="changeAction(2)">  
+					<text>转交</text>
+				 </view>
+			</div>
+		</uni-forms-item>
+		<uni-forms-item v-if="handleRemarkVisible" label="原因分析" prop="actionRemark">
+		  <uni-easyinput v-model="formData.warnReason" type="textarea" :maxlength="-1" autoHeight placeholder="原因分析" />
+		</uni-forms-item>
+
+		<uni-forms-item v-if="handleRemarkVisible" label="处理措施" prop="actionRemark">
+		  <uni-easyinput v-model="formData.handleMeasure" type="textarea" :maxlength="-1" autoHeight placeholder="处理说明" />
+		</uni-forms-item>
+
+		<uni-forms-item v-if="handlerVisible" label="执行人" prop="accountIdTo">
+		  <uni-data-select v-model="formData.accountId" :localdata="userList"></uni-data-select>
+		</uni-forms-item>
+
+		<uni-forms-item v-if="handlerVisible" label="备注" prop="remark">
+			<uni-easyinput v-model="transferData.remark" type="textarea" :maxlength="-1" autoHeight placeholder="请输入备注" />
+		</uni-forms-item>
+		<uni-file-picker  v-model="formData.attachList"
+			fileMediatype="image" 
+			title="请上传附件"
+			limit="1"
+			@select="uploadSuccess"
+			@delete="deleteFile">
+		 </uni-file-picker>	
+		<view class="btn-group">
+		  <uni-button type="primary" @click="handleSubmit">提交</uni-button>
+		</view>
+	  </uni-forms>		
+	</view>
+</template>
+
+<script>
+	import {upload} from '@/api/system/upload.js'		
+	import {getUserList} from '@/api/system/user.js'
+	import { getWarningById, completeWarning, transferWarning } from '@/api/aqpt/warningApi'
+	export default {
+		data() {
+			return {
+				formData:{
+					warnId: undefined,
+					attachList: []					
+				},
+				transferData:{
+					
+				},
+				viewData:{},
+				rules:{},
+				userList:[],
+				action:1,
+				warnId:undefined,
+				handleRemarkVisible:false,
+				handlerVisible:false
+			}
+		},
+		created() {
+			this.changeAction(1)
+			this.getUserList()
+		},
+		onLoad({id}) {
+			this.warnId=id	
+			this.formData.warnId = id			
+			this.getData()
+		},
+		methods: {
+			// Fetch Data
+			getData() {
+			  const warnId = this.warnId
+			  getWarningById(warnId).then((resp) => {
+				const { data } = resp
+				this.viewData = data
+			  })
+			},			
+			changeAction(iMode){
+			  this.action=iMode;
+			  if (iMode === 1) {
+				this.handleRemarkVisible = true
+				this.handlerVisible = false
+			  } else if (iMode === 2) {
+				this.handleRemarkVisible = false
+				this.handlerVisible = true
+			  }				
+			},
+			getUserList(){
+				getUserList().then((res)=>{
+					var userList=[]
+					for (var i = 0; i < res.data.length; i++) {
+						userList.push({
+							value: -i, 
+							text: res.data[i].name,
+							disable:true
+						})
+						for(let j = 0; j < res.data[i].children.length; j++){
+							userList.push({
+								...res.data[i].children[j],
+								value: res.data[i].children[j].accountId, 
+								text: res.data[i].children[j].accountName
+							})							
+						}
+					}
+					this.userList=userList
+				})
+			},	
+			// 提交
+			async handleSubmit() {
+				  const action = this.action
+				  if (action === 1) {
+					  let attachList=[]
+					  for(let i=0;i<this.formData.attachList.length;i++){
+						let filePath=this.formData.attachList[i].url
+						let fileresq=await upload({filePath})
+						fileresq=JSON.parse(fileresq)
+						attachList.push(fileresq.data)
+					  }
+					this.formData.attachList=attachList
+					await completeWarning(this.formData).then((resp) => {
+					  const { msg } = resp
+					  uni.showToast({
+						icon:"none",
+						title:msg||'处理成功！'
+					  })
+					  setTimeout(()=>{
+					  	uni.navigateBack()  
+					  },1000)
+					})
+				  } else {
+					let user=this.userList.filter(item=>this.formData.accountId===item.accountId)[0]
+					this.handleSelectUser(user)
+					transferWarning(this.warnId, this.transferData).then((resp) => {
+					  const { msg } = resp
+					  uni.showToast({
+						icon:"none",
+						title:msg||'处理成功！'
+					  })
+					  setTimeout(()=>{
+						uni.navigateBack()  
+					  },1000)
+					})
+				}
+			},
+			handleSelectUser(obj) {
+			  this.transferData.accountIdTo = obj.accountId
+			  this.transferData.groupIdTo = obj.groupId
+			  this.transferData.positionIdTo = obj.positionId
+			  this.transferData.accountNameTo = obj.accountName
+			  this.transferData.groupNameTo = obj.groupName
+			  this.transferData.positionNameTo = obj.positionName
+			},	
+			uploadSuccess(e){
+				let attachList=JSON.parse(JSON.stringify(this.formData.attachList))
+				attachList.push(e.tempFiles[0])
+				this.formData.attachList=attachList
+			},
+			deleteFile(e){							
+				let attachList=JSON.parse(JSON.stringify(this.formData.attachList))
+				attachList.filter(item=>item.uuid!==e.tempFile.uuid)
+				this.formData.attachList=attachList
+			},	
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.warning-handle-page{
+	padding: 32rpx;
+	::v-deep .uni-forms-item{
+		.uni-forms-item__content{
+			.uni-data-checkbox-wrap{
+				height: 100%;
+				display: flex;
+				align-items: center;
+				.action{
+					padding: 22rpx 32rpx;
+					background-color: #fff;
+					border-radius: 2px;
+					margin-right: 20rpx;
+					font-size: 28rpx;
+					line-height: 1;
+					&.active{
+						background: rgba(77, 115, 255, 0.16);
+						color: #4D73FF;
+					}
+				}
+			}
+	
+		}		
+	}
+	.btn-group{
+		margin-top: 100rpx;
+	}
+}
+</style>

unpackage/dist/dev/mp-weixin/app.json

@@ -23,7 +23,17 @@
     "pages/app_views/problem_feedback/record/record",
     "pages/app_views/problem_feedback/form/form",
     "pages/app_views/checkList/detail/detail",
-    "pages/app_views/clockIn/index"
+    "pages/app_views/clockIn/index",
+    "pages/index/detail/detail",
+    "pages/index/handle/danger/index/index",
+    "pages/index/handle/danger/index/submit",
+    "pages/index/handle/task/task",
+    "pages/index/handle/task/checkList/form/form",
+    "pages/index/handle/alert/alert",
+    "pages/index/handle/warning/warning",
+    "pages/index/handle/task/checkList/form/transferCheckTask",
+    "pages/index/handle/task/hazardRecord/hazardRecord",
+    "pages/index/handle/task/hazardRecord/form"
   ],
   "subPackages": [],
   "window": {

unpackage/dist/dev/mp-weixin/pages/app_views/checkList/index/index.js

@@ -254,11 +254,13 @@ var _default = {
       this.getchecklistRecord(id, recordId);
     }
   },
-  onShow: function onShow() {
-    var point = uni.getStorageSync('point');
-    if (!point) return;
-    this.getchecklistRecord(point.checklistId, point.recordId);
-  },
+  // onShow() {
+  // 	let point=uni.getStorageSync('point')
+  // 	if(!point)return	
+  // 	this.handleVisiable=true					
+  // 	this.getchecklistRecord(point.checklistId,point.recordId)
+  // 	uni.removeStorageSync('point')
+  // },
   methods: {
     initCheckList: function initCheckList(checklistId) {
       var _this = this;

unpackage/dist/dev/mp-weixin/pages/app_views/danger/handle/handle.js

@@ -101,31 +101,31 @@ var components
 try {
   components = {
     uniCollapse: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse/uni-collapse */ "uni_modules/uni-collapse/components/uni-collapse/uni-collapse").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue */ 331))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse/uni-collapse */ "uni_modules/uni-collapse/components/uni-collapse/uni-collapse").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue */ 446))
     },
     uniCollapseItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item */ "uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue */ 338))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item */ "uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue */ 453))
     },
     uniListItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 345))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 358))
     },
     uniSection: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-section/components/uni-section/uni-section */ "uni_modules/uni-section/components/uni-section/uni-section").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-section/components/uni-section/uni-section.vue */ 315))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-section/components/uni-section/uni-section */ "uni_modules/uni-section/components/uni-section/uni-section").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-section/components/uni-section/uni-section.vue */ 430))
     },
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 264))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 379))
     },
     uniFormsItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 277))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 392))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 250))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 365))
     },
     uniDataSelect: function () {
-      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 284))
+      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 399))
     },
     uniFilePicker: function () {
-      return Promise.all(/*! import() | uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue */ 322))
+      return Promise.all(/*! import() | uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue */ 437))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/app_views/danger/submit/submit.js

@@ -101,28 +101,28 @@ var components
 try {
   components = {
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 264))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 379))
     },
     uniFormsItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 277))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 392))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 250))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 365))
     },
     uniDataSelect: function () {
-      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 284))
+      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 399))
     },
     uniDataCheckbox: function () {
-      return Promise.all(/*! import() | uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue */ 296))
+      return Promise.all(/*! import() | uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue */ 411))
     },
     uniDatetimePicker: function () {
-      return Promise.all(/*! import() | uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue */ 303))
+      return Promise.all(/*! import() | uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue */ 418))
     },
     uniSection: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-section/components/uni-section/uni-section */ "uni_modules/uni-section/components/uni-section/uni-section").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-section/components/uni-section/uni-section.vue */ 315))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-section/components/uni-section/uni-section */ "uni_modules/uni-section/components/uni-section/uni-section").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-section/components/uni-section/uni-section.vue */ 430))
     },
     uniFilePicker: function () {
-      return Promise.all(/*! import() | uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue */ 322))
+      return Promise.all(/*! import() | uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue */ 437))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/app_views/problem_feedback/problem_feedback.js

@@ -101,16 +101,16 @@ var components
 try {
   components = {
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 264))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 379))
     },
     uniFormsItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 277))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 392))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 250))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 365))
     },
     uniFilePicker: function () {
-      return Promise.all(/*! import() | uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue */ 322))
+      return Promise.all(/*! import() | uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue */ 437))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/app_views/satisfaction_evaluation/satisfaction_evaluation.js

@@ -101,16 +101,16 @@ var components
 try {
   components = {
     uniRate: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-rate/components/uni-rate/uni-rate */ "uni_modules/uni-rate/components/uni-rate/uni-rate").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-rate/components/uni-rate/uni-rate.vue */ 257))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-rate/components/uni-rate/uni-rate */ "uni_modules/uni-rate/components/uni-rate/uni-rate").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-rate/components/uni-rate/uni-rate.vue */ 372))
     },
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 264))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 379))
     },
     uniFormsItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 277))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 392))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 250))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 365))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -98,6 +98,38 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
 var components
+try {
+  components = {
+    uniNoticeBar: function () {
+      return __webpack_require__.e(/*! import() | uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar */ "uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue */ 337))
+    },
+    uniPopup: function () {
+      return __webpack_require__.e(/*! import() | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 344))
+    },
+    uniList: function () {
+      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list/uni-list */ "uni_modules/uni-list/components/uni-list/uni-list").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list/uni-list.vue */ 351))
+    },
+    uniListItem: function () {
+      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 358))
+    },
+  }
+} catch (e) {
+  if (
+    e.message.indexOf("Cannot find module") !== -1 &&
+    e.message.indexOf(".vue") !== -1
+  ) {
+    console.error(e.message)
+    console.error("1. 排查组件名称拼写是否正确")
+    console.error(
+      "2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"
+    )
+    console.error(
+      "3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件"
+    )
+  } else {
+    throw e
+  }
+}
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -159,12 +191,26 @@ var _default = {
       bg: '',
       user: {
         userAvatar: ""
-      }
+      },
+      alertnotice: undefined,
+      alertList: [],
+      todos: {
+        checkTaskCount: 0,
+        dangerCount: 0,
+        snapshotCount: 0,
+        warningCount: 0
+      },
+      miniList: []
     };
   },
   onLoad: function onLoad(options) {
     this.init(options);
   },
+  computed: {
+    showTab: function showTab() {
+      return this.todos.checkTaskCount > 0 || this.todos.dangerCount > 0 || this.todos.snapshotCount > 0 || this.todos.warningCount > 0;
+    }
+  },
   methods: {
     init: function init(options) {
       var _this = this;
@@ -281,6 +327,18 @@ var _default = {
         }
         (0, _scan.getApps)(res.data.targetId).then(function (res) {
           _this2.actionList = res.data.miniList;
+          if (res.data.alertList) {
+            _this2.alertList = res.data.alertList;
+            _this2.alertnotice = res.data.alertList.reduce(function (pre, item, index) {
+              return "".concat(pre, "  ").concat(index + 1, "\u3001").concat(item.alertContent, ",").concat(item.alertTime, ";");
+            }, '');
+            _this2.$nextTick(function () {
+              _this2.$refs['uni-notice-bar'].initSize();
+            });
+          }
+          if (res.data.todos) {
+            _this2.todos = res.data.todos;
+          }
           if (res.data.wxId) uni.setStorageSync('wxId', res.data.wxId);
           uni.setStorageSync('isAccount', res.data.isAccount);
         });
@@ -332,6 +390,15 @@ var _default = {
         return true;
       }
       return false;
+    },
+    linkTo: function linkTo(type, name) {
+      var riskPointId = uni.getStorageSync('qrcode').riskPointId;
+      uni.navigateTo({
+        url: "/pages/index/detail/detail?type=".concat(type, "&name=").concat(name, "&rid=").concat(riskPointId)
+      });
+    },
+    getmorealert: function getmorealert() {
+      this.$refs.alertpopup.open("center");
     }
   },
   onShareAppMessage: function onShareAppMessage() {}

unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -1,4 +1,9 @@
 {
   "navigationBarTitleText": "六院联创促进医院高质量发展",
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-notice-bar": "/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar",
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
+    "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"
+  }
 }

unpackage/dist/dev/mp-weixin/pages/login/index.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 250))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 365))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker"],{
 
-/***/ 322:
+/***/ 437:
 /*!**************************************************************************************************************************!*\
   !*** E:/work/Project_newGit/hptwxMiniProgram/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue ***!
   \**************************************************************************************************************************/
@@ -9,10 +9,10 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _uni_file_picker_vue_vue_type_template_id_363ace0e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./uni-file-picker.vue?vue&type=template&id=363ace0e& */ 323);
-/* harmony import */ var _uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./uni-file-picker.vue?vue&type=script&lang=js& */ 325);
+/* harmony import */ var _uni_file_picker_vue_vue_type_template_id_363ace0e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./uni-file-picker.vue?vue&type=template&id=363ace0e& */ 438);
+/* harmony import */ var _uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./uni-file-picker.vue?vue&type=script&lang=js& */ 440);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _uni_file_picker_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./uni-file-picker.vue?vue&type=style&index=0&lang=css& */ 329);
+/* harmony import */ var _uni_file_picker_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./uni-file-picker.vue?vue&type=style&index=0&lang=css& */ 444);
 /* 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_3__ = __webpack_require__(/*! ../../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
@@ -41,7 +41,7 @@ component.options.__file = "uni_modules/uni-file-picker/components/uni-file-pick
 
 /***/ }),
 
-/***/ 323:
+/***/ 438:
 /*!*********************************************************************************************************************************************************!*\
   !*** E:/work/Project_newGit/hptwxMiniProgram/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue?vue&type=template&id=363ace0e& ***!
   \*********************************************************************************************************************************************************/
@@ -50,7 +50,7 @@ component.options.__file = "uni_modules/uni-file-picker/components/uni-file-pick
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_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_uni_file_picker_vue_vue_type_template_id_363ace0e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.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!./uni-file-picker.vue?vue&type=template&id=363ace0e& */ 324);
+/* harmony import */ var _software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_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_uni_file_picker_vue_vue_type_template_id_363ace0e___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../../software/HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.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!./uni-file-picker.vue?vue&type=template&id=363ace0e& */ 439);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_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_uni_file_picker_vue_vue_type_template_id_363ace0e___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_software_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_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_uni_file_picker_vue_vue_type_template_id_363ace0e___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -63,7 +63,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 324:
+/***/ 439:
 /*!*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.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/hptwxMiniProgram/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue?vue&type=template&id=363ace0e& ***!
   \*********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -99,7 +99,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 325:
+/***/ 440:
 /*!***************************************************************************************************************************************************!*\
   !*** E:/work/Project_newGit/hptwxMiniProgram/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue?vue&type=script&lang=js& ***!
   \***************************************************************************************************************************************************/
@@ -108,14 +108,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* 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_uni_file_picker_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!./uni-file-picker.vue?vue&type=script&lang=js& */ 326);
+/* 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_uni_file_picker_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!./uni-file-picker.vue?vue&type=script&lang=js& */ 441);
 /* 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_uni_file_picker_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_uni_file_picker_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_uni_file_picker_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_uni_file_picker_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_uni_file_picker_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 326:
+/***/ 441:
 /*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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/hptwxMiniProgram/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue?vue&type=script&lang=js& ***!
   \**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -134,18 +134,18 @@ var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime
 var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 42));
-var _chooseAndUploadFile = __webpack_require__(/*! ./choose-and-upload-file.js */ 327);
-var _utils = __webpack_require__(/*! ./utils.js */ 328);
+var _chooseAndUploadFile = __webpack_require__(/*! ./choose-and-upload-file.js */ 442);
+var _utils = __webpack_require__(/*! ./utils.js */ 443);
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var uploadImage = function uploadImage() {
   __webpack_require__.e(/*! require.ensure | uni_modules/uni-file-picker/components/uni-file-picker/upload-image */ "uni_modules/uni-file-picker/components/uni-file-picker/upload-image").then((function () {
-    return resolve(__webpack_require__(/*! ./upload-image.vue */ 399));
+    return resolve(__webpack_require__(/*! ./upload-image.vue */ 513));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var uploadFile = function uploadFile() {
   __webpack_require__.e(/*! require.ensure | uni_modules/uni-file-picker/components/uni-file-picker/upload-file */ "uni_modules/uni-file-picker/components/uni-file-picker/upload-file").then((function () {
-    return resolve(__webpack_require__(/*! ./upload-file.vue */ 406));
+    return resolve(__webpack_require__(/*! ./upload-file.vue */ 520));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var fileInput = null;
@@ -844,11 +844,11 @@ var _default2 = {
   }
 };
 exports.default = _default2;
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js */ 289)["default"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js */ 404)["default"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
 
-/***/ 329:
+/***/ 444:
 /*!***********************************************************************************************************************************************************!*\
   !*** E:/work/Project_newGit/hptwxMiniProgram/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue?vue&type=style&index=0&lang=css& ***!
   \***********************************************************************************************************************************************************/
@@ -857,14 +857,14 @@ exports.default = _default2;
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* 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_uni_file_picker_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!./uni-file-picker.vue?vue&type=style&index=0&lang=css& */ 330);
+/* 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_uni_file_picker_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!./uni-file-picker.vue?vue&type=style&index=0&lang=css& */ 445);
 /* 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_uni_file_picker_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_uni_file_picker_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_uni_file_picker_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_uni_file_picker_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_uni_file_picker_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 330:
+/***/ 445:
 /*!***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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/hptwxMiniProgram/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.vue?vue&type=style&index=0&lang=css& ***!
   \***************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -883,7 +883,7 @@ __webpack_require__.r(__webpack_exports__);
     'uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker-create-component',
     {
         'uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(322))
+            __webpack_require__('2')['createComponent'](__webpack_require__(437))
         })
     },
     [['uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker-create-component']]