对接焦煤正式环境

cokingCoal/hr.html

@@ -80,41 +80,41 @@
                                     <span>{{ item.content }}</span>
                                 </div> -->
                                 <p class="item_con">
-                                        <span>一、双选原则</span>
-                                        <span>公开报名、集中面试，公平竞争、择优录用。</span>
-                                    </p>
-                                    <p class="item_con">
-                                        <span>二、双选对象</span>
-                                        <span>具有全日制普通高等教育大专及以上学历的男性毕业生，<br>其中：<br>全日制学历为研究生的年龄原则上不超过35周岁（1988年1月1日之后出生），<br>全日制学历为研究生以下的年龄原则上不超过30周岁（1993年1月1日之后出生）。</span>
-                                    </p>
-                                    <p class="item_con">
-                                        <span>三、双选人数</span>
-                                        <span>共计50人。</span>
-                                    </p>
-                                    <p class="item_con">
-                                        <span>四、工作地点</span>
-                                        <span>{{ address}}</span>
-                                    </p>
-                                    <p class="item_con">
-                                        <span>五、双选条件</span>
-                                        <span>（一）遵纪守法，无犯罪记录，无严重不良信用记录，无重大处分。<br>
-                                            （二）品学兼优、吃苦耐劳、责任心强，认同山西焦煤企业文化。<br>
-                                            （三）应届毕业生须在2023年8月31日前取得相应学历，具备就业资格。<br>
-                                            （四）身心健康，服从分配，能够胜任岗位工作要求。</span>
-                                    </p>
-                                    <p class="item_con">
-                                        <span>六、报名方式</span>
-                                        <span>通过人力资源系统岗位双选服务平台或人才中心服务大厅进行报名，报名时间为：2023年8月05日8：00至2023年8月12日18：00。</span>
-                                    </p>
-                                    <p class="item_con">
-                                        <span>七、双选流程</span>
-                                        <span>本次双选按照发布岗位需求、员工自助报名、汇总整理简历、资格条件审查、综合测试评价、双选结果公示、人事关系办理等流程进行。</span>
-                                    </p>
-                                    <p class="item_con">
-                                        <span>八、有关说明</span>
-                                        <span>（一）每位应聘者只可投报一个单位，请勿重复或多次报名。<br>
-                                            （二）应聘者须如实提供有关信息和材料，凡因本人填写信息错误而导致的一切后果自行承担；如有弄虚作假行为，一经查实即取消应聘资格。</span>
-                                    </p>
+                                    <span>一、双选原则</span>
+                                    <span>公开报名、集中面试，公平竞争、择优录用。</span>
+                                </p>
+                                <p class="item_con">
+                                    <span>二、双选对象</span>
+                                    <span>具有全日制普通高等教育大专及以上学历的男性毕业生，<br>其中：<br>全日制学历为研究生的年龄原则上不超过35周岁（1988年1月1日之后出生），<br>全日制学历为研究生以下的年龄原则上不超过30周岁（1993年1月1日之后出生）。</span>
+                                </p>
+                                <p class="item_con">
+                                    <span>三、双选人数</span>
+                                    <span>共计50人。</span>
+                                </p>
+                                <p class="item_con">
+                                    <span>四、工作地点</span>
+                                    <span>{{ address}}</span>
+                                </p>
+                                <p class="item_con">
+                                    <span>五、双选条件</span>
+                                    <span>（一）遵纪守法，无犯罪记录，无严重不良信用记录，无重大处分。<br>
+                                        （二）品学兼优、吃苦耐劳、责任心强，认同山西焦煤企业文化。<br>
+                                        （三）应届毕业生须在2023年8月31日前取得相应学历，具备就业资格。<br>
+                                        （四）身心健康，服从分配，能够胜任岗位工作要求。</span>
+                                </p>
+                                <p class="item_con">
+                                    <span>六、报名方式</span>
+                                    <span>通过人力资源系统岗位双选服务平台或人才中心服务大厅进行报名，报名时间为：2023年8月05日8：00至2023年8月12日18：00。</span>
+                                </p>
+                                <p class="item_con">
+                                    <span>七、双选流程</span>
+                                    <span>本次双选按照发布岗位需求、员工自助报名、汇总整理简历、资格条件审查、综合测试评价、双选结果公示、人事关系办理等流程进行。</span>
+                                </p>
+                                <p class="item_con">
+                                    <span>八、有关说明</span>
+                                    <span>（一）每位应聘者只可投报一个单位，请勿重复或多次报名。<br>
+                                        （二）应聘者须如实提供有关信息和材料，凡因本人填写信息错误而导致的一切后果自行承担；如有弄虚作假行为，一经查实即取消应聘资格。</span>
+                                </p>
                             </div>
                             <!-- </vue-seamless-scroll> -->
                         </div>
