旧动火作业分为旧动火和新动火

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",

pages/application/eight-assignments/index.vue

@@ -6,6 +6,10 @@
 		</cu-custom>
 		<view class="apps-box">
 			<view class="apps-row">
+        <view class="apps-title">
+          <text class="apps-title-line"></text>
+          <text>（旧）动火作业</text>
+        </view>
 				<view class="apps-warp">
 					<navigator class="apps-item" hover-class="none" url="/pages/application/eight-assignments/hotwork/index">
 						<view class="imgs action">
@@ -30,6 +34,132 @@
       </view>
       <view class="cu-tabbar-height"></view>
     </view>
+
+    <view class="apps-box">
+      <view class="apps-row">
+        <view class="apps-title">
+          <text class="apps-title-line"></text>
+          <text>（新）动火作业</text>
+        </view>
+        <view class="apps-warp">
+          <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-apply/hotwork-apply-list">
+            <view class="imgs action">
+              <image src="../../../static/icon-apps/icon-yxkj-1.png" mode=""></image>
+              <view v-if="count.COUNTBACK" class="cu-tag badge">{{count.COUNTBACK}}</view>
+            </view>
+            <view class="text-semi" style="text-align: center;">
+              <view>动火作业</view>
+              <view>申请</view>
+            </view>
+          </navigator>
+          <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-list">
+            <view class="imgs action">
+              <image src="../../../static/icon-apps/icon-yh-1.png" mode=""></image>
+              <view v-if="count.COUNTCONFIRM" class="cu-tag badge">{{count.COUNTCONFIRM}}</view>
+            </view>
+            <view class="text-semi"  style="text-align: center;">
+              <view>作业负责人</view>
+              <view>意见</view>
+            </view>
+          </navigator>
+          <!--					<navigator class="apps-item" hover-class="none" url="/pages/application/hotwork/hotwork-guardian/hotwork-guardian-list">-->
+          <!--						<view class="imgs action">-->
+          <!--							<image src="../../../static/icon-apps/icon-zl-9.png" mode=""></image>-->
+          <!--							<view v-if="count.COUNTGUARDIAN" class="cu-tag badge">{{count.COUNTGUARDIAN}}</view>-->
+          <!--						</view>-->
+          <!--						<view class="text-semi"  style="text-align: center;">-->
+          <!--							<view>监护人</view>-->
+          <!--							<view>意见</view>-->
+          <!--						</view>-->
+          <!--					</navigator>-->
+          <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list">
+            <view class="imgs action">
+              <image src="../../../static/icon-apps/icon-807.png" mode=""></image>
+              <view v-if="count.COUNTLEADER" class="cu-tag badge">{{count.COUNTLEADER}}</view>
+            </view>
+            <view class="text-semi"  style="text-align: center;">
+              <view>所在单位</view>
+              <view>意见</view>
+            </view>
+          </navigator>
+          <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list">
+            <view class="imgs action">
+              <image src="../../../static/icon-apps/icon-yxkj-4.png" mode=""></image>
+              <view v-if="count.COUNTAUDIT" class="cu-tag badge">{{count.COUNTAUDIT}}</view>
+            </view>
+            <view class="text-semi" style="text-align: center;">
+              <view>安全管理部门</view>
+              <view>意见</view>
+            </view>
+          </navigator>
+          <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list">
+            <view class="imgs action">
+              <image src="../../../static/icon-apps/icon-yxkj-2.png" mode=""></image>
+              <view v-if="count.COUNTAPPROVE" class="cu-tag badge">{{count.COUNTAPPROVE}}</view>
+            </view>
+            <view class="text-semi" style="text-align: center;">
+              <view>动火审批人</view>
+              <view>意见</view>
+            </view>
+          </navigator>
+          <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list">
+            <view class="imgs action">
+              <image src="../../../static/icon-apps/icon-907.png" mode=""></image>
+              <view v-if="count.COUNTMONITOR" class="cu-tag badge">{{count.COUNTMONITOR}}</view>
+            </view>
+            <view class="text-semi" style="text-align: center;">
+              <view>班长验票</view>
+            </view>
+          </navigator>
+          <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list">
+            <view class="imgs action">
+              <image src="../../../static/icon-apps/icon-901.png" mode=""></image>
+              <view v-if="count.COUNTACCEPT" class="cu-tag badge">{{count.COUNTACCEPT}}</view>
+            </view>
+            <view class="text-semi" style="text-align: center;">
+              <view>完工验收</view>
+            </view>
+          </navigator>
+          <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-gas/hotwork-gas-list">
+            <view class="imgs action">
+              <image src="../../../static/icon-apps/icon-zl-8.png" mode=""></image>
+              <view v-if="count.COUNTANALYZE" class="cu-tag badge">{{count.COUNTANALYZE}}</view>
+            </view>
+            <view class="text-semi" style="text-align: center;">
+              <view>气体分析</view>
+            </view>
+          </navigator>
+          <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-guardian/hotwork-guardian-list">
+            <view class="imgs action">
+              <image src="../../../static/icon-apps/icon-jh-1_cfd.png" mode=""></image>
+              <view v-if="count.COUNTGUARDIAN" class="cu-tag badge">{{count.COUNTGUARDIAN}}</view>
+            </view>
+            <view class="text-semi" style="text-align: center;">
+              <view>监护人</view>
+            </view>
+          </navigator>
+          <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-confess/hotwork-confess-list">
+            <view class="imgs action">
+              <image src="../../../static/icon-apps/icon-aq-1_cfd.png" mode=""></image>
+              <view v-if="count.COUNTCONFESS" class="cu-tag badge">{{count.COUNTCONFESS}}</view>
+            </view>
+            <view class="text-semi" style="text-align: center;">
+              <view>安全交底人</view>
+            </view>
+          </navigator>
+          <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork_cfd/hotwork-acceptconfess/hotwork-acceptconfess-list">
+            <view class="imgs action">
+              <image src="../../../static/icon-apps/icon-js-1_cfd.png" mode=""></image>
+              <view v-if="count.COUNTACCEPTCONFESS" class="cu-tag badge">{{count.COUNTACCEPTCONFESS}}</view>
+            </view>
+            <view class="text-semi" style="text-align: center;">
+              <view>接受交底人</view>
+            </view>
+          </navigator>
+        </view>
+      </view>
+      <view class="cu-tabbar-height"></view>
+    </view>
 	</view>
 </template>
 
@@ -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);
+  }
 </style>

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: '新动火作业',
+        //   title: '新动火作业',
-          url:'/pages/application/hotwork_cfd/home',
+        //   url:'/pages/application/hotwork_cfd/home',
-          image:require('../../../static/new_images/i1.png'),
+        //   image:require('../../../static/new_images/i1.png'),
-        },
+        // },
         {
           title:'高处作业',
           url:'/pages/application/high-risk-work/high-work/home',