Procházet zdrojové kódy

提交代码,根据接口调整数据的拆分

fengxu před 2 roky
rodič
revize
63b07fb1cb
5 změnil soubory, kde provedl 301 přidání a 172 odebrání
  1. binární
      cokingCoal.zip
  2. 5 5
      cokingCoal/hr.html
  3. 104 114
      cokingCoal/js/humanResources.js
  4. 191 52
      cokingCoal/js/newIndex.js
  5. 1 1
      cokingCoal/js/request.js

binární
cokingCoal.zip


+ 5 - 5
cokingCoal/hr.html

@@ -36,7 +36,7 @@
 
                         <div class="main_item flex_column">
                             <div :class="classChange?'item_content_6':'item_content_6_false'">
-                                <dv-scroll-board id="itemContent" :config="config1" @scroll-change="scrollChange"
+                                <dv-scroll-board id="itemContent" :config="config1" v-if="isShowInfoList" @scroll-change="scrollChange"
                                     style="width: 100%; height: 100%" />
                             </div>
                             <div class="item_content_4 flex_column">
@@ -75,11 +75,11 @@
                             <p class="item_title">{{ rollTitle }}</p>
                             <!-- <vue-seamless-scroll v-if="rollFlag" :data="listData" class="warp" :classOption="classOption"> -->
                             <div class="item">
-                                <!-- <div class="item_con" v-for="(item,index) in recruitInfoList[1]">
+                                <div class="item_con" v-for="(item,index) in recruitInfoList[recruitInfoIndex]">
                                         <span>{{ item.title }}</span>
                                         <span>{{ item.content }}</span>
-                                </div> -->
-                                <p class="item_con">
+                                </div>
+                                <!-- <p class="item_con">
                                     <span>一、双选原则</span>
                                     <span>公开报名、集中面试,公平竞争、择优录用。</span>
                                 </p>
@@ -114,7 +114,7 @@
                                     <span>八、有关说明</span>
                                     <span>(一)每位应聘者只可投报一个单位,请勿重复或多次报名。<br>
                                         (二)应聘者须如实提供有关信息和材料,凡因本人填写信息错误而导致的一切后果自行承担;如有弄虚作假行为,一经查实即取消应聘资格。</span>
-                                </p>
+                                </p> -->
                             </div>
                             <!-- </vue-seamless-scroll> -->
                         </div>

+ 104 - 114
cokingCoal/js/humanResources.js

