9
0

5 Revīzijas 96705ae3e9 ... dd8f282bd0

Autors SHA1 Ziņojums Datums
  zhouzh dd8f282bd0 xiugai 3 gadi atpakaļ
  zhouzh 8b24a4190b 3.18 3 gadi atpakaļ
  zhouzh dadf8112c9 3.18 3 gadi atpakaļ
  zhouzh 62d8b3cd70 Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass 3 gadi atpakaļ
  zhouzh d497173593 3.16 3 gadi atpakaļ

+ 2 - 2
build/utils.js

@@ -18,8 +18,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
 
 
 
 
 
-//  let devModules = ['all']
-let devModules = ['index','inward','SporadicManage']
+ let devModules = ['all']
+// let devModules = ['index','inward','SporadicManage']
 // let devModules = ['index','inward']
 // let devModules = ['index','inward']
 // let devModules = ['index','SporadicManage','RMS','statisticalReport']
 // let devModules = ['index','SporadicManage','RMS','statisticalReport']
 // let devModules = ['index','inward','statisticalReport']
 // let devModules = ['index','inward','statisticalReport']

+ 5 - 6
config/index.js

@@ -64,18 +64,17 @@ let proxyTable = {
   },
   },
   // 所有数据的请求域名地址
   // 所有数据的请求域名地址
   "/api/v1": {
   "/api/v1": {
-    // target: "http://172.16.33.166:8080",
-    // target: "http://192.168.1.112:8019",
-    target: "http://localhost:8080",
-    // target: "http://192.168.1.107:8080",
+     target: "http://172.16.33.166:8080",
+    // target: "http://localhost:8080",
+ 
     ws: true,
     ws: true,
     pathRewrite: {
     pathRewrite: {
       "^/api/v1": "/api/v1"
       "^/api/v1": "/api/v1"
     }
     }
   },
   },
   "/views/api/v1": {
   "/views/api/v1": {
-    target: "http://172.16.33.166:8080",
-    // target: "http://172.16.33.166:8080",
+    // target: "http://localhost:8080",
+     target: "http://172.16.33.166:8080",
     // target: "http://192.168.1.115:8080",
     // target: "http://192.168.1.115:8080",
     ws: true,
     ws: true,
     pathRewrite: {
     pathRewrite: {

BIN
dist.rar


+ 3 - 3
src/views/statisticalReport/components/inwardReport/inwardFactory.vue

@@ -46,7 +46,7 @@ export default {
     };
     };
   }, 
   }, 
   created(){
   created(){
-          this.option.requestUrl = '/api/v1/tms/getInwardReport?apiId=452&startTime=null&endTime=null&i=' +new Date()
+          this.option.requestUrl = '/api/v1/tms/getInwardReport?apiId=459&startTime=null&endTime=null&i=' +new Date()
   },
   },
   methods: {
   methods: {
     func(res){
     func(res){
@@ -61,7 +61,7 @@ export default {
         this.totalCapacity = currentCapacityTotal;
         this.totalCapacity = currentCapacityTotal;
     },
     },
     getRequestUrl(){
     getRequestUrl(){
-        this.option.requestUrl = '/api/v1/tms/getInwardReport?apiId=452&startTime=null&endTime=null&i=' +new Date();
+        this.option.requestUrl = '/api/v1/tms/getInwardReport?apiId=459&startTime=null&endTime=null&i=' +new Date();
      
      
     },
     },
     onclick() {
     onclick() {
@@ -75,7 +75,7 @@ export default {
       }
       }
       if(startTime && endTime){
       if(startTime && endTime){
         if(startTime < endTime){
         if(startTime < endTime){
-          this.option.requestUrl = '/api/v1/tms/getInwardReport?apiId=441' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          this.option.requestUrl = '/api/v1/tms/getInwardReport?apiId=459' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
         }else{
         }else{
           this.startTime = null;
           this.startTime = null;
           this.endTime = null;
           this.endTime = null;