根据汇报修改

cokingCoal/hr.html

@@ -90,7 +90,7 @@
                                 </p>
                                 <p class="item_con">
                                     <span>四、工作地点</span>
-                                    <span>招聘单位所属煤矿。</span>
+                                    <span>{{ address}}</span>
                                 </p>
                                 <p class="item_con">
                                     <span>五、招聘条件</span>
@@ -312,17 +312,17 @@
 
                             <!-- </vue-seamless-scroll> -->
                         </div>
-                        <div class="main_item_btm flex_sp">
+                        <div class="main_item_btm flex_sp" v-if="isShowList">
                             <div class="btm_item">
-                                <dv-scroll-board :config="employmentList1" style="width: 100%; height: 100%" />
+                                <dv-scroll-board :config="employmentList1" @scroll-change="scrollChangeList" style="width: 100%; height: 100%" />
                             </div>
                             <div class="btm_item">
-                                <dv-scroll-board :config="employmentList2" style="width: 100%; height: 100%" />
+                                <dv-scroll-board :config="employmentList2" @scroll-change="scrollChangeList"  style="width: 100%; height: 100%" />
                             </div>
                         </div>
                     </div>
                 </div>
-
+                <!-- <img class='list_img' src="./images/humanResources/avatar.png" alt=""> -->
             </div>
         </div>
         <div class="page_btm">

cokingCoal/index.html

@@ -553,7 +553,7 @@
                                             <img src="./images/icon_title.png" alt="">
                                         </div>
                                         <div class="title_else_sb flex_sb">
-                                            <div class="tit_text">平均工资</div>
+                                            <div class="tit_text">累计月平均工资</div>
                                             <div class="tit_icon" @click="handleSelect('average')">
                                                 <span>{{ selectInfo.average }}月</span>
                                                 <img style="margin-left:10px" src="./images/down.png" alt="">

cokingCoal/js/dataA.js

