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 74b5aad..88cc953 100644
--- a/app.json
+++ b/app.json
@@ -63,12 +63,13 @@
     "pages/risk/myindex",
     "pages/risk/detail",
     "pages/risktask/index",
-    "pages/risktask/check",
-    "pages/risktask/main",
     "pages/riskact/index",
     "pages/riskact/detail",
     "pages/riskact/check",
-    "pages/chart/report"
+    "pages/chart/report",
+    "pages/risktask/detail",
+    "pages/riskact/index2",
+    "pages/area/detail"
   ],
   "window": {
     "backgroundTextStyle": "light",
diff --git a/pages/area/detail.js b/pages/area/detail.js
new file mode 100644
index 0000000..2bc8654
--- /dev/null
+++ b/pages/area/detail.js
@@ -0,0 +1,128 @@
+// pages/area/detail.js
+var util = require('../../utils/util.js')
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    fromWx: false,
+    riskact:0,
+    riskactlist:[],
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var areaid
+    if (options.id) {
+      areaid = options.id
+    } else {
+      let q = decodeURIComponent(options.q)
+      if (q) {
+        // console.log("index 生命周期 onload url=" + q) 
+        // console.log("index 生命周期 onload 参数 trainid=" + util.getQueryString(q, 'trainid')) 
+        areaid = util.getQueryString(q, 'id')
+        this.setData({
+          fromWx: true
+        })
+      }
+    }
+    wx.showLoading({
+      title: '',
+    })
+    wx.request({
+      url: getApp().globalData.serverUrl + 'api/area?a=detail&id=' + areaid,
+      header: {
+        'content-type': 'application/json', // 默认值
+        'Cookie': wx.getStorageSync("sessionid"),
+      },
+      success: res => {
+        if (res.statusCode === 200) {
+          this.setData({
+            name: res.data.name,
+          })
+
+        }
+        wx.hideLoading();
+      }
+    });
+    wx.request({
+      url: getApp().globalData.serverUrl + 'api/riskact?a=listall2&area='+areaid,
+      header: {
+        'content-type': 'application/json', // 默认值
+        'Cookie': wx.getStorageSync("sessionid"),
+      },
+      success: res => {
+        if (res.statusCode === 200) {
+            this.setData({
+              total: res.data.total,
+              riskactlist: res.data.rows
+            })
+          
+        }
+        wx.hideLoading();
+      }
+    });
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    let riskact = this.data.riskact
+    let riskactlist = this.data.riskactlist
+    console.log(riskact,riskactlist)
+    for(var i=0;i<riskactlist.length;i++){
+      if(riskactlist[i].id==riskact){
+        riskactlist[i]['checked']=true
+      }
+    }
+    this.setData({
+      riskactlist: riskactlist
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  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/area/detail.json
similarity index 100%
rename from pages/risktask/check.json
rename to pages/area/detail.json
diff --git a/pages/area/detail.wxml b/pages/area/detail.wxml
new file mode 100644
index 0000000..e5fa41a
--- /dev/null
+++ b/pages/area/detail.wxml
@@ -0,0 +1,37 @@
+<!--pages/area/detail.wxml-->
+<view class="weui-cells__title">区域信息</view>
+<view class="weui-cells weui-cells_after-title">
+<view class="weui-cell">
+    <view class="weui-cell__bd">名称</view>
+    <view class="weui-cell__ft">{{name}}</view>
+  </view>
+</view>
+<view class="page__bd">
+  <view class="head">共{{total}}条风险点</view>
+  <view class="weui-cells weui-cells_after-title" >
+    <block wx:for="{{riskactlist}}" wx:key="unique">
+      <navigator url="/pages/riskact/detail?id={{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">{{item.name}}</view>
+          <view class="weui-media-box__desc">
+          <span style="background-color:orange;color:white">区域</span>
+          {{item.area__name}}
+          <span style="background-color:orange;color:white"> 岗位</span>
+          {{item.group__groupname}}
+          </view>
+          <view class="weui-media-box__desc">
+          <span style="background-color:orange;color:white">风险点类别</span>
+          {{item.type__dickeyname}}
+          </view>
+        </view>
+        <view class="weui-panel__ft weui-cell__ft_in-access">
+        <view class="weui-media-box__title" wx:if="{{item.level == '低风险'}}" style="background-color:blue;color:white">低风险</view>
+        <view class="weui-media-box__title" wx:if="{{item.level == '一般风险'}}" style="background-color:yellow">一般风险</view>
+        <view class="weui-media-box__title" wx:if="{{item.level == '较大风险'}}" style="background-color:orange">较大风险</view>
+        <view class="weui-media-box__title" wx:if="{{item.level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
+        <view wx:if="{{item.checked==true}}" class="weui-media-box__desc" style="background-color:green;color:white">已查</view>
+        </view>
+      </navigator>
+    </block>
+  </view>
+</view>
diff --git a/pages/area/detail.wxss b/pages/area/detail.wxss
new file mode 100644
index 0000000..98e918f
--- /dev/null
+++ b/pages/area/detail.wxss
@@ -0,0 +1,10 @@
+/* pages/area/detail.wxss */
+.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/examtest/index.js b/pages/examtest/index.js
index 8d8df95..d777d0e 100644
--- a/pages/examtest/index.js
+++ b/pages/examtest/index.js
@@ -189,5 +189,27 @@ Page({
       })
     }
     
-  }
+  },
+  scan: function () {
+    wx.scanCode({
+      onlyFromCamera: true,
+      success(res) {
+        console.log(res)
+        if (res.result.indexOf("examtest") != -1) {
+          let id = res.result.split('=')[1]
+          wx.navigateTo({
+            url: 'note?examtestid=' + id,
+          })
+        } else {
+          wx.showModal({
+            title: "系统提示",
+            content: '请扫考试二维码!',
+            showCancel: false,
+            confirmText: "确定"
+          })
+        }
+
+      }
+    })
+  },
 });
\ No newline at end of file
diff --git a/pages/examtest/index.wxml b/pages/examtest/index.wxml
index 29b56ce..7a7131b 100644
--- a/pages/examtest/index.wxml
+++ b/pages/examtest/index.wxml
@@ -50,4 +50,7 @@
     </view>
 
   </view>
+</view>
+<view style="position:fixed;bottom:0;left:0;width:100%;" hidden="{{activeIndex == 1}}">
+    <button class="weui-btn" type="primary" style="width:auto;margin:5px" bindtap="scan" >扫一扫参加考试</button>
 </view>
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 293efcf..9a5cc0e 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -47,7 +47,7 @@
       </view>
       <view class="weui-media-box weui-media-box_small-appmsg">
         <view class="weui-cells weui-cells_in-small-appmsg">
-          <navigator url="../risk/myindex" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
+          <navigator url="../riskact/index2" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
             <view class="weui-cell__hd">
               <image src="../images/riskrole.png" style="width: 20px;height: 20px;margin-right: 5px" />
             </view>
