zcdsj
/
aqyj
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xx20190818

This commit is contained in:
caoqianming 2019-08-18 16:30:56 +08:00
parent 03da1d2065
commit febb676688
29 changed files with 800 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app.json
View File

@ -64,7 +64,10 @@
"pages/risk/detail",
"pages/risktask/index",
"pages/risktask/check",
"pages/risktask/main"
"pages/risktask/main",
"pages/riskact/index",
"pages/riskact/detail",
"pages/riskact/check"
],
"window": {
"backgroundTextStyle": "light",

3
pages/examtest/main.js
View File

@ -76,7 +76,7 @@ Page({
},
success: res => {
if (res.statusCode === 200) {
wx.hideLoading()
console.log(res.data)
let tms = res.data
this.tmdata = tms
@ -88,6 +88,7 @@ Page({
this.setData({
tmtotal: tms.tms.length,
starttime: util.formatTime(new Date()) })
wx.hideLoading()
}
}

BIN
pages/images/risk.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 582 B

25
pages/main/main.js
View File

@ -12,7 +12,8 @@ Page({
dknum:0,
gcnoread:0,
wsnoread:0,
jytodonum:0
jytodonum:0,
tasknum:0,
},
/**
@ -42,6 +43,7 @@ Page({
this.getgcnoreadnum()
this.getwsnoreadnum()//未遂未读
this.getjytodonum()
this.gettasknum()
}else{
getApp().callback = () => {
this.getnoread()
@ -51,6 +53,7 @@ Page({
this.getdknum()
this.getgcnoreadnum()
this.getjytodonum()
this.gettasknum()
};
}
@ -248,6 +251,26 @@ Page({
}
});
},
gettasknum: function () {
var that = this
//获取待考
wx.request({
url: getApp().globalData.serverUrl + 'api/risktask?a=todonum',
header: {
'content-type': 'application/json', // 默认值
'Cookie': wx.getStorageSync("sessionid"),
},
data: {},
success: res => {
if (res.statusCode === 200) {
//console.log(res.data)
this.setData({
tasknum: res.data.todonum,
})
}
}
});
},
taptest:function(){
if(getApp().globalData.rights != undefined){
if (getApp().globalData.rights.indexOf('25') != -1) {//考试功能

6
pages/main/main.wxml
View File

@ -5,7 +5,7 @@
<navigator url="/pages/risktask/index" class="weui-grid" hover-class="weui-grid_active">
<image class="weui-grid__icon" src="../images/task.png" />
<view class="weui-grid__label">排查任务</view>
<!-- <view class="weui-badge" style="position: absolute;top: 1em;right: 1em;" wx:if="{{yhtodonum!=0}}">{{yhtodonum}}</view> -->
<view class="weui-badge" style="position: absolute;top: 1em;right: 1em;" wx:if="{{tasknum!=0}}">{{tasknum}}</view>
</navigator>
<navigator url="/pages/trouble/trouble" class="weui-grid" hover-class="weui-grid_active">
<image class="weui-grid__icon" src="../images/trouble.png" />
@ -32,6 +32,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/riskact/index" class="weui-grid" hover-class="weui-grid_active">
<image class="weui-grid__icon" src="../images/risk.png" />
<view class="weui-grid__label">风险管控</view>
</navigator>
<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>

4
pages/risk/detail.js
View File

@ -12,6 +12,9 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
wx.showLoading({
title: '',
})
wx.request({
url: getApp().globalData.serverUrl + 'api/risk?a=detail&id=' + options.id,
header: {
@ -23,6 +26,7 @@ Page({
if (res.statusCode === 200) {
//console.log(res.data)
this.setData(res.data)
wx.hideLoading()
}
}
})

19
pages/risk/detail.wxml
View File

@ -34,9 +34,7 @@
</view>
</view>
<view class="weui-cell weui-cell_access">
<view class="weui-cell__bd weui-cell_primary">
<view>危害因素</view>
</view>
<view>危害因素/标准</view>
<view class="weui-cell__ft">
{{hazard}}
</view>
@ -70,24 +68,29 @@
<view class="weui-media-box">
<view class="weui-media-box__desc">工程技术措施</view>
<view style="color:green">{{measure1}}</view>
<view style="color:green" wx:if="{{measure1!=null}}">{{measure1}}</view>
<view style="color:green" wx:else>无</view>
</view>
<view class="weui-media-box">
<view class="weui-media-box__desc">管理措施措施</view>
<view style="color:green">{{measure2}}</view>
<view style="color:green" wx:if="{{measure2!=null}}">{{measure2}}</view>
<view style="color:green" wx:else>无</view>
</view>
<view class="weui-media-box">
<view class="weui-media-box__desc">培训教育措施</view>
<view style="color:green">{{measure3}}</view>
<view style="color:green" wx:if="{{measure3!=null}}">{{measure3}}</view>
<view style="color:green" wx:else>无</view>
</view>
<view class="weui-media-box">
<view class="weui-media-box__desc">个体防护措施</view>
<view style="color:green">{{measure4}}</view>
<view style="color:green" wx:if="{{measure4!=null}}">{{measure4}}</view>
<view style="color:green" wx:else>无</view>
</view>
<view class="weui-media-box">
<view class="weui-media-box__desc">应急防护措施</view>
<view style="color:green">{{measure5}}</view>
<view style="color:green" wx:if="{{measure5!=null}}">{{measure5}}</view>
<view style="color:green" wx:else>无</view>
</view>
</view>

10
pages/risk/myindex.js
View File

@ -12,8 +12,15 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
var url = getApp().globalData.serverUrl + 'api/risk?a=listself'
if(options.a=='listall'){
url = getApp().globalData.serverUrl + 'api/risk?a=listall&riskact='+options.riskact
}
wx.showLoading({
title: '',
})
wx.request({
url: getApp().globalData.serverUrl + 'api/risk?a=listself',
url: url,
header: {
'content-type': 'application/json', //
'Cookie': wx.getStorageSync("sessionid"),
@ -24,6 +31,7 @@ Page({
this.setData({
fxlist:res.data.rows
})
wx.hideLoading()
}
}
})

4
pages/risk/myindex.json
View File

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

153
pages/riskact/check.js Normal file
View File

@ -0,0 +1,153 @@
// pages/risktask/check.js
Page({
/**
* 页面的初始数据
*/
data: {
page: 1,
riskact: 0,
group: 0
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log(options)
this.data.riskact = options.riskact
this.getlist()
},
getlist: function () {
var page = this.data.page
wx.showLoading({
title: '加载中',
})
wx.request({
url: getApp().globalData.serverUrl + 'api/risk?a=listall&riskact=' + this.data.riskact,
header: {
'content-type': 'application/json', // 默认值
'Cookie': wx.getStorageSync("sessionid"),
},
success: res => {
if (res.statusCode === 200) {
wx.hideLoading()
console.log(res.data)
if (res.data.rows.length == 0) {
if (page == 1) {
this.setData({
total: 0,
alllist: []
})
}
else {
wx.showModal({
content: "已经到底啦!",
showCancel: false,
confirmText: "确定",
})
}
} else {
let list
if (page == 1) {
list = res.data.rows
} else {
list = this.data.alllist.concat(res.data.rows)
}
this.setData({
total: res.data.total,
alllist: list
})
}
}
wx.hideLoading();
}
});
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
},
open: function (e) {
console.log(e)
wx.navigateTo({
url: '/pages/trouble/addtrouble?type=riskcheck&index=' + e.currentTarget.dataset.index,
})
},
submit: function () {
console.log(this.data.alllist)
let alllist = this.data.alllist
let data = {'checks':[]}
for (var i = 0; i < alllist.length; i++) {
if (i.trouble != undefined){
data.checks.push({ 'id': alllist[i].id })
}
else{
data.checks.push({ 'id': alllist[i].id, 'trouble': alllist[i].trouble })
}
}
wx.showLoading({
title: '提交中',
})
wx.request({
url: getApp().globalData.serverUrl + 'api/riskcheck?a=add',
header: {
'content-type': 'application/json', // 默认值
'Cookie': wx.getStorageSync("sessionid"),
},
method: 'POST',
data: data,
success: res => {
if (res.statusCode === 200) {
wx.navigateBack({
})
}
wx.hideLoading();
}
});
},
})

3
pages/riskact/check.json Normal file
View File

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

51
pages/riskact/check.wxml Normal file
View File

@ -0,0 +1,51 @@
<view class="head">共{{total}}条风险</view>
<view class="weui-cells weui-cells_after-title">
<block wx:for="{{alllist}}" wx:key="unique">
<view class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
<view class="weui-media-box__bd weui-media-box__bd_in-appmsg" >
<view class="weui-media-box__title">
<span wx:if="{{item.level == '低风险'}}" style="background-color:blue;color:white">低风险</span>
<span wx:if="{{item.level == '一般风险'}}" style="background-color:yellow">一般风险</span>
<span wx:if="{{item.level == '较大风险'}}" style="background-color:orange">较大风险</span>
<span wx:if="{{item.level == '重大风险'}}" style="background-color:red;color:white">重大风险</span>
{{item.step}}
</view>
<view class="weui-media-box__desc">
<span style="background-color:orange;color:white">标准/危害因素</span>
{{item.hazard}}
</view>
<view class="weui-media-box__desc">
<span style="background-color:green;color:white">工程技术</span>
<span wx:if="{{item.measure1!=null}}">{{item.measure1}}</span>
<span wx:else>无</span>
</view>
<view class="weui-media-box__desc">
<span style="background-color:green;color:white">管理措施</span>
<span wx:if="{{item.measure2!=null}}">{{item.measure2}}</span>
<span wx:else>无</span>
</view>
<view class="weui-media-box__desc">
<span style="background-color:green;color:white">培训教育</span>
<span wx:if="{{item.measure3!=null}}">{{item.measure3}}</span>
<span wx:else>无</span>
</view>
<view class="weui-media-box__desc">
<span style="background-color:green;color:white">个体防护</span>
<span wx:if="{{item.measure4!=null}}">{{item.measure4}}</span>
<span wx:else>无</span>
</view>
<view class="weui-media-box__desc">
<span style="background-color:green;color:white">应急处理</span>
<span wx:if="{{item.measure5!=null}}">{{item.measure5}}</span>
<span wx:else>无</span>
</view>
<button class="weui-btn mini-btn" type="warn" size="mini" disabled="{{item.yhnum != null}}" data-index="{{index}}" bindtap="open">发现隐患</button>
<view class="weui-media-box__desc" style="color:red" wx:if="{{item.yhnum != null}}">{{item.yhnum}}</view>
</view>
</view>
</block>
</view>
<view class="btn-area">
<button class="weui-btn" type="primary" bindtap="submit"
>排查完毕,提交!</button>
</view>

14
pages/riskact/check.wxss Normal file
View File

@ -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;
}

101
pages/riskact/detail.js Normal file
View File

@ -0,0 +1,101 @@
// pages/inspect/detail.js
var util = require('../../utils/util.js')
Page({
/**
* 页面的初始数据
*/
data: {
fromWx:false
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
var riskactid
if (options.id) {
riskactid = 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'))
riskactid = util.getQueryString(q, 'id')
this.setData({
fromWx: true
})
}
}
wx.showLoading({
title: '',
})
wx.request({
url: getApp().globalData.serverUrl + 'api/riskact?a=detail&id=' + riskactid,
header: {
'content-type': 'application/json', //
'Cookie': wx.getStorageSync("sessionid"),
},
method: 'GET',
success: res => {
if (res.statusCode === 200) {
wx.hideLoading()
this.setData(res.data.data)
}
}
})
},
check:function(){
wx.redirectTo({
url: 'check?riskact='+this.data.id,
})
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})

3
pages/riskact/detail.json Normal file
View File

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

33
pages/riskact/detail.wxml Normal file
View File

@ -0,0 +1,33 @@
<view class="weui-cells__title">风险点信息</view>
<view class="weui-cells weui-cells_after-title">
<view class="weui-cell">
<view class="weui-cell__bd">名称</view>
<view class="weui-cell__ft">{{name}}</view>
</view>
<view class="weui-cell">
<view class="weui-cell__bd">类别</view>
<view class="weui-cell__ft">{{type__dickeyname}}</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" wx:if="{{place!=null}}">{{place}}</view>
</view>
<navigator url="/pages/risk/myindex?a=listall&riskact={{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">{{num}}</view>
</navigator>
<view class="weui-cell">
<view class="weui-cell__bd">风险等级</view>
<view class="weui-cell__ft" wx:if="{{level == '低风险'}}" style="background-color:blue;color:white">低风险</view>
<view class="weui-cell__ft" wx:if="{{level == '一般风险'}}" style="background-color:yellow;color:black">一般风险</view>
<view class="weui-cell__ft" wx:if="{{level == '较大风险'}}" style="background-color:orange;color:black">较大风险</view>
<view class="weui-cell__ft" wx:if="{{level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
</view>
</view>
<view style="position:fixed;bottom:0;left:0;width:100%;">
<button class="weui-btn" type="primary" style="width:auto;margin:5px" bindtap="check">开始排查</button>
</view>

1
pages/riskact/detail.wxss Normal file
View File

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

215
pages/riskact/index.js Normal file
View File

@ -0,0 +1,215 @@
// pages/miss/miss.js
var sliderWidth = 96;
Page({
/**
* 页面的初始数据
*/
data: {
page: 1,
serverUrl: getApp().globalData.serverUrl,
riskactlist: [],
tabs: ["我的记录", "全厂风险"],
activeIndex: 0,
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.getmyriskchecklist(1)
that.data.mypage = 1
}
else if (that.data.activeIndex == 1) {
that.getriskactlist(1)
that.data.page = 1
}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
var that = this
wx.getSystemInfo({
success: function (res) {
that.setData({
sliderLeft: (res.windowWidth / that.data.tabs.length - sliderWidth) / 2,
sliderOffset: res.windowWidth / that.data.tabs.length * that.data.activeIndex
});
}
});
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
this.onPullDownRefresh()
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
var that = this;
if (that.data.activeIndex == 0) {
that.getmyriskchecklist(1)
that.data.mypage = 1
} else if (that.data.activeIndex == 1){
that.getriskactlist(1);
this.data.page = 1;
}
wx.stopPullDownRefresh();
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
//上拉分页,将页码加1，然后调用分页函数
if (that.data.activeIndex == 0) {
this.data.mypage = this.data.mypage + 1;
this.getmyriskchecklist();
} else if (that.data.activeIndex == 1){
this.data.page = this.data.page + 1;
this.getriskactlist();
}
wx.stopPullDownRefresh();
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
},
scan: function () {
wx.scanCode({
onlyFromCamera: true,
success(res) {
console.log(res)
let id = res.result.split('=')[1]
wx.navigateTo({
url: 'detail?id='+id,
})
}
})
},
getriskactlist: function (page) {
var that = this;
if (page != 1) { page = that.data.page }
wx.showLoading({
title: '加载中',
}),
wx.request({
url: this.data.serverUrl + 'api/riskact?a=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,
riskactlist: []
})
}
else {
wx.showModal({
content: "已经到底啦!",
showCancel: false,
confirmText: "确定",
})
}
} else {
let list
if (page == 1) {
list = res.data.rows
} else {
list = this.data.riskactlist.concat(res.data.rows)
}
this.setData({
total: res.data.total,
riskactlist: list
})
}
}
wx.hideLoading();
}
});
},
getmyriskchecklist: function (page) {
var that = this;
if (page != 1) { page = that.data.mapage }
wx.showLoading({
title: '加载中',
}),
wx.request({
url: this.data.serverUrl + 'api/riskcheck?a=listself&rows=10&page=' + page,
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,
riskchecklist: []
})
}
else {
wx.showModal({
content: "已经到底啦!",
showCancel: false,
confirmText: "确定",
})
}
} else {
let list
if (page == 1) {
list = res.data.rows
} else {
list = this.data.riskchecklist.concat(res.data.rows)
}
this.setData({
mytotal: res.data.total,
riskchecklist: list
})
}
}
wx.hideLoading();
}
});
},
})

