设备巡检、岗位风险

app.js

@@ -73,8 +73,8 @@ App({
   },
   globalData: {
     userInfo: null,
-    serverUrl: 'https://safeyun.ctcshe.com/',
+    //serverUrl: 'https://safeyun.ctcshe.com/',
-    //serverUrl: 'http://127.0.0.1:8000/',
+    serverUrl: 'http://127.0.0.1:8000/',
     //serverUrl: 'http://192.168.0.102:8000/',
     //serverUrl:'http://10.7.100.250:8000/',
     isaqy: 0

app.json

@@ -53,12 +53,20 @@
     "pages/safecert/detail",
     "pages/exercise/index",
     "pages/questioncat/index",
-    "pages/exercise/main"
+    "pages/exercise/main",
+    "pages/area/tree",
+    "pages/suggest/update",
+    "pages/inspect/index",
+    "pages/inspect/add",
+    "pages/inspect/detail",
+    "pages/equipment/detail",
+    "pages/risk/myindex",
+    "pages/risk/detail"
   ],
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#fff",
-    "navigationBarTitleText": "安全预警lite",
+    "navigationBarTitleText": "安全生产管理工具",
     "navigationBarTextStyle": "black"
   },
   "tabBar": {

pages/area/tree.js

@@ -0,0 +1,41 @@
+Page({
+  data: {
+    value: [],
+  },
+  selThis(e) {
+    //console.log(e.detail);
+    var pages = getCurrentPages();
+    var prevPage = pages[pages.length - 2];
+    prevPage.setData({
+      yhqy:e.detail.id,
+      yhqy__name:e.detail.name,
+      missqy:e.detail.id,
+      missqy__name:e.detail.name,
+      zyqy__name:e.detail.name,
+      zyqy:e.detail.id,
+      jyqy:e.detail.id,
+      jyqy__name:e.detail.name
+    })
+    wx.navigateBack()
+  },
+  onLoad: function (option) {
+    wx.request({
+      url: getApp().globalData.serverUrl + 'api/area?a=tree',
+      header: {
+        'content-type': 'application/json', // 默认值
+        'Cookie': wx.getStorageSync("sessionid"),
+      },
+      data: {},
+      success: res => {
+        if (res.statusCode === 200) {
+          //console.log(res.data)
+          var data = res.data
+          console.log(data)
+          this.setData({
+            value: data
+          })
+        }
+      }
+    });
+  },
+});

pages/area/tree.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "path-view": "/components/path-view/index"
+  }
+}

pages/area/tree.wxml

@@ -0,0 +1,8 @@
+
+
+<view class="container">
+  <text class="item">地图区域</text>
+  <path-view value="{{value}}"
+             btnTxt='选中本项'
+             catchtapBtn="selThis"></path-view>
+</view>

pages/area/tree.wxss

@@ -0,0 +1,12 @@
+.item {
+  display: block;
+  margin: 20px 0 10px;
+  padding-left: 10px;
+  font-size: 16px;
+}
+.ps {
+  margin-bottom: 10px;
+  padding: 0 10px;
+  color: #666;
+  font-size: 24rpx;
+}

pages/equipment/detail.js

@@ -0,0 +1,66 @@
+// pages/equipment/detail.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/equipment/detail.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/equipment/detail.wxml

@@ -0,0 +1,2 @@
+<!--pages/equipment/detail.wxml-->
+<text>pages/equipment/detail.wxml</text>

pages/equipment/detail.wxss

@@ -0,0 +1 @@
+/* pages/equipment/detail.wxss */

pages/examtest/index.js

