Browse Source

根据新设备进行调试

fengxu 2 năm trước cách đây
mục cha
commit
9683f57017

+ 12 - 6
cokingCoal/humanResources.html

@@ -26,7 +26,7 @@
 
 <body>
     <div id="app" class="app_box">
-        <div class="page_title">{{ title }}</div>
+        <div class="page_title" @click="fullScreen()">{{ title }}</div>
         <div class="page_main">
             <div class="page_main_left flex_column">
                 <div class="left_top">
@@ -71,6 +71,10 @@
                             <p class="item_title">{{ rollTitle }}</p>
                             <!-- <vue-seamless-scroll v-if="rollFlag" :data="listData" class="warp" :classOption="classOption"> -->
                             <div class="item">
+                                <!-- <div class="item_con" v-for="(item,index) in recruitInfoList[1]">
+                                        <span>{{ item.title }}</span>
+                                        <span>{{ item.content }}</span>
+                                </div> -->
                                 <p class="item_con">
                                     <span>一、招聘原则</span>
                                     <span>公开报名、集中面试,公平竞争、择优录用。</span>
@@ -116,7 +120,7 @@
                     <div :class="treeList[1].flag?'title_yellow':'title'">Ⅱ.简历投递</div>
                     <div class="main flex_sp" style="position: relative;">
                         <div class="main_item">
-                            <dv-scroll-board :config="configMark" style="width: 100%; height: 100%" />
+                            <dv-scroll-board :config="configMark"  v-if="isChangeList" style="width: 100%; height: 100%" />
                         </div>
                         <div class="main_item">
                             <div class="echarts_dom" v-if="downholeFlag" ref="vita"></div>
@@ -293,14 +297,13 @@
                             <!-- <vue-seamless-scroll :data="listData" class="warp" :classOption="classOption"> -->
                             <div class="item">
                                 <p class="item_title">山西焦煤西山煤电杜儿坪矿井下操作工招聘公示</p>
-                                <p class="item_con" style="text-indent: 40px;">
+                                <p class="item_con" style="text-indent: 40px;line-height: 40px;">
                                     根据2023年7月1日发布的《山西焦煤西山煤电杜儿坪矿井下操作工招聘公告》相关要求,经过网上报名、资格审查、笔试、面试等程序,拟录用顾英杰等50名员工。现将拟录用人员名单予以公示。<br>
-
                                 </p>
-                                <p class="item_con" style="text-indent: 40px;">
+                                <p class="item_con" style="text-indent: 40px;line-height: 40px;">
                                     公示时间为2023年8月14日至8月20日(5个工作日),对招聘结果有异议的,可在公示期内通过电话形式反馈情况。<br>
                                 </p>
-                                <p class="item_con" style="text-indent: 40px;">
+                                <p class="item_con" style="text-indent: 40px;line-height: 40px;">
                                     受理电话:0351-8305319<br>
 
                                 </p>
@@ -408,6 +411,9 @@
                 <div class="mark_select_options" v-for="(item,index) in monthList" :key="index" @click="handleMonthOption(item)">{{ item }}月</div>
             </div>
         </div>
+        <div class="mark_box" @click="handleChangeImage()" v-if="imageIndex < imageList.length && imageFlag">
+            <img :src="imageList[imageIndex]" alt="">
+        </div>
 
     </div>
     <script src="./js/humanResources.js"></script>

BIN
cokingCoal/images/humanResources/ppt1.jpg


BIN
cokingCoal/images/newImage/ppt1.jpg


+ 2 - 2
cokingCoal/index.html

@@ -27,8 +27,8 @@
 
 <body>
     <div class="app_box" id="app">
-        <!-- <div class="box_item_title" @click="fullScreen()"> -->
-        <div class="box_item_title">
+        <div class="box_item_title" @click="fullScreen()">
+        <!-- <div class="box_item_title"> -->
             <span>集团管控 数智赋能</span>
         </div>
         <div class="box_item_main">

+ 336 - 26
cokingCoal/js/humanResources.js