5
pages/riskact/index.json Normal file
View File

@ -0,0 +1,5 @@
{
"navigationBarTitleText": "风险点",
"enablePullDownRefresh": true,
"onReachBottomDistance": 50
}

78
pages/riskact/index.wxml Normal file
View File

@ -0,0 +1,78 @@
<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="{{riskchecklist}}" wx:key="unique">
<view class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
<view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
<view class="weui-media-box__title">{{item.risk__step}}</view>
<view class="weui-media-box__desc">
<span style="background-color:orange;color:white">风险点</span>
{{item.risk__riskact__name}}
<span style="background-color:orange;color:white">区域</span>
{{item.risk__riskact__area__name}}
</view>
<view class="weui-media-box__desc">
<span style="background-color:orange;color:white">排查时间</span>
{{item.dotime}}
</view>
</view>
<view class="weui-panel__ft weui-cell__ft_in-access">
<view class="weui-media-box__title" wx:if="{{item.risk__level == '低风险'}}" style="background-color:blue;color:white">低风险</view>
<view class="weui-media-box__title" wx:if="{{item.risk__level == '一般风险'}}" style="background-color:yellow">一般风险</view>
<view class="weui-media-box__title" wx:if="{{item.risk__level == '较大风险'}}" style="background-color:orange">较大风险</view>
<view class="weui-media-box__title" wx:if="{{item.risk__level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
<view wx:if="{{item.trouble__yhnum!=null}}" class="weui-media-box__desc" style="background-color:red;color:white">隐患</view>
<view wx:else class="weui-media-box__desc" style="background-color:green;color:white">正常</view>
</view>
</view>
</block>
</view>
</view>
<view class="weui-tab__content" hidden="{{activeIndex != 1}}">
<view class="page__bd">
<view class="head">共{{total}}条风险点</view>
<view class="weui-cells weui-cells_after-title" >
<block wx:for="{{riskactlist}}" wx:key="unique">
<navigator url="detail?id={{item.id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
<view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
<view class="weui-media-box__title">{{item.name}}</view>
<view class="weui-media-box__desc">
<span style="background-color:orange;color:white">区域</span>
{{item.area__name}}
</view>
<view class="weui-media-box__desc">
<span style="background-color:orange;color:white">风险点类别</span>
{{item.type__dickeyname}}
</view>
</view>
<view class="weui-panel__ft weui-cell__ft_in-access">
<view class="weui-media-box__title" wx:if="{{item.level == '低风险'}}" style="background-color:blue;color:white">低风险</view>
<view class="weui-media-box__title" wx:if="{{item.level == '一般风险'}}" style="background-color:yellow">一般风险</view>
<view class="weui-media-box__title" wx:if="{{item.level == '较大风险'}}" style="background-color:orange">较大风险</view>
<view class="weui-media-box__title" wx:if="{{item.level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
</view>
</navigator>
</block>
</view>
</view>
</view>
</view>
</view>
<view style="position:fixed;bottom:0;left:0;width:100%;" hidden="{{activeIndex == 1}}">
<button class="weui-btn" type="primary" style="width:auto;margin:5px" bindtap="scan" >扫一扫风险点</button>
</view>

