# 提交分版本配置

Dockerfile → Dockerfile-prod

@@ -6,7 +6,7 @@ RUN echo "server {  \
                       listen       81; \
                       client_max_body_size 50M; \
                       location   /api/ { \
-                      proxy_pass              http://192.168.3.91:8084/; \
+                      proxy_pass              http://192.168.3.91:8080/; \
                       proxy_redirect          off; \
                       proxy_set_header        Host mes-pad; \
                       proxy_set_header        X-Real-IP \$remote_addr; \

Dockerfile-test

+FROM nginx
+MAINTAINER xin.lu
+VOLUME /tmp
+ENV LANG en_US.UTF-8
+RUN echo "server {  \
+                      listen       81; \
+                      client_max_body_size 50M; \
+                      location   /api/ { \
+                      proxy_pass              http://192.168.3.91:8100/; \
+                      proxy_redirect          off; \
+                      proxy_set_header        Host mes-pad; \
+                      proxy_set_header        X-Real-IP \$remote_addr; \
+                      proxy_set_header        X-Forwarded-For \$proxy_add_x_forwarded_for; \
+                  } \
+                  #解决Router(mode: 'history')模式下，刷新路由地址不能找到页面的问题 \
+                  location / { \
+                     root   /var/mes/mes-pad/; \
+                      index  index.html index.htm; \
+                      if (!-e \$request_filename) { \
+                          rewrite ^(.*)\$ /index.html?s=\$1 last; \
+                          break; \
+                      } \
+                  } \
+                  access_log  /var/log/nginx/access.log ; \
+              } " > /etc/nginx/conf.d/default.conf \
+    &&  mkdir  -p  /var/mes \
+    &&  mkdir -p /var/mes/mes-pad
+
+ADD / /var/mes/mes-pad/
+EXPOSE 80
+EXPOSE 443

common/config.js

@@ -22,7 +22,10 @@ const config = {
 
 // 设置后台接口服务的基础地址
 // config.baseUrl = 'http://192.168.3.91:8080';
-config.baseUrl = 'http://192.168.3.91:8080';//测试环境
+// config.baseUrl = 'http://192.168.3.91:8100';
+config.baseUrl = '/api';
+
+//测试环境
 // config.baseUrl = 'http://192.168.3.91:8080';
 //config.baseUrl = "http://101.43.244.58:8080/";
 //config.baseUrl = "http://101.200.162.168:8080";

common/http.api.js

@@ -273,6 +273,7 @@ const install = (Vue, vm) => {
       //查看生产工单
       getWorkorder: (params = {}) =>
         vm.$u.get(config.adminPath + '/mes/pro/workorder/list', params),
+      
       //查看生产工单
       getWorkorderWithSizeAndDirective: (params = {}) =>
         vm.$u.get(

static/css/amebase.css

@@ -81,4 +81,20 @@
   /* 垂直居中 */
   justify-content: flex-start;
   /* 水平左对齐 */
+}
+
+
+
+.qcbutton {
+  display: flex;
+  margin-right: 10px; /* 外边距 需要的间隔大小 */
+  padding-right: 10px; /* 内边距 需要的间隔大小 */
+
+  /* gap: 10px; 或者你需要的间隔大小 */
+}
+
+
+.qcradio {
+  display: flex;
+  flex-direction: column;
 }
\ No newline at end of file