From 03da1d20653c332b8c11d18081e91aa0c93057dd Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 12 Aug 2019 08:21:31 +0800
Subject: [PATCH] t4800812

---
 pages/risktask/check.js         | 34 ++++++++++++++++++++-
 pages/risktask/check.wxml       |  5 +++-
 pages/risktask/index.js         | 16 ++++++++--
 pages/risktask/index.wxml       | 52 ++++++++++++++++++---------------
 pages/trouble/addtrouble.js     |  2 +-
 pages/trouble/addtroublezg.js   | 26 ++++++++++++++++-
 pages/trouble/addtroublezg.wxml |  1 +
 pages/trouble/addtroublezp.js   | 26 ++++++++++++++++-
 pages/trouble/addtroublezp.wxml |  4 ++-
 9 files changed, 135 insertions(+), 31 deletions(-)

diff --git a/pages/risktask/check.js b/pages/risktask/check.js
index 84555c8..2e9888f 100644
--- a/pages/risktask/check.js
+++ b/pages/risktask/check.js
@@ -16,7 +16,13 @@ Page({
   onLoad: function (options) {
     console.log(options)
     this.data.riskact = options.riskact
-    this.data.group = options.group
+    if(options.group==undefined){
+      this.data.group = 'all'
+    }else{
+      this.data.group = options.group
+    }
+    
+
   },
   getlist:function(){
     var page = this.data.page
@@ -118,4 +124,30 @@ Page({
       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/check.wxml b/pages/risktask/check.wxml
index 2f8f8cc..e710ec0 100644
--- a/pages/risktask/check.wxml
+++ b/pages/risktask/check.wxml
@@ -40,10 +40,13 @@
                <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" >排查完毕,提交!</button>
+      <button class="weui-btn" type="primary" bindtap="submit" 
+      disabled="{{alllist[0].user__userid!=null}}"
+      >排查完毕,提交!</button>
     </view>
diff --git a/pages/risktask/index.js b/pages/risktask/index.js
index 1c0aad3..3d32918 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
@@ -190,7 +190,7 @@ Page({
       title: '加载中',
     }),
       wx.request({
-        url: this.data.serverUrl + 'api/suggest?a=listself&rows=10&page=' + page,
+        url: this.data.serverUrl + 'api/listtask?a=list2done&rows=10&page=' + page,
         header: {
           'content-type': 'application/json', // 默认值
           'Cookie': wx.getStorageSync("sessionid"),
@@ -228,6 +228,18 @@ Page({
         }
       });
   },
+  scan: function () {
+    wx.scanCode({
+      onlyFromCamera: true,
+      success(res) {
+        console.log(res)
+        let id = res.result.split('=')[1]
+        wx.navigateTo({
+          url: 'check?riskact=' + id,
+        })
+      }
+    })
+  },
   gettodolist: function (page) {
     var that = this;
     if (page != 1) { page = that.data.todopage }
diff --git a/pages/risktask/index.wxml b/pages/risktask/index.wxml
index 1c7db05..557b144 100644
--- a/pages/risktask/index.wxml
+++ b/pages/risktask/index.wxml
@@ -12,18 +12,25 @@
       <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">
+          <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">{{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 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.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 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 wx:if="{{item.user__userid!=null}}" class="weui-media-box__title" style="background-color:green;color:white">已完成</view>
             </view>
           </navigator>
         </block>
@@ -36,12 +43,12 @@
           <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}}
+                <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}}
+                <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>
@@ -51,6 +58,7 @@
               <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 wx:if="{{item.user__userid!=null}}" class="weui-media-box__title" style="background-color:green;color:white">已完成</view>
             </view>
           </navigator>
         </block>
@@ -63,12 +71,12 @@
           <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}}
+                <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}}
+                <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>
@@ -78,7 +86,7 @@
               <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 wx:if="{{item.user__userid!=null}}" class="weui-media-box__title" style="background-color:green;color:white">已完成</view>
             </view>
           </navigator>
         </block>
@@ -88,8 +96,6 @@
 </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 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/trouble/addtrouble.js b/pages/trouble/addtrouble.js
