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

manifest.json

@@ -55,7 +55,8 @@
                 "ad" : {}
             },
             "splashscreen" : {
-                "useOriginalMsgbox" : true
+                "useOriginalMsgbox" : true,
+                "androidStyle" : "default"
             },
             "icons" : {
                 "android" : {

pages.json

@@ -127,6 +127,15 @@
 		    }
 		    
 		}
+        ,{
+            "path" : "pages/risk/histroy/histroy",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "预警详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"tabBar": {
 		"color": "#999999",

pages/index/index.vue

@@ -8,15 +8,15 @@
 		<div class="statistics">
 			<div class="head">任务统计</div>
 			<div class="container">
-				<div class="item" @click="changeStuas(0,'待巡检')">
+				<div :class="conditions.status===0?'item active':'item'" @click="changeStuas(0,'待巡检')">
 					<image class="icon" src="@/static/index/wait.png" alt=""></image>
 					<text>待巡检{{statistics.wait}}个</text>
 				</div>
-				<div class="item" @click="changeStuas(2,'已逾期')">
+				<div :class="conditions.status===2?'item active':'item'" @click="changeStuas(2,'已逾期')">
 					<image class="icon" src="@/static/index/expire.png" alt=""></image>
 					<text>已逾期{{statistics.expire}}个</text>
 				</div>
-				<div class="item" @click="changeStuas(1,'已完成')">
+				<div :class="conditions.status===1?'item active':'item'" @click="changeStuas(1,'已完成')">
 					<image class="icon" src="@/static/index/complete.png" alt=""></image>
 					<text>已完成{{statistics.complete}}个</text>
 				</div>
@@ -180,7 +180,7 @@
 			&{
 				border-radius: 24upx;
 				background-color: #fff;
-				padding:36upx 0 44upx 24upx;
+				padding:36upx 0 0 24upx;
 				margin-top: 48upx;
 			}
 			.head{
@@ -193,12 +193,22 @@
 				display: flex;
 				justify-content: center;
 				align-items: center;
+					padding: 20rpx 20rpx 0 20rpx;
+					font-size: 14px;
+					line-height: 24px;
 				.item{
 					width: 33.33%;
 					display: flex;
 					justify-content: center;
 					align-items: center;
 					flex-direction: column;
+					padding-bottom: 40rpx;
+					&.active{
+						background-image: url('/static/icon/selectEd.png');
+						background-size: 32rpx 20rpx;
+						background-repeat: no-repeat;
+						background-position: center bottom;
+					}
 					.icon{
 						display: block;
 						width:88upx;
@@ -250,11 +260,6 @@
 			}
 		}
 	}
-	.container {
-		padding: 20px;
-		font-size: 14px;
-		line-height: 24px;
-	}
 	.empty{
 		text-align: center;
 		font-size: 28rpx;

pages/risk/check/form/form.vue

@@ -7,8 +7,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="hdangerDesc" required>
-				<uni-easyinput type="textarea" autoHeight v-model="formData.hdangerDesc" placeholder="请输入描述"></uni-easyinput>
+			<uni-forms-item label="处理说明" name="acceptRemark" required>
+				<uni-easyinput type="textarea" autoHeight v-model="formData.acceptRemark" placeholder="请输入描述"></uni-easyinput>
 			</uni-forms-item>
 			<uni-forms-item label="附件">
 				<div class="upload-container">
@@ -39,6 +39,7 @@
 					'dangerCatId': undefined, // 隐患类别ID
 					'hdangerLevel': 1, // 隐患等级
 					'hdangerDesc': '', // 描述
+					'acceptRemark':"",
 					'submitTime': parseTime(new Date()),
 					'dangerDeadline': '', // 截止时间
 					'goafId': undefined,
@@ -89,8 +90,7 @@
 				if(data){
 					this.formData.checklistId = data.checklistId
 					this.formData.goafId = data.goafId
-					this.formData.hdangerDesc = data.checkItemNopass
-					this.formData.hdangerTitle = data.checkItemNopass		
+					this.formData.hdangerDesc = data.checkItemNopass	
 				}
 			},
 			 onSubmit(){

pages/risk/histroy/histroy.vue

@@ -0,0 +1,110 @@
+<template>
+	<view class="reviewHistory">
+		<template v-if="items.length>0">
+			<uni-section title="历史记录" type="line" v-for="(item,index) in items" :key="index">
+				<uni-group :title="item.activityInsTitle" mode="card">
+					<uni-list >
+						<uni-list-item  title="处理时间" :right-text="item.actionTime"></uni-list-item>
+						<uni-list-item  title="人员" :right-text="item.accountName"></uni-list-item>
+						<uni-list-item  title="处理关卡" :right-text="item.activityInsTitle"></uni-list-item>
+						<uni-list-item  title="处理动作" :right-text="item.actionTitle"></uni-list-item>
+						<uni-list-item  title="处理说明" :note="item.actionRemark"></uni-list-item>
+						<uni-list-item  title="附件">
+							<template v-slot:header>
+								<view style="padding-right: 16rpx;">附件</view>
+							</template>
+							<view slot="body">
+								<template v-if="item.attachList.length>0">
+									<view class="attachList-box">
+										<image v-for="(attach,index) in item.attachList"
+										class="attach" 
+										:key="index"
+										:src="attach.fileUrl" 
+										@click="preview(item.attachList)"
+										mode="widthFix" ></image>									
+									</view>
+								</template>
+								<template v-else>
+									<view style="font-size: 28rpx;color: #666;">没有附件</view>
+								</template>								
+							</view>
+						</uni-list-item>
+					</uni-list>
+				</uni-group>
+			</uni-section>
+		</template>
+		<template v-else>
+			<view class="empty">
+				<image class="icon-empty" src="/static/icon/empty.png" mode="widthFix"></image>
+				<p>暂无历史信息</p>					
+			</view>
+		</template>		
+	</view>
+
+
+</template>
+
+<script>
+	import { getWorkflowById } from '@/api/system/wfApi'
+	export default{
+		name:"RiskHistory",
+		data(){
+			return{
+				items:[]
+			}
+		},
+		onLoad({hdangerId}) {
+			if(hdangerId){
+				this.getWorkflow(hdangerId)
+			}
+		},
+		methods:{
+			preview(attachList=[]){
+				let urls=attachList.map(item=>item.fileUrl)
+				uni.previewImage({
+					urls
+				})
+			},
+			getWorkflow(hdangerId){
+				getWorkflowById(hdangerId).then((resp) => {
+					const { code, data, msg } = resp
+					this.items=data.activityInsRecordList
+				})				
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.reviewHistory{
+		.empty{
+			.icon-empty{
+				display: block;
+				width: 160rpx;
+				margin: 364rpx auto 0;
+			}	
+			p{
+				font-size: 28rpx;
+				line-height: 1.8;
+				color: #666;
+				text-align: center;
+			}			
+		}
+		::v-deep.attachList-box{
+			display: flex;
+			flex-wrap: wrap;
+			.attach{
+				display: block;
+				width: 120rpx;
+				border: 1rpx solid #eaeaea;
+				padding: 10rpx;
+				box-sizing: border-box;	
+				margin: 8rpx;
+				&:nth-child(4n){
+					margin-left: 0;
+				}
+			}
+		}
+	}
+</style>

pages/risk/rectify/form/form.vue

@@ -13,9 +13,11 @@
 			<uni-forms-item label="验收人" name="acceptAccountId" required>
 				<view style="padding-bottom: 16rpx;">
 					<uni-data-picker :map='groupMap'
+					v-model="groupId"
 					placeholder="请选择组织"
 					 popup-title="请选择组织" 
 					:localdata="groupList"
+					@nodeclick="onnodeclick"
 					@change="onchangeGroup">  
 					</uni-data-picker> 					
 				</view> 
@@ -64,6 +66,7 @@
 				flowData:{
 				},
 				groupList:[],
+				groupId:"",
 				groupMap:{text:"groupName",value:"groupId"},
 				actionList:[],
 				userList:[]
@@ -110,8 +113,7 @@
 				if(data){
 					this.formData.checklistId = data.checklistId
 					this.formData.goafId = data.goafId
-					this.formData.acceptRemark = data.checkItemNopass
-					this.formData.hdangerTitle = data.checkItemNopass		
+					this.formData.hdangerDesc = data.checkItemNopass	
 				}
 			},
 			async onSubmit(){
@@ -175,6 +177,11 @@
 				this.formData.acceptAccountId=""
 				this.getUser(groupId)
 			},
+			onnodeclick(node){
+				this.formData.rectifyAccountId=""
+				this.groupId=node.groupId
+				this.getUser(node.groupId)
+			},
 			getGroup(){
 				getGroupByList().then((res)=>{
 					let items=packageTreeData({

pages/risk/review/form/form.vue

@@ -21,10 +21,13 @@
 			</uni-forms-item>
 			<uni-forms-item label="整改人" name="rectifyAccountId" required>
 				<view style="padding-bottom: 16rpx;">
-					<uni-data-picker :map='groupMap'
+					<uni-data-picker 
+					v-model="groupId"
+					:map='groupMap'
 					placeholder="请选择组织"
 					 popup-title="请选择组织" 
 					:localdata="groupList"
+					@nodeclick="onnodeclick"
 					@change="onchangeGroup">  
 					</uni-data-picker> 					
 				</view> 
@@ -79,6 +82,7 @@
 					{"value": 2,"text": "较大"},
 					{"value": 3,"text": "重大"},
 				],
+				groupId:"",
 				groupList:[],
 				groupMap:{text:"groupName",value:"groupId"},
 				actionList:[],
@@ -139,8 +143,7 @@
 				if(data){
 					this.formData.checklistId = data.checklistId
 					this.formData.goafId = data.goafId
-					this.formData.reviewRemark = data.checkItemNopass
-					this.formData.hdangerTitle = data.checkItemNopass		
+					this.formData.hdangerDesc = data.checkItemNopass		
 				}
 			},
 			async onSubmit(){
@@ -199,6 +202,11 @@
 				this.formData.rectifyAccountId=""				
 				this.getUser(groupId)
 			},
+			onnodeclick(node){				
+				this.formData.rectifyAccountId=""
+				this.groupId=node.groupId
+				this.getUser(node.groupId)
+			},
 			getGroup(){
 				getGroupByList().then((res)=>{
 					let items=packageTreeData({

pages/risk/risk.vue

@@ -8,23 +8,23 @@
 		<div class="statistics">
 			<div class="head">预警统计</div>
 			<div class="container">
-				<div class="item" @click="changeStuas(1,'待评审')">
+				<div :class="conditions.status===1?'item active':'item'" @click="changeStuas(1,'待评审')">
 					<image class="icon" src="/static/index/wait.png" alt=""></image>
 					<text>待评审{{statistics.review}}个</text>
 				</div>
-				<div class="item" @click="changeStuas(2,'待整改')">
+				<div :class="conditions.status===2?'item active':'item'" @click="changeStuas(2,'待整改')">
 					<image class="icon" src="/static/index/expire.png" alt=""></image>
 					<text>待整改{{statistics.rectify}}个</text>
 				</div>
-				<div class="item" @click="changeStuas(3,'待验收')">
+				<div :class="conditions.status===3?'item active':'item'" @click="changeStuas(3,'待验收')">
 					<image class="icon" src="/static/index/complete.png" alt=""></image>
 					<text>待验收{{statistics.accept}}个</text>
 				</div>
-				<div class="item" @click="changeStuas(4,'已完成')">
+				<div :class="conditions.status===4?'item active':'item'" @click="changeStuas(4,'已完成')">
 					<image class="icon" src="/static/index/complete.png" alt=""></image>
 					<text>已完成{{statistics.complete}}个</text>
 				</div>
-				<div class="item" @click="changeStuas(-1,'已撤销')">
+				<div :class="conditions.status===-1?'item active':'item'" @click="changeStuas(-1,'已撤销')">
 					<image class="icon" src="/static/index/revocation.png" alt=""></image>
 					<text>已撤销{{statistics.revocation}}个</text>
 				</div>
@@ -41,7 +41,7 @@
 							<div class="time">{{item.submitTime}}</div>
 							<div class="user">{{item.curAccountName}}</div>						
 						</view>
-						<div class="status" v-if="item.status===4">完成</div>
+						<div class="status" v-if="item.status===4||type==='group'">详情</div>
 						<div class="status" v-else>{{item.curActivityTitle}}</div>
 					</view>
 				</div>
@@ -144,7 +144,12 @@
 				this.getData()
 			},
 			linkTo(item){
-				if(this.type==='group') return
+				if(item.status===4||this.type==='group'){
+					uni.navigateTo({
+						url:`/pages/risk/histroy/histroy?hdangerId=${item.hdangerId}`
+					})
+					return
+				}
 				let url="";
 				switch(item.curActivityCode){
 					case "review" ://评审
@@ -201,13 +206,23 @@
 				display: flex;
 				align-items: center;
 				flex-wrap: wrap;
+				padding: 20rpx 20rpx 0 20rpx;
+				font-size: 14px;
+				line-height: 24px;
 				.item{
 					width: 33.33%;
 					display: flex;
 					justify-content: center;
 					align-items: center;
 					flex-direction: column;
-					margin-bottom: 40upx;
+					padding-bottom: 20rpx;
+					margin-bottom: 20rpx;
+					&.active{
+						background-image: url('/static/icon/selectEd.png');
+						background-size: 32rpx 20rpx;
+						background-repeat: no-repeat;
+						background-position: center bottom;
+					}
 					.icon{
 						display: block;
 						width:88upx;
@@ -282,11 +297,6 @@
 			}
 		}
 	}
-	.container {
-		padding: 20px;
-		font-size: 14px;
-		line-height: 24px;
-	}
 	.empty{
 		text-align: center;
 		font-size: 28rpx;

pages/task/submit/submit.vue

@@ -10,7 +10,7 @@
 					:localdata="goafList"
 				></uni-data-select>
 			</uni-forms-item>
-			<uni-forms-item label="预警类型" name="hdangerType" required>
+			<uni-forms-item label="预警类型" name="hdangerType" required v-if="false">
 				<uni-data-select :clear="false"
 					v-model="formData.hdangerType"
 					:localdata="hdangerTypes"
@@ -25,9 +25,10 @@
 			<uni-forms-item label="评审人" name="reviewAccountId" required>
 				<view style="padding-bottom: 16rpx;">
 					<uni-data-picker :map='groupMap'
+					v-model="groupId"
 					placeholder="请选择组织"
 					 popup-title="请选择组织" 
-					:localdata="groupList"
+					:localdata="groupList"					
 					@change="onchangeGroup">  
 					</uni-data-picker> 					
 				</view> 
@@ -101,6 +102,7 @@
 				userList:[],
 				checkList:[],
 				goafList:[],
+				groupId:'',
 				hdangerTypes:[
 					{"value": 0,"text": "人员巡检"	},
 					{"value": 1,"text": "传感器巡检"},					
@@ -194,6 +196,11 @@
 					this.groupList=items
 				})
 			},
+			onnodeclick(node){
+				this.formData.rectifyAccountId=""
+				this.groupId=node.groupId
+				this.getUser(node.groupId)
+			},
 			getUser(groupId){
 				getUserByPage({
 					page: 1,

pages/task/task.vue

@@ -97,20 +97,23 @@
 			onScanCode(){
 				let data=uni.getStorageSync('task-item')
 				let checklistId=data.checklistId
+				let goafId=data.goafId;
 				uni.scanCode({
 					success: function (res) {
 						scanCode(res.result).then((res)=>{
-							console.log(res)
-							if(checklistId!==res.data.goafChecklistId){
+							goafId
+							let qrcode_goafId=res.data.goafId;
+							let qrcode_ChecklistId=res.data.goafChecklistId;
+							if(checklistId===qrcode_ChecklistId&&goafId===qrcode_goafId){
+								uni.navigateTo({
+									url:'/pages/task/taskList/taskList'
+								})
+							}else{
 								uni.showToast({
 									icon:'none',
 									title:"任务跟二维码不否"
-								})	
-								return
-							}
-							uni.navigateTo({
-								url:'/pages/task/taskList/taskList'
-							})							
+								})
+							}							
 						})
 					},
 					fail(){

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

@@ -15,7 +15,8 @@
     "pages/risk/rectify/form/form",
     "pages/risk/repeal/repeal",
     "pages/task/taskList/taskList",
-    "pages/task/submit/submit"
+    "pages/task/submit/submit",
+    "pages/risk/histroy/histroy"
   ],
   "subPackages": [],
   "window": {

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

@@ -27,7 +27,7 @@
 .page-index .statistics.data-v-57280228 {
   border-radius: 24rpx;
   background-color: #fff;
-  padding: 36rpx 0 44rpx 24rpx;
+  padding: 36rpx 0 0 24rpx;
   margin-top: 48rpx;
 }
 .page-index .statistics .head.data-v-57280228 {
@@ -40,6 +40,9 @@
   display: flex;
   justify-content: center;
   align-items: center;
+  padding: 20rpx 20rpx 0 20rpx;
+  font-size: 14px;
+  line-height: 24px;
 }
 .page-index .statistics .container .item.data-v-57280228 {
   width: 33.33%;
@@ -47,6 +50,13 @@
   justify-content: center;
   align-items: center;
   flex-direction: column;
+  padding-bottom: 40rpx;
+}
+.page-index .statistics .container .item.active.data-v-57280228 {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAKCAYAAAC9vt6cAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAACbSURBVHgBnZDRDcIwDETPhT3IBnQMBIVViNo5gDIJ/eggsBCH0w+w2pBUPSlSdHbO8QMSOjU8V3pSPfKvUNXciuAZ7iTK/iqvWF8RM3eeTpM7M6XbN9zMDliv8NBXzvzTFSYwGXCsedOJ5dgP3kFrEf+nAI1Ai4S07vuL3CcBFlpOFuqwwhhaThbqEDCBlk/4QpUATQ2PBXoT7QeJDzEsimIlpQAAAABJRU5ErkJggg==);
+  background-size: 32rpx 20rpx;
+  background-repeat: no-repeat;
+  background-position: center bottom;
 }
 .page-index .statistics .container .item .icon.data-v-57280228 {
   display: block;
@@ -95,11 +105,6 @@
   color: #999;
   font-size: 24rpx;
 }
-.container.data-v-57280228 {
-  padding: 20px;
-  font-size: 14px;
-  line-height: 24px;
-}
 .empty.data-v-57280228 {
   text-align: center;
   font-size: 28rpx;

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

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 178))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 187))
     },
     uniFormsItem: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms-item/uni-forms-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 191))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 200))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 198))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 207))
     },
   }
 } catch (e) {

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

@@ -94,7 +94,7 @@
   line-height: 88rpx;
   text-align: center;
   color: #fff;
-  background: #8DA6FF;
+  background: #3d62ea;
   border-radius: 4px;
   text-align: center;
   position: absolute;

unpackage/dist/dev/mp-weixin/pages/mine/password/password.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uniForms: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 178))
+      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms/uni-forms */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms/uni-forms")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms/uni-forms.vue */ 187))
     },
     uniFormsItem: function () {
-      return Promise.all(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-forms/components/uni-forms-item/uni-forms-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 191))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-forms/components/uni-forms-item/uni-forms-item */ "uni_modules/uni-forms/components/uni-forms-item/uni-forms-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue */ 200))
     },
     uniEasyinput: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 198))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 207))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/risk/check/history/index.json

