Merge branch 'dev-yjl' into 'shenzhen-dev'

安全管理-新增项目自检记录页面

See merge request !119

public/js/config.js

@@ -1,4 +1,4 @@
-var COMPANY = ''; //通用
+// var COMPANY = ''; //通用
 // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业
 // var COMPANY='hezhan'; //合展-宿迁
 // var COMPANY='nanchang'; //南昌地铁、衢州
@@ -7,7 +7,7 @@ var COMPANY = ''; //通用
 // var COMPANY='shenbai'; //沈白高铁
 // COMPANY = 'henan' // 河南春笋
 // COMPANY = 'xingxuan'
-// COMPANY = 'hengtong'//瑞士恒通
+COMPANY = 'hengtong'//瑞士恒通
 
 
 

src/router/index.js

@@ -481,6 +481,12 @@ const routes2 = [
         name: '安全管理_项目自检子任务',
         component: () => import('@/views/projectFront/safeManage/v2/subTasklist.vue')
       },
+      //项目自检记录
+      {
+        path: '/project/safeManage/inspectionRecord',
+        name: '安全管理_项目自检记录',
+        component: () => import('@/views/projectFront/safeManage/v2/inspectionRecord.vue')
+      },
       {
         path: '/project/safeManage/hiddenDangerLibrary',
         name: '安全管理_隐患库',

src/views/projectFront/safeManage/v2/subTasklist.vue

@@ -197,7 +197,8 @@ export default {
         })
     },
     detailsPoint(item) {
-      this.$router.push('/project/safeManage/checkStandingBook?id=' + item.id)
+      // this.$router.push('/project/safeManage/checkStandingBook?id=' + item.id)
+      this.$router.push('/project/safeManage/inspectionRecord?id=' + item.id)
     }
   }
 }