Bläddra i källkod

焦煤演示修改

fengxu 2 år sedan
förälder
incheckning
c96b101932

+ 7 - 6
cokingCoal/humanResources.html

@@ -4,7 +4,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Document</title>
+    <title>内部人才市场双选服务平台</title>
     <!-- 引入样式 -->
     <link rel="stylesheet" href="./styles/element-ui@2.15.9.css" />
     <link rel="stylesheet" href="./styles/humanResources.css" />
@@ -26,7 +26,8 @@
 
 <body>
     <div id="app" class="app_box">
-        <div class="page_title" @click="fullScreen()">{{ title }}</div>
+        <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">
@@ -61,7 +62,7 @@
                                     </div>
                                 </div>
                                 <div class="content_4_btm">
-                                    <div v-if="!leftFlag" class="echarts_dom" ref="leftChange"></div>
+                                    <div v-if="!leftFlag" class="echarts_dom" ref="leftChange" id="echartL2"></div>
 
                                     <dv-scroll-board v-if="leftFlag" :config="config2" style="width: 100%; height: 100%" />
                                 </div>
@@ -89,7 +90,7 @@
                                 </p>
                                 <p class="item_con">
                                     <span>四、工作地点</span>
-                                    <span>招聘单位所属煤矿(包括偏远整合煤矿)。</span>
+                                    <span>招聘单位所属煤矿。</span>
                                 </p>
                                 <p class="item_con">
                                     <span>五、招聘条件</span>
@@ -297,11 +298,11 @@
                             <!-- <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;line-height: 40px;">
+                                <p class="item_con" style="text-indent: 40px;line-height: 50px;">
                                     根据2023年7月1日发布的《山西焦煤西山煤电杜儿坪矿井下操作工招聘公告》相关要求,经过网上报名、资格审查、笔试、面试等程序,拟录用顾英杰等50名员工。现将拟录用人员名单予以公示。<br>
                                 </p>
                                 <p class="item_con" style="text-indent: 40px;line-height: 40px;">
-                                    公示时间为2023年8月14日至8月20日(5个工作日),对招聘结果有异议的,可在公示期内通过电话形式反馈情况。<br>
+                                    公示时间为2023年8月14日至8月20日(5个工作日),对招聘结果有异议可在公示期内通过电话形式反馈情况。<br>
                                 </p>
                                 <p class="item_con" style="text-indent: 40px;line-height: 40px;">
                                     受理电话:0351-8305319<br>

BIN
cokingCoal/images/humanResources/title - 副本.png


BIN
cokingCoal/images/humanResources/title.png


BIN
cokingCoal/images/humanResources/title_yellow - 副本.png


BIN
cokingCoal/images/newImage/ppt1.jpg


BIN
cokingCoal/images/newImage/ppt1.png


+ 3 - 2
cokingCoal/index.html

@@ -31,7 +31,7 @@
         <!-- <div class="box_item_title"> -->
             <span>集团管控 数智赋能</span>
         </div>
-        <div class="box_item_main">
+        <div class="box_item_main" v-if="isShowPage">
             <div class="box_left">
                 <div class="left_item" style="padding: 0;">
                     <dv-border-box-12 :color="['#2169a3','#277099']" style="padding: 10px 40px 30px;box-sizing: border-box;">
@@ -398,9 +398,10 @@
                 <div class="main_item_one">
                     <div class="main_item_one_info">
                         <div class="main_info_item">
+                        <!-- <div class="main_info_item" @click="handleChangeData()"> -->
                             <div class="main_info_item_img">
                             </div>
-                            <div class="main_info_item_title">
+                            <div class="main_info_item_title" >
                                 <div>{{ loginInfo.num }} <span>{{ loginInfo.unit }}</span></div>
                                 <div>累计登陆</div>
                             </div>

+ 579 - 30
cokingCoal/js/humanResources.js