@@ -89,7 +89,7 @@ let app = new Vue({
             treeIndex: 0,
             rollFlag: true,
             config1: {
-                waitTime: 7300,
+                waitTime: 1300,
                 header: ["双选单位", "双选岗位", "双选人数", "报名人数", "发布时间"],
                 headerHeight: 55,
                 columnWidth: [230, 170],
@@ -103,7 +103,7 @@ let app = new Vue({
 
                     ["霍州煤电恒兴煤业", '生产调度员', '4', '10', "2023.07.01"],
                     ["霍州煤电吕梁山煤电公司", '汽车驾驶员', '5', '10', "2023.07.01"],
-                    ["山煤国际凌志达煤业", '电工', '5', '16', "2023.07.01"],
+                    // ["山煤国际凌志达煤业", '电工', '5', '16', "2023.07.01"],
                     ["华晋焦煤沙曲一号煤矿", '井下普工', '40', '120', "2023.07.01"],
                     ["山西焦化", '技术员', '2', '12', "2023.07.01"],
                     ["汾西矿业高阳煤矿", '井下安全检查员', '5', '10', "2023.07.01"],
@@ -346,6 +346,7 @@ let app = new Vue({
             leftTime: null,
             rightTime: null,
             recruitInfoList: [],
+            recruitInfoIndex: 0,
             vitaData: {
                 x: ['4月', '5月', '6月', '7月', '8月', '9月'],
                 y: [56, 32, 64, 81, 43, 13]
@@ -366,6 +367,7 @@ let app = new Vue({
             showExamination: true, //笔试
             noticeList: [],
             noticeIndex: 0,
+            isShowInfoList: false,
         }
     },
     created() {
@@ -490,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
@@ -543,7 +545,7 @@ let app = new Vue({
             let vita = this.$refs.vita
             that.initVitaEcharts(vita)
             that.getPostDetail()
-        // })
+        })
     },
     methods: {
         // 监听键盘
@@ -749,6 +751,7 @@ let app = new Vue({
             if (listIndex >= this.config1.data.length) {
                 listIndex = index - 11
             }
+            this.recruitInfoIndex = listIndex
             this.address = this.config1.data[listIndex][0] + "。"
             this.rollTitle = this.config1.data[listIndex][0] + this.config1.data[listIndex][1] + "双选公告"
             setTimeout(() => {
@@ -2162,46 +2165,32 @@ let app = new Vue({
         },
         getPostDetail() {
             let that = this;
-            let data = {};
+            let data = {
+                flag: true
+            };
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/PostDetail", data).then(res => {
-
-            })
-
-            let res = {
-                data: [
-                    [
-                        "山西焦煤集团有限责任公司",
-                        "事业部副总经理",
-                        "1",
-                        "6",
-                        "2022.12.07",
-                        "一、双选原则:\r\n无&二、双选对象:\r\n1.工作年限:不限,2.学历要求:不限,3.双选范围:不限.&三、双选人数:\r\n共计1人.&四、工作地点:&五、工作职责:\r\n1、统筹负责焦煤事业部的全面生产及经营等工作,重点保障公司冶金板块三个生产基地的焦煤供给;\n2、负责周边焦煤市场资源的开拓、整合与合作等工作;\n3、负责阿克苏周边地区煤矿资源的开发获取等;\n4、推进内部焦煤产品的市场化收益等工作。&六、双选条件:\r\n1、大专及以上学历,有焦煤行业全盘管理经验,熟悉焦煤市场运营,尤其熟悉新疆市场;\n2、有相关人员和企业的管理经验,具备一定的前瞻性规划及统筹能力;\n3、有0到1的从业经验,具备较强的整合能力,有较好的事业成就动机。&七、报名方式:八、双选流程:\r\n&九、有关说明:\r\n"
-                    ],
-                    [
-                        "山西焦煤集团有限责任公司",
-                        "营运部长",
-                        "2",
-                        "35",
-                        "2022.11.25",
-                        "一、双选原则:\r\n无&二、双选对象:\r\n1.工作年限:0年以上,2.学历要求:不限,3.双选范围:不限.&三、双选人数:\r\n共计2人.&四、工作地点:&五、工作职责:\r\n1、全面负责商场营运管控,确保现场营运良好秩序;\n2、监督销售数据统计工作,并根据销售数据及客流统计,召开部门分析会,提出合理化建议,对商场业态调整提供数据支持;\n3、制定并完善部门管理手册及各项规章制度并监督执行;\n4、负责监督商户的设计、装修、审批、进场流程和整体协调工作;\n5、负责商户培训、召开店长会及收集各商铺促销信息的工作;\n6、负责商户租金、物业费及水电费等相关费用的催缴工作,安排人员按时完成;\n7、定期监督收集商户资料,完善商户档案管理;\n8、定期组织员工进行市场调研,掌握品牌动向和新品上市;\n9、负责服务台客诉处理及日常政府职能部门的检查工作;&六、双选条件:\r\n任职资格:\n1、年龄在38岁以内,男女不限,本科以上学历;\n2、五年以上商业运营工作经验,三年以上中层管理经验;\n3. 具备较强的谈判能力、协调能力及人际交往能力,熟悉百货或购物中心市场调研、销售分析、现场管理、业务日常管理等工作;\n4、具备相应的统筹规划、运营管理等专业知识,熟悉商业规划设计理念、大型商业综合体业态规划、品类搭配和精准定位,敏锐的市场洞察力及数据分析力;\n5、熟悉公文写作格式,具备基本商务信函写作能力,熟练运用各种办公软件(如office办公软件等);&七、报名方式:\r\n线上&八、双选流程:\r\n&九、有关说明:\r\n无"
-                    ]
-                ]
-            }
-            let list = []
-            let a = []
-            res.data.forEach((item, index) => {
-                list.push([item[0], item[1], item[2], item[3], item[4]])
-                a[index] = []
-                item[5].split("&").forEach(i => {
-                    let infos = i.split("\r\n")
-                    let obj = {
-                        title: infos[0],
-                        content: infos[1]
-                    }
-                    a[index].push(obj)
+                let list = []
+                let a = []
+                res.data.forEach((item, index) => {
+                    list.push([item[0], item[1], item[2], item[3], item[4]])
+                    a[index] = []
+                    item[5].split("&").forEach(i => {
+                        let infos = i.split("\r\n")
+                        let obj = {
+                            title: infos[0],
+                            content: infos[1]
+                        }
+                        a[index].push(obj)
+                    })
                 })
+                that.config1.data = list
+                that.recruitInfoList.push(...a)
+                that.isShowInfoList = true
+                console.log(that.recruitInfoList);
             })
-            that.recruitInfoList.push(...a)
+
+
+
         },
         getHalfYearDelivcv() {
             let that = this;
@@ -2248,7 +2237,7 @@ let app = new Vue({
         getHotDelivcv() {
             let that = this;
             let data = {};
-            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/HotDelivcv",data).then(res => {})
+            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/HotDelivcv", data).then(res => { })
             let res = {
                 data: [
                     [
@@ -2387,6 +2376,7 @@ let app = new Vue({
                 flag: true
             };
             // fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getreviewarrange", data).then(res => {
+            //     console.log(res);
             if (res) {
                 that.isRendering(res.mianshi, "interviewIndex", "configInterview", "showInterview")
                 that.isRendering(res.bishi, "examinationIndex", "configWritten", "showExamination")
@@ -2712,39 +2702,39 @@ let app = new Vue({
         },
         scrollChangeList(index) {
             let that = this;
-            // setTimeout(() => {
-            //     if (index + 5 == that.employmentList1.data.length) {
-            //         that.isListEnd = that.isListEnd + 1
-            //         if (that.isListEnd == 2) {
-            //             that.isListEnd = 0
-            //             that.isShowList = false
-            //             that.employmentList1.data = []
-            //             that.employmentList2.data = []
-            //             that.noticeIndex = that.noticeIndex + 1
-            //             if(that.noticeIndex > that.noticeList.length - 1){
-            //                 that.noticeIndex = 0
-            //             }
-            //             that.getNoticePerson("李四是五")
-            //             setTimeout(() => {
-            //                 that.isShowList = true
-            //             }, 10)
-
-            //         }
-            //     }
-            // }, 1700)
-            // if (index == 0) {
-            //     console.log("index == 0");
-            // }
-            // if (index == that.employmentList1.data.length - 1) {
+            setTimeout(() => {
+                if (index + 5 == that.employmentList1.data.length) {
+                    that.isListEnd = that.isListEnd + 1
+                    if (that.isListEnd == 2) {
+                        that.isListEnd = 0
+                        that.isShowList = false
+                        that.employmentList1.data = []
+                        that.employmentList2.data = []
+                        that.noticeIndex = that.noticeIndex + 1
+                        if (that.noticeIndex > that.noticeList.length - 1) {
+                            that.noticeIndex = 0
+                        }
+                        that.getNoticePerson("李四是五")
+                        setTimeout(() => {
+                            that.isShowList = true
+                        }, 10)
 
-            // }
+                    }
+                }
+            }, 1700)
+            if (index == 0) {
+                console.log("index == 0");
+            }
+            if (index == that.employmentList1.data.length - 1) {
+
+            }
         },
         getNotice() {
             let that = this;
             let data = {
                 flag: true
             };
-            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getNotice",data).then(res => {})
+            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getNotice", data).then(res => { })
             let res = {
                 data: [{
                     mdnb_noticecontent: "   根据相关要求,经过网上报名、资格审查、笔试、面试等程序,现将拟录用人员名单予以公示。公示时间为2023年09月14日至2023年09月14日 ((1个工作日)),\n如对双选结果有异议,可在公示期内通过电话形式反馈情况。 \n 受理电话: 0351-8305606 0351-8305171\n",
@@ -2766,12 +2756,12 @@ let app = new Vue({
             }
             that.noticeList = res.data
         },
-        getDoubleChoice(){
+        getDoubleChoice() {
             let that = this;
             let data = {
                 flag: true
             }
-            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/DoubleChoice",data).then(res=>{
+            fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/DoubleChoice", data).then(res => {
                 console.log(res);
             })
         }

+ 191 - 52
cokingCoal/js/newIndex.js

@@ -434,9 +434,9 @@ let app = new Vue({
             }, {
                 key: "优化人数",
                 value: 14,
-                unit:"人"
+                unit: "人"
             }],
-            optimizeValue: 4.8 ,
+            optimizeValue: 4.8,
             PersonnelResource: [{
                 name: "用工总数",
                 value: 213185,
@@ -475,7 +475,7 @@ let app = new Vue({
             },
             newSkillList: [],
             dataFlag: true,
-            isShowRequest: false,
+            isShowRequest: true,
             isShowPage: true,
             industryEcharts: null
         }
@@ -683,8 +683,8 @@ let app = new Vue({
             levelList.y.forEach(item => {
                 sum = sum + item
             })
-            that.levelListX = spArr(levelList.x, 5)
-            that.levelListY = spArr(levelList.y, 5)
+            that.levelListX = spArr(levelList.x, 4)
+            that.levelListY = spArr(levelList.y, 4)
             that.initLineElseEcharts(level, { x: that.levelListX[0], y: that.levelListY[0] }, sum)
 
             let initChartR1 = this.$refs.initChartR1
@@ -736,9 +736,8 @@ let app = new Vue({
                     localStorage.setItem("access_token", res.access_token)
                     this.getAccumulatedLogin()
                     this.getMauInfo()
-                    this.getDistributionInfo()
                     this.getOrganizationChange()
-                    this.getIndustrydistribution()
+                    this.getIndustrydistribution(true)
                     this.getHumanResources()
                     this.getSalaryCalProg()
                     this.getCollegeinternAndEnterpriseship()
@@ -757,6 +756,11 @@ let app = new Vue({
                     this.getDownholeoperationTrue()
                     this.getDownholeoperationFlase()
 
+                    this.getTurnOverDetail()
+
+
+                    this.getDept(true)
+
                     // 员工年龄
                     this.getStaffAge()
 
@@ -804,8 +808,8 @@ let app = new Vue({
                 levelList.y.forEach(item => {
                     sum = sum + item
                 })
-                that.levelListX = spArr(levelList.x, 5)
-                that.levelListY = spArr(levelList.y, 5)
+                that.levelListX = spArr(levelList.x, 4)
+                that.levelListY = spArr(levelList.y, 4)
                 that.initLineElseEcharts(level, { x: that.levelListX[0], y: that.levelListY[0] }, sum)
 
                 let initChartR1 = this.$refs.initChartR1
@@ -919,7 +923,11 @@ let app = new Vue({
                 } else {
                     that.levelTimeIndex = that.levelTimeIndex + 1
                 }
-                this.initLineElseEcharts(level, { x: this.levelListX[that.levelTimeIndex], y: this.levelListY[that.levelTimeIndex] })
+                let sum = 0
+                levelList.y.forEach(item => {
+                    sum = sum + item
+                })
+                this.initLineElseEcharts(level, { x: this.levelListX[that.levelTimeIndex], y: this.levelListY[that.levelTimeIndex] }, sum)
             }, 8000)
         },
         downholeTimes() {
@@ -1517,7 +1525,7 @@ let app = new Vue({
             let dataList = this.changeOnIndex(data.y, index);
             let option = {
                 title: {
-                    text: '总人数: ' + sum,
+                    text: sum != undefined ? '总人数: ' + sum : '总人数: 0',
                     subtext: '',
                     top: 0,
                     right: 0,
@@ -2487,7 +2495,7 @@ let app = new Vue({
                     data: echarts2,
                     emphasis: {
                         scaleSize: 15, // 设置放大倍数
-                      },
+                    },
                     itemStyle: {
                         color: function (colors) {
                             var colorList = [
@@ -2504,7 +2512,7 @@ let app = new Vue({
                     }
                 },],
             }
-            
+
             myChart.setOption(option)
             tools.loopShowTooltip(myChart, option, {
                 nterval: 2000,
@@ -4696,6 +4704,7 @@ let app = new Vue({
                     },
                     axisLabel: {
                         show: true,
+                        interval: 0,
                         margin: 14,
                         textStyle: {
                             fontSize: 26,
@@ -5001,7 +5010,6 @@ let app = new Vue({
             this.downhole = echarts.init(el);
             let series = []
             let grid = {}
-            console.log(data);
             if (type == 1) {
                 series.push({
                     type: 'bar',
@@ -5141,7 +5149,6 @@ let app = new Vue({
                     right: "1%"
                 }
             }
-            console.log(series);
             option = {
                 tooltip: {
                     show: true,
@@ -5427,8 +5434,7 @@ let app = new Vue({
                         item.flag = false
                         item.name = item.key
                     })
-                    res.data[0].flag = true
-                    that.organizationList = res.data
+                    that.organizationList.push(...res.data)
                 }
 
             })
@@ -5446,20 +5452,33 @@ let app = new Vue({
                 }
             })
         },
-        getIndustrydistribution() {
+        getIndustrydistribution(flag) {
             let that = this
             let data = {
                 flag: that.dataFlag
             }
+            if (!flag) {
+                data.flag = false
+            }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/Industrydistribution", data).then(res => {
                 if (res) {
                     let x = []
                     let y = []
+                    let index = 0
                     that.industry = JSON.parse(JSON.stringify({}))
                     res.data.forEach(item => {
                         x.push(item.key)
                         y.push(item.value)
                     })
+                    y.forEach(i => {
+                        if (i == 0) {
+                            index = index + 1
+                        }
+                    })
+                    if (index == x.length) {
+                        that.getIndustrydistribution(false)
+                        return
+                    }
                     that.industry.x = x
                     that.industry.y = y
                 }
@@ -5831,42 +5850,74 @@ let app = new Vue({
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/MapData", data).then(res => {
                 if (res) {
                     let mapData = []
-                    let map = []
                     res.data.forEach(item => {
-                        let obj = {}
-                        item.forEach(i => {
-                            if (i.key == "区域") {
-                                obj.name = i.value
-                            }
-                            if (i.key == "员工总数") {
-                                obj.value = i.value
-                            }
-                            if (i.key == "二级单位") {
-                                obj.level = i.value
-                            }
-                        })
-                        map.push(obj)
-                    })
-                    map.forEach(i => {
-                        let obj = {
-                            name: "",
-                            value: []
-                        }
+                        let point = []
                         for (let k in geoCoordMap) {
-                            if (k.indexOf(i.name) != -1) {
-                                obj.name = k
-                                obj.value[0] = geoCoordMap[k][0]
-                                obj.value[1] = geoCoordMap[k][1]
-                                obj.value[2] = i.value
-                                obj.value[3] = i.level
+                            if (k.indexOf(item.value) != -1) {
+                                point = geoCoordMap[k]
                             }
                         }
-                        mapData.push(obj)
-
+                        item.data.forEach(i => {
+                            let num;
+                            let name;
+                            i.forEach(j => {
+                                if (j.key == "二级单位") {
+                                    name = j.value
+                                }
+                                if (j.key == "员工总数") {
+                                    num = j.value
+                                }
+                            })
+                            let obj = {
+                                itemStyle: {
+                                    color: "#fff"
+                                },
+                                name: item.value,
+                                value: [...point, num, name]
+                            }
+                            mapData.push(obj)
+                        })
                     })
                     let el = this.$refs.container
                     // this.initProvinceChart(el)
                     this.initMap2(el, mapData)
+
+                    // let map = []
+                    // res.data.forEach(item => {
+                    //     let obj = {}
+                    //     item.forEach(i => {
+                    //         if (i.key == "区域") {
+                    //             obj.name = i.value
+                    //         }
+                    //         if (i.key == "员工总数") {
+                    //             obj.value = i.value
+                    //         }
+                    //         if (i.key == "二级单位") {
+                    //             obj.level = i.value
+                    //         }
+                    //     })
+                    //     map.push(obj)
+                    // })
+                    // map.forEach(i => {
+                    //     let obj = {
+                    //         name: "",
+                    //         value: []
+                    //     }
+                    //     for (let k in geoCoordMap) {
+                    //         if (k.indexOf(i.name) != -1) {
+                    //             obj.name = k
+                    //             obj.value[0] = geoCoordMap[k][0]
+                    //             obj.value[1] = geoCoordMap[k][1]
+                    //             obj.value[2] = i.value
+                    //             obj.value[3] = i.level
+                    //         }
+                    //     }
+                    //     mapData.push(obj)
+
+                    // })
+                    // let el = this.$refs.container
+                    // // this.initProvinceChart(el)
+                    // this.initMap2(el, mapData)
                 }
 
             })
@@ -5937,10 +5988,9 @@ let app = new Vue({
                     levelList.y.forEach(item => {
                         sum = sum + item
                     })
-                    that.levelListX = spArr(levelList.x, 5)
-                    that.levelListY = spArr(levelList.y, 5)
+                    that.levelListX = spArr(levelList.x, 4)
+                    that.levelListY = spArr(levelList.y, 4)
                     if (levelList.x.length > 5) {
-
                         that.initLineElseEcharts(level, { x: that.levelListX[0], y: that.levelListY[0] }, sum)
                         that.timeLevel()
                     } else {
@@ -5951,8 +6001,8 @@ let app = new Vue({
                     levelList.y.forEach(item => {
                         sum = sum + item
                     })
-                    that.levelListX = spArr(levelList.x, 5)
-                    that.levelListY = spArr(levelList.y, 5)
+                    that.levelListX = spArr(levelList.x, 4)
+                    that.levelListY = spArr(levelList.y, 4)
                     that.initLineElseEcharts(level, { x: that.levelListX[0], y: that.levelListY[0] }, sum)
                 }
             })
@@ -6335,7 +6385,96 @@ let app = new Vue({
 
 
 
-        }
+        },
+        getTurnOverDetail() {
+            let that = this;
+            let data = {
+                flag: that.dataFlag,
+            }
+            // 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)
+                    })
+                }
+                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],])
+            })
+        },
+        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){
+                            index = index + 1
+                        }
+                    })
+
+                    if(index == 3){
+                        that.getDept(false)
+                        return
+                    }
+
+
+                    res.data[0].flag = true
+                    that.organizationList = res.data
+                    that.getDistributionInfo()
+                } 
+            })
+        },
 
     },
 

+ 1 - 1
cokingCoal/js/request.js

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