14
pages/riskact/index.wxss Normal file
View File

@ -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;
}

2
pages/risktask/index.js
View File

@ -190,7 +190,7 @@ Page({
title: '加载中',
}),
wx.request({
url: this.data.serverUrl + 'api/listtask?a=list2done&rows=10&page=' + page,
url: this.data.serverUrl + 'api/risktask?a=list2done&rows=10&page=' + page,
header: {
'content-type': 'application/json', // 默认值
'Cookie': wx.getStorageSync("sessionid"),

17
pages/risktask/index.wxml
View File

@ -9,7 +9,7 @@
</view>
<view class="weui-tab__panel">
<view class="weui-tab__content" hidden="{{activeIndex != 0}}">
<view class="head">共{{donetotal}}条已查</view>
<view class="head">共{{donetotal}}条</view>
<view class="weui-cells weui-cells_after-title">
<block wx:for="{{donelist}}" wx:key="unique">
<navigator url="check?riskact={{item.risk__riskact__id}}&group={{item.risk__group__groupid}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
@ -20,7 +20,7 @@
</view>
<view class="weui-media-box__desc">
<span style="background-color:orange;color:white">排查岗位</span>
{{item.risk__gkcj}} {{item.risk__group__groupname}}
{{item.risk__group__groupname}}
</view>
<view class="weui-media-box__desc">任务生成时间:{{item.taskadd}}</view>
<view class="weui-media-box__desc">任务过期时间:{{item.taskexpire}}</view>
@ -31,6 +31,7 @@
<view class="weui-media-box__title" wx:if="{{item.risk__riskact__level == '较大风险'}}" style="background-color:orange">较大风险</view>
<view class="weui-media-box__title" wx:if="{{item.risk__riskact__level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
<view wx:if="{{item.user__userid!=null}}" class="weui-media-box__title" style="background-color:green;color:white">已完成</view>
<view wx:if="{{item.usable==2}}" class="weui-media-box__title" style="background-color:green;color:white">作废</view>
</view>
</navigator>
</block>
@ -48,7 +49,7 @@
</view>
<view class="weui-media-box__desc">
<span style="background-color:orange;color:white">排查岗位</span>
{{item.risk__gkcj}} {{item.risk__group__groupname}}
{{item.risk__group__groupname}}
</view>
<view class="weui-media-box__desc">任务生成时间:{{item.taskadd}}</view>
<view class="weui-media-box__desc">任务过期时间:{{item.taskexpire}}</view>
@ -59,6 +60,10 @@
<view class="weui-media-box__title" wx:if="{{item.risk__riskact__level == '较大风险'}}" style="background-color:orange">较大风险</view>
<view class="weui-media-box__title" wx:if="{{item.risk__riskact__level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
<view wx:if="{{item.user__userid!=null}}" class="weui-media-box__title" style="background-color:green;color:white">已完成</view>
<view class="weui-media-box__desc">
风险数量
<span style="color:red">{{item.num}}</span>
</view>
</view>
</navigator>
</block>
@ -76,7 +81,7 @@
</view>
<view class="weui-media-box__desc">
<span style="background-color:orange;color:white">排查岗位</span>
{{item.risk__gkcj}} {{item.risk__group__groupname}}
{{item.risk__group__groupname}}
</view>
<view class="weui-media-box__desc">任务生成时间:{{item.taskadd}}</view>
<view class="weui-media-box__desc">任务过期时间:{{item.taskexpire}}</view>
@ -96,6 +101,6 @@
</view>
<view style="position:fixed;bottom:0;left:0;width:100%;" hidden="{{activeIndex != 1}}">
<!-- <view style="position:fixed;bottom:0;left:0;width:100%;" hidden="{{activeIndex != 1}}">
<button class="weui-btn" type="primary" style="width:auto;margin:5px" bindtap="scan">扫一扫风险点</button>
</view>
</view> -->

27
pages/trouble/addtrouble.js
View File

@ -282,6 +282,19 @@ Page({
}
});
}
else if (this.data.yhtype == 'riskcheck') {
var pages = getCurrentPages();
var prevPage = pages[pages.length - 2];
var alllist = prevPage.data.alllist
alllist[this.data.riskcheckindex].trouble = res.data.trouble
alllist[this.data.riskcheckindex].yhnum = res.data.yhnum
prevPage.setData(
{alllist:alllist}
)
wx.navigateBack({
delta: 1
})
}
else{
wx.hideLoading();
wx.navigateBack()
@ -380,6 +393,20 @@ Page({
yhdd: risktaskdata.risk__riskact__place,
riskstep: risktaskdata.risk__step,
})
} else if (options.type == 'riskcheck') {
var pages = getCurrentPages();
var prevPage = pages[pages.length - 2];
var riskcheckdata = prevPage.data.alllist[options.index]
console.log(riskcheckdata)
this.data.riskcheckdata = riskcheckdata
this.setData({
yhtype: 'riskcheck',
yhqy: riskcheckdata.riskact__area__id,
yhqy__name: riskcheckdata.riskact__area__name,
yhdd: riskcheckdata.riskact__place,
riskstep: riskcheckdata.step,
riskcheckindex:options.index
})
}
},