@@ -224,16 +224,16 @@ let app = new Vue({
                 columnWidth: [70, 120, 170, 200],
                 rowNum: 6,
                 data: [
-                    ["01", '陈英', '洽谈室1', '杜儿坪矿', "2023.07.01   09:30-10:30"],
-                    ["02", '李小曼', '洽谈室1', '杜儿坪矿', "2023.07.01   09:30-10:30"],
-                    ["03", '王亮', '洽谈室1', '杜儿坪矿', "2023.07.01   09:30-10:30"],
-                    ["04", '李鑫', '洽谈室1', '杜儿坪矿', "2023.07.01   09:30-10:30"],
-                    ["05", '王伟', '洽谈室1', '杜儿坪矿', "2023.07.01   09:30-10:30"],
-                    ["06", '张强', '洽谈室1', '杜儿坪矿', "2023.07.05   09:30-10:30"],
-                    ["07", '王强', '洽谈室1', '杜儿坪矿', "2023.07.05   09:30-10:30"],
-                    ["08", '程丽', '洽谈室1', '杜儿坪矿', "2023.07.05   09:30-10:30"],
-                    ["08", '韩', '洽谈室1', '杜儿坪矿', "2023.07.05   09:30-10:30"],
-                    ["09", '王', '洽谈室1', '杜儿坪矿', "2023.07.05   09:30-10:30"],
+                    ["01", '李志桐', '洽谈室1', '杜儿坪矿', "2023.07.01   09:30-10:30"],
+                    ["02", '赵建国', '洽谈室1', '杜儿坪矿', "2023.07.01   09:30-10:30"],
+                    ["03", '张耀杰', '洽谈室1', '杜儿坪矿', "2023.07.01   09:30-10:30"],
+                    ["04", '崔诚', '洽谈室1', '杜儿坪矿', "2023.07.01   09:30-10:30"],
+                    ["05", '陈灵均', '洽谈室1', '杜儿坪矿', "2023.07.01   09:30-10:30"],
+                    ["06", '杜勇', '洽谈室1', '杜儿坪矿', "2023.07.05   09:30-10:30"],
+                    ["07", '李灵风', '洽谈室1', '杜儿坪矿', "2023.07.05   09:30-10:30"],
+                    ["08", '卢晨', '洽谈室1', '杜儿坪矿', "2023.07.05   09:30-10:30"],
+                    ["08", '韩玉树', '洽谈室1', '杜儿坪矿', "2023.07.05   09:30-10:30"],
+                    ["09", '王', '洽谈室1', '杜儿坪矿', "2023.07.05   09:30-10:30"],
                 ],
                 align: ["center", "center", "center", "center", "center"],
                 headerBGC: "#69c1ff2d",
@@ -242,13 +242,13 @@ let app = new Vue({
             },
             mainList: [{
                 name: "双选场次",
-                value: 30,
+                value: 29,
                 unit: "场",
                 icon: "./images/humanResources/times.png"
             },
             {
                 name: "参与人数",
-                value: 3000,
+                value: 2957,
                 unit: "人",
                 icon: "./images/humanResources/user.png"
             }
@@ -348,13 +348,14 @@ let app = new Vue({
             recruitInfoList: [],
             vitaData: {
                 x: ['4月', '5月', '6月', '7月', '8月', '9月'],
-                y: [56, 32, 64, 81, 43,  13]
+                y: [56, 32, 64, 81, 43, 13]
             },
             isChangeList: false,
-            imageList: ["./images/humanResources/ppt1.jpg","",""],
+            imageList: ["./images/humanResources/ppt1.jpg", "", ""],
             imageIndex: 0,
             imageFlag: false,
             pageFlag: true,
+            hecharts: null,
         }
     },
     created() {
@@ -377,10 +378,10 @@ let app = new Vue({
             if (this.imageIndex == this.imageList.length) {
                 that.downhole.dispose()
                 that.vitaEcharts.dispose()
-                setTimeout(()=>{
+                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)
                 })
@@ -396,15 +397,15 @@ let app = new Vue({
 
 
             let rightOne = this.$refs.rightOne
-            this.initLineRight(rightOne, { value: 50, total: 118 })
+            this.initLineRight(rightOne, { value: 53, total: 125 })
             let rightTwo = this.$refs.rightTwo
-            this.initLineRight(rightTwo, { value: 30, total: 118 })
+            this.initLineRight(rightTwo, { value: 29, total: 125 })
             let rightThree = this.$refs.rightThree
-            this.initLineRight(rightThree, { value: 20, total: 118 })
+            this.initLineRight(rightThree, { value: 25, total: 125 })
             let rightFour = this.$refs.rightFour
-            this.initLineRight(rightFour, { value: 12, total: 118 })
+            this.initLineRight(rightFour, { value: 12, total: 125 })
             let rightFive = this.$refs.rightFive
-            this.initLineRight(rightFive, { value: 6, total: 118 })
+            this.initLineRight(rightFive, { value: 6, total: 125 })
             // let c1 = this.$refs.c1
             // this.initRightCycle(c1, 40)
             // let c2 = this.$refs.c2
@@ -434,15 +435,15 @@ let app = new Vue({
                     item.flag = false
                 })
 
-                if (that.treeIndex > that.treeList.length - 1) {
+                if (that.treeIndex >= that.treeList.length - 1) {
                     that.treeIndex = 0
-                    that.treeList[that.treeIndex].flag = true
                 } else {
-                    that.treeList[that.treeIndex].flag = true
                     that.treeIndex = that.treeIndex + 1
 
                 }
-            }, 2000)
+                that.treeList[that.treeIndex].flag = true
+
+            }, 5000)
             // setInterval(()=>{
             //     if(that.configIndex > that.config1.data.length - 1){
             //         that.configIndex = 0
@@ -463,7 +464,7 @@ let app = new Vue({
                         that.leftFlag = false
                         setTimeout(() => {
                             let leftChange = that.$refs.leftChange
-                            that.initRoseEcharts(leftChange)
+                            that.initThreeBig(leftChange)
                         })
                     }
                 }
@@ -521,14 +522,22 @@ let app = new Vue({
                         if (that.imageIndex != 0) {
                             that.imageIndex = that.imageIndex - 1
                         }
-                    } else if(e1 && e1.keyCode == 39){
+                    } 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){
+                    } else if (e1 && e1.keyCode == 40) {
+                        that.imageIndex = that.imageIndex + 1
+                    } else if (e1 && e1.keyCode == 34) {
                         that.imageIndex = that.imageIndex + 1
                     }
                 }
 
             }
+
         },
 
         handleChangeImage() {
@@ -1342,6 +1351,546 @@ let app = new Vue({
                 loopSeries: true,
             });
         },
+        initChartsBig(arr = [
+            {
+                name: '地面',
+                y: 10,
+                sliced: false,
+                selected: false,
+            },
+            {
+                name: '辅助',
+                y: 10,
+                sliced: false,
+                selected: false,
+            },
+            {
+                name: '一线',
+                y: 10,
+                sliced: false,
+                selected: false,
+            },
+        ]) {
+
+            let left5 = arr
+            var chartData = left5
+            var timer = null;
+            var i = 0;
+
+            let that = this
+
+            var option = {
+                colors: [
+                    "#D9E1F2",
+                    "#B4C6E7",
+                    "#8EA9DB",
+                    "#305496",
+                    "#203764",
+                ],
+                chart: {
+                    type: 'pie',
+                    backgroundColor: 'rgba(0,0,0,0)',
+                    options3d: {
+                        enabled: true,
+                        alpha: 45,
+                        //beta: 0
+                    },
+                    events: {
+                        // load,图表加载完成时触发
+                        load: function () {
+                            var chart = this;
+
+                            var points = chart.series[0].points;
+                            var len = points.length;
+
+                            timer && clearInterval(timer);
+                            timer = setInterval(function () {
+                                autoTooltip(points[i]);
+                                chartData.forEach((item, index) => {
+                                    item.sliced = false
+                                    item.selected = false
+                                    if (index == i) {
+                                        item.sliced = true
+                                        item.selected = true
+                                    }
+                                })
+                                chart.update({
+                                    series: [{
+                                        type: 'pie',
+                                        name: '占比',
+                                        data: chartData
+                                    }]
+                                })
+                                i++;
+                                if (i === len) {
+                                    i = 0;
+                                    chartData.forEach((item, index) => {
+                                        item.sliced = false
+                                        item.selected = false
+                                    })
+                                    chart.update({
+                                        series: [{
+                                            type: 'pie',
+                                            name: '占比',
+
+                                            data: chartData
+                                        }]
+                                    })
+                                }
+                            }, 1000);
+                        },
+                        legendItemClick: function (event) {
+                            return true;
+                        }
+                    }
+                },
+                credits: {
+                    enabled: false //去掉hightchats水印
+                },
+                legend: {
+                    align: 'right', //横向位置
+                    verticalAlign: 'middle', // 纵向位置
+                    layout: "vertical", //横排还是竖排
+                    x: 10,
+                    y: 100,
+                    symbolWidth: 30,
+                    itemStyle: {
+                        fontSize: '30px',
+                        color: '#fff',
+                        x: 20,
+                        fontWeight: 0,
+                        fontFamily: 'Microsoft YaHei'
+                    },
+                },
+                title: {
+                    enabled: false,
+                    text: "",
+                },
+                tooltip: {
+                    crosshairs: false,
+                    trigger: "axis",
+                    backgroundColor: 'rgba(0, 0, 0, 0.5)',
+                    borderColor: "rgba(0,0,0,0.5)",
+                    style: {
+                        fontSize: 30,
+                        color: '#A3E2F4',
+                        fontWeight: 0,
+                    },
+                    axisPointer: {
+                        lineStyle: {
+                            color: "#ddd",
+                        },
+                    },
+                    formatter: function (e) {
+                        this.percentage = this.percentage.toFixed(2) //Math.round(this.percentage)
+                        return `${this.key}:<b><b>${this.y}</b>(${this.percentage}%)</b></b>`
+                    },
+                },
+                plotOptions: {
+                    pie: {
+                        allowPointSelect: true,
+                        showInLegend: true, // 图例
+                        cursor: 'pointer',
+                        size: 350,
+                        innerSize: 0, //环形图中间空白,0为饼图
+                        depth: 80, //立体高度
+                        slicedOffset: 40, //动画距离
+                        dataLabels: {
+                            enabled: false, // 是否展示指示线
+                            format: '{point.name}: {point.percentage}'
+                        }
+                    },
+                },
+                series: [{
+                    type: 'pie',
+                    name: '占比',
+                    center: ['50%', '50%'],
+                    point: {
+                        events: {
+                            mouseOver: function (e) { //鼠标移入停止轮播并且找到移入的当前数据设为选中
+                                chartData.forEach((item, index) => {
+                                    item.sliced = false
+                                    item.selected = false
+                                })
+                                chartData[e.target.index].sliced = true
+                                chartData[e.target.index].selected = true
+                                chart.update({
+                                    series: [{
+                                        type: 'pie',
+                                        name: '占比',
+                                        point: {
+                                            events: {
+                                                click: function (e) {
+                                                    that.showChartLTipDouble(e.point.name)
+                                                }
+                                            }
+                                        },
+                                        data: chartData
+                                    }]
+                                })
+                                timer && clearInterval(timer);
+                            },
+                            mouseOut: function () { // 鼠标移出后需要继续执行轮播
+                                var points = chart.series[0].points;
+                                var len = points.length;
+
+                                timer && clearInterval(timer);
+                                timer = setInterval(function () {
+                                    autoTooltip(points[i]);
+                                    chartData.forEach((item, index) => {
+                                        item.sliced = false
+                                        item.selected = false
+                                        if (index == i) {
+                                            item.sliced = true
+                                            item.selected = true
+                                        }
+                                    })
+                                    chart.update({
+                                        series: [{
+                                            type: 'pie',
+                                            name: '占比',
+
+                                            data: chartData
+                                        }]
+                                    })
+                                    i++;
+                                    if (i === len) {
+                                        i = 0;
+                                        chartData.forEach((item, index) => {
+                                            item.sliced = false
+                                            item.selected = false
+                                        })
+                                        chart.update({
+                                            series: [{
+                                                type: 'pie',
+                                                name: '占比',
+
+                                                data: chartData
+                                            }]
+                                        })
+                                    }
+                                }, 2000);
+                            }
+                        }
+                    },
+                    data: chartData
+                }]
+            }
+
+            if (that.hecharts) {
+                that.hecharts.destroy();
+            }
+
+            that.hecharts = Highcharts.chart('echartL2', option);
+            function autoTooltip(point) {
+                that.hecharts.tooltip.refresh(point);
+            }
+
+        },
+        initThreeBig(el) {
+            this.roseEcharts = echarts.init(el)
+            var placeHolderStyle = {
+                normal: {
+                    label: {
+                        show: false
+                    },
+                    labelLine: {
+                        show: false
+                    },
+                    color: "rgba(0,0,0,0)",
+                    borderWidth: 0
+                },
+                emphasis: {
+                    color: "rgba(0,0,0,0)",
+                    borderWidth: 0
+                }
+            };
+
+
+            var dataStyle = {
+                normal: {
+                    formatter: '{c}',
+                    position: 'center',
+                    show: true,
+                    textStyle: {
+                        fontSize: '35',
+                        fontWeight: 'normal',
+                        color: '#fff'
+                    }
+                }
+            };
+
+
+            option = {
+                title: [{
+                    text: '地面',
+                    left: '19%',
+                    top: '70%',
+                    textAlign: 'center',
+                    textStyle: {
+                        fontWeight: 'normal',
+                        fontSize: '30',
+                        color: '#fff',
+                        textAlign: 'center',
+                    },
+                }, {
+                    text: '辅助',
+                    left: '49%',
+                    top: '70%',
+                    textAlign: 'center',
+                    textStyle: {
+                        color: '#fff',
+                        fontWeight: 'normal',
+                        fontSize: '30',
+                        textAlign: 'center',
+                    },
+                }, {
+                    text: '一线',
+                    left: '79%',
+                    top: '70%',
+                    textAlign: 'center',
+                    textStyle: {
+                        color: '#fff',
+                        fontWeight: 'normal',
+                        fontSize: '30',
+                        textAlign: 'center',
+                    },
+                }],
+                series: [{
+                    type: 'pie',
+                    hoverAnimation: false, //鼠标经过的特效
+                    // radius: ['55%', '61%'],
+                    radius: ['45%', '50%'],
+                    center: ['20%', '50%'],
+                    startAngle: 225,
+                    labelLine: {
+                        normal: {
+                            show: false
+                        }
+                    },
+                    label: {
+                        normal: {
+                            position: 'center'
+                        }
+                    },
+                    data: [{
+                        value: 12,
+                        itemStyle: {
+                            normal: {
+                                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                                    offset: 0,
+                                    color: '#99da69'
+                                }, {
+                                    offset: 1,
+                                    color: '#01babc'
+                                }]),
+                            }
+                        },
+                        label: dataStyle,
+                    }, {
+                        value: 4,
+                        itemStyle: placeHolderStyle,
+                    },
+
+                    ]
+                },
+                {
+                    type: 'pie',
+                    hoverAnimation: false, //鼠标经过的特效
+                    radius: ['45%', '50%'],
+                    center: ['50%', '50%'],
+                    startAngle: 225,
+                    labelLine: {
+                        normal: {
+                            show: false
+                        }
+                    },
+                    label: {
+                        normal: {
+                            position: 'center'
+                        }
+                    },
+                    data: [{
+                        value: 15,
+                        itemStyle: {
+                            normal: {
+                                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                                    offset: 0,
+                                    color: '#FBAB7E'
+                                }, {
+                                    offset: 1,
+                                    color: '#F7CE68'
+                                }]),
+                            }
+                        },
+                        label: dataStyle,
+                    }, {
+                        value: 5,
+                        itemStyle: placeHolderStyle,
+                    },
+
+                    ]
+                },
+                {
+                    type: 'pie',
+                    hoverAnimation: false,
+                    // radius: ['55%', '61%'],
+                    radius: ['45%', '50%'],
+                    center: ['80%', '50%'],
+                    startAngle: 225,
+                    labelLine: {
+                        normal: {
+                            show: false
+                        }
+                    },
+                    label: {
+                        normal: {
+                            position: 'center'
+                        }
+                    },
+                    data: [{
+                        value: 9,
+                        itemStyle: {
+                            normal: {
+                                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                                    offset: 0,
+                                    color: '#9f3edd'
+                                }, {
+                                    offset: 1,
+                                    color: '#4897f6'
+                                }]),
+                            }
+                        },
+                        label: dataStyle,
+                    }, {
+                        value: 3,
+                        itemStyle: placeHolderStyle,
+                    },
+
+                    ]
+                },
+
+                //外圈的边框
+                {
+                    // name: '总人数',
+                    type: 'pie',
+                    hoverAnimation: false, //鼠标经过的特效
+                    radius: ['51%', '52%'],
+                    center: ['20%', '50%'],
+                    startAngle: 225,
+                    labelLine: {
+                        normal: {
+                            show: false
+                        }
+                    },
+                    label: {
+                        normal: {
+                            position: 'center'
+                        }
+                    },
+                    data: [{
+                        value: 12,
+                        itemStyle: {
+                            normal: {
+                                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                                    offset: 0,
+                                    color: '#01babc'
+                                }, {
+                                    offset: 1,
+                                    color: '#99da69'
+                                }]),
+                            }
+                        },
+                    }, {
+                        value: 4,
+                        itemStyle: placeHolderStyle,
+                    },
+
+                    ]
+                },
+                {
+                    // name: '总人数',
+                    type: 'pie',
+                    hoverAnimation: false, //鼠标经过的特效
+                    // radius: ['61%', '62%'],
+                    radius: ['51%', '52%'],
+                    center: ['50%', '50%'],
+                    startAngle: 225,
+                    labelLine: {
+                        normal: {
+                            show: false
+                        }
+                    },
+                    label: {
+                        normal: {
+                            position: 'center'
+                        }
+                    },
+                    data: [{
+                        value: 15,
+                        itemStyle: {
+                            normal: {
+                                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                                    offset: 0,
+                                    color: '#FBAB7E'
+                                }, {
+                                    offset: 1,
+                                    color: '#F7CE68'
+                                }]),
+                            }
+                        },
+                    }, {
+                        value: 5,
+                        itemStyle: placeHolderStyle,
+                    },
+
+                    ]
+                },
+                {
+                    type: 'pie',
+                    hoverAnimation: false,
+                    // radius: ['61%', '62%'],
+                    radius: ['51%', '52%'],
+                    center: ['80%', '50%'],
+                    startAngle: 225,
+                    labelLine: {
+                        normal: {
+                            show: false
+                        }
+                    },
+                    label: {
+                        normal: {
+                            position: 'center'
+                        }
+                    },
+                    data: [{
+                        value: 9,
+                        itemStyle: {
+                            normal: {
+                                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+                                    offset: 0,
+                                    color: '#4897f6'
+                                }, {
+                                    offset: 1,
+                                    color: '#9f3edd'
+                                }]),
+                            }
+                        },
+                    }, {
+                        value: 3,
+                        itemStyle: placeHolderStyle,
+                    },
+
+                    ]
+                },
+                ]
+            };
+            this.roseEcharts.setOption(option)
+            tools.loopShowTooltip(this.roseEcharts, option, {
+                nterval: 2000,
+                loopSeries: true,
+            });
+        },
         handleClick(from, type) {
             this.handleMark()
             this.from = from
@@ -1529,7 +2078,7 @@ let app = new Vue({
                     that.leftFlag = false
                     setTimeout(() => {
                         let leftChange = that.$refs.leftChange
-                        that.initRoseEcharts(leftChange)
+                        that.initThreeBig(leftChange)
                     })
                 }
                 that.leftTime = setInterval(() => {
@@ -1542,7 +2091,7 @@ let app = new Vue({
                                 that.leftFlag = false
                                 setTimeout(() => {
                                     let leftChange = that.$refs.leftChange
-                                    that.initRoseEcharts(leftChange)
+                                    that.initThreeBig(leftChange)
                                 })
                             }
                         }

+ 126 - 44
cokingCoal/js/newIndex.js

@@ -419,7 +419,7 @@ let app = new Vue({
             },],
             orgChange: true,
             SalaryCalProgDetail: true,
-            imageList: ["./images/newImage/ppt1.jpg"],
+            imageList: ["./images/newImage/ppt1.png"],
             imageIndex: 0,
             imageFlag: false,
             pageFlag: true,
@@ -468,7 +468,12 @@ let app = new Vue({
                 top: "13%",
                 right: "21%",
             },
-            newSkillList: []
+            newSkillList: [],
+            dataFlag: true,
+            isShowRequest: false,
+            isShowPage: true,
+
+            industryEcharts: null
         }
     },
     beforeCreate() {
@@ -533,9 +538,9 @@ let app = new Vue({
 
             // let share = this.$refs.share
             // this.initHorizontalBar(share)
-            let el = this.$refs.container
-            // this.initProvinceChart(el)
-            this.initMap2(el)
+            // let el = this.$refs.container
+            // // this.initProvinceChart(el)
+            // this.initMap2(el)
 
 
 
@@ -586,8 +591,6 @@ let app = new Vue({
 
 
 
-        // this.requestFunction()
-        this.noRequestFunction()
 
 
         setInterval(() => {
@@ -596,9 +599,26 @@ let app = new Vue({
             console.log("数据更新每五分钟一次");
         }, 60000 * 5)
 
+        if (this.isShowRequest) {
+            this.requestFunction()
+
+        } else {
+            this.noRequestFunction()
+
+        }
+
     },
 
     methods: {
+        handleChangeData() {
+            this.isShowPage = false;
+            console.log(this.isShowPage);
+            this.requestFunction()
+            setTimeout(() => {
+                this.isShowPage = true;
+            }, 3)
+            this.dataFlag = !this.dataFlag
+        },
         // 监听键盘
         keyDown() {
             let that = this;
@@ -622,7 +642,7 @@ let app = new Vue({
                         if (that.imageIndex != 0) {
                             that.imageIndex = that.imageIndex - 1
                         }
-                    }  else if (e1 && e1.keyCode == 39) {
+                    } else if (e1 && e1.keyCode == 39) {
                         that.imageIndex = that.imageIndex + 1
                     } else if (e1 && e1.keyCode == 40) {
                         that.imageIndex = that.imageIndex + 1
@@ -700,10 +720,15 @@ let app = new Vue({
 
             let leftEnd = that.$refs.leftEnd
             that.initBarEchartsElse(leftEnd, leftEndList, ["累计平均工资", "同期累计平均工资"])
+
+            let el = this.$refs.container
+            // this.initProvinceChart(el)
+            this.initMap2(el)
         },
 
         requestFunction() {
             let that = this;
+            console.log(123123);
             localEnvAppToken().then(res => {
                 localStorage.setItem("app_token", res.app_token)
                 getLocalEnvAccessToken().then(res => {
@@ -818,10 +843,16 @@ let app = new Vue({
                 let leftEnd = that.$refs.leftEnd
                 that.initBarEchartsElse(leftEnd, leftEndList, ["累计平均工资", "同期累计平均工资"])
 
+                let el = this.$refs.container
+                // this.initProvinceChart(el)
+                this.initMap2(el)
+
 
             })
         },
 
+
+
         handleSelect(flag = 'total') {
             if (flag == 'total') {
                 this.markStyle = {
@@ -1152,7 +1183,10 @@ let app = new Vue({
             });
         },
         initOrganizationElse(el, title = "", data = { x: ["集团本部", "山焦财务", "山焦担保", "山焦股份", "山焦国华", "山焦机电", "山焦人力", "山焦民爆", "山焦事业", "山焦投资"], y: [0, 680, 562, 268, 717, 843, 987, 126, 723, 569] }, unit = "") {
-            let chart = echarts.init(el);
+            if (this.industryEcharts != null) {
+                this.industryEcharts.dispose()
+            }
+            this.industryEcharts = echarts.init(el);
             let option = {
                 title: {
                     show: false,
@@ -1284,14 +1318,14 @@ let app = new Vue({
                 },
             };
             let that = this;
-            chart.setOption(option);
-            tools.loopShowTooltip(chart, option, {
+            this.industryEcharts.setOption(option);
+            tools.loopShowTooltip(this.industryEcharts, option, {
                 nterval: 2000,
                 loopSeries: true,
             });
-            window.addEventListener("resize", function () {
-                chart.resize();
-            });
+            // window.addEventListener("resize", function () {
+            //     this.industryEcharts.resize();
+            // });
         },
         initLineEcharts(el, data) {
             if (this.intervalL != undefined) {
@@ -2685,8 +2719,12 @@ let app = new Vue({
                 }]
             }
 
-            var chart = Highcharts.chart('echartL2', option);
+            if (chart) {
+                chart.destroy();
+            }
 
+            var chart = Highcharts.chart('echartL2', option);
+            console.log(chart);
             function autoTooltip(point) {
                 chart.tooltip.refresh(point);
             }
@@ -5144,7 +5182,7 @@ let app = new Vue({
             this.achievementIndex = 0
         },
         handleStudio(item, index) {
-            if(index != 0){
+            if (index != 0) {
                 return
             }
             let that = this;
@@ -5310,8 +5348,10 @@ let app = new Vue({
             }
         },
         getDistributionInfo() {
-            let data = {}
             let that = this
+            let data = {
+                flag: that.dataFlag
+            }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/Distribution", data).then(res => {
                 if (res) {
                     res.data.forEach(item => {
@@ -5325,8 +5365,10 @@ let app = new Vue({
             })
         },
         getOrganizationChange() {
-            let data = {}
             let that = this
+            let data = {
+                flag: that.dataFlag
+            }
             this.orgChange = false
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/OrganizationChange", data).then(res => {
                 if (res) {
@@ -5337,7 +5379,9 @@ let app = new Vue({
         },
         getIndustrydistribution() {
             let that = this
-            let data = {}
+            let data = {
+                flag: that.dataFlag
+            }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/Industrydistribution", data).then(res => {
                 if (res) {
                     let x = []
@@ -5357,9 +5401,12 @@ let app = new Vue({
         },
         getHumanResources() {
             let that = this;
-            let data = {};
+            let data = {
+                flag: that.dataFlag
+            }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/HumanResources", data).then(res => {
                 if (res) {
+                    console.log(res);
                     that.HumanResourcesList.forEach(i => {
                         res.data.forEach(item => {
                             if (i.key == item.key) {
@@ -5466,7 +5513,9 @@ let app = new Vue({
         },
         getSalaryCalProg() {
             let that = this;
-            let data = {};
+            let data = {
+                flag: that.dataFlag
+            }
             this.SalaryCalProgDetail = false
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/SalaryCalProg", data).then(res => {
                 if (res) {
@@ -5478,7 +5527,9 @@ let app = new Vue({
         },
         getSalaryCalProgDetail() {
             let that = this;
-            let data = {};
+            let data = {
+                flag: that.dataFlag
+            }
             this.isShowMark = false
             this.salaryFlag = false
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/SalaryCalProgDetail", data).then(res => {
@@ -5585,7 +5636,9 @@ let app = new Vue({
 
         getTurnOver() {
             let that = this;
-            let data = {};
+            let data = {
+                flag: that.dataFlag
+            }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/TurnOver", data).then(res => {
                 if (res) {
                     res.data.forEach(item => {
@@ -5644,7 +5697,9 @@ let app = new Vue({
         },
         getOptimizeResources() {
             let that = this;
-            let data = {}
+            let data = {
+                flag: that.dataFlag
+            }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/OptimizeResources", data).then(res => {
                 if (res) {
                     res.data.forEach(item => {
@@ -5663,7 +5718,9 @@ let app = new Vue({
         },
         getHumanOrgAllResources() {
             let that = this;
-            let data = {};
+            let data = {
+                flag: that.dataFlag
+            }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/HumanOrgAllResources", data).then(res => {
                 if (res) {
                     res.data.forEach(item => {
@@ -5687,7 +5744,9 @@ let app = new Vue({
         },
         getMapData() {
             let that = this;
-            let data = {};
+            let data = {
+                flag: that.dataFlag
+            }
             var geoCoordMap = {
                 太原市: [112.049248, 38.157014],
                 大同市: [113.595259, 40.29031],
@@ -5739,15 +5798,20 @@ let app = new Vue({
 
                     })
                 }
+                // 
+                let el = this.$refs.container
+                // this.initProvinceChart(el)
+                this.initMap2(el)
             })
         },
         getPersonnelResource() {
             let that = this;
-            let data = {};
+            let data = {
+                flag: that.dataFlag
+            }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/PersonnelResource", data).then(res => {
                 if (res) {
-                    res.forEach(item => {
-                        console.log(item);
+                    res.data.forEach(item => {
                         if (item.key == "用工总数") {
                             that.PersonnelResource[0].value = item.value
                         }
@@ -5763,7 +5827,9 @@ let app = new Vue({
         },
         getEduStructure() {
             let that = this;
-            let data = {};
+            let data = {
+                flag: that.dataFlag
+            }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/EduStructure", data).then(res => {
                 if (res) {
                     let arr = []
@@ -5786,7 +5852,9 @@ let app = new Vue({
         },
         getSkillLevel() {
             let that = this;
-            let data = {};
+            let data = {
+                flag: that.dataFlag
+            }
             let level = this.$refs.level
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/SkillLevel", data).then(res => {
                 if (res) {
@@ -5798,7 +5866,6 @@ let app = new Vue({
                             levelList.y = item.value
                         }
                     })
-                    console.log(levelList);
                     let sum = 0
                     levelList.y.forEach(item => {
                         sum = sum + item
@@ -5825,14 +5892,16 @@ let app = new Vue({
         },
         getRankLevel() {
             let that = this;
-            let data = {}
+            let data = {
+                flag: that.dataFlag
+            }
             let initChartR1 = this.$refs.initChartR1
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/RankLevel", data).then(res => {
                 if (res) {
                     let nameList = []
                     let valueList = []
                     let rankLevelList = []
-                    infoData.forEach(item => {
+                    res.data.forEach(item => {
                         if (item.key == "技能名称") {
                             nameList = item.value
                         }
@@ -5855,7 +5924,9 @@ let app = new Vue({
         },
         getFrontLine() {
             let that = this;
-            let data = {};
+            let data = {
+                flag: that.dataFlag
+            }
             let efficiency = this.$refs.efficiency
 
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/FrontLine", data).then(res => {
@@ -5878,7 +5949,9 @@ let app = new Vue({
         },
         getGrassRoots() {
             let that = this;
-            let data = {}
+            let data = {
+                flag: that.dataFlag
+            }
             let efficiency = this.$refs.efficiency
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/GrassRoots", data).then(res => {
                 if (res) {
@@ -5912,7 +5985,9 @@ let app = new Vue({
         },
         getPositionSequence() {
             let that = this;
-            let data = {};
+            let data = {
+                flag: that.dataFlag
+            };
             let sequence = this.$refs.sequence
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/PositionSequence", data).then(res => {
                 if (res) {
@@ -5955,7 +6030,8 @@ let app = new Vue({
         getDownholeoperationTrue() {
             let that = this;
             let data = {
-                flagd: true
+                flagd: true,
+                flag: that.dataFlag
             }
             let echartTwo = this.$refs.echartTwo
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/Downholeoperation", data).then(res => {
@@ -5986,7 +6062,8 @@ let app = new Vue({
         getDownholeoperationFlase() {
             let that = this;
             let data = {
-                flagd: false
+                flagd: false,
+                flag: that.dataFlag
             }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/Downholeoperation", data).then(res => {
                 if (res) {
@@ -6005,7 +6082,9 @@ let app = new Vue({
         },
         getStaffAge() {
             let that = this;
-            let data = {};
+            let data = {
+                flag: that.dataFlag
+            };
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/StaffAge", data).then(res => {
                 if (res) {
                     let dataObj = {
@@ -6030,7 +6109,9 @@ let app = new Vue({
         },
         getStaffSeniority() {
             let that = this;
-            let data = {};
+            let data = {
+                flag: that.dataFlag
+            };
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/StaffSeniority", data).then(res => {
                 if (res) {
                     let obj = {
@@ -6050,7 +6131,7 @@ let app = new Vue({
         getCalSalary() {
             let that = this;
             let data = {
-                flag: true,
+                flag: that.dataFlag,
                 month: parseInt(that.selectInfo.average)
             };
             let leftEnd = that.$refs.leftEnd
@@ -6065,7 +6146,7 @@ let app = new Vue({
         getCalSalary1() {
             let that = this;
             let data = {
-                flag: true,
+                flag: that.dataFlag,
                 month: parseInt(that.selectInfo.total)
             }
             let echarts90 = that.$refs.echarts90
@@ -6083,7 +6164,7 @@ let app = new Vue({
         getCalSalary2() {
             let that = this;
             let data = {
-                flag: true
+                flag: that.dataFlag
             }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getCalSalary2", data).then(res => {
                 if (res) {
@@ -6111,6 +6192,7 @@ let app = new Vue({
         getCmasterstudio(level) {
             let that = this;
             let data = {
+                flag: that.dataFlag,
                 level
             }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/Cmasterstudio", data).then(res => {

+ 12 - 12
cokingCoal/styles/humanResources.css

@@ -119,7 +119,7 @@ a {
 
 .page_main_left,
 .page_main_right {
-    width: 35%;
+    width: 34%;
     height: 100%;
     position: absolute;
 }
@@ -149,7 +149,7 @@ img {
     width: 90%;
     z-index: 0;
     height: 84%;
-    transform: scale(1.15) translate(5%, 20%);
+    transform: scale(1.1) translate(5%, 20%);
 }
 
 .center_top {
@@ -241,7 +241,7 @@ img {
     width: calc(50% - 10px);
     height: 100%;
     background-color: #69c1ff09;
-    padding-top: 50px;
+    padding-top: 20px;
     box-sizing: border-box;
 }
 
@@ -265,13 +265,13 @@ img {
 
 .main_item_top {
     width: 100%;
-    height: calc(35% - 15px);
+    height: calc(37% - 15px);
     background-color: var(--bgc);
 }
 
 .main_item_btm {
     width: 100%;
-    height: calc(65% - 15px);
+    height: calc(63% - 15px);
     background-color: var(--bgc);
 }
 
@@ -903,7 +903,7 @@ li {
     background-color: var(--bgc);
     position: absolute;
     right: 0;
-    top: -10px;
+    top: 10px;
     display: flex;
     justify-content: center;
     align-items: center;
@@ -945,7 +945,7 @@ li {
     width: 70px;
     height: 70px;
     position: fixed;
-    left: 33.5%;
+    left: 32.5%;
     top: 62%;
     z-index: 9999;
 }
@@ -967,25 +967,25 @@ li {
     transform-origin: center top;
     transform: rotateX(81deg) scale(2.4);
     position: absolute;
-    bottom: -113%;
+    bottom: -100%;
 }
 
 .svg_item_s {
     width: 800px;
     height: 800px;
     transform-origin: center top;
-    transform: rotateX(83deg) scale(1.75) translateX(-1.2%);
+    transform: rotateX(83deg) scale(1.65) translateX(-1.2%);
     position: absolute;
-    bottom: -104%;
+    bottom: -90%;
 }
 
 .svg_item_shu {
     width: 800px;
     height: 800px;
     transform-origin: center top;
-    transform: rotateX(81deg) scale(2.2) translateX(-1%);
+    transform: rotateX(79deg) scale(2.1) translateX(-1%);
     position: absolute;
-    bottom: -106%;
+    bottom: -85%;
 }
 
 .svg {

+ 1 - 0
cokingCoal/styles/newIndex.css

@@ -958,6 +958,7 @@ img {
     position: absolute;
     top: 0;
     left: 0;
+    z-index: 999999;
 }
 
 .main_info_item {