@@ -39,6 +39,7 @@ Page({
         },
         success: res => {
           if (res.statusCode === 200) {
+            console.log(res.data.rows)
             if (res.data.rows.length == 0) {
               if (page == 1) {
                 this.setData({
@@ -169,4 +170,24 @@ Page({
       this.getyklist();
     }
   },
+  testDetail:function(e){
+    let data = e.currentTarget.dataset
+    let examtest__state = data.examtest__state
+    console.log(examtest__state)
+    let id = data.id
+    if (examtest__state==0){
+      let url = "detail?detailid="+id.toString()
+      wx.navigateTo({
+        url: url,
+      })
+    }else{
+      wx.showModal({
+        title: "系统提示",
+        content: '考试还未关闭,请稍候查看',
+        showCancel: false,
+        confirmText: "确定"
+      })
+    }
+    
+  }
 });

pages/examtest/index.wxml

@@ -28,7 +28,7 @@
         共{{yktotal}}条考试</view>
       <view class="weui-cells weui-cells_after-title">
         <block wx:for="{{yklist}}" wx:key="unique">
-          <navigator url="detail?detailid={{item.id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
+          <view bindtap='testDetail' data-examtest__state="{{item.examtest__state}}" data-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.examtest__name}}
               </view>
@@ -36,14 +36,14 @@
               <view class="weui-media-box__desc" style="color:blue">耗时:{{item.took}}分钟  得分:{{item.score}}</view>
             </view>
             <view class="weui-panel__ft weui-cell__ft_in-access">
-              <view class="weui-media-box__title" wx:if="{{item.passcode==1}}" style="color:green">
+              <view class="weui-media-box__title" >
-              通过
+              <view wx:if="{{item.passcode==1}}" style="color:green">通过</view>
-              </view>
+              <view wx:if="{{item.passcode==0 && item.ison==1}}" style="color:red">未通过</view>
-              <view class="weui-media-box__title" wx:if="{{item.passcode==0 && item.ison==1}}" style="color:red">
+              <view wx:if="{{item.examtest__state==1}}" style="color:green">进行中</view>
-              未通过
+              <view wx:else >已关闭</view>
+              </view>
             </view>
           </view>
-          </navigator>
         </block>
       </view>
 

pages/examtest/result.wxml

@@ -18,8 +18,8 @@
         </view>
         <view class="weui-msg__opr-area">
             <view class="weui-btn-area">
-                <button class="weui-btn" type="primary" bindtap='detail'>考卷详情</button>
+                <!-- <button class="weui-btn" type="primary" bindtap='detail'>考卷详情</button> -->
-                <button class="weui-btn" type="default" bindtap='back'>返回主页</button>
+                <button class="weui-btn" type="primary" bindtap='back'>返回主页</button>
             </view>
         </view>
     </view>

pages/exercise/index.js

@@ -6,6 +6,7 @@ Page({
    */
   data: {
   catsname:'',
+  cats:'',
   start1:true,
   start2:false
   },
@@ -48,6 +49,7 @@ wx.getStorage({
    */
   onShow: function () {
     var that=this
+    let oldcats = this.data.cats
     let lst = getApp().globalData.selectList
     let nst = []
     let nst1 = []
@@ -61,6 +63,7 @@ wx.getStorage({
         cats: nst1.join(','),
       })
     }
+    if (oldcats == '' || oldcats == this.data.cats){
       wx.getStorage({
         key: 'ydtms',
         success: function (res) {
@@ -70,6 +73,14 @@ wx.getStorage({
           })
         },
       })
+    }
+    else{
+      that.setData({
+        start1: true,
+        start2: false
+      })
+    }
+    
   },
 
   /**

pages/exercise/main.wxml

@@ -51,7 +51,7 @@
   <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">
+  <view style="width:40%;float:right">
     <button class="weui-btn" type="primary" bindtap="showanswer">查看答案</button>
   </view>
 </view>

pages/index/index.wxml

@@ -10,7 +10,8 @@
         <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
           <view class="weui-media-box__title">平台账号: {{username}}
           </view>
-          <view class="weui-media-box__desc">昵称: <open-data type="userNickName"></open-data> (点击进入个人信息管理)</view>
+          <view class="weui-media-box__desc">昵称:
+            <open-data type="userNickName"></open-data> (点击进入个人信息管理)</view>
         </view>
       </navigator>
     </view>
@@ -21,7 +22,9 @@
       <view class="weui-media-box weui-media-box_small-appmsg">
         <view class="weui-cells weui-cells_in-small-appmsg">
           <navigator url="../socert/socert" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
-                            <view class="weui-cell__hd"><image src="../images/socert.png" style="width: 20px;height: 20px;margin-right: 5px" /></view>
+            <view class="weui-cell__hd">
+              <image src="../images/socert.png" style="width: 20px;height: 20px;margin-right: 5px" />
+            </view>
             <view class="weui-cell__bd weui-cell_primary">
               <view>我的特种作业证书</view>
             </view>
@@ -32,7 +35,9 @@
       <view class="weui-media-box weui-media-box_small-appmsg">
         <view class="weui-cells weui-cells_in-small-appmsg">
           <navigator url="../safecert/index" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
-                            <view class="weui-cell__hd"><image src="../images/safecert.png" style="width: 20px;height: 20px;margin-right: 5px" /></view>
+            <view class="weui-cell__hd">
+              <image src="../images/safecert.png" style="width: 20px;height: 20px;margin-right: 5px" />
+            </view>
             <view class="weui-cell__bd weui-cell_primary">
               <view>我的安全资格证书</view>
             </view>
@@ -40,6 +45,19 @@
           </navigator>
         </view>
       </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">
+            <view class="weui-cell__hd">
+              <image src="../images/riskrole.png" style="width: 20px;height: 20px;margin-right: 5px" />
+            </view>
+            <view class="weui-cell__bd weui-cell_primary">
+              <view>我的岗位风险</view>
+            </view>
+            <view class="weui-cell__ft weui-cell__ft_in-access"></view>
+          </navigator>
+        </view>
+      </view>
     </view>
   </view>
 </view>

pages/inspect/add.js

@@ -0,0 +1,142 @@
+// pages/inspect/check.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    serverUrl: getApp().globalData.serverUrl,
+    state:1,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  radioChange: function (e) {
+    console.log('radio发生change事件，携带value值为：', e.detail.value);
+    this.setData({
+      state: e.detail.value,
+    });
+  },
+  bindcontentInput: function (e) {
+    this.data.content = e.detail.value
+  },
+  onLoad: function (options) {
+    let id = options.id
+    wx.request({
+      url: this.data.serverUrl + 'api/equipment?a=detail&id=' + id,
+      header: {
+        'content-type': 'application/json', // 默认值
+        'Cookie': wx.getStorageSync("sessionid"),
+      },
+      success: res => {
+        if (res.statusCode === 200) {
+          console.log(res.data)
+          this.setData({
+            equipment:res.data
+          })
+          wx.request({
+            url: this.data.serverUrl + 'api/risk?a=steps&type=equipment',
+            header: {
+              'content-type': 'application/json', // 默认值
+              'Cookie': wx.getStorageSync("sessionid"),
+            },
+            method:'post',
+            data:{'name':res.data.name,'id':res.data.id,'areaid':res.data.area__id},
+            success: res => {
+              if (res.statusCode === 200) {
+                if(res.data.code==1){
+                  this.setData({
+                    steps:res.data.steps
+                  })
+                }
+              }
+              wx.hideLoading();
+            }
+          });
+        }
+      }
+    });
+  },
+submit:function(){
+  let data={
+    equipment:this.data.equipment.id,
+    state:this.data.state,
+    content:this.data.content
+  }
+  wx.showLoading({
+    title: '提交中',
+  })
+  wx.request({
+    url: this.data.serverUrl + 'api/inspect?a=add',
+    header: {
+      'content-type': 'application/json', // 默认值
+      'Cookie': wx.getStorageSync("sessionid"),
+    },
+    method:'POST',
+    data:data,
+    success: res => {
+      if (res.statusCode === 200) {
+        console.log(res.data)
+        wx.navigateBack({
+          
+        })
+      }
+      wx.hideLoading();
+    }
+  });
+},
+  submit2: function () {
+    wx.navigateTo({
+      url: '/pages/trouble/addtrouble?type=inspect',
+    })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/inspect/add.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/inspect/add.wxml

@@ -0,0 +1,45 @@
+<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">{{equipment.num}}</view>
+  </view>
+  <navigator url="/pages/equipment/detail?id={{id}}" class="weui-cell weui-cell_access" hover-class="weui-cell_active">
+    <view class="weui-cell__bd">设备名称</view>
+    <view class="weui-cell__ft weui-cell__ft_in-access" style="color:green">{{equipment.name}}</view>
+  </navigator>
+  <view class="weui-cell ">
+    <view class="weui-cell__bd">区域</view>
+    <view class="weui-cell__ft">{{equipment.area__name}}</view>
+  </view>
+</view>
+<view class="weui-cells__title">检查项目</view>
+<view class="weui-cells weui-cells_after-title">
+  <block wx:for="{{steps}}" wx:key="unique">
+  <view class="weui-cell">
+        <view class="weui-media-box__title">{{item.step}}-</view>
+        <view class="weui-media-box__desc" style="color:red">{{item.result}}-</view>
+        <view class="weui-media-box__desc" style="color:green">{{item.hazard}}</view>
+  </view>
+  </block>
+</view>
+<view class="weui-cells__title">巡检记录</view>
+
+<radio-group name="radio-group" class="weui-cell" bindchange="radioChange">
+  <label>
+    <radio color="#1860F6" value="1" checked="{{state==1}}" />设备正常</label>
+  <label>
+    <radio color="#FF0000" value="0" checked="{{state==0}}" />设备异常</label>
+</radio-group>
+
+<view class="weui-cells weui-cells_after-title" wx:if="{{state==1}}">
+  <view class="weui-cell">
+    <view class="weui-cell__bd">
+      <textarea class="weui-textarea" placeholder="请输入巡检结论" style="height: 5.3em" bindinput="bindcontentInput" />
+    </view>
+  </view>
+</view>
+<view class="btn-area">
+  <button class="weui-btn" type="primary" bindtap="submit" wx:if="{{state==1}}">提交</button>
+  <button class="weui-btn" type="primary" bindtap="submit2" wx:else>继续补充隐患</button>
+</view>

pages/inspect/add.wxss

@@ -0,0 +1,3 @@
+.btn-area{
+  margin:5px
+}

pages/inspect/detail.js

@@ -0,0 +1,66 @@
+// pages/inspect/detail.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/inspect/detail.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/inspect/detail.wxml

@@ -0,0 +1,2 @@
+<!--pages/inspect/detail.wxml-->
+<text>pages/inspect/detail.wxml</text>

pages/inspect/detail.wxss

@@ -0,0 +1 @@
+/* pages/inspect/detail.wxss */

pages/inspect/index.js

@@ -0,0 +1,132 @@
+// pages/observe/observe.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    page: 1,
+    serverUrl: getApp().globalData.serverUrl,
+    xjlist: []
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    var that = this;
+    that.getXjlist(1)
+    this.data.page = 1;
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+  check: function () {
+    wx.scanCode({
+      onlyFromCamera: true,
+      success(res) {
+        console.log(res)
+        let id = res.result.split('=')[1]
+        wx.navigateTo({
+          url: 'add?id=' + id,
+        })
+      }
+    })
+  },
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  onPullDownRefresh: function () {
+    var that = this;
+    that.getXjlist(1);
+    wx.stopPullDownRefresh();
+    this.data.page = 1;
+  },
+  onReachBottom: function () {
+    //上拉分页,将页码加1，然后调用分页函数
+    this.data.page = this.data.page + 1;
+    this.getXjlist();
+
+  },
+  getXjlist: function (page) {
+    var that = this;
+    if (page != 1) { page = that.data.page }
+    wx.showLoading({
+      title: '加载中',
+    }),
+      wx.request({
+        url: this.data.serverUrl + 'api/inspect?a=listall&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,
+                  xjlist: []
+                })
+              }
+              else {
+                wx.showModal({
+                  content: "已经到底啦!",
+                  showCancel: false,
+                  confirmText: "确定",
+                })
+              }
+            } else {
+              let list
+              if (page == 1) {
+                list = res.data.rows
+              } else {
+                list = this.data.xjlist.concat(res.data.rows)
+              }
+              this.setData({
+                total: res.data.total,
+                xjlist: list
+              })
+            }
+          }
+          wx.hideLoading();
+        }
+      });
+  },
+})

pages/inspect/index.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "巡检记录",
+  "enablePullDownRefresh": true,
+  "onReachBottomDistance": 50
+}

pages/inspect/index.wxml

@@ -0,0 +1,20 @@
+
+
+  <view class="head">共{{total}}条巡检记录</view>
+  <view class="weui-cells weui-cells_after-title">
+    <block wx:for="{{xjlist}}" 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.equipment__name}} {{item.equipment__area__name}}</view>
+          <view class="weui-media-box__desc">
+          <span wx:if="{{item.state==1}}" style="background-color:green;color:white;padding:4px 4px">正常</span>
+          <span wx:if="{{item.state==0}}" style="background-color:red;color:white;padding:4px 4px">异常</span>
+          {{item.creattime}}</view>
+        </view>
+      </navigator>
+    </block>
+  </view>
+
+<view style="position:fixed; bottom:0;width:100%;">
+    <button class="weui-btn" type="primary" bindtap="check">扫一扫</button>
+</view>

pages/inspect/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;
+}
+ 

pages/main/main.js

