diff --git a/pages/riskact/check.js b/pages/riskact/check.js
index c6b693a..ea0d618 100644
--- a/pages/riskact/check.js
+++ b/pages/riskact/check.js
@@ -7,6 +7,7 @@ Page({
   data: {
     page: 1,
     riskact: 0,
+    riskacttask:0,
     group: 0
   },
 
@@ -16,6 +17,9 @@ Page({
   onLoad: function (options) {
     console.log(options)
     this.data.riskact = options.riskact
+    if(options.riskacttask){
+      this.riskacttask = options.riskacttask
+    }
     this.getlist()
   },
   getlist: function () {
@@ -99,7 +103,7 @@ Page({
   submit: function () {
     console.log(this.data.alllist)
     let alllist = this.data.alllist
-    let data = {'checks':[],'riskact':this.data.riskact}
+    let data = {'checks':[],'riskact':this.data.riskact, 'riskacttask':this.data.riskacttask}
     for (var i = 0; i < alllist.length; i++) {
       if (i.trouble != undefined){
         data.checks.push({ 'id': alllist[i].id })
diff --git a/pages/risktask/detail.wxml b/pages/risktask/detail.wxml
index 52a4b3f..90e219c 100644
--- a/pages/risktask/detail.wxml
+++ b/pages/risktask/detail.wxml
@@ -1,7 +1,7 @@
-      <view class="head">共{{total}}条风险</view>
+      <view class="head">共排查{{total}}条风险</view>
       <view class="weui-cells weui-cells_after-title">
         <block wx:for="{{alllist}}" wx:key="unique">
-          <view class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
+          <view class="weui-media-box weui-media-box_appmsg" >
             <view class="weui-media-box__bd weui-media-box__bd_in-appmsg" >
               <view class="weui-media-box__title">
               <span wx:if="{{item.risk__level == '低风险'}}" style="background-color:blue;color:white">低风险</span>
@@ -10,11 +10,16 @@
               <span wx:if="{{item.risk__level == '重大风险'}}" style="background-color:red;color:white">重大风险</span>
               {{item.risk__step}}
               </view>
+              
               <view class="weui-media-box__desc">
               <span style="background-color:orange;color:white">标准/危害因素</span>
               {{item.risk__hazard}}
               </view>
               <view class="weui-media-box__desc">
+              <span >排查时间</span>
+              <span style="color:darkblue;font-weight:bold">{{item.riskacttask__taskdo}}</span>
+              </view>
+              <!-- <view class="weui-media-box__desc">
               <span style="background-color:green;color:white">工程技术</span>
                <span wx:if="{{item.risk__measure1!=null}}">{{item.risk__measure1}}</span>
                <span wx:else>无</span>
@@ -38,8 +43,16 @@
               <span style="background-color:green;color:white">应急处理</span>
               <span wx:if="{{item.risk__measure5!=null}}">{{item.risk__measure5}}</span>
                <span wx:else>无</span>
+              </view> -->
+              <view class="weui-media-box__desc" wx:if="{{item.trouble__yhnum != null}}">
+              <span>隐患编号</span>
+              <span style="color:red;font-weight:bold">  {{item.trouble__yhnum}}</span>
               </view>
-              <view class="weui-media-box__desc" style="color:red" wx:if="{{item.trouble__yhnum != null}}">{{item.trouble__yhnum}}</view>
+            </view>
+            <view>
+            
+            <navigator url="/pages/risk/detail?id={{item.risk}}" hover-class="navigator-hover">风险详情</navigator>
+            <navigator url="/pages/trouble/troubledetail?troubleid={{item.trouble}}" hover-class="navigator-hover">隐患详情</navigator>
             </view>
           </view>
         </block>
diff --git a/pages/risktask/index.js b/pages/risktask/index.js
index 60c18ed..9fb9825 100644
--- a/pages/risktask/index.js
+++ b/pages/risktask/index.js
@@ -9,7 +9,7 @@ Page({
     page: 1,
     serverUrl: getApp().globalData.serverUrl,
     alllist: [],
-    tabs: ["历史任务", "我的任务", "全厂待办"],
+    tabs: ["历史任务", "我的待办", "全厂待办"],
     activeIndex: 1,
     sliderOffset: 0,
     sliderLeft: 0
diff --git a/pages/risktask/index.wxml b/pages/risktask/index.wxml
index 0d19291..c8b49bd 100644
--- a/pages/risktask/index.wxml
+++ b/pages/risktask/index.wxml
@@ -19,11 +19,12 @@
                 {{item.riskact__area__name}} {{item.riskact__name}}
               </view>
               <!-- <view class="weui-media-box__desc">
-                <span style="background-color:orange;color:white">排查岗位</span>
+                <span style="background-color:orange;color:white">所属岗位</span>
                 {{item.riskact__group__groupname}}
               </view> -->
               <view class="weui-media-box__desc">任务生成时间:{{item.taskadd}}</view>
-              <view class="weui-media-box__desc">任务过期时间:{{item.taskexpire}}</view>
+              <view class="weui-media-box__desc" wx:if="{{item.taskexpire}}">任务过期时间:{{item.taskexpire}}</view>
+              <view class="weui-media-box__desc" wx:if="{{item.user__name}}">执行人:{{item.user__name}}</view>
             </view>
             <view class="weui-panel__ft weui-cell__ft_in-access">
               <view class="weui-media-box__title" wx:if="{{item.riskact__level == '低风险'}}" style="background-color:blue;color:white">低风险</view>
@@ -32,7 +33,7 @@
               <view class="weui-media-box__title" wx:if="{{item.riskact__level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
               <view wx:if="{{item.taskdo!=null}}" class="weui-media-box__title" style="background-color:green;color:white">已执行</view>
               <view wx:if="{{item.usable==2}}" class="weui-media-box__title" style="background-color:green;color:white">作废</view>
-              <view wx:if="{{item.taskdo==null}}" class="weui-media-box__title" style="background-color:red;color:white">未执行</view>
+              <view wx:if="{{item.usable==0 && item.taskdo==null}}" class="weui-media-box__title" style="background-color:red;color:white">已过期</view>
             </view>
           </navigator>
         </block>
@@ -42,18 +43,19 @@
       <view class="head">共{{todototal}}条任务</view>
       <view class="weui-cells weui-cells_after-title">
         <block wx:for="{{todolist}}" wx:key="unique">
-          <navigator url="../riskact/check?riskact={{item.riskact__id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
+          <navigator url="../riskact/check?riskact={{item.riskact__id}}&riskacttask={{item.id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
             <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
               <view class="weui-media-box__title">
                 <span style="background-color:green;color:white">风险点</span>
                 {{item.riskact__area__name}} {{item.riskact__name}}
               </view>
               <view class="weui-media-box__desc">
-                <span style="background-color:orange;color:white">排查岗位</span>
+                <span style="background-color:orange;color:white">所属岗位</span>
                 {{item.riskact__group__groupname}}
               </view>
               <view class="weui-media-box__desc">任务生成时间:{{item.taskadd}}</view>
-              <view class="weui-media-box__desc">任务过期时间:{{item.taskexpire}}</view>
+              <view class="weui-media-box__desc" wx:if="{{item.taskexpire}}">任务过期时间:{{item.taskexpire}}</view>
+              <view class="weui-media-box__desc" wx:if="{{item.user__name}}">执行人:{{item.user__name}}</view>
             </view>
             <view class="weui-panel__ft weui-cell__ft_in-access">
               <view class="weui-media-box__title" wx:if="{{item.riskact__level == '低风险'}}" style="background-color:blue;color:white">低风险</view>
@@ -77,11 +79,12 @@
                 {{item.riskact__area__name}} {{item.riskact__name}}
               </view>
               <!-- <view class="weui-media-box__desc">
-                <span style="background-color:orange;color:white">排查岗位</span>
+                <span style="background-color:orange;color:white">所属岗位</span>
                 {{item.group__groupname}}
               </view> -->
               <view class="weui-media-box__desc">任务生成时间:{{item.taskadd}}</view>
-              <view class="weui-media-box__desc">任务过期时间:{{item.taskexpire}}</view>
+              <view class="weui-media-box__desc" wx:if="{{item.taskexpire}}">任务过期时间:{{item.taskexpire}}</view>
+              <view class="weui-media-box__desc" wx:if="{{item.user__name}}">执行人:{{item.user__name}}</view>
             </view>
             <view class="weui-panel__ft ">
               <view class="weui-media-box__title" wx:if="{{item.riskact__level == '低风险'}}" style="background-color:blue;color:white">低风险</view>
diff --git a/project.config.json b/project.config.json
index f9b849e..87653be 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,59 +1,59 @@
 {
-  "description": "项目配置文件。",
-  "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "enhance": false,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": true,
-    "coverView": true,
-    "nodeModules": true,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": false,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "useIsolateContext": true,
-    "useCompilerModule": true,
-    "userConfirmedUseCompilerModuleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": []
-  },
-  "compileType": "miniprogram",
-  "libVersion": "2.9.4",
-  "appid": "wx5c39b569f01c27db",
-  "projectname": "aqyj",
-  "isGameTourist": false,
-  "simulatorType": "wechat",
-  "simulatorPluginLibVersion": {},
-  "condition": {
-    "search": {
-      "current": -1,
-      "list": []
-    },
-    "conversation": {
-      "current": -1,
-      "list": []
-    },
-    "game": {
-      "currentL": -1,
-      "list": []
-    },
-    "miniprogram": {
-      "current": -1,
-      "list": []
-    }
-  }
+	"description": "项目配置文件。",
+	"setting": {
+		"urlCheck": false,
+		"es6": true,
+		"postcss": true,
+		"minified": true,
+		"newFeature": true,
+		"coverView": true,
+		"nodeModules": true,
+		"autoAudits": false,
+		"showShadowRootInWxmlPanel": true,
+		"scopeDataCheck": false,
+		"checkInvalidKey": true,
+		"checkSiteMap": true,
+		"uploadWithSourceMap": true,
+		"babelSetting": {
+			"ignore": [],
+			"disablePlugins": [],
+			"outputPath": ""
+		},
+		"useCompilerModule": false,
+		"userConfirmedUseCompilerModuleSwitch": false,
+		"enhance": false,
+		"preloadBackgroundData": false,
+		"uglifyFileName": false,
+		"compileHotReLoad": false,
+		"useMultiFrameRuntime": true,
+		"useApiHook": false,
+		"useIsolateContext": true,
+		"packNpmManually": false,
+		"packNpmRelationList": []
+	},
+	"compileType": "miniprogram",
+	"libVersion": "2.9.4",
+	"appid": "wx5c39b569f01c27db",
+	"projectname": "aqyj",
+	"isGameTourist": false,
+	"simulatorType": "wechat",
+	"simulatorPluginLibVersion": {},
+	"condition": {
+		"search": {
+			"current": -1,
+			"list": []
+		},
+		"conversation": {
+			"current": -1,
+			"list": []
+		},
+		"game": {
+			"currentL": -1,
+			"list": []
+		},
+		"miniprogram": {
+			"current": -1,
+			"list": []
+		}
+	}
 }
\ No newline at end of file