diff --git a/src/assets/js/api/selectWorkerInfoList.js b/src/assets/js/api/selectWorkerInfoList.js new file mode 100644 index 00000000..08364408 --- /dev/null +++ b/src/assets/js/api/selectWorkerInfoList.js @@ -0,0 +1,3 @@ +// 工作站 +import {post, get} from '../http' +export const selectWorkScheduleListApi = data => post('xmgl/workerInfo/selectWorkerInfoList', data); \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 13c0aebb..03c3aeac 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,31 +7,9 @@ import homeIntro from '../views/homeTwo/homeIntro.vue' //首页-系统简介页 Vue.use(VueRouter) var routes = [] const routes2 = [ - // { - // path: '/', - // name: 'Home', - // // component: homeLayout - // component: homeIntro - // }, - // { - // path: '/login', - // name: 'login', - // // component: () => import('../views/home/login.vue') - // component: () => import('../views/home/login_v1.vue') - // }, - // { - // path: '/sign', - // name: '注册', - // component: () => import('../views/home/sign.vue') - // }, - // { - // path: '/authorization', - // name: '授权', - // component: () => import('../views/home/authorization.vue') - // }, { path: '/', - name: 'HomeTwo', + name: 'Home', // component: homeLayout component: homeIntro }, @@ -39,18 +17,40 @@ const routes2 = [ path: '/login', name: 'login', // component: () => import('../views/home/login.vue') - component: () => import('../views/homeTwo/login_v1.vue') + component: () => import('../views/home/login_v1.vue') }, { path: '/sign', name: '注册', - component: () => import('../views/homeTwo/sign.vue') + component: () => import('../views/home/sign.vue') }, { path: '/authorization', name: '授权', - component: () => import('../views/homeTwo/authorization.vue') + component: () => import('../views/home/authorization.vue') }, + // { + // path: '/', + // name: 'HomeTwo', + // // component: homeLayout + // component: homeIntro + // }, + // { + // path: '/login', + // name: 'login', + // // component: () => import('../views/home/login.vue') + // component: () => import('../views/homeTwo/login_v1.vue') + // }, + // { + // path: '/sign', + // name: '注册', + // component: () => import('../views/homeTwo/sign.vue') + // }, + // { + // path: '/authorization', + // name: '授权', + // component: () => import('../views/homeTwo/authorization.vue') + // }, { path: '/page', name: 'page5', @@ -373,6 +373,12 @@ const routes2 = [ name: '劳务管理_人员统计分析', component: () => import('@/views/projectFront/laborManage/personnelAnalysis.vue'), }, + //核酸超时人员列表 + { + path: '/project/labor/nucleicAcidOvertimePersonnel', + name: '核酸超时人员列表', + component: () => import('@/views/projectFront/nucleicAcidOvertimePersonnel/index.vue'), + }, //人员定位--卡片管理 { path: '/project/personnelPosition/cardManage', @@ -1386,124 +1392,124 @@ const routes2 = [ { path: '/project/dataBoard/', name: '数据看板', - component: resolve => require(['@/views/projectAdmin/dataBoardTwo/dataBoard.vue'], resolve), - // component: resolve => require(['@/views/projectAdmin/dataBoard/dataBoard.vue'], resolve), - // children: [{ - // path: 'index', - // name: '数据看板-首页概览', - // component: () => import('@/views/projectAdmin/dataBoard/index.vue'), - // }, { - // path: 'digitalSite', - // name: '数据看板-数字工地', - // component: () => import('@/views/projectAdmin/dataBoard/digitalSite.vue'), - // }, { - // path: 'laborManage', - // name: '数据看板-劳务管理', - // component: () => import('@/views/projectAdmin/dataBoard/laborManage.vue'), - // }, { - // path: 'environment', - // name: '数据看板-环境监测', - // component: () => import('@/views/projectAdmin/dataBoard/environment.vue'), - // }, - // { - // path: 'material', - // name: '数据看板-材料管理', - // component: () => import('@/views/projectAdmin/dataBoard/material.vue'), - // }, - // { - // path: 'plan', - // name: '数据看板-进度计划', - // component: () => import('@/views/projectAdmin/dataBoard/plan.vue'), - // }, - // { - // path: 'secure', - // name: '数据看板-安全管理', - // component: () => import('@/views/projectAdmin/dataBoard/secure.vue'), - // }, - // { - // path: 'quality', - // name: '数据看板-质量管理', - // component: () => import('@/views/projectAdmin/dataBoard/quality.vue'), - // }, - // { - // path: 'SixHundred', - // name: '数据看板-六个百分百', - // component: () => import('@/views/projectAdmin/dataBoard/AiAnalysisCopy.vue'), - // }, - // { - // path: 'AiAnalysis', - // name: '数据看板-AI数据分析', - // component: () => import('@/views/projectAdmin/dataBoard/AiAnalysis.vue'), - // } - // ] + // component: resolve => require(['@/views/projectAdmin/dataBoardTwo/dataBoard.vue'], resolve), + component: resolve => require(['@/views/projectAdmin/dataBoard/dataBoard.vue'], resolve), children: [{ - path: 'index', - name: '数据看板-首页概览', - component: () => import('@/views/projectAdmin/dataBoardTwo/index.vue'), - }, { - path: 'digitalSite', - name: '数据看板-数字工地', - component: () => import('@/views/projectAdmin/dataBoardTwo/digitalSite'), - }, { - path: 'laborManage', - name: '数据看板-劳务管理', - component: () => import('@/views/projectAdmin/dataBoardTwo/laborManage.vue'), - }, { - path: 'environment', - name: '数据看板-环境监测', - component: () => import('@/views/projectAdmin/dataBoardTwo/environment.vue'), - }, - { - path: 'material', - name: '数据看板-材料管理', - component: () => import('@/views/projectAdmin/dataBoardTwo/material.vue'), - }, - { - path: 'plan', - name: '数据看板-进度计划', - component: () => import('@/views/projectAdmin/dataBoardTwo/plan.vue'), - }, - { - path: 'secure', - name: '数据看板-安全管理', - component: () => import('@/views/projectAdmin/dataBoardTwo/secure.vue'), - }, - { - path: 'quality', - name: '数据看板-质量管理', - component: () => import('@/views/projectAdmin/dataBoardTwo/quality.vue'), - }, - { - path: 'SixHundred', - name: '数据看板-六个百分百', - component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysisCopy.vue'), - }, - { - path: 'AiAnalysis', - name: '数据看板-AI数据分析', - component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysis.vue'), - }, - { - path: 'contractManage', - name: '数据看板-合约管理', - component: () => import('@/views/projectAdmin/dataBoardTwo/contractManage.vue'), - }, - { - path: 'doublecManage', - name: '数据看板-双碳管理', - component: () => import('@/views/projectAdmin/dataBoardTwo/doublecManage.vue'), - }, - { - path: 'bigScreen', - name: '数据看板-监控大屏', - component: () => import('@/views/projectAdmin/dataBoardTwo/bigScreen.vue'), - }, - { - path: 'cimManage', - name: '数据看板-CIM+', - component: () => import('@/views/projectAdmin/dataBoardTwo/cimManage.vue'), - } - ] + path: 'index', + name: '数据看板-首页概览', + component: () => import('@/views/projectAdmin/dataBoard/index.vue'), + }, { + path: 'digitalSite', + name: '数据看板-数字工地', + component: () => import('@/views/projectAdmin/dataBoard/digitalSite.vue'), + }, { + path: 'laborManage', + name: '数据看板-劳务管理', + component: () => import('@/views/projectAdmin/dataBoard/laborManage.vue'), + }, { + path: 'environment', + name: '数据看板-环境监测', + component: () => import('@/views/projectAdmin/dataBoard/environment.vue'), + }, + { + path: 'material', + name: '数据看板-材料管理', + component: () => import('@/views/projectAdmin/dataBoard/material.vue'), + }, + { + path: 'plan', + name: '数据看板-进度计划', + component: () => import('@/views/projectAdmin/dataBoard/plan.vue'), + }, + { + path: 'secure', + name: '数据看板-安全管理', + component: () => import('@/views/projectAdmin/dataBoard/secure.vue'), + }, + { + path: 'quality', + name: '数据看板-质量管理', + component: () => import('@/views/projectAdmin/dataBoard/quality.vue'), + }, + { + path: 'SixHundred', + name: '数据看板-六个百分百', + component: () => import('@/views/projectAdmin/dataBoard/AiAnalysisCopy.vue'), + }, + { + path: 'AiAnalysis', + name: '数据看板-AI数据分析', + component: () => import('@/views/projectAdmin/dataBoard/AiAnalysis.vue'), + } + ] + // children: [{ + // path: 'index', + // name: '数据看板-首页概览', + // component: () => import('@/views/projectAdmin/dataBoardTwo/index.vue'), + // }, { + // path: 'digitalSite', + // name: '数据看板-数字工地', + // component: () => import('@/views/projectAdmin/dataBoardTwo/digitalSite'), + // }, { + // path: 'laborManage', + // name: '数据看板-劳务管理', + // component: () => import('@/views/projectAdmin/dataBoardTwo/laborManage.vue'), + // }, { + // path: 'environment', + // name: '数据看板-环境监测', + // component: () => import('@/views/projectAdmin/dataBoardTwo/environment.vue'), + // }, + // { + // path: 'material', + // name: '数据看板-材料管理', + // component: () => import('@/views/projectAdmin/dataBoardTwo/material.vue'), + // }, + // { + // path: 'plan', + // name: '数据看板-进度计划', + // component: () => import('@/views/projectAdmin/dataBoardTwo/plan.vue'), + // }, + // { + // path: 'secure', + // name: '数据看板-安全管理', + // component: () => import('@/views/projectAdmin/dataBoardTwo/secure.vue'), + // }, + // { + // path: 'quality', + // name: '数据看板-质量管理', + // component: () => import('@/views/projectAdmin/dataBoardTwo/quality.vue'), + // }, + // { + // path: 'SixHundred', + // name: '数据看板-六个百分百', + // component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysisCopy.vue'), + // }, + // { + // path: 'AiAnalysis', + // name: '数据看板-AI数据分析', + // component: () => import('@/views/projectAdmin/dataBoardTwo/AiAnalysis.vue'), + // }, + // { + // path: 'contractManage', + // name: '数据看板-合约管理', + // component: () => import('@/views/projectAdmin/dataBoardTwo/contractManage.vue'), + // }, + // { + // path: 'doublecManage', + // name: '数据看板-双碳管理', + // component: () => import('@/views/projectAdmin/dataBoardTwo/doublecManage.vue'), + // }, + // { + // path: 'bigScreen', + // name: '数据看板-监控大屏', + // component: () => import('@/views/projectAdmin/dataBoardTwo/bigScreen.vue'), + // }, + // { + // path: 'cimManage', + // name: '数据看板-CIM+', + // component: () => import('@/views/projectAdmin/dataBoardTwo/cimManage.vue'), + // } + // ] }, { path: '/equipmentCenter/', diff --git a/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue b/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue index 4a870dfb..abdbba20 100644 --- a/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue +++ b/src/views/projectFront/laborManage/attendanceManage/attendanceManage.vue @@ -309,7 +309,7 @@ align="center" > diff --git a/src/views/projectFront/nucleicAcidOvertimePersonnel/index.vue b/src/views/projectFront/nucleicAcidOvertimePersonnel/index.vue new file mode 100644 index 00000000..12e4c794 --- /dev/null +++ b/src/views/projectFront/nucleicAcidOvertimePersonnel/index.vue @@ -0,0 +1,180 @@ + + + + + \ No newline at end of file