fengxu hace 2 años
padre
commit
83f3e1fb55
Se han modificado 2 ficheros con 50 adiciones y 46 borrados
  1. 48 44
      cokingCoal/js/humanResources.js
  2. 2 2
      cokingCoal/js/newIndex.js

+ 48 - 44
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],
@@ -242,13 +242,13 @@ let app = new Vue({
             },
             mainList: [{
                 name: "双选场次",
-                value: 29,
+                value: 0,
                 unit: "场",
                 icon: "./images/humanResources/times.png"
             },
             {
                 name: "参与人数",
-                value: 2957,
+                value: 0,
                 unit: "人",
                 icon: "./images/humanResources/user.png"
             }
@@ -335,15 +335,15 @@ let app = new Vue({
             rightList: [{
                 name: "当前数",
                 flag: true,
-                num1: 292,
-                num2: 248,
-                num3: "85%",
+                num1: 0,
+                num2: 0,
+                num3: "0%",
             }, {
                 name: "累计数",
                 flag: false,
-                num1: 571,
-                num2: 492,
-                num3: "84%",
+                num1: 0,
+                num2: 0,
+                num3: "0%",
             }],
             rightIndex: 0,
             leftList: [{
@@ -375,7 +375,7 @@ let app = new Vue({
 
             isShowList: true,
             isListEnd: 0,
-            address: "西山煤电屯兰矿。",
+            // address: "西山煤电屯兰矿。",
             interviewIndex: 0,
             examinationIndex: 0,
             showInterview: true,  // 面试
@@ -409,12 +409,13 @@ let app = new Vue({
 
             mianshiTime: null,
             bishiTime: null,
+            noteListIndex: 0,
         }
     },
     beforeCreate() {
         // 跳转地址
         let AddUrl = location.protocol + "//" + location.host + "/ierp"
-        return
+        // return
         if (!window.location.search) {
             // alert("链接已失效,请重新打开")
             window.location.href = AddUrl
@@ -442,18 +443,15 @@ let app = new Vue({
 
         let date = new Date()
         let year = date.getFullYear()
-        let month
-        if (date.getMonth() - 1 < 10) {
-            month = "0" + (date.getMonth() - 1)
-            this.timeList1 = [year + "-" + month, year + "-" + date.getMonth()]
-            this.timeList2 = [year + "-" + month, year + "-" + date.getMonth()]
-
+        let month = date.getMonth() + 1
+        if (month < 10) {
+            month = "0" + month
+            this.timeList1 = [year + "-" + month, year + "-" + (month)]
+            this.timeList2 = [year + "-" + month, year + "-" + (month)]
         } else {
-            month = date.getMonth()
-            this.timeList1 = [year + "-" + (month - 1), year + "-" + date.getMonth()]
-            this.timeList2 = [year + "-" + (month - 1), year + "-" + date.getMonth()]
+            this.timeList1 = [year + "-" + (month), year + "-" + (month)]
+            this.timeList2 = [year + "-" + (month), year + "-" + (month)]
         }
-
         this.newList = listToChange(yearList, monthList)
         this.employmentList3.data = employmentList
         if (employmentList.length % 2 != 0) {
@@ -549,11 +547,11 @@ let app = new Vue({
                 if (item.flag) {
                     if (index == 0) {
                         that.leftFlag = true
-                        that.timeList2 = [that.allTimeList[1][1], that.allTimeList[1][0]]
+                        // that.timeList2 = [that.allTimeList[1][1], that.allTimeList[1][0]]
                         that.getPositionAll()
                     } else {
                         that.leftFlag = false
-                        that.timeList2 = [that.allTimeList[0][1], that.allTimeList[0][0]]
+                        // that.timeList2 = [that.allTimeList[0][1], that.allTimeList[0][0]]
                         that.getRecruitType()
                         setTimeout(() => {
                             let leftChange = that.$refs.leftChange
@@ -671,11 +669,11 @@ let app = new Vue({
                                 if (item.flag) {
                                     if (index == 0) {
                                         that.leftFlag = true
-                                        that.timeList2 = [that.allTimeList[1][1], that.allTimeList[1][0]]
+                                        // that.timeList2 = [that.allTimeList[1][1], that.allTimeList[1][0]]
                                         that.getPositionAll()
                                     } else {
                                         that.leftFlag = false
-                                        that.timeList2 = [that.allTimeList[0][1], that.allTimeList[0][0]]
+                                        // that.timeList2 = [that.allTimeList[0][1], that.allTimeList[0][0]]
                                         that.getRecruitType()
                                         setTimeout(() => {
                                             let leftChange = that.$refs.leftChange
@@ -710,11 +708,11 @@ let app = new Vue({
                         if (item.flag) {
                             if (index == 0) {
                                 that.leftFlag = true
-                                that.timeList2 = [that.allTimeList[1][1], that.allTimeList[1][0]]
+                                // that.timeList2 = [that.allTimeList[1][1], that.allTimeList[1][0]]
                                 that.getPositionAll()
                             } else {
                                 that.leftFlag = false
-                                that.timeList2 = [that.allTimeList[0][1], that.allTimeList[0][0]]
+                                // that.timeList2 = [that.allTimeList[0][1], that.allTimeList[0][0]]
                                 that.getRecruitType()
                                 setTimeout(() => {
                                     let leftChange = that.$refs.leftChange
@@ -951,15 +949,21 @@ let app = new Vue({
             });
         },
         scrollChange(index) {
+            let that = this;
             this.itemClass = "item_content_6",
-                this.rollFlag = false;
-            let listIndex = index
-            if (listIndex >= this.config1.data.length) {
-                listIndex = index - 11
+            this.rollFlag = false;
+
+            if(that.noteListIndex >= this.config1.data.length - 1){
+                that.noteListIndex = 0
+                this.recruitInfoIndex = 0
+            } else {
+                that.noteListIndex += 1
+                that.recruitInfoIndex += 1
+            }
+            // this.address = this.config1.data[listIndex][0] + "。"
+            if (this.config1.data[that.noteListIndex][0] && this.config1.data[that.noteListIndex][1]) {
+                this.rollTitle = this.config1.data[that.noteListIndex][0] + this.config1.data[that.noteListIndex][1] + "双选公告"
             }
-            this.recruitInfoIndex = listIndex
-            this.address = this.config1.data[listIndex][0] + "。"
-            this.rollTitle = this.config1.data[listIndex][0] + this.config1.data[listIndex][1] + "双选公告"
             setTimeout(() => {
                 this.rollFlag = true
             })
@@ -2385,12 +2389,12 @@ let app = new Vue({
                 that.leftIndex = index
                 if (index == 0) {
                     that.leftFlag = true
-                    that.timeList2 = [that.allTimeList[1][1], that.allTimeList[1][0]]
+                    // that.timeList2 = [that.allTimeList[1][1], that.allTimeList[1][0]]
                     that.getPositionAll()
 
                 } else {
                     that.leftFlag = false
-                    that.timeList2 = [that.allTimeList[0][1], that.allTimeList[0][0]]
+                    // that.timeList2 = [that.allTimeList[0][1], that.allTimeList[0][0]]
                     that.getRecruitType()
 
                     setTimeout(() => {
@@ -2404,11 +2408,11 @@ let app = new Vue({
                         if (item.flag) {
                             if (index == 0) {
                                 that.leftFlag = true
-                                that.timeList2 = [that.allTimeList[1][1], that.allTimeList[1][0]]
+                                // that.timeList2 = [that.allTimeList[1][1], that.allTimeList[1][0]]
                                 that.getPositionAll()
                             } else {
                                 that.leftFlag = false
-                                that.timeList2 = [that.allTimeList[0][1], that.allTimeList[0][0]]
+                                // that.timeList2 = [that.allTimeList[0][1], that.allTimeList[0][0]]
                                 that.getRecruitType()
                                 setTimeout(() => {
                                     let leftChange = that.$refs.leftChange
@@ -2523,8 +2527,8 @@ let app = new Vue({
         },
         funChangeList(idnex) {
             let listIndex = idnex
-            this.address = this.config1.data[listIndex][0] + "。"
-            this.rollTitle = this.config1.data[listIndex][0] + this.config1.data[listIndex][1] + "双选公告"
+            // this.address = this.config1.data[listIndex][0] + "。"
+            this.rollTitle = this.config1.data[listIndex][0] + this.config1.data[listIndex][1] + "双选公告" || ""
             setTimeout(() => {
                 this.rollFlag = true
             })
@@ -2702,11 +2706,11 @@ let app = new Vue({
                             if (item.flag) {
                                 if (index == 0) {
                                     that.leftFlag = true
-                                    that.timeList2 = [that.allTimeList[1][1], that.allTimeList[1][0]]
+                                    // that.timeList2 = [that.allTimeList[1][1], that.allTimeList[1][0]]
                                     that.getPositionAll()
                                 } else {
                                     that.leftFlag = false
-                                    that.timeList2 = [that.allTimeList[0][1], that.allTimeList[0][0]]
+                                    // that.timeList2 = [that.allTimeList[0][1], that.allTimeList[0][0]]
                                     that.getRecruitType()
                                     setTimeout(() => {
                                         let leftChange = that.$refs.leftChange
@@ -3144,11 +3148,11 @@ let app = new Vue({
                                 if (item.flag) {
                                     if (index == 0) {
                                         that.leftFlag = true
-                                        that.timeList2 = [that.allTimeList[1][1], that.allTimeList[1][0]]
+                                        // that.timeList2 = [that.allTimeList[1][1], that.allTimeList[1][0]]
                                         that.getPositionAll()
                                     } else {
                                         that.leftFlag = false
-                                        that.timeList2 = [that.allTimeList[0][1], that.allTimeList[0][0]]
+                                        // that.timeList2 = [that.allTimeList[0][1], that.allTimeList[0][0]]
                                         that.getRecruitType()
                                         setTimeout(() => {
                                             let leftChange = that.$refs.leftChange

+ 2 - 2
cokingCoal/js/newIndex.js

@@ -6748,8 +6748,8 @@ let app = new Vue({
                     } else {
                         x = res.thisyear.x
                     }
-                    y1 = res.lastyear.y
-                    y2 = res.thisyear.y
+                    y1 = res.thisyear.y
+                    y2 = res.lastyear.y
                     leftEndList = {
                         x,
                         y1,