diff --git a/src/views/mes/wip/operation-out/jmIndex.vue b/src/views/mes/wip/operation-out/jmIndex.vue index 2a04066..ca9c894 100644 --- a/src/views/mes/wip/operation-out/jmIndex.vue +++ b/src/views/mes/wip/operation-out/jmIndex.vue @@ -498,6 +498,7 @@ export default { site: this.searchForm.site, operation: this.searchForm.operation, resrce: this.searchForm.resrce, + rollType: this.searchForm.rollType, operationList: this.operationList, autoOperationList: this.autoOperationList, autoResource: this.getResource, diff --git a/src/views/mes/wip/operation-out/tbIndex.vue b/src/views/mes/wip/operation-out/tbIndex.vue index 5c09dd1..95da02b 100644 --- a/src/views/mes/wip/operation-out/tbIndex.vue +++ b/src/views/mes/wip/operation-out/tbIndex.vue @@ -576,6 +576,7 @@ export default { site: this.site, operation: this.searchForm.operation, resrce: this.searchForm.resrce, + rollType: this.searchForm.rollType, operationList: this.operationList, autoOperationList: this.autoOperationList, autoResource: this.getResource, diff --git a/web.conf b/web.conf index 9d3ccb5..e3b20af 100644 --- a/web.conf +++ b/web.conf @@ -14,7 +14,7 @@ server { root /app/www; # 若新增后端路由前缀注意在此处添加(|新增) - location ~* ^/(code|auth|admin|monitor|actuator|gen|job|tx|act|mp|pay|jimu|aj|rpt|iep-app|iep-pms|iep-tms|iep-tap|iep-qms|iep-alm|tqm-lims|iep-oem|iep-tds|iep-wms|iep-flow|iep-dcc|iMES-jxls|nlv-wms|nlv-print|mom-xxl-job-admin|iep-int|mom-wms) { + location ~* ^/(code|auth|admin|monitor|actuator|gen|job|tx|act|mp|pay|jimu|aj|rpt|iep-app|iep-pms|iep-tms|iep-tap|iep-qms|iep-alm|tqm-lims|iep-oem|iep-tds|iep-wms|iep-flow|iep-dcc|iMES-jxls|nlv-wms|nlv-print|mom-xxl-job-admin|mom-wms) { proxy_pass http://mom-gateway:9999; proxy_connect_timeout 15s; proxy_send_timeout 15s;