Pārlūkot izejas kodu

配合后端接口进行调整

fengxu 2 gadi atpakaļ
vecāks
revīzija
1ddc4fe25f

+ 2 - 2
cokingCoal/hr.html

@@ -71,10 +71,10 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="main_item" v-if="rollFlag">
+                        <div class="main_item" v-if="rollFlag" style="overflow: scroll;">
                             <p class="item_title">{{ rollTitle }}</p>
                             <!-- <vue-seamless-scroll v-if="rollFlag" :data="listData" class="warp" :classOption="classOption"> -->
-                            <div class="item">
+                            <div class="item" >
                                 <div class="item_con" v-for="(item,index) in recruitInfoList[recruitInfoIndex]">
                                         <span>{{ item.title }}</span>
                                         <span>{{ item.content }}</span>

+ 6 - 5
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" >
@@ -821,13 +821,14 @@
                 </div>
             </div>
             <div class="mark_pdf" v-show="pdfFlag">
-                <img src="./pdf/1.png" alt="" style="width: 100%;height: 100%;">
+                <img :src="imageUrl" alt="" style="width: 100%;height: 100%;">
+                <!-- <img src="./pdf/1.png" alt="" style="width: 100%;height: 100%;"> -->
             </div>
-            <div class="mark_main_item" v-show="mobilizeFlag">
+            <div class="mark_main_item" v-if="mobilizeFlag">
                 <div class="main_item_center flex_column">
                     <div class="mark_title">人员流动</div>
                     <div class="mark_main">
-                        <dv-scroll-board :config="configChange" style="width: 100%; height: 100%" />
+                        <dv-scroll-board :config="configChange" v-if="showChange" style="width: 100%; height: 100%" />
                     </div>
                 </div>
             </div>

+ 173 - 189
cokingCoal/js/humanResources.js

@@ -431,13 +431,13 @@ 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")
+            //     let target = itemContent.getElementsByClassName("row-item")
+            //     let targetList = target.item(0)
+            //     targetList.style.background = "#302e2d50"
+            //     targetList.style.color = "#E1AF27"
+            // }, 0)
             setTimeout(() => {
                 that.classChange = true
             }, 5000);
@@ -492,51 +492,51 @@ 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()
-                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 => {
+        // 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()
+        //         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
 
             let pageBtm = this.$refs.pageBtm
@@ -545,7 +545,7 @@ let app = new Vue({
             let vita = this.$refs.vita
             that.initVitaEcharts(vita)
             that.getPostDetail()
-        })
+        // })
     },
     methods: {
         // 监听键盘
@@ -2186,7 +2186,13 @@ let app = new Vue({
                 that.config1.data = list
                 that.recruitInfoList.push(...a)
                 that.isShowInfoList = true
-                console.log(that.recruitInfoList);
+                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)
             })
 
 
