Переглянути джерело

修改大屏,对接接口

fengxu 2 роки тому
батько
коміт
6c6caf03fe
5 змінених файлів з 339 додано та 332 видалено
  1. BIN
      cokingCoal.zip
  2. 15 15
      cokingCoal/hr.html
  3. 2 2
      cokingCoal/index.html
  4. 258 271
      cokingCoal/js/humanResources.js
  5. 64 44
      cokingCoal/js/newIndex.js

BIN
cokingCoal.zip


+ 15 - 15
cokingCoal/hr.html

@@ -36,7 +36,7 @@
 
                         <div class="main_item flex_column">
                             <div :class="classChange?'item_content_6':'item_content_6_false'">
-                                <dv-scroll-board id="itemContent" :config="config1" v-if="!isShowInfoList"
+                                <dv-scroll-board id="itemContent" :config="config1" v-if="isShowInfoList"
                                     @scroll-change="scrollChange" style="width: 100%; height: 100%" />
                             </div>
                             <div class="item_content_4 flex_column">
@@ -146,16 +146,16 @@
 
                     <div class="main_item " style="width: 100%;background: none;">
                         <!-- <div class="main_item_title">笔试安排</div> -->
-                        <div class="main_item_main">
-                            <dv-scroll-board v-if="showExamination" :config="configWritten"
+                        <div class="main_item_main" style="height: 100%;">
+                            <dv-scroll-board v-if="showExamination" :config="configWritten"  @scroll-change="scrollChangeListW"
                                 style="width: 100%; height: 100%" />
                         </div>
                     </div>
                     <div class="title" style="width: 70%;height: 100px;margin-left: -30%;margin-top: 30px;">面试安排</div>
                     <div class="main_item  w100" style="width: 100%;background: none;position: relative;">
                         <!-- <div class="main_item_title">面试安排</div> -->
-                        <div class="main_item_main">
-                            <dv-scroll-board v-if="showInterview" :config="configInterview"
+                        <div class="main_item_main" style="height: 100%;">
+                            <dv-scroll-board v-if="showInterview" :config="configInterview" @scroll-change="scrollChangeListIn"
                                 style="width: 100%; height: 100%" />
                         </div>
                         <!-- <div class="changeTime" @click="handleMonth()">
@@ -309,14 +309,14 @@
                         <div class="main_item flex_column" style="background: none;">
                             <div class="main_item_title">笔试安排</div>
                             <div class="main_item_main">
-                                <dv-scroll-board v-if="showExamination" :config="configWritten"
+                                <dv-scroll-board v-if="showExamination" :config="configWritten" @scroll-change="scrollChangeListW"
                                     style="width: 100%; height: 100%" />
                             </div>
                         </div>
                         <div class="main_item flex_column" style="background: none;position: relative;">
                             <div class="main_item_title">面试安排</div>
                             <div class="main_item_main">
-                                <dv-scroll-board v-if="showInterview" :config="configInterview"
+                                <dv-scroll-board v-if="showInterview" :config="configInterview" @scroll-change="scrollChangeListIn"
                                     style="width: 100%; height: 100%" />
                             </div>
                             <!-- <div class="changeTime" @click="handleMonth()">
@@ -333,9 +333,9 @@
                         <div class="main_item_top">
                             <!-- <vue-seamless-scroll :data="listData" class="warp" :classOption="classOption"> -->
                             <!-- <div class="item" v-if="noticeList.length == 0"> -->
-                            <div class="item">
-                                <!-- <p class="item_title">{{ noticeList[noticeIndex].title  }}</p> -->
-                                <p class="item_title">山西焦煤西山煤电斜沟煤矿井下操作工招聘公示</p>
+                            <div class="item" v-if="noticList[noticIndex]">
+                                <p class="item_title">{{ noticList[noticIndex].noticeDataList.title  }}</p>
+                                <!-- <p class="item_title">山西焦煤西山煤电斜沟煤矿井下操作工招聘公示</p>
                                 <p class="item_con" style="text-indent: 40px;line-height: 50px;">
                                     根据2023年7月1日发布的《山西焦煤西山煤电杜儿坪矿井下操作工双选公告》相关要求,经过双选平台发布岗位、自主报名、资格审查、综合测评等流程,双选结果公示,拟录用陈英等14名员工。现将拟录用人员名单予以公示。<br>
                                 </p>
@@ -345,10 +345,10 @@
                                 <p class="item_con" style="text-indent: 40px;line-height: 40px;">
                                     受理电话:0351-8305319<br>
 
-                                </p>
-                                <!-- <div class="item_con">
-                                    <span class="item_con_main">{{ noticeList[noticeIndex].mdnb_noticecontent }}</span>
-                                </div> -->
+                                </p> -->
+                                <div class="item_con">
+                                    <span class="item_con_main">{{ noticList[noticIndex].noticeDataList.mdnb_noticecontent }}</span>
+                                </div>
                             </div>
 
                             <!-- </vue-seamless-scroll> -->
@@ -369,7 +369,7 @@
             </div>
             <div class="page_main_right flex_column" v-if="!showBigList">
                 <div class="right_btm w100" style="height: 100%;">