@@ -147,16 +147,16 @@
                     <div class="main_item " style="width: 100%;background: none;">
                         <!-- <div class="main_item_title">笔试安排</div> -->
                         <div class="main_item_main" style="height: 100%;">
-                            <dv-scroll-board v-if="showExamination" :config="configWritten"  @scroll-change="scrollChangeListW"
-                                style="width: 100%; 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" style="height: 100%;">
-                            <dv-scroll-board v-if="showInterview" :config="configInterview" @scroll-change="scrollChangeListIn"
-                                style="width: 100%; height: 100%" />
+                            <dv-scroll-board v-if="showInterview" :config="configInterview"
+                                @scroll-change="scrollChangeListIn" style="width: 100%; height: 100%" />
                         </div>
                         <!-- <div class="changeTime" @click="handleMonth()">
                                 <img class="humanResources_times" src="./images/humanResources/time.png" alt="">
@@ -309,15 +309,15 @@
                         <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" @scroll-change="scrollChangeListW"
-                                    style="width: 100%; height: 100%" />
+                                <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" @scroll-change="scrollChangeListIn"
-                                    style="width: 100%; height: 100%" />
+                                <dv-scroll-board v-if="showInterview" :config="configInterview"
+                                    @scroll-change="scrollChangeListIn" style="width: 100%; height: 100%" />
                             </div>
                             <!-- <div class="changeTime" @click="handleMonth()">
                                 <img class="humanResources_times" src="./images/humanResources/time.png" alt="">
@@ -334,7 +334,7 @@
                             <!-- <vue-seamless-scroll :data="listData" class="warp" :classOption="classOption"> -->
                             <!-- <div class="item" v-if="noticeList.length == 0"> -->
                             <div class="item" v-if="noticList[noticIndex]">
-                                <p class="item_title">{{ noticList[noticIndex].noticeDataList.title  }}</p>
+                                <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>
@@ -347,7 +347,8 @@
 
                                 </p> -->
                                 <div class="item_con">
-                                    <span class="item_con_main">{{ noticList[noticIndex].noticeDataList.mdnb_noticecontent }}</span>
+                                    <span class="item_con_main">{{
+                                        noticList[noticIndex].noticeDataList.mdnb_noticecontent }}</span>
                                 </div>
                             </div>
 
@@ -370,12 +371,13 @@
             <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% - 0px);">
+                        <div class="title" style="width: 70%;height: 65px;margin-left: -30%;">录用公示</div>
                         <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"> -->
