From 2f82f2edd23d6aecc1b474c65136155ffa28c95e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Wed, 13 Nov 2024 11:37:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=92=8Cnginx=E9=85=8D=E7=BD=AE=20=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9=20Vue2=E5=8D=87=E7=BA=A7Vue3=2010/2?=
 =?UTF-8?q?5-11-11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nginx.conf     | 21 +++++++++++++++++++++
 src/pages.json | 25 ++++++++++++++++++++++++-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/nginx.conf b/nginx.conf
index 736b3465..c41ac366 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -41,6 +41,27 @@ http {
 			proxy_set_header X-Real-IP  $remote_addr;
 			proxy_set_header X-Forwarded-For $http_x_forwarded_for;
 		}
+		location ^~ /jmreport/ {
+        	proxy_pass http://localhost:100/jmreport/;
+        	proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header;
+        	proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for;
+        	proxy_set_header X-Real-IP      $remote_addr;
+        	proxy_set_header X-Forwarded-For $http_x_forwarded_for;
+        }
+        location ^~ /magic/ {
+        	proxy_pass http://localhost:100/magic/;
+        	proxy_next_upstream http_500 http_502 http_503 http_504 error timeout invalid_header;
+        	proxy_set_header X-Forwared-For $proxy_add_x_forwarded_for;
+        	proxy_set_header X-Real-IP      $remote_addr;
+        	proxy_set_header X-Forwarded-For $http_x_forwarded_for;
+        }
+        location /profile/ {
+        	proxy_cache my_zone;
+        	proxy_cache_valid  200 304 12h;
+        	proxy_cache_key $host$uri$is_args$args;
+        	alias /opt/profile/;
+        	index index.html index.htm;
+        }
 		location / {
 			proxy_cache my_zone;
 			proxy_cache_valid  200 304 12h;
diff --git a/src/pages.json b/src/pages.json
index da7a52b9..e57dba01 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -692,6 +692,13 @@
 				"enablePullDownRefresh": false
 			}
 		},
+		{
+			"path": "pages/issue/job/issueDetailBatch",
+			"style": {
+				"navigationBarTitleText": "发料任务详情",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/issue/job/issueJob0816",
 			"style": {
@@ -1557,6 +1564,22 @@
 
 			}
 		},
+		{
+			"path": "pages/productPutaway/record/fgDirectPutawayByBatch",
+			"style": {
+				"navigationBarTitleText": "装配直接上架",
+				"enablePullDownRefresh": false
+
+			}
+		},
+		{
+			"path": "pages/productPutaway/record/semiDirectPutawayByBatch",
+			"style": {
+				"navigationBarTitleText": "预生产直接上架",
+				"enablePullDownRefresh": false
+
+			}
+		},
 		{
 			"path": "pages/productPutaway/request/putawayRequest",
 			"style": {
@@ -2233,7 +2256,7 @@
 		{
 			"path": "pages/inventoryMove/record/okToHoldRecord",
 			"style": {
-				"navigationBarTitleText": "合格转隔离记录",
+				"navigationBarTitleText": "物料转隔离记录",
 				"enablePullDownRefresh": true
 			}
 		},