修改BUG

cokingCoal/js/humanResources.js

@@ -2604,15 +2604,15 @@ let app = new Vue({
             }
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/assessmentarrangement", data).then(res => {
                 if (res) {
-                    for(let key in res){
-                        if(Array.isArray(res[key])){
-                            res[key].forEach(item=>{
+                    for (let key in res) {
+                        if (Array.isArray(res[key])) {
+                            res[key].forEach(item => {
                                 item.splice(item.length - 2, 1);
-                                item[item.length - 1] = item[item.length - 1].replaceAll("年","-")
-                                item[item.length - 1] = item[item.length - 1].replaceAll("月","-")
-                                item[item.length - 1] = item[item.length - 1].replaceAll("日"," ")
-                                item[item.length - 1] = item[item.length - 1].replaceAll("/","-")
-                                item[item.length - 1] = item[item.length - 1].replaceAll("|","-")
+                                item[item.length - 1] = item[item.length - 1].replaceAll("年", "-")
+                                item[item.length - 1] = item[item.length - 1].replaceAll("月", "-")
+                                item[item.length - 1] = item[item.length - 1].replaceAll("日", " ")
+                                item[item.length - 1] = item[item.length - 1].replaceAll("/", "-")
+                                item[item.length - 1] = item[item.length - 1].replaceAll("|", "-")
                             })
                         }
                     }
@@ -2704,7 +2704,7 @@ let app = new Vue({
         getNotice() {
             let that = this;
             let data = {
-                flag: false
+                flag: true
             };
             this.isShowList = false
 
@@ -2712,13 +2712,11 @@ let app = new Vue({
             that.employmentList2.data = []
             that.employmentList3.data = []
 
+            that.noticIndex = 0
 
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/getNotice", data).then(res => {
                 if (res) {
                     res.forEach((item, index) => {
-                        if (index == 0) {
-                            item.noticeUserList[0].sex = "南"
-                        }
                         let obj = {
                             noticeDataList: item.noticeDataList,
                             noticeUserList: that.changeNoticList(item.noticeUserList)
@@ -2733,35 +2731,37 @@ let app = new Vue({
                         }
                     })
                     that.employmentList3.data.push(...that.noticList[that.noticIndex].noticeUserList)
-                    that.noticIndex += 1
+                    if (res.length != 1) {
+                        that.noticIndex += 1
 
-                    if (that.employmentList2.data.length <= that.employmentList2.rowNum) {
-                        that.noticTime = setInterval(() => {
-                            that.employmentList1.data = []
-                            that.employmentList2.data = []
-                            that.employmentList3.data = []
+                        if (that.employmentList2.data.length <= that.employmentList2.rowNum) {
+                            that.noticTime = setInterval(() => {
+                                that.employmentList1.data = []
+                                that.employmentList2.data = []
+                                that.employmentList3.data = []
 
 
-                            that.isShowList = false
-                            that.noticList[that.noticIndex].noticeUserList.forEach((item, index) => {
-                                if (index % 2 == 0) {
-                                    that.employmentList1.data.push(item)
-                                } else {
-                                    that.employmentList2.data.push(item)
-                                }
-                            })
-                            that.employmentList3.data.push(...that.noticList[that.noticIndex].noticeUserList)
-                            console.log(that.employmentList3.data);
-                            that.noticIndex += 1
+                                that.isShowList = false
+                                that.noticList[that.noticIndex].noticeUserList.forEach((item, index) => {
+                                    if (index % 2 == 0) {
+                                        that.employmentList1.data.push(item)
+                                    } else {
+                                        that.employmentList2.data.push(item)
+                                    }
+                                })
+                                that.employmentList3.data.push(...that.noticList[that.noticIndex].noticeUserList)
+                                that.noticIndex += 1
 
-                            if (that.noticIndex > that.noticList.length - 1) {
-                                that.noticIndex = 0
-                            }
-                            setTimeout(() => {
-                                that.isShowList = true
-                            }, 10)
-                        }, that.employmentList2.data.length * 2000)
+                                if (that.noticIndex > that.noticList.length - 1) {
+                                    that.noticIndex = 0
+                                }
+                                setTimeout(() => {
+                                    that.isShowList = true
+                                }, 10)
+                            }, that.employmentList2.data.length * 2000)
+                        }
                     }
+
                     setTimeout(() => {
                         that.isShowList = true
                     })

cokingCoal/js/newIndex.js

@@ -6750,7 +6750,7 @@ let app = new Vue({
                 flag: that.dataFlag
             };
             fetchPostMethods("/ierp/kapi/v2/mdnb/mdnb_control/DistributionAttachment", data).then(res => {
-                if (res) {
+                if (res && res.url) {
                     that.imageUrl = res.url
                 }
             })

cokingCoal/js/request.js

@@ -13,7 +13,7 @@ function isLocalEnv() {
 }
 
 
-window.apiType = "prod"  // dev 本地测试 ，  sit  线上测试  uat  客户测试环境 prod  正式环境
+window.apiType = "sit"  // dev 本地测试 ，  sit  线上测试  uat  客户测试环境 prod  正式环境
 if(window.location.search){
   apiType = window.location.search.split("=")[1]
 }