diff --git a/pages/inspect/index.js b/pages/inspect/index.js
index 18a99e7..ffe8b33 100644
--- a/pages/inspect/index.js
+++ b/pages/inspect/index.js
@@ -51,10 +51,19 @@ Page({
       onlyFromCamera: true,
       success(res) {
         console.log(res)
-        let id = res.result.split('=')[1]
-        wx.navigateTo({
-          url: 'add?id=' + id,
-        })
+        if (res.result.indexOf("equipment") != -1) {
+          let id = res.result.split('=')[1]
+          wx.navigateTo({
+            url: 'add?id=' + id,
+          })
+        } else {
+          wx.showModal({
+            title: "系统提示",
+            content: '请扫设备二维码!',
+            showCancel: false,
+            confirmText: "确定"
+          })
+        }      
       }
     })
   },
diff --git a/pages/main/main.js b/pages/main/main.js
index bf266e3..6d9ea99 100644
--- a/pages/main/main.js
+++ b/pages/main/main.js
@@ -255,7 +255,7 @@ Page({
     var that = this
     //获取待考
     wx.request({
-      url: getApp().globalData.serverUrl + 'api/risktask?a=todonum',
+      url: getApp().globalData.serverUrl + 'api/riskacttask?a=todonum',
       header: {
         'content-type': 'application/json', // 默认值
         'Cookie': wx.getStorageSync("sessionid"),
diff --git a/pages/observe/addobserve.js b/pages/observe/addobserve.js
index a1cc8f0..f2b9cb0 100644
--- a/pages/observe/addobserve.js
+++ b/pages/observe/addobserve.js
@@ -183,15 +183,19 @@ Page({
       data: {},
       success: res => {
         if (res.statusCode === 200) {
-          //console.log(res.data.data)
+          console.log(res.data.data)
+          let recdata = res.data.data
+          for (var j = 0, lenJ = recdata.length; j < lenJ; ++j) {
+            recdata[j].child.push({'text':'全部安全','value':0})
+          }
           this.setData({
-            unsafe24: res.data.data[0],
-            unsafe25: res.data.data[1],
-            unsafe26: res.data.data[2],
-            unsafe27: res.data.data[3],
-            unsafe28: res.data.data[4],
-            unsafe29: res.data.data[5],
-            unsafe30: res.data.data[6],
+            unsafe24: recdata[0],
+            unsafe25: recdata[1],
+            unsafe26: recdata[2],
+            unsafe27: recdata[3],
+            unsafe28: recdata[4],
+            unsafe29: recdata[5],
+            unsafe30: recdata[6],
           })
         }
       }
@@ -302,7 +306,20 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    let lst = getApp().globalData.selectPeopleList
+    let nst = []
+    let nst1 = []
+    if (lst) {
+      for (var i = 0; i < lst.length; i++) {
+        nst.push(lst[i]['name'])
+        nst1.push(lst[i]['id'])
+      }
+      this.setData({
+        gcryname: nst.join(','),
+        lookers: nst1.join(','),
+        lookersnum: nst1.length
+      })
+    }
   },
 
   /**
diff --git a/pages/observe/addobserve.wxml b/pages/observe/addobserve.wxml
index 20469a5..0341543 100644
--- a/pages/observe/addobserve.wxml
+++ b/pages/observe/addobserve.wxml
@@ -25,6 +25,19 @@
     </view>
     <view class="weui-cells__title">观察信息</view>
     <view class="weui-cells weui-cells_after-title">
+          <view class="weui-cell weui-cell_select">
+        <view class="weui-cell__hd weui-cell__hd_in-select-after">
+          <view class="weui-label">观察人员</view>
+        </view>
+        <view class="weui-cell__bd">
+          <navigator url="/pages/userSelect/userSelect">
+            <view class="weui-select">请选择</view>
+          </navigator>
+        </view>
+      </view>
+      <view class="weui-cell weui-cell_access" style="height: 5.3em">
+        {{gcryname}}
+      </view>
       <view class="weui-cell weui-cell_input">
         <view class="weui-cell__hd">
           <view class="weui-label">被观察人员</view>
diff --git a/pages/operation/list.wxml b/pages/operation/list.wxml
index 53bb163..aea17ed 100644
--- a/pages/operation/list.wxml
+++ b/pages/operation/list.wxml
@@ -7,7 +7,7 @@
         <view class="weui-media-box__title">{{item.dickeyname}}
         </view>
         <view class="weui-media-box__desc" style="color:green">{{item.detail}}</view>
-        <view class="weui-media-box__desc" style="color:red">审批流程:{{item.splcdetail}}</view>
+        <view class="weui-media-box__desc" style="color:red">自动审批:{{item.splcdetail}}</view>
       </view>
     </navigator>
   </block>
diff --git a/pages/operation/operationcheck.wxml b/pages/operation/operationcheck.wxml
index c8d511b..7a002db 100644
--- a/pages/operation/operationcheck.wxml
+++ b/pages/operation/operationcheck.wxml
@@ -116,5 +116,7 @@
       </view>
     </view>
 <button class="weui-btn" type="primary" bindtap="submit" wx:if="{{zyzt.zyzt == '确认中'}}">安全措施就绪,确认参与作业</button>
-<button class="weui-btn" type="primary" bindtap="submit2" wx:if="{{zyzt.zyzt == '审批中'}}">安全措施就绪,可以开始作业</button>
-<button class="weui-btn" type="primary" bindtap="submit3" wx:if="{{zyzt.zyzt == '待关闭'}}">现场清理完毕,关闭作业</button>
\ No newline at end of file
+<!-- <button class="weui-btn" type="primary" bindtap="submit2" >安全措施就绪,可以开始作业</button> -->
+<button class="weui-btn" type="primary" bindtap="submit3" wx:if="{{zyzt.zyzt == '待关闭'}}">现场清理完毕,关闭作业</button>
+<button type="primary" bindtap="openaction" class="weui-btn" wx:if="{{zyzt.zyzt == '审批中'}}">选择操作</button>
+<view wx:if="{{zyzt.zyzt == '审批中'}}"><span>当前操作：</span><span style="color:blue">{{action}}</span></view>
\ No newline at end of file
diff --git a/pages/riskact/check.js b/pages/riskact/check.js
index 9321355..49b90ea 100644
--- a/pages/riskact/check.js
+++ b/pages/riskact/check.js
@@ -33,33 +33,11 @@ Page({
         if (res.statusCode === 200) {
           wx.hideLoading()
           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
+              alllist: res.data.rows
             })
           }
-        }
         wx.hideLoading();
       }
     });
@@ -121,7 +99,7 @@ Page({
   submit: function () {
     console.log(this.data.alllist)
     let alllist = this.data.alllist
-    let data = {'checks':[]}
+    let data = {'checks':[],'riskact':this.data.riskact}
     for (var i = 0; i < alllist.length; i++) {
       if (i.trouble != undefined){
         data.checks.push({ 'id': alllist[i].id })
@@ -134,7 +112,7 @@ Page({
       title: '提交中',
     })
     wx.request({
-      url: getApp().globalData.serverUrl + 'api/riskcheck?a=add',
+      url: getApp().globalData.serverUrl + 'api/riskcheck2?a=add',
       header: {
         'content-type': 'application/json', // 默认值
         'Cookie': wx.getStorageSync("sessionid"),
@@ -143,6 +121,14 @@ Page({
       data: data,
       success: res => {
         if (res.statusCode === 200) {
+          var pages = getCurrentPages();
+          var currPage = pages[pages.length - 1];   //当前页面
+          var prevPage = pages[pages.length - 2];  //上一个页面
+
+          //直接调用上一个页面对象的setData()方法，把数据存到上一个页面中去
+          prevPage.setData({
+            riskact: this.data.riskact
+          });
           wx.navigateBack({
           })
         }
diff --git a/pages/riskact/check.wxml b/pages/riskact/check.wxml
index 2359d6f..b663bc7 100644
--- a/pages/riskact/check.wxml
+++ b/pages/riskact/check.wxml
@@ -47,5 +47,5 @@
       </view>
     <view class="btn-area">
       <button class="weui-btn" type="primary" bindtap="submit"
-      >排查完毕,提交!</button>
+      disabled="{{alllist[0].user__userid!=null}}">排查完毕,提交!</button>
     </view>
diff --git a/pages/riskact/index.js b/pages/riskact/index.js
index a5a18e2..0d4342d 100644
--- a/pages/riskact/index.js
+++ b/pages/riskact/index.js
@@ -21,7 +21,7 @@ Page({
       activeIndex: e.currentTarget.id
     });
     if (that.data.activeIndex == 0) {
-      that.getmyriskchecklist(1)
+      that.getmyriskactchecklist(1)
       that.data.mypage = 1
     }
     else if (that.data.activeIndex == 1) {
@@ -79,7 +79,7 @@ Page({
   onPullDownRefresh: function () {
     var that = this;
     if (that.data.activeIndex == 0) {
-      that.getmyriskchecklist(1)
+      that.getmyriskactchecklist(1)
       that.data.mypage = 1
     } else if (that.data.activeIndex == 1){
       that.getriskactlist(1);
@@ -94,9 +94,10 @@ Page({
    */
   onReachBottom: function () {
     //上拉分页,将页码加1，然后调用分页函数
+    var that =this
     if (that.data.activeIndex == 0) {
       this.data.mypage = this.data.mypage + 1;
-      this.getmyriskchecklist();
+      this.getmyriskactchecklist();
     } else if (that.data.activeIndex == 1){
       this.data.page = this.data.page + 1;
       this.getriskactlist();
@@ -115,10 +116,42 @@ Page({
       onlyFromCamera: true,
       success(res) {
         console.log(res)
-        let id = res.result.split('=')[1]
-        wx.navigateTo({
-          url: 'detail?id='+id,
-        })
+        if (res.result.indexOf("riskact") != -1){
+          let id = res.result.split('=')[1]
+          wx.navigateTo({
+            url: 'detail?id=' + id,
+          })
+        }else{
+          wx.showModal({
+            title: "系统提示",
+            content: '请扫风险点二维码!',
+            showCancel: false,
+            confirmText: "确定"
+          })
+        }
+        
+      }
+    })
+  },
+  scanArea: function () {
+    wx.scanCode({
+      onlyFromCamera: true,
+      success(res) {
+        console.log(res)
+        if (res.result.indexOf("area") != -1) {
+          let id = res.result.split('=')[1]
+          wx.navigateTo({
+            url: '/pages/area/detail?id=' + id,
+          })
+        } else {
+          wx.showModal({
+            title: "系统提示",
+            content: '请扫区域二维码!',
+            showCancel: false,
+            confirmText: "确定"
+          })
+        }
+
       }
     })
   },
@@ -167,14 +200,14 @@ Page({
         }
       });
   },
-  getmyriskchecklist: function (page) {
+  getmyriskactchecklist: function (page) {
     var that = this;
     if (page != 1) { page = that.data.mapage }
     wx.showLoading({
       title: '加载中',
     }),
       wx.request({
-        url: this.data.serverUrl + 'api/riskcheck?a=listself&rows=10&page=' + page,
+        url: this.data.serverUrl + 'api/riskacttask?a=listself&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
           'Cookie': wx.getStorageSync("sessionid"),
@@ -185,7 +218,7 @@ Page({
               if (page == 1) {
                 this.setData({
                   mytotal: 0,
-                  riskchecklist: []
+                  riskactchecklist: []
                 })
               }
               else {
@@ -200,11 +233,11 @@ Page({
               if (page == 1) {
                 list = res.data.rows
               } else {
-                list = this.data.riskchecklist.concat(res.data.rows)
+                list = this.data.riskactchecklist.concat(res.data.rows)
               }
               this.setData({
                 mytotal: res.data.total,
-                riskchecklist: list
+                riskactchecklist: list
               })
             }
           }
diff --git a/pages/riskact/index.wxml b/pages/riskact/index.wxml
index af5d0c7..dd43578 100644
--- a/pages/riskact/index.wxml
+++ b/pages/riskact/index.wxml
@@ -12,30 +12,28 @@
       <view class="head">
         共{{mytotal}}条风险排查记录</view>
   <view class="weui-cells weui-cells_after-title" >
-    <block wx:for="{{riskchecklist}}" wx:key="unique">
-      <view class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
+    <block wx:for="{{riskactchecklist}}" wx:key="unique">
+      <navigator url="../risktask/detail?id={{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">{{item.risk__step}}</view>
+          <view class="weui-media-box__title">{{item.riskact__name}}</view>
           <view class="weui-media-box__desc">
-          <span style="background-color:orange;color:white">风险点</span>
-          {{item.risk__riskact__name}}
           <span style="background-color:orange;color:white">区域</span>
-          {{item.risk__riskact__area__name}}
+          {{item.riskact__area__name}}
           </view>
           <view class="weui-media-box__desc">
           <span style="background-color:orange;color:white">排查时间</span>
-          {{item.dotime}}
+          {{item.taskdo}}
           </view>
         </view>
         <view class="weui-panel__ft weui-cell__ft_in-access">
-        <view class="weui-media-box__title" wx:if="{{item.risk__level == '低风险'}}" style="background-color:blue;color:white">低风险</view>
-        <view class="weui-media-box__title" wx:if="{{item.risk__level == '一般风险'}}" style="background-color:yellow">一般风险</view>
-        <view class="weui-media-box__title" wx:if="{{item.risk__level == '较大风险'}}" style="background-color:orange">较大风险</view>
-        <view class="weui-media-box__title" wx:if="{{item.risk__level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
-        <view wx:if="{{item.trouble__yhnum!=null}}" class="weui-media-box__desc" style="background-color:red;color:white">隐患</view>
+        <view class="weui-media-box__title" wx:if="{{item.riskact__level == '低风险'}}" style="background-color:blue;color:white">低风险</view>
+        <view class="weui-media-box__title" wx:if="{{item.riskact__level == '一般风险'}}" style="background-color:yellow">一般风险</view>
+        <view class="weui-media-box__title" wx:if="{{item.riskact__level == '较大风险'}}" style="background-color:orange">较大风险</view>
+        <view class="weui-media-box__title" wx:if="{{item.riskact__level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
+        <view wx:if="{{item.state==0}}" class="weui-media-box__desc" style="background-color:red;color:white">异常</view>
         <view wx:else class="weui-media-box__desc" style="background-color:green;color:white">正常</view>
         </view>
-      </view>
+      </navigator>
     </block>
   </view>
     </view>
@@ -50,6 +48,8 @@
           <view class="weui-media-box__desc">
           <span style="background-color:orange;color:white">区域</span>
           {{item.area__name}}
+          <span style="background-color:orange;color:white"> 岗位</span>
+          {{item.group__groupname}}
           </view>
           <view class="weui-media-box__desc">
           <span style="background-color:orange;color:white">风险点类别</span>
@@ -72,7 +72,13 @@
   </view>
 </view>
 
-
-<view style="position:fixed;bottom:0;left:0;width:100%;" hidden="{{activeIndex == 1}}">
-    <button class="weui-btn" type="primary" style="width:auto;margin:5px" bindtap="scan" >扫一扫风险点</button>
+<view class="container" style="position:fixed; bottom:0;width:100%;" hidden="{{activeIndex == 1}}">
+  <view style="width:100%">
+    <view style="width:50%;float:left;">
+      <button class="weui-btn" type="primary" bindtap="scanArea">扫一扫区域</button>
+    </view>
+    <view style="width:50%;float:left;">
+      <button class="weui-btn" type="primary" bindtap="scan">扫一扫风险点</button>
+    </view>
+  </view>
 </view>
\ No newline at end of file
diff --git a/pages/riskact/index2.js b/pages/riskact/index2.js
new file mode 100644
index 0000000..ccab0a9
--- /dev/null
+++ b/pages/riskact/index2.js
@@ -0,0 +1,116 @@
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    page: 1,
+    serverUrl: getApp().globalData.serverUrl,
+    riskactlist: [],
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    this.onPullDownRefresh()
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+    var that = this;
+    this.data.page = 1;
+    this.getriskactlist();
+    wx.stopPullDownRefresh();
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    this.getriskactlist();
+    wx.stopPullDownRefresh();
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  getriskactlist: function (page) {
+    var that = this;
+    if (page != 1) { page = that.data.page }
+    wx.showLoading({
+      title: '加载中',
+    }),
+      wx.request({
+        url: this.data.serverUrl + 'api/riskact?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({
+                  total: 0,
+                  riskactlist: []
+                })
+              }
+              else {
+                wx.showModal({
+                  content: "已经到底啦!",
+                  showCancel: false,
+                  confirmText: "确定",
+                })
+              }
+            } else {
+              let list
+              if (page == 1) {
+                list = res.data.rows
+              } else {
+                list = this.data.riskactlist.concat(res.data.rows)
+              }
+              this.setData({
+                total: res.data.total,
+                riskactlist: list
+              })
+            }
+          }
+          wx.hideLoading();
+        }
+      });
+  },
+})
\ No newline at end of file
diff --git a/pages/riskact/index2.json b/pages/riskact/index2.json
new file mode 100644
index 0000000..7efa756
--- /dev/null
+++ b/pages/riskact/index2.json
@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "风险点",
+  "enablePullDownRefresh": true,
+  "onReachBottomDistance": 50
+}
\ No newline at end of file
diff --git a/pages/riskact/index2.wxml b/pages/riskact/index2.wxml
new file mode 100644
index 0000000..0d3ce70
--- /dev/null
+++ b/pages/riskact/index2.wxml
@@ -0,0 +1,28 @@
+<view class="page__bd">
+  <view class="head">共{{total}}条风险点</view>
+  <view class="weui-cells weui-cells_after-title">
+    <block wx:for="{{riskactlist}}" wx:key="unique">
+      <navigator url="detail?id={{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">{{item.name}}</view>
+          <view class="weui-media-box__desc">
+            <span style="background-color:orange;color:white">区域</span>
+            {{item.area__name}}
+            <span style="background-color:orange;color:white"> 岗位</span>
+            {{item.group__groupname}}
+          </view>
+          <view class="weui-media-box__desc">
+            <span style="background-color:orange;color:white">风险点类别</span>
+            {{item.type__dickeyname}}
+          </view>
+        </view>
+        <view class="weui-panel__ft weui-cell__ft_in-access">
+          <view class="weui-media-box__title" wx:if="{{item.level == '低风险'}}" style="background-color:blue;color:white">低风险</view>
+          <view class="weui-media-box__title" wx:if="{{item.level == '一般风险'}}" style="background-color:yellow">一般风险</view>
+          <view class="weui-media-box__title" wx:if="{{item.level == '较大风险'}}" style="background-color:orange">较大风险</view>
+          <view class="weui-media-box__title" wx:if="{{item.level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
+        </view>
+      </navigator>
+    </block>
+  </view>
+</view>
\ No newline at end of file
diff --git a/pages/risktask/check.wxss b/pages/riskact/index2.wxss
similarity index 100%
rename from pages/risktask/check.wxss
rename to pages/riskact/index2.wxss
diff --git a/pages/risktask/check.js b/pages/risktask/check.js
deleted file mode 100644
index 2e9888f..0000000
--- a/pages/risktask/check.js
+++ /dev/null
@@ -1,153 +0,0 @@
-// pages/risktask/check.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    page:1,
-    riskact:0,
-    group:0
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    console.log(options)
-    this.data.riskact = options.riskact
-    if(options.group==undefined){
-      this.data.group = 'all'
-    }else{
-      this.data.group = options.group
-    }
-    
-
-  },
-  getlist:function(){
-    var page = this.data.page
-    wx.showLoading({
-      title: '加载中',
-    })
-    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) {
-          wx.hideLoading()
-          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 () {
-    this.getlist()
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  },
-  open: function (e) {
-    console.log(e)
-    wx.navigateTo({
-      url: '/pages/trouble/addtrouble?type=risktask&index=' + e.currentTarget.dataset.index,
-    })
-  },
-  submit: function () {
-    console.log(this.data.alllist)
-    let data={'tasks':[]}
-    for (var i = 0; i < this.data.alllist.length; i++) {
-      data.tasks.push(this.data.alllist[i].id)
-    }
-    wx.showLoading({
-      title: '提交中',
-    })
-    wx.request({
-      url: getApp().globalData.serverUrl + 'api/risktask?a=update',
-      header: {
-        'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
-      },
-      method: 'POST',
-      data:data,
-      success: res => {
-        if (res.statusCode === 200) {
-          wx.navigateBack({
-          })
-        }
-        wx.hideLoading();
-      }
-    });
-  },
-})
\ No newline at end of file
diff --git a/pages/risktask/detail.js b/pages/risktask/detail.js
new file mode 100644
index 0000000..57d0058
--- /dev/null
+++ b/pages/risktask/detail.js
@@ -0,0 +1,91 @@
+// pages/risktask/check.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    page: 1,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    console.log(options)
+    this.data.id = options.id
+    this.getlist()
+  },
+  getlist: function () {
+    var page = this.data.page
+    wx.showLoading({
+      title: '加载中',
+    })
+    wx.request({
+      url: getApp().globalData.serverUrl + 'api/riskcheck2?a=listall&riskacttask=' + this.data.id,
+      header: {
+        'content-type': 'application/json', // 默认值
+        'Cookie': wx.getStorageSync("sessionid"),
+      },
+      success: res => {
+        if (res.statusCode === 200) {
+          wx.hideLoading()
+          console.log(res.data)
+          this.setData({
+            total: res.data.total,
+            alllist: res.data.rows
+          })
+        }
+        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/detail.json b/pages/risktask/detail.json
new file mode 100644
index 0000000..8835af0
--- /dev/null
+++ b/pages/risktask/detail.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/risktask/check.wxml b/pages/risktask/detail.wxml
similarity index 88%
rename from pages/risktask/check.wxml
rename to pages/risktask/detail.wxml
index e710ec0..52a4b3f 100644
--- a/pages/risktask/check.wxml
+++ b/pages/risktask/detail.wxml
@@ -39,14 +39,8 @@
               <span wx:if="{{item.risk__measure5!=null}}">{{item.risk__measure5}}</span>
                <span wx:else>无</span>
               </view>
-              <button class="weui-btn mini-btn" type="warn" size="mini" disabled="{{item.trouble__yhnum != null}}" data-index="{{index}}" bindtap="open">发现隐患</button>
               <view class="weui-media-box__desc" style="color:red" wx:if="{{item.trouble__yhnum != null}}">{{item.trouble__yhnum}}</view>
             </view>
           </view>
         </block>
       </view>
-    <view class="btn-area">
-      <button class="weui-btn" type="primary" bindtap="submit" 
-      disabled="{{alllist[0].user__userid!=null}}"
-      >排查完毕,提交!</button>
-    </view>
diff --git a/pages/risktask/detail.wxss b/pages/risktask/detail.wxss
new file mode 100644
index 0000000..ef15154
--- /dev/null
+++ b/pages/risktask/detail.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
index 89ad83c..dc817d5 100644
--- a/pages/risktask/index.js
+++ b/pages/risktask/index.js
@@ -145,7 +145,7 @@ Page({
       title: '加载中',
     }),
       wx.request({
-      url: this.data.serverUrl + 'api/risktask?a=listalltodo&rows=10&page=' + page,
+      url: this.data.serverUrl + 'api/riskacttask?a=listalltodo&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
           'Cookie': wx.getStorageSync("sessionid"),
@@ -190,7 +190,7 @@ Page({
       title: '加载中',
     }),
       wx.request({
-        url: this.data.serverUrl + 'api/risktask?a=list2done&rows=10&page=' + page,
+        url: this.data.serverUrl + 'api/riskacttask?a=listself&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
           'Cookie': wx.getStorageSync("sessionid"),
@@ -247,7 +247,7 @@ Page({
       title: '加载中',
     }),
       wx.request({
-        url: this.data.serverUrl + 'api/risktask?a=list2todo&rows=10&page=' + page,
+        url: this.data.serverUrl + 'api/riskacttask?a=listmytodo&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
           'Cookie': wx.getStorageSync("sessionid"),
diff --git a/pages/risktask/index.wxml b/pages/risktask/index.wxml
index ea0987d..54513d9 100644
--- a/pages/risktask/index.wxml
+++ b/pages/risktask/index.wxml
@@ -12,24 +12,24 @@
       <view class="head">共{{donetotal}}条</view>
       <view class="weui-cells weui-cells_after-title">
         <block wx:for="{{donelist}}" 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">
+          <navigator url="detail?id={{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.risk__riskact__area__name}} {{item.risk__riskact__name}}
+                {{item.riskact__area__name}} {{item.riskact__name}}
               </view>
               <view class="weui-media-box__desc">
                 <span style="background-color:orange;color:white">排查岗位</span>
-                {{item.risk__group__groupname}}
+                {{item.riskact__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 class="weui-media-box__title" wx:if="{{item.riskact__level == '低风险'}}" style="background-color:blue;color:white">低风险</view>
+              <view class="weui-media-box__title" wx:if="{{item.riskact__level == '一般风险'}}" style="background-color:yellow">一般风险</view>
+              <view class="weui-media-box__title" wx:if="{{item.riskact__level == '较大风险'}}" style="background-color:orange">较大风险</view>
+              <view class="weui-media-box__title" wx:if="{{item.riskact__level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
               <view wx:if="{{item.user__userid!=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.user__userid==null}}" class="weui-media-box__title" style="background-color:red;color:white">未执行</view>
@@ -42,29 +42,25 @@
       <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">
+          <navigator url="../riskact/check?riskact={{item.riskact__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.risk__riskact__area__name}} {{item.risk__riskact__name}}
+                {{item.riskact__area__name}} {{item.riskact__name}}
               </view>
               <view class="weui-media-box__desc">
                 <span style="background-color:orange;color:white">排查岗位</span>
-                {{item.risk__group__groupname}}
+                {{item.riskact__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 class="weui-media-box__title" wx:if="{{item.riskact__level == '低风险'}}" style="background-color:blue;color:white">低风险</view>
+              <view class="weui-media-box__title" wx:if="{{item.riskact__level == '一般风险'}}" style="background-color:yellow">一般风险</view>
+              <view class="weui-media-box__title" wx:if="{{item.riskact__level == '较大风险'}}" style="background-color:orange">较大风险</view>
+              <view class="weui-media-box__title" wx:if="{{item.riskact__level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
               <view wx:if="{{item.user__userid!=null}}" class="weui-media-box__title" style="background-color:green;color:white">已完成</view>
-              <view class="weui-media-box__desc">
-              风险数量
-              <span style="color:red">{{item.num}}</span>
-              </view>
             </view>
           </navigator>
         </block>
@@ -74,24 +70,24 @@
       <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">
+          <navigator url="../riskact/check?riskact={{item.riskact__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.risk__riskact__area__name}} {{item.risk__riskact__name}}
+                {{item.riskact__area__name}} {{item.riskact__name}}
               </view>
               <view class="weui-media-box__desc">
                 <span style="background-color:orange;color:white">排查岗位</span>
-                {{item.risk__group__groupname}}
+                {{item.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 class="weui-media-box__title" wx:if="{{item.riskact__level == '低风险'}}" style="background-color:blue;color:white">低风险</view>
+              <view class="weui-media-box__title" wx:if="{{item.riskact__level == '一般风险'}}" style="background-color:yellow">一般风险</view>
+              <view class="weui-media-box__title" wx:if="{{item.riskact__level == '较大风险'}}" style="background-color:orange">较大风险</view>
+              <view class="weui-media-box__title" wx:if="{{item.riskact__level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
               <view wx:if="{{item.user__userid!=null}}" class="weui-media-box__title" style="background-color:green;color:white">已完成</view>
             </view>
           </navigator>
diff --git a/pages/risktask/main.js b/pages/risktask/main.js
deleted file mode 100644
index 7abd958..0000000
--- a/pages/risktask/main.js
+++ /dev/null
@@ -1,283 +0,0 @@
-// pages/examtest/main.js
-var util = require('../../utils/util.js')
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    fxIndex: 0,
-    answerChoices: [],
-    ydtm: 0
-  },
-  riskdata: {
-
-  },
-  calydtm: function (e) {
-    var tms = this.riskdata.tms
-    var ydtm = 0
-    for (var i = 0, len = tms.length; i < len; ++i) {
-      if (tms[i].userchecked && tms[i].userchecked.length != 0) {
-        ydtm += 1
-      }
-    }
-    this.setData({
-      ydtm: ydtm
-    })
-  },
-  radioChange: function (e) {
-    console.log('radio发生change事件，携带value值为：', e.detail.value);
-    var answerChoices = this.data.answerChoices;
-    for (var i = 0, len = answerChoices.length; i < len; ++i) {
-      answerChoices[i].checked = answerChoices[i].value == e.detail.value;
-    }
-
-    this.setData({
-      answerChoices: answerChoices,
-    });
-    this.riskdata.tms[this.data.fxIndex]['userchecked'] = e.detail.value
-    this.calydtm()
-  },
-  checkboxChange: function (e) {
-    console.log('checkbox发生change事件，携带value值为：', e.detail.value);
-
-    var answerChoices = this.data.answerChoices, values = e.detail.value;
-    for (var i = 0, lenI = answerChoices.length; i < lenI; ++i) {
-      answerChoices[i].checked = false;
-
-      for (var j = 0, lenJ = values.length; j < lenJ; ++j) {
-        if (answerChoices[i].value == values[j]) {
-          answerChoices[i].checked = true;
-          break;
-        }
-      }
-    }
-
-    this.setData({
-      answerChoices: answerChoices,
-    });
-    this.riskdata.tms[this.data.fxIndex]['userchecked'] = e.detail.value
-    this.calydtm()
-  },
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    console.log(options)
-    this.data.riskact = options.riskact
-    this.data.group = options.group
-      wx.showLoading({})
-      wx.request({
-        url: getApp().globalData.serverUrl + 'api/risktask?a=listtaskall' + '&group=' + this.data.group + '&riskact=' + this.data.riskact,
-        header: {
-          'content-type': 'application/json', // 默认值
-          'Cookie': wx.getStorageSync("sessionid"),
-        },
-        success: res => {
-          if (res.statusCode === 200) {
-            let risks = res.data
-            this.riskdata = risks
-            this.showRisk(0)
-            this.setData({
-              total: risks.total,
-            })
-          }
-          wx.hideLoading();
-        }
-      });
-    
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-    // wx.showModal({
-    //   title: '系统提示',
-    //   content: '未完成答卷,是否要提交答卷!',
-    //   confirmText: "提交",
-    //   cancelText: "点错了",
-    //   success: function (res) {
-    //     if (res.confirm) {
-    //     } else {
-    //       this.onShow()
-    //     }
-    //   }
-    // })
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  },
-  showRisk: function (index) {
-    var that = this
-    var currentFx = that.riskdata.rows[index]
-    console.log(currentFx)
-    that.setData({ 'currentFx': currentFx })
-  },
-  showChecked: function (index) {
-    var tm = this.riskdata.tms[index]
-    let choices = this.data.answerChoices
-    if (tm.userchecked) {
-      if (tm.question__type == 2) {
-        for (var i = 0, len = choices.length; i < len; i++) {
-          if (tm.userchecked.indexOf(choices[i].value) != -1) {
-            choices[i].checked = true
-          }
-        }
-      } else {
-        for (var i = 0, len = choices.length; i < len; i++) {
-          if (choices[i].value == tm.userchecked) {
-            choices[i].checked = true
-          }
-        }
-      }
-      this.setData({
-        answerChoices: choices
-      })
-    }
-  },
-  next: function () {
-    var that = this
-    var fxIndex = that.data.fxIndex + 1
-    that.showTm(fxIndex)
-    that.setData({
-      fxIndex: fxIndex,
-    })
-    that.showChecked(fxIndex)
-  },
-  previous: function () {
-    var that = this
-    var fxIndex = that.data.fxIndex - 1
-    that.showTm(fxIndex)
-    that.setData({
-      fxIndex: fxIndex,
-    })
-    that.showChecked(fxIndex)
-  },
-  hand: function () {
-    var that = this
-    if (that.data.ydtm < that.riskdata.tms.length) {
-      wx.showModal({
-        title: '警告',
-        content: '答卷未完成,确定提交?',
-        confirmText: "确定",
-        cancelText: "取消",
-        success: function (res) {
-          if (res.confirm) {
-            that.handtest()
-          }
-        }
-      })
-    } else {
-      wx.showModal({
-        content: '确定提交?',
-        confirmText: "确定",
-        cancelText: "取消",
-        success: function (res) {
-          if (res.confirm) {
-            that.handtest()
-          }
-        }
-      })
-    }
-  },
-  handtest: function () {
-    var data = {
-      'testid': this.data.testid,
-      'starttime': this.data.starttime,
-      'endtime': util.formatTime(new Date()),
-      'sheet': this.riskdata.tms
-    }
-    wx.showLoading({
-      title: '自动判卷中..',
-    })
-    wx.request({
-      url: getApp().globalData.serverUrl + 'api/examtestdetail?a=handtest&id=' + this.data.testid,
-      header: {
-        'content-type': 'application/json', // 默认值
-        'Cookie': wx.getStorageSync("sessionid"),
-      },
-      method: 'POST',
-      data: data,
-      success: res => {
-        if (res.statusCode === 200) {
-          wx.hideLoading()
-          wx.redirectTo({
-            url: 'result?' + parseParams(res.data.data),
-          })
-          clearTimeout(getApp().globalData.timepass)
-        }
-      }
-    });
-  }
-})
-function formatmil(mil) {
-  var allSecond = Math.floor(mil / 1000);
-  var h = Math.floor(allSecond / 3600);
-  var m = Math.floor((allSecond - h * 3600) / 60);
-  var s = Math.floor(allSecond - h * 3600 - m * 60);
-  h = toTow(h);
-  m = toTow(m);
-  s = toTow(s);
-  return h + ":" + m + ":" + s;
-}
-function toTow(num) {
-  if (num < 10) {
-    return "0" + num;
-  } else {
-    return num;
-  }
-}
-function parseParams(data) {
-  try {
-    var tempArr = [];
-    for (var i in data) {
-      var key = encodeURIComponent(i);
-      var value = encodeURIComponent(data[i]);
-      tempArr.push(key + '=' + value);
-    }
-    var urlParamsStr = tempArr.join('&');
-    return urlParamsStr;
-  } catch (err) {
-    return '';
-  }
-}
\ No newline at end of file
diff --git a/pages/risktask/main.json b/pages/risktask/main.json
deleted file mode 100644
index 9c848e5..0000000
--- a/pages/risktask/main.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "usingComponents": {},
-  "navigationBarTitleText": "考试中"
-}
\ No newline at end of file
diff --git a/pages/risktask/main.wxml b/pages/risktask/main.wxml
deleted file mode 100644
index 809eb2d..0000000
--- a/pages/risktask/main.wxml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--pages/examtest/main.wxml-->
-<view class="head">
-
-<view style="float:left">倒计时 {{countdown}}</view>
-<navigator url="sheet" >
-<view class="sheet">答题卡: {{ydtm}}/{{tmtotal}}</view>
-</navigator>
-</view>
-<view >
-</view>
-<view class="weui-article">
-  <view class="weui-article__h2">{{tmIndex+1}}.
-    <span wx:if="{{currentTm.question__type==1}}" class="txlabel">单选题</span>
-    <span wx:if="{{currentTm.question__type==2}}" class="txlabel">多选题</span>
-    <span wx:if="{{currentTm.question__type==3}}" class="txlabel">判断题</span>
-    <span> ({{currentTm.score}}分)</span>
-  </view>
-  <view class="weui-article__title">{{currentTm.question__title}}</view>
-</view>
-  <radio-group bindchange="radioChange" wx:if="{{(currentTm.question__type==1 ||currentTm.question__type==3)}}">
-    <label class="weui-cell weui-check__label" wx:for="{{answerChoices}}" wx:key="value">
-      <radio class="weui-check" value="{{item.value}}" checked="{{item.checked}}" />
-
-      <view class="weui-cell__bd">{{item.name}}: {{currentTm.question__answer[item.value]}}</view>
-      <view class="weui-cell__ft weui-cell__ft_in-radio" wx:if="{{item.checked}}">
-        <icon class="weui-icon-radio" type="success_no_circle" size="16"></icon>
-      </view>
-    </label>
-  </radio-group>
-  <checkbox-group bindchange="checkboxChange" wx:if="{{currentTm.question__type==2}}">
-    <label class="weui-cell weui-check__label" wx:for="{{answerChoices}}" wx:key="value">
-      <checkbox class="weui-check" value="{{item.value}}" checked="{{item.checked}}" />
-      <view class="weui-cell__bd">{{item.name}}: {{currentTm.question__answer[item.value]}}</view>
-      <view class="weui-cell__hd weui-check__hd_in-checkbox">
-        <icon class="weui-icon-checkbox_circle" type="circle" size="23" wx:if="{{!item.checked}}"></icon>
-        <icon class="weui-icon-checkbox_success" type="success" size="23" wx:if="{{item.checked}}"></icon>
-      </view>
-    </label>
-  </checkbox-group>
-<view style="position:fixed;bottom:0;left:0;width:100%;">
-  <view style="width:30%;float:left">
-    <button class="weui-btn" type="primary" bindtap="previous" disabled="{{tmIndex==0}}">上一题</button>
-  </view>
-  <view style="width:30%;float:left">
-    <button class="weui-btn" type="primary" bindtap="next" disabled="{{tmIndex==tmtotal-1}}">下一题</button>
-  </view>
-  <view style="width:30%;float:right">
-    <button class="weui-btn" type="primary" bindtap="hand" >交卷</button>
-  </view>
-</view>
\ No newline at end of file
diff --git a/pages/risktask/main.wxss b/pages/risktask/main.wxss
deleted file mode 100644
index e51debe..0000000
--- a/pages/risktask/main.wxss
+++ /dev/null
@@ -1,18 +0,0 @@
-.head{
-  color:#fff;
-  background-color: cornflowerblue;
-}
-.txlabel{
-  color:#fff;
-  background-color: rgb(216, 140, 0);
-  padding: 2px
-}
-.weui-btn{
-  width:auto;
-  margin: 5px;
-}
-.sheet{
-  color:#fff;
-  background-color: red;
-  float:right
-}
\ No newline at end of file
diff --git a/pages/suggest/update.js b/pages/suggest/update.js
index 52a5174..9ade9c6 100644
--- a/pages/suggest/update.js
+++ b/pages/suggest/update.js
@@ -11,40 +11,8 @@ Page({
     shresult:'',
     apcl:true,
     zjtr:false,
-  },
-  shChange: function (e) {
-    if (e.detail.value == false) { this.setData({
-      shresult:'reject'
-    }) }
-    else { this.setData({
-      shresult:''
-    }) }
-  },
-  apcl: function (e) {
-    if (e.detail.value == false) {
-      this.setData({
-        apcl: false,
-      })
-    }
-    else {
-      this.setData({
-        apcl: true
-      })
-    }
-    console.log(this.data.apcl)
-  },
-  zjtr: function (e) {
-    if (e.detail.value == false) {
-      this.setData({
-        zjtr:false
-      })
-    }
-    else {
-      this.setData({
-        apcl: false,
-        zjtr:true,
-      })
-    }
+    accept: 'yes',
+    action: '安排处理'
   },
   bindjyfkInput: function (e) {
     this.data.jyfk = e.detail.value
@@ -314,4 +282,44 @@ Page({
       urls: this.data.jyimg2
     })
   },
+  openaction: function () {
+    var that = this
+    wx.showActionSheet({
+      itemList: ['安排处理', '转交他人', '不采纳','采纳并归档'],
+      success: function (res) {
+        if (!res.cancel) {
+          if (res.tapIndex == 0) {
+            that.setData({
+              'apcl': true,
+              'zjtr': false,
+              'accept': 'yes',
+              'action': '安排处理'
+            })
+          }
+          else if (res.tapIndex == 1) {
+            that.setData({
+              'apcl': false,
+              'zjtr': true,
+              'accept': 'yes',
+              'action': '转交他人'
+            })
+          } else if (res.tapIndex == 2) {
+            that.setData({
+              'apcl': false,
+              'zjtr': false,
+              'accept': 'no',
+              'action': '不采纳'
+            })
+          } else if (res.tapIndex == 3) {
+            that.setData({
+              'apcl': false,
+              'zjtr': false,
+              'accept': 'yes',
+              'action': '采纳并归档'
+            })
+          }
+        }
+      }
+    });
+  }
 })
\ No newline at end of file
diff --git a/pages/suggest/update.wxml b/pages/suggest/update.wxml
index 10571ff..8d13924 100644
--- a/pages/suggest/update.wxml
+++ b/pages/suggest/update.wxml
@@ -118,20 +118,9 @@
     </view>
   </view>
 </view>
-<view class="weui-cells weui-cells_after-title">
-  <view class="weui-cell weui-cell_switch" wx:if="{{jyzt==1}}">
-    <view class="weui-cell__bd">安排处理</view>
-    <view class="weui-cell__ft">
-      <switch checked="{{apcl}}" bindchange="apcl" />
-    </view>
-  </view>
-  <view class="weui-cell weui-cell_switch" wx:if="{{jyzt==1}}">
-    <view class="weui-cell__bd">转交</view>
-    <view class="weui-cell__ft">
-      <switch bindchange="zjtr" checked="{{zjtr}}" />
-    </view>
-  </view>
-</view>
+<button type="primary" bindtap="openaction" class="weui-btn" wx:if="{{jyzt ==1}}">选择操作</button>
+<view wx:if="{{jyzt ==1}}"><span>当前操作：</span><span style="color:blue">{{action}}</span></view>
+
 <view class="weui-cells weui-cells_after-title">
   <view class="weui-cell weui-cell_select" wx:if='{{zjtr==true}}'>
     <view class="weui-cell__hd weui-cell__hd_in-select-after">
diff --git a/pages/train/train.js b/pages/train/train.js
index f4ab65a..a0aacac 100644
--- a/pages/train/train.js
+++ b/pages/train/train.js
@@ -244,10 +244,20 @@ Page({
       onlyFromCamera: true,
       success(res) {
         console.log(res)
-        let pxid = util.getQueryString(res.result, 'trainid')
-        wx.navigateTo({
-          url: 'check?pxid='+pxid,
-        })
+        if (res.result.indexOf("trainid") != -1) {
+          let pxid = util.getQueryString(res.result, 'trainid')
+          wx.navigateTo({
+            url: 'check?pxid=' + pxid,
+          })
+        } else {
+          wx.showModal({
+            title: "系统提示",
+            content: '请扫培训二维码!',
+            showCancel: false,
+            confirmText: "确定"
+          })
+        }
+        
       }
     })
   },
diff --git a/pages/trouble/accesstrouble.js b/pages/trouble/accesstrouble.js
index f2547cc..caaf3b2 100644
--- a/pages/trouble/accesstrouble.js
+++ b/pages/trouble/accesstrouble.js
@@ -27,7 +27,8 @@ Page({
     yhtp: [],
     zghtp: [],
     zppg: 'no',
-    newr:''
+    newr:'',
+    action:'正常处理'
   },
   yhlbArray:{},
   bindfcyjInput: function (e) {
@@ -45,37 +46,6 @@ Page({
   bindyhddInput: function (e) {
     this.data.yhdd = e.detail.value
   },
-  shChange: function(e){
-    if (e.detail.value == false) { this.data.shresult='reject'}
-    else { this.data.shresult = ''}
-  },
-  zppg: function (e) {
-    if (e.detail.value == true) {
-      this.setData({
-        zppg: 'yes',
-      }) }
-    else { 
-      this.setData({
-        zppg:'no',
-      })
-      }
-  },
-  bhct: function (e) {
-    if (e.detail.value == false) {
-      this.setData({
-        shresult:'pass',
-        zppg: 'no',
-        zppg_d: false,
-      })
-    }
-    else {
-      this.setData({
-        shresult: 'reject',
-        zppg_c: false,
-        zppg_d:true
-      })
-    }
-  },
   bindyhpgChange: function (e) {
     this.setData({
       yhpgIndex: e.detail.value,
@@ -608,5 +578,45 @@ Page({
         })
       }
     })
+  },
+  openaction: function () {
+    var that=this
+    wx.showActionSheet({
+      itemList: ['正常处理', '转交他人', '驳回重填', '不采纳'],
+      success: function (res) {
+        if (!res.cancel) {
+          if(res.tapIndex==0){
+            that.setData({
+              'zppg': 'no',
+              'shresult': 'pass',
+              'accept': 'yes',
+              'action':'正常处理'
+            })
+          }
+          else if(res.tapIndex==1){
+            that.setData({
+              'zppg':'yes',
+              'shresult':'pass',
+              'accept': 'yes',
+              'action': '转交他人'
+            })
+          }else if(res.tapIndex==2){
+            that.setData({
+              'shresult':'reject',
+              'zppg':'no',
+              'accept': 'yes',
+              'action': '驳回重填'
+            })
+          }else if(res.tapIndex==3){
+            that.setData({
+              'shresult': 'reject',
+              'zppg': 'no',
+              'accept': 'no',
+              'action': '不采纳'
+            })
+          }
+        }
+      }
+    });
   }
 })
\ No newline at end of file
diff --git a/pages/trouble/accesstrouble.wxml b/pages/trouble/accesstrouble.wxml
index f010086..fd058fc 100644
--- a/pages/trouble/accesstrouble.wxml
+++ b/pages/trouble/accesstrouble.wxml
@@ -97,19 +97,8 @@
     </view>
   </view>
 </view>
-
-<view class="weui-cell weui-cell_switch" wx:if="{{yhzt ==1}}">
-  <view class="weui-cell__bd">转交他人</view>
-  <view class="weui-cell__ft">
-    <switch bindchange="zppg" checked='{{zppg_c}}' disabled='{{zppg_d}}' />
-  </view>
-</view>
-<view class="weui-cell weui-cell_switch" wx:if="{{yhzt ==1}}">
-  <view class="weui-cell__bd">退回重填</view>
-  <view class="weui-cell__ft">
-    <switch bindchange="bhct" checked='{{bhct_c}}' disabled='{{bhct_d}}' />
-  </view>
-</view>
+<button type="primary" bindtap="openaction" class="weui-btn" wx:if="{{yhzt ==1}}">选择操作</button>
+<view wx:if="{{yhzt ==1}}"><span>当前操作：</span><span style="color:blue">{{action}}</span></view>
 <view wx:if='{{yhzt!=0}}'>
   <view wx:if="{{zppg=='yes' && shresult !='reject' }}">
     <view class="weui-cells__title">新评估人</view>