Browse Source

表数据bug修复

zhbyyy 2 years ago
parent
commit
948687d2d1

+ 18 - 18
manpowerPort/js/index.js

@@ -181,18 +181,18 @@ let app = new Vue({
         // "language": "zh_CN"
 
         // UAT环境
-        "appId": "CockpitScreen",
-        "appSecuret": "JSCdpsjgl@539126",
-        "tenantid": "uatierp",
-        "accountId": "1490670568960163840",
-        "language": "zh_CN"
-
-        // 生产环境
         // "appId": "CockpitScreen",
         // "appSecuret": "JSCdpsjgl@539126",
-        // "tenantid": "ierp",
-        // "accountId": "1504594026697850880",
+        // "tenantid": "uatierp",
+        // "accountId": "1490670568960163840",
         // "language": "zh_CN"
+
+        // 生产环境
+        "appId": "CockpitScreen",
+        "appSecuret": "JSCdpsjgl@539126",
+        "tenantid": "ierp",
+        "accountId": "1504594026697850880",
+        "language": "zh_CN"
       }
       post('/ierp/api/getAppToken.do', value).then(res => {
         this.app_token = res.data.app_token
@@ -217,18 +217,18 @@ let app = new Vue({
         // "usertype": "UserName"
 
         // UAT环境
-        "user": "jiashicangjiekou",
-        "apptoken": this.app_token,
-        "tenantid": "uatierp",
-        "accountId": "1490670568960163840",
-        "usertype": "UserName"
-
-        // 生产环境
         // "user": "jiashicangjiekou",
         // "apptoken": this.app_token,
-        // "tenantid": "ierp",
-        // "accountId": "1504594026697850880",
+        // "tenantid": "uatierp",
+        // "accountId": "1490670568960163840",
         // "usertype": "UserName"
+
+        // 生产环境
+        "user": "jiashicangjiekou",
+        "apptoken": this.app_token,
+        "tenantid": "ierp",
+        "accountId": "1504594026697850880",
+        "usertype": "UserName"
       }
       post('/ierp/api/login.do', value).then(res => {
         this.access_token = res.data.access_token

+ 10 - 5
manpowerPort/js/index2JNKG.js

@@ -355,13 +355,18 @@ let app = new Vue({
             dataR5[1].push(item['ZBPZ0064'])
           })
           // 各二级企业利润与薪酬变动情况
-          dataR6[0] = []
-          dataR6[1] = []
+          // dataR6[0] = []
+          // dataR6[1] = []
+          // res.orgData.area5.card2.forEach(item => {
+          //   dataR6[0].push(item['ZBPZ0061'])
+          //   dataR6[1].push(item['ZBPZ0062'])
+          // })
+          fjxdataL2[0] = []
+          fjxdataL2[1] = []
           res.orgData.area5.card2.forEach(item => {
-            dataR6[0].push(item['ZBPZ0061'])
-            dataR6[1].push(item['ZBPZ0062'])
+            fjxdataL2[0].push(item['ZBPZ0061'])
+            fjxdataL2[1].push(item['ZBPZ0062'])
           })
-
           // 定任期
           // 弹窗
           tipData.analysis[6] = res.orgData.area6.intAnalysis.map(item => item.analysis)

+ 10 - 4
manpowerPort/js/index3MT.js

@@ -399,11 +399,17 @@ let app = new Vue({
             dataR5[1].push(item['ZBPZ0064'])
           })
           // 各二级企业利润与薪酬变动情况
-          dataR6[0] = []
-          dataR6[1] = []
+          // dataR6[0] = []
+          // dataR6[1] = []
+          // res.orgData.area5.card2.forEach(item => {
+          //   dataR6[0].push(item['ZBPZ0061'])
+          //   dataR6[1].push(item['ZBPZ0062'])
+          // })
+          fjxdataL2[0] = []
+          fjxdataL2[1] = []
           res.orgData.area5.card2.forEach(item => {
-            dataR6[0].push(item['ZBPZ0061'])
-            dataR6[1].push(item['ZBPZ0062'])
+            fjxdataL2[0].push(item['ZBPZ0061'])
+            fjxdataL2[1].push(item['ZBPZ0062'])
           })
 
           // 定任期

+ 10 - 4
manpowerPort/js/index4SY.js

@@ -351,11 +351,17 @@ let app = new Vue({
             dataR5[1].push(item['ZBPZ0064'])
           })
           // 各二级企业利润与薪酬变动情况
-          dataR6[0] = []
-          dataR6[1] = []
+          // dataR6[0] = []
+          // dataR6[1] = []
+          // res.orgData.area5.card2.forEach(item => {
+          //   dataR6[0].push(item['ZBPZ0061'])
+          //   dataR6[1].push(item['ZBPZ0062'])
+          // })
+          fjxdataL2[0] = []
+          fjxdataL2[1] = []
           res.orgData.area5.card2.forEach(item => {
-            dataR6[0].push(item['ZBPZ0061'])
-            dataR6[1].push(item['ZBPZ0062'])
+            fjxdataL2[0].push(item['ZBPZ0061'])
+            fjxdataL2[1].push(item['ZBPZ0062'])
           })
 
           // 定任期

+ 2 - 2
manpowerPort/js/request.js

@@ -60,8 +60,8 @@ const httpRequest = axios.create({
   // baseURL: 'http://172.21.9.23:8081', // SIT环境
   // baseURL: 'http://172.21.9.23:30001/api/', // SIT环境解决跨域
   // baseURL: 'http://172.27.1.243:8081', // UAT环境
-  baseURL: 'http://172.27.1.243:30001/api/', // UAT环境解决跨域
-  // baseURL: 'http://172.28.1.243:30001/api/', // 生产环境解决跨域
+  // baseURL: 'http://172.27.1.243:30001/api/', // UAT环境解决跨域
+  baseURL: 'http://172.28.1.243:30001/api/', // 生产环境解决跨域
 
   timeout: 3 * 60 * 1000, // 3分钟等待
   withCredentials: true // 携带cookie

+ 6 - 0
manpowerPort/styles/index.css

@@ -383,6 +383,12 @@ a {
   border-radius: 8px;
   cursor: pointer;
 }
+.tip-content-img {
+  height: 95%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 .tip-window2 {
   color: #69c0ff;
   display: inline-block;