@@ -1,9 +1,9 @@
 {
+  "component": true,
   "usingComponents": {
     "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
     "uni-group": "/uni_modules/uni-group/components/uni-group/uni-group",
     "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
     "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/pages/risk/check/history/index.wxss

@@ -12,11 +12,19 @@
   color: #666;
   text-align: center;
 }
-.reviewHistory.data-v-1bbf1b09 .attach {
+.reviewHistory.data-v-1bbf1b09 .attachList-box {
+  display: flex;
+  flex-wrap: wrap;
+}
+.reviewHistory.data-v-1bbf1b09 .attachList-box .attach {
   display: block;
   width: 120rpx;
   border: 1rpx solid #eaeaea;
   padding: 10rpx;
   box-sizing: border-box;
+  margin: 8rpx;
+}
+.reviewHistory.data-v-1bbf1b09 .attachList-box .attach:nth-child(4n) {
+  margin-left: 0;
 }
 

unpackage/dist/dev/mp-weixin/pages/risk/histroy/histroy.json

@@ -0,0 +1,10 @@
+{
+  "navigationBarTitleText": "预警详情",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
+    "uni-group": "/uni_modules/uni-group/components/uni-group/uni-group",
+    "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
+    "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item"
+  }
+}

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

@@ -0,0 +1,30 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.reviewHistory .empty .icon-empty.data-v-b5d417c4 {
+  display: block;
+  width: 160rpx;
+  margin: 364rpx auto 0;
+}
+.reviewHistory .empty ._p.data-v-b5d417c4 {
+  font-size: 28rpx;
+  line-height: 1.8;
+  color: #666;
+  text-align: center;
+}
+.reviewHistory.data-v-b5d417c4 .attachList-box {
+  display: flex;
+  flex-wrap: wrap;
+}
+.reviewHistory.data-v-b5d417c4 .attachList-box .attach {
+  display: block;
+  width: 120rpx;
+  border: 1rpx solid #eaeaea;
+  padding: 10rpx;
+  box-sizing: border-box;
+  margin: 8rpx;
+}
+.reviewHistory.data-v-b5d417c4 .attachList-box .attach:nth-child(4n) {
+  margin-left: 0;
+}
+

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

@@ -6,6 +6,7 @@
     "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
     "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
     "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
+    "uni-data-picker": "/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker",
     "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select"
   }
 }

