diff --git a/pages.json b/pages.json
index dc5fccd..3d5619a 100644
--- a/pages.json
+++ b/pages.json
@@ -781,6 +781,127 @@
"path": "pages/application/high-risk-work/blind-work/acceptance/list",
"style": {}
},
+ //新动火作业
+ {
+ "path": "pages/application/hotwork_cfd/home",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-alldetail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-alldetail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-alldetail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-alldetail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-gas/gas-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-gas/gas-list",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-list",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-alldetail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-alldetail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail",
+ "style": {}
+ },
+ {
+ "path": "pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list",
+ "style": {}
+ },
//智能门禁管理
{
"path": "pages/application/accesscontrol/home",
diff --git a/pages/application/eight-assignments/index.vue b/pages/application/eight-assignments/index.vue
index 7cae42e..7023b3d 100644
--- a/pages/application/eight-assignments/index.vue
+++ b/pages/application/eight-assignments/index.vue
@@ -6,6 +6,10 @@
+
+
+ （旧）动火作业
+
@@ -27,9 +31,135 @@
-
-
-
+
+
+
+
+
+
+
+
+ （新）动火作业
+
+
+
+
+
+ {{count.COUNTBACK}}
+
+
+ 动火作业
+ 申请
+
+
+
+
+
+ {{count.COUNTCONFIRM}}
+
+
+ 作业负责人
+ 意见
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{count.COUNTLEADER}}
+
+
+ 所在单位
+ 意见
+
+
+
+
+
+ {{count.COUNTAUDIT}}
+
+
+ 安全管理部门
+ 意见
+
+
+
+
+
+ {{count.COUNTAPPROVE}}
+
+
+ 动火审批人
+ 意见
+
+
+
+
+
+ {{count.COUNTMONITOR}}
+
+
+ 班长验票
+
+
+
+
+
+ {{count.COUNTACCEPT}}
+
+
+ 完工验收
+
+
+
+
+
+ {{count.COUNTANALYZE}}
+
+
+ 气体分析
+
+
+
+
+
+ {{count.COUNTGUARDIAN}}
+
+
+ 监护人
+
+
+
+
+
+ {{count.COUNTCONFESS}}
+
+
+ 安全交底人
+
+
+
+
+
+ {{count.COUNTACCEPTCONFESS}}
+
+
+ 接受交底人
+
+
+
+
+
+
@@ -38,18 +168,62 @@ import {
basePath,
corpinfoId,
loginUser,
+ isRest
} from '@/common/tool.js';
export default {
data() {
return {
hotCount : 0,
- hotSuperCount :0
+ hotSuperCount :0,
+ isRest : '',
+ count : {}
};
},
+ mounted() {
+ this.isRest = isRest;
+
+ },
onShow() {
this.getData();
+ this.getDataCfd();
},
methods: {
+ showRest(){
+ uni.showModal({
+ title: '提示',
+ showCancel:false,
+ content: '您处于离岗状态，无需检查清单。',
+ confirmText: "返回", // 确认按钮文字
+ success: (res) => {
+ }
+ })
+ },
+ getDataCfd(){
+ var _this = this;
+ uni.showLoading({
+ title:"加载中..."
+ });//加载中动画
+ uni.request({
+ url: basePath +'/app/hotwork/cfd/countCheck',
+ method: 'POST',
+ dataType: 'json',
+ header: {
+ 'Content-type':'application/x-www-form-urlencoded'
+ },
+ data: {
+ tm:new Date().getTime(),
+ CORPINFO_ID:loginUser.CORPINFO_ID,
+ USER_ID:loginUser.USER_ID,
+ },
+ success: (res) => {
+ uni.hideLoading();//结束加载中动画
+ if ("success" == res.data.result) {
+ _this.count = res.data.count;
+ }
+
+ }
+ })
+ },
getData(){
var _this = this;
uni.showLoading({
@@ -161,4 +335,9 @@ export default {
width: 100%;
height: 100%;
}
+
+ .cu-tabbar-height {
+ min-height: 20upx;
+ height: calc(20upx + env(safe-area-inset-bottom) / 2);
+ }
diff --git a/pages/application/high-risk-work/home.vue b/pages/application/high-risk-work/home.vue
index 336f853..bd93bd8 100644
--- a/pages/application/high-risk-work/home.vue
+++ b/pages/application/high-risk-work/home.vue
@@ -31,11 +31,11 @@ export default {
url:'/pages/application/eight-assignments/index',
image:require('../../../static/new_images/i1.png'),
},
- {
- title: '新动火作业',
- url:'/pages/application/hotwork_cfd/home',
- image:require('../../../static/new_images/i1.png'),
- },
+ // {
+ // title: '新动火作业',
+ // url:'/pages/application/hotwork_cfd/home',
+ // image:require('../../../static/new_images/i1.png'),
+ // },
{
title:'高处作业',
url:'/pages/application/high-risk-work/high-work/home',