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

作业、考试展示优化

This commit is contained in:
caoqianming 2019-10-12 17:57:53 +08:00
parent a6acbd8aa2
commit 135f3ca3a3
16 changed files with 446 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app.js
View File

@ -74,8 +74,8 @@ App({
}, },
globalData: { globalData: {
userInfo: null, 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://192.168.0.102:8000/',
//serverUrl:'http://10.7.100.250:8000/', //serverUrl:'http://10.7.100.250:8000/',
isaqy: 0, isaqy: 0,

5
pages/examtest/index.js
View File

@ -108,6 +108,11 @@ Page({
} else { } else {
list = this.data.todokslist.concat(res.data.rows) list = this.data.todokslist.concat(res.data.rows)
} }
for(var n=0;n<list.length;n++){
let value = new Date(list[n].examtest__endtime) - new Date();
let isActive = value > 0 ? true : false;
list[n].isActive = isActive;
}
this.setData({ this.setData({
todototal: res.data.total, todototal: res.data.total,
todokslist: list todokslist: list

24
pages/examtest/index.wxml
View File

@ -10,18 +10,24 @@
<view class="weui-tab__panel"> <view class="weui-tab__panel">
<view class="weui-tab__content" hidden="{{activeIndex != 0}}"> <view class="weui-tab__content" hidden="{{activeIndex != 0}}">
<view class="head"> <view class="head">
共{{todototal}}条待参加考试</view> 共{{todototal}}条考试</view>
<view class="weui-cells weui-cells_after-title"> <view class="weui-cells weui-cells_after-title">
<block wx:for="{{todokslist}}" wx:key="unique"> <block wx:for="{{todokslist}}" wx:key="unique">
<navigator url="note?examtestid={{item.examtest__id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active"> <navigator url="note?examtestid={{item.examtest__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__bd weui-media-box__bd_in-appmsg">
<view class="weui-media-box__title">{{item.examtest__name}} <view class="weui-media-box__title">{{item.examtest__name}}
</view> </view>
<view class="weui-media-box__desc" style="color:green">答卷时长:{{item.examtest__duration}}分钟 通过分数:{{item.examtest__passscore}}</view> <view class="weui-media-box__desc" style="color:green">答卷时长:{{item.examtest__duration}}分钟 通过分数:{{item.examtest__passscore}}</view>
</view> </view>
<view class="weui-panel__ft weui-cell__ft_in-access">
<view wx:if="{{item.isActive}}" class="weui-media-box__title" style="background-color:green;color:white">可参加</view>
<view wx:else class="weui-media-box__title" style="background-color:red;color:white">已过期</view>
</view>
</navigator> </navigator>
</block> </block>
</view> </view>
</view> </view>
<view class="weui-tab__content" hidden="{{activeIndex != 1}}"> <view class="weui-tab__content" hidden="{{activeIndex != 1}}">
<view class="head"> <view class="head">
@ -33,14 +39,14 @@
<view class="weui-media-box__title">{{item.examtest__name}} <view class="weui-media-box__title">{{item.examtest__name}}
</view> </view>
<view class="weui-media-box__desc">参加时间:{{item.starttime}}</view> <view class="weui-media-box__desc">参加时间:{{item.starttime}}</view>
<view class="weui-media-box__desc" style="color:blue">耗时:{{item.took}}分钟 得分:{{item.score}}</view> <view class="weui-media-box__desc" style="color:blue">耗时:{{item.took}}分钟 得分:{{item.score}}</view>
</view> </view>
<view class="weui-panel__ft weui-cell__ft_in-access"> <view class="weui-panel__ft weui-cell__ft_in-access">
<view class="weui-media-box__title" > <view class="weui-media-box__title">
<view wx:if="{{item.passcode==1}}" style="color:green">通过</view> <view wx:if="{{item.passcode==1}}" style="color:green">通过</view>
<view wx:if="{{item.passcode==0 && item.ison==1}}" style="color:red">未通过</view> <view wx:if="{{item.passcode==0 && item.ison==1}}" style="color:red">未通过</view>
<view wx:if="{{item.examtest__state==1}}" style="color:green">进行中</view> <view wx:if="{{item.examtest__state==1}}" style="color:green">进行中</view>
<view wx:else >已关闭</view> <view wx:else>已关闭</view>
</view> </view>
</view> </view>
</view> </view>
@ -52,5 +58,5 @@
</view> </view>
</view> </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> <button class="weui-btn" type="primary" style="width:auto;margin:5px" bindtap="scan">扫一扫参加考试</button>
</view> </view>

1
pages/examtest/main.js
View File

@ -224,6 +224,7 @@ Page({
tmIndex:tmIndex, tmIndex:tmIndex,
}) })
that.showChecked(tmIndex) that.showChecked(tmIndex)
console.log(that.tmdata.tms)
}, },
previous: function () { previous: function () {
var that = this var that = this

146
pages/main/main.js
View File

@ -5,21 +5,51 @@ Page({
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
yhtodonum:0, yhtodonum: 0,
zytodonum:0, zytodonum: 0,
noread:0, noread: 0,
dqdnum:0, dqdnum: 0,
dknum:0, dknum: 0,
gcnoread:0, gcnoread: 0,
wsnoread:0, wsnoread: 0,
jytodonum:0, jytodonum: 0,
tasknum:0, tasknum: 0,
serverUrl: getApp().globalData.serverUrl,
// Banner数据
images: [],
// 是否显示面板指示点
indicatorDots: true,
// 滑动方向是否为纵向
vertical: false,
// 自动切换
autoplay: true,
// 采用衔接滑动
circular: true,
// 自动切换时间间隔2s
interval: 4000,
// 滑动动画时长0.5s
duration: 1000,
// 前边距，可用于露出前一项的一小部分，接受 px 和 rpx 值
previousMargin: 0,
// 后边距，可用于露出后一项的一小部分，接受 px 和 rpx 值
nextMargin: 0
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
var that = this
let images = [
that.data.serverUrl + 'media/banner/1.jpg',
that.data.serverUrl + 'media/banner/2.jpg',
that.data.serverUrl + 'media/banner/3.jpg',
that.data.serverUrl + 'media/banner/4.jpg',
that.data.serverUrl + 'media/banner/5.jpg',
]
that.setData({
images: images
})
}, },
/** /**
@ -34,7 +64,7 @@ Page({
onShow: function () { onShow: function () {
var that = this var that = this
//获取待阅读通知数目 //获取待阅读通知数目
if(wx.getStorageSync("sessionid")){ if (wx.getStorageSync("sessionid")) {
this.getnoread() this.getnoread()
this.getyhtodonum() this.getyhtodonum()
this.getzytodonum() this.getzytodonum()
@ -44,16 +74,16 @@ Page({
this.getwsnoreadnum()//未遂未读 this.getwsnoreadnum()//未遂未读
this.getjytodonum() this.getjytodonum()
this.gettasknum() this.gettasknum()
}else{ } else {
getApp().callback = () => { getApp().callback = () => {
this.getnoread() this.getnoread()
this.getyhtodonum() this.getyhtodonum()
this.getzytodonum() this.getzytodonum()
this.getpxqdnum() this.getpxqdnum()
this.getdknum() this.getdknum()
this.getgcnoreadnum() this.getgcnoreadnum()
this.getjytodonum() this.getjytodonum()
this.gettasknum() this.gettasknum()
}; };
} }
@ -93,9 +123,9 @@ Page({
onShareAppMessage: function () { onShareAppMessage: function () {
}, },
getnoread: function(){ getnoread: function () {
wx.request({ wx.request({
url: getApp().globalData.serverUrl + 'api/notice?a=noreadnum', url: this.data.serverUrl + 'api/notice?a=noreadnum',
header: { header: {
'content-type': 'application/json', // 默认值 'content-type': 'application/json', // 默认值
'Cookie': wx.getStorageSync("sessionid"), 'Cookie': wx.getStorageSync("sessionid"),
@ -111,11 +141,11 @@ Page({
} }
}); });
}, },
getyhtodonum:function(){ getyhtodonum: function () {
var that = this var that = this
//获取隐患待办数目 //获取隐患待办数目
wx.request({ wx.request({
url: getApp().globalData.serverUrl + 'troublehandle?a=todonum', url: this.data.serverUrl + 'troublehandle?a=todonum',
header: { header: {
'content-type': 'application/json', // 默认值 'content-type': 'application/json', // 默认值
'Cookie': wx.getStorageSync("sessionid"), 'Cookie': wx.getStorageSync("sessionid"),
@ -135,7 +165,7 @@ Page({
var that = this var that = this
//获取作业待办数目 //获取作业待办数目
wx.request({ wx.request({
url: getApp().globalData.serverUrl + 'api/operation?a=todonum', url: this.data.serverUrl + 'api/operation?a=todonum',
header: { header: {
'content-type': 'application/json', // 默认值 'content-type': 'application/json', // 默认值
'Cookie': wx.getStorageSync("sessionid"), 'Cookie': wx.getStorageSync("sessionid"),
@ -151,11 +181,11 @@ Page({
} }
}); });
}, },
getpxqdnum:function(){ getpxqdnum: function () {
var that = this var that = this
//获取待签到培训 //获取待签到培训
wx.request({ wx.request({
url: getApp().globalData.serverUrl + 'pxhandle?a=dqdnum', url: this.data.serverUrl + 'pxhandle?a=dqdnum',
header: { header: {
'content-type': 'application/json', // 默认值 'content-type': 'application/json', // 默认值
'Cookie': wx.getStorageSync("sessionid"), 'Cookie': wx.getStorageSync("sessionid"),
@ -175,7 +205,7 @@ Page({
var that = this var that = this
//获取待考 //获取待考
wx.request({ wx.request({
url: getApp().globalData.serverUrl + 'api/examtestdetail?a=dknum', url: this.data.serverUrl + 'api/examtestdetail?a=dknum',
header: { header: {
'content-type': 'application/json', // 默认值 'content-type': 'application/json', // 默认值
'Cookie': wx.getStorageSync("sessionid"), 'Cookie': wx.getStorageSync("sessionid"),
@ -195,7 +225,7 @@ Page({
var that = this var that = this
//获取待考 //获取待考
wx.request({ wx.request({
url: getApp().globalData.serverUrl + 'gchandle?a=noreadnum', url: this.data.serverUrl + 'gchandle?a=noreadnum',
header: { header: {
'content-type': 'application/json', // 默认值 'content-type': 'application/json', // 默认值
'Cookie': wx.getStorageSync("sessionid"), 'Cookie': wx.getStorageSync("sessionid"),
@ -215,7 +245,7 @@ Page({
var that = this var that = this
//获取待考 //获取待考
wx.request({ wx.request({
url: getApp().globalData.serverUrl + 'api/miss?a=noreadnum', url: this.data.serverUrl + 'api/miss?a=noreadnum',
header: { header: {
'content-type': 'application/json', // 默认值 'content-type': 'application/json', // 默认值
'Cookie': wx.getStorageSync("sessionid"), 'Cookie': wx.getStorageSync("sessionid"),
@ -235,7 +265,7 @@ Page({
var that = this var that = this
//获取待考 //获取待考
wx.request({ wx.request({
url: getApp().globalData.serverUrl + 'api/suggest?a=todonum', url: this.data.serverUrl + 'api/suggest?a=todonum',
header: { header: {
'content-type': 'application/json', // 默认值 'content-type': 'application/json', // 默认值
'Cookie': wx.getStorageSync("sessionid"), 'Cookie': wx.getStorageSync("sessionid"),
@ -255,7 +285,7 @@ Page({
var that = this var that = this
//获取待考 //获取待考
wx.request({ wx.request({
url: getApp().globalData.serverUrl + 'api/riskacttask?a=todonum', url: this.data.serverUrl + 'api/riskacttask?a=todonum',
header: { header: {
'content-type': 'application/json', // 默认值 'content-type': 'application/json', // 默认值
'Cookie': wx.getStorageSync("sessionid"), 'Cookie': wx.getStorageSync("sessionid"),
@ -271,8 +301,8 @@ Page({
} }
}); });
}, },
taptest:function(){ taptest: function () {
if(getApp().globalData.rights != undefined){ if (getApp().globalData.rights != undefined) {
if (getApp().globalData.rights.indexOf('25') != -1) {//考试功能 if (getApp().globalData.rights.indexOf('25') != -1) {//考试功能
wx.navigateTo({ wx.navigateTo({
url: '/pages/examtest/index', url: '/pages/examtest/index',
@ -283,7 +313,7 @@ Page({
showCancel: false showCancel: false
}) })
} }
}else{ } else {
wx.showModal({ wx.showModal({
content: '加载中,请稍后。。', content: '加载中,请稍后。。',
showCancel: false showCancel: false
@ -292,17 +322,18 @@ Page({
}, },
tapexercise: function () { tapexercise: function () {
if (getApp().globalData.rights != undefined) { if (getApp().globalData.rights != undefined) {
if (getApp().globalData.rights.indexOf('25') != -1) {//考试功能 if (getApp().globalData.rights.indexOf('25') != -1) {//考试功能
wx.navigateTo({ wx.navigateTo({
url: '/pages/exercise/index', url: '/pages/exercise/index',
}) })
} else { } else {
wx.showModal({ wx.showModal({
content: '该功能如需开通,请查看公告或联系管理员!', content: '该功能如需开通,请查看公告或联系管理员!',
showCancel:false showCancel: false
}) })
}} }
else{ }
else {
wx.showModal({ wx.showModal({
content: '加载中,请稍后。。', content: '加载中,请稍后。。',
showCancel: false showCancel: false
@ -311,22 +342,23 @@ Page({
}, },
tapinspect: function () { tapinspect: function () {
if (getApp().globalData.rights != undefined) { if (getApp().globalData.rights != undefined) {
if (getApp().globalData.rights.indexOf('35') != -1) {//设备巡检 if (getApp().globalData.rights.indexOf('35') != -1) {//设备巡检
wx.navigateTo({ wx.navigateTo({
url: '/pages/inspect/index', url: '/pages/inspect/index',
}) })
} else { } else {
wx.showModal({ wx.showModal({
content: '该功能如需开通,请查看公告或联系管理员!', content: '该功能如需开通,请查看公告或联系管理员!',
showCancel: false showCancel: false
}) })
}} }
else{ }
else {
wx.showModal({ wx.showModal({
content: '加载中,请稍后。。', content: '加载中,请稍后。。',
showCancel: false showCancel: false
}) })
} }
}, },
}) })

5
pages/main/main.json
View File

@ -1 +1,4 @@
{} {
"usingComponents": {
}
}

17
pages/main/main.wxml
View File

@ -1,4 +1,21 @@
<view class="page"> <view class="page">
<swiper indicator-dots="{{indicatorDots}}"
autoplay="{{autoplay}}"
circular="{{circular}}"
vertical="{{vertical}}"
interval="{{interval}}"
duration="{{duration}}"
previous-margin="{{previousMargin}}px"
next-margin="{{nextMargin}}px">
<block wx:for='{{images}}' wx:key='index'>
<swiper-item>
<image src='{{item}}' mode='aspectFill' class='swiper-item-images'/>
</swiper-item>
</block>
</swiper>
<view class="page__bd"> <view class="page__bd">
<view class="weui-cells__title">数据采集</view> <view class="weui-cells__title">数据采集</view>
<view class="weui-grids"> <view class="weui-grids">

6
pages/main/main.wxss
View File

@ -1 +1,5 @@
/* pages/main/main.wxss */ /* pages/main/main.wxss */
.swiper-item-images{
width: 100%;
height: 300rpx;
}

1
pages/observe/addobserve.js
View File

@ -263,6 +263,7 @@ Page({
otherunsafe: this.data.otherunsafe, otherunsafe: this.data.otherunsafe,
safecontent: this.data.safecontent, safecontent: this.data.safecontent,
unsafe: this.getunsafe(), unsafe: this.getunsafe(),
lookers:this.data.lookers
} }
//console.log(gcdata.unsafe) //console.log(gcdata.unsafe)
wx.request({ wx.request({

14
pages/observe/observedetail.wxml
View File

@ -27,11 +27,19 @@
</view> </view>
<view class="weui-cell weui-cell_access"> <view class="weui-cell weui-cell_access">
<view class="weui-cell__bd weui-cell_primary"> <view class="weui-cell__bd weui-cell_primary">
<view>观察人</view> <view>记录人</view>
</view> </view>
<view class="weui-cell__ft"> <view class="weui-cell__ft">
{{looker__name}} {{looker__name}}
</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">
{{lookers}}
</view>
</view>
</view> </view>
<view class="weui-cell weui-cell_access"> <view class="weui-cell weui-cell_access">
<view class="weui-cell__bd weui-cell_primary"> <view class="weui-cell__bd weui-cell_primary">
@ -80,7 +88,7 @@
<view class="weui-cell weui-cell_access"> <view class="weui-cell weui-cell_access">
<view class="weui-cell__bd weui-cell_primary"> <view class="weui-cell__bd weui-cell_primary">
<view>过程及交流记录</view> <view>过程及交流记录</view>
<view class="weui-cell__ft"> <view class="weui-cell__ft" wx:if="{{otherunsafe!=null}}">
{{otherunsafe}} {{otherunsafe}}
</view> </view>
</view> </view>
@ -88,7 +96,7 @@
<view class="weui-cell weui-cell_access"> <view class="weui-cell weui-cell_access">
<view class="weui-cell__bd weui-cell_primary"> <view class="weui-cell__bd weui-cell_primary">
<view>共识或改进要求</view> <view>共识或改进要求</view>
<view class="weui-cell__ft"> <view class="weui-cell__ft" wx:if="{{safecontent!=null}}">
{{safecontent}} {{safecontent}}
</view> </view>
</view> </view>

4
pages/operation/operationadd.wxml
View File

@ -121,8 +121,8 @@
<icon class="weui-icon-checkbox_success" type="success" size="23" wx:if="{{item.checked}}"></icon> <icon class="weui-icon-checkbox_success" type="success" size="23" wx:if="{{item.checked}}"></icon>
</view> </view>
<view> <view>
<view class="weui-media-box__desc" style='color:red'>{{item.fxfx}}</view> <view style='color:red'>{{item.fxfx}}</view>
<view class="weui-media-box__desc" style='color:green'>{{item.aqcs}}</view> <view style='color:green'>{{item.aqcs}}</view>
<view class="weui-media-box__desc">{{item.cslx}}</view> <view class="weui-media-box__desc">{{item.cslx}}</view>
</view> </view>
</label> </label>

28
pages/operation/operationcheck.js
View File

@ -8,7 +8,9 @@ Page({
data: { data: {
serverUrl: getApp().globalData.serverUrl, serverUrl: getApp().globalData.serverUrl,
zyimg2: [], zyimg2: [],
zjsp:false zjsp:false,
zyspryname: '',
spry: [],
}, },
getZy: function (zyid) { getZy: function (zyid) {
wx.showLoading({ wx.showLoading({
@ -122,7 +124,7 @@ Page({
wx.request({ wx.request({
url: that.data.serverUrl + 'api/operation?a=qrzy', url: that.data.serverUrl + 'api/operation?a=qrzy',
header: { header: {
'content-type': 'application/x-www-form-urlencoded', // 'content-type': 'aapplication/json', //
'Cookie': wx.getStorageSync("sessionid"), 'Cookie': wx.getStorageSync("sessionid"),
}, },
method: 'POST', method: 'POST',
@ -142,7 +144,7 @@ Page({
wx.request({ wx.request({
url: that.data.serverUrl + 'api/operation?a=spzy', url: that.data.serverUrl + 'api/operation?a=spzy',
header: { header: {
'content-type': 'application/x-www-form-urlencoded', // 'content-type': 'application/json', //
'Cookie': wx.getStorageSync("sessionid"), 'Cookie': wx.getStorageSync("sessionid"),
}, },
method: 'POST', method: 'POST',
@ -252,6 +254,24 @@ Page({
} }
}); });
}, },
zjsp: function () {
var that=this
wx.request({
url: getApp().globalData.serverUrl + 'api/operation?a=spzy',
header: {
'content-type': 'application/json', //
'Cookie': wx.getStorageSync("sessionid"),
},
method: 'POST',
data: { 'zyid': that.data.zyid, 'zjsp': true, 'newsprs': that.data.spry },
success: res => {
if (res.statusCode === 200) {
wx.hideLoading();
wx.navigateBack()
}
}
});
},
openaction: function () { openaction: function () {
var that = this var that = this
wx.showActionSheet({ wx.showActionSheet({
@ -270,7 +290,7 @@ Page({
wx.request({ wx.request({
url: that.data.serverUrl + 'api/operation?a=spzy', url: that.data.serverUrl + 'api/operation?a=spzy',
header: { header: {
'content-type': 'application/x-www-form-urlencoded', // 'content-type': 'application/json', //
'Cookie': wx.getStorageSync("sessionid"), 'Cookie': wx.getStorageSync("sessionid"),
}, },
method: 'POST', method: 'POST',

14
pages/operation/operationcheck.wxml
View File

@ -2,13 +2,13 @@
作业详情 作业详情
</view> </view>
<view class="weui-cells weui-cells_after-title"> <view class="weui-cells weui-cells_after-title">
<view class="weui-cell weui-cell_access"> <navigator url="operationdetail?zyid={{zyid}}&fromwx=1" class="weui-cell weui-cell_access">
<view class="weui-cell__bd weui-cell_primary"> <view class="weui-cell__bd weui-cell_primary">
<view>当前状态</view> <view>当前状态</view>
</view> </view>
<view class="weui-cell__ft" style="color:green" wx:if="{{zyzt.zyzt=='已关闭'}}">已关闭</view> <view class="weui-cell__ft_in-access" style="color:green" wx:if="{{zyzt.zyzt=='审批中'}}">{{zyzt.jdmc}}-{{zyzt.zyzt}}</view>
<view class="weui-cell__ft" style="color:green" wx:else>{{zyzt.zyzt}}</view> <view class="weui-cell__ft_in-access" style="color:green" wx:else>{{zyzt.zyzt}}</view>
</view> </navigator>
<view class="weui-cell weui-cell_access"> <view class="weui-cell weui-cell_access">
<view class="weui-cell__bd weui-cell_primary"> <view class="weui-cell__bd weui-cell_primary">
<view>作业类型</view> <view>作业类型</view>
@ -87,9 +87,9 @@
<view class="weui-cells weui-cells_after-title"> <view class="weui-cells weui-cells_after-title">
<block wx:for="{{fxcs}}" wx:key="unique" wx:for-item="item"> <block wx:for="{{fxcs}}" wx:key="unique" wx:for-item="item">
<view class="weui-media-box"> <view class="weui-media-box">
<view class="weui-media-box__desc" style='color:red'>{{item.fxfx}}</view> <view style='color:red'>{{item.fxfx}}</view>
<view class="weui-media-box__desc" style='color:green'>{{item.aqcs}}</view> <view style='color:green'>{{item.aqcs}}</view>
<view class="weui-media-box__desc">{{item.cslx}}</view> <view class="weui-media-box__desc" >{{item.cslx}}</view>
</view> </view>
</block> </block>

40
pages/operation/operationdetail.js
View File

@ -1,5 +1,6 @@
// pages/operation/operationcheck.js // pages/operation/operationcheck.js
var util = require('../../utils/util.js') var util = require('../../utils/util.js')
var sliderWidth = 96;
Page({ Page({
/** /**
@ -7,6 +8,17 @@ Page({
*/ */
data: { data: {
serverUrl: getApp().globalData.serverUrl, serverUrl: getApp().globalData.serverUrl,
tabs: ["作业详情","流程详情"],
activeIndex: 0,
sliderOffset: 0,
sliderLeft: 0
},
tabClick: function (e) {
var that = this
that.setData({
sliderOffset: e.currentTarget.offsetLeft,
activeIndex: e.currentTarget.id
});
}, },
getZy: function (zyid) { getZy: function (zyid) {
wx.showLoading({ wx.showLoading({
@ -31,8 +43,6 @@ Page({
zydata.zyimg2[i] = this.data.serverUrl + zydata.zyimg2[i]; zydata.zyimg2[i] = this.data.serverUrl + zydata.zyimg2[i];
} }
this.setData(zydata) this.setData(zydata)
switch (zydata.zyzt) {
}
//console.log(this.data.yhzt) //console.log(this.data.yhzt)
} }
} }
@ -42,7 +52,31 @@ Page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
this.getZy(options.zyid); var fromwx = options.fromwx
if(fromwx==1){
var pages = getCurrentPages();//页面指针数组
var prepage = pages[pages.length - 2];//上一页面指针
var zydata = prepage.data
//格式化信息
for (var i = 0; i < zydata.zyimg.length; i++) {
zydata.zyimg[i] = this.data.serverUrl + zydata.zyimg[i];
}
for (var i = 0; i < zydata.zyimg2.length; i++) {
zydata.zyimg2[i] = this.data.serverUrl + zydata.zyimg2[i];
}
this.setData(zydata)
}else{
this.getZy(options.zyid);
}
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
});
}
});
}, },
/** /**

308
pages/operation/operationdetail.wxml
View File

@ -1,147 +1,187 @@
<view class="weui-cells__title"> <view class="weui-tab">
作业详情 <view class="weui-navbar">
</view> <block wx:for="{{tabs}}" wx:key="*this">
<view class="weui-cells weui-cells_after-title"> <view id="{{index}}" class="weui-navbar__item {{activeIndex == index ? 'weui-bar__item_on' : ''}}" bindtap="tabClick">
<view class="weui-cell weui-cell_access"> <view class="weui-navbar__title">{{item}}</view>
<view class="weui-cell__bd weui-cell_primary">
<view>当前状态</view>
</view>
<view class="weui-cell__ft" style="color:green" wx:if="{{zyzt.zyzt=='已关闭'}}">已关闭</view>
<view class="weui-cell__ft" style="color:green" wx:else>{{zyzt.zyzt}}</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">
{{zylx__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">
{{zydd}}
</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">
{{zybm__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">
{{zyfzr__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">
{{sdbm__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">
{{kssj}}
</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">
{{jssj}}
</view>
</view>
<view class="weui-cell weui-cell_access">
<view class="weui-cell__bd weui-cell_primary">
<view>作业内容</view>
<view class="weui-cell__ft">
{{zynr}}
</view> </view>
</view> </block>
<view class="weui-navbar__slider" style="left: {{sliderLeft}}px; transform: translateX({{sliderOffset}}px); -webkit-transform: translateX({{sliderOffset}}px);"></view>
</view> </view>
<view class="weui-cell weui-cell_access"> <view class="weui-tab__panel">
<view class="weui-cell__bd weui-cell_primary"> <view class="weui-tab__content" hidden="{{activeIndex != 0}}">
<view>现场图片</view> <view class="weui-cells weui-cells_after-title">
<view class="weui-uploader__files"> <view class="weui-cell weui-cell_access">
<block wx:for="{{zyimg}}" wx:for-item="image" wx:key="unique"> <view class="weui-cell__bd weui-cell_primary">
<view class="weui-uploader__file"> <view>当前状态</view>
<image class="weui-uploader__img" src="{{image}}" data-src="{{image}}" bindtap="zyimgPreview" bindlongpress="deleteyhImage"></image>
</view> </view>
</block> <view class="weui-cell__ft" style="color:green" wx:if="{{zyzt.zyzt=='审批中'}}">{{zyzt.jdmc}}-{{zyzt.zyzt}}</view>
<!-- <view class="weui-uploader__input-box" wx:if="{{zyzt ==0}}"> <view class="weui-cell__ft" style="color:green" wx:else>{{zyzt.zyzt}}</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">
{{zylx__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">
{{zydd}}
</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">
{{zybm__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">
{{zyfzr__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">
{{sdbm__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">
{{kssj}}
</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">
{{jssj}}
</view>
</view>
<view class="weui-cell weui-cell_access">
<view class="weui-cell__bd weui-cell_primary">
<view>作业内容</view>
<view class="weui-cell__ft">
{{zynr}}
</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">
{{zyry}}
</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="{{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>
</view>
</block>
<!-- <view class="weui-uploader__input-box" wx:if="{{zyzt ==0}}">
<view class="weui-uploader__input" bindtap="chooseyhImage"></view> <view class="weui-uploader__input" bindtap="chooseyhImage"></view>
</view> --> </view> -->
</view>
</view>
</view>
</view> </view>
</view>
</view>
</view>
<view class="weui-cells__title">风险分析和安全措施</view> <view class="weui-cells__title">风险分析和安全措施</view>
<view class="weui-cells weui-cells_after-title"> <view class="weui-cells weui-cells_after-title">
<block wx:for="{{fxcs}}" wx:key="unique" wx:for-item="item"> <block wx:for="{{fxcs}}" wx:key="unique" wx:for-item="item">
<view class="weui-media-box"> <view class="weui-media-box">
<view class="weui-media-box__desc" style='color:red'>{{item.fxfx}}</view> <view style='color:red'>{{item.fxfx}}</view>
<view class="weui-media-box__desc" style='color:green'>{{item.aqcs}}</view> <view style='color:green'>{{item.aqcs}}</view>
<view class="weui-media-box__desc">{{item.cslx}}</view> <view class="weui-media-box__desc">{{item.cslx}}</view>
</view> </view>
</block> </block>
</view>
<view class="weui-cells__title">作业人员确认详情</view>
<view class="weui-cells weui-cells_after-title">
<block wx:for="{{qrxq}}" wx:key="unique" wx:for-item="item">
<view class="weui-cell weui-cell_access">
<view class="weui-cell__bd weui-cell_primary">
<view>{{item.operzyry__name}}</view>
</view> </view>
<view class="weui-cell__ft" wx:if="{{item.checked == 0}}" style="color:red"> <view class="weui-cells__title">审批流程</view>
待确认 <view class="weui-cells weui-cells_after-title">
</view> <block wx:for="{{zyzt.splc}}" wx:key="unique" wx:for-item="item">
<view class="weui-cell__ft" wx:if="{{item.checked == 1}}" style="color:green"> <view class="weui-cell weui-cell_access">
已确认 <view class="weui-cell__bd weui-cell_primary">
</view> <view>{{index+1}} {{item.jdmc}}</view>
</view> </view>
</block> <view class="weui-cell__ft" wx:if="{{zyzt.index > index }}" style="color:green">
</view> 已执行
<view class="weui-cells__title">审批详情</view> </view>
<view class="weui-cells weui-cells_after-title"> <view class="weui-cell__ft" wx:if="{{zyzt.index == index && zyzt.zyzt=='待关闭' }}" style="color:green">
<block wx:for="{{spxq}}" wx:key="unique" wx:for-item="item"> 已执行
<view class="weui-cell weui-cell_access"> </view>
<view class="weui-cell__bd weui-cell_primary">
<view>{{item.jdmc}}</view>
<view class="weui-media-box__desc">{{item.spr__name}} {{item.submittime}}</view>
</view>
<view class="weui-cell__ft" wx:if="{{item.checked == 0}}" style="color:red">
待审批
</view>
<view class="weui-cell__ft" wx:if="{{item.checked == 1}}" style="color:green">
已通过
</view>
</view>
</block>
</view>
<view class="weui-cells__title">关闭现场图片</view>
<view class="weui-cell weui-cell_access">
<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="zyimg2Preview" ></image>
</view> </view>
</block> </block>
</view> </view>
<view class="weui-cells__title">关闭现场图片</view>
<view class="weui-cell weui-cell_access">
<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="zyimg2Preview"></image>
</view>
</block>
</view>
</view>
</view>
<view class="weui-tab__content" hidden="{{activeIndex != 1}}">
<view class="weui-cells__title">作业人员确认详情</view>
<view class="weui-cells weui-cells_after-title">
<block wx:for="{{qrxq}}" wx:key="unique" wx:for-item="item">
<view class="weui-cell weui-cell_access">
<view class="weui-cell__bd weui-cell_primary">
<view>{{item.operzyry__name}}</view>
</view>
<view class="weui-cell__ft" wx:if="{{item.checked == 0}}" style="color:red">
待确认
</view>
<view class="weui-cell__ft" wx:if="{{item.checked == 1}}" style="color:green">
已确认
</view>
</view>
</block>
</view>
<view class="weui-cells__title">审批详情</view>
<view class="weui-cells weui-cells_after-title">
<block wx:for="{{spxq}}" wx:key="unique" wx:for-item="item">
<view class="weui-cell weui-cell_access">
<view class="weui-cell__bd weui-cell_primary">
<view>{{item.jdmc}}</view>
<view class="weui-media-box__desc">{{item.spr__name}} {{item.submittime}}</view>
</view>
<view class="weui-cell__ft" wx:if="{{item.checked == 0}}" style="color:red">
待审批
</view>
<view class="weui-cell__ft" wx:if="{{item.checked == 1}}" style="color:green">
已通过
</view>
<view class="weui-cell__ft" wx:if="{{item.checked == 2}}" style="color:green">
转交审批
</view>
</view>
</block>
</view>
</view>
</view>
</view> </view>

104
pages/riskact/index.wxml
View File

@ -11,61 +11,61 @@
<view class="weui-tab__content" hidden="{{activeIndex != 0}}"> <view class="weui-tab__content" hidden="{{activeIndex != 0}}">
<view class="head"> <view class="head">
共{{mytotal}}条风险排查记录</view> 共{{mytotal}}条风险排查记录</view>
<view class="weui-cells weui-cells_after-title" > <view class="weui-cells weui-cells_after-title">
<block wx:for="{{riskactchecklist}}" wx:key="unique"> <block wx:for="{{riskactchecklist}}" wx:key="unique">
<navigator url="../risktask/detail?id={{item.id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active"> <navigator url="../risktask/detail?id={{item.id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active">
<view class="weui-media-box__bd weui-media-box__bd_in-appmsg"> <view class="weui-media-box__bd weui-media-box__bd_in-appmsg">
<view class="weui-media-box__title">{{item.riskact__name}}</view> <view class="weui-media-box__title">{{item.riskact__name}}</view>
<view class="weui-media-box__desc"> <view class="weui-media-box__desc">
<span style="background-color:orange;color:white">区域</span> <span style="background-color:orange;color:white">区域</span>
{{item.riskact__area__name}} {{item.riskact__area__name}}
</view> </view>
<view class="weui-media-box__desc"> <view class="weui-media-box__desc">
<span style="background-color:orange;color:white">排查时间</span> <span style="background-color:orange;color:white">排查时间</span>
{{item.taskdo}} {{item.taskdo}}
</view> </view>
</view> </view>
<view class="weui-panel__ft weui-cell__ft_in-access"> <view class="weui-panel__ft weui-cell__ft_in-access">
<view class="weui-media-box__title" wx:if="{{item.riskact__level == '低风险'}}" style="background-color:blue;color:white">低风险</view> <view class="weui-media-box__title" wx:if="{{item.riskact__level == '低风险'}}" style="background-color:blue;color:white">低风险</view>
<view class="weui-media-box__title" wx:if="{{item.riskact__level == '一般风险'}}" style="background-color:yellow">一般风险</view> <view class="weui-media-box__title" wx:if="{{item.riskact__level == '一般风险'}}" style="background-color:yellow">一般风险</view>
<view class="weui-media-box__title" wx:if="{{item.riskact__level == '较大风险'}}" style="background-color:orange">较大风险</view> <view class="weui-media-box__title" wx:if="{{item.riskact__level == '较大风险'}}" style="background-color:orange">较大风险</view>
<view class="weui-media-box__title" wx:if="{{item.riskact__level == '重大风险'}}" style="background-color:red;color:white">重大风险</view> <view class="weui-media-box__title" wx:if="{{item.riskact__level == '重大风险'}}" style="background-color:red;color:white">重大风险</view>
<view wx:if="{{item.state==0}}" class="weui-media-box__desc" style="background-color:red;color:white">异常</view> <view wx:if="{{item.state==0}}" class="weui-media-box__desc" style="background-color:red;color:white">异常</view>
<view wx:else class="weui-media-box__desc" style="background-color:green;color:white">正常</view> <view wx:else class="weui-media-box__desc" style="background-color:green;color:white">正常</view>
</view> </view>
</navigator> </navigator>
</block> </block>
</view> </view>
</view> </view>
<view class="weui-tab__content" hidden="{{activeIndex != 1}}"> <view class="weui-tab__content" hidden="{{activeIndex != 1}}">
<view class="page__bd"> <view class="page__bd">
<view class="head">共{{total}}条风险点</view> <view class="head">共{{total}}条风险点</view>
<view class="weui-cells weui-cells_after-title" > <view class="weui-cells weui-cells_after-title">
<block wx:for="{{riskactlist}}" wx:key="unique"> <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"> <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__bd weui-media-box__bd_in-appmsg">
<view class="weui-media-box__title">{{item.name}}</view> <view class="weui-media-box__title">{{item.name}}</view>
<view class="weui-media-box__desc"> <view class="weui-media-box__desc">
<span style="background-color:orange;color:white">区域</span> <span style="background-color:orange;color:white">区域</span>
{{item.area__name}} {{item.area__name}}
<span style="background-color:orange;color:white"> 岗位</span> <span style="background-color:orange;color:white"> 岗位</span>
{{item.group__groupname}} {{item.group__groupname}}
</view> </view>
<view class="weui-media-box__desc"> <view class="weui-media-box__desc">
<span style="background-color:orange;color:white">风险点类别</span> <span style="background-color:orange;color:white">风险点类别</span>
{{item.type__dickeyname}} {{item.type__dickeyname}}
</view> </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 class="weui-panel__ft weui-cell__ft_in-access"> </view>
<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>