unpackage/dist/dev/mp-weixin/pages/risk/rectify/history/index.json

@@ -1,9 +1,9 @@
 {
+  "component": true,
   "usingComponents": {
     "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
     "uni-group": "/uni_modules/uni-group/components/uni-group/uni-group",
     "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
     "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/pages/risk/rectify/history/index.wxss

@@ -12,11 +12,19 @@
   color: #666;
   text-align: center;
 }
-.reviewHistory.data-v-76575f4e .attach {
+.reviewHistory.data-v-76575f4e .attachList-box {
+  display: flex;
+  flex-wrap: wrap;
+}
+.reviewHistory.data-v-76575f4e .attachList-box .attach {
   display: block;
   width: 120rpx;
   border: 1rpx solid #eaeaea;
   padding: 10rpx;
   box-sizing: border-box;
+  margin: 8rpx;
+}
+.reviewHistory.data-v-76575f4e .attachList-box .attach:nth-child(4n) {
+  margin-left: 0;
 }
 

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

@@ -7,6 +7,7 @@
     "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
     "uni-data-checkbox": "/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox",
     "uni-datetime-picker": "/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker",
+    "uni-data-picker": "/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker",
     "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select"
   }
 }

unpackage/dist/dev/mp-weixin/pages/risk/review/history/index.json

