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

App.vue

@@ -1,23 +1,23 @@
 <script>
 	export default {
-		onLaunch: function() {
-			console.warn('当前组件仅支持 uni_modules 目录结构 ，请升级 HBuilderX 到 3.1.0 版本以上！')
-			console.log('App Launch')
-		},
-		onShow: function() {
-			console.log('App Show')
-		},
-		onHide: function() {
-			console.log('App Hide')
-		}
+		// onLaunch: function() {
+		// 	console.warn('当前组件仅支持 uni_modules 目录结构 ，请升级 HBuilderX 到 3.1.0 版本以上！')
+		// 	console.log('App Launch')
+		// },
+		// onShow: function() {
+		// 	console.log('App Show')
+		// },
+		// onHide: function() {
+		// 	console.log('App Hide')
+		// }
 	}
 </script>
 
 <style lang="scss">
 	/*每个页面公共css */
 	@import '@/uni_modules/uni-scss/index.scss';
-	/* #ifndef APP-NVUE */
 	@import '@/static/iconfont.css';
+	/* #ifndef APP-NVUE */
 	// 设置整个项目的背景色
 	page {
 		background-color: #fff;

api/danger.js

@@ -6,7 +6,7 @@ export function getGroupTree() {
 		url: '/group/treeView'
 	})
 }
-//获取隐患类别
+//获取预警类别
 export function getDangerCatList() {
 	return request({
 		url: '/ent/danger/cat'
@@ -23,7 +23,7 @@ export function getUserList() {
 }
 
 /**
- * 添加隐患
+ * 添加预警
  * @param data
  * @returns {AxiosPromise}
  */
@@ -47,7 +47,7 @@ export function createDangerIns(wfDefId) {
 	})
 }
 /**
- * 我处理的隐患分页列表
+ * 我处理的预警分页列表
  * @param {Object} data
  */
 export function getMyHandlingDangerInsByPage(data) {
@@ -81,7 +81,7 @@ export function triggerDangerIns(data) {
 	})
 }
 /*
-	获取隐患详情
+	获取预警详情
 */
 export function getDangerDetailsById(dangerId) {
 	return request({

api/dangerApi.js

@@ -9,7 +9,7 @@ export function getDangerByList(data) {
   return request({
     url: '/goaf/goafhdanger/list',
     method: 'GET',
-    params: data
+    data
   })
 }
 

api/goaf.js

@@ -46,3 +46,11 @@ export function delGoaf(goafId) {
   })
 }
 
+// 扫码
+export function scanCode(goafQr) {
+  return request({
+    url: `/goaf/goafbaseinfo/goafqr/${goafQr}`,
+    method: 'GET'
+  })
+}
+

api/task.js

@@ -101,4 +101,12 @@ export function handleCheckTask(data) {
     method: 'POST',
     data
   })
+}
+// 任务统计
+export function goaftaskstatis(data) {
+  return request({
+    url: "/goaf/goaftaskstatis",
+    method: 'GET',
+	data
+  })
 }

libs/enum.js

@@ -79,7 +79,7 @@ export function checkResult(i) {
     '没执行',
     '通过',
     '没通过',
-    '有隐患',
+    '有预警',
     '已完成'
   ]
   return strs[i]
@@ -101,8 +101,8 @@ export function dangerStatus(i) {
 export function dangerLevel(i) {
   const strs = [
     '未知',
-    '一般隐患',
-    '重大隐患'
+    '一般预警',
+    '重大预警'
   ]
   return strs[i]
 }

libs/tool.js

@@ -1,5 +1,5 @@
 /**
- * 隐患等级、风险等级、风险点等级、危险源等级、级别转换
+ * 预警等级、风险等级、风险点等级、危险源等级、级别转换
  */
 export function levelConversion(level) {
 	let levelStr;

pages.json

@@ -122,7 +122,7 @@
 		    "path" : "pages/task/submit/submit",
 		    "style" :                                                                                    
 		    {
-		        "navigationBarTitleText": "登记隐患",
+		        "navigationBarTitleText": "登记预警",
 		        "enablePullDownRefresh": false
 		    }
 		    
@@ -146,7 +146,7 @@
 			"pagePath": "pages/risk/risk",
 			"iconPath": "static/tabBar/risk.png",
 			"selectedIconPath": "static/tabBar/riskEd.png",
-			"text": "隐患"
+			"text": "预警"
 		}, {
 			"pagePath": "pages/mine/mine",
 			"iconPath": "static/tabBar/mine.png",

pages/index/index.vue

@@ -4,95 +4,137 @@
 		<div class="title">
 			<text class="tab" :class="type==='user'?'active':''" @click="changeTab('user')">我的</text>
 			<text class="tab" :class="type==='group'?'active':''" @click="changeTab('group')">部门</text>
-			<!-- #ifndef H5 -->
-			<text class="icon-xiangji iconfont" @click="onScanCode"></text>			
-			<!-- #endif -->
 		</div>
 		<div class="statistics">
 			<div class="head">任务统计</div>
 			<div class="container">
-				<div class="item">
+				<div class="item" @click="changeStuas(0,'待巡检')">
 					<image class="icon" src="@/static/index/wait.png" alt=""></image>
 					<text>待巡检{{statistics.wait}}个</text>
 				</div>
-				<div class="item">
+				<div class="item" @click="changeStuas(2,'已逾期')">
 					<image class="icon" src="@/static/index/expire.png" alt=""></image>
 					<text>已逾期{{statistics.expire}}个</text>
 				</div>
-				<div class="item">
+				<div class="item" @click="changeStuas(1,'已完成')">
 					<image class="icon" src="@/static/index/complete.png" alt=""></image>
 					<text>已完成{{statistics.complete}}个</text>
 				</div>
 			</div>
 		</div>
 		<div class="task-list">
-			<div class="head">待办任务</div>
-			<div class="item" v-for="(item,index) in items" :key="index" @click="linkTo(item)">
-				<div class="task-title">{{item.taskTitle}}</div>
-				<div class="time">{{item.expectedStartDate}}-{{item.expectedEndDate}}</div>
-			</div>
+			<div class="head">{{title}}任务</div>
+			<template v-if="items.length>0">
+				<div class="item" v-for="(item,index) in items" :key="item.taskId" @click="linkTo(item)">
+					<div class="task-title">{{item.taskTitle}}</div>
+					<div class="time">{{item.expectedStartDate}}-{{item.expectedEndDate}}</div>
+				</div>
+			</template>
+			<template v-else>
+				<view class="empty">
+					<image class="icon-empty" src="/static/icon/empty.png" mode="widthFix"></image>
+					<p>暂无数据</p>					
+				</view>
+			</template>
+
 		</div>
 	</view>
 </template>
 
 <script>
-	import {getCheckTaskByList} from '@/api/task.js'
-	const accountInfo=uni.getStorageSync('accountInfo');
-	const positionId=accountInfo.positionId
-	const userId=accountInfo.userId
+	import {getCheckTaskByList,goaftaskstatis} from '@/api/task.js'
 	export default {
 		data() {
 			return {
 				statusBarHeight:0,
 				type:'user',
+				title:"待巡检",
 				statistics: {
 					wait:0,
 					expire:0,
 					complete:0
 				},
-				items:[]			
+				items:[],
+				conditions: {
+					status: 0,
+					accountId:undefined
+				},
+				accountId:undefined,
+				groupId:undefined
 			}
 		},
 		onLoad(){
 			this.initStatusBarHeight()
 		},
+		onPullDownRefresh (){
+			this.getData()
+		},
 		onShow() {
-			this.init()
+			const accountInfo=uni.getStorageSync('accountInfo');
+			const groupId=accountInfo.groupId
+			const accountId=accountInfo.userId
+			this.accountId=accountId
+			this.groupId=groupId
+			this.getData()
+			this.goaftaskstatis()
 		},
 		methods: {
 			initStatusBarHeight(){
 				this.statusBarHeight=uni.getSystemInfoSync().statusBarHeight
 			},
-			init(){				
+			getData(){
+				let conditions={}
+				if(this.type==='user'){
+					conditions.handleAccountId=this.accountId
+				}else{
+					conditions.handleGroupId=this.groupId
+				}
 				getCheckTaskByList({
-					status:0
+					status:this.conditions.status,
+					...conditions,
 				}).then((res)=>{
 					this.items=res.data
-					this.statistics.wait=res.data.length
-					// this.statistics.expire=res.data.filter(item=>item.status==1).length
-					// this.statistics.complete=res.data.filter(item=>item.status==2).length
 				})
 			},
-			changeTab(type){
-				this.type=type
-				if(type==='group'){
-					
+			goaftaskstatis(){
+				let conditions={}
+				if(this.type==='user'){
+					conditions.handleAccountId=this.accountId
 				}else{
-					
+					conditions.handleGroupId=this.groupId
 				}
+				goaftaskstatis(conditions).then((res)=>{
+					this.statistics={
+						wait:res.data.goafTaskWaitingNum,
+						expire:res.data.goafTaskExceedNum,
+						complete:res.data.goafTaskCompletedNum						
+					}
+				})
+			},
+			changeTab(type){
+				this.type=type
+				this.getData()
+				this.goaftaskstatis()
 			},
 			linkTo(item){
-				uni.setStorageSync('task-item',item)
-				uni.navigateTo({
-					url:'/pages/task/task'
-				})
+				if(this.type==='user'){
+					uni.setStorageSync('task-item',item)
+					uni.navigateTo({
+						url:'/pages/task/task'
+					})				
+				}
+			},
+			changeStuas(status,name){
+				this.conditions.status=status
+				this.title=name
+				this.getData()
 			},
 			onScanCode(){
 				uni.scanCode({
 					success: function (res) {
 						uni.setStorageSync('scanCode-info',res.result)
 						uni.navigateTo({
-							url:'/pages/task/submit/submit'
+							url:'/pages/task/taskList/taskList'
 						})
 					}					
 				})
@@ -196,4 +238,15 @@
 		font-size: 14px;
 		line-height: 24px;
 	}
+	.empty{
+		text-align: center;
+		font-size: 28rpx;
+		margin-top: 10%;
+		color: #666;
+		.icon-empty{
+			display: block;
+			width: 100px;
+			margin: 0 auto;
+		}
+	}
 </style>

pages/risk/check/form/form.vue

@@ -4,8 +4,8 @@
 			<uni-forms-item label="处理动作" name="actionId" required>
 				<uni-data-checkbox v-model="flowData.actionId" :localdata="actionList" @change="changeCheck"/>
 			</uni-forms-item>
-			<uni-forms-item label="处理说明" name="acceptRemark" required>
-				<uni-easyinput type="textarea" autoHeight v-model="formData.acceptRemark" placeholder="请输入描述"></uni-easyinput>
+			<uni-forms-item label="处理说明" name="hdangerDesc" required>
+				<uni-easyinput type="textarea" autoHeight v-model="formData.hdangerDesc" placeholder="请输入描述"></uni-easyinput>
 			</uni-forms-item>
 			<uni-forms-item label="附件">
 				<div class="upload-container">
@@ -32,10 +32,10 @@
 				formData:{
 					'hdangerId': undefined,
 					'formCode': 'submit',
-					'hdangerTitle': '', // 隐患标题
-					'dangerCatId': undefined, // 隐患类别ID
-					'hdangerLevel': 1, // 隐患等级
-					'acceptRemark': '', // 描述
+					'hdangerTitle': '', // 预警标题
+					'dangerCatId': undefined, // 预警类别ID
+					'hdangerLevel': 1, // 预警等级
+					'hdangerDesc': '', // 描述
 					'submitTime': parseTime(new Date()),
 					'dangerDeadline': '', // 截止时间
 					'goafId': undefined,
@@ -63,14 +63,16 @@
 				  this.flowData.activityDefId = data.curActivityIns.activityDefId
 				  this.flowData.activityInsId = data.curActivityIns.activityInsId
 				  this.flowData.activityCode = data.curActivityIns.activityCode
-				  let actionList=this.flowData.curActivityIns.actionList.map(function(item){
-					  item.value=item.actionId
-					  item.text=item.actionTitle
-					  return item
-				  })
-				  this.actionList=JSON.parse(JSON.stringify(actionList))
-				  this.flowData.actionId=actionList[0].actionId
-				  this.flowData.actionCode=actionList[0].actionCode
+				  if(data.curActivityIns.actionList){
+					let actionList=data.curActivityIns.actionList.map(function(item){
+						  item.value=item.actionId
+						  item.text=item.actionTitle
+						  return item
+					})	
+					this.actionList=JSON.parse(JSON.stringify(actionList))
+					this.flowData.actionId=actionList[0].actionId
+					this.flowData.actionCode=actionList[0].actionCode
+				  }
 				}
 			  })
 			},

pages/risk/rectify/form/form.vue

@@ -39,9 +39,9 @@
 				formData:{
 					'hdangerId': undefined,
 					'formCode': 'submit',
-					'hdangerTitle': '', // 隐患标题
-					'dangerCatId': undefined, // 隐患类别ID
-					'hdangerLevel': 1, // 隐患等级
+					'hdangerTitle': '', // 预警标题
+					'dangerCatId': undefined, // 预警类别ID
+					'hdangerLevel': 1, // 预警等级
 					'rectifyRemark': '', // 描述
 					'submitTime': parseTime(new Date()),
 					'dangerDeadline': '', // 截止时间
@@ -71,14 +71,16 @@
 				  this.flowData.activityDefId = data.curActivityIns.activityDefId
 				  this.flowData.activityInsId = data.curActivityIns.activityInsId
 				  this.flowData.activityCode = data.curActivityIns.activityCode
-				  let actionList=this.flowData.curActivityIns.actionList.map(function(item){
-					  item.value=item.actionId
-					  item.text=item.actionTitle
-					  return item
-				  })
-				  this.actionList=JSON.parse(JSON.stringify(actionList))
-				  this.flowData.actionId=actionList[0].actionId
-				  this.flowData.actionCode=actionList[0].actionCode
+				  if(data.curActivityIns.actionList){
+					let actionList=data.curActivityIns.actionList.map(function(item){
+						  item.value=item.actionId
+						  item.text=item.actionTitle
+						  return item
+					})	
+					this.actionList=JSON.parse(JSON.stringify(actionList))
+					this.flowData.actionId=actionList[0].actionId
+					this.flowData.actionCode=actionList[0].actionCode
+				  }
 				}
 			  })
 			},

pages/risk/rectify/rectify.vue

@@ -4,15 +4,15 @@
 		<div class="info">
 			<div class="item">
 				<view class="name">执行人</view>
-				<view class="cont">执行人</view>	
+				<view class="cont">{{item.curAccountName}}</view>	
 			</div>
 			<div class="item">
 				<view class="name">执行部门</view>
-				<view class="cont">执行部门</view>	
+				<view class="cont">{{item.curGroupName}}</view>	
 			</div>
 			<div class="item">
 				<view class="name">上报时间</view>
-				<view class="cont">{{parseTime(new Date())}}</view>	
+				<view class="cont">{{parseTime(item.curActivityBeginTime)}}</view>	
 			</div>
 		</div>
 		<div class="status">

pages/risk/review/form/form.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="body">		
 		<uni-forms ref="form" label-position="top" :model="formData">
-			<uni-forms-item label="处理动作" name="actionId" required>
+			<uni-forms-item label="处理动作" name="actionId" required v-if="actionList.length>0">
 				<uni-data-checkbox v-model="flowData.actionId" :localdata="actionList" @change="changeCheck"/>
 			</uni-forms-item>
 			<uni-forms-item label="处理说明" name="reviewRemark" required>
@@ -39,9 +39,9 @@
 				formData:{
 					'hdangerId': undefined,
 					'formCode': 'submit',
-					'hdangerTitle': '', // 隐患标题
-					'dangerCatId': undefined, // 隐患类别ID
-					'hdangerLevel': 1, // 隐患等级
+					'hdangerTitle': '', // 预警标题
+					'dangerCatId': undefined, // 预警类别ID
+					'hdangerLevel': 1, // 预警等级
 					'reviewRemark': '', // 描述
 					'submitTime': parseTime(new Date()),
 					'dangerDeadline': '', // 截止时间
@@ -85,14 +85,16 @@
 				  this.flowData.activityDefId = data.curActivityIns.activityDefId
 				  this.flowData.activityInsId = data.curActivityIns.activityInsId
 				  this.flowData.activityCode = data.curActivityIns.activityCode
-				  let actionList=this.flowData.curActivityIns.actionList.map(function(item){
-					  item.value=item.actionId
-					  item.text=item.actionTitle
-					  return item
-				  })
-				  this.actionList=JSON.parse(JSON.stringify(actionList))
-				  this.flowData.actionId=actionList[0].actionId
-				  this.flowData.actionCode=actionList[0].actionCode
+				  if(data.curActivityIns.actionList){
+					let actionList=data.curActivityIns.actionList.map(function(item){
+						  item.value=item.actionId
+						  item.text=item.actionTitle
+						  return item
+					})	
+					this.actionList=JSON.parse(JSON.stringify(actionList))
+					this.flowData.actionId=actionList[0].actionId
+					this.flowData.actionCode=actionList[0].actionCode
+				  }
 				}
 			  })
 			},

