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

gridtaskset

This commit is contained in:
caoqianming 2020-09-09 17:13:50 +08:00
parent 93c304de83
commit c4d54ad573
5 changed files with 90 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pages/riskact/check.js
View File

@ -7,6 +7,7 @@ Page({
data: { data: {
page: 1, page: 1,
riskact: 0, riskact: 0,
riskacttask:0,
group: 0 group: 0
}, },
@ -16,6 +17,9 @@ Page({
onLoad: function (options) { onLoad: function (options) {
console.log(options) console.log(options)
this.data.riskact = options.riskact this.data.riskact = options.riskact
if(options.riskacttask){
this.riskacttask = options.riskacttask
}
this.getlist() this.getlist()
}, },
getlist: function () { getlist: function () {
@ -99,7 +103,7 @@ Page({
submit: function () { submit: function () {
console.log(this.data.alllist) console.log(this.data.alllist)
let alllist = this.data.alllist let alllist = this.data.alllist
let data = {'checks':[],'riskact':this.data.riskact} let data = {'checks':[],'riskact':this.data.riskact, 'riskacttask':this.data.riskacttask}
for (var i = 0; i < alllist.length; i++) { for (var i = 0; i < alllist.length; i++) {
if (i.trouble != undefined){ if (i.trouble != undefined){
data.checks.push({ 'id': alllist[i].id }) data.checks.push({ 'id': alllist[i].id })

19
pages/risktask/detail.wxml
View File

@ -1,7 +1,7 @@
<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="{{alllist}}" wx:key="unique"> <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 weui-media-box_appmsg" >
<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"> <view class="weui-media-box__title">
<span wx:if="{{item.risk__level == '低风险'}}" style="background-color:blue;color:white">低风险</span> <span wx:if="{{item.risk__level == '低风险'}}" style="background-color:blue;color:white">低风险</span>
@ -10,11 +10,16 @@
<span wx:if="{{item.risk__level == '重大风险'}}" style="background-color:red;color:white">重大风险</span> <span wx:if="{{item.risk__level == '重大风险'}}" style="background-color:red;color:white">重大风险</span>
{{item.risk__step}} {{item.risk__step}}
</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.risk__hazard}} {{item.risk__hazard}}
</view> </view>
<view class="weui-media-box__desc"> <view class="weui-media-box__desc">
<span >排查时间</span>
<span style="color:darkblue;font-weight:bold">{{item.riskacttask__taskdo}}</span>
</view>
<!-- <view class="weui-media-box__desc">
<span style="background-color:green;color:white">工程技术</span> <span style="background-color:green;color:white">工程技术</span>
<span wx:if="{{item.risk__measure1!=null}}">{{item.risk__measure1}}</span> <span wx:if="{{item.risk__measure1!=null}}">{{item.risk__measure1}}</span>
<span wx:else>无</span> <span wx:else>无</span>
@ -38,8 +43,16 @@
<span style="background-color:green;color:white">应急处理</span> <span style="background-color:green;color:white">应急处理</span>
<span wx:if="{{item.risk__measure5!=null}}">{{item.risk__measure5}}</span> <span wx:if="{{item.risk__measure5!=null}}">{{item.risk__measure5}}</span>
<span wx:else>无</span> <span wx:else>无</span>
</view> -->
<view class="weui-media-box__desc" wx:if="{{item.trouble__yhnum != null}}">
<span>隐患编号</span>
<span style="color:red;font-weight:bold"> {{item.trouble__yhnum}}</span>
</view> </view>
<view class="weui-media-box__desc" style="color:red" wx:if="{{item.trouble__yhnum != null}}">{{item.trouble__yhnum}}</view> </view>
<view>
<navigator url="/pages/risk/detail?id={{item.risk}}" hover-class="navigator-hover">风险详情</navigator>
<navigator url="/pages/trouble/troubledetail?troubleid={{item.trouble}}" hover-class="navigator-hover">隐患详情</navigator>
</view> </view>
</view> </view>
</block> </block>

2
pages/risktask/index.js
View File

@ -9,7 +9,7 @@ Page({
page: 1, page: 1,
serverUrl: getApp().globalData.serverUrl, serverUrl: getApp().globalData.serverUrl,
alllist: [], alllist: [],
tabs: ["历史任务", "我的任务", "全厂待办"], tabs: ["历史任务", "我的待办", "全厂待办"],
activeIndex: 1, activeIndex: 1,
sliderOffset: 0, sliderOffset: 0,
sliderLeft: 0 sliderLeft: 0

19
pages/risktask/index.wxml
View File

@ -19,11 +19,12 @@
{{item.riskact__area__name}} {{item.riskact__name}} {{item.riskact__area__name}} {{item.riskact__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.riskact__group__groupname}} {{item.riskact__group__groupname}}
</view> --> </view> -->
<view class="weui-media-box__desc">任务生成时间:{{item.taskadd}}</view> <view class="weui-media-box__desc">任务生成时间:{{item.taskadd}}</view>
<view class="weui-media-box__desc">任务过期时间:{{item.taskexpire}}</view> <view class="weui-media-box__desc" wx:if="{{item.taskexpire}}">任务过期时间:{{item.taskexpire}}</view>
<view class="weui-media-box__desc" wx:if="{{item.user__name}}">执行人:{{item.user__name}}</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>
@ -32,7 +33,7 @@
<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.taskdo!=null}}" class="weui-media-box__title" style="background-color:green;color:white">已执行</view> <view wx:if="{{item.taskdo!=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 wx:if="{{item.usable==2}}" class="weui-media-box__title" style="background-color:green;color:white">作废</view>
<view wx:if="{{item.taskdo==null}}" class="weui-media-box__title" style="background-color:red;color:white">未执行</view> <view wx:if="{{item.usable==0 && item.taskdo==null}}" class="weui-media-box__title" style="background-color:red;color:white">已过期</view>
</view> </view>
</navigator> </navigator>
</block> </block>
@ -42,18 +43,19 @@
<view class="head">共{{todototal}}条任务</view> <view class="head">共{{todototal}}条任务</view>
<view class="weui-cells weui-cells_after-title"> <view class="weui-cells weui-cells_after-title">
<block wx:for="{{todolist}}" wx:key="unique"> <block wx:for="{{todolist}}" wx:key="unique">
<navigator url="../riskact/check?riskact={{item.riskact__id}}" class="weui-media-box weui-media-box_appmsg" hover-class="weui-cell_active"> <navigator url="../riskact/check?riskact={{item.riskact__id}}&riskacttask={{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"> <view class="weui-media-box__title">
<span style="background-color:green;color:white">风险点</span> <span style="background-color:green;color:white">风险点</span>
{{item.riskact__area__name}} {{item.riskact__name}} {{item.riskact__area__name}} {{item.riskact__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.riskact__group__groupname}} {{item.riskact__group__groupname}}
</view> </view>
<view class="weui-media-box__desc">任务生成时间:{{item.taskadd}}</view> <view class="weui-media-box__desc">任务生成时间:{{item.taskadd}}</view>
<view class="weui-media-box__desc">任务过期时间:{{item.taskexpire}}</view> <view class="weui-media-box__desc" wx:if="{{item.taskexpire}}">任务过期时间:{{item.taskexpire}}</view>
<view class="weui-media-box__desc" wx:if="{{item.user__name}}">执行人:{{item.user__name}}</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>
@ -77,11 +79,12 @@
{{item.riskact__area__name}} {{item.riskact__name}} {{item.riskact__area__name}} {{item.riskact__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.group__groupname}} {{item.group__groupname}}
</view> --> </view> -->
<view class="weui-media-box__desc">任务生成时间:{{item.taskadd}}</view> <view class="weui-media-box__desc">任务生成时间:{{item.taskadd}}</view>
<view class="weui-media-box__desc">任务过期时间:{{item.taskexpire}}</view> <view class="weui-media-box__desc" wx:if="{{item.taskexpire}}">任务过期时间:{{item.taskexpire}}</view>
<view class="weui-media-box__desc" wx:if="{{item.user__name}}">执行人:{{item.user__name}}</view>
</view> </view>
<view class="weui-panel__ft "> <view class="weui-panel__ft ">
<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>

114
project.config.json
View File

@ -1,59 +1,59 @@
{ {
"description": "项目配置文件。", "description": "项目配置文件。",
"setting": { "setting": {
"urlCheck": false, "urlCheck": false,
"es6": true, "es6": true,
"enhance": false, "postcss": true,
"postcss": true, "minified": true,
"preloadBackgroundData": false, "newFeature": true,
"minified": true, "coverView": true,
"newFeature": true, "nodeModules": true,
"coverView": true, "autoAudits": false,
"nodeModules": true, "showShadowRootInWxmlPanel": true,
"autoAudits": false, "scopeDataCheck": false,
"showShadowRootInWxmlPanel": true, "checkInvalidKey": true,
"scopeDataCheck": false, "checkSiteMap": true,
"uglifyFileName": false, "uploadWithSourceMap": true,
"checkInvalidKey": true, "babelSetting": {
"checkSiteMap": true, "ignore": [],
"uploadWithSourceMap": true, "disablePlugins": [],
"compileHotReLoad": false, "outputPath": ""
"useMultiFrameRuntime": true, },
"useApiHook": false, "useCompilerModule": false,
"babelSetting": { "userConfirmedUseCompilerModuleSwitch": false,
"ignore": [], "enhance": false,
"disablePlugins": [], "preloadBackgroundData": false,
"outputPath": "" "uglifyFileName": false,
}, "compileHotReLoad": false,
"useIsolateContext": true, "useMultiFrameRuntime": true,
"useCompilerModule": true, "useApiHook": false,
"userConfirmedUseCompilerModuleSwitch": false, "useIsolateContext": true,
"packNpmManually": false, "packNpmManually": false,
"packNpmRelationList": [] "packNpmRelationList": []
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.9.4", "libVersion": "2.9.4",
"appid": "wx5c39b569f01c27db", "appid": "wx5c39b569f01c27db",
"projectname": "aqyj", "projectname": "aqyj",
"isGameTourist": false, "isGameTourist": false,
"simulatorType": "wechat", "simulatorType": "wechat",
"simulatorPluginLibVersion": {}, "simulatorPluginLibVersion": {},
"condition": { "condition": {
"search": { "search": {
"current": -1, "current": -1,
"list": [] "list": []
}, },
"conversation": { "conversation": {
"current": -1, "current": -1,
"list": [] "list": []
}, },
"game": { "game": {
"currentL": -1, "currentL": -1,
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
"current": -1, "current": -1,
"list": [] "list": []
} }
} }
} }