@@ -70,7 +70,7 @@ let app = new Vue({
                 }
             },
             {
-                name: "录用公",
+                name: "录用公",
                 flag: false,
                 src: "./images/humanResources/publicity.png",
                 onSrc: "./images/humanResources/publicity_on.png",
@@ -345,6 +345,16 @@ let app = new Vue({
             rollTitle: "西山煤电屯兰矿井下普工工招聘公告",
             leftTime: null,
             rightTime: null,
+            recruitInfoList: [],
+            vitaData: {
+                x: ['4月', '5月', '6月', '7月', '8月', '9月'],
+                y: [56, 32, 64, 81, 43,  13]
+            },
+            isChangeList: false,
+            imageList: ["./images/humanResources/ppt1.jpg","",""],
+            imageIndex: 0,
+            imageFlag: false,
+            pageFlag: true,
         }
     },
     created() {
@@ -359,16 +369,32 @@ let app = new Vue({
                 this.employmentList2.data.push(item)
             }
         })
-        console.log();
+        this.keyDown()
+    },
+    watch: {
+        imageIndex() {
+            let that = this
+            if (this.imageIndex == this.imageList.length) {
+                that.downhole.dispose()
+                that.vitaEcharts.dispose()
+                setTimeout(()=>{
+                    let pageBtm = that.$refs.pageBtm
+                    that.initDownholeEcharts(pageBtm, { x: admissionList.x, y1: admissionList.y1, y2: admissionList.y2, y3: admissionList.y3 })
+            
+                    let vita = that.$refs.vita
+                    that.initVitaEcharts(vita)
+                })
+                this.imageIndex = 0
+                this.imageFlag = false
+
+            }
+        },
     },
     mounted() {
         let that = this;
         this.$nextTick(() => {
-            let vita = this.$refs.vita
-            this.initVitaEcharts(vita)
 
-            let pageBtm = this.$refs.pageBtm
-            this.initDownholeEcharts(pageBtm, { x: admissionList.x, y1: admissionList.y1, y2: admissionList.y2, y3: admissionList.y3 })
+
             let rightOne = this.$refs.rightOne
             this.initLineRight(rightOne, { value: 50, total: 118 })
             let rightTwo = this.$refs.rightTwo
@@ -451,19 +477,79 @@ let app = new Vue({
                 }
             })
         }, 5000)