pages/risk/review/review.vue

@@ -4,15 +4,15 @@
 		<div class="info">
 			<div class="item">
 				<view class="name">执行人</view>
-				<view class="cont">执行人</view>	
+				<view class="cont">{{item.curAccountName}}</view>	
 			</div>
 			<div class="item">
 				<view class="name">执行部门</view>
-				<view class="cont">执行部门</view>	
+				<view class="cont">{{item.curGroupName}}</view>	
 			</div>
 			<div class="item">
 				<view class="name">上报时间</view>
-				<view class="cont">{{parseTime(new Date())}}</view>	
+				<view class="cont">{{parseTime(item.curActivityBeginTime)}}</view>	
 			</div>
 		</div>
 		<view class="footer" @click="onSubmit">评审</view>

pages/risk/risk.vue

@@ -8,41 +8,49 @@
 		<div class="statistics">
 			<div class="head">任务统计</div>
 			<div class="container">
-				<div class="item">
+				<div class="item" @click="changeStuas(1,'待评审')">
 					<image class="icon" src="/static/index/wait.png" alt=""></image>
 					<text>待评审{{statistics.review}}个</text>
 				</div>
-				<div class="item">
+				<div class="item" @click="changeStuas(2,'待整改')">
 					<image class="icon" src="/static/index/expire.png" alt=""></image>
 					<text>待整改{{statistics.rectify}}个</text>
 				</div>
-				<div class="item">
+				<div class="item" @click="changeStuas(3,'待验收')">
 					<image class="icon" src="/static/index/complete.png" alt=""></image>
 					<text>待验收{{statistics.accept}}个</text>
 				</div>
-				<div class="item">
+				<div class="item" @click="changeStuas(4,'已完成')">
 					<image class="icon" src="/static/index/complete.png" alt=""></image>
 					<text>已完成{{statistics.complete}}个</text>
 				</div>
-				<div class="item">
+				<div class="item" @click="changeStuas(-1,'已撤销')">
 					<image class="icon" src="/static/index/revocation.png" alt=""></image>
 					<text>已撤销{{statistics.revocation}}个</text>
 				</div>
 			</div>
 		</div>
 		<div class="task-list">
-			<div class="head">待办风险</div>
-			<div class="item" v-for="(item,index) in items" :key="index" @click="linkTo(item)">
-				<div class="task-title">{{item.hdangerTitle}}</div>
-			    <view class="footer">
-					<view class="lf">
-						<div class="time">{{item.dangerDeadline}}</div>
-						<div class="user">{{item.curAccountName}}</div>						
+			<div class="head">{{title}}</div>
+			<template v-if="items.length>0">
+				<div class="item" v-for="(item,index) in items" :key="index" @click="linkTo(item)">
+					<div class="task-title">{{item.hdangerTitle}}</div>
+					<view class="footer">
+						<view class="lf">
+							<div class="time">{{item.dangerDeadline}}</div>
+							<div class="user">{{item.curAccountName}}</div>						
+						</view>
+						<div class="status" v-if="item.status===4">完成</div>
+						<div class="status" v-else>{{item.curActivityTitle}}</div>
 					</view>
-					<div class="status" v-if="item.status===4">完成</div>
-					<div class="status" v-else>{{item.curActivityTitle}}</div>
-			    </view>
-			</div>
+				</div>
+			</template>
+			<template v-else>
+				<view class="empty">
+					<image class="icon-empty" src="/static/icon/empty.png" mode="widthFix"></image>
+					<p>暂无数据</p>					
+				</view>
+			</template>
 		</div>
 	</view>
 </template>