-                    <div class="main flex_column" style="width: 100%;height: calc(100% - 100px);">
+                    <div class="main flex_column" style="width: 100%;height: calc(100% - 0px);">
                         <div class="main_item_top" style="height: calc(18% - 15px);">
                             <!-- <vue-seamless-scroll :data="listData" class="warp" :classOption="classOption"> -->
                             <!-- <div class="item" v-if="noticeList.length == 0"> -->

+ 2 - 2
cokingCoal/index.html

@@ -397,8 +397,8 @@
             <div class="box_main">
                 <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">
+                        <!-- <div class="main_info_item" @click="handleChangeData()"> -->
                             <div class="main_info_item_img">
                             </div>
                             <div class="main_info_item_title" >

+ 258 - 271
cokingCoal/js/humanResources.js

@@ -103,7 +103,7 @@ let app = new Vue({
 
                     ["霍州煤电恒兴煤业", '生产调度员', '4', '10', "2023.07.01"],
                     ["霍州煤电吕梁山煤电公司", '汽车驾驶员', '5', '10', "2023.07.01"],
-                    // ["山煤国际凌志达煤业", '电工', '5', '16', "2023.07.01"],
+                    ["山煤国际凌志达煤业", '电工', '5', '16', "2023.07.01"],
                     ["华晋焦煤沙曲一号煤矿", '井下普工', '40', '120', "2023.07.01"],
                     ["山西焦化", '技术员', '2', '12', "2023.07.01"],
                     ["汾西矿业高阳煤矿", '井下安全检查员', '5', '10', "2023.07.01"],
@@ -321,8 +321,8 @@ let app = new Vue({
             showMonth: false,
             monthList,
             monthItem: "08",
-            timeList1: ["2022-07", "2023-07"],
-            timeList2: ["2022-07", "2023-07"],
+            timeList1: ["2022-08", "2023-08"],
+            timeList2: ["2022-08", "2023-08"],
             from: "",
             type: 0,
             echartsIndex: 1,
@@ -387,9 +387,21 @@ let app = new Vue({
 
             showBigList: true,
             rightData: [],
+
+            noticIndex: 0,
+            noticList: [],
+            noticTime: null,
+
         }
     },
     created() {
+
+        let date = new Date()
+        let year = date.getFullYear()
+        let month = "0" + date.getMonth()
+        this.timeList1 = [(year - 1) + "-" + month, year + "-" + month]
+        this.timeList2 = [(year - 1) + "-" + month, year + "-" + month]
+
         this.newList = listToChange(yearList, monthList)
         this.employmentList3.data = employmentList
         if (employmentList.length % 2 != 0) {
@@ -444,13 +456,15 @@ let app = new Vue({
 
 
 
-            // setTimeout(() => {
-            //     let itemContent = document.getElementById("itemContent")
-            //     let target = itemContent.getElementsByClassName("row-item")
-            //     let targetList = target.item(0)
-            //     targetList.style.background = "#302e2d50"
-            //     targetList.style.color = "#E1AF27"
-            // }, 0)
+            setTimeout(() => {
+                let itemContent = document.getElementById("itemContent")
+                if (itemContent) {
+                    let target = itemContent.getElementsByClassName("row-item")
+                    let targetList = target.item(0)
+                    targetList.style.background = "#302e2d50"
+                    targetList.style.color = "#E1AF27"
+                }
+            }, 10)
             setTimeout(() => {
                 that.classChange = true
             }, 5000);
@@ -505,72 +519,48 @@ 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()
-        //         that.getHalfYearDelivcv()
-        //         that.getHotDelivcv()
-        //         that.arrToListArr()
-        //         that.getDelivcvAndApply()
-        //         that.getreviewarrange()
-        //         that.getRecruitType()
-        //         that.getFailReason()
-        //         that.getQualAudits()
-        //         that.getNoticePerson()
-        //         that.getNotice()
-        //         that.getDoubleChoice()
-        //         that.getPositionAll()
-        //         setInterval(() => {
-        //             that.getreviewarrange({
-        //                 mianshi: [
-        //                     ["焦煤", "李哥", "301", "2", "2023-08-31 10:40:55.0"],
-        //                     ["焦", "李13哥", "311", "2", "2023-08-31 10:40:55.0"],
-        //                     ["焦", "李13哥", "311", "2", "2023-08-31 10:40:55.0"],
-        //                     ["焦", "李13哥", "311", "2", "2023-08-31 10:40:55.0"],
-        //                     ["焦", "李13哥", "311", "2", "2023-08-31 10:40:55.0"],
-        //                     ["焦", "李13哥", "311", "2", "2023-08-31 10:40:55.0"],
-        //                     ["焦", "李13哥", "311", "2", "2023-08-31 10:40:55.0"],
-        //                     ["焦", "李13哥", "311", "2", "2023-08-31 10:40:55.0"],
-        //                 ],
-        //                 bishi: [
-        //                     ["煤", "李13哥", "311", "2", "2023-08-31 10:40:55.0"],
-        //                     ["煤", "李13哥", "311", "2", "2023-08-31 10:40:55.0"],
-        //                     ["煤", "李13哥", "311", "2", "2023-08-31 10:40:55.0"],
-        //                     ["煤", "李13哥", "311", "2", "2023-08-31 10:40:55.0"],
-        //                     ["煤", "李13哥", "311", "2", "2023-08-31 10:40:55.0"],
-        //                     ["煤", "李13哥", "311", "2", "2023-08-31 10:40:55.0"],
-        //                     ["煤", "李13哥", "311", "2", "2023-08-31 10:40:55.0"],
-        //                     ["煤", "李13哥", "311", "2", "2023-08-31 10:40:55.0"],
-        //                     ["煤", "李13哥", "311", "2", "2023-08-31 10:40:55.0"],
-        //                 ],
-        //             })
-        //         }, (1000 * 10))
-
-        //     })
-        // }).catch(err => {
-            this.isChangeList = true
+        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.getPostDetail()
+
+                that.getHalfYearDelivcv()
+                that.getHotDelivcv()
+                that.arrToListArr()
+                that.getDelivcvAndApply()
+                that.getRecruitType()
+                that.getFailReason()
+                that.getQualAudits()
+                that.getNoticePerson()
+                that.getNotice()
+                that.getDoubleChoice()
+                that.getPositionAll()
+                that.getTotalRate()
 
+            })
+        }).catch(err => {
+            this.isChangeList = true
+            this.isShowInfoList = true
             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: 25, total: 67 })
+            this.initLineRight(rightOne, { value: 18, total: 44 })
             let rightTwo = this.$refs.rightTwo
-            this.initLineRight(rightTwo, { value: 22, total: 67 })
+            this.initLineRight(rightTwo, { value: 11, total: 44 })
             let rightThree = this.$refs.rightThree
-            this.initLineRight(rightThree, { value: 10, total: 67 })
+            this.initLineRight(rightThree, { value: 9, total: 44 })
             let rightFour = this.$refs.rightFour
-            this.initLineRight(rightFour, { value: 8, total: 67 })
+            this.initLineRight(rightFour, { value: 4, total: 44 })
             let rightFive = this.$refs.rightFive
-            this.initLineRight(rightFive, { value: 2, total: 67 })
+            this.initLineRight(rightFive, { value: 2, total: 44 })
 
             let vita = this.$refs.vita
             that.initVitaEcharts(vita)
-            that.getPostDetail()
-        // })
+        })
     },
     methods: {
         handleClickIcon(item, index) {
@@ -637,22 +627,6 @@ let app = new Vue({
                         return new Promise(() => {
                             that.getFailReason()
                             that.getHalfYearDelivcv()
-                            // setTimeout(() => {
-                            //     let leftChange = that.$refs.leftChange
-                            //     that.initThreeBig(leftChange)
-                            //     let rightOne = that.$refs.rightOne
-                            //     let rightTwo = that.$refs.rightTwo
-                            //     let rightThree = that.$refs.rightThree
-                            //     let rightFour = that.$refs.rightFour
-                            //     let rightFive = that.$refs.rightFive
-
-                            //     that.initLineRight(rightOne, { value: that.rightData[0].value, total })
-                            //     that.initLineRight(rightTwo, { value: that.rightData[1].value, total })
-                            //     that.initLineRight(rightThree, { value: that.rightData[2].value, total })
-                            //     that.initLineRight(rightFour, { value: that.rightData[3].value, total })
-                            //     that.initLineRight(rightFive, { value: that.rightData[4].value, total })
-
-                            // }, 300)
                         })
                     }
                 }, 15)
@@ -2317,10 +2291,13 @@ let app = new Vue({
                 that.isShowInfoList = true
                 setTimeout(() => {
                     let itemContent = document.getElementById("itemContent")
-                    let target = itemContent.getElementsByClassName("row-item")
-                    let targetList = target.item(0)
-                    targetList.style.background = "#302e2d50"
-                    targetList.style.color = "#E1AF27"
+                    if (itemContent) {
+                        let target = itemContent.getElementsByClassName("row-item")
+                        let targetList = target.item(0)
+                        targetList.style.background = "#302e2d50"
+                        targetList.style.color = "#E1AF27"
+                    }
+
                 }, 0)
             })
 
@@ -2355,7 +2332,7 @@ let app = new Vue({
 
             }).catch(err => {
                 let vita = this.$refs.vita
-                    that.initVitaEcharts(vita)
+                that.initVitaEcharts(vita)
             })
         },
         getHotDelivcv() {
@@ -2442,28 +2419,6 @@ let app = new Vue({
 
             })
         },
-        getreviewarrange(res = {
-            mianshi: [
-                ["焦煤", "李大哥", "301", "2", "2023-08-31 10:40:55.0"]
-            ],
-            bishi: [
-                ["焦煤", "李大哥", "301", "2", "2023-08-31 10:40:55.0"]
-            ],
-        }) {
-            let that = this;
-            let data = {
-                flag: true
-            };
-            // fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getreviewarrange", data).then(res => {
-            //     console.log(res);
-            // })
-
-            if (res) {
-                that.isRendering(res.mianshi, "interviewIndex", "configInterview", "showInterview")
-                that.isRendering(res.bishi, "examinationIndex", "configWritten", "showExamination")
-            }
-
-        },
         isRendering(data, type, key, flag) {
             let that = this;
             if (that[type] == 0) {
@@ -2584,159 +2539,81 @@ let app = new Vue({
             //     num3: 80,
             // }],
         },
-        getNoticePerson(name = "张三") {
+        getNo(arr) {
+            if (Array.isArray(arr)) {
+                arr.forEach((item, index) => {
+                    if (index <= 8) {
+                        item.unshift("0" + (index + 1))
+                    } else {
+                        item.unshift((index + 1).toString())
+                    }
+                })
+            }
+            return arr
+        },
+        getNoticePerson(type = 3) {
             let that = this;
-            that.employmentList1.data = []
-            that.employmentList2.data = []
-            this.isShowList = false
+            if (type == 1) {
+                that.showExamination = false
+            } else if (type == 2) {
+                that.showInterview = false
+            } else {
+                this.showExamination = false
+                this.showInterview = false
+            }
+            let year = new Date().getFullYear()
             let data = {
                 flag: true,
-                year: "2023",
+                year,
                 month: 0
             }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/assessmentarrangement", data).then(res => {
+                if (res) {
+                    if (type == 1) {
+                        that.configWritten.data = that.getNo(res.bishiList)
+                        setTimeout(() => {
+                            that.showExamination = true
+                        }, 10)
+                    } else if (type == 2) {
+                        that.configInterview.data = that.getNo(res.mianshiList)
+                        setTimeout(() => {
+                            that.showInterview = true
+                        }, 10)
+                    } else {
+                        that.configWritten.data = that.getNo(res.bishiList)
+                        that.configInterview.data = that.getNo(res.mianshiList)
+                        setTimeout(() => {
+                            that.showInterview = true
+                            that.showExamination = true
+                        }, 10)
+                    }
 
-            })
-            let res = {
-                data: [{
-                    "sex": "男",
-                    "name": name,
-                    "org1": "山西焦煤西山煤电杜儿坪矿井下操作工双选公示",
-                    "cardno": "16666XXXXXXXXXXXXXXXXXXXXX99"
-                }, {
-                    "sex": "男",
-                    "name": name,
-                    "org1": "山西焦煤西山煤电杜儿坪矿井下操作工双选公示",
-                    "cardno": "16666XXXXXXXXXXXXXXXXXXXXX99"
-                }, {
-                    "sex": "男",
-                    "name": name,
-                    "org1": "山西焦煤西山煤电杜儿坪矿井下操作工双选公示",
-                    "cardno": "16666XXXXXXXXXXXXXXXXXXXXX99"
-                }, {
-                    "sex": "男",
-                    "name": name,
-                    "org1": "山西焦煤西山煤电杜儿坪矿井下操作工双选公示",
-                    "cardno": "16666XXXXXXXXXXXXXXXXXXXXX99"
-                }, {
-                    "sex": "男",
-                    "name": name,
-                    "org1": "山西焦煤西山煤电杜儿坪矿井下操作工双选公示",
-                    "cardno": "16666XXXXXXXXXXXXXXXXXXXXX99"
-                }, {
-                    "sex": "男",
-                    "name": name,
-                    "org1": "山西焦煤西山煤电杜儿坪矿井下操作工双选公示",
-                    "cardno": "16666XXXXXXXXXXXXXXXXXXXXX99"
-                }, {
-                    "sex": "男",
-                    "name": name,
-                    "org1": "山西焦煤西山煤电杜儿坪矿井下操作工双选公示",
-                    "cardno": "16666XXXXXXXXXXXXXXXXXXXXX99"
-                }, {
-                    "sex": "男",
-                    "name": name,
-                    "org1": "山西焦煤西山煤电杜儿坪矿井下操作工双选公示",
-                    "cardno": "16666XXXXXXXXXXXXXXXXXXXXX99"
-                }, {
-                    "sex": "男",
-                    "name": name,
-                    "org1": "山西焦煤西山煤电杜儿坪矿井下操作工双选公示",
-                    "cardno": "16666XXXXXXXXXXXXXXXXXXXXX99"
-                }, {
-                    "sex": "男",
-                    "name": name,
-                    "org1": "山西焦煤西山煤电杜儿坪矿井下操作工双选公示",
-                    "cardno": "16666XXXXXXXXXXXXXXXXXXXXX99"
-                }, {
-                    "sex": "男",
-                    "name": name,
-                    "org1": "山西焦煤西山煤电杜儿坪矿井下操作工双选公示",
-                    "cardno": "16666XXXXXXXXXXXXXXXXXXXXX99"
-                }, {
-                    "sex": "男",
-                    "name": name,
-                    "org1": "山西焦煤西山煤电杜儿坪矿井下操作工双选公示",
-                    "cardno": "16666XXXXXXXXXXXXXXXXXXXXX99"
-                }, {
-                    "sex": "男",
-                    "name": name,
-                    "org1": "山西焦煤西山煤电杜儿坪矿井下操作工双选公示",
-                    "cardno": "16666XXXXXXXXXXXXXXXXXXXXX99"
-                }, {
-                    "sex": "男",
-                    "name": name,
-                    "org1": "山西焦煤西山煤电杜儿坪矿井下操作工双选公示",
-                    "cardno": "16666XXXXXXXXXXXXXXXXXXXXX99"
-                }, {
-                    "sex": "男",
-                    "name": name,
-                    "org1": "山西焦煤西山煤电杜儿坪矿井下操作工双选公示",
-                    "cardno": "16666XXXXXXXXXXXXXXXXXXXXX99"
-                }, {
-                    "sex": "男",
-                    "name": name,
-                    "org1": "山西焦煤西山煤电杜儿坪矿井下操作工双选公示",
-                    "cardno": "16666XXXXXXXXXXXXXXXXXXXXX99"
-                }, {
-                    "sex": "男",
-                    "name": name,
-                    "org1": "山西焦煤西山煤电杜儿坪矿井下操作工双选公示",
-                    "cardno": "16666XXXXXXXXXXXXXXXXXXXXX99"
-                }, {
-                    "sex": "男",
-                    "name": name,
-                    "org1": "山西焦煤西山煤电杜儿坪矿井下操作工双选公示",
-                    "cardno": "16666XXXXXXXXXXXXXXXXXXXXX99"
-                }]
-            }
-            let listData = []
-            res.data.forEach((item, index) => {
-                let list = []
-                if (index <= 8) {
-                    list.push('0' + (index + 1), item.name, item.sex, item.cardno, item.org1)
-                } else {
-                    list.push((index + 1).toString(), item.name, item.sex, item.cardno, item.org1)
                 }
-                listData.push(list)
             })
-            if (listData.length % 2 != 0) {
-                listData.push([])
-            }
-            listData.forEach((item, index) => {
-                if (index % 2 == 0) {
-                    that.employmentList1.data.push(item)
-                } else {
-                    that.employmentList2.data.push(item)
-                }
-            })
-            // console.log(that.employmentList1.data);
-            setTimeout(() => {
-                that.isShowList = true
-            }, 10)
         },
         scrollChangeList(index) {
             let that = this;
-            // setTimeout(() => {
-            //     if (index + 5 == that.employmentList1.data.length) {
-            //         that.isListEnd = that.isListEnd + 1
-            //         if (that.isListEnd == 2) {
-            //             that.isListEnd = 0
-            //             that.isShowList = false
-            //             that.employmentList1.data = []
-            //             that.employmentList2.data = []
-            //             that.noticeIndex = that.noticeIndex + 1
-            //             if (that.noticeIndex > that.noticeList.length - 1) {
-            //                 that.noticeIndex = 0
-            //             }
-            //             that.getNoticePerson("李四是五")
-            //             setTimeout(() => {
-            //                 that.isShowList = true
-            //             }, 10)
-
-            //         }
-            //     }
-            // }, 1700)
+            that.noticTime && clearInterval(that.noticTime)
+            setTimeout(() => {
+                if (index + 5 == that.employmentList1.data.length) {
+                    that.isListEnd = that.isListEnd + 1
+                    if (that.isListEnd == 2) {
+                        that.isListEnd = 0
+                        that.isShowList = false
+                        that.employmentList1.data = []
+                        that.employmentList2.data = []
+                        that.noticeIndex = that.noticeIndex + 1
+                        if (that.noticeIndex > that.noticeList.length - 1) {
+                            that.noticeIndex = 0
+                        }
+                        // that.getNoticePerson("李四是五")
+                        setTimeout(() => {
+                            that.isShowList = true
+                        }, 10)
+
+                    }
+                }
+            }, 1700)
             if (index == 0) {
                 console.log("index == 0");
             }
@@ -2744,32 +2621,106 @@ let app = new Vue({
 
             }
         },
+        changeCardNo(str) {
+            let arr = []
+            let list = []
+            if (str.length != 0) {
+                arr = str.split("")
+                for (let i = 0; i <= arr.length - 1; i++) {
+                    if (i < 5) {
+                        list.push(arr[i])
+                    } else if (i > 5 && i < 14) {
+                        list.push("*")
+                    } else {
+                        list.push(arr[i])
+                    }
+                }
+            }
+            return list.join("")
+        },
+        changeNoticList(arr) {
+            let list = []
+            let that = this;
+            if (Array.isArray(arr)) {
+                arr.forEach((item, index) => {
+                    let a = []
+                    if (index <= 8) {
+                        a = ["0" + (index + 1), item.name, item.sex, that.changeCardNo(item.cardno), item.org1]
+                    } else {
+                        a = [(index + 1).toString(), item.name, item.sex, that.changeCardNo(item.cardno), item.org1]
+                    }
+                    list.push(a)
+                })
+            }
+            return list
+        },
         getNotice() {
             let that = this;
             let data = {
-                flag: true
+                flag: false
             };
-            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getNotice", data).then(res => { })
-            let res = {
-                data: [{
-                    mdnb_noticecontent: "   根据相关要求,经过网上报名、资格审查、笔试、面试等程序,现将拟录用人员名单予以公示。公示时间为2023年09月14日至2023年09月14日 ((1个工作日)),\n如对双选结果有异议,可在公示期内通过电话形式反馈情况。 \n 受理电话: 0351-8305606 0351-8305171\n",
-                    title: "山西焦煤西山煤电杜儿坪矿井下操作工招聘公示",
-                    billno: "000001"
-                }, {
-                    mdnb_noticecontent: "   根据相关要求,经过网上报名、资格审查、笔试、面试等程序,现将拟录用人员名单予以公示。公示时间为2023年09月14日至2023年09月14日 ((1个工作日)),\n如对双选结果有异议,可在公示期内通过电话形式反馈情况。 \n 受理电话: 0351-8305606 0351-8305171\n",
-                    title: "山西焦煤西山煤电杜坪矿井下操作工招聘公示",
-                    billno: "000002"
-                }, {
-                    mdnb_noticecontent: "   根据相关要求,经过网上报名、资格审查、笔试、面试等程序,现将拟录用人员名单予以公示。公示时间为2023年09月14日至2023年09月14日 ((1个工作日)),\n如对双选结果有异议,可在公示期内通过电话形式反馈情况。 \n 受理电话: 0351-8305606 0351-8305171\n",
-                    title: "山西焦煤西山煤电杜儿矿井下操作工招聘公示",
-                    billno: "000003"
-                }, {
-                    mdnb_noticecontent: "   根据相关要求,经过网上报名、资格审查、笔试、面试等程序,现将拟录用人员名单予以公示。公示时间为2023年09月14日至2023年09月14日 ((1个工作日)),\n如对双选结果有异议,可在公示期内通过电话形式反馈情况。 \n 受理电话: 0351-8305606 0351-8305171\n",
-                    title: "山西焦煤西山煤电儿坪矿井下操作工招聘公示",
-                    billno: "000004"
-                }]
-            }
-            that.noticeList = res.data
+            this.isShowList = false
+
+            that.employmentList1.data = []
+            that.employmentList2.data = []
+
+
+            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getNotice", data).then(res => {
+                if (res) {
+                    res.forEach((item, index) => {
+                        if (index == 0) {
+                            item.noticeUserList[0].sex = "南"
+                        }
+                        let obj = {
+                            noticeDataList: item.noticeDataList,
+                            noticeUserList: that.changeNoticList(item.noticeUserList)
+                        }
+                        that.noticList.push(obj)
+                    })
+                    that.noticList[that.noticIndex].noticeUserList.forEach((item, index) => {
+                        if (index % 2 == 0) {
+                            that.employmentList1.data.push(item)
+                        } else {
+                            that.employmentList2.data.push(item)
+                        }
+                    })
+
+                    that.noticIndex += 1
+
+                    if (that.employmentList2.data.length <= that.employmentList2.rowNum) {
+                        that.noticTime = setInterval(() => {
+                            that.employmentList1.data = []
+                            that.employmentList2.data = []
+
+
+                            that.isShowList = false
+                            that.noticList[that.noticIndex].noticeUserList.forEach((item, index) => {
+                                if (index % 2 == 0) {
+                                    that.employmentList1.data.push(item)
+                                } else {
+                                    that.employmentList2.data.push(item)
+                                }
+                            })
+
+                            console.log(that.employmentList1.data);
+
+                            that.noticIndex += 1
+
+                            if (that.noticIndex > that.noticList.length - 1) {
+                                that.noticIndex = 0
+                            }
+                            setTimeout(() => {
+                                that.isShowList = true
+                            }, 10)
+                        }, that.employmentList2.data.length * 2000)
+                    }
+                    setTimeout(() => {
+                        that.isShowList = true
+                    })
+                }
+            })
+
+            // that.noticeList = res.data
         },
         getDoubleChoice() {
             let that = this;
@@ -2875,6 +2826,42 @@ let app = new Vue({
             })
         },
 
+        getTotalRate() {
+            let that = this;
+            let data = {
+                flag: true
+            };
+            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/TotalRate", data).then(res => {
+                if (res) {
+                    // that.rightList
+                    res.data.forEach(item => {
+                        if (item.key == "累计人数") {
+                            that.rightList[1].num1 = item.value
+                        }
+                        if (item.key == "累计通过人数") {
+                            that.rightList[1].num2 = item.value
+                        }
+                        if (item.key == "通过率") {
+                            that.rightList[1].num3 = item.value
+                        }
+                    })
+                }
+            })
+        },
+        scrollChangeListW(index) {
+            let that = this;
+            if (index + 10 == that.configWritten.data.length) {
+                console.log("笔试更新");
+                that.getNoticePerson(1)
+            }
+        },
+        scrollChangeListIn(index) {
+            let that = this;
+            if (index + 10 == that.configInterview.data.length) {
+                console.log("面试更新");
+                that.getNoticePerson(2)
+            }
+        },
 
     },
 