index d6b6077..d3f1b09 100644
--- a/pages/trouble/addtrouble.js
+++ b/pages/trouble/addtrouble.js
@@ -275,7 +275,7 @@ Page({
                 if (res.statusCode === 200) {
                   wx.hideLoading();
                   wx.navigateBack({
-                    delta: 2
+                    delta: 1
                   })
 
                 }
diff --git a/pages/trouble/addtroublezg.js b/pages/trouble/addtroublezg.js
index 6253de2..2f27091 100644
--- a/pages/trouble/addtroublezg.js
+++ b/pages/trouble/addtroublezg.js
@@ -209,7 +209,31 @@ Page({
                 }
               }
             });
-          }else{
+          }
+          else if (this.data.yhtype == 'risktask') {
+            let data = { 'risktask': null, 'trouble': null }
+            data.risktask = this.data.risktaskdata.id
+            data.trouble = res.data.trouble
+            wx.request({
+              url: this.data.serverUrl + 'api/risktask?a=checktrouble',
+              header: {
+                'content-type': 'application/json', // 
+                'Cookie': wx.getStorageSync("sessionid"),
+              },
+              method: 'POST',
+              data: data,
+              success: res => {
+                if (res.statusCode === 200) {
+                  wx.hideLoading();
+                  wx.navigateBack({
+                    delta: 2
+                  })
+
+                }
+              }
+            });
+          }
+          else{
             wx.hideLoading();
             wx.navigateBack({
               delta: 2
diff --git a/pages/trouble/addtroublezg.wxml b/pages/trouble/addtroublezg.wxml
index 2e96ed4..99a8622 100644
--- a/pages/trouble/addtroublezg.wxml
+++ b/pages/trouble/addtroublezg.wxml
@@ -1,6 +1,7 @@
 <view class="page" >
   <view class="page__bd">
   <view class="head" wx:if="{{yhtype=='inspect'}}">{{inspectdata.equipment.name}} 设备异常</view>
+  <view class="head" wx:if="{{yhtype=='risktask'}}">风险 {{risktaskdata.risk__step}}</view>
     <view class="weui-cells__title">评估信息</view>
     <view class="weui-cells weui-cells_after-title">
       <view class="weui-cell weui-cell_select">
diff --git a/pages/trouble/addtroublezp.js b/pages/trouble/addtroublezp.js
index c4c7561..488314b 100644
--- a/pages/trouble/addtroublezp.js
+++ b/pages/trouble/addtroublezp.js
@@ -169,7 +169,31 @@ Page({
                 }
               }
             });
-          }else{
+          }
+          else if (this.data.yhtype == 'risktask') {
+            let data = { 'risktask': null, 'trouble': null }
+            data.risktask = this.data.risktaskdata.id
+            data.trouble = res.data.trouble
+            wx.request({
+              url: this.data.serverUrl + 'api/risktask?a=checktrouble',
+              header: {
+                'content-type': 'application/json', // 
+                'Cookie': wx.getStorageSync("sessionid"),
+              },
+              method: 'POST',
+              data: data,
+              success: res => {
+                if (res.statusCode === 200) {
+                  wx.hideLoading();
+                  wx.navigateBack({
+                    delta: 2
+                  })
+
+                }
+              }
+            });
+          }
+          else{
             wx.hideLoading();
             wx.navigateBack({
               delta: 2
diff --git a/pages/trouble/addtroublezp.wxml b/pages/trouble/addtroublezp.wxml
index b5e72ef..c75a0a0 100644
--- a/pages/trouble/addtroublezp.wxml
+++ b/pages/trouble/addtroublezp.wxml
@@ -1,6 +1,8 @@
 <view class="page">
   <view class="page__bd">
-  <view class="head" wx:if="{{yhtype=='inspect'}}">{{inspectdata.equipment.name}} 设备异常</view>
+  <view class="head" wx:if="{{yhtype=='inspect'}}">{{inspectdata.equipment.name}} 设备异常
+  </view>
+  <view class="head" wx:if="{{yhtype=='riskdata'}}">风险 {{inspectdata.equipment.name}}</view>
     <view class="weui-cells__title">评估信息</view>
     <view class="weui-cells weui-cells_after-title">
       <view class="weui-cell weui-cell_select">