@@ -52,7 +52,7 @@ let salaryList = {
 // }
 
 let leftEndList = {
-    x: ["集团公司", "西山煤电", "汾西矿业", "霍州煤电", "山煤国际", "华晋焦煤", "山西焦化", "物资装备", "金土地", "销售公司", "国发公司", "投资公司", "人力资源", "金融资本", "民爆集团", "云数据公司", "焦煤置业", "新能源公司", "油品公司", "低碳公司", "交易中心", "招标公司"],
+    x: ["集团公司", "西山煤电", "汾西矿业", "霍州煤电", "山煤国际", "华晋焦煤", "山西焦化", "物资装备", "金 土地公司", "销售公司", "国发公司", "投资公司", "人力资源", "金融资本", "民爆集团", "云 数据公司", "焦煤置业", "新 能源公司", "油品公司", "低碳公司", "交易中心", "招标公司"],
     y1: [9401, 9794, 9814, 8997, 9411, 10830, 5043, 12743, 16787, 20488, 7321, 8479, 18297, 14812, 7551, 16525, 12173, 11308, 13405, 7077, 7566, 5889],
     y2: [8146, 8812, 8043, 7634, 8231, 8928, 4752, 11693, 15066, 15402, 9911, 6681, 0, 14568, 5457, 13146, 13014, 10882, 12268, 0, 0, 0],
 }

cokingCoal/js/humanResources.js

@@ -92,7 +92,7 @@ let app = new Vue({
                 waitTime: 7300,
                 header: ["招聘单位", "招聘岗位", "招聘人数", "投递人数", "发布时间"],
                 headerHeight: 55,
-                columnWidth: [230, 170, 100, 100],
+                columnWidth: [230, 170],
                 rowNum: 10,
                 data: [
                     ["西山煤电屯兰矿", '井下普工', '50', '100', "2023.07.01"],
@@ -178,16 +178,16 @@ let app = new Vue({
                 headerHeight: 55,
                 columnWidth: [120],
                 data: [
-                    ["<img class='list_img' src='https://www.bootcdn.cn/assets/img/m-react.png' alt=''>", "<span class=''>王伟</span>", "<span class=''>技术员</span>", "<span class=''>2023.07.29</span>"],
-                    ["<img class='list_img' src='https://www.bootcdn.cn/assets/img/m-react.png' alt=''>", "<span class=''>李丽丽</span>", "<span class=''>井下钻探工</span>", "<span class=''>2023.07.26</span>"],
-                    ["<img class='list_img' src='https://www.bootcdn.cn/assets/img/m-react.png' alt=''>", "<span class=''>王亮</span>", "<span class=''>井下钻探工</span>", "<span class=''>2023.07.18</span>"],
-                    ["<img class='list_img' src='https://www.bootcdn.cn/assets/img/m-react.png' alt=''>", "<span class=''>李星</span>", "<span class=''>井下钻探工</span>", "<span class=''>2023.07.11</span>"],
-                    ["<img class='list_img' src='https://www.bootcdn.cn/assets/img/m-react.png' alt=''>", "<span class=''>韩梅</span>", "<span class=''>生产调度员</span>", "<span class=''>2023.07.08</span>"],
-                    ["<img class='list_img' src='https://www.bootcdn.cn/assets/img/m-react.png' alt=''>", "<span class=''>郑凯</span>", "<span class=''>生产调度员</span>", "<span class=''>2023.07.01</span>"],
-                    ["<img class='list_img' src='https://www.bootcdn.cn/assets/img/m-react.png' alt=''>", "<span class=''>吉宇晟</span>", "<span class=''>技术员</span>", "<span class=''>2023.06.29</span>"],
-                    ["<img class='list_img' src='https://www.bootcdn.cn/assets/img/m-react.png' alt=''>", "<span class=''>李志桐</span>", "<span class=''>技术员</span>", "<span class=''>2023.07.29</span>"],
-                    ["<img class='list_img' src='https://www.bootcdn.cn/assets/img/m-react.png' alt=''>", "<span class=''>赵建国</span>", "<span class=''>井下钻探工</span>", "<span class=''>2023.07.26</span>"],
-                    ["<img class='list_img' src='https://www.bootcdn.cn/assets/img/m-react.png' alt=''>", "<span class=''>杜勇</span>", "<span class=''>井下钻探工</span>", "<span class=''>2023.07.18</span>"],
+                    ["<img class='list_img' src='./images/header/1.jpg' alt=''>", "<span class=''>程嘉鑫</span>", "<span class=''>技术员</span>", "<span class=''>2023.07.29</span>"],
+                    ["<img class='list_img' src='./images/header/2.jpg' alt=''>", "<span class=''>池富婕</span>", "<span class=''>生产调度员</span>", "<span class=''>2023.07.26</span>"],
+                    ["<img class='list_img' src='./images/header/3.jpg' alt=''>", "<span class=''>邓文奇</span>", "<span class=''>井下钻探工</span>", "<span class=''>2023.07.18</span>"],
+                    ["<img class='list_img' src='./images/header/4.jpg' alt=''>", "<span class=''>翟世佳</span>", "<span class=''>井下钻探工</span>", "<span class=''>2023.07.11</span>"],
+                    ["<img class='list_img' src='./images/header/5.jpg' alt=''>", "<span class=''>丁一帆</span>", "<span class=''>生产调度员</span>", "<span class=''>2023.07.08</span>"],
+                    ["<img class='list_img' src='./images/header/6.jpg' alt=''>", "<span class=''>董明霞</span>", "<span class=''>生产调度员</span>", "<span class=''>2023.07.01</span>"],
+                    ["<img class='list_img' src='./images/header/7.jpg' alt=''>", "<span class=''>杜沛宣</span>", "<span class=''>技术员</span>", "<span class=''>2023.06.29</span>"],
+                    ["<img class='list_img' src='./images/header/8.jpg' alt=''>", "<span class=''>樊宇浩</span>", "<span class=''>技术员</span>", "<span class=''>2023.07.29</span>"],
+                    ["<img class='list_img' src='./images/header/9.jpg' alt=''>", "<span class=''>冯凯</span>", "<span class=''>井下钻探工</span>", "<span class=''>2023.07.26</span>"],
+                    ["<img class='list_img' src='./images/header/10.png' alt=''>", "<span class=''>耿越</span>", "<span class=''>生产调度员</span>", "<span class=''>2023.07.18</span>"],
                 ],
                 align: ["center", "center", "center", "center", "center"],
                 headerBGC: "#69c1ff2d",
@@ -196,7 +196,7 @@ let app = new Vue({
             },
             configInterview: {
                 waitTime: 2000,
-                header: ["序号", "姓名", "会议厅", "场次", "时间"],
+                header: ["序号", "姓名", "会议厅", "双选单位", "时间"],
                 headerHeight: 55,
                 columnWidth: [70, 120, 170, 200],
                 rowNum: 6,
@@ -219,7 +219,7 @@ let app = new Vue({
             },
             configWritten: {
                 waitTime: 2000,
-                header: ["序号", "姓名", "会议厅", "场次", "时间"],
+                header: ["序号", "姓名", "会议厅", "双选单位", "时间"],
                 headerHeight: 55,
                 columnWidth: [70, 120, 170, 200],
                 rowNum: 6,
@@ -255,7 +255,7 @@ let app = new Vue({
             ],
             employmentList1: {
                 waitTime: 2000,
-                header: ["序号", "姓名", "性别", "身份证号", "拟录单位"],
+                header: ["序号", "姓名", "性别", "身份证号", "拟录用单位"],
                 rowNum: 5,
                 headerHeight: 55,
                 columnWidth: [100, 100, 100, 280],
@@ -268,7 +268,7 @@ let app = new Vue({
             },
             employmentList2: {
                 waitTime: 2000,
-                header: ["序号", "姓名", "性别", "身份证号", "拟录单位"],
+                header: ["序号", "姓名", "性别", "身份证号", "拟录用单位"],
                 rowNum: 5,
                 headerHeight: 55,
                 columnWidth: [100, 100, 100, 280],
@@ -356,7 +356,10 @@ let app = new Vue({
             imageFlag: false,
             pageFlag: true,
             hecharts: null,
-            leftErrorList: ["信息不完整", "信息有误", "任职条件不符", "出勤不足", "工作年限不符"]
+            leftErrorList: ["信息不完整", "信息有误", "任职条件不符", "出勤不足", "工作年限不符"],
+            isShowList: true,
+            isListEnd: 0,
+            address:"西山煤电屯兰矿。"
         }
     },
     created() {
@@ -495,6 +498,7 @@ let app = new Vue({
         //         that.getRecruitType()
         //         that.getFailReason()
         //         that.getQualAudits()
+        //         that.getNoticePerson()
 
         //     })
         // }).catch(err => {
@@ -712,6 +716,7 @@ let app = new Vue({
             if (listIndex >= this.config1.data.length) {
                 listIndex = index - 11
             }
+            this.address = this.config1.data[listIndex][0] + "。"
             this.rollTitle = this.config1.data[listIndex][0] + this.config1.data[listIndex][1] + "招聘公告"
             setTimeout(() => {
                 this.rollFlag = true
@@ -2468,7 +2473,7 @@ let app = new Vue({
             let data = {
                 flag: true
             };
-            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/QualAudits",data).then(res => {})
+            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/QualAudits", data).then(res => { })
             let res = {
                 data: [
                     {
@@ -2486,13 +2491,13 @@ let app = new Vue({
                 ]
             }
             res.data.forEach(item => {
-                if(item.key == "当前总人数"){
+                if (item.key == "当前总人数") {
                     that.rightList[0].num1 = item.value
                 }
-                if(item.key == "通过总人数"){
+                if (item.key == "通过总人数") {
                     that.rightList[0].num2 = item.value
                 }
-                if(item.key == "当前通过率"){
+                if (item.key == "当前通过率") {
                     that.rightList[0].num3 = item.value
                 }
             })
@@ -2511,6 +2516,171 @@ let app = new Vue({
             //     num3: 80,
             // }],
         },
+        getNoticePerson(name = "张三") {
+            let that = this;
+            that.employmentList1.data = []
+            that.employmentList2.data = []
+            this.isShowList = false
+            let data = {
+                flag: true
+            }
+            // fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getNoticePerson", data).then(res => {
+
+            // })
+            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.getNoticePerson("李四")
+            //             if (employmentList.length % 2 != 0) {
+            //                 employmentList.push([])
+            //             }
+            //             employmentList.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)
+
+            //         }
+            //     }
+            // }, 1700)
+            // if(index == 0){
+            //     console.log("index == 0");
+            // }
+            // if(index == that.employmentList1.data.length - 1){
+            //     
+            // }
+        },
 
     },
 

cokingCoal/js/newIndex.js

@@ -171,7 +171,7 @@ let app = new Vue({
             },
             config2: {
                 waitTime: 2000,
-                header: ["单位名称", "已算薪组织", "未算薪组织", "算薪进度百分比"],
+                header: ["单位名称", "已算薪单位", "未算薪单位", "算薪进度百分比"],
                 rowNum: 4,
                 data: [
                     ["西山煤电", '84', '0', '100%'],
@@ -352,12 +352,12 @@ let app = new Vue({
             downholeTime: null,
             echartsMark: false,
             loginInfo: {
-                unit: "人",
-                num: 25890
+                unit: "人次",
+                num: 273030
             },
             mauInfo: {
-                unit: "人",
-                mau: 1534
+                unit: "人次",
+                mau: 33755
             },
             skillIndex: 0,
             studentIndex: 2,
@@ -370,7 +370,7 @@ let app = new Vue({
             listInterval: null,
             HumanResourcesList: [{
                 key: "优化池",
-                value: 0,
+                value: 24,
                 image: "./images/top-1.png",
             }, {
                 key: "缓冲池",
@@ -719,7 +719,7 @@ let app = new Vue({
             that.initLineElseEchartsR(echarts90, { x: that.sx[0], y: that.sy[0] })
 
             let leftEnd = that.$refs.leftEnd
-            that.initBarEchartsElse(leftEnd, leftEndList, ["累计平均工资", "同期累计平均工资"])
+            that.initBarEchartsElse(leftEnd, leftEndList, ["累计月平均工资", "同期累计月平均工资"])
 
             let el = this.$refs.container
             // this.initProvinceChart(el)
@@ -840,7 +840,7 @@ let app = new Vue({
                 that.initLineElseEchartsR(echarts90, { x: that.sx[0], y: that.sy[0] })
 
                 let leftEnd = that.$refs.leftEnd
-                that.initBarEchartsElse(leftEnd, leftEndList, ["累计平均工资", "同期累计平均工资"])
+                that.initBarEchartsElse(leftEnd, leftEndList, ["累计月平均工资", "同期累计月平均工资"])
 
                 let el = this.$refs.container
                 // this.initProvinceChart(el)
@@ -3493,11 +3493,11 @@ let app = new Vue({
                 legend: {
                     data: nameList,
                     align: 'left',
-                    itemGap: 50,
+                    // itemGap: 50,
                     // x: 'right',
                     right: '1%',
                     y: '1%',
-                    icon: 'rect',
+                    // icon: 'rect',
                     textStyle: {
                         color: "#fff",
                         fontSize: 30
@@ -6207,7 +6207,7 @@ let app = new Vue({
                 if (res) {
                     leftEndList = res.data
                 }
-                that.initBarEchartsElse(leftEnd, leftEndList, ["累计平均工资", "同期累计平均工资"])
+                that.initBarEchartsElse(leftEnd, leftEndList, ["累计月平均工资", "同期累计月平均工资"])
 
             })
         },

cokingCoal/styles/newIndex.css

@@ -962,7 +962,7 @@ img {
 }
 
 .main_info_item {
-    width: 370px;
+    /* width: 370px; */
     height: 100%;
     display: flex;
     justify-content: center;