@@ -54,6 +62,7 @@
 			return {
 				statusBarHeight:0,
 				type:"user",
+				title:"待评审",
 				statistics: {
 					review:10,
 					rectify:2,
@@ -61,32 +70,71 @@
 					accept:88,
 					revocation:2
 				},
+				conditions:{
+					status:1,
+					accountId:undefined
+				},
 				items:[]
 			}
 		},
 		onShow(){
+			const accountInfo=uni.getStorageSync('accountInfo');
+			const groupId=accountInfo.groupId
+			const accountId=accountInfo.userId
+			this.accountId=accountId
+			this.groupId=groupId
 			this.init()
+			this.getData()
 		},
 		methods: {
 			init(){
+				let type="AccountId"
+				let tab_type=this.accountId
+				if(this.type!=='user'){
+					type="GroupId"
+					tab_type=this.groupId
+				}
 				getDangerByList().then((res)=>{
+					this.statistics.review=res.data.filter(item=>item.status==1&&item['review'+type]===tab_type).length
+					this.statistics.rectify=res.data.filter(item=>item.status==2&&item['rectify'+type]===tab_type).length
+					this.statistics.accept=res.data.filter(item=>item.status==3&&item['accept'+type]===tab_type).length
+					this.statistics.complete=res.data.filter(item=>item.status==4&&item['submit'+type]===tab_type).length
+					this.statistics.revocation=res.data.filter(item=>item.status==-1&&item['submit'+type]===tab_type).length
+				})			
+			},
+			onPullDownRefresh (){
+				this.getData()
+			},
+			getData(){
+				let conditions={status:this.conditions.status}
+				let statusName="submit"
+				if(this.conditions.status==1){
+					statusName="review"
+				}else if(this.conditions.status==2){
+					statusName="rectify"
+				}else if(this.conditions.status==3){
+					statusName="accept"
+				}
+				if(this.type==='user'){
+					conditions[statusName+"AccountId"]=this.accountId
+				}else{
+					conditions[statusName+"GroupId"]=this.groupId
+				}
+				getDangerByList(conditions).then((res)=>{
 					this.items=res.data
-					this.statistics.review=res.data.filter(item=>item.status==1).length
-					this.statistics.rectify=res.data.filter(item=>item.status==2).length
-					this.statistics.accept=res.data.filter(item=>item.status==3).length
-					this.statistics.complete=res.data.filter(item=>item.status==4).length
-					this.statistics.revocation=res.data.filter(item=>item.status==-1).length
 				})
 			},
 			changeTab(type){
 				this.type=type
-				if(type==='group'){
-					
-				}else{
-					
-				}
+				this.getData()
+			},
+			changeStuas(status,name){
+				this.conditions.status=status
+				this.title=name
+				this.getData()
 			},
 			linkTo(item){
+				if(this.type==='group') return
 				let url="";
 				switch(item.curActivityCode){
 					case "review" ://评审
@@ -222,4 +270,15 @@
 		font-size: 14px;
 		line-height: 24px;
 	}
+	.empty{
+		text-align: center;
+		font-size: 28rpx;
+		margin-top: 10%;
+		color: #666;
+		.icon-empty{
+			display: block;
+			width: 100px;
+			margin: 0 auto;
+		}
+	}
 </style>

pages/task/submit/submit.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="body">		
 		<uni-forms ref="form" label-position="top" :rules="rules" :model="formData">
-			<uni-forms-item label="隐患标题" name="desc" required>
+			<uni-forms-item label="预警标题" name="desc" required>
 				<uni-easyinput v-model="formData.hdangerTitle" placeholder="请输入描述"></uni-easyinput>
 			</uni-forms-item>	
 			<uni-forms-item label="采空区" name="goafId" required>
@@ -10,7 +10,7 @@
 					:localdata="goafList"
 				></uni-data-select>
 			</uni-forms-item>
-			<uni-forms-item label="检查表" name="checklistId" required>
+			<uni-forms-item v-if="formState!=='form_checkList'" label="检查表" name="checklistId" required>
 				<uni-data-select
 					v-model="formData.checklistId"
 					:localdata="checkList"
@@ -22,7 +22,7 @@
 					:localdata="userList"
 				></uni-data-select>
 			</uni-forms-item>
-			<uni-forms-item label="隐患等级" name="hdangerLevel" required>
+			<uni-forms-item label="预警等级" name="hdangerLevel" required>
 				<uni-data-checkbox v-model="formData.hdangerLevel" :localdata="hdangerLevels"></uni-data-checkbox>
 			</uni-forms-item>							  
 			<uni-forms-item label="发生时间" name="submitTime" required>
@@ -68,9 +68,9 @@
 				formData:{
 					'hdangerId': undefined,
 					'formCode': 'submit',
-					'hdangerTitle': '', // 隐患标题
-					'dangerCatId': undefined, // 隐患类别ID
-					'hdangerLevel': 1, // 隐患等级
+					'hdangerTitle': '', // 预警标题
+					'dangerCatId': undefined, // 预警类别ID
+					'hdangerLevel': 1, // 预警等级
 					'hdangerDesc': '', // 描述
 					'submitTime': parseTime(new Date()),
 					'dangerDeadline': '', // 截止时间
@@ -78,6 +78,7 @@
 					'checklistId': '',
 					"attachList":[]
 				},
+				formState:undefined,
 				flowData:{},
 				userList:[],
 				checkList:[],
@@ -111,12 +112,6 @@
 		created() {
 			this.init()
 		},
-		onLoad() {
-			let scanCode_info=uni.getStorageSync('scanCode-info')
-			if(scanCode_info){
-				console.log('扫码登记')
-			}
-		},
 		methods: {
 			// 启动流程
 			async start(wfDefId) {
@@ -148,8 +143,6 @@
 				} else {
 				  this.$message.error(msg)
 				}
-			  }).catch((error) => {
-				console.log(error)
 			  })
 			},
 			init(){
@@ -158,7 +151,8 @@
 					this.formData.checklistId = data.checklistId
 					this.formData.goafId = data.goafId
 					this.formData.hdangerDesc = data.checkItemNopass
-					this.formData.hdangerTitle = data.checkItemNopass		
+					this.formData.hdangerTitle = `${data.taskTitle}未通过检查`	
+					this.formState = 'form_checkList'
 				}
 				this.getUser()
 				this.getChecklist()