-        localEnvAppToken().then(res => {
-            localStorage.setItem("app_token", res.app_token)
-            getLocalEnvAccessToken().then(res => {
-                localStorage.setItem("access_token", res.access_token)
-                that.getPlayers()
-                that.getPostDetail()
-            })
-        }).catch(err => {
 
 
-        })
+        // localEnvAppToken().then(res => {
+        //     localStorage.setItem("app_token", res.app_token)
+        //     getLocalEnvAccessToken().then(res => {
+        //         localStorage.setItem("access_token", res.access_token)
+        //         that.getPlayers()
+        //         that.getPostDetail()
+        //         that.getHalfYearDelivcv()
+        //         that.getHotDelivcv()
+        //         that.arrToListArr()
+        //         that.getDelivcvAndApply()
+        //         that.getreviewarrange()
+
+        //     })
+        // }).catch(err => {
+        this.isChangeList = true
+
+        let pageBtm = this.$refs.pageBtm
+        this.initDownholeEcharts(pageBtm, { x: admissionList.x, y1: admissionList.y1, y2: admissionList.y2, y3: admissionList.y3 })
+
+        let vita = this.$refs.vita
+        that.initVitaEcharts(vita)
+        //     that.getPostDetail()
+        // })
     },
     methods: {
+        // 监听键盘
+        keyDown() {
+            let that = this;
+            document.onkeydown = (e) => {
+                //事件对象兼容
+                if (this.imageFlag) {
+                    let e1 = e || event || window.event || arguments.callee.caller.arguments[0]
+                    //键盘按键判断:左箭头-37;上箭头-38;右箭头-39;下箭头-40
+                    if (e1 && e1.keyCode == 37) {
+                        if (that.imageIndex != 0) {
+                            that.imageIndex = that.imageIndex - 1
+                        }
+                    } else if (e1 && e1.keyCode == 38) {
+                        // that.imageIndex = that.imageIndex - 1
+                        if (that.imageIndex != 0) {
+                            that.imageIndex = that.imageIndex - 1
+                        }
+                    } else if(e1 && e1.keyCode == 39){
+                        that.imageIndex = that.imageIndex + 1
+                    } else if(e1 && e1.keyCode == 40){
+                        that.imageIndex = that.imageIndex + 1
+                    }
+                }
+
+            }
+        },
+
+        handleChangeImage() {
+            this.imageIndex += 1
+        },
+
+        fullScreen() {
+            let docElm = document.documentElement;
+            if (docElm.requestFullscreen) {
+                docElm.requestFullscreen();
+            } else if (docElm.msRequestFullscreen) {
+                docElm.msRequestFullscreen();
+            } else if (docElm.mozRequestFullScreen) {
+                docElm.mozRequestFullScreen();
+            } else if (docElm.webkitRequestFullScreen) {
+                docElm.webkitRequestFullScreen();
+            }
+            this.imageFlag = true
+            this.pageFlag = false
+        },
+
         initDownholeEcharts(el, data) {
             this.downhole = echarts.init(el);
             let series = []
@@ -697,7 +783,6 @@ let app = new Vue({
         },
         initLineRight(el, data) {
             let that = this;
-            console.log(data);
             let myChart = echarts.init(el);
             let nameList = ["a"];
             let valueList = [data.value];
@@ -765,7 +850,7 @@ let app = new Vue({
                 grid: {
                     left: "1%",
                     top: 20, // 设置条形图的边距
-                    right: "25%",
+                    right: "40%",
                     bottom: 20,
                 },
                 yAxis: [{
@@ -858,7 +943,6 @@ let app = new Vue({
                         normal: {
                             formatter: (params) => {
                                 var text;
-                                console.log(params.value);
                                 text = `${(params.value <= 9 ? "  " + params.value : params.value)}人  |  ${(((params.value) / total) * 100).toFixed(0)}%`;
                                 return text;
                             },
@@ -905,7 +989,16 @@ let app = new Vue({
             myChart.setOption(option);
         },
         initVitaEcharts(el, data) {
+            let that = this;
             this.vitaEcharts = echarts.init(el)
+            let dataList = [...that.vitaData.y]
+            let max = dataList.sort(function (a, b) {
+                return b - a
+            })[0]
+            let maxList = []
+            this.vitaData.x.forEach(item => {
+                maxList.push(max)
+            })
             option = {
                 tooltip: {
                     show: true,
@@ -928,7 +1021,7 @@ let app = new Vue({
                     right: "2%"
                 },
                 xAxis: {
-                    data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
+                    data: that.vitaData.x,
                     axisLine: {
                         show: false //隐藏X轴轴线
                     },
@@ -1005,7 +1098,7 @@ let app = new Vue({
                             ])
                         }
                     },
-                    data: [21, 43, 56, 32, 64, 21, 43, 56, 32, 64, 21, 43],
+                    data: that.vitaData.y,
                     z: 10,
                     zlevel: 0
                 },
@@ -1024,7 +1117,7 @@ let app = new Vue({
                     symbolSize: [18, 2],
                     symbolPosition: "start",
                     symbolOffset: [1, 1],
-                    data: [21, 43, 56, 32, 64, 21, 43, 56, 32, 64, 21, 43],
+                    data: that.vitaData.y,
                     width: 2,
                     z: 0,
                     zlevel: 1
@@ -1033,7 +1126,7 @@ let app = new Vue({
                     name: "外框",
                     type: "bar",
                     barGap: "-110%", // 设置外框粗细
-                    data: [100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100],
+                    data: maxList,
                     barWidth: 16,
                     itemStyle: {
                         normal: {
@@ -1060,7 +1153,7 @@ let app = new Vue({
                     areaStyle: {
                         color: "rgba(0, 151, 251, 0.1)"
                     },
-                    data: [21, 43, 56, 32, 64, 21, 43, 56, 32, 64, 21, 43],
+                    data: that.vitaData.y,
                     z: 5
                 }
                 ],
@@ -1470,12 +1563,229 @@ let app = new Vue({
             let that = this;
             let data = {};
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/PostDetail", data).then(res => {
-                console.log(res);
-                if(res){
-                    
+
+            })
+
+            let res = {
+                data: [
+                    [
+                        "山西焦煤集团有限责任公司",
+                        "事业部副总经理",
+                        "1",
+                        "6",
+                        "2022.12.07",
+                        "一、招聘原则:\r\n无&二、招聘对象:\r\n1.工作年限:不限,2.学历要求:不限,3.招聘范围:不限.&三、招聘人数:\r\n共计1人.&四、工作地点:&五、工作职责:\r\n1、统筹负责焦煤事业部的全面生产及经营等工作,重点保障公司冶金板块三个生产基地的焦煤供给;\n2、负责周边焦煤市场资源的开拓、整合与合作等工作;\n3、负责阿克苏周边地区煤矿资源的开发获取等;\n4、推进内部焦煤产品的市场化收益等工作。&六、招聘条件:\r\n1、大专及以上学历,有焦煤行业全盘管理经验,熟悉焦煤市场运营,尤其熟悉新疆市场;\n2、有相关人员和企业的管理经验,具备一定的前瞻性规划及统筹能力;\n3、有0到1的从业经验,具备较强的整合能力,有较好的事业成就动机。&七、报名方式:八、招聘流程:\r\n&九、有关说明:\r\n"
+                    ],
+                    [
+                        "山西焦煤集团有限责任公司",
+                        "营运部长",
+                        "2",
+                        "35",
+                        "2022.11.25",
+                        "一、招聘原则:\r\n无&二、招聘对象:\r\n1.工作年限:0年以上,2.学历要求:不限,3.招聘范围:不限.&三、招聘人数:\r\n共计2人.&四、工作地点:&五、工作职责:\r\n1、全面负责商场营运管控,确保现场营运良好秩序;\n2、监督销售数据统计工作,并根据销售数据及客流统计,召开部门分析会,提出合理化建议,对商场业态调整提供数据支持;\n3、制定并完善部门管理手册及各项规章制度并监督执行;\n4、负责监督商户的设计、装修、审批、进场流程和整体协调工作;\n5、负责商户培训、召开店长会及收集各商铺促销信息的工作;\n6、负责商户租金、物业费及水电费等相关费用的催缴工作,安排人员按时完成;\n7、定期监督收集商户资料,完善商户档案管理;\n8、定期组织员工进行市场调研,掌握品牌动向和新品上市;\n9、负责服务台客诉处理及日常政府职能部门的检查工作;&六、招聘条件:\r\n任职资格:\n1、年龄在38岁以内,男女不限,本科以上学历;\n2、五年以上商业运营工作经验,三年以上中层管理经验;\n3. 具备较强的谈判能力、协调能力及人际交往能力,熟悉百货或购物中心市场调研、销售分析、现场管理、业务日常管理等工作;\n4、具备相应的统筹规划、运营管理等专业知识,熟悉商业规划设计理念、大型商业综合体业态规划、品类搭配和精准定位,敏锐的市场洞察力及数据分析力;\n5、熟悉公文写作格式,具备基本商务信函写作能力,熟练运用各种办公软件(如office办公软件等);&七、报名方式:\r\n线上&八、招聘流程:\r\n&九、有关说明:\r\n无"
+                    ]
+                ]
+            }
+            let list = []
+            let a = []
+            res.data.forEach((item, index) => {
+                list.push([item[0], item[1], item[2], item[3], item[4]])
+                a[index] = []
+                item[5].split("&").forEach(i => {
+                    let infos = i.split("\r\n")
+                    let obj = {
+                        title: infos[0],
+                        content: infos[1]
+                    }
+                    a[index].push(obj)
+                })
+            })
+            that.recruitInfoList.push(...a)
+        },
+        getHalfYearDelivcv() {
+            let that = this;
+            let data = {};
+            // fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/HalfYearDelivcv",data).then(res=>{
+            //     console.log(res);
+            // })
+            let res = {
+                data: [
+                    {
+                        2: 90
+                    },
+                    {
+                        3: 58
+                    },
+                    {
+                        4: 100
+                    },
+                    {
+                        5: 30
+                    },
+                    {
+                        6: 10
+                    },
+                    {
+                        7: 30
+                    }
+                ]
+            }
+            let vita = this.$refs.vita
+            let nameList = [];
+            let valueList = [];
+            res.data.forEach(item => {
+                for (let k in item) {
+                    nameList.push(k + "月")
+                    valueList.push(item[k])
                 }
             })
+            that.vitaData.x = nameList
+            that.vitaData.y = valueList
+            that.initVitaEcharts(vita)
+
+        },
+        getHotDelivcv() {
+            let that = this;
+            let data = {};
+            // fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/HotDelivcv",data).then(res => {})
+            let res = {
+                data: [
+                    [
+                        "山西焦煤集团有限责任公司",
+                        "营运部长",
+                        35
+                    ],
+                    [
+                        "山西焦煤集团有限责任公司",
+                        "合同管理员",
+                        24
+                    ],
+                    [
+                        "",
+                        "java开发",
+                        7
+                    ]
+                ]
+            }
+            that.typeList.data = res.data
+
+        },
+        arrToListArr() {
+            this.isChangeList = false
+            let arr = [
+                {
+                    value: [
+                        "http://localhost:8080/ierp/attachment/downloadImage/fe1bc8750ca94a95bf9c6a64579a7cca.jpg",
+                        "http://localhost:8080/ierp/attachment/downloadImage/",
+                        "http://localhost:8080/ierp/attachment/downloadImage/fe1bc8750ca94a95bf9c6a64579a7cca.jpg",
+                        "http://localhost:8080/ierp/attachment/downloadImage/fe1bc8750ca94a95bf9c6a64579a7cca.jpg"
+
+                    ],
+                    key: "头像地址"
+                },
+                {
+                    value: [
+                        "胡军军",
+                        "胡军军",
+                        "胡军军",
+                        "测试触发003"
+                    ],
+                    key: "姓名"
+                },
+                {
+                    value: [
+                        "java开发",
+                        "java开发",
+                        "java开发",
+                        "123"
+                    ],
+                    key: "投递岗位"
+                },
+                {
+                    value: [
+                        "2022-10-19",
+                        "2023-08-27",
+                        "2023-08-27",
+                        "2023-08-27"
+                    ],
+                    key: "申请时间"
+                }
+            ]
+            let that = this;
+            let data = {}
+            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/Delivcv", data).then(res => { })
+            let imageList = []
+            let nameList = []
+            let stationList = []
+            let timeList = []
+            let dataList = []
+            arr.forEach(item => {
+                if (item.key == "头像地址") {
+                    imageList.push(...item.value)
+                }
+                if (item.key == "姓名") {
+                    nameList.push(...item.value)
+                }
+                if (item.key == "投递岗位") {
+                    stationList.push(...item.value)
+                }
+                if (item.key == "申请时间") {
+                    timeList.push(...item.value)
+                }
+            })
+            nameList.forEach((item, index) => {
+                dataList.push(["<img class='list_img' src='" + imageList[index] + "' alt=''>", item, stationList[index], timeList[index]])
+            })
+            this.configMark.data = dataList
+            console.log(this.configMark.data);
+            this.isChangeList = true
+            delete imageList
+            delete nameList
+            delete stationList
+            delete timeList
         },
 
+        getDelivcvAndApply() {
+            let that = this;
+            let data = {
+                flag: true
+            };
+
+            let pageBtm = this.$refs.pageBtm
+            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/DelivcvAndApply", data).then(res => {
+                if (res) {
+                    res.data.forEach(item => {
+                        if (item.key == "单位名称") {
+                            admissionList.x = item.value
+                            console.log(item.value);
+                        }
+                        if (item.key == "招聘人数") {
+                            admissionList.y1 = item.value
+                        }
+                        if (item.key == "报名人数") {
+                            admissionList.y2 = item.value
+                        }
+                        if (item.key == "录用人数") {
+                            admissionList.y3 = item.value
+                        }
+                    })
+
+                }
+                console.log(admissionList);
+                this.initDownholeEcharts(pageBtm, { x: admissionList.x, y1: admissionList.y1, y2: admissionList.y2, y3: admissionList.y3 })
+
+            })
+        },
+        getreviewarrange() {
+            let that = this;
+            let data = {
+                flag: false
+            };
+            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getreviewarrange", data).then(res => {
+                console.log(res);
+            })
+        }
+
     },
+
 })

+ 78 - 28
cokingCoal/js/newIndex.js

@@ -133,7 +133,7 @@ let app = new Vue({
             },
             configChange: {
                 waitTime: 2000,
-                header: ["姓名", "调出单位", "调入单位", "调动时间", '变动状态', ""],
+                header: ["姓名", "调出单位", "调入单位", "调动时间", '变动状态',],
                 rowNum: 6,
                 data: [
                     ["段树成", '山煤国际', '招标公司', '2023-07-04', '调动完成'],
@@ -419,7 +419,7 @@ let app = new Vue({
             },],
             orgChange: true,
             SalaryCalProgDetail: true,
-            imageList: ["./images/home-bg.png", "./images/page-bg.png", "./images/top-back.png"],
+            imageList: ["./images/newImage/ppt1.jpg"],
             imageIndex: 0,
             imageFlag: false,
             pageFlag: true,
@@ -458,8 +458,8 @@ let app = new Vue({
             },
             selectFlag: false,
             selectInfo: {
-                total: "06",
-                average: "06"
+                total: "07",
+                average: "07"
 
             },
             selectType: "total",
@@ -586,8 +586,8 @@ let app = new Vue({
 
 
 
-        this.requestFunction()
-        // this.noRequestFunction()
+        // this.requestFunction()
+        this.noRequestFunction()
 
 
         setInterval(() => {
@@ -606,15 +606,27 @@ let app = new Vue({
                 //事件对象兼容
                 if (this.imageFlag) {
                     let e1 = e || event || window.event || arguments.callee.caller.arguments[0]
-                    //键盘按键判断:左箭头-37;上箭头-38;右箭头-39;下箭头-40
-                    //左
+                    //键盘按键判断:左箭头-37;上箭头-38;右箭头-39;下箭头-40  33 翻页笔的下   34 翻页笔的下
+                    console.log(e1.keyCode);
                     if (e1 && e1.keyCode == 37) {
                         if (that.imageIndex != 0) {
                             that.imageIndex = that.imageIndex - 1
                         }
-                        // 按下左箭头
-                    } else if (e1 && e1.keyCode == 39) {
-                        // 按下右箭头
+                    } else if (e1 && e1.keyCode == 38) {
+                        // that.imageIndex = that.imageIndex - 1
+                        if (that.imageIndex != 0) {
+                            that.imageIndex = that.imageIndex - 1
+                        }
+                    } else if (e1 && e1.keyCode == 33) {
+                        // that.imageIndex = that.imageIndex - 1
+                        if (that.imageIndex != 0) {
+                            that.imageIndex = that.imageIndex - 1
+                        }
+                    }  else if (e1 && e1.keyCode == 39) {
+                        that.imageIndex = that.imageIndex + 1
+                    } else if (e1 && e1.keyCode == 40) {
+                        that.imageIndex = that.imageIndex + 1
+                    } else if (e1 && e1.keyCode == 34) {
                         that.imageIndex = that.imageIndex + 1
                     }
                 }
@@ -665,6 +677,10 @@ let app = new Vue({
 
             this.nx1 = spArr(this.echartTwoList.x, 5)
             this.ny1 = spArr(this.echartTwoList.y, 5)
+
+            this.nx2 = spArr(this.echartTwoList2.x, 5)
+            this.ny2 = spArr(this.echartTwoList2.y, 5)
+
             let echartTwo = this.$refs.echartTwo
             this.initTwoBarEcharts(echartTwo, { x: that.nx1[0], y: that.ny1[0] })
 
@@ -778,6 +794,10 @@ let app = new Vue({
 
                 this.nx1 = spArr(this.echartTwoList.x, 5)
                 this.ny1 = spArr(this.echartTwoList.y, 5)
+
+                this.nx2 = spArr(this.echartTwoList2.x, 5)
+                this.ny2 = spArr(this.echartTwoList2.y, 5)
+
                 let echartTwo = this.$refs.echartTwo
                 this.initTwoBarEcharts(echartTwo, { x: that.nx1[0], y: that.ny1[0] })
 
@@ -1886,6 +1906,9 @@ let app = new Vue({
                   <p>二级单位:<span>${params.value[3]}</span></p>
                   <p>员工总数:<span>${params.value[2]}</span></p>
               </div>`
+                            if (params.value[2] == undefined) {
+                                return ""
+                            }
                             callback(ticket, tipHtml)
                             return tipHtml
                         }
@@ -1896,6 +1919,9 @@ let app = new Vue({
                   <p>二级单位:<span>${params.value[3]}</span></p>
                   <p>员工总数:<span>${params.value[2]}</span></p>
               </div>`
+                            if (params.value[2] == undefined) {
+                                return ""
+                            }
                             callback(ticket, tipHtml)
                             return tipHtml
                         }
@@ -1908,28 +1934,42 @@ let app = new Vue({
                 },
                 geo: {
                     map: 'shanxi',
-                    zoom: 1.3,
-                    layoutCenter: ['51%', '56%'],
+                    zoom: 1.5,
+                    layoutCenter: ['51%', '53%'],
                     layoutSize: '100%',
 
                     silent: true,
                     roam: false,
                     z: 1,
+                    // itemStyle: {
+                    //     areaColor: 'rgba(0, 15, 40, 1)',
+                    //     shadowColor: 'rgba(0, 0, 0, 1)',
+                    //     shadowBlur: 0,
+                    //     shadowOffsetX: 0,
+                    //     shadowOffsetY: 5,
+                    //     borderColor: 'rgba(0, 0, 0, 1)',
+                    //     borderWidth: 0.5,
+                    //     emphasis: {
+                    //         areaColor: '#2AB8FF',
+                    //         borderWidth: 1,
+                    //         color: 'green',
+                    //         label: {
+                    //             show: false,
+                    //         },
+                    //     },
+                    // },
                     itemStyle: {
-                        areaColor: 'rgba(0, 15, 40, 1)',
-                        shadowColor: 'rgba(0, 0, 0, 1)',
-                        shadowBlur: 0,
-                        shadowOffsetX: 0,
+                        areaColor: '#25B9E9',
+                        shadowColor: '#25B9E9',
+                        borderWidth: 6, //设置外层边框
+                        borderColor: '#00FFFF',
+                        shadowOffsetX: 5,
                         shadowOffsetY: 5,
-                        borderColor: 'rgba(0, 0, 0, 1)',
-                        borderWidth: 0.5,
+                        shadowBlur: 5,
                         emphasis: {
-                            areaColor: '#2AB8FF',
-                            borderWidth: 1,
-                            color: 'green',
-                            label: {
-                                show: false,
-                            },
+                            areaColor: '#013d95',
+                            borderColor: '#e7e1a0',
+                            borderWidth: 4, //设置外层边框
                         },
                     },
                 },
@@ -1998,7 +2038,7 @@ let app = new Vue({
                             color: '#00FFF6',
                         },
                         symbol: img2,
-                        symbolSize: [250, 160],
+                        symbolSize: [200, 160],
                         symbolOffset: [0, -200],
                         z: 999,
                         data: mapDate,
@@ -2035,9 +2075,9 @@ let app = new Vue({
                                 }
                             }
                         },
-                        layoutCenter: ['50%', '54%'],
+                        layoutCenter: ['50%', '52%'],
                         layoutSize: '100%',
-                        zoom: 1.29,
+                        zoom: 1.5,
                         roam: false,
                         map: 'shanxi',
                     },
@@ -2047,6 +2087,7 @@ let app = new Vue({
                         rippleEffect: {
                             scale: 10,
                             brushType: 'stroke',
+                            color: "#fff"
                         },
                         showEffectOn: 'render',
                         itemStyle: {
@@ -2054,6 +2095,7 @@ let app = new Vue({
                             shadowBlur: 10,
                             shadowOffsetX: 0,
                             shadowOffsetY: 0,
+                            // color: "#fff"
                             color: new echarts.graphic.LinearGradient(1, 0, 0, 0, [
                                 {
                                     offset: 0,
@@ -5091,6 +5133,7 @@ let app = new Vue({
             this.isShowMark = false
             this.salaryFlag = false
             this.pdfFlag = false
+            this.selectFlag = false
             this.warningFlag = false
             this.mobilizeFlag = false
             this.echartsMark = false
@@ -5101,6 +5144,9 @@ let app = new Vue({
             this.achievementIndex = 0
         },
         handleStudio(item, index) {
+            if(index != 0){
+                return
+            }
             let that = this;
             this.handleMark()
             this.studioTitle = item.name + "技能大师工作室"
@@ -5173,6 +5219,7 @@ let app = new Vue({
 
         handleTap2(index) {
             let that = this;
+            console.log(index);
             if (this.twoIndex == index) {
                 return
             }
@@ -5183,7 +5230,9 @@ let app = new Vue({
             if (index == 1) {
                 that.initTwoBarEcharts(echartTwo, { x: that.nx1[that.twoTimeIndex], y: that.ny1[that.twoTimeIndex] })
             } else if (index == 2) {
+                console.log(that.nx2);
                 that.initTwoBarEcharts(echartTwo, { x: that.nx2[that.twoTimeIndex], y: that.ny2[that.twoTimeIndex] })
+                console.log(123);
             }
             this.twoIndex = index
             this.timeTwo()
@@ -5421,6 +5470,7 @@ let app = new Vue({
             this.SalaryCalProgDetail = false
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/SalaryCalProg", data).then(res => {
                 if (res) {
+                    console.log(res);
                     that.config2.data = res.data
                 }
                 this.SalaryCalProgDetail = true

+ 8 - 3
cokingCoal/styles/humanResources.css

@@ -241,6 +241,8 @@ img {
     width: calc(50% - 10px);
     height: 100%;
     background-color: #69c1ff09;
+    padding-top: 50px;
+    box-sizing: border-box;
 }
 
 .right_top {
@@ -263,13 +265,13 @@ img {
 
 .main_item_top {
     width: 100%;
-    height: calc(30% - 15px);
+    height: calc(35% - 15px);
     background-color: var(--bgc);
 }
 
 .main_item_btm {
     width: 100%;
-    height: calc(70% - 15px);
+    height: calc(65% - 15px);
     background-color: var(--bgc);
 }
 
@@ -579,7 +581,7 @@ li {
     width: 100%;
     margin: 10px 0;
     font-size: 24px;
-    line-height: 30px;
+    line-height: 50px;
     display: flex;
     flex-direction: column;
     justify-content: flex-start;
@@ -592,11 +594,14 @@ li {
     font-family: Source Han Sans CN;
     font-weight: bolder;
     margin-top: 10px;
+    color: #7CC8FF;
 }
 
 .item_con span:nth-child(2) {
     margin-left: 20px;
     line-height: 30px;
+    /* white-space: pre-wrap; */
+
 }
 
 .main_item_2 {

+ 7 - 7
cokingCoal/styles/newIndex.css

@@ -125,7 +125,7 @@ a {
     width: 140%;
     height: 100%;
     position: absolute;
-    bottom: -8%;
+    bottom: -10%;
     left: -19.5%;
     z-index: 0;
 }
@@ -147,8 +147,8 @@ a {
     transform: rotateX(65deg) scale(1.6);
     text-align: center;
     position: absolute;
-    bottom: -325px;
-    left: 17.5%;
+    bottom: -355px;
+    left: 21%;
 }
 
 .svg_box_item_else {
@@ -1244,12 +1244,12 @@ img {
 }
 
 .echarts_else .img {
-    width: 360px;
-    height: 360px;
+    width: 420px;
+    height: 420px;
     z-index: 99999;
     position: absolute;
-    left: -25px;
-    top: calc(50% - 180px);
+    left: -36px;
+    top: calc(50% - 210px);
     animation: fadenum 8s infinite linear;
 }