1
pages/trouble/addtrouble.wxml
View File

@ -3,6 +3,7 @@
<view class="weui-toptips weui-toptips_warn" wx:if="{{showTopTips}}">错误提示</view>
<view class="head" wx:if="{{yhtype=='inspect'}}">{{equipmentname}} 设备异常</view>
<view class="head" wx:if="{{yhtype=='risktask'}}">风险 {{riskstep}}</view>
<view class="head" wx:if="{{yhtype=='riskcheck'}}">风险 {{riskstep}}</view>
<view class="weui-cells__title">隐患图片</view>
<view class="weui-cells weui-cells_after-title">
<view class="weui-cell">

13
pages/trouble/addtroublezg.js
View File

@ -233,6 +233,19 @@ Page({
}
});
}
else if (this.data.yhtype == 'riskcheck') {
var pages = getCurrentPages();
var prevPage = pages[pages.length - 3];
var alllist = prevPage.data.alllist
alllist[this.data.riskcheckindex].trouble = res.data.trouble
alllist[this.data.riskcheckindex].yhnum = res.data.yhnum
prevPage.setData(
{ alllist: alllist }
)
wx.navigateBack({
delta: 2
})
}
else{
wx.hideLoading();
wx.navigateBack({

1
pages/trouble/addtroublezg.wxml
View File

@ -2,6 +2,7 @@
<view class="page__bd">
<view class="head" wx:if="{{yhtype=='inspect'}}">{{inspectdata.equipment.name}} 设备异常</view>
<view class="head" wx:if="{{yhtype=='risktask'}}">风险 {{risktaskdata.risk__step}}</view>
<view class="head" wx:if="{{yhtype=='riskcheck'}}">风险 {{riskstep}}</view>
<view class="weui-cells__title">评估信息</view>
<view class="weui-cells weui-cells_after-title">
<view class="weui-cell weui-cell_select">

13
pages/trouble/addtroublezp.js
View File

@ -193,6 +193,19 @@ Page({
}
});
}
else if (this.data.yhtype == 'riskcheck') {
var pages = getCurrentPages();
var prevPage = pages[pages.length - 3];
var alllist = prevPage.data.alllist
alllist[this.data.riskcheckindex].trouble = res.data.trouble
alllist[this.data.riskcheckindex].yhnum = res.data.yhnum
prevPage.setData(
{ alllist: alllist }
)
wx.navigateBack({
delta: 2
})
}
else{
wx.hideLoading();
wx.navigateBack({

2
pages/trouble/addtroublezp.wxml
View File

@ -1,6 +1,8 @@
<view class="page">
<view class="page__bd">
<view class="head" wx:if="{{yhtype=='inspect'}}">{{inspectdata.equipment.name}} 设备异常
<view class="head" wx:if="{{yhtype=='risktask'}}">风险 {{risktaskdata.risk__step}}</view>
<view class="head" wx:if="{{yhtype=='riskcheck'}}">风险 {{riskstep}}</view>
</view>
<view class="head" wx:if="{{yhtype=='riskdata'}}">风险 {{inspectdata.equipment.name}}</view>
<view class="weui-cells__title">评估信息</view>