fengxu пре 2 година
родитељ
комит
d937f210aa
3 измењених фајлова са 35 додато и 8 уклоњено
  1. 13 1
      cokingCoal/js/humanResources.js
  2. 21 6
      cokingCoal/js/newIndex.js
  3. 1 1
      cokingCoal/js/request.js

+ 13 - 1
cokingCoal/js/humanResources.js

@@ -2307,7 +2307,7 @@ let app = new Vue({
                         }
                         that.itemClass = "item_content_" + (that.configDataIndex + 5)
                         that.funChangeList(that.configDataIndex)
-                        console.log(that.itemClass);
+                        // console.log(that.itemClass);
                         that.configDataIndex += 1
                     }, that.config1.waitTime)
                 } else {
@@ -2604,6 +2604,18 @@ 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=>{
+                                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("|","-")
+                            })
+                        }
+                    }
                     if (type == 1) {
                         that.configWritten.data = that.getNo(res.bishiList)
                         setTimeout(() => {

+ 21 - 6
cokingCoal/js/newIndex.js

@@ -4751,9 +4751,14 @@ let app = new Vue({
         },
         initEchartsBar(el, data, color) {
             this.studentEcharts = echarts.init(el);
-            data.x.forEach(item => {
-                item = item.slice(0, -2)
-            })
+            if(Array.isArray(data.x)){
+                data.x.forEach(item => {
+                    item = item.slice(0, -2)
+                })
+            } else {
+                return
+            }
+            
             let xLabel = data.x
             option = {
                 grid: {
@@ -5538,8 +5543,6 @@ let app = new Vue({
                             index = index + 1
                         }
                     })
-                    console.log(that.organizationList.length);
-                    console.log(that.organizationList);
                     if (that.organizationList.length == 3) {
                         that.organizationList.push(...res.data)
                     }
@@ -6710,6 +6713,19 @@ let app = new Vue({
                         }
                     })
                     if (that.fetchIndex == 3) {
+                        this.organizationList = [{
+                            name: "职能部门",
+                            flag: true,
+                            value: 18
+                        }, {
+                            name: "共享中心",
+                            flag: false,
+                            value: 12
+                        }, {
+                            name: "事业部",
+                            flag: false,
+                            value: 5
+                        }]
                         that.getDistributionInfo()
                         that.fetchIndex = 0
 
@@ -6720,7 +6736,6 @@ let app = new Vue({
                         that.getDept(false)
                         return
                     }
-                    console.log(12312132132);
                     res.data[0].flag = true
                     that.organizationList.push(...res.data)
                     console.log(that.organizationList);

+ 1 - 1
cokingCoal/js/request.js

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