设备巡检和岗位风险

2019-07-17 18:18:46 +08:00 · 2019-07-17 18:18:46 +08:00 · 02a50195e9
parent c07bb06cba
commit 02a50195e9
15 changed files with 292 additions and 23 deletions
--- a/app.js
+++ b/app.js
@ -55,6 +55,7 @@ App({
                data: {},
                success: res => {
                  if (res.statusCode === 200) {
+                    console.log(res.data.rights)
                    that.globalData.rights = res.data.rights
                  }

@ -73,11 +74,12 @@ App({
  },
  globalData: {
    userInfo: null,
-    //serverUrl: 'https://safeyun.ctcshe.com/',
-    serverUrl: 'http://127.0.0.1:8000/',
+    serverUrl: 'https://safeyun.ctcshe.com/',
+    //serverUrl: 'http://127.0.0.1:8000/',
    //serverUrl: 'http://192.168.0.102:8000/',
    //serverUrl:'http://10.7.100.250:8000/',
-    isaqy: 0
+    isaqy: 0,
+    timepass:null //定时器
  },

 })
--- a/pages/equipment/detail.js
+++ b/pages/equipment/detail.js
@ -1,4 +1,5 @@
 // pages/equipment/detail.js
+var util = require('../../utils/util.js')
 Page({

  /**
@ -12,7 +13,31 @@ Page({
   * 生命周期函数--监听页面加载
   */
  onLoad: function (options) {
-
+    var equipmentid
+    if(options.id){
+      equipmentid = options.id
+    }else{
+      let q = decodeURIComponent(options.q)
+      if (q) {
+        // console.log("index 生命周期 onload url=" + q) 
+        // console.log("index 生命周期 onload 参数 trainid=" + util.getQueryString(q, 'trainid')) 
+        equipmentid = util.getQueryString(q, 'id')
+      }
+    }
+    wx.request({
+      url: getApp().globalData.serverUrl + 'api/equipment?a=detail&id=' + equipmentid,
+      header: {
+        'content-type': 'application/json', // 默认值
+        'Cookie': wx.getStorageSync("sessionid"),
+      },
+      data: {},
+      success: res => {
+        if (res.statusCode === 200) {
+          //console.log(res.data)
+          this.setData(res.data)
+        }
+      }
+    });
  },

  /**
--- a/pages/equipment/detail.wxml
+++ b/pages/equipment/detail.wxml
@ -1,2 +1,67 @@
-<!--pages/equipment/detail.wxml-->
-<text>pages/equipment/detail.wxml</text>
+<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">{{num}}</view>
+  </view>
+  <view class="weui-cell ">
+    <view class="weui-cell__bd">设备名称</view>
+    <view class="weui-cell__ft" style="color:green">{{name}}</view>
+  </view>
+  <view class="weui-cell ">
+    <view class="weui-cell__bd">区域</view>
+    <view class="weui-cell__ft">{{area__name}}</view>
+  </view>
+  <view class="weui-cell ">
+    <view class="weui-cell__bd">具体位置</view>
+    <view class="weui-cell__ft">{{place}}</view>
+  </view>
+  <view class="weui-cell ">
+    <view class="weui-cell__bd">当前状态</view>
+    <view class="weui-cell__ft" wx:if="{{state==1}}" style="color:green">正常</view>
+    <view class="weui-cell__ft" wx:if="{{state==0}}" style="color:red">异常</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">设备类别</view>
+    <view class="weui-cell__ft">{{cate__dickeyname}}</view>
+  </view>
+  <view class="weui-cell ">
+    <view class="weui-cell__bd">型号</view>
+    <view class="weui-cell__ft">{{type}}</view>
+  </view>
+  <view class="weui-cell ">
+    <view class="weui-cell__bd">生产厂家</view>
+    <view class="weui-cell__ft">{{oem}}</view>
+  </view>
+  <view class="weui-cell " wx:if='{{fnum!=null}}'>
+    <view class="weui-cell__bd" >出厂编号</view>
+    <view class="weui-cell__ft">{{fnum}}</view>
+  </view>
+  <view class="weui-cell ">
+    <view class="weui-cell__bd">出厂日期</view>
+    <view class="weui-cell__ft">{{fdate}}</view>
+  </view>
+  <view class="weui-cell ">
+    <view class="weui-cell__bd">投用日期</view>
+    <view class="weui-cell__ft">{{udate}}</view>
+  </view>
+  <view class="weui-cell ">
+    <view class="weui-cell__bd">责任部门</view>
+    <view class="weui-cell__ft">{{zrbm__partname}}</view>
+  </view>
+  <view class="weui-cell ">
+    <view class="weui-cell__bd">责任人</view>
+    <view class="weui-cell__ft">{{zrr__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">
+        {{parameter}}
+      </view>
+    </view>
+  </view>
+</view>
--- a/pages/examtest/main.js
+++ b/pages/examtest/main.js
@ -168,7 +168,7 @@ Page({
      return
    };

-    setTimeout(
+    getApp().globalData.timepass=setTimeout(
      () => {
        mil -= 1000;
        this.begin(mil);
@ -284,7 +284,7 @@ Page({
          wx.redirectTo({
            url: 'result?' + parseParams(res.data.data),
          })
-          
+          clearTimeout(getApp().globalData.timepass)
        }
      }
    });
--- a/pages/inspect/add.wxml
+++ b/pages/inspect/add.wxml
@ -4,7 +4,7 @@
    <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">
+  <navigator url="/pages/equipment/detail?id={{equipment.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>
--- a/pages/inspect/detail.js
+++ b/pages/inspect/detail.js
@ -12,7 +12,19 @@ Page({
   * 生命周期函数--监听页面加载
   */
  onLoad: function (options) {
-
+    wx.request({
+      url: getApp().globalData.serverUrl + 'api/inspect?a=detail&id='+options.id,
+      header: {
+        'content-type': 'application/json', // 
+        'Cookie': wx.getStorageSync("sessionid"),
+      },
+      method: 'GET',
+      success: res => {
+        if (res.statusCode === 200) {
+          this.setData(res.data)
+        }
+      }
+    })
  },

  /**
--- a/pages/inspect/detail.wxml
+++ b/pages/inspect/detail.wxml
@ -1,2 +1,36 @@
-<!--pages/inspect/detail.wxml-->
-<text>pages/inspect/detail.wxml</text>
+<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">{{user__name}}</view>
+  </view>
+    <view class="weui-cell">
+    <view class="weui-cell__bd">提交时间</view>
+    <view class="weui-cell__ft">{{creattime}}</view>
+  </view>
+  <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={{equipment__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 class="weui-cell ">
+    <view class="weui-cell__bd">设备状态</view>
+    <view class="weui-cell__ft" wx:if="{{state==1}}" style="color:green">正常</view>
+    <view class="weui-cell__ft" wx:if="{{state==0}}" style="color:red">异常</view>
+  </view>
+  <view class="weui-cell " wx:if="{{state==1&&content!=null}}">
+    <view class="weui-cell__bd">巡检记录</view>
+    <view class="weui-cell__ft">{{content}}</view>
+  </view>
+  <navigator url="/pages/trouble/troubledetail?troubleid={{trouble__troubleid}}" class="weui-cell weui-cell_access" wx:if="{{state==0}}" hover-class="weui-cell_active">
+    <view class="weui-cell__bd">关联隐患</view>
+    <view class="weui-cell__ft weui-cell__ft_in-access" style="color:red">{{trouble__yhnum}}</view>
+  </navigator>
+</view>
--- a/pages/inspect/index.wxml
+++ b/pages/inspect/index.wxml
@ -9,6 +9,16 @@
          <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>
+          <span wx:if="{{item.state==0}}">
+              <span wx:if="{{item.trouble__yhzt == 7}}" style="color:orange">措施/方案待提交</span>
+              <span wx:elif="{{item.trouble__yhzt == 5}}" style="color:orange">待复查</span>
+              <span wx:elif="{{item.trouble__yhzt == 1}}" style="color:orange">待评估</span>
+              <span wx:elif="{{item.trouble__yhzt == 3}}" style="color:orange">待整改</span>
+              <span wx:elif="{{item.trouble__yhzt == 6}}" style="color:orange">已归档</span>
+              <span wx:elif="{{item.trouble__yhzt == 2}}" style="color:orange">措施/方案待确认</span>
+              <span wx:elif="{{item.trouble__yhzt == 4}}" style="color:orange">待审核</span>
+              <span wx:elif="{{item.trouble__yhzt == 0}}" style="color:orange">待新增</span>
+          </span>
          {{item.creattime}}</view>
        </view>
      </navigator>
--- a/pages/main/main.js
+++ b/pages/main/main.js
@ -255,7 +255,7 @@ Page({
      })
    }else{
      wx.showModal({
-        content: '该功能为增值服务,如需开通,请查看相关公告!',
+        content: '该功能如需开通,请查看公告或联系管理员!',
        showCancel: false
      })
    }
@ -267,10 +267,22 @@ Page({
      })
    } else {
      wx.showModal({
-        content: '该功能为增值服务,如需开通,请查看相关公告!',
+        content: '该功能如需开通,请查看公告或联系管理员!',
        showCancel:false
      })
    }
  },
+  tapinspect: function () {
+    if (getApp().globalData.rights.indexOf('35') != -1) {//设备巡检
+      wx.navigateTo({
+        url: '/pages/inspect/index',
+      })
+    } else {
+      wx.showModal({
+        content: '该功能如需开通,请查看公告或联系管理员!',
+        showCancel: false
+      })
+    }
+  },
  
 })
--- a/pages/main/main.wxml
+++ b/pages/main/main.wxml
@ -27,10 +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">
+      <view url="/pages/inspect/index" class="weui-grid" hover-class="weui-grid_active" bindtap='tapinspect'>
        <image class="weui-grid__icon" src="../images/inspect.png" />
        <view class="weui-grid__label">设备巡检</view>
-      </navigator>
+      </view>
    </view>
    <view class="weui-cells__title">学习园地</view>
    <view class="weui-grids">
--- a/pages/risk/detail.js
+++ b/pages/risk/detail.js
@ -12,7 +12,20 @@ Page({
   * 生命周期函数--监听页面加载
   */
  onLoad: function (options) {
-
+    wx.request({
+      url: getApp().globalData.serverUrl + 'api/risk?a=detail&id=' + options.id,
+      header: {
+        'content-type': 'application/json', // 默认值
+        'Cookie': wx.getStorageSync("sessionid"),
+      },
+      data: {},
+      success: res => {
+        if (res.statusCode === 200) {
+          //console.log(res.data)
+          this.setData(res.data)
+        }
+      }
+    })
  },

  /**
--- a/pages/risk/detail.wxml
+++ b/pages/risk/detail.wxml
@ -1,2 +1,93 @@
-<!--pages/risk/detail.wxml-->
-<text>pages/risk/detail.wxml</text>
+<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">
+      {{riskact__type__dickeyname}}
+    </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">
+      {{riskact__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">
+      {{riskact__area__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">
+      {{step}}
+    </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">
+      {{hazard}}
+    </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">
+      {{result}}
+    </view>
+  </view>
+</view>
+
+<view class="weui-cells__title">风险等级和管控措施</view>
+<view class="weui-cells weui-cells_after-title">
+  <view class="weui-media-box">
+    <view class="weui-media-box__title">
+        <span style="background-color:red;color:white" wx:if="{{level == '重大风险'}}">重大风险</span>
+        <span style="background-color:orange;color:white" wx:if="{{level == '较大风险'}}">较大风险</span>
+        <span style="background-color:yellow;color:gray" wx:if="{{level == '一般风险'}}">一般风险</span>
+        <span style="background-color:blue;color:white" wx:if="{{level == '低风险'}}">低风险</span>
+    </view>
+    <view class="weui-media-box__desc">
+    LECD分析法:  L:<span style="color:red">{{riskl}}</span>
+    E:<span style="color:red">{{riske}}</span>
+    C:<span style="color:red">{{riskc}}</span>
+    D:<span style="color:red">{{riskd}}</span>
+    </view>
+  </view>
+  <view class="weui-media-box">
+    
+    <view class="weui-media-box__desc">工程技术措施</view>
+    <view style="color:green">{{measure1}}</view>
+  </view>
+    <view class="weui-media-box">
+    
+    <view class="weui-media-box__desc">管理措施措施</view>
+    <view style="color:green">{{measure2}}</view>
+  </view>
+    <view class="weui-media-box">
+    
+    <view class="weui-media-box__desc">培训教育措施</view>
+    <view style="color:green">{{measure3}}</view>
+  </view>
+    <view class="weui-media-box">
+    <view class="weui-media-box__desc">个体防护措施</view>
+    <view style="color:green">{{measure4}}</view>
+  </view>
+    <view class="weui-media-box">
+    <view class="weui-media-box__desc">应急防护措施</view>
+    <view style="color:green">{{measure5}}</view>
+  </view>
+</view>
--- a/pages/risk/myindex.wxml
+++ b/pages/risk/myindex.wxml
@ -3,10 +3,10 @@
    <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:red;color:white" wx:if="{{item.level == '重大风险'}}">重大风险</span>
+        <span style="background-color:orange;color:white" 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 style="background-color:blue;color:white" wx:if="{{item.level == '低风险'}}">低风险</span>
        <span>--</span>
        {{item.step}}
        </view>
--- a/pages/safecert/index.js
+++ b/pages/safecert/index.js
@ -139,6 +139,9 @@ Page({
                                        wx.navigateTo({
                                          url: '../user/userdetail',
                                        })
+                                      } else {
+                                        wx.navigateBack({
+                                        })
                                      }
                                    }
                                  })
--- a/pages/socert/socert.js
+++ b/pages/socert/socert.js
@ -87,7 +87,6 @@ Page({
                    })
                  }else{
                    wx.navigateBack({
-                      
                    })
                  }
                }
@ -139,6 +138,9 @@ Page({
                                      wx.navigateTo({
                                        url: '../user/userdetail',
                                      })
+                                    } else {
+                                      wx.navigateBack({
+                                      })
                                    }
                                  }
                                })