+ 64 - 44
cokingCoal/js/newIndex.js

@@ -476,8 +476,8 @@ let app = new Vue({
             newSkillList: [],
             dataFlag: true,
 
-            
-            isShowRequest: false,
+
+            isShowRequest: true,
 
 
 
@@ -494,8 +494,8 @@ let app = new Vue({
             defeat: 0,
             showChange: false,
             fetchIndex: 0,
-            employsNums: 0,
-            selectTraining: 0,
+            employsNums: 15308,
+            selectTraining: 2807,
             technical: null,
         }
     },
@@ -531,6 +531,11 @@ let app = new Vue({
         },
     },
     mounted() {
+        let data = "0" + new Date().getMonth()
+        this.selectInfo = {
+            total: data,
+            average: data
+        }
         this.$nextTick(() => {
             this.keyDown()
             // document.documentElement.webitRequestFullScreen()
@@ -628,7 +633,7 @@ let app = new Vue({
         } else {
             this.noRequestFunction()
         }
-        setInterval(()=>{
+        setInterval(() => {
             this.SAtime && clearInterval(this.SAtime);
             this.levelTime && clearInterval(this.levelTime);
             this.downholeTime && clearInterval(this.downholeTime);
@@ -639,11 +644,11 @@ let app = new Vue({
             this.time3 && clearInterval(this.time3);
             if (this.isShowRequest) {
                 this.requestFunction()
-    
+
             } else {
                 this.noRequestFunction()
             }
-        },1000*60*60)
+        }, 1000 * 60 * 60)
 
     },
 
@@ -922,6 +927,13 @@ let app = new Vue({
         },
         selectOption(item) {
             this.selectInfo[this.selectType] = item
+            console.log(this.selectType);
+            if (this.selectType == "average") {
+                this.getCalSalary()
+            }
+            if (this.selectType == "total") {
+                this.getCalSalary1()
+            }
         },
         SAtimeFun() {
             let that = this;
@@ -1753,13 +1765,13 @@ let app = new Vue({
             let myChart = echarts.init(el)
             let img = 'image://images/newImage/data-1619059838735-QE9mBZmhh.png'
             var geoCoordMap = {
-                太原市: [112.049248, 38.157014],
-                大同市: [113.595259, 40.29031],
-                阳泉市: [113.505474, 37.964652],
-                长治市: [112.813556, 36.791112],
+                太原市: [112.049248, 37.957014],
+                大同市: [113.595259, 39.89031],
+                阳泉市: [113.505474, 38.064652],
+                长治市: [112.913556, 36.591112],
                 晋城市: [112.551274, 35.577553],
                 朔州市: [112.433387, 39.531261],
-                晋中市: [112.936465, 37.696495],
+                晋中市: [112.936465, 37.486495],
                 运城市: [111.003957, 34.99],
                 忻州市: [112.333538, 38.7769],
                 临汾市: [111.517973, 36.48415],
@@ -1938,6 +1950,7 @@ let app = new Vue({
                 effectScatterData = data
             }
             mapDate = []
+            let iconList = []
 
             const result = effectScatterData.reduce((acc, obj) => {
                 const { name, value } = obj;
@@ -1977,17 +1990,13 @@ let app = new Vue({
                         mapDate.push(obj)
                     }
                 })
+                let icon = {
+                    name: k,
+                    value: geoCoordMap[k],
+                    img
+                }
+                iconList.push(icon)
             }
-            // var domImg = document.createElement('img');
-            // domImg.style.height = domImg.height = domImg.width = domImg.style.width = '8px';
-            // domImg.src =
-            //     'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAIAAAAmKNuZAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkE4MTE0OTgyQTdDQzExRUI4Q0RBRkMwQkFGMTY2NDhEIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkE4MTE0OTgzQTdDQzExRUI4Q0RBRkMwQkFGMTY2NDhEIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QTgxMTQ5ODBBN0NDMTFFQjhDREFGQzBCQUYxNjY0OEQiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6QTgxMTQ5ODFBN0NDMTFFQjhDREFGQzBCQUYxNjY0OEQiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4v4trwAAAAVklEQVR42mL0D225cu0hAzWAjpY8C9CsL19/wIV4uDnI5gKNYmKgKhjcxrFAggBZiBIuyDhqRQWQOxoVo1ExGhWjUTEaFYMiKoB1LVq1TXZUAI0CCDAAcAlaxCt7dtQAAAAASUVORK5CYII=';
-
-            // var domImgHover = document.createElement('img');
-            // domImgHover.style.height = domImgHover.height = domImgHover.width = domImgHover.style.width = '8px';
-            // domImgHover.src =
-            //     'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAIAAAAmKNuZAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkFDQ0Q2RjYyQTdDRDExRUI4ODUxRDIxRjkzMEExNzg2IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkFDQ0Q2RjYzQTdDRDExRUI4ODUxRDIxRjkzMEExNzg2Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QUNDRDZGNjBBN0NEMTFFQjg4NTFEMjFGOTMwQTE3ODYiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6QUNDRDZGNjFBN0NEMTFFQjg4NTFEMjFGOTMwQTE3ODYiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz6FboimAAAASklEQVR42mIUnL9XtHsDAzXA69IARjWtXJYX7+FCfyQEKeEyMVAVDG7jWCB+RhaihAsybjQqRqNiNCpGo2I0KoZZVDBSt9oGCDAAhYNrvRu3DWEAAAAASUVORK5CYII=';
-
             var img2 = 'image://images/newImage/bggg.png'
 
             echarts.registerMap('shanxi', jsonData);
@@ -2054,7 +2063,7 @@ let app = new Vue({
                 geo: {
                     map: 'shanxi',
                     zoom: 1.5,
-                    layoutCenter: ['51%', '53%'],
+                    layoutCenter: ['51%', '55.5%'],
                     layoutSize: '100%',
 
                     silent: true,
@@ -2160,7 +2169,7 @@ let app = new Vue({
                         symbolSize: [200, 160],
                         symbolOffset: [0, -200],
                         z: 999,
-                        data: mapDate,
+                        data: iconList,
                     },
                     {
                         type: 'map',
@@ -2203,7 +2212,7 @@ let app = new Vue({
                                 }
                             }
                         },
-                        layoutCenter: ['50%', '52%'],
+                        layoutCenter: ['50%', '55%'],
                         layoutSize: '100%',
                         zoom: 1.5,
                         roam: false,
@@ -2240,8 +2249,8 @@ let app = new Vue({
                         },
                         symbol: 'circle',
                         symbolSize: [30, 15],
-                        data: mapDate,
-                        zlevel: 1,
+                        data: iconList,
+                        zlevel: 9,
                     },
                     {
                         type: 'scatter',
@@ -2252,8 +2261,8 @@ let app = new Vue({
                         },
                         symbolSize: [96, 123],
                         symbolOffset: [0, -75],
-                        z: 9999,
-                        data: mapDate,
+                        z: 3,
+                        data: iconList,
                     },
 
                 ],
@@ -5447,6 +5456,7 @@ let app = new Vue({
                 this.salaryFlag = false
                 this.pdfFlag = false
                 this.mobilizeFlag = true
+                this.showChange = true
             }, 10)
 
         },
@@ -5458,12 +5468,12 @@ let app = new Vue({
             this.mobilizeFlag = false
             this.echartsMark = true
             setTimeout(() => {
-                //     this.getlaborproductivity()
-                //     this.getMineEfficiency()
-                //     this.getEmpProductivity()
-                this.initBarCharts(this.$refs.works, worksList)
-                this.initBarChartsElse(this.$refs.efficiencyElse, efficiencyList, "吨/工", { name: "行业线", value: 8.2 })
-                this.initBarChartsElse(this.$refs.whole, wholeList, "吨/人", { name: "标杆矿井线", value: 1800 })
+                this.getlaborproductivity()
+                this.getMineEfficiency()
+                this.getEmpProductivity()
+                // this.initBarCharts(this.$refs.works, worksList)
+                // this.initBarChartsElse(this.$refs.efficiencyElse, efficiencyList, "吨/工", { name: "行业线", value: 8.2 })
+                // this.initBarChartsElse(this.$refs.whole, wholeList, "吨/人", { name: "标杆矿井线", value: 1800 })
             })
 
         },
@@ -5950,7 +5960,7 @@ let app = new Vue({
                                 point = geoCoordMap[k]
                             }
                         }
-                        item.data.forEach(i => { 
+                        item.data.forEach(i => {
                             let num;
                             let name;
                             i.forEach(j => {
@@ -6126,7 +6136,7 @@ let app = new Vue({
                         }
                         rankLevelList.push(obj)
                     })
-                    if(this.technical != null){
+                    if (this.technical != null) {
                         this.technical.dispose()
                     }
                     this.initChartR1(initChartR1, rankLevelList)
@@ -6286,7 +6296,7 @@ let app = new Vue({
                     that.twoTimeIndex = 0
                     that.timeTwo()
                 }
-                
+
             })
 
         },
@@ -6367,10 +6377,20 @@ let app = new Vue({
                 month: parseInt(that.selectInfo.average)
             };
             let leftEnd = that.$refs.leftEnd
+            let x = []
+            let y1 = []
+            let y2 = []
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getCalSalary", data).then(res => {
                 if (res) {
-                    leftEndList = res.data
-
+                    // leftEndList = res.data
+                    x = res.lastyear.x
+                    y1 = res.lastyear.y
+                    y2 = res.thisyear.y
+                    leftEndList = {
+                        x,
+                        y1,
+                        y2,
+                    }
                 }
                 that.initBarEchartsElse(leftEnd, leftEndList, ["累计月平均工资", "同期累计月平均工资"])
 
@@ -6386,7 +6406,7 @@ let app = new Vue({
             let echarts90 = that.$refs.echarts90
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getCalSalary1", data).then(res => {
                 if (res) {
-                    salaryList = res.data
+                    salaryList = res
                 }
                 that.sx = spArr(salaryList.x, 6)
                 that.sy = spArr(salaryList.y, 6)
@@ -6548,9 +6568,9 @@ let app = new Vue({
                         list.push([item, outList[index], inList[index], timeList[index], flagList[index],])
                     })
                     that.configChange.data = list
-                    setTimeout(()=>{
+                    setTimeout(() => {
                         that.showChange = true
-                    },10)
+                    }, 10)
                 }
             })
 
@@ -6573,7 +6593,7 @@ let app = new Vue({
                             index = index + 1
                         }
                     })
-                    if(that.fetchIndex == 3){
+                    if (that.fetchIndex == 3) {
                         return
                     }
                     if (index == 3) {