diff --git a/default - 副本.conf b/default - 副本.conf new file mode 100644 index 00000000..4e317c70 --- /dev/null +++ b/default - 副本.conf @@ -0,0 +1,21 @@ +server { + listen 80; + server_name localhost; + default_type 'text/html'; + charset utf-8; + + location @fallback{ + rewrite .* /index.html break; + } + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + try_files $uri /index.html; + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue index 33a14bb4..4f2db09f 100644 --- a/src/views/mes/reportWork/index.vue +++ b/src/views/mes/reportWork/index.vue @@ -177,7 +177,7 @@ - + { + if(response.code ==200){ + _this.$modal.msgSuccess("报工成功"); + } + _this.loading = false; + }); }).then(() => { - this.getList(); - //this.$modal.msgSuccess("报工成功"); - }).catch(() => {}); + + }).catch(() => { + + }); }, /** 报工详情按钮操作 */ handleReportHz(row) { diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue index 3dc1d04b..a16f56f9 100644 --- a/src/views/quality/qcProduce/index.vue +++ b/src/views/quality/qcProduce/index.vue @@ -196,6 +196,11 @@ + + +