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 } },