修改打包配置

.env.production2

@@ -0,0 +1,12 @@
+# 页面标题
+VUE_APP_TITLE = 丽水同创二辊轧机
+
+# 生产环境配置
+ENV = 'production'
+
+# 丽水同创二级系统/生产环境
+VUE_APP_BASE_API = '/prod-api'
+
+PROXY_TARGTE = 'http://localhost:8081'
+
+OUTDIR = 'dist'

.env.production4

@@ -0,0 +1,12 @@
+# 页面标题
+VUE_APP_TITLE = 丽水同创四辊轧机
+
+# 生产环境配置
+ENV = 'production'
+
+# 丽水同创二级系统/生产环境
+VUE_APP_BASE_API = '/prod-api'
+
+PROXY_TARGTE = 'http://localhost:8082'
+
+OUTDIR = 'dist2'

dist2/static/css/chunk-17ee1abe.ecea2c5f.css

@@ -1 +0,0 @@
-.icon-body[data-v-480c2f7f]{width:100%;padding:10px}.icon-body .icon-search[data-v-480c2f7f]{position:relative;margin-bottom:5px}.icon-body .icon-list[data-v-480c2f7f]{height:200px;overflow:auto}.icon-body .icon-list .list-container[data-v-480c2f7f]{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.icon-body .icon-list .list-container .icon-item-wrapper[data-v-480c2f7f]{width:33.33333%;height:25px;line-height:25px;cursor:pointer;display:-webkit-box;display:-ms-flexbox;display:flex}.icon-body .icon-list .list-container .icon-item-wrapper .icon-item[data-v-480c2f7f]{display:-webkit-box;display:-ms-flexbox;display:flex;max-width:100%;height:100%;padding:0 5px}.icon-body .icon-list .list-container .icon-item-wrapper .icon-item[data-v-480c2f7f]:hover{background:#ececec;border-radius:5px}.icon-body .icon-list .list-container .icon-item-wrapper .icon-item .icon[data-v-480c2f7f]{-ms-flex-negative:0;flex-shrink:0}.icon-body .icon-list .list-container .icon-item-wrapper .icon-item span[data-v-480c2f7f]{display:inline-block;vertical-align:-.15em;fill:currentColor;padding-left:2px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.icon-body .icon-list .list-container .icon-item-wrapper .icon-item.active[data-v-480c2f7f]{background:#ececec;border-radius:5px}

dist2/static/css/chunk-35800316.db631dbc.css

@@ -1 +0,0 @@
-.register{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:100%;background-image:url(../../static/img/login-background.f9f49138.jpg);background-size:cover}.title{margin:0 auto 30px auto;text-align:center;color:#707070}.register-form{border-radius:6px;background:#fff;width:400px;padding:25px 25px 5px 25px}.register-form .el-input,.register-form .el-input input{height:38px}.register-form .input-icon{height:39px;width:14px;margin-left:2px}.register-tip{font-size:13px;text-align:center;color:#bfbfbf}.register-code{width:33%;height:38px;float:right}.register-code img{cursor:pointer;vertical-align:middle}.el-register-footer{height:40px;line-height:40px;position:fixed;bottom:0;width:100%;text-align:center;color:#fff;font-family:Arial;font-size:12px;letter-spacing:1px}.register-code-img{height:38px}

dist2/static/css/chunk-46f2cf5c.17fbdb6b.css

@@ -1 +0,0 @@
-.wscn-http404-container[data-v-279ea4b2]{-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);position:absolute;top:40%;left:50%}.wscn-http404[data-v-279ea4b2]{position:relative;width:1200px;padding:0 50px;overflow:hidden}.wscn-http404 .pic-404[data-v-279ea4b2]{position:relative;float:left;width:600px;overflow:hidden}.wscn-http404 .pic-404__parent[data-v-279ea4b2]{width:100%}.wscn-http404 .pic-404__child[data-v-279ea4b2]{position:absolute}.wscn-http404 .pic-404__child.left[data-v-279ea4b2]{width:80px;top:17px;left:220px;opacity:0;-webkit-animation-name:cloudLeft-data-v-279ea4b2;animation-name:cloudLeft-data-v-279ea4b2;-webkit-animation-duration:2s;animation-duration:2s;-webkit-animation-timing-function:linear;animation-timing-function:linear;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards;-webkit-animation-delay:1s;animation-delay:1s}.wscn-http404 .pic-404__child.mid[data-v-279ea4b2]{width:46px;top:10px;left:420px;opacity:0;-webkit-animation-name:cloudMid-data-v-279ea4b2;animation-name:cloudMid-data-v-279ea4b2;-webkit-animation-duration:2s;animation-duration:2s;-webkit-animation-timing-function:linear;animation-timing-function:linear;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards;-webkit-animation-delay:1.2s;animation-delay:1.2s}.wscn-http404 .pic-404__child.right[data-v-279ea4b2]{width:62px;top:100px;left:500px;opacity:0;-webkit-animation-name:cloudRight-data-v-279ea4b2;animation-name:cloudRight-data-v-279ea4b2;-webkit-animation-duration:2s;animation-duration:2s;-webkit-animation-timing-function:linear;animation-timing-function:linear;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards;-webkit-animation-delay:1s;animation-delay:1s}@-webkit-keyframes cloudLeft-data-v-279ea4b2{0%{top:17px;left:220px;opacity:0}20%{top:33px;left:188px;opacity:1}80%{top:81px;left:92px;opacity:1}to{top:97px;left:60px;opacity:0}}@keyframes cloudLeft-data-v-279ea4b2{0%{top:17px;left:220px;opacity:0}20%{top:33px;left:188px;opacity:1}80%{top:81px;left:92px;opacity:1}to{top:97px;left:60px;opacity:0}}@-webkit-keyframes cloudMid-data-v-279ea4b2{0%{top:10px;left:420px;opacity:0}20%{top:40px;left:360px;opacity:1}70%{top:130px;left:180px;opacity:1}to{top:160px;left:120px;opacity:0}}@keyframes cloudMid-data-v-279ea4b2{0%{top:10px;left:420px;opacity:0}20%{top:40px;left:360px;opacity:1}70%{top:130px;left:180px;opacity:1}to{top:160px;left:120px;opacity:0}}@-webkit-keyframes cloudRight-data-v-279ea4b2{0%{top:100px;left:500px;opacity:0}20%{top:120px;left:460px;opacity:1}80%{top:180px;left:340px;opacity:1}to{top:200px;left:300px;opacity:0}}@keyframes cloudRight-data-v-279ea4b2{0%{top:100px;left:500px;opacity:0}20%{top:120px;left:460px;opacity:1}80%{top:180px;left:340px;opacity:1}to{top:200px;left:300px;opacity:0}}.wscn-http404 .bullshit[data-v-279ea4b2]{position:relative;float:left;width:300px;padding:30px 0;overflow:hidden}.wscn-http404 .bullshit__oops[data-v-279ea4b2]{font-size:32px;line-height:40px;color:#1482f0;margin-bottom:20px;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards}.wscn-http404 .bullshit__headline[data-v-279ea4b2],.wscn-http404 .bullshit__oops[data-v-279ea4b2]{font-weight:700;opacity:0;-webkit-animation-name:slideUp-data-v-279ea4b2;animation-name:slideUp-data-v-279ea4b2;-webkit-animation-duration:.5s;animation-duration:.5s}.wscn-http404 .bullshit__headline[data-v-279ea4b2]{font-size:20px;line-height:24px;color:#222;margin-bottom:10px;-webkit-animation-delay:.1s;animation-delay:.1s;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards}.wscn-http404 .bullshit__info[data-v-279ea4b2]{font-size:13px;line-height:21px;color:grey;margin-bottom:30px;-webkit-animation-delay:.2s;animation-delay:.2s;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards}.wscn-http404 .bullshit__info[data-v-279ea4b2],.wscn-http404 .bullshit__return-home[data-v-279ea4b2]{opacity:0;-webkit-animation-name:slideUp-data-v-279ea4b2;animation-name:slideUp-data-v-279ea4b2;-webkit-animation-duration:.5s;animation-duration:.5s}.wscn-http404 .bullshit__return-home[data-v-279ea4b2]{display:block;float:left;width:110px;height:36px;background:#1482f0;border-radius:100px;text-align:center;color:#fff;font-size:14px;line-height:36px;cursor:pointer;-webkit-animation-delay:.3s;animation-delay:.3s;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards}@-webkit-keyframes slideUp-data-v-279ea4b2{0%{-webkit-transform:translateY(60px);transform:translateY(60px);opacity:0}to{-webkit-transform:translateY(0);transform:translateY(0);opacity:1}}@keyframes slideUp-data-v-279ea4b2{0%{-webkit-transform:translateY(60px);transform:translateY(60px);opacity:0}to{-webkit-transform:translateY(0);transform:translateY(0);opacity:1}}

dist2/static/css/chunk-4f55a4ac.5a402cd2.css

@@ -1 +0,0 @@
-.panel-group[data-v-0ac8ac4e]{margin-top:18px}.panel-group .card-panel-col[data-v-0ac8ac4e]{margin-bottom:32px}.panel-group .card-panel[data-v-0ac8ac4e]{height:108px;cursor:pointer;font-size:12px;position:relative;overflow:hidden;color:#666;background:#fff;-webkit-box-shadow:4px 4px 40px rgba(0,0,0,.05);box-shadow:4px 4px 40px rgba(0,0,0,.05);border-color:rgba(0,0,0,.05)}.panel-group .card-panel:hover .card-panel-icon-wrapper[data-v-0ac8ac4e]{color:#fff}.panel-group .card-panel:hover .icon-people[data-v-0ac8ac4e]{background:#40c9c6}.panel-group .card-panel:hover .icon-message[data-v-0ac8ac4e]{background:#36a3f7}.panel-group .card-panel:hover .icon-money[data-v-0ac8ac4e]{background:#f4516c}.panel-group .card-panel:hover .icon-shopping[data-v-0ac8ac4e]{background:#34bfa3}.panel-group .card-panel .icon-people[data-v-0ac8ac4e]{color:#40c9c6}.panel-group .card-panel .icon-message[data-v-0ac8ac4e]{color:#36a3f7}.panel-group .card-panel .icon-money[data-v-0ac8ac4e]{color:#f4516c}.panel-group .card-panel .icon-shopping[data-v-0ac8ac4e]{color:#34bfa3}.panel-group .card-panel .card-panel-icon-wrapper[data-v-0ac8ac4e]{float:left;margin:14px 0 0 14px;padding:16px;-webkit-transition:all .38s ease-out;transition:all .38s ease-out;border-radius:6px}.panel-group .card-panel .card-panel-icon[data-v-0ac8ac4e]{float:left;font-size:48px}.panel-group .card-panel .card-panel-description[data-v-0ac8ac4e]{float:right;font-weight:700;margin:26px;margin-left:0}.panel-group .card-panel .card-panel-description .card-panel-text[data-v-0ac8ac4e]{line-height:18px;color:rgba(0,0,0,.45);font-size:16px;margin-bottom:12px}.panel-group .card-panel .card-panel-description .card-panel-num[data-v-0ac8ac4e]{font-size:20px}@media (max-width:550px){.card-panel-description[data-v-0ac8ac4e]{display:none}.card-panel-icon-wrapper[data-v-0ac8ac4e]{float:none!important;width:100%;height:100%;margin:0!important}.card-panel-icon-wrapper .svg-icon[data-v-0ac8ac4e]{display:block;margin:14px auto!important;float:none!important}}

dist2/static/css/chunk-5945e82b.f59a1d86.css

@@ -1 +0,0 @@
-.login{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:100%;background-image:url(../../static/img/login-background.f9f49138.jpg);background-size:cover}.title{margin:0 auto 30px auto;text-align:center;color:#707070}.login-form{border-radius:6px;background:#fff;width:400px;padding:25px 25px 5px 25px}.login-form .el-input,.login-form .el-input input{height:38px}.login-form .input-icon{height:39px;width:14px;margin-left:2px}.login-tip{font-size:13px;text-align:center;color:#bfbfbf}.login-code{width:33%;height:38px;float:right}.login-code img{cursor:pointer;vertical-align:middle}.el-login-footer{height:40px;line-height:40px;position:fixed;bottom:0;width:100%;text-align:center;color:#fff;font-family:Arial;font-size:12px;letter-spacing:1px}.login-code-img{height:38px}

dist2/static/css/chunk-5b83c289.ce2a2394.css

@@ -1 +0,0 @@
-.hljs{display:block;background:#fff;padding:.5em;color:#333;overflow-x:auto}.hljs-comment,.hljs-meta{color:#969896}.hljs-emphasis,.hljs-quote,.hljs-strong,.hljs-template-variable,.hljs-variable{color:#df5000}.hljs-keyword,.hljs-selector-tag,.hljs-type{color:#d73a49}.hljs-attribute,.hljs-bullet,.hljs-literal,.hljs-symbol{color:#0086b3}.hljs-name,.hljs-section{color:#63a35c}.hljs-tag{color:#333}.hljs-attr,.hljs-selector-attr,.hljs-selector-class,.hljs-selector-id,.hljs-selector-pseudo,.hljs-title{color:#6f42c1}.hljs-addition{color:#55a532;background-color:#eaffea}.hljs-deletion{color:#bd2c00;background-color:#ffecec}.hljs-link{text-decoration:underline}.hljs-number{color:#005cc5}.hljs-string{color:#032f62}

dist2/static/css/chunk-61408335.20b33cd6.css

@@ -1 +0,0 @@
-.pop_btn[data-v-e1e29174]{text-align:center;margin-top:20px}.popup-main[data-v-e1e29174]{position:relative;margin:10px auto;background:#fff;border-radius:5px;font-size:12px;overflow:hidden}.popup-title[data-v-e1e29174]{overflow:hidden;line-height:34px;padding-top:6px;background:#f2f2f2}.popup-result[data-v-e1e29174]{-webkit-box-sizing:border-box;box-sizing:border-box;line-height:24px;margin:25px auto;padding:15px 10px 10px;border:1px solid #ccc;position:relative}.popup-result .title[data-v-e1e29174]{position:absolute;top:-28px;left:50%;width:140px;font-size:14px;margin-left:-70px;text-align:center;line-height:30px;background:#fff}.popup-result table[data-v-e1e29174]{text-align:center;width:100%;margin:0 auto}.popup-result table span[data-v-e1e29174]{display:block;width:100%;font-family:arial;line-height:30px;height:30px;white-space:nowrap;overflow:hidden;border:1px solid #e8e8e8}.popup-result-scroll[data-v-e1e29174]{font-size:12px;line-height:24px;height:10em;overflow-y:auto}

dist2/static/css/chunk-65989782.78b49577.css

@@ -1 +0,0 @@
-.user-info-head[data-v-07624ce5]{position:relative;display:inline-block;height:120px}.user-info-head[data-v-07624ce5]:hover:after{content:"+";position:absolute;left:0;right:0;top:0;bottom:0;color:#eee;background:rgba(0,0,0,.5);font-size:24px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;cursor:pointer;line-height:110px;border-radius:50%}

dist2/static/css/chunk-6746b265.3e10cd59.css

@@ -1 +0,0 @@
-.icon-ul[data-v-2fa68d6e]{margin:0;padding:0;font-size:0}.icon-ul li[data-v-2fa68d6e]{list-style-type:none;text-align:center;font-size:14px;display:inline-block;width:16.66%;-webkit-box-sizing:border-box;box-sizing:border-box;height:108px;padding:15px 6px 6px 6px;cursor:pointer;overflow:hidden}.icon-ul li[data-v-2fa68d6e]:hover{background:#f2f2f2}.icon-ul li.active-item[data-v-2fa68d6e]{background:#e1f3fb;color:#7a6df0}.icon-ul li>i[data-v-2fa68d6e]{font-size:30px;line-height:50px}.icon-dialog[data-v-2fa68d6e] .el-dialog{border-radius:8px;margin-bottom:0;margin-top:4vh!important;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;max-height:92vh;overflow:hidden;-webkit-box-sizing:border-box;box-sizing:border-box}.icon-dialog[data-v-2fa68d6e] .el-dialog .el-dialog__header{padding-top:14px}.icon-dialog[data-v-2fa68d6e] .el-dialog .el-dialog__body{margin:0 20px 20px 20px;padding:0;overflow:auto}

dist2/static/css/chunk-78e2409b.0b7ecf5b.css

@@ -1 +0,0 @@
-.home1[data-v-6fc1171e]{width:100vw;height:100vh;background-image:url(../../static/img/login-background.f9f49138.jpg)}

dist2/static/css/chunk-e648d5fe.bbc9fa95.css

@@ -1 +0,0 @@
-.errPage-container[data-v-f2e02586]{width:800px;max-width:100%;margin:100px auto}.errPage-container .pan-back-btn[data-v-f2e02586]{background:#008489;color:#fff;border:none!important}.errPage-container .pan-gif[data-v-f2e02586]{margin:0 auto;display:block}.errPage-container .pan-img[data-v-f2e02586]{display:block;margin:0 auto;width:100%}.errPage-container .text-jumbo[data-v-f2e02586]{font-size:60px;font-weight:700;color:#484848}.errPage-container .list-unstyled[data-v-f2e02586]{font-size:14px}.errPage-container .list-unstyled li[data-v-f2e02586]{padding-bottom:5px}.errPage-container .list-unstyled a[data-v-f2e02586]{color:#008489;text-decoration:none}.errPage-container .list-unstyled a[data-v-f2e02586]:hover{text-decoration:underline}

dist2/static/css/chunk-ed37dce4.78b49577.css

@@ -1 +0,0 @@
-.user-info-head[data-v-07624ce5]{position:relative;display:inline-block;height:120px}.user-info-head[data-v-07624ce5]:hover:after{content:"+";position:absolute;left:0;right:0;top:0;bottom:0;color:#eee;background:rgba(0,0,0,.5);font-size:24px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;cursor:pointer;line-height:110px;border-radius:50%}

dist2/static/js/chunk-2d0f012d.ddeb06bb.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0f012d"],{"9b8f":function(e,r,n){"use strict";n.r(r);n("ac1f"),n("5319");var t,u,a={created:function(){var e=this.$route,r=e.params,n=e.query,t=r.path;this.$router.replace({path:"/"+t,query:n})},render:function(e){return e()}},c=a,o=n("2877"),p=Object(o["a"])(c,t,u,!1,null,null,null);r["default"]=p.exports}}]);

package.json

@@ -8,6 +8,8 @@
     "dev": "vue-cli-service serve",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
+    "build2": "vue-cli-service build --mode production2",
+    "build4": "vue-cli-service build --mode production4",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
   },

src/views/work/abnormal_process/index.vue

@@ -135,7 +135,7 @@
           </div>
           <div style="">
             <el-button type="primary" plain
-                       @click="reset" :loading="!submitButton">
+                       @click="reset" :loading="resetLoading">
               强制停止
             </el-button>
             <el-button type="success" plain
@@ -450,7 +450,8 @@ export default {
       processBatchId: 0,
       nowPass: {},
       nextStepLoading: false,
-      circleStart: 0
+      circleStart: 0,
+      resetLoading: false
     }
   },
   methods: {
@@ -466,11 +467,11 @@ export default {
     },
 
     reset() {
-      this.submitButton = false
+      this.resetLoading = false
       materialReset().then(res => {
         if (res.data == true) {
           this.$message('强制停止成功')
-          this.submitButton = true
+          this.resetLoading = true
           this.getDataList()
         } else {
           this.$message('强制停止失败，请联系管理员')

src/views/work/process/index.vue

@@ -135,7 +135,7 @@
             </div>
             <div style="">
               <el-button type="primary" plain
-                         @click="reset" :loading="!submitButton">
+                         @click="reset" :loading="resetLoading">
                 强制停止
               </el-button>
               <el-button type="success" plain
@@ -448,7 +448,8 @@ export default {
       passStateLoading: false,
       nowPass: {},
       newHTML: true,
-      nextStepLoading: false
+      nextStepLoading: false,
+      resetLoading: false,
     }
   },
   methods: {
@@ -463,8 +464,10 @@ export default {
     },
 
     reset() {
+      this.resetLoading = true
       materialReset().then(res => {
         if (res.data == true) {
+          this.resetLoading = false
           this.$message('强制停止成功')
           this.getDataList()
         } else {

vue.config.js

@@ -11,6 +11,10 @@ const name = process.env.VUE_APP_TITLE || '丽水同创二级系统（四辊）'
 
 const port = process.env.port || process.env.npm_config_port || 81 // 端口
 
+const outputDir = process.env.OUTDIR || 'dist'
+
+const proxyTarget = process.env.PROXY_TARGTE || 'http://localhost:8081'
+
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
 // 这里只列一部分，具体配置参考文档
@@ -21,7 +25,7 @@ module.exports = {
   publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   // outputDir: 'dist',
-  outputDir: 'dist2',
+  outputDir,
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
   assetsDir: 'static',
   // 是否开启eslint保存检测，有效值：ture | false | 'error'
@@ -37,7 +41,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://localhost:8081`,
-        target: `http://localhost:8082`,
+        target: proxyTarget,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''