diff --git a/yanzhu-bigscreen/src/assets/images/map-bg.png b/yanzhu-bigscreen/src/assets/images/map-bg.png
new file mode 100755
index 00000000..064fa94a
Binary files /dev/null and b/yanzhu-bigscreen/src/assets/images/map-bg.png differ
diff --git a/yanzhu-bigscreen/src/components/MyChart.vue b/yanzhu-bigscreen/src/components/MyChart.vue
index 59960aea..9b165642 100644
--- a/yanzhu-bigscreen/src/components/MyChart.vue
+++ b/yanzhu-bigscreen/src/components/MyChart.vue
@@ -1,65 +1,62 @@
 <template>
-
-        <div :id="id" :class="className" :style="{ height, width }"></div>
-
+    <div :id="id" :class="className" :style="{ height, width }"></div>
 </template>
 
 <script>
 export default {
     props: {
-    id: {
-      type: String,
-      default: "barChart1",
+        id: {
+            type: String,
+            default: 'barChart1',
+        },
+        className: {
+            type: String,
+            default: '',
+        },
+        width: {
+            type: String,
+            default: '400px',
+        },
+        height: {
+            type: String,
+            default: '400px',
+        },
+        render: {
+            type: Function,
+        },
     },
-    className: {
-      type: String,
-      default: "",
+    data() {
+        return {
+            chart: null,
+        }
     },
-    width: {
-      type: String,
-      default: "400px",
+    mounted() {
+        this.chart = window.echarts.init(document.getElementById(this.id))
+        setTimeout(() => {
+            this.setOption({})
+        }, 400)
+        // 大小自适应
+        window.addEventListener('resize', () => {
+            this.chart.resize()
+        })
     },
-    height: {
-      type: String,
-      default: "400px",
+    methods: {
+        reLoad() {
+            let opt = {}
+            if (this.render) {
+                opt = this.render(opt)
+            }
+            this.chart.setOption(opt, true)
+        },
+        setOption(opt) {
+            if (this.render) {
+                opt = this.render(opt, this.chart)
+            }
+            this.chart.setOption(opt)
+        },
     },
-    render: {
-      type: Function,
-    },
-  },
-  data() {
-    return {
-      chart: null,
-    };
-  },
-  mounted() {
-    this.chart = window.echarts.init(document.getElementById(this.id));
-    setTimeout(() => {
-      this.setOption({});
-    }, 400);
-    // 大小自适应
-    window.addEventListener("resize", () => {
-      this.chart.resize();
-    });
-  },
-  methods: {
-    reLoad(){
-      let opt={};
-      if (this.render) {
-        opt = this.render(opt);
-      }
-      this.chart.setOption(opt,true);
-    },
-    setOption(opt) {
-      if (this.render) {
-        opt = this.render(opt);
-      }
-      this.chart.setOption(opt);
-    },
-  },
 }
 </script>
 
 <style>
-
 </style>
\ No newline at end of file
diff --git a/yanzhu-bigscreen/src/components/header.vue b/yanzhu-bigscreen/src/components/header.vue
index 439ac093..f784e816 100644
--- a/yanzhu-bigscreen/src/components/header.vue
+++ b/yanzhu-bigscreen/src/components/header.vue
@@ -5,6 +5,7 @@
                 <div class="head-title-tab">
                     <div :class="nav == 1 ? 'head-nav active' : 'head-nav'" @click="doNav(1)" v-if="1==2">项目概况</div>
                     <div :class="nav == 2 ? 'head-nav active' : 'head-nav'" @click="doNav(2)">项目详情</div>
+                    <div :class="nav == 7 ? 'head-nav active' : 'head-nav'" @click="doNav(7)">劳务管理</div>
                     <div :class="(nav >= 300 && nav < 400) || nav == 3 ? 'head-nav active' : 'head-nav'" style="position: relative;" class="has-submenu">
                         <div @click="doNav(3)">安全管理</div>
                         <div class="header-btn-list">
@@ -211,6 +212,9 @@ export default {
                 case 6:
                     this.$router.push('/greenCarbon')
                     break
+                case 7:
+                    this.$router.push('/labor')
+                    break
                 case 501:
                     this.$router.push('/photography')
                     break
diff --git a/yanzhu-bigscreen/src/router/index.js b/yanzhu-bigscreen/src/router/index.js
index e68f3d5d..d9fa9d88 100644
--- a/yanzhu-bigscreen/src/router/index.js
+++ b/yanzhu-bigscreen/src/router/index.js
@@ -18,6 +18,13 @@ const routes = [
     component: () =>
       import(/* webpackChunkName: "detail" */ "../views/projectDetail.vue"),
   },
+  {
+    path: "/labor",
+    name: "labor",
+    meta: { nav: 7 },
+    component: () =>
+      import(/* webpackChunkName: "labor" */ "../views/projectLabor.vue"),
+  },
   {
     path: "/prjSafety",
     name: "prjSafety",
diff --git a/yanzhu-bigscreen/src/views/projectLabor.vue b/yanzhu-bigscreen/src/views/projectLabor.vue
new file mode 100644
index 00000000..2d8a2a86
--- /dev/null
+++ b/yanzhu-bigscreen/src/views/projectLabor.vue
@@ -0,0 +1,557 @@
+<template>
+    <div class="project-labor main-page">
+        <el-col :span="6" class="h100">
+            <module-one-1-1 label="劳务人员概况">
+                <img src="images/icon2001.png" class="img-openwin" />
+            </module-one-1-1>
+            <module-one-1-1 label="劳务人员七天出勤趋势"></module-one-1-1>
+            <module-one-1-1 label="劳务人员年龄分布"></module-one-1-1>
+        </el-col>
+        <el-col :span="12" class="h100">
+            <module-one-2-2 label class="no-title no-border">
+                <my-chart :key="chartKey" id="prj-labor-map" width="100%" height="100%" :render="renderMap"></my-chart>
+            </module-one-2-2>
+            <module-one-1-2 label="实时进出" class="prj-plan"></module-one-1-2>
+        </el-col>
+        <el-col :span="6" class="h100">
+            <module-one-1-1 label="工种占比分布"></module-one-1-1>
+            <module-one-1-1 label="人员地区分布"></module-one-1-1>
+            <module-one-1-1 label="人员预期"></module-one-1-1>
+        </el-col>
+    </div>
+</template>
+
+<script>
+import debounce from 'lodash.debounce'
+import mapbg from '@/assets/images/map-bg.png'
+export default {
+    data() {
+        return {
+            dpi: '',
+            chartKey: 0,
+            selProject: null,
+        }
+    },
+    methods: {
+        init() {
+            if (!this.selProject) {
+                return
+            }
+        },
+        renderMap(opt, myChart) {
+            var name_title = '中国人民大学2017年各省市计划录取人数'
+            var subname = '数据爬取自千栀网\n，\n上海、浙江无文理科录取人数'
+            var nameColor = ' rgb(55, 75, 113)'
+            var name_fontFamily = '等线'
+            var subname_fontSize = 15
+            var name_fontSize = 18
+            var mapName = 'china'
+            var data = [
+                { name: '北京', value: 177 },
+                { name: '天津', value: 42 },
+                { name: '河北', value: 102 },
+                { name: '山西', value: 81 },
+                { name: '内蒙古', value: 47 },
+                { name: '辽宁', value: 67 },
+                { name: '吉林', value: 82 },
+                { name: '黑龙江', value: 66 },
+                { name: '上海', value: 24 },
+                { name: '江苏', value: 92 },
+                { name: '浙江', value: 114 },
+                { name: '安徽', value: 109 },
+                { name: '福建', value: 116 },
+                { name: '江西', value: 91 },
+                { name: '山东', value: 119 },
+                { name: '河南', value: 137 },
+                { name: '湖北', value: 0 },
+                { name: '湖南', value: 114 },
+                { name: '重庆', value: 91 },
+                { name: '四川', value: 125 },
+                { name: '贵州', value: 62 },
+                { name: '云南', value: 83 },
+                { name: '西藏', value: 9 },
+                { name: '陕西', value: 80 },
+                { name: '甘肃', value: 56 },
+                { name: '青海', value: 10 },
+                { name: '宁夏', value: 18 },
+                { name: '新疆', value: 67 },
+                { name: '广东', value: 123 },
+                { name: '广西', value: 59 },
+                { name: '海南', value: 14 },
+            ]
+
+            var geoCoordMap = {}
+            var toolTipData = [
+                {
+                    name: '北京',
+                    value: [
+                        { name: '文科', value: 95 },
+                        { name: '理科', value: 82 },
+                    ],
+                },
+                {
+                    name: '天津',
+                    value: [
+                        { name: '文科', value: 22 },
+                        { name: '理科', value: 20 },
+                    ],
+                },
+                {
+                    name: '河北',
+                    value: [
+                        { name: '文科', value: 60 },
+                        { name: '理科', value: 42 },
+                    ],
+                },
+                {
+                    name: '山西',
+                    value: [
+                        { name: '文科', value: 40 },
+                        { name: '理科', value: 41 },
+                    ],
+                },
+                {
+                    name: '内蒙古',
+                    value: [
+                        { name: '文科', value: 23 },
+                        { name: '理科', value: 24 },
+                    ],
+                },
+                {
+                    name: '辽宁',
+                    value: [
+                        { name: '文科', value: 39 },
+                        { name: '理科', value: 28 },
+                    ],
+                },
+                {
+                    name: '吉林',
+                    value: [
+                        { name: '文科', value: 41 },
+                        { name: '理科', value: 41 },
+                    ],
+                },
+                {
+                    name: '黑龙江',
+                    value: [
+                        { name: '文科', value: 35 },
+                        { name: '理科', value: 31 },
+                    ],
+                },
+                {
+                    name: '上海',
+                    value: [
+                        { name: '文科', value: 12 },
+                        { name: '理科', value: 12 },
+                    ],
+                },
+                {
+                    name: '江苏',
+                    value: [
+                        { name: '文科', value: 47 },
+                        { name: '理科', value: 45 },
+                    ],
+                },
+                {
+                    name: '浙江',
+                    value: [
+                        { name: '文科', value: 57 },
+                        { name: '理科', value: 57 },
+                    ],
+                },
+                {
+                    name: '安徽',
+                    value: [
+                        { name: '文科', value: 57 },
+                        { name: '理科', value: 52 },
+                    ],
+                },
+                {
+                    name: '福建',
+                    value: [
+                        { name: '文科', value: 59 },
+                        { name: '理科', value: 57 },
+                    ],
+                },
+                {
+                    name: '江西',
+                    value: [
+                        { name: '文科', value: 49 },
+                        { name: '理科', value: 42 },
+                    ],
+                },
+                {
+                    name: '山东',
+                    value: [
+                        { name: '文科', value: 67 },
+                        { name: '理科', value: 52 },
+                    ],
+                },
+                {
+                    name: '河南',
+                    value: [
+                        { name: '文科', value: 69 },
+                        { name: '理科', value: 68 },
+                    ],
+                },
+                {
+                    name: '湖北',
+                    value: [
+                        { name: '文科', value: 60 },
+                        { name: '理科', value: 56 },
+                    ],
+                },
+                {
+                    name: '湖南',
+                    value: [
+                        { name: '文科', value: 62 },
+                        { name: '理科', value: 52 },
+                    ],
+                },
+                {
+                    name: '重庆',
+                    value: [
+                        { name: '文科', value: 47 },
+                        { name: '理科', value: 44 },
+                    ],
+                },
+                {
+                    name: '四川',
+                    value: [
+                        { name: '文科', value: 65 },
+                        { name: '理科', value: 60 },
+                    ],
+                },
+                {
+                    name: '贵州',
+                    value: [
+                        { name: '文科', value: 32 },
+                        { name: '理科', value: 30 },
+                    ],
+                },
+                {
+                    name: '云南',
+                    value: [
+                        { name: '文科', value: 42 },
+                        { name: '理科', value: 41 },
+                    ],
+                },
+                {
+                    name: '西藏',
+                    value: [
+                        { name: '文科', value: 5 },
+                        { name: '理科', value: 4 },
+                    ],
+                },
+                {
+                    name: '陕西',
+                    value: [
+                        { name: '文科', value: 38 },
+                        { name: '理科', value: 42 },
+                    ],
+                },
+                {
+                    name: '甘肃',
+                    value: [
+                        { name: '文科', value: 28 },
+                        { name: '理科', value: 28 },
+                    ],
+                },
+                {
+                    name: '青海',
+                    value: [
+                        { name: '文科', value: 5 },
+                        { name: '理科', value: 5 },
+                    ],
+                },
+                {
+                    name: '宁夏',
+                    value: [
+                        { name: '文科', value: 10 },
+                        { name: '理科', value: 8 },
+                    ],
+                },
+                {
+                    name: '新疆',
+                    value: [
+                        { name: '文科', value: 36 },
+                        { name: '理科', value: 31 },
+                    ],
+                },
+                {
+                    name: '广东',
+                    value: [
+                        { name: '文科', value: 63 },
+                        { name: '理科', value: 60 },
+                    ],
+                },
+                {
+                    name: '广西',
+                    value: [
+                        { name: '文科', value: 29 },
+                        { name: '理科', value: 30 },
+                    ],
+                },
+                {
+                    name: '海南',
+                    value: [
+                        { name: '文科', value: 8 },
+                        { name: '理科', value: 6 },
+                    ],
+                },
+            ]
+
+            /*获取地图数据*/
+
+            var mapFeatures = echarts.getMap(mapName).geoJson.features
+
+            mapFeatures.forEach(function (v) {
+                // 地区名称
+                var name = v.properties.name
+                // 地区经纬度
+                geoCoordMap[name] = v.properties.cp
+            })
+
+            // console.log("============geoCoordMap===================")
+            // console.log(geoCoordMap)
+            // console.log("================data======================")
+            //console.log(data)
+            //console.log(toolTipData)
+            var max = 480,
+                min = 9 // todo
+            var maxSize4Pin = 100,
+                minSize4Pin = 20
+
+            var convertData = function (data, lbl) {
+                var res = []
+                for (var i = 0; i < data.length; i++) {
+                    var geoCoord = geoCoordMap[data[i].name]
+                    if (geoCoord) {
+                        res.push({
+                            name: data[i].name,
+                            value: geoCoord.concat(data[i].value),
+                        })
+                    }
+                }
+                if (lbl == 1) {
+                    return res
+                }
+                return res.filter((d) => d.value[2] > 0)
+            }
+            let option = {
+                title: {
+                    show: false,
+                    text: name_title,
+                    subtext: subname,
+                    x: 'center',
+                    textStyle: {
+                        color: nameColor,
+                        fontFamily: name_fontFamily,
+                        fontSize: name_fontSize,
+                    },
+                    subtextStyle: {
+                        fontSize: subname_fontSize,
+                        fontFamily: name_fontFamily,
+                    },
+                },
+                tooltip: {
+                    show: false,
+                    trigger: 'item',
+                    formatter: function (params) {
+                        if (typeof params.value[2] == 'undefined') {
+                            var toolTiphtml = ''
+                            for (var i = 0; i < toolTipData.length; i++) {
+                                if (params.name == toolTipData[i].name) {
+                                    toolTiphtml += toolTipData[i].name + ':<br>'
+                                    for (var j = 0; j < toolTipData[i].value.length; j++) {
+                                        toolTiphtml += toolTipData[i].value[j].name + ':' + toolTipData[i].value[j].value + '<br>'
+                                    }
+                                }
+                            }
+                            console.log(toolTiphtml)
+                            // console.log(convertData(data))
+                            return toolTiphtml
+                        } else {
+                            var toolTiphtml = ''
+                            for (var i = 0; i < toolTipData.length; i++) {
+                                if (params.name == toolTipData[i].name) {
+                                    toolTiphtml += toolTipData[i].name + ':<br>'
+                                    for (var j = 0; j < toolTipData[i].value.length; j++) {
+                                        toolTiphtml += toolTipData[i].value[j].name + ':' + toolTipData[i].value[j].value + '<br>'
+                                    }
+                                }
+                            }
+                            console.log(toolTiphtml)
+                            // console.log(convertData(data))
+                            return toolTiphtml
+                        }
+                    },
+                },
+                // legend: {
+                //     orient: 'vertical',
+                //     y: 'bottom',
+                //     x: 'right',
+                //     data: ['credit_pm2.5'],
+                //     textStyle: {
+                //         color: '#fff'
+                //     }
+                // },
+                visualMap: {
+                    show: false,
+                    min: 0,
+                    max: 200,
+                    left: 'left',
+                    top: 'bottom',
+                    text: ['高', '低'], // 文本，默认为数值文本
+                    calculable: true,
+                    seriesIndex: [1],
+                    inRange: {
+                        color: ['#00e1ff00', '#3da2ffFF'],
+                        //color: ['#3B5077', '#031525'], // 蓝黑
+                        // color: ['#ffc0cb', '#800080'] // 红紫
+                        // color: ['#3C3B3F', '#605C3C'] // 黑绿
+                        // color: ['#0f0c29', '#302b63', '#24243e'] // 黑紫黑
+                        // color: ['#23074d', '#cc5333'] // 紫红
+                        //color: ['#00467F', '#A5CC82'], // 蓝绿
+                        // color: ['#1488CC', '#2B32B2'] // 浅蓝
+                        // color: ['#00467F', '#A5CC82'] // 蓝绿
+                        // color: ['#00467F', '#A5CC82'] // 蓝绿
+                        // color: ['#00467F', '#A5CC82'] // 蓝绿
+                        // color: ['#00467F', '#A5CC82'] // 蓝绿
+                    },
+                },
+                /*工具按钮组*/
+                // toolbox: {
+                //     show: true,
+                //     orient: 'vertical',
+                //     left: 'right',
+                //     top: 'center',
+                //     feature: {
+                //         dataView: {
+                //             readOnly: false
+                //         },
+                //         restore: {},
+                //         saveAsImage: {}
+                //     }
+                // },
+                geo: {
+                    show: true,
+                    map: mapName,
+                    label: {
+                        normal: {
+                            show: false,
+                        },
+                        emphasis: {
+                            show: false,
+                        },
+                    },
+                    roam: true,
+                    itemStyle: {
+                        normal: {
+                            areaColor: '#031525',
+                            borderColor: '#3B5077',
+                        },
+                        emphasis: {
+                            areaColor: '#2B91B7',
+                        },
+                    },
+                },
+                series: [
+                    {
+                        name: '散点',
+                        type: 'scatter',
+                        coordinateSystem: 'geo',
+                        data: convertData(data, 1),
+                        symbolSize: function (val) {
+                            return val[2] / 10
+                        },
+                        label: {
+                            normal: {
+                                formatter: '{b}',
+                                position: 'right',
+                                show: true,
+                            },
+                            emphasis: {
+                                show: true,
+                            },
+                        },
+                        itemStyle: {
+                            normal: {
+                                color: '#05C3F9',
+                            },
+                        },
+                    },
+                    {
+                        type: 'map',
+                        map: mapName,
+                        geoIndex: 0,
+                        aspectScale: 0.75, //长宽比
+                        showLegendSymbol: false, // 存在legend时显示
+                        select: {
+                            disabled: true,
+                            label: {
+                                show: false,
+                            },
+                        },
+                        data: data,
+                    },
+                    {
+                        name: '点',
+                        type: 'scatter',
+                        coordinateSystem: 'geo',
+                        symbol: 'pin', //气泡
+                        symbolSize: function (val) {
+                            var a = (maxSize4Pin - minSize4Pin) / (max - min)
+                            var b = minSize4Pin - a * min
+                            b = maxSize4Pin - a * max
+                            return a * val[2] + b
+                        },
+                        label: {
+                            normal: {
+                                formatter: (a) => {
+                                    return a.value[2]
+                                },
+                                show: true,
+                                textStyle: {
+                                    color: '#fff',
+                                    fontSize: 9,
+                                },
+                            },
+                        },
+                        itemStyle: {
+                            normal: {
+                                color: '#F62157', //标志颜色
+                            },
+                        },
+                        zlevel: 6,
+                        data: convertData(data, 2),
+                    },
+                ],
+            }
+            return option
+        },
+    },
+    mounted() {
+        this.$store.dispatch('ChangeNav', 7)
+        this.$bus.$on(
+            'projectChange',
+            debounce((prj) => {
+                this.selProject = prj
+                this.init()
+            })
+        )
+        this.selProject = this.$store.getters.selProject
+        this.init()
+        this.dpi = this.$dpi()
+        window.addEventListener('resize', () => {
+            if (this.dpi != this.$dpi()) {
+                this.dpi = this.$dpi()
+                this.chartKey++
+            }
+        })
+    },
+}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml
index bf45ba6f..5526e323 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml
@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                psu.remark,psu.face_guid,sd.dept_name com_name,psu.work_type
         from pro_project_info_subdepts_users psu
                  left join pro_project_info pi on pi.id = psu.project_id
-                 left join pro_project_info_subdepts pdept on psu.sub_dept_id=pdept.id
+                 join pro_project_info_subdepts pdept on psu.sub_dept_id=pdept.id
                  left join sys_dept sd on sd.dept_id = psu.com_id
                  left join sys_dict_data dic1 on psu.`craft_type`=dic1.`dict_value` and dic1.`dict_type`='pro_craft_type'
                  left join sys_dict_data dic2 on psu.`craft_post`=dic2.`dict_value` and dic2.`dict_type`='pro_craft_post'
diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceJgwTask.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceJgwTask.java
index 4163d2da..eb32c096 100644
--- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceJgwTask.java
+++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceJgwTask.java
@@ -193,6 +193,7 @@ public class AttendanceJgwTask {
     }
 
     public static void main(String[] args){
+        Date d1= DateUtil.date(-86169600000L);
         String d="sxyzxx2024suc";
         //System.out.println(Base64.encode(d));
         //System.out.println(DateTime.now().year());