@@ -2194,144 +2200,122 @@ let app = new Vue({
         },
         getHalfYearDelivcv() {
             let that = this;
-            let data = {};
-            // fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/HalfYearDelivcv",data).then(res=>{
-            //     console.log(res);
-            // })
-            let res = {
-                data: [
-                    {
-                        2: 90
-                    },
-                    {
-                        3: 58
-                    },
-                    {
-                        4: 100
-                    },
-                    {
-                        5: 30
-                    },
-                    {
-                        6: 10
-                    },
-                    {
-                        7: 30
-                    }
-                ]
-            }
-            let vita = this.$refs.vita
-            let nameList = [];
-            let valueList = [];
-            res.data.forEach(item => {
-                for (let k in item) {
-                    nameList.push(k + "月")
-                    valueList.push(item[k])
+            let data = {
+                flag: true
+            };
+            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/HalfYearDelivcv", data).then(res => {
+                if(res){
+                    let list = []
+                    res.forEach(item=>{
+                        if(item.key == "月份"){
+                            // that.vitaData.x = item.value
+                            item.value.forEach(i=>{
+                                list.push(i + "月")
+
+                            })
+                        }
+                        if(item.key == "数量"){
+                            that.vitaData.y = item.value
+                        }
+                    })
+                    that.vitaData.x = list
+                    let vita = this.$refs.vita
+                    that.initVitaEcharts(vita)
                 }
-            })
-            that.vitaData.x = nameList
-            that.vitaData.y = valueList
-            that.initVitaEcharts(vita)
+                
 
+            })
         },
         getHotDelivcv() {
             let that = this;
-            let data = {};
-            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/HotDelivcv", data).then(res => { })
-            let res = {
-                data: [
-                    [
-                        "山西焦煤集团有限责任公司",
-                        "营运部长",
-                        35
-                    ],
-                    [
-                        "山西焦煤集团有限责任公司",
-                        "合同管理员",
-                        24
-                    ],
-                    [
-                        "",
-                        "java开发",
-                        7
-                    ]
-                ]
-            }
-            that.typeList.data = res.data
+            let data = {
+                flag: true
+            };
+            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/HotDelivcv", data).then(res => {
+                if(res){
+                    that.typeList.data = res.data
+                    console.log(that.typeList.data);
+                }
+            })
+
 
         },
         arrToListArr() {
             this.isChangeList = false
-            let arr = [
-                {
-                    value: [
-                        "http://localhost:8080/ierp/attachment/downloadImage/fe1bc8750ca94a95bf9c6a64579a7cca.jpg",
-                        "http://localhost:8080/ierp/attachment/downloadImage/",
-                        "http://localhost:8080/ierp/attachment/downloadImage/fe1bc8750ca94a95bf9c6a64579a7cca.jpg",
-                        "http://localhost:8080/ierp/attachment/downloadImage/fe1bc8750ca94a95bf9c6a64579a7cca.jpg"
-
-                    ],
-                    key: "头像地址"
-                },
-                {
-                    value: [
-                        "胡军军",
-                        "胡军军",
-                        "胡军军",
-                        "测试触发003"
-                    ],
-                    key: "姓名"
-                },
-                {
-                    value: [
-                        "java开发",
-                        "java开发",
-                        "java开发",
-                        "123"
-                    ],
-                    key: "投递岗位"
-                },
-                {
-                    value: [
-                        "2022-10-19",
-                        "2023-08-27",
-                        "2023-08-27",
-                        "2023-08-27"
-                    ],
-                    key: "申请时间"
-                }
-            ]
+            // let arr = [
+            //     {
+            //         value: [
+            //             "http://localhost:8080/ierp/attachment/downloadImage/fe1bc8750ca94a95bf9c6a64579a7cca.jpg",
+            //             "http://localhost:8080/ierp/attachment/downloadImage/",
+            //             "http://localhost:8080/ierp/attachment/downloadImage/fe1bc8750ca94a95bf9c6a64579a7cca.jpg",
+            //             "http://localhost:8080/ierp/attachment/downloadImage/fe1bc8750ca94a95bf9c6a64579a7cca.jpg"
+
+            //         ],
+            //         key: "头像地址"
+            //     },
+            //     {
+            //         value: [
+            //             "胡军军",
+            //             "胡军军",
+            //             "胡军军",
+            //             "测试触发003"
+            //         ],
+            //         key: "姓名"
+            //     },
+            //     {
+            //         value: [
+            //             "java开发",
+            //             "java开发",
+            //             "java开发",
+            //             "123"
+            //         ],
+            //         key: "投递岗位"
+            //     },
+            //     {
+            //         value: [
+            //             "2022-10-19",
+            //             "2023-08-27",
+            //             "2023-08-27",
+            //             "2023-08-27"
+            //         ],
+            //         key: "申请时间"
+            //     }
+            // ]
             let that = this;
-            let data = {}
-            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/Delivcv", data).then(res => { })
-            let imageList = []
-            let nameList = []
-            let stationList = []
-            let timeList = []
-            let dataList = []
-            arr.forEach(item => {
-                if (item.key == "头像地址") {
-                    imageList.push(...item.value)
-                }
-                if (item.key == "姓名") {
-                    nameList.push(...item.value)
-                }
-                if (item.key == "投递岗位") {
-                    stationList.push(...item.value)
-                }
-                if (item.key == "申请时间") {
-                    timeList.push(...item.value)
-                }
-            })
-            nameList.forEach((item, index) => {
-                dataList.push(["<img class='list_img' src='" + imageList[index] + "' alt=''>", item, stationList[index], timeList[index]])
+            let data = {
+                flag: true
+            }
+            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/Delivcv", data).then(res => {
+                let imageList = []
+                let nameList = []
+                let stationList = []
+                let timeList = []
+                let dataList = []
+                res.data.forEach(item => {
+                    if (item.key == "头像地址") {
+                        imageList.push(...item.value)
+                    }
+                    if (item.key == "姓名") {
+                        nameList.push(...item.value)
+                    }
+                    if (item.key == "投递岗位") {
+                        stationList.push(...item.value)
+                    }
+                    if (item.key == "申请时间") {
+                        timeList.push(...item.value)
+                    }
+                })
+                nameList.forEach((item, index) => {
+                    dataList.push(["<img class='list_img' src='" + imageList[index] + "' alt=''>", item, stationList[index], timeList[index]])
+                })
+                this.configMark.data = dataList
+                this.isChangeList = true
+                delete imageList
+                delete nameList
+                delete stationList
+                delete timeList
             })
-            this.configMark.data = dataList
-            this.isChangeList = true
-            delete imageList
-            delete nameList
-            delete stationList
-            delete timeList
+
         },
 
         getDelivcvAndApply() {
@@ -2347,7 +2331,7 @@ let app = new Vue({
                         if (item.key == "单位名称") {
                             admissionList.x = item.value
                         }
-                        if (item.key == "双选人数") {
+                        if (item.key == "招聘人数") {
                             admissionList.y1 = item.value
                         }
                         if (item.key == "报名人数") {
@@ -2407,9 +2391,9 @@ let app = new Vue({
             let data = {
                 flag: true
             }
-            // fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/RecruitType",data).then(res => {
-            //     console.log(res);
-            // })
+            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/RecruitType",data).then(res => {
+                console.log(res);
+            })
         },
         getFailReason() {
             let that = this;
@@ -2520,9 +2504,9 @@ let app = new Vue({
             this.initLineRight(rightFour, { value: dataList[3].value, total })
             let rightFive = this.$refs.rightFive
             this.initLineRight(rightFive, { value: dataList[4].value, total })
-            // fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/FailReason",data).then(res => {
-            //     console.log(res);
-            // })
+            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/FailReason",data).then(res => {
+                console.log(res);
+            })
         },
         getQualAudits() {
             let that = this;
@@ -2762,7 +2746,7 @@ let app = new Vue({
                 flag: true
             }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/DoubleChoice", data).then(res => {
-                console.log(res);
+                // console.log(res);
             })
         }
 

+ 246 - 122
cokingCoal/js/newIndex.js

@@ -475,9 +475,28 @@ let app = new Vue({
             },
             newSkillList: [],
             dataFlag: true,
-            isShowRequest: true,
+
+            
+            isShowRequest: false,
+
+
+
             isShowPage: true,
-            industryEcharts: null
+            industryEcharts: null,
+            userListX: [],
+            userListy1: [],
+            userListy2: [],
+            userListy3: [],
+            userIndex: 0,
+            timeUserList: null,
+            stereoscopic: undefined,
+            imageUrl: "./pdf/1.png",
+            defeat: 0,
+            showChange: false,
+            fetchIndex: 0,
+            employsNums: 0,
+            selectTraining: 0,
+            technical: null,
         }
     },
     beforeCreate() {
@@ -597,7 +616,7 @@ let app = new Vue({
 
 
 
-        setInterval(() => {
+        let changeData = setInterval(() => {
             this.getAccumulatedLogin()
             this.getMauInfo()
             console.log("数据更新每五分钟一次");
@@ -608,14 +627,37 @@ let app = new Vue({
 
         } else {
             this.noRequestFunction()
-
         }
+        setInterval(()=>{
+            this.SAtime && clearInterval(this.SAtime);
+            this.levelTime && clearInterval(this.levelTime);
+            this.downholeTime && clearInterval(this.downholeTime);
+            this.twoTime && clearInterval(this.twoTime);
+            this.timeUserList && clearInterval(this.timeUserList);
+            // this.timeTitle && clearInterval(this.timeTitle);
+            this.time2 && clearInterval(this.time2);
+            this.time3 && clearInterval(this.time3);
+            if (this.isShowRequest) {
+                this.requestFunction()
+    
+            } else {
+                this.noRequestFunction()
+            }
+        },1000*60*60)
 
     },
 
     methods: {
         handleChangeData() {
             this.isShowPage = false;
+            this.SAtime && clearInterval(this.SAtime);
+            this.levelTime && clearInterval(this.levelTime);
+            this.downholeTime && clearInterval(this.downholeTime);
+            this.twoTime && clearInterval(this.twoTime);
+            this.timeUserList && clearInterval(this.timeUserList);
+            // this.timeTitle && clearInterval(this.timeTitle);
+            this.time2 && clearInterval(this.time2);
+            this.time3 && clearInterval(this.time3);
             this.requestFunction()
             setTimeout(() => {
                 this.isShowPage = true;
@@ -757,6 +799,7 @@ let app = new Vue({
                     this.getDownholeoperationFlase()
 
                     this.getTurnOverDetail()
+                    this.getDistributionAttachment()
 
 
                     this.getDept(true)
@@ -941,14 +984,14 @@ let app = new Vue({
 
                     this.downholeObj = {
                         key: "集团公司",
-                        value: 15396
+                        value: that.employsNums
                     }
                     this.initDownholeEcharts(efficiency, { x: downhole.x, y: [downhole.y[4], downhole.y[5]] }, 2)
                     that.downholeIndex = 2
                 } else if (that.downholeIndex == 2) {
                     this.downholeObj = {
                         key: "选拔培养",
-                        value: 2807
+                        value: that.selectTraining
                     }
                     this.initDownholeEcharts(efficiency, { x: downhole.x, y: [downhole.y[0], downhole.y[1], downhole.y[2], downhole.y[3]] }, 1)
                     that.downholeIndex = 1
@@ -977,6 +1020,7 @@ let app = new Vue({
                     if (that.twoTimeIndex == that.nx2.length - 1) {
                         that.twoTimeIndex = 0
                         that.twoIndex = 1
+                        console.log(that.twoTimeIndex);
                         that.initTwoBarEcharts(echartTwo, { x: that.nx1[that.twoTimeIndex], y: that.ny1[that.twoTimeIndex] })
                         return
                     } else {
@@ -986,6 +1030,27 @@ let app = new Vue({
                 }
             }, 8000)
         },
+        // 人才市场定时器
+        timeuserList() {
+            let that = this;
+            this.timeUserList = setInterval(() => {
+                this.timeUserList && clearInterval(this.timeUserList);
+                this.timeuserList()
+                let buffer = that.$refs.buffer
+                that.stereoscopic.dispose();
+                if (that.userIndex >= that.userListX.length - 1) {
+                    that.userIndex = 0
+                    // this.userListX = spArr(userList.x,9)
+                    // this.userListy1 = spArr(userList.y1,9)
+                    // this.userListy2 = spArr(userList.y2,9)
+                    // this.userListy3 = spArr(userList.y3,9)
+                    that.initStereoscopic(buffer, { x: that.userListX[that.userIndex], y1: that.userListy1[that.userIndex], y2: that.userListy2[that.userIndex], y3: that.userListy3[that.userIndex] })
+                } else {
+                    that.userIndex += 1
+                    that.initStereoscopic(buffer, { x: that.userListX[that.userIndex], y1: that.userListy1[that.userIndex], y2: that.userListy2[that.userIndex], y3: that.userListy3[that.userIndex] })
+                }
+            }, 18000)
+        },
         // 针对学历结构的定时器
         timeNt() {
             let that = this;
@@ -2386,7 +2451,7 @@ let app = new Vue({
             value: 7350,
         },
         ]) {
-            let myChart = echarts.init(el)
+            this.technical = echarts.init(el)
             let objData = {}
             let sum = 0
             data.forEach(item => {
@@ -2492,7 +2557,7 @@ let app = new Vue({
                             show: false
                         }
                     },
-                    data: echarts2,
+                    data: data,
                     emphasis: {
                         scaleSize: 15, // 设置放大倍数
                     },
@@ -2513,14 +2578,14 @@ let app = new Vue({
                 },],
             }
 
-            myChart.setOption(option)
-            tools.loopShowTooltip(myChart, option, {
+            this.technical.setOption(option)
+            tools.loopShowTooltip(this.technical, option, {
                 nterval: 2000,
                 loopSeries: true,
             });
-            window.addEventListener("resize", function () {
-                myChart.resize();
-            });
+            // window.addEventListener("resize", function () {
+            //     myChart.resize();
+            // });
         },
         initChartsBig(arr = [{
             name: '研究生及以上',
@@ -3284,14 +3349,15 @@ let app = new Vue({
             let chart = echarts.init(el);
             var scale = 2;
             var singleData = data.y1;
-            var multipleData = data.y2
-            // data.y1.forEach(item => {
-            //     max = max + item
-            // })
-            // data.y1.forEach(item => {
-            //     let num = ((item / max) * 100).toFixed(2)
-            //     multipleData.push(num)
-            // })
+            var multipleData = []
+            let max = 0;
+            data.y1.forEach(item => {
+                max = max + item
+            })
+            data.y1.forEach(item => {
+                let num = ((item / max) * 100).toFixed(2)
+                multipleData.push(num)
+            })
             var color = "#fff";
             option = {
                 tooltip: {
@@ -3680,7 +3746,7 @@ let app = new Vue({
             });
         },
         initStereoscopic(el, data) {
-            let chart = echarts.init(el);
+            this.stereoscopic = echarts.init(el);
             option = {
                 tooltip: {
                     show: true,
@@ -3841,14 +3907,14 @@ let app = new Vue({
 
                 ]
             }
-            chart.setOption(option);
-            tools.loopShowTooltip(chart, option, {
+            this.stereoscopic.setOption(option);
+            tools.loopShowTooltip(this.stereoscopic, option, {
                 nterval: 2000,
                 loopSeries: true,
             });
-            window.addEventListener("resize", function () {
-                chart.resize();
-            });
+            // window.addEventListener("resize", function () {
+            //     chart.resize();
+            // });
         },
         initHorizontalBar(el) {
             let chart = echarts.init(el);
@@ -4990,11 +5056,14 @@ let app = new Vue({
                 ],
             };
             this.mobilizeFL.on('click', function (params) {
+                that.getTurnOverDetail(params.name)
                 // 获取点击事件的参数信息
-                that.isShowMark = true
-                that.salaryFlag = false
-                that.pdfFlag = false
-                that.mobilizeFlag = true
+                setTimeout(() => {
+                    that.isShowMark = true
+                    that.salaryFlag = false
+                    that.pdfFlag = false
+                    that.mobilizeFlag = true
+                }, 10)
                 // 在这里进行相应的处理逻辑
             });
             this.mobilizeFL.setOption(option);
@@ -5372,10 +5441,14 @@ let app = new Vue({
         },
 
         handleUserChange() {
-            this.isShowMark = true
-            this.salaryFlag = false
-            this.pdfFlag = false
-            this.mobilizeFlag = true
+            this.getTurnOverDetail()
+            setTimeout(() => {
+                this.isShowMark = true
+                this.salaryFlag = false
+                this.pdfFlag = false
+                this.mobilizeFlag = true
+            }, 10)
+
         },
 
         handleMore() {
@@ -5395,16 +5468,20 @@ let app = new Vue({
 
         },
         getAccumulatedLogin() {
-            let data = {}
             let that = this
+            let data = {
+                flag: that.dataFlag
+            }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/AccumulatedLogin", data).then(res => {
                 that.loginInfo.num = res.accumulatedLogin
                 that.loginInfo.unit = res.unit
             })
         },
         getMauInfo() {
-            let data = {}
             let that = this;
+            let data = {
+                flag: that.dataFlag
+            }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/MAU", data).then(res => {
                 that.mauInfo.mau = res.mau
                 that.mauInfo.unit = res.unit
@@ -5506,7 +5583,9 @@ let app = new Vue({
         },
         getlaborproductivity() {
             let that = this;
-            let data = {};
+            let data = {
+                flag: that.dataFlag
+            }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/laborproductivity", data).then(res => {
                 let markLine = []
                 if (res.data) {
@@ -5538,7 +5617,9 @@ let app = new Vue({
         },
         getMineEfficiency() {
             let that = this;
-            let data = {};
+            let data = {
+                flag: that.dataFlag
+            }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/MineEfficiency", data).then(res => {
                 let obj = {}
                 if (res != null) {
@@ -5569,7 +5650,9 @@ let app = new Vue({
         },
         getEmpProductivity() {
             let that = this;
-            let data = {}
+            let data = {
+                flag: that.dataFlag
+            }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/EmpProductivity", data).then(res => {
                 let obj = {}
                 if (res != null) {
@@ -5631,7 +5714,9 @@ let app = new Vue({
         },
         getCollegeinternAndEnterpriseship() {
             let that = this;
-            let data = {};
+            let data = {
+                flag: that.dataFlag
+            }
             let student = this.$refs.student
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/CollegeinternAndEnterpriseship", data).then(res => {
                 if (res) {
@@ -5667,7 +5752,9 @@ let app = new Vue({
         },
         getCollegestudy() {
             let that = this;
-            let data = {};
+            let data = {
+                flag: that.dataFlag
+            }
             let proList = [];
             let schList = [];
             let typeList = [];
@@ -5823,9 +5910,15 @@ let app = new Vue({
                             userList.y3 = item.value
                         }
                     })
+                    that.userListX = spArr(userList.x, 9)
+                    that.userListy1 = spArr(userList.y1, 9)
+                    that.userListy2 = spArr(userList.y2, 9)
+                    that.userListy3 = spArr(userList.y3, 9)
+                    let buffer = that.$refs.buffer
+                    that.initStereoscopic(buffer, { x: that.userListX[0], y1: that.userListy1[0], y2: that.userListy2[0], y3: that.userListy3[0], })
+                    that.timeuserList()
                 }
-                let buffer = that.$refs.buffer
-                this.initStereoscopic(buffer, userList)
+
             })
         },
         getMapData() {
@@ -5857,7 +5950,7 @@ let app = new Vue({
                                 point = geoCoordMap[k]
                             }
                         }
-                        item.data.forEach(i => {
+                        item.data.forEach(i => { 
                             let num;
                             let name;
                             i.forEach(j => {
@@ -6033,9 +6126,10 @@ let app = new Vue({
                         }
                         rankLevelList.push(obj)
                     })
+                    if(this.technical != null){
+                        this.technical.dispose()
+                    }
                     this.initChartR1(initChartR1, rankLevelList)
-                } else {
-                    this.initChartR1(initChartR1)
                 }
             })
         },
@@ -6053,16 +6147,15 @@ let app = new Vue({
                             downhole.x = item.value
                         }
                         if (item.key == "井下一线") {
-                            downhole.y[2] = item.value
+                            downhole.y[4] = item.value
                         }
                         if (item.key == "井下辅助") {
-                            downhole.y[3] = item.value
+                            downhole.y[5] = item.value
                         }
                     })
-                    this.initDownholeEcharts(efficiency, { x: downhole.x, y: [downhole.y[0], downhole.y[1]] }, 1)
-
+                    // this.initDownholeEcharts(efficiency, { x: downhole.x, y: [downhole.y[4], downhole.y[5]] }, 1)
                 } else {
-                    this.initDownholeEcharts(efficiency, { x: downhole.x, y: [downhole.y[0], downhole.y[1]] }, 1)
+                    // this.initDownholeEcharts(efficiency, { x: downhole.x, y: [downhole.y[4], downhole.y[5]] }, 1)
 
                 }
             })
@@ -6073,33 +6166,50 @@ let app = new Vue({
                 flag: that.dataFlag
             }
             let efficiency = this.$refs.efficiency
-            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/GrassRoots", data).then(res => {
+            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/SelectTraining", data).then(res => {
                 if (res) {
                     res.data.forEach(item => {
-                        if (item.key == "组织") {
+                        if (item.key == "组织名称") {
                             downhole.x = item.value
                         }
-                        if (item.key == "基层正职") {
+                        if (item.key == "一级专员") {
                             downhole.y[0] = item.value
                         }
-                        if (item.key == "基层副职") {
+                        if (item.key == "二级专员") {
                             downhole.y[1] = item.value
                         }
+                        if (item.key == "一级技工") {
+                            downhole.y[2] = item.value
+                        }
+                        if (item.key == "二级技工") {
+                            downhole.y[3] = item.value
+                        }
+                        if (item.key == "选拔培训") {
+                            that.downholeObj = {
+                                key: "选拔培养",
+                                value: item.value
+                            }
+                            that.selectTraining = item.value
+                        }
                     })
+                    this.initDownholeEcharts(efficiency, { x: downhole.x, y: [downhole.y[0], downhole.y[1], downhole.y[2], downhole.y[3]] }, 1)
+                    this.getFrontLine()
                 }
-                this.initDownholeEcharts(efficiency, { x: downhole.x, y: [downhole.y[0], downhole.y[1]] }, 1)
-                this.getFrontLine()
+
             })
             this.downholeTimes()
 
         },
         getEmploysNums() {
             let that = this;
-            let data = {};
+            let data = {
+                flag: that.dataFlag
+            };
 
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/EmploysNums", data).then(res => {
                 if (res) {
                     that.downholeObj = res
+                    that.employsNums = res.value
                 }
             })
         },
@@ -6170,12 +6280,13 @@ let app = new Vue({
                             that.echartTwoList.y = item.value
                         }
                     })
-
+                    that.nx1 = spArr(that.echartTwoList.x, 5)
+                    that.ny1 = spArr(that.echartTwoList.y, 5)
+                    that.initTwoBarEcharts(echartTwo, { x: that.nx1[0], y: that.ny1[0] })
+                    that.twoTimeIndex = 0
+                    that.timeTwo()
                 }
-                that.nx1 = spArr(that.echartTwoList.x, 5)
-                that.ny1 = spArr(that.echartTwoList.y, 5)
-                that.initTwoBarEcharts(echartTwo, { x: that.nx1[0], y: that.ny1[0] })
-                that.timeTwo()
+                
             })
 
         },
@@ -6243,10 +6354,11 @@ let app = new Vue({
                         obj.y.push(item.value)
                     })
                     that.echartsTwoBar2 = JSON.parse(JSON.stringify(obj))
+                    that.seniorityListX = spArr(that.echartsTwoBar2.x, 4)
+                    that.seniorityListY = spArr(that.echartsTwoBar2.y, 4)
                 }
             })
-            that.seniorityListX = spArr(that.echartsTwoBar2.x, 4)
-            that.seniorityListY = spArr(that.echartsTwoBar2.y, 4)
+
         },
         getCalSalary() {
             let that = this;
@@ -6258,9 +6370,11 @@ let app = new Vue({
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getCalSalary", data).then(res => {
                 if (res) {
                     leftEndList = res.data
+
                 }
                 that.initBarEchartsElse(leftEnd, leftEndList, ["累计月平均工资", "同期累计月平均工资"])
 
+
             })
         },
         getCalSalary1() {
@@ -6386,96 +6500,106 @@ let app = new Vue({
 
 
         },
-        getTurnOverDetail() {
+        getTurnOverDetail(orgName = null) {
             let that = this;
             let data = {
                 flag: that.dataFlag,
+                orgName,
             }
-            // fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/TurnOverDetail",data).then(res => {
-            //     console.log(res);
-            // })
-            let res = {
-                data: [
-                    { value: ["张三", "孙七"], key: "姓名" },
-                    { value: ["山焦华晋", "6"], key: "调出单位" },
-                    { value: ["山焦盐化", "7"], key: "调入单位" },
-                    { value: ["2023-09-07 00:00:00", "2023-09-07 00:00:00"], key: "调动时间" },
-                    { value: ["变动完成", "9"], key: "变动状态" }]
-            }
-            let list = []
-            let nameList = []
-            let outList = []
-            let inList = []
-            let timeList = []
-            let flagList = []
-            // header: ["姓名", "调出单位", "调入单位", "调动时间", '变动状态',],
-            res.data.forEach((item) => {
-                if (item.key == "姓名") {
-                    item.value.forEach((i) => {
-                        nameList.push(i)
-                    })
-                }
-                if (item.key == "调出单位") {
-                    item.value.forEach((i) => {
-                        outList.push(i)
-                    })
-                }
-                if (item.key == "调入单位") {
-                    item.value.forEach((i) => {
-                        inList.push(i)
-                    })
-                }
-                if (item.key == "调动时间") {
-                    item.value.forEach((i) => {
-                        timeList.push(i)
+            that.showChange = false
+            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/TurnOverDetail", data).then(res => {
+                // console.log(res);
+                if (res) {
+                    let list = []
+                    let nameList = []
+                    let outList = []
+                    let inList = []
+                    let timeList = []
+                    let flagList = []
+                    // header: ["姓名", "调出单位", "调入单位", "调动时间", '变动状态',],
+                    res.data.forEach((item) => {
+                        if (item.key == "姓名") {
+                            item.value.forEach((i) => {
+                                nameList.push(i)
+                            })
+                        }
+                        if (item.key == "调出单位") {
+                            item.value.forEach((i) => {
+                                outList.push(i)
+                            })
+                        }
+                        if (item.key == "调入单位") {
+                            item.value.forEach((i) => {
+                                inList.push(i)
+                            })
+                        }
+                        if (item.key == "调动时间") {
+                            item.value.forEach((i) => {
+                                timeList.push(i)
+                            })
+                        }
+                        if (item.key == "变动状态") {
+                            item.value.forEach((i) => {
+                                flagList.push(i)
+                            })
+                        }
                     })
-                }
-                if (item.key == "变动状态") {
-                    item.value.forEach((i) => {
-                        flagList.push(i)
+                    nameList.forEach((item, index) => {
+                        list.push([item, outList[index], inList[index], timeList[index], flagList[index],])
                     })
+                    that.configChange.data = list
+                    setTimeout(()=>{
+                        that.showChange = true
+                    },10)
                 }
             })
-            nameList.forEach((item, index) => {
-                list.push([item, outList[index], inList[index], timeList[index], flagList[index],])
-            })
+
         },
         getDept(flag) {
             let that = this;
             let data = {
                 flag: that.dataFlag
             }
-
             if (!flag) {
                 data.flag = false
             }
-
             let index = 0
-
-
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/Dept", data).then(res => {
                 if (res) {
                     res.data.forEach(item => {
                         item.flag = false
                         item.name = item.key
-                        if(item.value == 0){
+                        if (item.value == 0) {
                             index = index + 1
                         }
                     })
-
-                    if(index == 3){
+                    if(that.fetchIndex == 3){
+                        return
+                    }
+                    if (index == 3) {
+                        that.fetchIndex += 1
                         that.getDept(false)
                         return
                     }
-
-
                     res.data[0].flag = true
                     that.organizationList = res.data
                     that.getDistributionInfo()
-                } 
+                }
+            })
+        },
+        getDistributionAttachment() {
+            let that = this;
+            let data = {
+                flag: that.dataFlag
+            };
+            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/DistributionAttachment", data).then(res => {
+                if (res) {
+                    that.imageUrl = res.url
+                }
             })
         },
 
     },
 
-})
+})
+

+ 1 - 1
cokingCoal/js/request.js

@@ -14,7 +14,7 @@ function isLocalEnv() {
 
 
 
-window.apiType = "dev"  // dev 本地测试 ,  sit  线上测试  uat  客户测试环境
+window.apiType = "sit"  // dev 本地测试 ,  sit  线上测试  uat  客户测试环境
 window.fetchUrl = ""
 // window.fetchUrl = "http://172.21.9.236:8081"
 

+ 1 - 1
cokingCoal/styles/newIndex.css

@@ -1064,7 +1064,7 @@ img {
 }
 
 .mark_pdf {
-    width: 2176px;
+    /* width: 2176px; */
     height: 1500px;
     background: url("../images/markBG.png") no-repeat;
     background-size: 100% 100%;