@@ -1,9 +1,9 @@
 {
+  "component": true,
   "usingComponents": {
     "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
     "uni-group": "/uni_modules/uni-group/components/uni-group/uni-group",
     "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
     "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item"
-  },
-  "component": true
+  }
 }

unpackage/dist/dev/mp-weixin/pages/risk/review/history/index.wxss

@@ -12,11 +12,19 @@
   color: #666;
   text-align: center;
 }
-.reviewHistory.data-v-cdee2b92 .attach {
+.reviewHistory.data-v-cdee2b92 .attachList-box {
+  display: flex;
+  flex-wrap: wrap;
+}
+.reviewHistory.data-v-cdee2b92 .attachList-box .attach {
   display: block;
   width: 120rpx;
   border: 1rpx solid #eaeaea;
   padding: 10rpx;
   box-sizing: border-box;
+  margin: 8rpx;
+}
+.reviewHistory.data-v-cdee2b92 .attachList-box .attach:nth-child(4n) {
+  margin-left: 0;
 }
 

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

@@ -320,7 +320,12 @@ var _default = {
       this.getData();
     },
     linkTo: function linkTo(item) {
-      if (this.type === 'group') return;
+      if (item.status === 4 || this.type === 'group') {
+        uni.navigateTo({
+          url: "/pages/risk/histroy/histroy?hdangerId=".concat(item.hdangerId)
+        });
+        return;
+      }
       var url = "";
       switch (item.curActivityCode) {
         case "review":

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

@@ -30,6 +30,9 @@
   display: flex;
   align-items: center;
   flex-wrap: wrap;
+  padding: 20rpx 20rpx 0 20rpx;
+  font-size: 14px;
+  line-height: 24px;
 }
 .page-index .statistics .container .item.data-v-26b92334 {
   width: 33.33%;
@@ -37,7 +40,14 @@
   justify-content: center;
   align-items: center;
   flex-direction: column;
-  margin-bottom: 40rpx;
+  padding-bottom: 20rpx;
+  margin-bottom: 20rpx;
+}
+.page-index .statistics .container .item.active.data-v-26b92334 {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAKCAYAAAC9vt6cAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAACbSURBVHgBnZDRDcIwDETPhT3IBnQMBIVViNo5gDIJ/eggsBCH0w+w2pBUPSlSdHbO8QMSOjU8V3pSPfKvUNXciuAZ7iTK/iqvWF8RM3eeTpM7M6XbN9zMDliv8NBXzvzTFSYwGXCsedOJ5dgP3kFrEf+nAI1Ai4S07vuL3CcBFlpOFuqwwhhaThbqEDCBlk/4QpUATQ2PBXoT7QeJDzEsimIlpQAAAABJRU5ErkJggg==);
+  background-size: 32rpx 20rpx;
+  background-repeat: no-repeat;
+  background-position: center bottom;
 }
 .page-index .statistics .container .item .icon.data-v-26b92334 {
   display: block;
@@ -109,11 +119,6 @@
 .page-index .task-list .item .footer .status.data-v-26b92334 {
   color: #4D73FF;
 }
-.container.data-v-26b92334 {
-  padding: 20px;
-  font-size: 14px;
-  line-height: 24px;
-}
 .empty.data-v-26b92334 {
   text-align: center;
   font-size: 28rpx;

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

@@ -4,6 +4,7 @@
     "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
     "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
     "uni-data-select": "/uni_modules/uni-data-select/components/uni-data-select/uni-data-select",
+    "uni-data-picker": "/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker",
     "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput"
   }
 }