fengxu 2 роки тому
батько
коміт
96a00cfefa
3 змінених файлів з 47 додано та 25 видалено
  1. 17 17
      cokingCoal/hr.html
  2. 5 4
      cokingCoal/js/humanResources.js
  3. 25 4
      cokingCoal/js/request.js

+ 17 - 17
cokingCoal/hr.html

@@ -373,23 +373,23 @@
                         <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">
-                                <!-- <p class="item_title">{{ noticeList[noticeIndex].title  }}</p> -->
-                                <p class="item_title">山西焦煤西山煤电斜沟煤矿井下操作工招聘公示</p>
-                                <p class="item_con" style="text-indent: 40px;line-height: 50px;">
-                                    根据2023年7月1日发布的《山西焦煤西山煤电杜儿坪矿井下操作工双选公告》相关要求,经过双选平台发布岗位、自主报名、资格审查、综合测评等流程,双选结果公示,拟录用陈英等14名员工。现将拟录用人员名单予以公示。<br>
-                                </p>
-                                <p class="item_con" style="text-indent: 40px;line-height: 40px;">
-                                    公示时间为2023年9月1日至9月7日(5个工作日),对双选结果有异议可在公示期内通过电话形式反馈情况。<br>
-                                </p>
-                                <p class="item_con" style="text-indent: 40px;line-height: 40px;">
-                                    受理电话:0351-8305319<br>
-
-                                </p>
-                                <!-- <div class="item_con">
-                                    <span class="item_con_main">{{ noticeList[noticeIndex].mdnb_noticecontent }}</span>
-                                </div> -->
-                            </div>
+                                <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>
+                                    <p class="item_con" style="text-indent: 40px;line-height: 40px;">
+                                        公示时间为2023年9月1日至9月7日(5个工作日),对双选结果有异议可在公示期内通过电话形式反馈情况。<br>
+                                    </p>
+                                    <p class="item_con" style="text-indent: 40px;line-height: 40px;">
+                                        受理电话:0351-8305319<br>
+    
+                                    </p> -->
+                                    <div class="item_con">
+                                        <span class="item_con_main">{{ noticList[noticIndex].noticeDataList.mdnb_noticecontent }}</span>
+                                    </div>
+                                </div>
 
                             <!-- </vue-seamless-scroll> -->
                         </div>

+ 5 - 4
cokingCoal/js/humanResources.js

@@ -2663,6 +2663,7 @@ let app = new Vue({
 
             that.employmentList1.data = []
             that.employmentList2.data = []
+            that.employmentList3.data = []
 
 
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getNotice", data).then(res => {
@@ -2684,13 +2685,14 @@ let app = new Vue({
                             that.employmentList2.data.push(item)
                         }
                     })
-
+                    that.employmentList3.data.push(...that.noticList[that.noticIndex].noticeUserList)
                     that.noticIndex += 1
 
                     if (that.employmentList2.data.length <= that.employmentList2.rowNum) {
                         that.noticTime = setInterval(() => {
                             that.employmentList1.data = []
                             that.employmentList2.data = []
+                            that.employmentList3.data = []
 
 
                             that.isShowList = false
@@ -2701,9 +2703,8 @@ let app = new Vue({
                                     that.employmentList2.data.push(item)
                                 }
                             })
-
-                            console.log(that.employmentList1.data);
-
+                            that.employmentList3.data.push(...that.noticList[that.noticIndex].noticeUserList)
+                            console.log(that.employmentList3.data);
                             that.noticIndex += 1
 
                             if (that.noticIndex > that.noticList.length - 1) {

+ 25 - 4
cokingCoal/js/request.js

@@ -14,7 +14,7 @@ function isLocalEnv() {
 
 
 
-window.apiType = "sit"  // dev 本地测试 ,  sit  线上测试  uat  客户测试环境
+window.apiType = "sit"  // dev 本地测试 ,  sit  线上测试  uat  客户测试环境 prod  正式环境
 window.fetchUrl = ""
 // window.fetchUrl = "http://172.21.9.236:8081"
 
@@ -25,6 +25,8 @@ if (window.apiType == "dev") {
   window.fetchUrl = "http://172.21.9.236:8081"
 } else if (window.apiType == "uat") {
   window.fetchUrl = "http://172.21.12.247:8081"
+} else if(window.apiType == "prod"){
+  window.fetchUrl = "http://172.21.12.244:8081"
 }
 
 // api 前缀
@@ -208,7 +210,14 @@ function localEnvAppToken() {
         tenantid: "jmuatierp",
         accountId: "1609428936914108416",
       }
-    } else {
+    } else if(window.apiType == "prod") {
+      data = {
+        appId: "jsc",
+        appSecuret: '{Li$d73F13x"+ASb',
+        tenantid: "jmierp",
+        accountId: "1507155316804943872",
+      }
+    }else {
       console.log("未知类型");
       return
     }
@@ -256,12 +265,24 @@ function getLocalEnvAccessToken() {
       }
     } else if (window.apiType == "uat") {
       data = {
-        appId: "jsc",
+        // appId: "jsc",
         apptoken: localStorage.getItem("app_token"),
-        appSecuret: "Cs?9HeKqacN%gnu3",
+        // appSecuret: "Cs?9HeKqacN%gnu3",
         tenantid: "jmuatierp",
+        user: "17649834944",
+        usertype: "Mobile",
         accountId: "1609428936914108416",
       }
+    }  else if(window.apiType == "prod") {
+      data = {
+        // appId: "jsc",
+        user: "18035133443",
+        usertype: "Mobile",
+        apptoken: localStorage.getItem("app_token"),
+        // appSecuret: '{Li$d73F13x"+ASb',
+        tenantid: "jmierp",
+        accountId: "1507155316804943872",
+      }
     } else {
       console.log("未知类型");
       return