diff --git a/app.js b/app.js
index 2036e08..a75ea24 100644
--- a/app.js
+++ b/app.js
@@ -74,8 +74,8 @@ App({
   },
   globalData: {
     userInfo: null,
-    serverUrl: 'https://safeyun.ctcshe.com/',
-    //serverUrl: 'http://127.0.0.1:8000/',
+    //serverUrl: 'https://safeyun.ctcshe.com/',
+    serverUrl: 'http://127.0.0.1:8000/',
     //serverUrl: 'http://192.168.0.102:8000/',
     //serverUrl:'http://10.7.100.250:8000/',
     isaqy: 0,
diff --git a/app.json b/app.json
index 4a6506b..9de8a63 100644
--- a/app.json
+++ b/app.json
@@ -61,7 +61,9 @@
     "pages/inspect/detail",
     "pages/equipment/detail",
     "pages/risk/myindex",
-    "pages/risk/detail"
+    "pages/risk/detail",
+    "pages/risktask/index",
+    "pages/risktask/check"
   ],
   "window": {
     "backgroundTextStyle": "light",
diff --git a/pages/images/task.png b/pages/images/task.png
new file mode 100644
index 0000000..285dcc6
Binary files /dev/null and b/pages/images/task.png differ
diff --git a/pages/main/main.wxml b/pages/main/main.wxml
index 7dd753e..0090b14 100644
--- a/pages/main/main.wxml
+++ b/pages/main/main.wxml
@@ -2,6 +2,11 @@
   <view class="page__bd">
     <view class="weui-cells__title">数据采集</view>
     <view class="weui-grids">
+      <navigator url="/pages/risktask/index" class="weui-grid" hover-class="weui-grid_active">
+        <image class="weui-grid__icon" src="../images/task.png" />
+        <view class="weui-grid__label">排查任务</view>
+        <!-- <view class="weui-badge" style="position: absolute;top: 1em;right: 1em;" wx:if="{{yhtodonum!=0}}">{{yhtodonum}}</view> -->
+      </navigator>
       <navigator url="/pages/trouble/trouble" class="weui-grid" hover-class="weui-grid_active">
         <image class="weui-grid__icon" src="../images/trouble.png" />
         <view class="weui-grid__label">事故隐患</view>
diff --git a/pages/risktask/check.js b/pages/risktask/check.js
new file mode 100644
index 0000000..886af98
--- /dev/null
+++ b/pages/risktask/check.js
@@ -0,0 +1,112 @@
+// pages/risktask/check.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    page:1,
+    riskact:0,
+    group:0
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    console.log(options)
+    this.data.riskact = options.riskact
+    this.data.group = options.group
+    this.getlist()
+  },
+  getlist:function(){
+    var page = this.data.page
+    wx.request({
+      url: getApp().globalData.serverUrl + 'api/risktask?a=listtask&rows=10&page=' + page + '&group=' + this.data.group + '&riskact=' + this.data.riskact,
+      header: {
+        'content-type': 'application/json', // 默认值
+        'Cookie': wx.getStorageSync("sessionid"),
+      },
+      success: res => {
+        if (res.statusCode === 200) {
+          console.log(res.data)
+          if (res.data.rows.length == 0) {
+            if (page == 1) {
+              this.setData({
+                total: 0,
+                alllist: []
+              })
+            }
+            else {
+              wx.showModal({
+                content: "已经到底啦!",
+                showCancel: false,
+                confirmText: "确定",
+              })
+            }
+          } else {
+            let list
+            if (page == 1) {
+              list = res.data.rows
+            } else {
+              list = this.data.alllist.concat(res.data.rows)
+            }
+            this.setData({
+              total: res.data.total,
+              alllist: list
+            })
+          }
+        }
+        wx.hideLoading();
+      }
+    });
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/risktask/check.json b/pages/risktask/check.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/risktask/check.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/risktask/check.wxml b/pages/risktask/check.wxml
new file mode 100644
index 0000000..9554f7e
--- /dev/null
+++ b/pages/risktask/check.wxml
@@ -0,0 +1,47 @@
+      <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__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>
+              <span wx:if="{{item.risk__level == '一般风险'}}" style="background-color:yellow">一般风险</span>
+              <span wx:if="{{item.risk__level == '较大风险'}}" style="background-color:orange">较大风险</span>
+              <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 style="background-color:green;color:white">工程技术</span>
+               <span wx:if="{{item.risk__measure1!=null}}">{{item.risk__measure1}}</span>
+               <span wx:else>无</span>
+              </view>
+              <view class="weui-media-box__desc">
+              <span style="background-color:green;color:white">管理措施</span>
+              <span wx:if="{{item.risk__measure2!=null}}">{{item.risk__measure2}}</span>
+               <span wx:else>无</span>
+              </view>
+              <view class="weui-media-box__desc">
+              <span style="background-color:green;color:white">培训教育</span>
+              <span wx:if="{{item.risk__measure3!=null}}">{{item.risk__measure3}}</span>
+               <span wx:else>无</span>
+              </view>
+              <view class="weui-media-box__desc">
+              <span style="background-color:green;color:white">个体防护</span>
+              <span wx:if="{{item.risk__measure4!=null}}">{{item.risk__measure4}}</span>
+               <span wx:else>无</span>
+              </view>
+              <view class="weui-media-box__desc">
+              <span style="background-color:green;color:white">应急处理</span>
+              <span wx:if="{{item.risk__measure5!=null}}">{{item.risk__measure5}}</span>
+               <span wx:else>无</span>
+              </view>
+              <checkbox checked="{{item.checked}}"/>确认已排查
+              <button class="weui-btn mini-btn" type="warn" size="mini" >发现隐患</button>
+            </view>
+          </view>
+        </block>
+      </view>
diff --git a/pages/risktask/check.wxss b/pages/risktask/check.wxss
new file mode 100644
index 0000000..ef15154
--- /dev/null
+++ b/pages/risktask/check.wxss
@@ -0,0 +1,14 @@
+.weui-btn{
+  width:auto;
+  margin: 5px;
+}
+.container {
+  background-color: #fff;  
+  color: #939393; 
+}
+.head{
+  color:#fff;
+  background-color: cornflowerblue;
+  text-align: center;
+}
+ 
\ No newline at end of file
diff --git a/pages/risktask/index.js b/pages/risktask/index.js
new file mode 100644
index 0000000..1c0aad3
--- /dev/null
+++ b/pages/risktask/index.js
@@ -0,0 +1,277 @@
+// pages/suggest/suggest.js
+var sliderWidth = 96;
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    page: 1,
+    serverUrl: getApp().globalData.serverUrl,
+    alllist: [],
+    tabs: ["我的已查", "我的待查", "全厂待办"],
+    activeIndex: 1,
+    sliderOffset: 0,
+    sliderLeft: 0
+  },
+  tabClick: function (e) {
+    var that = this
+    that.setData({
+      sliderOffset: e.currentTarget.offsetLeft,
+      activeIndex: e.currentTarget.id
+    });
+    if (that.data.activeIndex == 0) {
+      that.getmylist(1)
+      that.data.mypage = 1
+    }
+    else if (that.data.activeIndex == 1) {
+      that.gettodolist(1)
+      that.data.todopage = 1
+    }
+    else if (that.data.activeIndex == 2) {
+      that.getalllist(1)
+      that.data.page = 1
+    }
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this;
+    wx.getSystemInfo({
+      success: function (res) {
+        that.setData({
+          sliderLeft: (res.windowWidth / that.data.tabs.length - sliderWidth) / 2,
+          sliderOffset: res.windowWidth / that.data.tabs.length * that.data.activeIndex
+        });
+      }
+    });
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    var that = this;
+    console.log(that.data.activeIndex)
+    if (that.data.activeIndex == 0) {
+      that.getmylist(1)
+      that.data.mypage = 1
+    }
+    else if (that.data.activeIndex == 1) {
+      that.gettodolist(1)
+      that.data.todopage = 1
+    }
+    else if (that.data.activeIndex == 2) {
+      that.getalllist(1)
+      this.data.page = 1;
+    }
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+    var that = this;
+    if (that.data.activeIndex == 0) {
+      that.getmylist(1)
+      wx.stopPullDownRefresh();
+      that.data.mypage = 1
+    }
+    else if (that.data.activeIndex == 1) {
+      that.gettodolist(1)
+      wx.stopPullDownRefresh();
+      that.data.todopage = 1
+    }
+    else if (that.data.activeIndex == 2) {
+      that.getalllist(1)
+      wx.stopPullDownRefresh();
+      that.data.page = 1
+    }
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    //上拉分页,将页码加1，然后调用分页函数
+    var that = this;
+    if (that.data.activeIndex == 0) {
+      this.data.mypage = this.data.mypage + 1;
+      this.getmylist();
+    }
+    else if (that.data.activeIndex == 1) {
+      this.data.todopage = this.data.todopage + 1;
+      this.gettodolist();
+    }
+    else if (that.data.activeIndex == 2) {
+      this.data.page = this.data.page + 1;
+      this.getalllist();
+    }
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  getalllist: function (page) {
+    var that = this;
+    if (page != 1) { page = that.data.page }
+    wx.showLoading({
+      title: '加载中',
+    }),
+      wx.request({
+      url: this.data.serverUrl + 'api/risktask?a=listalltodo&rows=10&page=' + page,
+        header: {
+          'content-type': 'application/json', // 默认值
+          'Cookie': wx.getStorageSync("sessionid"),
+        },
+        success: res => {
+          if (res.statusCode === 200) {
+            if (res.data.rows.length == 0) {
+              if (page == 1) {
+                this.setData({
+                  total: 0,
+                  alllist: []
+                })
+              }
+              else {
+                wx.showModal({
+                  content: "已经到底啦!",
+                  showCancel: false,
+                  confirmText: "确定",
+                })
+              }
+            } else {
+              let list
+              if (page == 1) {
+                list = res.data.rows
+              } else {
+                list = this.data.alllist.concat(res.data.rows)
+              }
+              this.setData({
+                total: res.data.total,
+                alllist: list
+              })
+            }
+          }
+          wx.hideLoading();
+        }
+      });
+  },
+  getmylist: function (page) {
+    var that = this;
+    if (page != 1) { page = that.data.mypage }
+    wx.showLoading({
+      title: '加载中',
+    }),
+      wx.request({
+        url: this.data.serverUrl + 'api/suggest?a=listself&rows=10&page=' + page,
+        header: {
+          'content-type': 'application/json', // 默认值
+          'Cookie': wx.getStorageSync("sessionid"),
+        },
+        success: res => {
+          if (res.statusCode === 200) {
+            if (res.data.rows.length == 0) {
+              if (page == 1) {
+                this.setData({
+                  donetotal: 0,
+                  donelist: []
+                })
+              }
+              else {
+                wx.showModal({
+                  content: "已经到底啦!",
+                  showCancel: false,
+                  confirmText: "确定",
+                })
+              }
+            } else {
+              let list
+              if (page == 1) {
+                list = res.data.rows
+              } else {
+                list = this.data.donelist.concat(res.data.rows)
+              }
+              this.setData({
+                donetotal: res.data.total,
+                donelist: list
+              })
+            }
+          }
+          wx.hideLoading();
+        }
+      });
+  },
+  gettodolist: function (page) {
+    var that = this;
+    if (page != 1) { page = that.data.todopage }
+    wx.showLoading({
+      title: '加载中',
+    }),
+      wx.request({
+        url: this.data.serverUrl + 'api/risktask?a=list2todo&rows=10&page=' + page,
+        header: {
+          'content-type': 'application/json', // 默认值
+          'Cookie': wx.getStorageSync("sessionid"),
+        },
+        success: res => {
+          if (res.statusCode === 200) {
+            console.log(res.data)
+            if (res.data.rows.length == 0) {
+              if (page == 1) {
+                this.setData({
+                  todototal: 0,
+                  todolist: []
+                })
+              }
+              else {
+                wx.showModal({
+                  content: "已经到底啦!",
+                  showCancel: false,
+                  confirmText: "确定",
+                })
+              }
+            } else {
+              let list
+              if (page == 1) {
+                list = res.data.rows
+              } else {
+                list = this.data.todolist.concat(res.data.rows)
+              }
+              this.setData({
+                todototal: res.data.total,
+                todolist: list
+              })
+            }
+          }
+          wx.hideLoading();
+        }
+      });
+  },
+})
\ No newline at end of file
diff --git a/pages/risktask/index.json b/pages/risktask/index.json
new file mode 100644
index 0000000..7bdce1d
--- /dev/null
+++ b/pages/risktask/index.json
@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "排查任务",
+  "enablePullDownRefresh": true,
+  "onReachBottomDistance": 20
+}
\ No newline at end of file
diff --git a/pages/risktask/index.wxml b/pages/risktask/index.wxml
new file mode 100644
index 0000000..4619108
--- /dev/null
+++ b/pages/risktask/index.wxml
@@ -0,0 +1,95 @@
+<view class="weui-tab">
+  <view class="weui-navbar">
+    <block wx:for="{{tabs}}" wx:key="*this">
+      <view id="{{index}}" class="weui-navbar__item {{activeIndex == index ? 'weui-bar__item_on' : ''}}" bindtap="tabClick">
+        <view class="weui-navbar__title">{{item}}</view>
+      </view>
+    </block>
+    <view class="weui-navbar__slider" style="left: {{sliderLeft}}px; transform: translateX({{sliderOffset}}px); -webkit-transform: translateX({{sliderOffset}}px);"></view>
+  </view>
+  <view class="weui-tab__panel">
+    <view class="weui-tab__content" hidden="{{activeIndex != 0}}">
+      <view class="head">共{{donetotal}}条合理化建议</view>
+      <view class="weui-cells weui-cells_after-title">
+        <block wx:for="{{donelist}}" wx:key="unique">
+          <navigator url="detail?jyid={{item.jyid}}" 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">{{item.jynr}}</view>
+              <view class="weui-media-box__desc">{{item.jynum}} {{item.jyr__name}}填报</view>
+              <view class="weui-media-box__desc">{{item.submittime}}</view>
+            </view>
+                        <view class="weui-panel__ft weui-cell__ft_in-access">
+              <view class="weui-media-box__title" wx:if="{{item.jyzt == 1}}" style="background-color:yellow">待评估</view>
+              <view class="weui-media-box__title" wx:if="{{item.jyzt == 2}}" style="background-color:yellow">处理中</view>
+              <view class="weui-media-box__title" wx:if="{{item.jyzt == 3}}" style="background-color:yellow">待确认</view>
+              <view class="weui-media-box__title" wx:if="{{item.jyzt == 4}}" style="background-color:green">已归档</view>
+              <view class="weui-media-box__desc" wx:if="{{item.todouser__name}}">{{item.todouser__name}}</view>
+            </view>
+          </navigator>
+        </block>
+      </view>
+    </view>
+    <view class="weui-tab__content" hidden="{{activeIndex != 1}}">
+      <view class="head">共{{todototal}}条任务</view>
+      <view class="weui-cells weui-cells_after-title">
+        <block wx:for="{{todolist}}" wx:key="unique">
+          <navigator url="check?riskact={{item.risk__riskact__id}}&group={{item.risk__group__groupid}}" 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.risk__riskact__area__name}} {{item.risk__riskact__name}}
+              </view>
+              <view class="weui-media-box__desc">
+              <span style="background-color:orange;color:white">排查岗位</span>
+              {{item.risk__gkcj}} {{item.risk__group__groupname}}
+              </view>
+              <view class="weui-media-box__desc">任务生成时间:{{item.taskadd}}</view>
+              <view class="weui-media-box__desc">任务过期时间:{{item.taskexpire}}</view>
+            </view>
+            <view class="weui-panel__ft weui-cell__ft_in-access">
+              <view class="weui-media-box__title" wx:if="{{item.risk__riskact__level == '低风险'}}" style="background-color:blue;color:white">低风险</view>
+              <view class="weui-media-box__title" wx:if="{{item.risk__riskact__level == '一般风险'}}" style="background-color:yellow">一般风险</view>
+              <view class="weui-media-box__title" wx:if="{{item.risk__riskact__level == '较大风险'}}" style="background-color:orange">较大风险</view>
+              <view class="weui-media-box__title" wx:if="{{item.risk__riskact__level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
+            </view>
+          </navigator>
+        </block>
+      </view>
+    </view>
+    <view class="weui-tab__content" hidden="{{activeIndex != 2}}">
+      <view class="head">共{{total}}条任务</view>
+      <view class="weui-cells weui-cells_after-title">
+        <block wx:for="{{alllist}}" wx:key="unique">
+          <navigator url="check?riskact={{item.risk__riskact__id}}&group={{item.risk__group__groupid}}" 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.risk__riskact__area__name}} {{item.risk__riskact__name}}
+              </view>
+              <view class="weui-media-box__desc">
+              <span style="background-color:orange;color:white">排查岗位</span>
+              {{item.risk__gkcj}} {{item.risk__group__groupname}}
+              </view>
+              <view class="weui-media-box__desc">任务生成时间:{{item.taskadd}}</view>
+              <view class="weui-media-box__desc">任务过期时间:{{item.taskexpire}}</view>
+            </view>
+            <view class="weui-panel__ft weui-cell__ft_in-access">
+              <view class="weui-media-box__title" wx:if="{{item.risk__riskact__level == '低风险'}}" style="background-color:blue;color:white">低风险</view>
+              <view class="weui-media-box__title" wx:if="{{item.risk__riskact__level == '一般风险'}}" style="background-color:yellow">一般风险</view>
+              <view class="weui-media-box__title" wx:if="{{item.risk__riskact__level == '较大风险'}}" style="background-color:orange">较大风险</view>
+              <view class="weui-media-box__title" wx:if="{{item.risk__riskact__level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
+              
+            </view>
+          </navigator>
+        </block>
+      </view>
+    </view>
+  </view>
+</view>
+
+
+<view style="position:fixed;bottom:0;left:0;width:100%;" hidden="{{activeIndex != 0}}">
+  <navigator url="/pages/suggest/add" hover-class="navigator-hover">
+    <button class="weui-btn" type="primary" style="width:auto;margin:5px">新增</button>
+  </navigator>
+</view>
\ No newline at end of file
diff --git a/pages/risktask/index.wxss b/pages/risktask/index.wxss
new file mode 100644
index 0000000..ef15154
--- /dev/null
+++ b/pages/risktask/index.wxss
@@ -0,0 +1,14 @@
+.weui-btn{
+  width:auto;
+  margin: 5px;
+}
+.container {
+  background-color: #fff;  
+  color: #939393; 
+}
+.head{
+  color:#fff;
+  background-color: cornflowerblue;
+  text-align: center;
+}
+ 
\ No newline at end of file