@@ -260,9 +254,9 @@
 			},
 			verify(){
 				let items={
-					'hdangerTitle': '隐患标题', // 
+					'hdangerTitle': '预警标题', // 
 					"reviewAccountId":'评审人',
-					'hdangerLevel': "隐患等级", // 隐患等级
+					'hdangerLevel': "预警等级", // 预警等级
 					// 'hdangerDesc': '描述', // 
 					'submitTime': "发生时间",
 					'dangerDeadline': '截止时间', // 

pages/task/task.vue

@@ -1,6 +1,11 @@
 <template>
 	<view class="task-page">
-		<div class="title">{{item.taskTitle}}</div>
+		<div class="title">
+			<text>{{item.taskTitle}}</text>
+			<!-- #ifndef H5 -->
+			<text class="icon-saoma iconfont" @click="onScanCode" v-if="item.status!==1"></text>			
+			<!-- #endif -->
+		</div>
 		<div class="info">
 			<div class="item">
 				<view class="name">执行人</view>
@@ -16,13 +21,21 @@
 			</div>
 		</div>
 		<div class="status">
-			<div class="head">处置过程</div>
 			<template v-if="item.status===0">
 				<image class="icon-empty" src="/static/icon/empty.png" mode="widthFix"></image>
 				<p>暂无处置信息</p>	
 				<image class="add" @click="add" src="/static/icon/add.png" mode="widthFix"></image>
 			</template>
-			<template v-else>
+			<div class="head"  v-if="item.status===1">处置过程</div>
+				<h3 v-if="checkItemPass.length>0">通过项</h3>
+				<ul style="padding-bottom: 10px;">
+					<li v-for="(item,index) in checkItemPass">{{item}}</li>
+				</ul>
+				<h3 v-if="checkItemNopass.length>0">不通过项</h3>
+				<ul>
+					<li v-for="(item,index) in checkItemNopass">{{item}}</li>
+				</ul>
+<!-- 			<template v-else>
 				<view class="flow-head">
 					<div class="flow-status" :class="flow.status===1?'success':'error'">{{flow.status===0?'异常':(flow.status===1?'正常':'')}}</div>
 					<view class="flow-time">{{parseTime(flow.time)}}</view>
@@ -33,53 +46,78 @@
 						<image class="image" :src="attach.url" mode="widthFix"></image>
 					</view>
 				</div>
-			</template>
+			</template> -->
 		</div>
 	</view>
 </template>
 
 <script>
 	import {parseTime} from '@/libs/index.js'
+	import {scanCode} from '@/api/goaf.js'
 	export default {
 		data() {
 			return {
 				item:{
 					title:"水位预{2号-770-32002}:采空区封堵完好，无渗水情况。"
 				},
-				flow:{
-					status:"",
-					time:"",
-					desc:"",
-					attachList:[]
-				}
+				checkItemNopass:[],
+				checkItemPass:[]
 			}
 		},
 		onLoad() {
 			this.init()
 		},
+		onPullDownRefresh (){
+			this.init()
+		},
 		methods: {
 			parseTime,
 			init(){
-				this.flow={
-					status:0,
-					time:new Date(),
-					desc:"处置过程描述处置过程描述处置过程描述处置过程描述处置过程描述处置过程描述处置过程描述",
-					attachList:[
-						{url:"/static/preview/1.png"},
-						{url:"/static/preview/2.png"},
-						{url:"/static/preview/3.png"},
-						{url:"/static/preview/2.png"}
-					]
-				}
 				this.getTask()
 			},
 			getTask(){
-				this.item=uni.getStorageSync('task-item')
+				let data=uni.getStorageSync('task-item')
+				let checkItemPass=data.checkItemPass
+				let checkItemNopass=data.checkItemNopass
+				this.item=data
+				if(checkItemPass){
+					this.checkItemPass=checkItemPass.split('通过;')
+				}
+				if(checkItemNopass){
+					this.checkItemNopass=checkItemNopass.split('不通过;')
+				}			
 			},
 			add(){
 				uni.navigateTo({
 					url:'/pages/task/taskList/taskList'
 				})
+			},
+			onScanCode(){
+				let data=uni.getStorageSync('task-item')
+				let checklistId=data.checklistId
+				uni.scanCode({
+					success: function (res) {
+						scanCode(res.result).then((res)=>{
+							console.log(res)
+							if(checklistId!==res.data.goafChecklistId){
+								uni.showToast({
+									icon:'none',
+									title:"任务跟二维码不否"
+								})	
+								return
+							}
+							uni.navigateTo({
+								url:'/pages/task/taskList/taskList'
+							})							
+						})
+					},
+					fail(){
+						uni.showToast({
+							icon:'none',
+							title:"扫码失败！"
+						})
+					}
+				})		
 			}
 		}
 	}
@@ -95,11 +133,21 @@
 			font-size: 36rpx;
 			line-height: 54rpx;
 			color: #212121;
-			padding:0 32rpx;
+			padding-left: 32rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			.iconfont{
+				font-size: 42rpx;
+				line-height: 1;
+				padding: 12rpx 32rpx;
+				font-weight: normal;
+				color: #333;
+			}
 		}
 		.info{
 			padding: 0 32rpx;
-			margin: 40rpx 0;
+			margin: 20rpx 0;
 			background: #FFFFFF;
 			border-radius: 32rpx 32rpx 0px 0px;	
 			.item{
@@ -129,7 +177,18 @@
 				color: #212121;
 				font-size: 34rpx;
 				line-height:1;
-				font-weight: 700;				
+				font-weight: 700;
+				padding-bottom: 20rpx;
+			}
+			h3{
+				color: #424242;
+				padding: 10rpx 10rpx;
+				background-color: #EFF1F3;
+				line-height: 1;
+				margin-bottom: 10rpx;
+			}
+			ul{
+				list-style: decimal;
 			}
 			.icon-empty{
 				display: block;
@@ -137,10 +196,10 @@
 				margin: 64rpx auto 0;
 			}
 			p{
-				font-size: 24rpx;
-				line-height: 28rpx;
-				color: #D5D5D5;
-				text-align: center;
+				font-size: 28rpx;
+				line-height: 1.8;
+				color: #666;
+				// text-align: center;
 			}
 			.flow-head{
 				display: flex;

pages/task/taskList/taskList.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="task-page">
-		<div class="title">{{item.title}}</div>
+		<div class="title">{{viewData.taskTitle}}</div>
 		<div class="info" v-if="items.length>0">
 			<div class="item-checklist" v-for="item in items">
-				<view class="name">检查防水是否完好检查防水是否完好检查防水是否完好检查防水是否完好检查防水是否完好</view>	
+				<view class="name">{{item.checklistItemContent}}</view>	
 				<view class="cont">
 					<uni-data-checkbox v-model="item.state" :localdata="checkState" @change="changeCheck(item)"/>
 				</view>	
@@ -24,8 +24,7 @@
 		data() {
 			return {
 				userData:{},
-				item:{
-					title:"水位预{2号-770-32002}:采空区封堵完好，无渗水情况。"
+				viewData:{
 				},
 				flow:{
 					status:"",
@@ -45,74 +44,95 @@
 			init(){
 			  let data=uni.getStorageSync('task-item')
 			  this.userData=uni.getStorageSync('accountInfo')
-			  getChecklistItemById(data.checklistId).then((res) => {
-				this.items = res.data
+			  let scanCode_info=uni.getStorageSync('scanCode-info')
+			  let checklistId=data.checklistId
+			  if(scanCode_info){
+				checklistId=scanCode_info.checklistId
+			  }
+			  this.viewData=data
+			  getChecklistItemById(checklistId).then((res) => {
+				this.items = res.data.map(item=>{
+					return{
+						...item,
+						state:1
+					}
+				})
 			  })
 			},
 			changeCheck(item){
-				if(!item.state){
-					uni.showModal({
-						title: '提示',
-						content: `请确认${item.title}状态为否`,
-						success: function (res) {
-							if (res.confirm) {
-								console.log('用户点击确定');
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
-						}
-					});
-				}
+				console.log(item.state)
 			},
 			onSubmit(){
 				  let viewData=uni.getStorageSync('task-item')
 				  let checkItemNopass = ''
 				  let checkItemPass = ''
 				  let checkResult=0
-				  this.dataList.forEach(item => {
+				  let handleAccountId =this.userData.userId
+				  let handleAccountName =this.userData.userName
+				  let handlePositionId =this.userData.positionId
+				  let handlePositionName =this.userData.positionName
+				  let handleGroupId =this.userData.groupId
+				  let handleGroupName =this.userData.groupName
+				  this.items.forEach(item => {
 					if (item.state===1) {
-					   checkItemPass += item.checkItemPass + '，'
+					   checkItemPass += item.checklistItemContent + '通过;'
 					}else{
 						checkResult=1
-					   checkItemNopass += item.checklistItemContent + '不通过，'
+					   checkItemNopass += item.checklistItemContent + '不通过;'
 					}
 				  })
 				  checkItemPass = checkItemPass.substring(0, checkItemPass.length - 1)
 				  checkItemNopass = checkItemNopass.substring(0, checkItemNopass.length - 1)
-				  handleCheckTask({
-					...viewData,
-					'handleAccountId': this.userData.userId,
-					'handleAccountName': this.userData.userName,
-					'handlePositionId': this.userData.positionId,
-					'handlePositionName': this.userData.positionName,
-					'handleGroupId': this.userData.groupId,
-					'handleGroupName': this.userData.groupName,
-					'status': 1,
-					checkResult,
-					checkItemPass,
-					checkItemNopass
-				  }).then(() => {
-					this.dialogVisible = false
-					this.$emit('success')
-					if (checkResult===1) {
-						uni.setStorageSync('submit-data',{
-							...viewData,
-							'handleAccountId': this.userData.userId,
-							'handleAccountName': this.userData.userName,
-							'handlePositionId': this.userData.positionId,
-							'handlePositionName': this.userData.positionName,
-							'handleGroupId': this.userData.groupId,
-							'handleGroupName': this.userData.groupName,
-							'status': 1,
-							checkResult,
-							checkItemPass,
-							checkItemNopass						
-						})
-						uni.navigateTo({
-							url:'/pages/task/submit/submit'
+				  if(checkResult===1){
+				  	uni.showModal({
+				  		title: '提示',
+				  		content: "确认检查项是否提交准确",
+				  		success: function (res) {
+				  			if (res.confirm) {
+								  handleCheckTask({
+									...viewData,
+									handleAccountId,
+									handleAccountName,
+									handlePositionId,
+									handlePositionName,
+									handleGroupId,
+									handleGroupName,
+									'status': 1,
+									checkResult,
+									checkItemPass,
+									checkItemNopass
+								  }).then(() => {
+									  let submit_data=uni.getStorageSync('task-item')
+									  uni.removeStorageSync('task-item')
+									  submit_data.checkItemNopass=checkItemNopass
+									  uni.setStorageSync('submit-data',submit_data)
+									   let viewData=
+										uni.navigateTo({
+											url:'/pages/task/submit/submit'
+										})
+								  })
+				  			}
+				  		}
+				  	});
+				  }else{
+					  handleCheckTask({
+						...viewData,
+						handleAccountId,
+						handleAccountName,
+						handlePositionId,
+						handlePositionName,
+						handleGroupId,
+						handleGroupName,
+						'status': 1,
+						checkResult,
+						checkItemPass,
+						checkItemNopass
+					  }).then(() => {
+						uni.switchTab({
+							url:'/pages/index/index'
 						})
-					}
-				  })
+					  })
+				  } 
 			}
 		}
 	}

static/customicons.css

@@ -1,20 +0,0 @@
-@font-face {
-  font-family: "customicons"; /* Project id 2878519 */
-  src:url('/static/customicons.ttf') format('truetype');
-}
-
-.customicons {
-  font-family: "customicons" !important;
-}
-
-.youxi:before {
-  content: "\e60e";
-}
-
-.wenjian:before {
-  content: "\e60f";
-}
-
-.zhuanfa:before {
-  content: "\e610";
-}

static/iconfont.css

@@ -1,6 +1,6 @@
 @font-face {
   font-family: "iconfont"; /* Project id  */
-  src: url('@/static/iconfont.ttf') format('truetype');
+  src: url('/static/iconfont.ttf?t=1684737682162') format('truetype');
 }
 
 .iconfont {
@@ -27,3 +27,7 @@
   content: "\e672";
 }
 
+.icon-saoma:before {
+  content: "\e627";
+}
+

unpackage/cache/wgt/__UNI__ED9AEA5/app-config-service.js

@@ -1,8 +1,8 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/index/index","pages/risk/risk","pages/mine/mine","pages/login/login","pages/mine/password/password","pages/task/task","pages/task/form/form","pages/risk/review/review","pages/risk/review/form/form","pages/risk/check/check","pages/risk/check/form/form","pages/risk/rectify/rectify","pages/risk/rectify/form/form","pages/risk/repeal/repeal","pages/task/taskList/taskList","pages/task/submit/submit"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F3F5FB","backgroundColor":"#F8F8F8","background":"#efeff4"},"tabBar":{"color":"#999999","selectedColor":"#3384ff","borderStyle":"white","backgroundColor":"#ffffff","height":"50px","fontSize":"10px","iconWidth":"24px","spacing":"3px","list":[{"pagePath":"pages/index/index","iconPath":"static/tabBar/Home.png","selectedIconPath":"static/tabBar/HomeEd.png","text":"任务"},{"pagePath":"pages/risk/risk","iconPath":"static/tabBar/risk.png","selectedIconPath":"static/tabBar/riskEd.png","text":"隐患"},{"pagePath":"pages/mine/mine","iconPath":"static/tabBar/mine.png","selectedIconPath":"static/tabBar/mineEd.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"app","compilerVersion":"3.7.11","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
-var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"任务","navigationStyle":"custom"}},{"path":"/pages/risk/risk","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"风险","navigationStyle":"custom"}},{"path":"/pages/mine/mine","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"我的","navigationStyle":"custom"}},{"path":"/pages/login/login","meta":{},"window":{"navigationBarTitleText":"登录"}},{"path":"/pages/mine/password/password","meta":{},"window":{"navigationBarTitleText":"修改密码"}},{"path":"/pages/task/task","meta":{},"window":{"navigationBarTitleText":"预警处置"}},{"path":"/pages/task/form/form","meta":{},"window":{"navigationBarTitleText":"处置"}},{"path":"/pages/risk/review/review","meta":{},"window":{"navigationBarTitleText":"待评审","enablePullDownRefresh":false}},{"path":"/pages/risk/review/form/form","meta":{},"window":{"navigationBarTitleText":"评审","enablePullDownRefresh":false}},{"path":"/pages/risk/check/check","meta":{},"window":{"navigationBarTitleText":"待验收","enablePullDownRefresh":false}},{"path":"/pages/risk/check/form/form","meta":{},"window":{"navigationBarTitleText":"验收","enablePullDownRefresh":false}},{"path":"/pages/risk/rectify/rectify","meta":{},"window":{"navigationBarTitleText":"待整改","enablePullDownRefresh":false}},{"path":"/pages/risk/rectify/form/form","meta":{},"window":{"navigationBarTitleText":"整改","enablePullDownRefresh":false}},{"path":"/pages/risk/repeal/repeal","meta":{},"window":{"navigationBarTitleText":"已撤销","enablePullDownRefresh":false}},{"path":"/pages/task/taskList/taskList","meta":{},"window":{"navigationBarTitleText":"检查任务","enablePullDownRefresh":false}},{"path":"/pages/task/submit/submit","meta":{},"window":{"navigationBarTitleText":"登记隐患","enablePullDownRefresh":false}}];
+var __uniConfig = {"pages":["pages/index/index","pages/risk/risk","pages/mine/mine","pages/login/login","pages/mine/password/password","pages/task/task","pages/task/form/form","pages/risk/review/review","pages/risk/review/form/form","pages/risk/check/check","pages/risk/check/form/form","pages/risk/rectify/rectify","pages/risk/rectify/form/form","pages/risk/repeal/repeal","pages/task/taskList/taskList","pages/task/submit/submit"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F3F5FB","backgroundColor":"#F8F8F8","background":"#efeff4"},"tabBar":{"color":"#999999","selectedColor":"#3384ff","borderStyle":"white","backgroundColor":"#ffffff","height":"50px","fontSize":"10px","iconWidth":"24px","spacing":"3px","list":[{"pagePath":"pages/index/index","iconPath":"static/tabBar/Home.png","selectedIconPath":"static/tabBar/HomeEd.png","text":"任务"},{"pagePath":"pages/risk/risk","iconPath":"static/tabBar/risk.png","selectedIconPath":"static/tabBar/riskEd.png","text":"预警"},{"pagePath":"pages/mine/mine","iconPath":"static/tabBar/mine.png","selectedIconPath":"static/tabBar/mineEd.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"app","compilerVersion":"3.7.11","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"任务","navigationStyle":"custom"}},{"path":"/pages/risk/risk","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"风险","navigationStyle":"custom"}},{"path":"/pages/mine/mine","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"我的","navigationStyle":"custom"}},{"path":"/pages/login/login","meta":{},"window":{"navigationBarTitleText":"登录"}},{"path":"/pages/mine/password/password","meta":{},"window":{"navigationBarTitleText":"修改密码"}},{"path":"/pages/task/task","meta":{},"window":{"navigationBarTitleText":"预警处置"}},{"path":"/pages/task/form/form","meta":{},"window":{"navigationBarTitleText":"处置"}},{"path":"/pages/risk/review/review","meta":{},"window":{"navigationBarTitleText":"待评审","enablePullDownRefresh":false}},{"path":"/pages/risk/review/form/form","meta":{},"window":{"navigationBarTitleText":"评审","enablePullDownRefresh":false}},{"path":"/pages/risk/check/check","meta":{},"window":{"navigationBarTitleText":"待验收","enablePullDownRefresh":false}},{"path":"/pages/risk/check/form/form","meta":{},"window":{"navigationBarTitleText":"验收","enablePullDownRefresh":false}},{"path":"/pages/risk/rectify/rectify","meta":{},"window":{"navigationBarTitleText":"待整改","enablePullDownRefresh":false}},{"path":"/pages/risk/rectify/form/form","meta":{},"window":{"navigationBarTitleText":"整改","enablePullDownRefresh":false}},{"path":"/pages/risk/repeal/repeal","meta":{},"window":{"navigationBarTitleText":"已撤销","enablePullDownRefresh":false}},{"path":"/pages/task/taskList/taskList","meta":{},"window":{"navigationBarTitleText":"检查任务","enablePullDownRefresh":false}},{"path":"/pages/task/submit/submit","meta":{},"window":{"navigationBarTitleText":"登记预警","enablePullDownRefresh":false}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});

unpackage/dist/build/app-plus/app-config-service.js

@@ -1,8 +1,8 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/index/index","pages/risk/risk","pages/mine/mine","pages/login/login","pages/mine/password/password","pages/task/task","pages/task/form/form","pages/risk/review/review","pages/risk/review/form/form","pages/risk/check/check","pages/risk/check/form/form","pages/risk/rectify/rectify","pages/risk/rectify/form/form","pages/risk/repeal/repeal","pages/task/taskList/taskList","pages/task/submit/submit"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F3F5FB","backgroundColor":"#F8F8F8","background":"#efeff4"},"tabBar":{"color":"#999999","selectedColor":"#3384ff","borderStyle":"white","backgroundColor":"#ffffff","height":"50px","fontSize":"10px","iconWidth":"24px","spacing":"3px","list":[{"pagePath":"pages/index/index","iconPath":"static/tabBar/Home.png","selectedIconPath":"static/tabBar/HomeEd.png","text":"任务"},{"pagePath":"pages/risk/risk","iconPath":"static/tabBar/risk.png","selectedIconPath":"static/tabBar/riskEd.png","text":"隐患"},{"pagePath":"pages/mine/mine","iconPath":"static/tabBar/mine.png","selectedIconPath":"static/tabBar/mineEd.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"app","compilerVersion":"3.7.11","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
-var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"任务","navigationStyle":"custom"}},{"path":"/pages/risk/risk","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"风险","navigationStyle":"custom"}},{"path":"/pages/mine/mine","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"我的","navigationStyle":"custom"}},{"path":"/pages/login/login","meta":{},"window":{"navigationBarTitleText":"登录"}},{"path":"/pages/mine/password/password","meta":{},"window":{"navigationBarTitleText":"修改密码"}},{"path":"/pages/task/task","meta":{},"window":{"navigationBarTitleText":"预警处置"}},{"path":"/pages/task/form/form","meta":{},"window":{"navigationBarTitleText":"处置"}},{"path":"/pages/risk/review/review","meta":{},"window":{"navigationBarTitleText":"待评审","enablePullDownRefresh":false}},{"path":"/pages/risk/review/form/form","meta":{},"window":{"navigationBarTitleText":"评审","enablePullDownRefresh":false}},{"path":"/pages/risk/check/check","meta":{},"window":{"navigationBarTitleText":"待验收","enablePullDownRefresh":false}},{"path":"/pages/risk/check/form/form","meta":{},"window":{"navigationBarTitleText":"验收","enablePullDownRefresh":false}},{"path":"/pages/risk/rectify/rectify","meta":{},"window":{"navigationBarTitleText":"待整改","enablePullDownRefresh":false}},{"path":"/pages/risk/rectify/form/form","meta":{},"window":{"navigationBarTitleText":"整改","enablePullDownRefresh":false}},{"path":"/pages/risk/repeal/repeal","meta":{},"window":{"navigationBarTitleText":"已撤销","enablePullDownRefresh":false}},{"path":"/pages/task/taskList/taskList","meta":{},"window":{"navigationBarTitleText":"检查任务","enablePullDownRefresh":false}},{"path":"/pages/task/submit/submit","meta":{},"window":{"navigationBarTitleText":"登记隐患","enablePullDownRefresh":false}}];
+var __uniConfig = {"pages":["pages/index/index","pages/risk/risk","pages/mine/mine","pages/login/login","pages/mine/password/password","pages/task/task","pages/task/form/form","pages/risk/review/review","pages/risk/review/form/form","pages/risk/check/check","pages/risk/check/form/form","pages/risk/rectify/rectify","pages/risk/rectify/form/form","pages/risk/repeal/repeal","pages/task/taskList/taskList","pages/task/submit/submit"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F3F5FB","backgroundColor":"#F8F8F8","background":"#efeff4"},"tabBar":{"color":"#999999","selectedColor":"#3384ff","borderStyle":"white","backgroundColor":"#ffffff","height":"50px","fontSize":"10px","iconWidth":"24px","spacing":"3px","list":[{"pagePath":"pages/index/index","iconPath":"static/tabBar/Home.png","selectedIconPath":"static/tabBar/HomeEd.png","text":"任务"},{"pagePath":"pages/risk/risk","iconPath":"static/tabBar/risk.png","selectedIconPath":"static/tabBar/riskEd.png","text":"预警"},{"pagePath":"pages/mine/mine","iconPath":"static/tabBar/mine.png","selectedIconPath":"static/tabBar/mineEd.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"app","compilerVersion":"3.7.11","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"任务","navigationStyle":"custom"}},{"path":"/pages/risk/risk","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"风险","navigationStyle":"custom"}},{"path":"/pages/mine/mine","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"我的","navigationStyle":"custom"}},{"path":"/pages/login/login","meta":{},"window":{"navigationBarTitleText":"登录"}},{"path":"/pages/mine/password/password","meta":{},"window":{"navigationBarTitleText":"修改密码"}},{"path":"/pages/task/task","meta":{},"window":{"navigationBarTitleText":"预警处置"}},{"path":"/pages/task/form/form","meta":{},"window":{"navigationBarTitleText":"处置"}},{"path":"/pages/risk/review/review","meta":{},"window":{"navigationBarTitleText":"待评审","enablePullDownRefresh":false}},{"path":"/pages/risk/review/form/form","meta":{},"window":{"navigationBarTitleText":"评审","enablePullDownRefresh":false}},{"path":"/pages/risk/check/check","meta":{},"window":{"navigationBarTitleText":"待验收","enablePullDownRefresh":false}},{"path":"/pages/risk/check/form/form","meta":{},"window":{"navigationBarTitleText":"验收","enablePullDownRefresh":false}},{"path":"/pages/risk/rectify/rectify","meta":{},"window":{"navigationBarTitleText":"待整改","enablePullDownRefresh":false}},{"path":"/pages/risk/rectify/form/form","meta":{},"window":{"navigationBarTitleText":"整改","enablePullDownRefresh":false}},{"path":"/pages/risk/repeal/repeal","meta":{},"window":{"navigationBarTitleText":"已撤销","enablePullDownRefresh":false}},{"path":"/pages/task/taskList/taskList","meta":{},"window":{"navigationBarTitleText":"检查任务","enablePullDownRefresh":false}},{"path":"/pages/task/submit/submit","meta":{},"window":{"navigationBarTitleText":"登记预警","enablePullDownRefresh":false}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});

unpackage/dist/dev/app-plus/app-config-service.js

@@ -1,8 +1,8 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/index/index","pages/risk/risk","pages/mine/mine","pages/login/login","pages/mine/password/password","pages/task/task","pages/task/form/form","pages/risk/review/review","pages/risk/review/form/form","pages/risk/check/check","pages/risk/check/form/form","pages/risk/rectify/rectify","pages/risk/rectify/form/form","pages/risk/repeal/repeal","pages/task/taskList/taskList","pages/task/submit/submit"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F3F5FB","backgroundColor":"#F8F8F8","background":"#efeff4"},"tabBar":{"color":"#999999","selectedColor":"#3384ff","borderStyle":"white","backgroundColor":"#ffffff","height":"50px","fontSize":"10px","iconWidth":"24px","spacing":"3px","list":[{"pagePath":"pages/index/index","iconPath":"static/tabBar/Home.png","selectedIconPath":"static/tabBar/HomeEd.png","text":"任务"},{"pagePath":"pages/risk/risk","iconPath":"static/tabBar/risk.png","selectedIconPath":"static/tabBar/riskEd.png","text":"隐患"},{"pagePath":"pages/mine/mine","iconPath":"static/tabBar/mine.png","selectedIconPath":"static/tabBar/mineEd.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"app","compilerVersion":"3.7.11","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
-var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"任务","navigationStyle":"custom"}},{"path":"/pages/risk/risk","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"风险","navigationStyle":"custom"}},{"path":"/pages/mine/mine","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"我的","navigationStyle":"custom"}},{"path":"/pages/login/login","meta":{},"window":{"navigationBarTitleText":"登录"}},{"path":"/pages/mine/password/password","meta":{},"window":{"navigationBarTitleText":"修改密码"}},{"path":"/pages/task/task","meta":{},"window":{"navigationBarTitleText":"预警处置"}},{"path":"/pages/task/form/form","meta":{},"window":{"navigationBarTitleText":"处置"}},{"path":"/pages/risk/review/review","meta":{},"window":{"navigationBarTitleText":"待评审","enablePullDownRefresh":false}},{"path":"/pages/risk/review/form/form","meta":{},"window":{"navigationBarTitleText":"评审","enablePullDownRefresh":false}},{"path":"/pages/risk/check/check","meta":{},"window":{"navigationBarTitleText":"待验收","enablePullDownRefresh":false}},{"path":"/pages/risk/check/form/form","meta":{},"window":{"navigationBarTitleText":"验收","enablePullDownRefresh":false}},{"path":"/pages/risk/rectify/rectify","meta":{},"window":{"navigationBarTitleText":"待整改","enablePullDownRefresh":false}},{"path":"/pages/risk/rectify/form/form","meta":{},"window":{"navigationBarTitleText":"整改","enablePullDownRefresh":false}},{"path":"/pages/risk/repeal/repeal","meta":{},"window":{"navigationBarTitleText":"已撤销","enablePullDownRefresh":false}},{"path":"/pages/task/taskList/taskList","meta":{},"window":{"navigationBarTitleText":"检查任务","enablePullDownRefresh":false}},{"path":"/pages/task/submit/submit","meta":{},"window":{"navigationBarTitleText":"登记隐患","enablePullDownRefresh":false}}];
+var __uniConfig = {"pages":["pages/index/index","pages/risk/risk","pages/mine/mine","pages/login/login","pages/mine/password/password","pages/task/task","pages/task/form/form","pages/risk/review/review","pages/risk/review/form/form","pages/risk/check/check","pages/risk/check/form/form","pages/risk/rectify/rectify","pages/risk/rectify/form/form","pages/risk/repeal/repeal","pages/task/taskList/taskList","pages/task/submit/submit"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F3F5FB","backgroundColor":"#F8F8F8","background":"#efeff4"},"tabBar":{"color":"#999999","selectedColor":"#3384ff","borderStyle":"white","backgroundColor":"#ffffff","height":"50px","fontSize":"10px","iconWidth":"24px","spacing":"3px","list":[{"pagePath":"pages/index/index","iconPath":"static/tabBar/Home.png","selectedIconPath":"static/tabBar/HomeEd.png","text":"任务"},{"pagePath":"pages/risk/risk","iconPath":"static/tabBar/risk.png","selectedIconPath":"static/tabBar/riskEd.png","text":"预警"},{"pagePath":"pages/mine/mine","iconPath":"static/tabBar/mine.png","selectedIconPath":"static/tabBar/mineEd.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"app","compilerVersion":"3.7.11","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"任务","navigationStyle":"custom"}},{"path":"/pages/risk/risk","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"风险","navigationStyle":"custom"}},{"path":"/pages/mine/mine","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"我的","navigationStyle":"custom"}},{"path":"/pages/login/login","meta":{},"window":{"navigationBarTitleText":"登录"}},{"path":"/pages/mine/password/password","meta":{},"window":{"navigationBarTitleText":"修改密码"}},{"path":"/pages/task/task","meta":{},"window":{"navigationBarTitleText":"预警处置"}},{"path":"/pages/task/form/form","meta":{},"window":{"navigationBarTitleText":"处置"}},{"path":"/pages/risk/review/review","meta":{},"window":{"navigationBarTitleText":"待评审","enablePullDownRefresh":false}},{"path":"/pages/risk/review/form/form","meta":{},"window":{"navigationBarTitleText":"评审","enablePullDownRefresh":false}},{"path":"/pages/risk/check/check","meta":{},"window":{"navigationBarTitleText":"待验收","enablePullDownRefresh":false}},{"path":"/pages/risk/check/form/form","meta":{},"window":{"navigationBarTitleText":"验收","enablePullDownRefresh":false}},{"path":"/pages/risk/rectify/rectify","meta":{},"window":{"navigationBarTitleText":"待整改","enablePullDownRefresh":false}},{"path":"/pages/risk/rectify/form/form","meta":{},"window":{"navigationBarTitleText":"整改","enablePullDownRefresh":false}},{"path":"/pages/risk/repeal/repeal","meta":{},"window":{"navigationBarTitleText":"已撤销","enablePullDownRefresh":false}},{"path":"/pages/task/taskList/taskList","meta":{},"window":{"navigationBarTitleText":"检查任务","enablePullDownRefresh":false}},{"path":"/pages/task/submit/submit","meta":{},"window":{"navigationBarTitleText":"登记预警","enablePullDownRefresh":false}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});

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

@@ -44,7 +44,7 @@
         "pagePath": "pages/risk/risk",
         "iconPath": "static/tabBar/risk.png",
         "selectedIconPath": "static/tabBar/riskEd.png",
-        "text": "隐患"
+        "text": "预警"
       },
       {
         "pagePath": "pages/mine/mine",

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -9625,6 +9625,7 @@ exports.completeCheckTask = completeCheckTask;
 exports.getCheckTaskByList = getCheckTaskByList;
 exports.getCheckTaskByPage = getCheckTaskByPage;
 exports.getTaskDetailById = getTaskDetailById;
+exports.goaftaskstatis = goaftaskstatis;
 exports.handleCheckTask = handleCheckTask;
 exports.manageTaskById = manageTaskById;
 exports.transferCheckTask = transferCheckTask;
@@ -9732,6 +9733,14 @@ function handleCheckTask(data) {
     data: data
   });
 }
+// 任务统计
+function goaftaskstatis(data) {
+  return (0, _request.request)({
+    url: "/goaf/goaftaskstatis",
+    method: 'GET',
+    data: data
+  });
+}
 
 /***/ }),
 /* 40 */
@@ -10323,7 +10332,7 @@ function getDangerByList(data) {
   return (0, _request.request)({
     url: '/goaf/goafhdanger/list',
     method: 'GET',
-    params: data
+    data: data
   });
 }
 
@@ -11294,6 +11303,7 @@ exports.delGoaf = delGoaf;
 exports.getGoafBaseInfo = getGoafBaseInfo;
 exports.getGoafBaseInfoByPage = getGoafBaseInfoByPage;
 exports.getGoafInfoById = getGoafInfoById;
+exports.scanCode = scanCode;
 exports.updateGoaf = updateGoaf;
 var _request = __webpack_require__(/*! ../libs/request.js */ 40);
 // 获取所有采空区信息
@@ -11342,6 +11352,14 @@ function delGoaf(goafId) {
   });
 }
 
+// 扫码
+function scanCode(goafQr) {
+  return (0, _request.request)({
+    url: "/goaf/goafbaseinfo/goafqr/".concat(goafQr),
+    method: 'GET'
+  });
+}
+
 /***/ }),
 /* 175 */,
 /* 176 */,
@@ -19972,7 +19990,7 @@ var _default = {
   }, {
     "path": "pages/task/submit/submit",
     "style": {
-      "navigationBarTitleText": "登记隐患",
+      "navigationBarTitleText": "登记预警",
       "enablePullDownRefresh": false
     }
   }],
@@ -19994,7 +20012,7 @@ var _default = {
       "pagePath": "pages/risk/risk",
       "iconPath": "static/tabBar/risk.png",
       "selectedIconPath": "static/tabBar/riskEd.png",
-      "text": "隐患"
+      "text": "预警"
     }, {
       "pagePath": "pages/mine/mine",
       "iconPath": "static/tabBar/mine.png",

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

@@ -102,6 +102,15 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  var g0 = _vm.items.length
+  _vm.$mp.data = Object.assign(
+    {},
+    {
+      $root: {
+        g0: g0,
+      },
+    }
+  )
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -137,102 +146,108 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 /* WEBPACK VAR INJECTION */(function(uni) {
 
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
 var _task = __webpack_require__(/*! @/api/task.js */ 39);
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-
-var accountInfo = uni.getStorageSync('accountInfo');
-var positionId = accountInfo.positionId;
-var userId = accountInfo.userId;
+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 _default = {
   data: function data() {
     return {
       statusBarHeight: 0,
       type: 'user',
+      title: "待巡检",
       statistics: {
         wait: 0,
         expire: 0,
         complete: 0
       },
-      items: []
+      items: [],
+      conditions: {
+        status: 0,
+        accountId: undefined
+      },
+      accountId: undefined,
+      groupId: undefined
     };
   },
   onLoad: function onLoad() {
     this.initStatusBarHeight();
   },
+  onPullDownRefresh: function onPullDownRefresh() {
+    this.getData();
+  },
   onShow: function onShow() {
-    this.init();
+    var accountInfo = uni.getStorageSync('accountInfo');
+    var groupId = accountInfo.groupId;
+    var accountId = accountInfo.userId;
+    this.accountId = accountId;
+    this.groupId = groupId;
+    this.getData();
+    this.goaftaskstatis();
   },
   methods: {
     initStatusBarHeight: function initStatusBarHeight() {
       this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
     },
-    init: function init() {
+    getData: function getData() {
       var _this = this;
-      (0, _task.getCheckTaskByList)({
-        status: 0
-      }).then(function (res) {
+      var conditions = {};
+      if (this.type === 'user') {
+        conditions.handleAccountId = this.accountId;
+      } else {
+        conditions.handleGroupId = this.groupId;
+      }
+      (0, _task.getCheckTaskByList)(_objectSpread({
+        status: this.conditions.status
+      }, conditions)).then(function (res) {
         _this.items = res.data;
-        _this.statistics.wait = res.data.length;
-        // this.statistics.expire=res.data.filter(item=>item.status==1).length
-        // this.statistics.complete=res.data.filter(item=>item.status==2).length
+      });
+    },
+    goaftaskstatis: function goaftaskstatis() {
+      var _this2 = this;
+      var conditions = {};
+      if (this.type === 'user') {
+        conditions.handleAccountId = this.accountId;
+      } else {
+        conditions.handleGroupId = this.groupId;
+      }
+      (0, _task.goaftaskstatis)(conditions).then(function (res) {
+        _this2.statistics = {
+          wait: res.data.goafTaskWaitingNum,
+          expire: res.data.goafTaskExceedNum,
+          complete: res.data.goafTaskCompletedNum
+        };
       });
     },
     changeTab: function changeTab(type) {
       this.type = type;
-      if (type === 'group') {} else {}
+      this.getData();
+      this.goaftaskstatis();
     },
     linkTo: function linkTo(item) {
-      uni.setStorageSync('task-item', item);
-      uni.navigateTo({
-        url: '/pages/task/task'
-      });
+      if (this.type === 'user') {
+        uni.setStorageSync('task-item', item);
+        uni.navigateTo({
+          url: '/pages/task/task'
+        });
+      }
+    },
+    changeStuas: function changeStuas(status, name) {
+      this.conditions.status = status;
+      this.title = name;
+      this.getData();
     },
     onScanCode: function onScanCode() {
       uni.scanCode({
         success: function success(res) {
           uni.setStorageSync('scanCode-info', res.result);
           uni.navigateTo({
-            url: '/pages/task/submit/submit'
+            url: '/pages/task/taskList/taskList'
           });
         }
       });

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

@@ -93,4 +93,15 @@
   font-size: 14px;
   line-height: 24px;
 }
+.empty.data-v-57280228 {
+  text-align: center;
+  font-size: 28rpx;
+  margin-top: 10%;
+  color: #666;
+}
+.empty .icon-empty.data-v-57280228 {
+  display: block;
+  width: 100px;
+  margin: 0 auto;
+}
 

unpackage/dist/dev/mp-weixin/pages/risk/check/form/form.js

@@ -197,11 +197,11 @@ var _default = {
         'hdangerId': undefined,
         'formCode': 'submit',
         'hdangerTitle': '',
-        // 隐患标题
+        // 预警标题
         'dangerCatId': undefined,
-        // 隐患类别ID
+        // 预警类别ID
         'hdangerLevel': 1,
-        // 隐患等级
+        // 预警等级
         'acceptRemark': '',
         // 描述
         'submitTime': (0, _libs.parseTime)(new Date()),

unpackage/dist/dev/mp-weixin/pages/risk/rectify/form/form.js

@@ -203,11 +203,11 @@ var _default = {
         'hdangerId': undefined,
         'formCode': 'submit',
         'hdangerTitle': '',
-        // 隐患标题
+        // 预警标题
         'dangerCatId': undefined,
-        // 隐患类别ID
+        // 预警类别ID
         'hdangerLevel': 1,
-        // 隐患等级
+        // 预警等级
         'rectifyRemark': '',
         // 描述
         'submitTime': (0, _libs.parseTime)(new Date()),

unpackage/dist/dev/mp-weixin/pages/risk/review/form/form.js

@@ -203,11 +203,11 @@ var _default = {
         'hdangerId': undefined,
         'formCode': 'submit',
         'hdangerTitle': '',
-        // 隐患标题
+        // 预警标题
         'dangerCatId': undefined,
-        // 隐患类别ID
+        // 预警类别ID
         'hdangerLevel': 1,
-        // 隐患等级
+        // 预警等级
         'reviewRemark': '',
         // 描述
         'submitTime': (0, _libs.parseTime)(new Date()),

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

@@ -102,6 +102,15 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  var g0 = _vm.items.length
+  _vm.$mp.data = Object.assign(
+    {},
+    {
+      $root: {
+        g0: g0,
+      },
+    }
+  )
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -191,11 +200,20 @@ var _dangerApi = __webpack_require__(/*! @/api/dangerApi */ 54);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
       statusBarHeight: 0,
       type: "user",
+      title: "待评审",
       statistics: {
         review: 10,
         rectify: 2,
@@ -203,39 +221,85 @@ var _default = {
         accept: 88,
         revocation: 2
       },
+      conditions: {
+        status: 1,
+        accountId: undefined
+      },
       items: []
     };
   },
   onShow: function onShow() {
+    var accountInfo = uni.getStorageSync('accountInfo');
+    var groupId = accountInfo.groupId;
+    var accountId = accountInfo.userId;
+    this.accountId = accountId;
+    this.groupId = groupId;
     this.init();
+    this.getData();
   },
   methods: {
     init: function init() {
       var _this = this;
+      var type = "AccountId";
+      var tab_type = this.accountId;
+      if (this.type !== 'user') {
+        type = "GroupId";
+        tab_type = this.groupId;
+      }
       (0, _dangerApi.getDangerByList)().then(function (res) {
-        _this.items = res.data;
         _this.statistics.review = res.data.filter(function (item) {
-          return item.status == 1;
+          return item.status == 1 && item['review' + type] === tab_type;
         }).length;
         _this.statistics.rectify = res.data.filter(function (item) {
-          return item.status == 2;
+          return item.status == 2 && item['rectify' + type] === tab_type;
         }).length;
         _this.statistics.accept = res.data.filter(function (item) {
-          return item.status == 3;
+          return item.status == 3 && item['accept' + type] === tab_type;
         }).length;
         _this.statistics.complete = res.data.filter(function (item) {
-          return item.status == 4;
+          return item.status == 4 && item['submit' + type] === tab_type;
         }).length;
         _this.statistics.revocation = res.data.filter(function (item) {
-          return item.status == -1;
+          return item.status == -1 && item['submit' + type] === tab_type;
         }).length;
       });
     },
+    onPullDownRefresh: function onPullDownRefresh() {
+      this.getData();
+    },
+    getData: function getData() {
+      var _this2 = this;
+      var conditions = {
+        status: this.conditions.status
+      };
+      var statusName = "submit";
+      if (this.conditions.status == 1) {
+        statusName = "review";
+      } else if (this.conditions.status == 2) {
+        statusName = "rectify";
+      } else if (this.conditions.status == 3) {
+        statusName = "accept";
+      }
+      if (this.type === 'user') {
+        conditions[statusName + "AccountId"] = this.accountId;
+      } else {
+        conditions[statusName + "GroupId"] = this.groupId;
+      }
+      (0, _dangerApi.getDangerByList)(conditions).then(function (res) {
+        _this2.items = res.data;
+      });
+    },
     changeTab: function changeTab(type) {
       this.type = type;
-      if (type === 'group') {} else {}
+      this.getData();
+    },
+    changeStuas: function changeStuas(status, name) {
+      this.conditions.status = status;
+      this.title = name;
+      this.getData();
     },
     linkTo: function linkTo(item) {
+      if (this.type === 'group') return;
       var url = "";
       switch (item.curActivityCode) {
         case "review":

unpackage/dist/dev/mp-weixin/pages/risk/risk.wxss

@@ -107,4 +107,15 @@
   font-size: 14px;
   line-height: 24px;
 }
+.empty.data-v-26b92334 {
+  text-align: center;
+  font-size: 28rpx;
+  margin-top: 10%;
+  color: #666;
+}
+.empty .icon-empty.data-v-26b92334 {
+  display: block;
+  width: 100px;
+  margin: 0 auto;
+}
 

unpackage/dist/dev/mp-weixin/pages/task/submit/submit.js

@@ -208,11 +208,11 @@ var _default = {
         'hdangerId': undefined,
         'formCode': 'submit',
         'hdangerTitle': '',
-        // 隐患标题
+        // 预警标题
         'dangerCatId': undefined,
-        // 隐患类别ID
+        // 预警类别ID
         'hdangerLevel': 1,
-        // 隐患等级
+        // 预警等级
         'hdangerDesc': '',
         // 描述
         'submitTime': (0, _libs.parseTime)(new Date()),
@@ -258,12 +258,6 @@ var _default = {
   created: function created() {
     this.init();
   },
-  onLoad: function onLoad() {
-    var scanCode_info = uni.getStorageSync('scanCode-info');
-    if (scanCode_info) {
-      console.log('扫码登记');
-    }
-  },
   methods: {
     // 启动流程
     start: function start(wfDefId) {
@@ -451,11 +445,11 @@ var _default = {
     },
     verify: function verify() {
       var items = {
-        'hdangerTitle': '隐患标题',
+        'hdangerTitle': '预警标题',
         // 
         "reviewAccountId": '评审人',
-        'hdangerLevel': "隐患等级",
-        // 隐患等级
+        'hdangerLevel': "预警等级",
+        // 预警等级
         // 'hdangerDesc': '描述', // 
         'submitTime': "发生时间",
         'dangerDeadline': '截止时间',

unpackage/dist/dev/mp-weixin/pages/task/submit/submit.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "登记隐患",
+  "navigationBarTitleText": "登记预警",
   "enablePullDownRefresh": false,
   "usingComponents": {
     "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",

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

@@ -102,15 +102,6 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  var m0 = !(_vm.item.status === 0) ? _vm.parseTime(_vm.flow.time) : null
-  _vm.$mp.data = Object.assign(
-    {},
-    {
-      $root: {
-        m0: m0,
-      },
-    }
-  )
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -151,6 +142,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _index = __webpack_require__(/*! @/libs/index.js */ 90);
+var _goaf = __webpack_require__(/*! @/api/goaf.js */ 174);
+//
+//
+//
+//
+//
+//
+//
 //
 //
 //
@@ -197,43 +196,64 @@ var _default = {
       item: {
         title: "水位预{2号-770-32002}:采空区封堵完好，无渗水情况。"
       },
-      flow: {
-        status: "",
-        time: "",
-        desc: "",
-        attachList: []
-      }
+      checkItemNopass: [],
+      checkItemPass: []
     };
   },
   onLoad: function onLoad() {
     this.init();
   },
+  onPullDownRefresh: function onPullDownRefresh() {
+    this.init();
+  },
   methods: {
     parseTime: _index.parseTime,
     init: function init() {
-      this.flow = {
-        status: 0,
-        time: new Date(),
-        desc: "处置过程描述处置过程描述处置过程描述处置过程描述处置过程描述处置过程描述处置过程描述",
-        attachList: [{
-          url: "/static/preview/1.png"
-        }, {
-          url: "/static/preview/2.png"
-        }, {
-          url: "/static/preview/3.png"
-        }, {
-          url: "/static/preview/2.png"
-        }]
-      };
       this.getTask();
     },
     getTask: function getTask() {
-      this.item = uni.getStorageSync('task-item');
+      var data = uni.getStorageSync('task-item');
+      var checkItemPass = data.checkItemPass;
+      var checkItemNopass = data.checkItemNopass;
+      this.item = data;
+      if (checkItemPass) {
+        this.checkItemPass = checkItemPass.split('通过;');
+      }
+      if (checkItemNopass) {
+        this.checkItemNopass = checkItemNopass.split('不通过;');
+      }
     },
     add: function add() {
       uni.navigateTo({
         url: '/pages/task/taskList/taskList'
       });
+    },
+    onScanCode: function onScanCode() {
+      var data = uni.getStorageSync('task-item');
+      var checklistId = data.checklistId;
+      uni.scanCode({
+        success: function success(res) {
+          (0, _goaf.scanCode)(res.result).then(function (res) {
+            console.log(res);
+            if (checklistId !== res.data.goafChecklistId) {
+              uni.showToast({
+                icon: 'none',
+                title: "任务跟二维码不否"
+              });
+              return;
+            }
+            uni.navigateTo({
+              url: '/pages/task/taskList/taskList'
+            });
+          });
+        },
+        fail: function fail() {
+          uni.showToast({
+            icon: 'none',
+            title: "扫码失败！"
+          });
+        }
+      });
     }
   }
 };

unpackage/dist/dev/mp-weixin/pages/task/task.wxml

@@ -1 +1 @@
-<view class="task-page data-v-96a65fb4"><view class="title _div data-v-96a65fb4">{{item.taskTitle}}</view><view class="info _div data-v-96a65fb4"><view class="item _div data-v-96a65fb4"><view class="name data-v-96a65fb4">执行人</view><view class="cont data-v-96a65fb4">{{item.handleAccountName}}</view></view><view class="item _div data-v-96a65fb4"><view class="name data-v-96a65fb4">执行部门</view><view class="cont data-v-96a65fb4">{{item.handleGroupName}}</view></view><view class="item _div data-v-96a65fb4"><view class="name data-v-96a65fb4">发布时间</view><view class="cont data-v-96a65fb4">{{item.expectedStartDate}}</view></view></view><view class="status _div data-v-96a65fb4"><view class="head _div data-v-96a65fb4">处置过程</view><block wx:if="{{item.status===0}}"><image class="icon-empty data-v-96a65fb4" src="/static/icon/empty.png" mode="widthFix"></image><view class="_p data-v-96a65fb4">暂无处置信息</view><image class="add data-v-96a65fb4" src="/static/icon/add.png" mode="widthFix" data-event-opts="{{[['tap',[['add',['$event']]]]]}}" bindtap="__e"></image></block><block wx:else><view class="flow-head data-v-96a65fb4"><view class="{{['flow-status','_div','data-v-96a65fb4',flow.status===1?'success':'error']}}">{{flow.status===0?'异常':flow.status===1?'正常':''}}</view><view class="flow-time data-v-96a65fb4">{{$root.m0}}</view></view><view class="desc _div data-v-96a65fb4">{{flow.desc}}</view><view class="attach _div data-v-96a65fb4"><block wx:for="{{flow.attachList}}" wx:for-item="attach" wx:for-index="index"><view class="attach-item data-v-96a65fb4"><image class="image data-v-96a65fb4" src="{{attach.url}}" mode="widthFix"></image></view></block></view></block></view></view>
+<view class="task-page data-v-96a65fb4"><view class="title _div data-v-96a65fb4"><text class="data-v-96a65fb4">{{item.taskTitle}}</text><block wx:if="{{item.status!==1}}"><text data-event-opts="{{[['tap',[['onScanCode',['$event']]]]]}}" class="icon-saoma iconfont data-v-96a65fb4" bindtap="__e"></text></block></view><view class="info _div data-v-96a65fb4"><view class="item _div data-v-96a65fb4"><view class="name data-v-96a65fb4">执行人</view><view class="cont data-v-96a65fb4">{{item.handleAccountName}}</view></view><view class="item _div data-v-96a65fb4"><view class="name data-v-96a65fb4">执行部门</view><view class="cont data-v-96a65fb4">{{item.handleGroupName}}</view></view><view class="item _div data-v-96a65fb4"><view class="name data-v-96a65fb4">发布时间</view><view class="cont data-v-96a65fb4">{{item.expectedStartDate}}</view></view></view><view class="status _div data-v-96a65fb4"><block wx:if="{{item.status===0}}"><image class="icon-empty data-v-96a65fb4" src="/static/icon/empty.png" mode="widthFix"></image><view class="_p data-v-96a65fb4">暂无处置信息</view></block><block wx:if="{{item.status===1}}"><view class="head _div data-v-96a65fb4">处置过程</view></block><block wx:for="{{checkItemNopass}}" wx:for-item="item" wx:for-index="__i0__"><view class="_p data-v-96a65fb4">{{item}}</view></block><block wx:for="{{checkItemPass}}" wx:for-item="item" wx:for-index="__i1__"><view class="_p data-v-96a65fb4">{{item}}</view></block></view></view>

unpackage/dist/dev/mp-weixin/pages/task/task.wxss

@@ -11,11 +11,21 @@
   font-size: 36rpx;
   line-height: 54rpx;
   color: #212121;
-  padding: 0 32rpx;
+  padding-left: 32rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.task-page .title .iconfont.data-v-96a65fb4 {
+  font-size: 42rpx;
+  line-height: 1;
+  padding: 12rpx 32rpx;
+  font-weight: normal;
+  color: #333;
 }
 .task-page .info.data-v-96a65fb4 {
   padding: 0 32rpx;
-  margin: 40rpx 0;
+  margin: 20rpx 0;
   background: #FFFFFF;
   border-radius: 32rpx 32rpx 0px 0px;
 }

unpackage/dist/dev/mp-weixin/pages/task/taskList/taskList.js

@@ -186,9 +186,7 @@ var _default = {
   data: function data() {
     return {
       userData: {},
-      item: {
-        title: "水位预{2号-770-32002}:采空区封堵完好，无渗水情况。"
-      },
+      viewData: {},
       flow: {
         status: "",
         time: "",
@@ -214,8 +212,19 @@ var _default = {
       var _this = this;
       var data = uni.getStorageSync('task-item');
       this.userData = uni.getStorageSync('accountInfo');
-      (0, _check.getChecklistItemById)(data.checklistId).then(function (res) {
-        _this.items = res.data;
+      var scanCode_info = uni.getStorageSync('scanCode-info');
+      var checklistId = data.checklistId;
+      if (scanCode_info) {
+        console.log('扫码登记');
+        checklistId = scanCode_info.checklistId;
+      }
+      this.viewData = data;
+      (0, _check.getChecklistItemById)(checklistId).then(function (res) {
+        _this.items = res.data.map(function (item) {
+          return _objectSpread(_objectSpread({}, item), {}, {
+            state: 1
+          });
+        });
       });
     },
     changeCheck: function changeCheck(item) {
@@ -234,17 +243,16 @@ var _default = {
       }
     },
     onSubmit: function onSubmit() {
-      var _this2 = this;
       var viewData = uni.getStorageSync('task-item');
       var checkItemNopass = '';
       var checkItemPass = '';
       var checkResult = 0;
-      this.dataList.forEach(function (item) {
+      this.items.forEach(function (item) {
         if (item.state === 1) {
-          checkItemPass += item.checkItemPass + '，';
+          checkItemPass += item.checklistItemContent + '通过;';
         } else {
           checkResult = 1;
-          checkItemNopass += item.checklistItemContent + '不通过，';
+          checkItemNopass += item.checklistItemContent + '不通过;';
         }
       });
       checkItemPass = checkItemPass.substring(0, checkItemPass.length - 1);
@@ -261,25 +269,9 @@ var _default = {
         checkItemPass: checkItemPass,
         checkItemNopass: checkItemNopass
       })).then(function () {
-        _this2.dialogVisible = false;
-        _this2.$emit('success');
-        if (checkResult === 1) {
-          uni.setStorageSync('submit-data', _objectSpread(_objectSpread({}, viewData), {}, {
-            'handleAccountId': _this2.userData.userId,
-            'handleAccountName': _this2.userData.userName,
-            'handlePositionId': _this2.userData.positionId,
-            'handlePositionName': _this2.userData.positionName,
-            'handleGroupId': _this2.userData.groupId,
-            'handleGroupName': _this2.userData.groupName,
-            'status': 1,
-            checkResult: checkResult,
-            checkItemPass: checkItemPass,
-            checkItemNopass: checkItemNopass
-          }));
-          uni.navigateTo({
-            url: '/pages/task/submit/submit'
-          });
-        }
+        uni.switchTab({
+          url: '/pages/index/index'
+        });
       });
     }
   }

unpackage/dist/dev/mp-weixin/pages/task/taskList/taskList.wxml

@@ -1 +1 @@
-<view class="task-page data-v-402433be"><view class="title _div data-v-402433be">{{item.title}}</view><block wx:if="{{$root.g0>0}}"><view class="info _div data-v-402433be"><block wx:for="{{items}}" wx:for-item="item" wx:for-index="__i0__"><view class="item-checklist _div data-v-402433be"><view class="name data-v-402433be">检查防水是否完好检查防水是否完好检查防水是否完好检查防水是否完好检查防水是否完好</view><view class="cont data-v-402433be"><uni-data-checkbox vue-id="{{'773a75f0-1-'+__i0__}}" localdata="{{checkState}}" value="{{item.state}}" data-event-opts="{{[['^change',[['changeCheck',['$0'],[[['items','',__i0__]]]]]],['^input',[['__set_model',['$0','state','$event',[]],[[['items','',__i0__]]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-402433be" bind:__l="__l"></uni-data-checkbox></view></view></block></view></block><block wx:else><view class="empty data-v-402433be">没有可检查项</view></block><block wx:if="{{$root.g1>0}}"><view data-event-opts="{{[['tap',[['onSubmit',['$event']]]]]}}" class="footer data-v-402433be" bindtap="__e">提交</view></block></view>
+<view class="task-page data-v-402433be"><view class="title _div data-v-402433be">{{viewData.taskTitle}}</view><block wx:if="{{$root.g0>0}}"><view class="info _div data-v-402433be"><block wx:for="{{items}}" wx:for-item="item" wx:for-index="__i0__"><view class="item-checklist _div data-v-402433be"><view class="name data-v-402433be">{{item.checklistItemContent}}</view><view class="cont data-v-402433be"><uni-data-checkbox vue-id="{{'773a75f0-1-'+__i0__}}" localdata="{{checkState}}" value="{{item.state}}" data-event-opts="{{[['^change',[['changeCheck',['$0'],[[['items','',__i0__]]]]]],['^input',[['__set_model',['$0','state','$event',[]],[[['items','',__i0__]]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-402433be" bind:__l="__l"></uni-data-checkbox></view></view></block></view></block><block wx:else><view class="empty data-v-402433be">没有可检查项</view></block><block wx:if="{{$root.g1>0}}"><view data-event-opts="{{[['tap',[['onSubmit',['$event']]]]]}}" class="footer data-v-402433be" bindtap="__e">提交</view></block></view>

unpackage/dist/dev/mp-weixin/project.config.json

@@ -15,7 +15,8 @@
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
-    }
+    },
+    "condition": false
   },
   "compileType": "miniprogram",
   "libVersion": "2.31.0",

unpackage/dist/dev/mp-weixin/static/iconfont.css

@@ -1,6 +1,6 @@
 @font-face {
   font-family: "iconfont"; /* Project id  */
-  src: url('@/static/iconfont.ttf') format('truetype');
+  src: url('/static/iconfont.ttf?t=1684737682162') format('truetype');
 }
 
 .iconfont {
@@ -27,3 +27,7 @@
   content: "\e672";
 }
 
+.icon-saoma:before {
+  content: "\e627";
+}
+

unpackage/resources/__UNI__ED9AEA5/www/app-config-service.js

@@ -1,8 +1,8 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/index/index","pages/risk/risk","pages/mine/mine","pages/login/login","pages/mine/password/password","pages/task/task","pages/task/form/form","pages/risk/review/review","pages/risk/review/form/form","pages/risk/check/check","pages/risk/check/form/form","pages/risk/rectify/rectify","pages/risk/rectify/form/form","pages/risk/repeal/repeal","pages/task/taskList/taskList","pages/task/submit/submit"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F3F5FB","backgroundColor":"#F8F8F8","background":"#efeff4"},"tabBar":{"color":"#999999","selectedColor":"#3384ff","borderStyle":"white","backgroundColor":"#ffffff","height":"50px","fontSize":"10px","iconWidth":"24px","spacing":"3px","list":[{"pagePath":"pages/index/index","iconPath":"static/tabBar/Home.png","selectedIconPath":"static/tabBar/HomeEd.png","text":"任务"},{"pagePath":"pages/risk/risk","iconPath":"static/tabBar/risk.png","selectedIconPath":"static/tabBar/riskEd.png","text":"隐患"},{"pagePath":"pages/mine/mine","iconPath":"static/tabBar/mine.png","selectedIconPath":"static/tabBar/mineEd.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"app","compilerVersion":"3.7.11","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
-var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"任务","navigationStyle":"custom"}},{"path":"/pages/risk/risk","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"风险","navigationStyle":"custom"}},{"path":"/pages/mine/mine","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"我的","navigationStyle":"custom"}},{"path":"/pages/login/login","meta":{},"window":{"navigationBarTitleText":"登录"}},{"path":"/pages/mine/password/password","meta":{},"window":{"navigationBarTitleText":"修改密码"}},{"path":"/pages/task/task","meta":{},"window":{"navigationBarTitleText":"预警处置"}},{"path":"/pages/task/form/form","meta":{},"window":{"navigationBarTitleText":"处置"}},{"path":"/pages/risk/review/review","meta":{},"window":{"navigationBarTitleText":"待评审","enablePullDownRefresh":false}},{"path":"/pages/risk/review/form/form","meta":{},"window":{"navigationBarTitleText":"评审","enablePullDownRefresh":false}},{"path":"/pages/risk/check/check","meta":{},"window":{"navigationBarTitleText":"待验收","enablePullDownRefresh":false}},{"path":"/pages/risk/check/form/form","meta":{},"window":{"navigationBarTitleText":"验收","enablePullDownRefresh":false}},{"path":"/pages/risk/rectify/rectify","meta":{},"window":{"navigationBarTitleText":"待整改","enablePullDownRefresh":false}},{"path":"/pages/risk/rectify/form/form","meta":{},"window":{"navigationBarTitleText":"整改","enablePullDownRefresh":false}},{"path":"/pages/risk/repeal/repeal","meta":{},"window":{"navigationBarTitleText":"已撤销","enablePullDownRefresh":false}},{"path":"/pages/task/taskList/taskList","meta":{},"window":{"navigationBarTitleText":"检查任务","enablePullDownRefresh":false}},{"path":"/pages/task/submit/submit","meta":{},"window":{"navigationBarTitleText":"登记隐患","enablePullDownRefresh":false}}];
+var __uniConfig = {"pages":["pages/index/index","pages/risk/risk","pages/mine/mine","pages/login/login","pages/mine/password/password","pages/task/task","pages/task/form/form","pages/risk/review/review","pages/risk/review/form/form","pages/risk/check/check","pages/risk/check/form/form","pages/risk/rectify/rectify","pages/risk/rectify/form/form","pages/risk/repeal/repeal","pages/task/taskList/taskList","pages/task/submit/submit"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F3F5FB","backgroundColor":"#F8F8F8","background":"#efeff4"},"tabBar":{"color":"#999999","selectedColor":"#3384ff","borderStyle":"white","backgroundColor":"#ffffff","height":"50px","fontSize":"10px","iconWidth":"24px","spacing":"3px","list":[{"pagePath":"pages/index/index","iconPath":"static/tabBar/Home.png","selectedIconPath":"static/tabBar/HomeEd.png","text":"任务"},{"pagePath":"pages/risk/risk","iconPath":"static/tabBar/risk.png","selectedIconPath":"static/tabBar/riskEd.png","text":"预警"},{"pagePath":"pages/mine/mine","iconPath":"static/tabBar/mine.png","selectedIconPath":"static/tabBar/mineEd.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"app","compilerVersion":"3.7.11","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"任务","navigationStyle":"custom"}},{"path":"/pages/risk/risk","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"风险","navigationStyle":"custom"}},{"path":"/pages/mine/mine","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"我的","navigationStyle":"custom"}},{"path":"/pages/login/login","meta":{},"window":{"navigationBarTitleText":"登录"}},{"path":"/pages/mine/password/password","meta":{},"window":{"navigationBarTitleText":"修改密码"}},{"path":"/pages/task/task","meta":{},"window":{"navigationBarTitleText":"预警处置"}},{"path":"/pages/task/form/form","meta":{},"window":{"navigationBarTitleText":"处置"}},{"path":"/pages/risk/review/review","meta":{},"window":{"navigationBarTitleText":"待评审","enablePullDownRefresh":false}},{"path":"/pages/risk/review/form/form","meta":{},"window":{"navigationBarTitleText":"评审","enablePullDownRefresh":false}},{"path":"/pages/risk/check/check","meta":{},"window":{"navigationBarTitleText":"待验收","enablePullDownRefresh":false}},{"path":"/pages/risk/check/form/form","meta":{},"window":{"navigationBarTitleText":"验收","enablePullDownRefresh":false}},{"path":"/pages/risk/rectify/rectify","meta":{},"window":{"navigationBarTitleText":"待整改","enablePullDownRefresh":false}},{"path":"/pages/risk/rectify/form/form","meta":{},"window":{"navigationBarTitleText":"整改","enablePullDownRefresh":false}},{"path":"/pages/risk/repeal/repeal","meta":{},"window":{"navigationBarTitleText":"已撤销","enablePullDownRefresh":false}},{"path":"/pages/task/taskList/taskList","meta":{},"window":{"navigationBarTitleText":"检查任务","enablePullDownRefresh":false}},{"path":"/pages/task/submit/submit","meta":{},"window":{"navigationBarTitleText":"登记预警","enablePullDownRefresh":false}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});

unpackage/resources/__UNI__ED9AEA5/www/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__ED9AEA5","name":"app","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F3F5FB"},"usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","allowsInlineMediaPlayback":true,"safearea":{"background":"#ffffff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.7.11","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#999999","selectedColor":"#3384ff","borderStyle":"rgba(255,255,255,0.4)","backgroundColor":"#ffffff","height":"50px","fontSize":"10px","iconWidth":"24px","spacing":"3px","list":[{"pagePath":"pages/index/index","iconPath":"static/tabBar/Home.png","selectedIconPath":"static/tabBar/HomeEd.png","text":"任务"},{"pagePath":"pages/risk/risk","iconPath":"static/tabBar/risk.png","selectedIconPath":"static/tabBar/riskEd.png","text":"隐患"},{"pagePath":"pages/mine/mine","iconPath":"static/tabBar/mine.png","selectedIconPath":"static/tabBar/mineEd.png","text":"我的"}],"child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__ED9AEA5","name":"app","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F3F5FB"},"usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","allowsInlineMediaPlayback":true,"safearea":{"background":"#ffffff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.7.11","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#999999","selectedColor":"#3384ff","borderStyle":"rgba(255,255,255,0.4)","backgroundColor":"#ffffff","height":"50px","fontSize":"10px","iconWidth":"24px","spacing":"3px","list":[{"pagePath":"pages/index/index","iconPath":"static/tabBar/Home.png","selectedIconPath":"static/tabBar/HomeEd.png","text":"任务"},{"pagePath":"pages/risk/risk","iconPath":"static/tabBar/risk.png","selectedIconPath":"static/tabBar/riskEd.png","text":"预警"},{"pagePath":"pages/mine/mine","iconPath":"static/tabBar/mine.png","selectedIconPath":"static/tabBar/mineEd.png","text":"我的"}],"child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}