-                                <div class="item" v-if="noticList[noticIndex]">
-                                    <p class="item_title">{{ noticList[noticIndex].noticeDataList.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>
@@ -386,10 +388,11 @@
                                         受理电话：0351-8305319<br>
     
                                     </p> -->
-                                    <div class="item_con">
-                                        <span class="item_con_main">{{ noticList[noticIndex].noticeDataList.mdnb_noticecontent }}</span>
-                                    </div>
+                                <div class="item_con">
+                                    <span class="item_con_main">{{
+                                        noticList[noticIndex].noticeDataList.mdnb_noticecontent }}</span>
                                 </div>
+                            </div>
 
                             <!-- </vue-seamless-scroll> -->
                         </div>

cokingCoal/index.html

@@ -815,6 +815,7 @@
         </div>
         <div class="mark_box" v-if="isShowMark" @click="handleMark()">
             <div class="mark_centter flex_column" v-if="salaryFlag">
+                <!-- 薪酬低于4000 -->
                 <div class="mark_title">薪酬预警</div>
                 <div class="mark_main">
                     <dv-scroll-board v-if="salaryFlag" :config="configMark" style="width: 100%; height: 100%" />
@@ -832,8 +833,8 @@
                     </div>
                 </div>
             </div>
-
             <div class="mark_centter flex_column" v-show="warningFlag">
+                <!-- 算薪进度预警 -->
                 <div class="mark_title">算薪预警</div>
                 <div class="mark_main">
                     <dv-scroll-board :config="configWarning" style="width: 100%; height: 100%" />

cokingCoal/js/dataA.js

@@ -296,13 +296,14 @@ let employmentList = [
 ]
 
 let monthList = ['01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12']
-let yearList = ["2023", "2022"]
+let year = new Date().getFullYear()
+let yearList = [year, year - 1]
 
 function listToChange(list1, list2) {
     let list = []
     list1.forEach(i => {
         list2.forEach(k => {
-            list.push(i + "-" + k)
+            list.push(i + " - " + k)
         })
     });
     return list

cokingCoal/js/humanResources.js

@@ -571,8 +571,11 @@ let app = new Vue({
                     that.configWritten.rowNum = 10
                     that.employmentList3.rowNum = 20
                     that.configInterview.columnWidth = []
+                    that.configInterview.columnWidth = [240, 320, 370,460,480]
                     that.configWritten.columnWidth = []
+                    that.configWritten.columnWidth = [240, 320, 370,460,480]
                     that.employmentList3.columnWidth = []
+                    that.employmentList3.columnWidth = [240, 320, 370,460,480]
 
                     that.leftTime && clearInterval(that.leftTime)
                     that.rightTime && clearInterval(that.rightTime)
@@ -2803,6 +2806,7 @@ let app = new Vue({
                             lastList.push(["<span class='" + color + "'>" + res.data[i][0] + "</span>", "<span class='" + color + "'>" + res.data[i][1] + "</span>", "<span class='" + color + "'>" + res.data[i][2] + "</span>"])
                         }
                     }
+                    console.log(lastList);
                     that.config2.data = lastList
                     setTimeout(() => {
                         that.leftFlag = true
@@ -2853,14 +2857,18 @@ let app = new Vue({
             let that = this;
             if (index + 10 == that.configWritten.data.length) {
                 console.log("笔试更新");
-                that.getNoticePerson(1)
+                setTimeout(()=>{
+                    that.getNoticePerson(1)
+                },1700)
             }
         },
         scrollChangeListIn(index) {
             let that = this;
             if (index + 10 == that.configInterview.data.length) {
                 console.log("面试更新");
-                that.getNoticePerson(2)
+                setTimeout(()=>{
+                    that.getNoticePerson(2)
+                },1700)
             }
         },
 

cokingCoal/js/newIndex.js

@@ -497,6 +497,11 @@ let app = new Vue({
             employsNums: 15308,
             selectTraining: 2807,
             technical: null,
+
+            IndustrydistributionIndex: 0,
+
+            isShowFlag: false,
+
         }
     },
     beforeCreate() {
@@ -585,33 +590,33 @@ let app = new Vue({
             //   this.initBarCharts(works, worksList)
             // },16000)
             // this.timeLevel()
-            setInterval(_ => {
-                if (this.fIndex == this.fList.length - 1) {
-                    this.fIndex = 0
-                } else {
-                    this.fIndex = this.fIndex + 1
-                }
-                this.organizationList.forEach(item => {
-                    item.flag = false
-                })
-                if (this.orgIndex == this.organizationList.length - 1) {
-                    this.orgIndex = 0
-                } else {
-                    this.orgIndex = this.orgIndex + 1
-                }
-                this.organizationList[this.orgIndex].flag = true
-
-
-                skillList.forEach(item => {
-                    item.flag = false
-                })
-                if (this.skillIndex == skillList.length - 1) {
-                    this.skillIndex = 0
-                } else {
-                    this.skillIndex = this.skillIndex + 1
-                }
-                skillList[this.skillIndex].flag = true
-            }, 2000)
+            // setInterval(_ => {
+            //     if (this.fIndex == this.fList.length - 1) {
+            //         this.fIndex = 0
+            //     } else {
+            //         this.fIndex = this.fIndex + 1
+            //     }
+            //     this.organizationList.forEach(item => {
+            //         item.flag = false
+            //     })
+            //     if (this.orgIndex == this.organizationList.length - 1) {
+            //         this.orgIndex = 0
+            //     } else {
+            //         this.orgIndex = this.orgIndex + 1
+            //     }
+            //     this.organizationList[this.orgIndex].flag = true
+
+
+            //     skillList.forEach(item => {
+            //         item.flag = false
+            //     })
+            //     if (this.skillIndex == skillList.length - 1) {
+            //         this.skillIndex = 0
+            //     } else {
+            //         this.skillIndex = this.skillIndex + 1
+            //     }
+            //     skillList[this.skillIndex].flag = true
+            // }, 2000)
             setTimeout(() => {
 
             }, 9000)
@@ -787,7 +792,7 @@ let app = new Vue({
                     this.getIndustrydistribution(true)
                     this.getHumanResources()
                     this.getSalaryCalProg()
-                    this.getCollegeinternAndEnterpriseship()
+                    // this.getCollegeinternAndEnterpriseship()
                     this.getTurnOver()
                     this.getOptimizeResources()
                     this.getHumanOrgAllResources()
@@ -806,6 +811,9 @@ let app = new Vue({
                     this.getTurnOverDetail()
                     this.getDistributionAttachment()
 
+                    // 算薪预警
+                    this.getSalaryCalProgDetail()
+
 
                     this.getDept(true)
 
@@ -5367,7 +5375,6 @@ let app = new Vue({
             this.warningFlag = true
             this.mobilizeFlag = false
             this.echartsMark = false
-            this.getSalaryCalProgDetail()
         },
         handleORG() {
             this.isShowMark = true
@@ -5521,7 +5528,34 @@ let app = new Vue({
                         item.flag = false
                         item.name = item.key
                     })
-                    that.organizationList.push(...res.data)
+                    this.organizationList.push(...res.data)
+                    setInterval(_ => {
+                        if (this.fIndex == this.fList.length - 1) {
+                            this.fIndex = 0
+                        } else {
+                            this.fIndex = this.fIndex + 1
+                        }
+                        this.organizationList.forEach(item => {
+                            item.flag = false
+                        })
+                        if (this.orgIndex == this.organizationList.length - 1) {
+                            this.orgIndex = 0
+                        } else {
+                            this.orgIndex = this.orgIndex + 1
+                        }
+                        this.organizationList[this.orgIndex].flag = true
+
+
+                        skillList.forEach(item => {
+                            item.flag = false
+                        })
+                        if (this.skillIndex == skillList.length - 1) {
+                            this.skillIndex = 0
+                        } else {
+                            this.skillIndex = this.skillIndex + 1
+                        }
+                        skillList[this.skillIndex].flag = true
+                    }, 2000)
                 }
 
             })
@@ -5547,6 +5581,7 @@ let app = new Vue({
             if (!flag) {
                 data.flag = false
             }
+            let industry = that.$refs.industry
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/Industrydistribution", data).then(res => {
                 if (res) {
                     let x = []
@@ -5563,13 +5598,22 @@ let app = new Vue({
                         }
                     })
                     if (index == x.length) {
+                        if (that.IndustrydistributionIndex >= 3) {
+                            that.industry = {
+                                x: ["矿井", "选煤厂", "火电厂", "清洁电厂", "焦化厂"],
+                                y: [151, 50, 6, 32, 4]
+                            }
+                            that.initOrganizationElse(industry, "", that.industry, "")
+                            return
+                        }
                         that.getIndustrydistribution(false)
+                        that.IndustrydistributionIndex += 1
                         return
                     }
+
                     that.industry.x = x
                     that.industry.y = y
                 }
-                let industry = that.$refs.industry
                 that.initOrganizationElse(industry, "", that.industry, "")
                 // 
             })
@@ -5709,18 +5753,18 @@ let app = new Vue({
             let data = {
                 flag: that.dataFlag
             }
-            this.isShowMark = false
-            this.salaryFlag = false
+            // this.isShowMark = false
+            // this.salaryFlag = false
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/SalaryCalProgDetail", data).then(res => {
                 if (res) {
                     that.configWarning.data = res.data
                 }
             })
-            this.isShowMark = true
-            this.salaryFlag = true
-            this.pdfFlag = false
-            this.mobilizeFlag = false
-            this.echartsMark = false
+            // this.isShowMark = true
+            // this.salaryFlag = true
+            // this.pdfFlag = false
+            // this.mobilizeFlag = false
+            // this.echartsMark = false
         },
         getCollegeinternAndEnterpriseship() {
             let that = this;
@@ -5771,48 +5815,41 @@ let app = new Vue({
             let userList = [];
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/Collegestudy", data).then(res => {
                 if (res) {
-                    res.data.forEach(item => {
-                        if (item.key == "产学研合作高校数量") {
-                            that.schoolList2[0].value = item.value
-                        }
-
-                        if (item.key == "产学研成果数量") {
-                            that.schoolList2[1].value = item.value
-                        }
+                    // res.data.forEach(item => {
+                    //     if (item.key == "产学研合作高校数量") {
+                    //         that.schoolList2[0].value = item.value
+                    //     }
 
-                        if (item.key == "项目名称") {
-                            proList = item.value
-                        }
+                    //     if (item.key == "产学研成果数量") {
+                    //         that.schoolList2[1].value = item.value
+                    //     }
 
-                        if (item.key == "合作高校") {
-                            schList = item.value
-                        }
+                    //     if (item.key == "项目名称") {
+                    //         proList = item.value
+                    //     }
 
-                        if (item.key == "合作类型") {
-                            typeList = item.value
-                        }
+                    //     if (item.key == "合作高校") {
+                    //         schList = item.value
+                    //     }
 
-                        if (item.key == "主要成效") {
-                            userList = item.value
-                        }
+                    //     if (item.key == "合作类型") {
+                    //         typeList = item.value
+                    //     }
 
-                        // {
-                        //   project: "高瓦斯矿井110工法回采工作面瓦斯与自然发火共治关键技术示范研究",
-                        //   school: "太原理工大学",
-                        //   type: "山西省重点研发项目",
-                        //   merits: "解决了瓦斯超限问题"
-                        // },
-                        that.fList = []
-                        proList.forEach((i, k) => {
-                            let obj = {
-                                project: i,
-                                school: schList[k],
-                                type: typeList[k],
-                                merits: userList[k],
-                            }
-                            that.fList.push(obj)
-                        })
-                    })
+                    //     if (item.key == "主要成效") {
+                    //         userList = item.value
+                    //     }
+                    //     that.fList = []
+                    //     proList.forEach((i, k) => {
+                    //         let obj = {
+                    //             project: i,
+                    //             school: schList[k],
+                    //             type: typeList[k],
+                    //             merits: userList[k],
+                    //         }
+                    //         that.fList.push(obj)
+                    //     })
+                    // })
                 }
             })
         },
@@ -6420,6 +6457,7 @@ let app = new Vue({
             let data = {
                 flag: that.dataFlag
             }
+
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getCalSalary2", data).then(res => {
                 if (res) {
                     that.configMark.data = res
@@ -6584,6 +6622,7 @@ let app = new Vue({
                 data.flag = false
             }
             let index = 0
+            that.organizationList = []
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/Dept", data).then(res => {
                 if (res) {
                     res.data.forEach(item => {
@@ -6594,6 +6633,7 @@ let app = new Vue({
                         }
                     })
                     if (that.fetchIndex == 3) {
+                        // that.getDistributionInfo()
                         return
                     }
                     if (index == 3) {
@@ -6602,7 +6642,7 @@ let app = new Vue({
                         return
                     }
                     res.data[0].flag = true
-                    that.organizationList = res.data
+                    that.organizationList.push(...res.data)
                     that.getDistributionInfo()
                 }
             })

cokingCoal/js/request.js

@@ -14,13 +14,13 @@ function isLocalEnv() {
 
 
 
-window.apiType = "sit"  // dev 本地测试 ，  sit  线上测试  uat  客户测试环境 prod  正式环境
+window.apiType = "prod"  // dev 本地测试 ，  sit  线上测试  uat  客户测试环境 prod  正式环境
 window.fetchUrl = ""
 // window.fetchUrl = "http://172.21.9.236:8081"
 
 
 if (window.apiType == "dev") {
-  window.fetchUrl = "http://192.168.1.11:8080"
+  window.fetchUrl = "http://192.168.1.4:8080"
 } else if (window.apiType == "sit") {
   window.fetchUrl = "http://172.21.9.236:8081"
 } else if (window.apiType == "uat") {

cokingCoal/styles/humanResources.css

@@ -1013,6 +1013,10 @@ li {
     font-size: 30px;
 }
 
+.w100 .row-item {
+    font-size: 35px !important;
+}
+
 ::-webkit-scrollbar {
     display: none;
 }