tijiao

build/utils.js

@@ -15,8 +15,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // ['index','appoint'，'configManager','homepage','inward','queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-// let devModules = ['all'];
-let devModules = ['index','statisticalReport','SporadicManage','inward'];
+let devModules = ['all'];
+// let devModules = ['index','statisticalReport','appoint','RMS','TMS'];
+// let devModules = ['index'];
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

config/index.js

@@ -54,11 +54,18 @@ let proxyTable = {
       "^/api/v1/cd": "/api/v1/cd"
     }
   },
+  //抽奖结果的接口
+  "/game/v1": {
+    target: "http://172.16.33.166:9002",
+    ws: true,
+    pathRewrite: {
+      "^/game/v1": "/v1"
+    }
+  },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://localhost:8087",
-    // target: "http://192.168.1.102:8019",
-    // target: "http://localhost:8019",
+    target: "http://172.16.33.166:8080",
+    // target: "http://192.168.1.109:8019",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

nginx.conf

@@ -37,6 +37,15 @@ http {
 
     server {
         root /usr/share/nginx/html/;
+
+        location /game/v1 {
+            rewrite ^/icore.icp.web/game(.*)$ /$1 break; # 去除本地接口/api前缀, 否则会出现404
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_pass http://oa-system-game-service/v1; # 转发地址
+        }
+        
         location /views/icore.icp.web/pass/v1 {
 		    rewrite ^/b/(.*)$ /$1 break; # 去除本地接口/api前缀, 否则会出现404
 			port_in_redirect   on;

src/views/RMS/components/editConsignee.vue

@@ -21,7 +21,6 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
 export default {
   components: { PageTitle },
   data() {
@@ -68,7 +67,7 @@ console.log(this.$route.params)
          consigneeAbbreviation:this.form1.consigneeAbbreviation,
          consigneeRegisteredAddress:this.form1.consigneeRegisteredAddress,
          consigneeReceiveAddress:this.form1.consigneeReceiveAddress,
-         consigneeRegistrationTime:this.form1. consigneeRegistrationTime,
+         consigneeRegistrationTime:this.form1.consigneeRegistrationTime,
          consigneeContactName:this.form1.consigneeContactName,
          consigneeContactTel:this.form1.consigneeContactTel,
        };

src/views/RMS/components/editSupplier.vue

@@ -21,7 +21,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {

src/views/RMS/components/supplier.vue

@@ -71,6 +71,7 @@ export default {
         center: true,
       })
         .then(() => {
+          console.log("scope.row.supplierId",scope.row.supplierId)
           this.axios
             .post("/api/v1/rms/deleteSupplier/" + scope.row.supplierId)
             .then((res) => {

src/views/index/components/luckDraw.vue

@@ -109,20 +109,25 @@ export default {
             this.height = window.innerHeight - 200
         },
         initialization(){
-           let arr;
-            for(var i = 0 ;i<1000;i++){
-                let num = i + 1;
-                arr = {
-                    prop1:'测试' + num,
-                }
-                this.tableData1.push(arr)
-            }
+            this.axios.get('/game/v1/rflemplotterys/').then((res)=>{
+                this.tableData1 = res.data.list
+            })
+            console.log(this.tableData1)
+        //    let arr;
+        //     for(var i = 0 ;i<1000;i++){
+        //         let num = i + 1;
+        //         arr = {
+        //             prop1:'测试' + num,
+        //         }
+        //         this.tableData1.push(arr)
+        //     }
             this.total = this.tableData1.length;
+            
         },
         //查询事件
         selectClick(){
             this.selectLoading = true;
-            console.log(this.form)
+            
             this.selectLoading = false;
         },
         //行间样式