@@ -9,7 +9,10 @@ Page({
       zytodonum:0,
       noread:0,
       dqdnum:0,
-      dknum:0
+      dknum:0,
+      gcnoread:0,
+      wsnoread:0,
+      jytodonum:0
   },
 
   /**
@@ -36,6 +39,9 @@ Page({
       this.getzytodonum()
       this.getpxqdnum()
       this.getdknum() //待考
+      this.getgcnoreadnum()
+      this.getwsnoreadnum()//未遂未读
+      this.getjytodonum()
     }else{
       getApp().callback = () => {
       this.getnoread()
@@ -43,6 +49,8 @@ Page({
       this.getzytodonum()
       this.getpxqdnum()
       this.getdknum()
+      this.getgcnoreadnum()
+      this.getjytodonum()
       };
     }
 
@@ -180,6 +188,66 @@ Page({
       }
     });
   },
+  getgcnoreadnum: function () {
+    var that = this
+    //获取待考
+    wx.request({
+      url: getApp().globalData.serverUrl + 'gchandle?a=noreadnum',
+      header: {
+        'content-type': 'application/json', // 默认值
+        'Cookie': wx.getStorageSync("sessionid"),
+      },
+      data: {},
+      success: res => {
+        if (res.statusCode === 200) {
+          //console.log(res.data)
+          this.setData({
+            gcnoread: res.data.noread,
+          })
+        }
+      }
+    });
+  },
+  getwsnoreadnum: function () {
+    var that = this
+    //获取待考
+    wx.request({
+      url: getApp().globalData.serverUrl + 'api/miss?a=noreadnum',
+      header: {
+        'content-type': 'application/json', // 默认值
+        'Cookie': wx.getStorageSync("sessionid"),
+      },
+      data: {},
+      success: res => {
+        if (res.statusCode === 200) {
+          //console.log(res.data)
+          this.setData({
+            wsnoread: res.data.noread,
+          })
+        }
+      }
+    });
+  },
+  getjytodonum: function () {
+    var that = this
+    //获取待考
+    wx.request({
+      url: getApp().globalData.serverUrl + 'api/suggest?a=todonum',
+      header: {
+        'content-type': 'application/json', // 默认值
+        'Cookie': wx.getStorageSync("sessionid"),
+      },
+      data: {},
+      success: res => {
+        if (res.statusCode === 200) {
+          //console.log(res.data)
+          this.setData({
+            jytodonum: res.data.todonum,
+          })
+        }
+      }
+    });
+  },
   taptest:function(){
     if (getApp().globalData.rights.indexOf('25') != -1) {//考试功能
       wx.navigateTo({

pages/main/main.wxml

@@ -10,13 +10,16 @@
       <navigator url="/pages/observe/observe" class="weui-grid" hover-class="weui-grid_active">
         <image class="weui-grid__icon" src="../images/watch.png" />
         <view class="weui-grid__label">行为观察</view>
+        <view class="weui-badge" style="position: absolute;top: 1em;right: 1em;" wx:if="{{gcnoread!=0}}">{{gcnoread}}</view>
       </navigator>
       <navigator url="/pages/miss/miss" class="weui-grid" hover-class="weui-grid_active">
         <image class="weui-grid__icon" src="../images/miss.png" />
         <view class="weui-grid__label">未遂事件</view>
+        <view class="weui-badge" style="position: absolute;top: 1em;right: 1em;" wx:if="{{wsnoread!=0}}">{{wsnoread}}</view>
       </navigator>
       <navigator url="/pages/suggest/suggest" class="weui-grid" hover-class="weui-grid_active">
         <image class="weui-grid__icon" src="../images/suggest.png" />
+        <view class="weui-badge" style="position: absolute;top: 1em;right: 1em;" wx:if="{{jytodonum!=0}}">{{jytodonum}}</view>
         <view class="weui-grid__label">合理化建议</view>
       </navigator>
       <navigator url="/pages/operation/operation" class="weui-grid" hover-class="weui-grid_active">
@@ -24,6 +27,10 @@
         <view class="weui-grid__label">作业许可</view>
         <view class="weui-badge" style="position: absolute;top: 1em;right: 1em;" wx:if="{{zytodonum!=0}}">{{zytodonum}}</view>
       </navigator>
+      <navigator url="/pages/inspect/index" class="weui-grid" hover-class="weui-grid_active">
+        <image class="weui-grid__icon" src="../images/inspect.png" />
+        <view class="weui-grid__label">设备巡检</view>
+      </navigator>
     </view>
     <view class="weui-cells__title">学习园地</view>
     <view class="weui-grids">

pages/miss/addmiss.js

@@ -7,6 +7,7 @@ Page({
    */
   data: {
     misstime: '',
+    missqy:'',
     missplace: '',
     missimg: [],
   },
@@ -74,6 +75,7 @@ Page({
   addobserve: function () {
     var wsdata = {
       misstime: this.data.misstime,
+      missqy:this.data.missqy,
       missplace: this.data.missplace,
       description: this.data.description,
       missimg: this.data.missimg,
@@ -111,6 +113,16 @@ Page({
       dateTime1: obj1.dateTime,
     });
     this.data.misstime = time
+    //拉取地图权限
+    if (getApp().globalData.rights.indexOf('30') != -1) {
+      this.setData({
+        mapright: true
+      })
+    } else {
+      this.setData({
+        mapright: false
+      })
+    }
   },
 
   /**

pages/miss/addmiss.wxml

@@ -17,6 +17,19 @@
           </picker>
         </view>
       </view>
+      <view class="weui-cell weui-cell_select" wx:if='{{mapright}}'>
+        <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/area/tree">
+            <view class="weui-select">
+              {{missqy__name}}
+            </view>
+          </navigator>
+        </view>
+      </view>
       <view class="weui-cell weui-cell_select">
         <view class="weui-cell__hd weui-cell__hd_in-select-after">
           <view class="weui-label">发生地点</view>
@@ -35,7 +48,7 @@
               <view class="weui-uploader__files">
                 <block wx:for="{{missimg}}" wx:for-item="image" wx:key="unique">
                   <view class="weui-uploader__file">
-                    <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" bindtap="previewImage" bindlongpress="deleteImage" data-index="{{index}}"></image>
+                    <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" data-index="{{index}}" bindtap="previewImage" bindlongpress="deleteImage" data-index="{{index}}"></image>
                   </view>
                 </block>
               </view>

pages/miss/addmiss.wxss

@@ -1 +1,3 @@
-/* pages/miss/addmiss.wxss */
+.btn-area{
+  margin:5px
+}

pages/miss/miss.wxml

@@ -9,6 +9,11 @@
           <view class="weui-media-box__desc">{{item.missnum}} {{item.misser__name}}填报</view>
           <view class="weui-media-box__desc">{{item.misstime}}</view>
         </view>
+        <view class="weui-panel__ft weui-cell__ft_in-access">
+        <view class="weui-media-box__title" wx:if="{{item.read == 0}}" style="background-color:yellow">未读</view>
+        <view class="weui-media-box__title" wx:else style="background-color:green">已读</view>
+        <view class="weui-media-box__desc" wx:if="{{item.read == 1}}">{{item.readtime}}</view>
+        </view>
       </navigator>
     </block>
   </view>

pages/observe/addobserve.js

@@ -167,6 +167,12 @@ Page({
       dateTime1: obj1.dateTime,
     });
     this.data.looktime = time
+    // 获取完整的年月日 时分秒，以及默认显示的数组
+    var dateTime2 = obj1.dateTime
+    this.setData({
+      dateTime2: obj1.dateTime,
+    });
+    this.data.looktime2 = time
     //获取观察字典
     wx.request({
       url: getApp().globalData.serverUrl + 'gchandle?a=getdics',
@@ -246,6 +252,7 @@ Page({
     var gcdata = {
       lookeder: this.data.lookeder,
       looktime: this.data.looktime,
+      looktime2:this.data.looktime2,
       lookplace: this.data.lookplace,
       actname: this.data.actname,
       lookimg: this.data.lookimg,
@@ -355,6 +362,29 @@ Page({
       dateTime1: arr
     });
   },
+  changeDateTime2(e) {
+    var dateTimeArray1 = this.data.dateTimeArray1
+    var dateTime2 = this.data.dateTime2
+    var time = dateTimeArray1[0][dateTime2[0]] + '-' + dateTimeArray1[1][dateTime2[1]] + '-' + dateTimeArray1[2][dateTime2[2]] + ' ' + dateTimeArray1[3][dateTime2[3]] + ':' + dateTimeArray1[4][dateTime2[4]]
+    //console.log(time)
+    this.data.looktime2 = time
+    this.setData({
+      dateTime2: e.detail.value,
+    });
+
+  },
+  changeDateTimeColumn2(e) {
+    var arr = this.data.dateTime2,
+      dateArr = this.data.dateTimeArray1;
+
+    arr[e.detail.column] = e.detail.value;
+    dateArr[2] = dateTimePicker.getMonthDay(dateArr[0][arr[0]], dateArr[1][arr[1]]);
+
+    this.setData({
+      dateTimeArray1: dateArr,
+      dateTime2: arr
+    });
+  },
   chooseImage: function () {
     var that = this
     wx.chooseImage({

pages/observe/addobserve.wxml

@@ -11,7 +11,7 @@
               <view class="weui-uploader__files">
                 <block wx:for="{{lookimg}}" wx:for-item="image" wx:key="unique">
                   <view class="weui-uploader__file">
-                    <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" bindtap="previewImage" bindlongpress="deleteImage" data-index="{{index}}"></image>
+                    <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" data-index="{{index}}" bindtap="previewImage" bindlongpress="deleteImage" data-index="{{index}}"></image>
                   </view>
                 </block>
               </view>
@@ -27,7 +27,7 @@
     <view class="weui-cells weui-cells_after-title">
       <view class="weui-cell weui-cell_input">
         <view class="weui-cell__hd">
-          <view class="weui-label">被观察对象</view>
+          <view class="weui-label">被观察人员</view>
         </view>
         <view class="weui-cell__bd">
           <input class="weui-input" placeholder="请输入" bindinput="bindlookederInput" />
@@ -35,7 +35,7 @@
       </view>
       <view class="weui-cell weui-cell_select">
         <view class="weui-cell__hd weui-cell__hd_in-select-after">
-          <view class="weui-label">观察时间</view>
+          <view class="weui-label">开始时间</view>
         </view>
         <view class="weui-cell__bd">
           <picker mode="multiSelector" value="{{dateTime1}}" bindchange="changeDateTime1" bindcolumnchange="changeDateTimeColumn1" range="{{dateTimeArray1}}">
@@ -45,6 +45,18 @@
           </picker>
         </view>
       </view>
+      <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">
+          <picker mode="multiSelector" value="{{dateTime2}}" bindchange="changeDateTime2" bindcolumnchange="changeDateTimeColumn2" range="{{dateTimeArray1}}">
+            <view class="weui-select">
+              {{dateTimeArray1[0][dateTime2[0]]}}-{{dateTimeArray1[1][dateTime2[1]]}}-{{dateTimeArray1[2][dateTime2[2]]}} {{dateTimeArray1[3][dateTime2[3]]}}:{{dateTimeArray1[4][dateTime2[4]]}}
+            </view>
+          </picker>
+        </view>
+      </view>
       <view class="weui-cell weui-cell_select">
         <view class="weui-cell__hd weui-cell__hd_in-select-after">
           <view class="weui-label">观察地点</view>
@@ -61,6 +73,25 @@
           <input class="weui-input" placeholder="请输入作业名称" bindinput="bindactnameInput" />
         </view>
       </view>
+
+    </view>
+    <view class="weui-cells__title">过程及交流记录</view>
+    <view class="weui-cells weui-cells_after-title">
+      <view class="weui-cell">
+        <view class="weui-cell__bd">
+          <textarea class="weui-textarea" placeholder="请输入描述" style="height: 3.3em" bindinput="bindotherunsafeInput" />
+          <view class="weui-textarea-counter">0/200</view>
+        </view>
+      </view>
+    </view>
+    <view class="weui-cells__title">共识或改进要求</view>
+    <view class="weui-cells weui-cells_after-title">
+      <view class="weui-cell">
+        <view class="weui-cell__bd">
+          <textarea class="weui-textarea" placeholder="请输入描述" style="height: 3.3em" bindinput="bindsafecontentInput" />
+          <view class="weui-textarea-counter">0/200</view>
+        </view>
+      </view>
     </view>
 
     <view class="weui-cells__title">不安全行为记录卡</view>
@@ -154,24 +185,6 @@
           <view class="weui-cell__bd">{{item.text}}</view>
         </label>
       </checkbox-group>
-    </view>
-        <view class="weui-cells__title">其他不安全行为</view>
-    <view class="weui-cells weui-cells_after-title">
-      <view class="weui-cell">
-        <view class="weui-cell__bd">
-          <textarea  class="weui-textarea" placeholder="请输入描述" style="height: 3.3em" bindinput="bindotherunsafeInput"/>
-          <view class="weui-textarea-counter">0/200</view>
-        </view>
-      </view>
-    </view>
-        <view class="weui-cells__title">安全或提倡的行为</view>
-    <view class="weui-cells weui-cells_after-title">
-      <view class="weui-cell">
-        <view class="weui-cell__bd">
-          <textarea  class="weui-textarea" placeholder="请输入描述" style="height: 3.3em" bindinput="bindsafecontentInput"/>
-          <view class="weui-textarea-counter">0/200</view>
-        </view>
-      </view>
     </view>
     <view class="btn-area">
       <button class="weui-btn" type="primary" bindtap="submit">提交</button>

pages/observe/addobserve.wxss

@@ -1 +1,3 @@
-/* pages/observe/addobserve.wxss */
+.btn-area{
+  margin:5px
+}

pages/observe/observe.wxml

@@ -9,6 +9,11 @@
           <view class="weui-media-box__desc">{{item.looknum}} {{item.looker__name}}填报</view>
           <view class="weui-media-box__desc">{{item.looktime}}</view>
         </view>
+        <view class="weui-panel__ft weui-cell__ft_in-access">
+        <view class="weui-media-box__title" wx:if="{{item.read == 0}}" style="background-color:yellow">未读</view>
+        <view class="weui-media-box__title" wx:else style="background-color:green">已读</view>
+        <view class="weui-media-box__desc" wx:if="{{item.read == 1}}">{{item.readtime}}</view>
+        </view>
       </navigator>
     </block>
   </view>

pages/observe/observedetail.wxml

@@ -77,6 +77,22 @@
       </view>
     </view>
   </view>
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>过程及交流记录</view>
+      <view class="weui-cell__ft">
+        {{otherunsafe}}
+      </view>
+    </view>
+  </view>
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>共识或改进要求</view>
+      <view class="weui-cell__ft">
+        {{safecontent}}
+      </view>
+    </view>
+  </view>
 </view>
 
 <view class="weui-cells__title">不安全行为记录</view>
@@ -88,22 +104,3 @@
     </view>
   </block>
 </view>
-<view class="weui-cells__title">其他</view>
-<view class="weui-cells weui-cells_after-title">
-  <view class="weui-cell weui-cell_access">
-    <view class="weui-cell__bd weui-cell_primary">
-      <view>其他不安全行为</view>
-      <view class="weui-cell__ft">
-        {{otherunsafe}}
-      </view>
-    </view>
-  </view>
-  <view class="weui-cell weui-cell_access">
-    <view class="weui-cell__bd weui-cell_primary">
-      <view>安全或提倡的行为</view>
-      <view class="weui-cell__ft">
-        {{safecontent}}
-      </view>
-    </view>
-  </view>
-</view>

pages/operation/operationadd.js

@@ -6,7 +6,8 @@ Page({
    * 页面的初始数据
    */
   data: {
-    zyimg:[]
+    zyimg:[],
+    zyqy:''
   },
   checkboxChangefxcs: function (e) {
     var x = this.data.fxcslist;
@@ -79,6 +80,16 @@ Page({
       dateTime2: obj2.dateTime,
       dateshow2: 0
     });
+    //拉取地图权限
+    if (getApp().globalData.rights.indexOf('30') != -1) {
+      this.setData({
+        mapright: true
+      })
+    } else {
+      this.setData({
+        mapright: false
+      })
+    }
   },
 
   /**
@@ -301,6 +312,7 @@ Page({
       zylx:this.data.zylx,
       kssj: this.data.kssj,
       jssj: this.data.jssj,
+      zyqy:this.data.zyqy,
       zydd: this.data.zydd,
       zynr: this.data.zynr,
       zyry: this.data.zyry,

pages/operation/operationadd.wxml

@@ -33,6 +33,19 @@
           </picker>
         </view>
       </view>
+      <view class="weui-cell weui-cell_select" wx:if='{{mapright}}'>
+        <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/area/tree">
+            <view class="weui-select">
+              {{zyqy__name}}
+            </view>
+          </navigator>
+        </view>
+      </view>
       <view class="weui-cell weui-cell_select">
         <view class="weui-cell__hd weui-cell__hd_in-select-after">
           <view class="weui-label">作业地点</view>
@@ -86,7 +99,7 @@
               <view class="weui-uploader__files">
                 <block wx:for="{{zyimg}}" wx:for-item="image" wx:key="unique">
                   <view class="weui-uploader__file">
-                    <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" bindtap="previewImage" bindlongpress="deleteImage" data-index="{{index}}"></image>
+                    <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" data-index="{{index}}" bindtap="previewImage" bindlongpress="deleteImage" data-index="{{index}}"></image>
                   </view>
                 </block>
               </view>

pages/operation/operationcheck.wxml

@@ -72,7 +72,7 @@
       <view class="weui-uploader__files">
         <block wx:for="{{zyimg}}" wx:for-item="image" wx:key="unique">
           <view class="weui-uploader__file">
-            <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" bindtap="zyimgPreview" bindlongpress="deleteyhImage"></image>
+            <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" data-index="{{index}}" bindtap="zyimgPreview"></image>
           </view>
         </block>
         <!-- <view class="weui-uploader__input-box" wx:if="{{zyzt ==0}}">
@@ -103,7 +103,7 @@
               <view class="weui-uploader__files">
                 <block wx:for="{{zyimg2}}" wx:for-item="image" wx:key="unique">
                   <view class="weui-uploader__file">
-                    <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" bindtap="previewImage2" bindlongpress="deleteImage2" data-index="{{index}}"></image>
+                    <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" data-index="{{index}}" bindtap="previewImage2" bindlongpress="deleteImage2" data-index="{{index}}"></image>
                   </view>
                 </block>
               </view>

pages/parttree/index.js

@@ -94,10 +94,10 @@ Page({
       success: res => {
         if (res.statusCode === 200) {
           //console.log(res.data)
-          var data = this.convert(res.data)
+          var rows = res.data
-          console.log(data)
+          console.log(rows)
           this.setData({
-            value: data
+            value: this.convert(rows)
           })
         }
       }

pages/risk/detail.js

@@ -0,0 +1,66 @@
+// pages/risk/detail.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/risk/detail.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/risk/detail.wxml

@@ -0,0 +1,2 @@
+<!--pages/risk/detail.wxml-->
+<text>pages/risk/detail.wxml</text>

pages/risk/detail.wxss

@@ -0,0 +1 @@
+/* pages/risk/detail.wxss */

pages/risk/myindex.js

@@ -0,0 +1,80 @@
+// pages/risk/myindex.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    wx.request({
+      url: getApp().globalData.serverUrl + 'api/risk?a=listself',
+      header: {
+        'content-type': 'application/json', // 
+        'Cookie': wx.getStorageSync("sessionid"),
+      },
+      method: 'GET',
+      success: res => {
+        if (res.statusCode === 200) {
+          this.setData({
+            fxlist:res.data.rows
+          })
+        }
+      }
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/risk/myindex.json

@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "岗位风险"
+}

pages/risk/myindex.wxml

@@ -0,0 +1,21 @@
+<view class="weui-cells weui-cells_after-title">
+  <block wx:for="{{fxlist}}" 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">
+        <span style="background-color:red;color:gray" wx:if="{{item.level == '重大风险'}}">重大风险</span>
+        <span style="background-color:orange;color:gray" wx:if="{{item.level == '较大风险'}}">较大风险</span>
+        <span style="background-color:yellow;color:gray" wx:if="{{item.level == '一般风险'}}">一般风险</span>
+        <span style="background-color:blue;color:gray" wx:if="{{item.level == '低风险'}}">低风险</span>
+        <span>--</span>
+        {{item.step}}
+        </view>
+        <view class="weui-media-box__desc">
+        <span style="color:green">{{item.riskact__area__name}}  </span>
+        
+        <span style="color:red">{{item.riskact__name}}</span>
+        </view>
+      </view>
+    </navigator>
+  </block>
+</view>

pages/risk/myindex.wxss

@@ -0,0 +1,6 @@
+/* pages/risk/myindex.wxss */
+.head{
+  color:#fff;
+  background-color: cornflowerblue;
+  text-align: center;
+}

pages/safecert/index.js

@@ -102,13 +102,6 @@ Page({
                     'Cookie': wx.getStorageSync("sessionid"),
                   },
                   success: res => {
-                    if (res.statusCode === 200) {
-                      //console.log(res.data)
-                      this.setData({
-                        total: res.data.total,
-                        safecertlist: res.data.rows
-                      })
-                    }
                     if (res.data.total == 0) {
                       wx.request({
                         url: getApp().globalData.serverUrl + 'api/safecert?a=addspiderself',
@@ -157,6 +150,10 @@ Page({
                       });
 
                     } else {
+                      this.setData({
+                        total: res.data.total,
+                        safecertlist: res.data.rows
+                      })
                       wx.hideLoading();
                     }
                   }

pages/socert/socert.js

@@ -102,13 +102,6 @@ Page({
                   'Cookie': wx.getStorageSync("sessionid"),
                 },
                 success: res => {
-                  if (res.statusCode === 200) {
-                    //console.log(res.data)
-                    this.setData({
-                      total: res.data.total,
-                      socertlist: res.data.rows
-                    })
-                  }
                   if (res.data.total == 0) {
                     wx.request({
                       url: getApp().globalData.serverUrl + 'api/socert?a=addspiderself',
@@ -157,6 +150,10 @@ Page({
                     });
 
                   }else{
+                    this.setData({
+                      total: res.data.total,
+                      socertlist: res.data.rows
+                    })
                     wx.hideLoading();
                   }
                 }

pages/suggest/add.js

@@ -6,6 +6,8 @@ Page({
    */
   data: {
     jyimg: [],
+    jyqy:'',
+    jydd:'',
     dqxz:'',
     jynr:'',
     qwxg:'',
@@ -38,6 +40,9 @@ Page({
   bindqwxgInput: function (e) {
     this.data.qwxg = e.detail.value
   },
+  bindjyddInput: function (e) {
+    this.data.jydd = e.detail.value
+  },
   submit: function () {
     var that = this
     if (that.data.dqxz == '') {
@@ -101,7 +106,9 @@ Page({
       jynr: this.data.jynr,
       qwxg: this.data.qwxg,
       jyimg: this.data.jyimg,
-      jylb:this.data.jylb
+      jylb:this.data.jylb,
+      jyqy:this.data.jyqy,
+      jydd:this.data.jydd,
     }
     //console.log(wsdata.unsafe)
     wx.request({
@@ -124,6 +131,16 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    //拉取地图权限
+    if (getApp().globalData.rights.indexOf('30') != -1) {
+      this.setData({
+        mapright: true
+      })
+    } else {
+      this.setData({
+        mapright: false
+      })
+    }
     //获取建议类别
     wx.request({
       url: this.data.serverUrl + 'getdickey?dicclass=32&a=combobox',

pages/suggest/add.wxml

@@ -12,7 +12,7 @@
               <view class="weui-uploader__files">
                 <block wx:for="{{jyimg}}" wx:for-item="image" wx:key="unique">
                   <view class="weui-uploader__file">
-                    <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" bindtap="previewImage" bindlongpress="deleteImage" data-index="{{index}}"></image>
+                    <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" data-index="{{index}}" bindtap="previewImage" bindlongpress="deleteImage" data-index="{{index}}"></image>
                   </view>
                 </block>
               </view>
@@ -34,6 +34,27 @@
             <view class="weui-select">{{jylbArray[jylbIndex].text}}</view>
           </picker>
         </view>
+      </view>
+            <view class="weui-cell weui-cell_select" wx:if='{{mapright}}'>
+        <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/area/tree">
+            <view class="weui-select">
+              {{jyqy__name}}
+            </view>
+          </navigator>
+        </view>
+      </view>
+      <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">
+          <input class="weui-input" placeholder="请输入建议地点" bindinput="bindjyddInput" />
+        </view>
       </view>
     </view>
     <view class="weui-cells__title">当前现状</view>

pages/suggest/detail.js

@@ -63,6 +63,14 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },
+  jyimg2Preview: function (e) {
+    var current = e.target.dataset.src
+
+    wx.previewImage({
+      current: current,
+      urls: this.data.jyimg2
+    })
   },
   jyimgPreview: function (e) {
     var current = e.target.dataset.src
@@ -93,6 +101,9 @@ Page({
             for (var i = 0; i < jydata.jyimg.length; i++) {
               jydata.jyimg[i] = this.data.serverUrl + jydata.jyimg[i];
             }
+            for (var i = 0; i < jydata.jyimg2.length; i++) {
+              jydata.jyimg2[i] = this.data.serverUrl + jydata.jyimg2[i];
+            }
             if (jydata.submittime != '') { jydata.submittime = util.formatTime(new Date(jydata.submittime)) }
             this.setData(jydata)
           }

pages/suggest/detail.wxml

@@ -33,6 +33,22 @@
       {{jyr__name}}
     </view>
   </view>
+  <view class="weui-cell weui-cell_access" wx:if="{{jyqy__name}}">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>所在区域</view>
+    </view>
+    <view class="weui-cell__ft">
+      {{jyqy__name}}
+    </view>
+  </view>
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>建议地点</view>
+    </view>
+    <view class="weui-cell__ft">
+      {{jydd}}
+    </view>
+  </view>
   <view class="weui-cell weui-cell_access">
     <view class="weui-cell__bd weui-cell_primary">
       <view>现场图片</view>
@@ -74,5 +90,81 @@
     </view>
   </view>
 </view>
+<view class="weui-cells__title">反馈</view>
+<view class="weui-cells weui-cells_after-title">
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>反馈人</view>
+    </view>
+    <view class="weui-cell__ft">
+      {{pgr__name}}
+    </view>
+  </view>
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>建议反馈</view>
+      <view class="weui-cell__ft" >
+        {{jyfk}}
+      </view>
+    </view>
+  </view>
+</view>
 
-
+<view class="weui-cells weui-cells_after-title">
+    <view class="weui-cell weui-cell_access" >
+      <view class="weui-cell__bd weui-cell_primary">
+        <view>处理人</view>
+      </view>
+      <view class="weui-cell__ft">
+        {{clr__name}}
+      </view>
+    </view>
+    <view class="weui-cell weui-cell_access">
+      <view class="weui-cell__bd weui-cell_primary">
+        <view>处理措施</view>
+        <view class="weui-cell__ft">
+          {{clcs}}
+        </view>
+      </view>
+    </view>
+</view>
+<view class="weui-cells__title">处理结果</view>
+<view class="weui-cells weui-cells_after-title" >
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>处理描述</view>
+      <view class="weui-cell__ft" >
+        {{clms}}
+      </view>
+    </view>
+  </view>
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>处理图片</view>
+      <view class="weui-uploader__files">
+        <block wx:for="{{jyimg2}}" wx:for-item="image" wx:key="unique">
+          <view class="weui-uploader__file">
+            <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" data-index="{{index}}" bindtap="jyimg2Preview" bindlongpress="deleteImage"></image>
+          </view>
+        </block>
+      </view>
+    </view>
+  </view>
+    <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>上传时间</view>
+    </view>
+    <view class="weui-cell__ft">
+      {{sjwcsj}}
+    </view>
+  </view>
+</view>
+<view class="weui-cells__title">流程详情</view>
+<view class="weui-cells weui-cells_after-title">
+  <block wx:for="{{flow}}" wx:key="unique">
+    <view class="weui-media-box">
+      <view class="weui-media-box__desc">{{item.name}}</view>
+      <view class="weui-media-box__desc">{{item.submittime}} {{item.action}}</view>
+    </view>
+  </block>
+</view>

pages/suggest/suggest.js

@@ -1,4 +1,5 @@
 // pages/suggest/suggest.js
+var sliderWidth = 96;
 Page({
 
   /**
@@ -7,14 +8,44 @@ Page({
   data: {
     page: 1,
     serverUrl: getApp().globalData.serverUrl,
-    jylist:[]
+    jylist:[],
+    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.getmyJylist(1)
+      that.data.mypage = 1
+    }
+    else if (that.data.activeIndex == 1) {
+      that.gettodoJylist(1)
+      that.data.todopage = 1
+    }
+    else if (that.data.activeIndex == 2) {
+      that.getJylist(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
+        });
+      }
+    });
   },
 
   /**
@@ -29,8 +60,20 @@ Page({
    */
   onShow: function () {
     var that = this;
+    console.log(that.data.activeIndex)
+    if (that.data.activeIndex == 0) {
+      that.getmyJylist(1)
+      that.data.mypage = 1
+    }
+    else if (that.data.activeIndex == 1) {
+      that.gettodoJylist(1)
+      that.data.todopage = 1
+    }
+    else if (that.data.activeIndex == 2) {
       that.getJylist(1)
       this.data.page = 1;
+    }
+
   },
 
   /**
@@ -52,9 +95,21 @@ Page({
    */
   onPullDownRefresh: function () {
     var that = this;
-    that.getJylist(1);
+    if (that.data.activeIndex == 0) {
+      that.getmyJylist(1)
       wx.stopPullDownRefresh();
-    this.data.page = 1;
+      that.data.mypage = 1
+    }
+    else if (that.data.activeIndex == 1) {
+      that.gettodoJylist(1)
+      wx.stopPullDownRefresh();
+      that.data.todopage = 1
+    }
+    else if (that.data.activeIndex == 2) {
+      that.getallJylist(1)
+      wx.stopPullDownRefresh();
+      that.data.page = 1
+    }
   },
 
   /**
@@ -62,8 +117,19 @@ Page({
    */
   onReachBottom: function () {
     //上拉分页,将页码加1，然后调用分页函数
+    var that = this;
+    if (that.data.activeIndex == 0) {
+      this.data.mypage = this.data.mypage + 1;
+      this.getmyJylist();
+    }
+    else if (that.data.activeIndex == 1) {
+      this.data.todopage = this.data.todopage + 1;
+      this.gettodoJylist();
+    }
+    else if (that.data.activeIndex == 2) {
       this.data.page = this.data.page + 1;
-    this.getJylist();
+      this.getallJylist();
+    }
   },
 
   /**
@@ -117,4 +183,94 @@ Page({
         }
       });
   },
+  getmyJylist: 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({
+                  mytotal: 0,
+                  myjylist: []
+                })
+              }
+              else {
+                wx.showModal({
+                  content: "已经到底啦!",
+                  showCancel: false,
+                  confirmText: "确定",
+                })
+              }
+            } else {
+              let list
+              if (page == 1) {
+                list = res.data.rows
+              } else {
+                list = this.data.myjylist.concat(res.data.rows)
+              }
+              this.setData({
+                mytotal: res.data.total,
+                myjylist: list
+              })
+            }
+          }
+          wx.hideLoading();
+        }
+      });
+  },
+  gettodoJylist: function (page) {
+    var that = this;
+    if (page != 1) { page = that.data.todopage }
+    wx.showLoading({
+      title: '加载中',
+    }),
+      wx.request({
+        url: this.data.serverUrl + 'api/suggest?a=listtodo&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({
+                  todototal: 0,
+                  todojylist: []
+                })
+              }
+              else {
+                wx.showModal({
+                  content: "已经到底啦!",
+                  showCancel: false,
+                  confirmText: "确定",
+                })
+              }
+            } else {
+              let list
+              if (page == 1) {
+                list = res.data.rows
+              } else {
+                list = this.data.todojylist.concat(res.data.rows)
+              }
+              this.setData({
+                todototal: res.data.total,
+                todojylist: list
+              })
+            }
+          }
+          wx.hideLoading();
+        }
+      });
+  },
 })

pages/suggest/suggest.wxml

@@ -1,5 +1,56 @@
-<view class="page__bd">
+<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">共{{mytotal}}条合理化建议</view>
+      <view class="weui-cells weui-cells_after-title">
+        <block wx:for="{{myjylist}}" 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="{{todojylist}}" wx:key="unique">
+          <navigator url="update?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 != 2}}">
       <view class="head">共{{total}}条合理化建议</view>
       <view class="weui-cells weui-cells_after-title">
         <block wx:for="{{jylist}}" wx:key="unique">
@@ -9,11 +60,22 @@
               <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 style="position:fixed; bottom:0;width:100%;">
+  </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>

pages/suggest/update.js

@@ -0,0 +1,317 @@
+// pages/suggest/detail.js
+var util = require('../../utils/util.js')
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    serverUrl: getApp().globalData.serverUrl,
+    jyimg2:[],
+    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,
+      })
+    }
+  },
+  bindjyfkInput: function (e) {
+    this.data.jyfk = e.detail.value
+  },
+  bindclcsInput: function (e) {
+    this.data.clcs = e.detail.value
+  },
+  bindclmsInput: function (e) {
+    this.data.clms = e.detail.value
+  },
+  bindshyjInput: function (e) {
+    this.data.shyj = e.detail.value
+  },
+  Tap1: function (x) {
+    wx.showModal({
+      title: "系统提示",
+      content: x,
+      showCancel: false,
+      confirmText: "确定"
+    })
+  },
+  //上传隐患图片
+  upimg: function (x, y) {
+    var that = this
+    if (x < y) {
+      wx.showLoading({
+        title: '上传处理图片' + (x + 1) + '....',
+      })
+
+      if (that.data.jyimg2[x].indexOf(that.data.serverUrl) == -1) {
+        wx.uploadFile({
+          header: {
+            'content-type': 'application/json', // 默认值
+            'Cookie': wx.getStorageSync("sessionid"),
+          },
+          url: that.data.serverUrl + 'upfile',
+          filePath: that.data.jyimg2[x],
+          name: 'upfile',
+          success(res) {
+            var obj = JSON.parse(res.data);
+            that.data.jyimg2[x] = obj['filepath']
+            x = x + 1
+            if (x < y) {
+              that.upimg(x, y)
+            } else {
+              that.update()
+            }
+          }
+        })
+      } else {
+        var bl = that.data.jyimg2[x].replace(that.data.serverUrl, "")
+        that.data.jyimg2[x] = bl
+        that.update()
+      }
+    } else {
+      that.update()
+    }
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.getJydetail(options.jyid);
+    getApp().globalData.selectPeopleList = []
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    let lst = getApp().globalData.selectPeopleList
+    let nst = []
+    let nst1 = []
+    if (lst.length !=0) {
+      for (var i = 0; i < lst.length; i++) {
+        nst.push(lst[i]['name'])
+        nst1.push(lst[i]['id'])
+      }
+      this.setData({
+        clr__name: nst[0],
+        clr: nst1[0],
+        npgr__name:nst[0],
+        npgr:nst1[0],
+      })
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+  jyimgPreview: function (e) {
+    var current = e.target.dataset.src
+
+    wx.previewImage({
+      current: current,
+      urls: this.data.jyimg
+    })
+  },
+  getJydetail: function (jyid) {
+    wx.showLoading({
+      title: '加载中',
+    }),
+      wx.request({
+        url: this.data.serverUrl + 'api/suggest?a=detail&jyid=' + jyid,
+        header: {
+          'content-type': 'application/json', // 默认值
+          'Cookie': wx.getStorageSync("sessionid"),
+        },
+        data: {
+        },
+        success: res => {
+          wx.hideLoading();
+          console.log(res.data);
+          if (res.statusCode === 200) {
+            var jydata = res.data
+            //格式化观察信息
+            for (var i = 0; i < jydata.jyimg.length; i++) {
+              jydata.jyimg[i] = this.data.serverUrl + jydata.jyimg[i];
+            }
+            for (var i = 0; i < jydata.jyimg2.length; i++) {
+              jydata.jyimg2[i] = this.data.serverUrl + jydata.jyimg2[i];
+            }
+            if (jydata.submittime != '') { jydata.submittime = util.formatTime(new Date(jydata.submittime)) }
+            this.setData(jydata)
+          }
+        }
+      });
+  },
+  submit:function(){
+    if(this.data.jyzt==2){
+      if (this.data.clms == '') {
+        this.Tap1('处理描述未填写!')
+      }else{
+        this.upimg(0, this.data.jyimg2.length)
+      }
+
+       
+      
+      
+    }else if(this.data.jyzt==3){
+      this.update()
+    }else if(this.data.jyzt==1){
+      if(this.data.apcl== true){
+        if (this.data.jyfk == '') {
+          this.Tap1('建议反馈未填!')
+        }
+        else if(this.data.clr__name==''){
+          this.Tap1('处理人未选择!')
+        }
+        else if(this.data.clcs==''){
+          this.Tap1('处理措施未填写!')
+        }else{
+          this.update()
+        }
+      } else if(this.data.zjtr==true){
+        this.update()
+      }else {
+        if (this.data.jyfk == '') {
+          this.Tap1('建议反馈未填!')
+        }else{
+          this.update()
+        }
+      }
+    }
+
+  },
+  update:function(){
+    var jydata = this.data
+    wx.request({
+      url: this.data.serverUrl + 'api/suggest?a=update',
+      header: {
+        'content-type': 'application/json', // 默认值
+        'Cookie': wx.getStorageSync("sessionid"),
+      },
+      data: jydata,
+      method: 'post',
+      success: res => {
+        wx.hideLoading();
+        console.log(res.data);
+        if (res.statusCode === 200) {
+          wx.navigateBack({
+          })
+        }
+      }
+    });
+  },
+  choosejyimg2Image: function () {
+    var that = this
+    wx.chooseImage({
+      count: 9,
+      sizeType: ['original', 'compressed'],
+      sourceType: ['album', 'camera'],
+      success: function (res) {
+        console.log(that.data.jyimg2.concat(res.tempFilePaths))
+        if(that.data.jyimg2 ==''){
+          that.data.jyimg2 = []
+        }
+        that.setData({
+          jyimg2: that.data.jyimg2.concat(res.tempFilePaths)
+        })
+      }
+    })
+  },
+  deleteImage: function (e) {
+    var that = this;
+    var jyimg2 = that.data.jyimg2;
+    var index = e.currentTarget.dataset.index; //获取当前长按图片下标
+    console.log(e)
+    wx.showModal({
+      title: '系统提醒',
+      content: '确定要删除此图片吗？',
+      success: function (res) {
+        if (res.confirm) {
+          jyimg2.splice(index, 1);
+        } else if (res.cancel) {
+          return false;
+        }
+        that.setData({
+          jyimg2: jyimg2
+        });
+      }
+    })
+  },
+  jyimg2Preview: function (e) {
+    var current = e.target.dataset.src
+
+    wx.previewImage({
+      current: current,
+      urls: this.data.jyimg2
+    })
+  },
+})

pages/suggest/update.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/suggest/update.wxml

@@ -0,0 +1,246 @@
+<view class="weui-cells__title">
+  建议详情</view>
+<view class="weui-cells weui-cells_after-title">
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">当前状态</view>
+    <view class="weui-cell__ft" wx:if="{{jyzt == 1}}" style="color:red">待评估</view>
+    <view class="weui-cell__ft" wx:if="{{jyzt == 3}}" style="color:green">已关闭</view>
+    <view class="weui-cell__ft" wx:if="{{jyzt == 2}}" style="color:red">处理中</view>
+  </view>
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>建议编号</view>
+    </view>
+    <view class="weui-cell__ft">
+      {{jynum}}
+    </view>
+  </view>
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>填报时间</view>
+    </view>
+    <view class="weui-cell__ft">
+      {{submittime}}
+    </view>
+  </view>
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>建议部门</view>
+    </view>
+    <view class="weui-cell__ft">
+      {{jybm__partname}}
+    </view>
+  </view>
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>建议人</view>
+    </view>
+    <view class="weui-cell__ft">
+      {{jyr__name}}
+    </view>
+  </view>
+  <view class="weui-cell weui-cell_access" wx:if="{{jyqy__name}}">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>所在区域</view>
+    </view>
+    <view class="weui-cell__ft">
+      {{jyqy__name}}
+    </view>
+  </view>
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>建议地点</view>
+    </view>
+    <view class="weui-cell__ft">
+      {{jydd}}
+    </view>
+  </view>
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>现场图片</view>
+      <view class="weui-uploader__files">
+        <block wx:for="{{jyimg}}" wx:for-item="image" wx:key="unique">
+          <view class="weui-uploader__file">
+            <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" bindtap="jyimgPreview"></image>
+          </view>
+        </block>
+      </view>
+    </view>
+  </view>
+</view>
+
+<view class="weui-cells__title">详细内容</view>
+<view class="weui-cells weui-cells_after-title">
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>当前现状</view>
+      <view class="weui-cell__ft">
+        {{dqxz}}
+      </view>
+    </view>
+  </view>
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>建议内容</view>
+      <view class="weui-cell__ft">
+        {{jynr}}
+      </view>
+    </view>
+  </view>
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>期望效果</view>
+      <view class="weui-cell__ft">
+        {{qwxg}}
+      </view>
+    </view>
+  </view>
+</view>
+<view class="weui-cells__title">反馈</view>
+<view class="weui-cells weui-cells_after-title">
+  <view class="weui-cell weui-cell_access" wx:if='{{pgr__name != null}}'>
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>反馈人</view>
+    </view>
+    <view class="weui-cell__ft">
+      {{pgr__name}}
+    </view>
+  </view>
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>建议反馈</view>
+      <view class="weui-cell__ft" wx:if="{{jyfk != ''&& jyzt != 1}}">
+        {{jyfk}}
+      </view>
+      <view class="weui-cell__bd" wx:if="{{jyzt == 1}}">
+        <textarea class="weui-textarea" style="height: 3.3em" bindinput="bindjyfkInput" placeholder="请输入" />
+      </view>
+    </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>
+<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">
+      <view class="weui-label">新评估人</view>
+    </view>
+    <view class="weui-cell__bd">
+      <navigator url="/pages/userSelect/userSelect">
+        <view class="weui-select">
+          {{npgr__name}}
+        </view>
+      </navigator>
+    </view>
+  </view>
+  <view wx:if='{{apcl == true}}'>
+    <view class="weui-cell weui-cell_select" wx:if='{{jyzt == 1 && apcl == true}}'>
+      <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">
+            {{clr__name}}
+          </view>
+        </navigator>
+      </view>
+    </view>
+
+    <view class="weui-cell weui-cell_access" wx:if='{{jyzt != 1 }}'>
+      <view class="weui-cell__bd weui-cell_primary">
+        <view>处理人</view>
+      </view>
+      <view class="weui-cell__ft">
+        {{clr__name}}
+      </view>
+    </view>
+    <view class="weui-cell weui-cell_access" wx:if="{{clcs != ''&& jyzt != 1 }}">
+      <view class="weui-cell__bd weui-cell_primary">
+        <view>处理措施</view>
+        <view class="weui-cell__ft">
+          {{clcs}}
+        </view>
+      </view>
+    </view>
+    <view class="weui-cell weui-cell_access" wx:if='{{apcl == true}}'>
+      <view class="weui-cell__bd weui-cell_primary">
+        <view>处理措施</view>
+        <view class="weui-cell__bd" wx:if="{{jyzt == 1}}">
+          <textarea class="weui-textarea" style="height: 3.3em" bindinput="bindclcsInput" placeholder="请输入" />
+        </view>
+      </view>
+    </view>
+
+  </view>
+</view>
+<view class="weui-cells__title" wx:if='{{jyzt!=1}}'>处理结果</view>
+<view style="color:red" wx:if='{{jyzt==2&&clms!=""}}'>提交的处理结果被驳回,请重新提交</view>
+<view class="weui-cells weui-cells_after-title" wx:if='{{jyzt!=1}}'>
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>处理描述</view>
+      <view class="weui-cell__ft" wx:if="{{jyzt == 3 & clms !=''}}">
+        {{clms}}
+      </view>
+      <view class="weui-cell__bd" wx:if='{{jyzt == 2 && clms ==""}}'>
+        <textarea class="weui-textarea" placeholder="请输入处理描述" style="height: 3.3em" bindinput="bindclmsInput" />
+      </view>
+      <view class="weui-cell__bd" wx:if='{{jyzt == 2 && clms !=""}}'>
+        <textarea class="weui-textarea" value="{{clms}}" style="height: 3.3em" bindinput="bindclmsInput" />
+      </view>
+    </view>
+  </view>
+  <view class="weui-cell weui-cell_access">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>处理图片</view>
+      <view class="weui-uploader__files">
+        <block wx:for="{{jyimg2}}" wx:for-item="image" wx:key="unique">
+          <view class="weui-uploader__file">
+            <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" data-index="{{index}}" bindtap="jyimg2Preview" bindlongpress="deleteImage"></image>
+          </view>
+        </block>
+      </view>
+      <view class="weui-uploader__input-box" wx:if="{{jyzt ==2}}">
+        <view class="weui-uploader__input" bindtap="choosejyimg2Image"></view>
+      </view>
+    </view>
+  </view>
+  <view class="weui-cell weui-cell_access" wx:if="{{jyzt ==3 ||jyzt==4}}">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>上传时间</view>
+    </view>
+    <view class="weui-cell__ft">
+      {{sjwcsj}}
+    </view>
+  </view>
+  <view class="weui-cell weui-cell_switch" wx:if="{{jyzt==3}}">
+    <view class="weui-cell__bd">是否通过</view>
+    <view class="weui-cell__ft">
+      <switch checked bindchange="shChange" />
+    </view>
+  </view>
+  <view class="weui-cell weui-cell_access" wx:if='{{shresult == "reject"}}'>
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>意见</view>
+      <view class="weui-cell__bd">
+        <textarea class="weui-textarea" placeholder="请输入原因" style="height: 3.3em" bindinput="bindshyjInput" />
+      </view>
+    </view>
+  </view>
+</view>
+<view style="bottom:0;left:0;width:100%;">
+  <button class="weui-btn" type="primary" style="width:auto;margin:5px" bindtap="submit">提交</button>
+</view>

pages/suggest/update.wxss

@@ -0,0 +1 @@
+/* pages/suggest/update.wxss */

pages/trouble/accesstrouble.js

@@ -539,6 +539,7 @@ Page({
     var that = this;
     var zghtp = that.data.zghtp;
     var index = e.currentTarget.dataset.index; //获取当前长按图片下标
+    console.log(e.index)
     wx.showModal({
       title: '系统提醒',
       content: '确定要删除此图片吗？',

pages/trouble/accesstrouble.wxml

@@ -346,7 +346,7 @@
           <view class="weui-uploader__files">
             <block wx:for="{{zghtp}}" wx:for-item="image" wx:key="unique">
               <view class="weui-uploader__file">
-                <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" bindtap="zghtpPreview" bindlongpress="deleteImage"></image>
+                <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" data-index="{{index}}" bindtap="zghtpPreview" bindlongpress="deleteImage"></image>
               </view>
             </block>
           </view>

pages/trouble/addtrouble.js

@@ -5,8 +5,10 @@ Page({
    * 页面的初始数据
    */
   data: {
+    yhtype:null,
     date: '2018-10-01',
     time: '12:00',
+    mapright:false,
     dateTimeArray1: null,
     dateTime1: null,
     startYear: 2000,
@@ -20,6 +22,7 @@ Page({
     yhdj: '',
     jclx: '',
     fxsj: '',
+    yhqy:'',
     yhdd: '',
     yhms: '',
     yhpg: '',
@@ -132,6 +135,7 @@ Page({
       'yhdj':this.data.yhdj,
       'jclx':this.data.jclx,
       'fxsj':this.data.fxsj,
+      'yhqy':this.data.yhqy,
       'yhdd':this.data.yhdd,
       'yhms':this.data.yhms,
       'yhtp':this.data.yhtp,
@@ -232,9 +236,34 @@ Page({
       data: this.yhdata,
       success: res => {
         if (res.statusCode === 200) {
+          if(this.data.yhtype=='inspect'){
+            let inspectdata = this.data.inspectdata
+            inspectdata.equipment = inspectdata.equipment.id
+            inspectdata.trouble = res.data.trouble
+            wx.request({
+              url: this.data.serverUrl + 'api/inspect?a=add',
+              header: {
+                'content-type': 'application/json', // 
+                'Cookie': wx.getStorageSync("sessionid"),
+              },
+              method: 'POST',
+              data: inspectdata,
+              success: res => {
+                if (res.statusCode === 200) {
+                  wx.hideLoading();
+                  wx.navigateBack({
+                    delta: 2
+                  })
+
+                }
+              }
+            });
+          }else{
             wx.hideLoading();
             wx.navigateBack()
           }
+          
+        }
       }
     });
   },
@@ -290,6 +319,31 @@ Page({
         }
       }
     });
+    //拉取权限
+    if (getApp().globalData.rights.indexOf('30') != -1) {
+      this.setData({
+        mapright: true
+      })
+    } else {
+      this.setData({
+        mapright: false
+      })
+    }
+    console.log(options.type)
+    if(options.type=='inspect'){
+      var pages = getCurrentPages();
+      var prevPage = pages[pages.length - 2];
+      var inspectdata = prevPage.data
+      console.log(inspectdata)
+      this.data.inspectdata = inspectdata
+      this.setData({
+        yhtype:'inspect',
+        yhqy:inspectdata.equipment.area__id,
+        yhqy__name:inspectdata.equipment.area__name,
+        yhdd: inspectdata.equipment.place,
+        equipmentname: inspectdata.equipment.name,
+      })
+    }
   },
 
   /**
@@ -303,7 +357,6 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
   },
 
   /**

pages/trouble/addtrouble.wxml

@@ -1,7 +1,7 @@
 <view class="page">
   <view class="page__bd">
     <view class="weui-toptips weui-toptips_warn" wx:if="{{showTopTips}}">错误提示</view>
-
+    <view class="head" wx:if="{{yhtype=='inspect'}}">{{equipmentname}} 设备异常</view>
     <view class="weui-cells__title">隐患图片</view>
     <view class="weui-cells weui-cells_after-title">
       <view class="weui-cell">
@@ -11,7 +11,7 @@
               <view class="weui-uploader__files">
                 <block wx:for="{{yhtp}}" wx:for-item="image" wx:key="unique">
                   <view class="weui-uploader__file">
-                    <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" bindtap="previewImage" bindlongpress="deleteImage" data-index="{{index}}"></image>
+                    <image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" data-index="{{index}}" bindtap="previewImage" bindlongpress="deleteImage" data-index="{{index}}"></image>
                   </view>
                 </block>
               </view>
@@ -57,12 +57,25 @@
           </picker>
         </view>
       </view>
+      <view class="weui-cell weui-cell_select" wx:if='{{mapright}}'>
+        <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/area/tree">
+            <view class="weui-select">
+              {{yhqy__name}}
+            </view>
+          </navigator>
+        </view>
+      </view>
       <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">
-          <input  class="weui-input" placeholder="请输入发现地点" bindinput="bindyhddInput"/>
+          <input class="weui-input" placeholder="请输入发现地点" bindinput="bindyhddInput" value="{{yhdd}}"/>
         </view>
       </view>
     </view>
@@ -76,7 +89,7 @@
       </view>
     </view>
 
-    <view class="btn-area" style="position:fixed; bottom:0;width:100%;">
+    <view class="btn-area">
       <button class="weui-btn" type="primary" bindtap="open">继续</button>
     </view>
   </view>

pages/trouble/addtrouble.wxss

@@ -1,4 +1,9 @@
-.weui-btn{
+.btn-area{
   width:auto;
   margin: 5px;
 }
+.head{
+  color:#fff;
+  background-color: red;
+  text-align: center;
+}

pages/trouble/addtroublezg.js

@@ -162,6 +162,7 @@ Page({
       'yhdj': this.data.yhdj,
       'jclx': this.data.jclx,
       'fxsj': this.data.fxsj,
+      'yhqy': this.data.yhqy,
       'yhdd': this.data.yhdd,
       'yhms': this.data.yhms,
       'yhtp': this.data.yhtp,
@@ -186,11 +187,36 @@ Page({
       data: this.yhdata,
       success: res => {
         if (res.statusCode === 200) {
+          if (this.data.yhtype == 'inspect') {
+            let inspectdata = this.data.inspectdata
+            inspectdata.equipment = inspectdata.equipment.id
+            inspectdata.trouble = res.data.trouble
+            wx.request({
+              url: this.data.serverUrl + 'api/inspect?a=add',
+              header: {
+                'content-type': 'application/json', // 
+                'Cookie': wx.getStorageSync("sessionid"),
+              },
+              method: 'POST',
+              data: inspectdata,
+              success: res => {
+                if (res.statusCode === 200) {
+                  wx.hideLoading();
+                  wx.navigateBack({
+                    delta: 3
+                  })
+
+                }
+              }
+            });
+          }else{
             wx.hideLoading();
             wx.navigateBack({
               delta: 2
             })
           }
+          
+        }
       }
     });
   },
@@ -223,7 +249,8 @@ Page({
   onLoad: function(options) {
     var that = this
     var pages = getCurrentPages();
-    this.data = pages[pages.length - 2].data;//获取前一个界面数据
+    //this.data = pages[pages.length - 2].data;//获取前一个界面数据
+    this.setData(pages[pages.length - 2].data)
     //console.log(that.data)
     //获取隐患评估
     wx.request({

pages/trouble/addtroublezg.wxml

@@ -1,5 +1,6 @@
 <view class="page" >
   <view class="page__bd">
+  <view class="head" wx:if="{{yhtype=='inspect'}}">{{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">

pages/trouble/addtroublezg.wxss

@@ -1,4 +1,9 @@
-.weui-btn{
+.btn-area{
   width:auto;
   margin: 5px;
 }
+.head{
+  color:#fff;
+  background-color: red;
+  text-align: center;
+}

pages/trouble/addtroublezp.js

@@ -121,6 +121,7 @@ Page({
       'yhdj': this.data.yhdj,
       'jclx': this.data.jclx,
       'fxsj': this.data.fxsj,
+      'yhqy': this.data.yhqy,
       'yhdd': this.data.yhdd,
       'yhms': this.data.yhms,
       'yhtp': this.data.yhtp,
@@ -146,11 +147,36 @@ Page({
       data: this.yhdata,
       success: res => {
         if (res.statusCode === 200) {
+          if (this.data.yhtype == 'inspect') {
+            let inspectdata = this.data.inspectdata
+            inspectdata.equipment = inspectdata.equipment.id
+            inspectdata.trouble = res.data.trouble
+            wx.request({
+              url: this.data.serverUrl + 'api/inspect?a=add',
+              header: {
+                'content-type': 'application/json', // 
+                'Cookie': wx.getStorageSync("sessionid"),
+              },
+              method: 'POST',
+              data: inspectdata,
+              success: res => {
+                if (res.statusCode === 200) {
+                  wx.hideLoading();
+                  wx.navigateBack({
+                    delta: 3
+                  })
+
+                }
+              }
+            });
+          }else{
             wx.hideLoading();
             wx.navigateBack({
               delta: 2
             })
           }
+          
+        }
       }
     });
   },
@@ -168,7 +194,7 @@ Page({
   onLoad: function(options) {
     var that = this
     var pages = getCurrentPages();
-    this.data = pages[pages.length - 2].data;//获取前一个界面数据
+    this.setData(pages[pages.length - 2].data)
     //console.log(that.data)
     // 获取完整的年月日 时分秒，以及默认显示的数组
     var obj1 = dateTimePicker.dateTimePicker(this.data.startYear, this.data.endYear);

pages/trouble/addtroublezp.wxml

@@ -1,5 +1,6 @@
 <view class="page">
   <view class="page__bd">
+  <view class="head" wx:if="{{yhtype=='inspect'}}">{{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">

pages/trouble/addtroublezp.wxss

@@ -1,4 +1,9 @@
-.weui-btn{
+.btn-area{
   width:auto;
   margin: 5px;
 }
+.head{
+  color:#fff;
+  background-color: red;
+  text-align: center;
+}

pages/trouble/trouble.wxml

@@ -1,4 +1,3 @@
-
 <view class="weui-tab">
   <view class="weui-navbar">
     <block wx:for="{{tabs}}" wx:key="*this">

pages/trouble/troubledetail.wxml

@@ -70,6 +70,14 @@
       {{fxr__name}}
     </view>
   </view>
+  <view class="weui-cell weui-cell_access" wx:if="{{yhqy__name}}">
+    <view class="weui-cell__bd weui-cell_primary">
+      <view>所在区域</view>
+    </view>
+    <view class="weui-cell__ft">
+      {{yhqy__name}}
+    </view>
+  </view>
   <view class="weui-cell weui-cell_access">
     <view class="weui-cell__bd weui-cell_primary">
       <view>隐患地点</view>