名字改回来

Reviewed-on: #87

.dockerignore

@@ -1,7 +1,6 @@
 .vscode/
 .idea/
 node_modules/
-dist/
 **/*.log
 LICENSE
 README.md

.gitignore

@@ -1,6 +1,5 @@
 .DS_Store
 node_modules/
-dist/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*

Dockerfile

@@ -1,10 +1,14 @@
-FROM node:12 AS builder
-WORKDIR /app
-ADD package.json /app/
-RUN npm config set registry https://registry.npmmirror.com && npm install git+https://gitee.com/shihairong/raphael && npm install 
-ADD . /app
-RUN npm run build:prod
+#FROM node:12 AS builder
+#WORKDIR /app
+#ADD package.json /app/
+#RUN npm config set registry https://registry.npmmirror.com && npm install git+https://gitee.com/shihairong/raphael && npm install 
+#ADD . /app
+#RUN npm run build:prod
+#
+#FROM busybox
+#LABEL maintainer thomas.hairong@gmail.com
+#COPY --from=builder /app/dist /html
 
 FROM busybox
 LABEL maintainer thomas.hairong@gmail.com
-COPY --from=builder /app/dist /html
+COPY dist/ /html

dist/static/css/chunk-0220d172.da14afab.css

@@ -0,0 +1 @@
+.dashboard-container[data-v-23572fce]{background:#f2f4f9;min-height:calc(100vh - 134px);overflow-x:scroll;padding:0 16px;padding-top:24px;font-size:14px}.dashboard-container .dashboard-main[data-v-23572fce]{width:100%;min-width:1380px;background-color:#fff;border-radius:8px;min-height:calc(100vh - 186px)}.dashboard-container .dashboard-main .dashboard-title .dashboard-header-line[data-v-23572fce]{display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;position:relative;top:2px;margin-right:4px}.dashboard-container .dashboard-main .dashboard-title .dashboard-header-title[data-v-23572fce]{display:inline-block;font-size:16px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#000;line-height:16px}.dashboard-container .dashboard-main .dashboard-legend[data-v-23572fce]{margin-top:20px}.dashboard-container .dashboard-main .dashboard-legend .dashboard-legend-cassette[data-v-23572fce]{display:inline-block;margin-right:24px}.dashboard-container .dashboard-main .dashboard-legend .dashboard-legend-cassette .dashboard-legend-cassette-cricle[data-v-23572fce]{display:inline-block;width:12px;height:12px;border-radius:6px}.dashboard-container .dashboard-main .dashboard-legend .dashboard-legend-port[data-v-23572fce]{display:inline-block;height:24px;line-height:24px;border-radius:4px;padding:0 16px;margin-left:24px}.dashboard-container .dashboard-main .dashboard-legend .dashboard-legend-btn[data-v-23572fce]{margin:0 20px;float:right}.dashboard-container .dashboard-main .dashboard-legend .dashboard-legend-search[data-v-23572fce]{float:right}.dashboard-container .dashboard-main .dashboard-layout[data-v-23572fce]{margin:20px 0}.dashboard-container .dashboard-main .dashboard-layout .dashboard-layout-shelf-box .dashboard-layout-footer[data-v-23572fce]{text-align:center;margin-top:12px}.dashboard-container .dashboard-main .dashboard-layout .dashboard-layout-shelf-box .dashboard-layout-shelf[data-v-23572fce]{padding:0 8px}.dashboard-container .dashboard-main .dashboard-layout .dashboard-layout-shelf-box .dashboard-layout-shelf .dashboard-layout-row[data-v-23572fce]{padding:0 1px}.dashboard-container .dashboard-main .dashboard-layout .dashboard-layout-shelf-box .dashboard-layout-shelf .dashboard-layout-row .dashboard-layout-item[data-v-23572fce]{width:100%;text-align:center;height:32px;-webkit-box-shadow:0 3px 6px 0 rgba(166,174,190,.8);box-shadow:0 3px 6px 0 rgba(166,174,190,.8);border-radius:2px 4px 4px 2px;margin-bottom:8px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;position:relative}.dashboard-container .dashboard-main .dashboard-layout .dashboard-layout-shelf-box .dashboard-layout-shelf .dashboard-layout-row .dashboard-layout-item .dashboard-layout-item-cricle[data-v-23572fce]{display:inline-block;width:12px;height:12px;border-radius:6px;margin-right:6px}.dashboard-container .dashboard-main .dashboard-layout .dashboard-layout-shelf-box .dashboard-layout-shelf .dashboard-layout-row .dashboard-layout-item .dashboard-layout-item-horn[data-v-23572fce]{position:absolute;width:0;height:0;right:0;top:0;border-style:solid;border-width:14px 0 0 14px;border-color:#0b58ff transparent transparent transparent}

dist/static/css/chunk-041e834e.6ef9a82f.css

@@ -0,0 +1 @@
+.edit-input[data-v-49ebac60]{padding-right:100px}.cancel-btn[data-v-49ebac60]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-0bfb745f.6c642e0a.css

@@ -0,0 +1 @@
+.container[data-v-1f95126c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;height:50px;padding:4px 40px;background-color:#eee}.container .label-name[data-v-1f95126c]{margin-right:8px;font-size:14px}.submit-bar_container_1-UKi{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-top:28px;width:100%;height:40px}.add-dialog_dialog_19c-6 .add-dialog_input_3zaRq{display:-webkit-box;display:-ms-flexbox;display:flex;margin:8px 16px 8px 4px;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.add-dialog_dialog_19c-6 .add-dialog_input_3zaRq .add-dialog_select_3aPry,.add-dialog_dialog_19c-6 .add-dialog_select_3aPry{width:100%}.process-chart_c_3LXgj{margin:16px;height:300px;width:10%;position:relative}.process-chart_c_3LXgj .process-chart_chart_SL9sC{position:relative;height:400px;width:120%}.process-table_content_2g17L{padding:16px;margin:16px;position:relative;height:calc(100vh - 150px)}.process-table_content_2g17L .process-table_flaw-detail_g8l5C{width:1400px;position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.process-table_content_2g17L .process-table_flaw-detail_g8l5C .process-table_flaw-title_3vhhy{position:relative;width:200px;text-align:center;border:1px solid #ccc;background-color:#eee;padding:8px}.process-table_content_2g17L .process-table_flaw-detail_g8l5C .process-table_flaw-btns_21fhD{position:relative;width:200px;text-align:left}.process-table_content_2g17L .process-table_flaw-detail_g8l5C .process-table_flaw-select_29x-9{position:relative;width:200px;height:40px}.process-node-panel_container_1nz_9{margin:0 16px}.process-node-panel_container_1nz_9 .process-node-panel_content_2ne7O{padding:0 16px;font-size:14px}.process-node-panel_container_1nz_9 .process-node-panel_content_2ne7O div{margin-bottom:8px}.process-node-panel_container_1nz_9 .process-node-panel_content_2ne7O div span:nth-of-type(odd){color:#999}.process-node-panel_container_1nz_9 .process-node-panel_content_2ne7O div span:nth-of-type(2n){color:#666}.process-edit-bar_container_1bh-W{background-color:#eee;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;padding:4px 16px;margin:-16px 16px 16px 16px;width:98%}.process-drawer_dialog_2wxcT .process-drawer_input_3idWs{display:-webkit-box;display:-ms-flexbox;display:flex;margin:8px 16px 8px 4px;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.process-drawer_dialog_2wxcT .process-drawer_input_3idWs .process-drawer_select_1n-Z8,.process-drawer_dialog_2wxcT .process-drawer_select_1n-Z8{width:100%}.list_container_3gVva .list_table_1Smbo{margin:16px;width:98.5%}

dist/static/css/chunk-0ebaadc4.8009b251.css

@@ -0,0 +1 @@
+.drawer-footer[data-v-66806479]{width:100%;margin-top:50px;border-top:1px solid #e8e8e8;border-bottom:1px solid #e8e8e8;padding:10px 50px;text-align:left;background:#fff}

dist/static/css/chunk-0f24abb6.1ed7de12.css

@@ -0,0 +1 @@
+.edit-input[data-v-5282d6b8]{padding-right:100px}.cancel-btn[data-v-5282d6b8]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-11aace31.cad6f294.css

@@ -0,0 +1 @@
+.edit-input[data-v-7a98e903]{padding-right:100px}.cancel-btn[data-v-7a98e903]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-1357b78a.9eacac72.css

@@ -0,0 +1 @@
+.edit-input[data-v-732c3250]{padding-right:100px}.cancel-btn[data-v-732c3250]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-16bb1ba0.7eac9af8.css

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

dist/static/css/chunk-19c1fc52.9c105dc2.css

@@ -0,0 +1 @@
+.edit-input[data-v-3f4062d7]{padding-right:100px}.cancel-btn[data-v-3f4062d7]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-1c8763b4.17909dee.css

@@ -0,0 +1 @@
+.el-tree[data-v-350bd2ba] .el-tree-node__expand-icon,.el-tree[data-v-350bd2ba] .el-tree-node__label{font-size:20px}.text[data-v-1c0f2c97]{font-size:14px}.item[data-v-1c0f2c97]{margin-bottom:18px}.clearfix[data-v-1c0f2c97]:after,.clearfix[data-v-1c0f2c97]:before{display:table;content:""}.clearfix[data-v-1c0f2c97]:after{clear:both}.box-card[data-v-1c0f2c97]{width:100%}.el-container[data-v-0070ada1] .el-aside{border:2px solid #e4e4e4;border-radius:10px;background-color:#fff;min-height:550px;width:30%;padding-top:20px}

dist/static/css/chunk-1d1d8a1a.9ea95426.css

@@ -0,0 +1 @@
+@supports(-webkit-mask:none) and (not (cater-color:#fff)){.login-container .el-input input{color:#fff}}.login-container .el-input{display:inline-block;height:47px;width:85%}.login-container .el-input input{background:transparent;border:0;-webkit-appearance:none;border-radius:0;padding:12px 5px 12px 15px;color:#fff;height:47px;caret-color:#fff}.login-container .el-input input:-webkit-autofill{-webkit-text-fill-color:#fff!important}.login-container .el-form-item{border:1px solid hsla(0,0%,100%,.1);background:rgba(0,0,0,.1);border-radius:5px;color:#454545}.login-container[data-v-30639d60]{min-height:100%;width:100%;background:url(../../static/img/login-back.2210a7b4.jpg) 50% no-repeat;background-size:cover;overflow:hidden}.login-container .login-form[data-v-30639d60]{position:relative;width:620px;max-width:100%;top:160px;padding:10px 35px;margin:0 auto;overflow:hidden;background:hsla(0,0%,100%,.3);-webkit-backdrop-filter:blur(10px);backdrop-filter:blur(10px);border-radius:5px;-webkit-box-shadow:5px 5px 5px rgba(0,0,0,.1);box-shadow:5px 5px 5px rgba(0,0,0,.1)}.login-container .login-form .login-language[data-v-30639d60]{position:absolute;top:10px;right:10px;color:#fff;font-size:22px;cursor:pointer}.login-container .login-form .login-copyright[data-v-30639d60]{color:#fff;text-align:center}.login-container .tips[data-v-30639d60]{font-size:14px;color:#fff;margin-bottom:10px}.login-container .tips span[data-v-30639d60]:first-of-type{margin-right:16px}.login-container .svg-container[data-v-30639d60]{padding:6px 5px 6px 15px;color:#889aa4;vertical-align:middle;width:30px;display:inline-block}.login-container .title-container[data-v-30639d60]{position:relative}.login-container .title-container .title[data-v-30639d60]{font-size:26px;color:#eee;margin:0 auto 40px auto;text-align:center;font-weight:700}.login-container .show-pwd[data-v-30639d60]{position:absolute;right:10px;top:7px;font-size:16px;color:#889aa4;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.login-container .thirdparty-button[data-v-30639d60]{position:absolute;right:0;bottom:6px}@media only screen and (max-width:470px){.login-container .thirdparty-button[data-v-30639d60]{display:none}}

dist/static/css/chunk-230696e6.beb8459e.css

@@ -0,0 +1 @@
+.edit-input[data-v-3ca30f77]{padding-right:100px}.cancel-btn[data-v-3ca30f77]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-264322de.8cb5617e.css

@@ -0,0 +1 @@
+.edit-input[data-v-e4ce97b0]{padding-right:100px}.cancel-btn[data-v-e4ce97b0]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-29bfcd85.56d8d645.css

@@ -0,0 +1 @@
+.el-tree[data-v-350bd2ba] .el-tree-node__expand-icon,.el-tree[data-v-350bd2ba] .el-tree-node__label{font-size:20px}.el-container[data-v-3c677582] .el-aside{border:2px solid #e4e4e4;border-radius:10px;background-color:#fff;min-height:550px;width:30%;padding-top:20px}

dist/static/css/chunk-38a3fd8e.639915a8.css

@@ -0,0 +1 @@
+.mod-menu .icon-list__input>.el-input__inner,.mod-menu .menu-list__input>.el-input__inner{cursor:pointer}.mod-menu__icon-popover{width:458px;overflow:hidden}.mod-menu__icon-inner{width:478px;max-height:258px;overflow-x:hidden;overflow-y:auto}.mod-menu__icon-list{width:458px;padding:0;margin:-8px 0 0 -8px}.mod-menu__icon-list>.el-button{padding:8px;margin:8px 0 0 8px}.mod-menu__icon-list>.el-button>span{display:inline-block;vertical-align:middle;width:18px;height:18px;font-size:18px}

dist/static/css/chunk-3dfa6e6a.c9426164.css

@@ -0,0 +1 @@
+.edit-input[data-v-7afbc726]{padding-right:100px}.cancel-btn[data-v-7afbc726]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-3fefd9bc.4632f7ef.css

@@ -0,0 +1 @@
+.edit-input[data-v-5f68faaa]{padding-right:100px}.cancel-btn[data-v-5f68faaa]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-42febee0.4c8a36ad.css

@@ -0,0 +1 @@
+.title[data-v-5d47f12a]{left:150px}.edit-input[data-v-5d47f12a]{padding-right:100px}.cancel-btn[data-v-5d47f12a]{position:absolute;right:15px;top:10px}.back[data-v-5d47f12a]{right:20px}

dist/static/css/chunk-45f42266.a8826b98.css

@@ -0,0 +1 @@
+.edit-input[data-v-6282007e]{padding-right:100px}.cancel-btn[data-v-6282007e]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-49f842f0.debe6b50.css

@@ -0,0 +1 @@
+.edit-input[data-v-6c17bb6e]{padding-right:100px}.cancel-btn[data-v-6c17bb6e]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-4e303e21.249ebb58.css

@@ -0,0 +1 @@
+.edit-input[data-v-07c420b7]{padding-right:100px}.cancel-btn[data-v-07c420b7]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-50357256.ab732114.css

@@ -0,0 +1 @@
+.edit-input[data-v-c6111fec]{padding-right:100px}.cancel-btn[data-v-c6111fec]{position:absolute;right:15px;top:10px}.edit-input[data-v-a9803bae]{padding-right:100px}.cancel-btn[data-v-a9803bae]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-5190b266.841c5428.css

@@ -0,0 +1 @@
+.edit-input[data-v-8314039c]{padding-right:100px}.cancel-btn[data-v-8314039c]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-523689e4.4aa14a47.css

@@ -0,0 +1 @@
+.edit-input[data-v-c1465320]{padding-right:100px}.cancel-btn[data-v-c1465320]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-534c3dec.6b936c17.css

@@ -0,0 +1 @@
+.drawer-footer[data-v-0d4d3fb0],.drawer-footer[data-v-5cb9bb4a]{width:100%;margin-top:50px;border-top:1px solid #e8e8e8;padding:10px 50px;text-align:left;background:#fff}.drawer-footer[data-v-0d4d3fb0]{border-bottom:1px solid #e8e8e8}

dist/static/css/chunk-556562e8.13a7e89e.css

@@ -0,0 +1 @@
+.wscn-http404-container[data-v-26fcd89f]{-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);position:absolute;top:40%;left:50%}.wscn-http404[data-v-26fcd89f]{position:relative;width:1200px;padding:0 50px;overflow:hidden}.wscn-http404 .pic-404[data-v-26fcd89f]{position:relative;float:left;width:600px;overflow:hidden}.wscn-http404 .pic-404__parent[data-v-26fcd89f]{width:100%}.wscn-http404 .pic-404__child[data-v-26fcd89f]{position:absolute}.wscn-http404 .pic-404__child.left[data-v-26fcd89f]{width:80px;top:17px;left:220px;opacity:0;-webkit-animation-name:cloudLeft-data-v-26fcd89f;animation-name:cloudLeft-data-v-26fcd89f;-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-26fcd89f]{width:46px;top:10px;left:420px;opacity:0;-webkit-animation-name:cloudMid-data-v-26fcd89f;animation-name:cloudMid-data-v-26fcd89f;-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-26fcd89f]{width:62px;top:100px;left:500px;opacity:0;-webkit-animation-name:cloudRight-data-v-26fcd89f;animation-name:cloudRight-data-v-26fcd89f;-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-26fcd89f{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-26fcd89f{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-26fcd89f{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-26fcd89f{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-26fcd89f{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-26fcd89f{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-26fcd89f]{position:relative;float:left;width:300px;padding:30px 0;overflow:hidden}.wscn-http404 .bullshit__oops[data-v-26fcd89f]{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-26fcd89f],.wscn-http404 .bullshit__oops[data-v-26fcd89f]{font-weight:700;opacity:0;-webkit-animation-name:slideUp-data-v-26fcd89f;animation-name:slideUp-data-v-26fcd89f;-webkit-animation-duration:.5s;animation-duration:.5s}.wscn-http404 .bullshit__headline[data-v-26fcd89f]{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-26fcd89f]{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-26fcd89f],.wscn-http404 .bullshit__return-home[data-v-26fcd89f]{opacity:0;-webkit-animation-name:slideUp-data-v-26fcd89f;animation-name:slideUp-data-v-26fcd89f;-webkit-animation-duration:.5s;animation-duration:.5s}.wscn-http404 .bullshit__return-home[data-v-26fcd89f]{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-26fcd89f{0%{-webkit-transform:translateY(60px);transform:translateY(60px);opacity:0}to{-webkit-transform:translateY(0);transform:translateY(0);opacity:1}}@keyframes slideUp-data-v-26fcd89f{0%{-webkit-transform:translateY(60px);transform:translateY(60px);opacity:0}to{-webkit-transform:translateY(0);transform:translateY(0);opacity:1}}

dist/static/css/chunk-58400871.66bec945.css

@@ -0,0 +1 @@
+.edit-input[data-v-da97073a]{padding-right:100px}.cancel-btn[data-v-da97073a]{position:absolute;right:15px;top:10px}.edit-input[data-v-cc86fb48]{padding-right:100px}.cancel-btn[data-v-cc86fb48]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-58cd45f6.778d086d.css

@@ -0,0 +1 @@
+.edit-input[data-v-a1be8dee]{padding-right:100px}.cancel-btn[data-v-a1be8dee]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-6b10ed08.39dfdead.css

@@ -0,0 +1 @@
+.process-table .process-table-addprocess{margin-left:20px;margin-top:20px}.process-table .process-table-main{width:calc(100% - 40px);margin:20px;border:1px solid #e6ebf5;border-radius:5px;min-width:1000px}.process-table .process-table-main .process-table-main-title{padding:0 20px;width:100%;position:relative}.process-table .process-table-main .process-table-main-title .process-table-main-title-delbtn{position:absolute;top:50%;right:20px;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.process-table .process-table-main .process-table-main-item{width:calc(100% - 40px);margin:0 10px!important;line-height:48px}.process-node-panel_container_xVoVF{margin:0 16px}.process-node-panel_container_xVoVF .process-node-panel_content_6Qtl9{padding:0 16px;font-size:14px}.process-node-panel_container_xVoVF .process-node-panel_content_6Qtl9 div{margin-bottom:8px}.process-node-panel_container_xVoVF .process-node-panel_content_6Qtl9 div span:nth-of-type(odd){color:#999}.process-node-panel_container_xVoVF .process-node-panel_content_6Qtl9 div span:nth-of-type(2n){color:#666}.process-edit-bar_container_3eKjx{background-color:#eee;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;padding:4px 16px}.list_container_1CdVu .list_input_1gETR{display:-webkit-box;display:-ms-flexbox;display:flex;margin:8px 16px 8px 4px;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.list_container_1CdVu .list_input_1gETR .list_select_3iZGL,.list_container_1CdVu .list_select_3iZGL{width:100%}

dist/static/css/chunk-6b9ab80e.3e774abe.css

@@ -0,0 +1 @@
+span[data-v-239f8dce]{margin-left:30px}

dist/static/css/chunk-6c5eaa2e.5ceed7d5.css

@@ -0,0 +1 @@
+.edit-input[data-v-66bd78e1]{padding-right:100px}.cancel-btn[data-v-66bd78e1]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-6de8d2c1.dcc74605.css

@@ -0,0 +1 @@
+.edit-input[data-v-ce6e7c2c]{padding-right:100px}.cancel-btn[data-v-ce6e7c2c]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-70414a8d.3eea8ae0.css

@@ -0,0 +1 @@
+.drawer-footer[data-v-55723996],.drawer-footer[data-v-a897ac3c]{width:100%;margin-top:50px;border-top:1px solid #e8e8e8;padding:10px 50px;text-align:left;background:#fff}.drawer-footer[data-v-a897ac3c]{border-bottom:1px solid #e8e8e8}

dist/static/css/chunk-75f75070.2958fdcc.css

@@ -0,0 +1 @@
+.edit-input[data-v-534c0526]{padding-right:100px}.cancel-btn[data-v-534c0526]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-799950e4.d97b575e.css

@@ -0,0 +1 @@
+.edit-input[data-v-206ab25c]{padding-right:100px}.cancel-btn[data-v-206ab25c]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-799b1311.44333ae3.css

@@ -0,0 +1 @@
+.edit-input[data-v-ff8f9c44]{padding-right:100px}.cancel-btn[data-v-ff8f9c44]{position:absolute;right:15px;top:10px}.edit-input[data-v-4ca4790c]{padding-right:100px}.cancel-btn[data-v-4ca4790c]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-7b74f4e0.ef31d3b8.css

@@ -0,0 +1 @@
+.edit-input[data-v-49689e8c]{padding-right:100px}.cancel-btn[data-v-49689e8c]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-9feea084.4183ea76.css

@@ -0,0 +1 @@
+.edit-input[data-v-e8895f3c]{padding-right:100px}.cancel-btn[data-v-e8895f3c]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-a375c554.f31494ab.css

@@ -0,0 +1 @@
+.edit-input[data-v-a2c4e918]{padding-right:100px}.cancel-btn[data-v-a2c4e918]{position:absolute;right:15px;top:10px}.edit-input[data-v-41d27c02]{padding-right:100px}.cancel-btn[data-v-41d27c02]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-a5e10e00.8a72f78c.css

@@ -0,0 +1 @@
+.edit-input[data-v-7b0427da]{padding-right:100px}.cancel-btn[data-v-7b0427da]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-a78d1b0e.c694aa34.css

@@ -0,0 +1 @@
+.edit-input[data-v-44977cf9]{padding-right:100px}.cancel-btn[data-v-44977cf9]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-b04bb9b0.1a22d542.css

@@ -0,0 +1 @@
+.edit-input[data-v-5a807358]{padding-right:100px}.cancel-btn[data-v-5a807358]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-c182234c.53325349.css

@@ -0,0 +1 @@
+.dashboard-container[data-v-54d82d52]{background:#f2f4f9;min-height:calc(100vh - 134px);overflow-x:scroll;padding:0 16px;padding-top:24px;font-size:14px}.dashboard-container .dashboard-main[data-v-54d82d52]{width:100%;min-width:1380px;background-color:#fff;border-radius:8px;min-height:calc(100vh - 186px)}.dashboard-container .dashboard-main .dashboard-title .dashboard-header-line[data-v-54d82d52]{display:inline-block;width:4px;height:16px;background:#0b58ff;border-radius:1px;position:relative;top:2px;margin-right:4px}.dashboard-container .dashboard-main .dashboard-title .dashboard-header-title[data-v-54d82d52]{display:inline-block;font-size:16px;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:#000;line-height:16px}.dashboard-container .dashboard-main .dashboard-legend[data-v-54d82d52]{margin-top:20px}.dashboard-container .dashboard-main .dashboard-legend .dashboard-legend-cassette[data-v-54d82d52]{display:inline-block;margin-right:24px}.dashboard-container .dashboard-main .dashboard-legend .dashboard-legend-cassette .dashboard-legend-cassette-cricle[data-v-54d82d52]{display:inline-block;width:12px;height:12px;border-radius:6px}.dashboard-container .dashboard-main .dashboard-legend .dashboard-legend-port[data-v-54d82d52]{display:inline-block;height:24px;line-height:24px;border-radius:4px;padding:0 16px;margin-left:24px}.dashboard-container .dashboard-main .dashboard-legend .dashboard-legend-search[data-v-54d82d52]{float:right}.dashboard-container .dashboard-main .dashboard-layout[data-v-54d82d52]{margin:20px 0}.dashboard-container .dashboard-main .dashboard-layout .dashboard-layout-shelf-box .dashboard-layout-footer[data-v-54d82d52]{text-align:center;margin-top:12px}.dashboard-container .dashboard-main .dashboard-layout .dashboard-layout-shelf-box .dashboard-layout-shelf[data-v-54d82d52]{padding:0 8px}.dashboard-container .dashboard-main .dashboard-layout .dashboard-layout-shelf-box .dashboard-layout-shelf .dashboard-layout-row[data-v-54d82d52]{padding:0 1px}.dashboard-container .dashboard-main .dashboard-layout .dashboard-layout-shelf-box .dashboard-layout-shelf .dashboard-layout-row .dashboard-layout-item[data-v-54d82d52]{width:100%;text-align:center;height:32px;-webkit-box-shadow:0 3px 6px 0 rgba(166,174,190,.8);box-shadow:0 3px 6px 0 rgba(166,174,190,.8);border-radius:2px 4px 4px 2px;margin-bottom:8px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.dashboard-container .dashboard-main .dashboard-layout .dashboard-layout-shelf-box .dashboard-layout-shelf .dashboard-layout-row .dashboard-layout-item .dashboard-layout-item-cricle[data-v-54d82d52]{display:inline-block;width:12px;height:12px;border-radius:6px;margin-right:6px}

dist/static/css/chunk-c7d68bd4.e66cdcee.css

@@ -0,0 +1 @@
+.edit-input[data-v-be3f5ace]{padding-right:100px}.cancel-btn[data-v-be3f5ace]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-c81a1604.df5f6e44.css

@@ -0,0 +1 @@
+.usermanager-container[data-v-fe4452a8]{padding:20px}.usermanager-container .method-btn-area[data-v-fe4452a8]{padding:15px 30px;margin:10px 0 20px 0;border:1px solid #dfe6ec}.usermanager-container .tree-select-container[data-v-fe4452a8]{border:1px solid #dfe6ec;min-height:400px;padding:20px}.edit-input[data-v-fe4452a8]{padding-right:100px}.cancel-btn[data-v-fe4452a8]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-d821855c.b4855738.css

@@ -0,0 +1 @@
+.el-tree[data-v-30783aa4] .el-tree-node__expand-icon,.el-tree[data-v-30783aa4] .el-tree-node__label{font-size:20px}.usermanager-container[data-v-05a26c04]{padding:20px}.usermanager-container .method-btn-area[data-v-05a26c04]{padding:15px 30px;margin:10px 0 20px 0;border:1px solid #dfe6ec}.edit-input[data-v-05a26c04]{padding-right:100px}.cancel-btn[data-v-05a26c04]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-e2929524.71b45be3.css

@@ -0,0 +1 @@
+.edit-input[data-v-87371a6e]{padding-right:100px}.cancel-btn[data-v-87371a6e]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-ee59210a.f2499780.css

@@ -0,0 +1 @@
+.edit-input[data-v-417a3860]{padding-right:100px}.cancel-btn[data-v-417a3860]{position:absolute;right:15px;top:10px}

dist/static/css/chunk-ff677954.795f3d76.css

@@ -0,0 +1 @@
+.edit-input[data-v-16271d56]{padding-right:100px}.cancel-btn[data-v-16271d56]{position:absolute;right:15px;top:10px}

dist/static/js/chunk-2d230fe7.65bf5dea.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d230fe7"],{ef3c:function(e,r,n){"use strict";n.r(r);n("a481");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}}]);

src/api/orderManage/00A.js

@@ -2,13 +2,13 @@
  * @Author: zwq
  * @Date: 2022-01-17 14:55:09
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-10 14:13:22
+ * @LastEditTime: 2022-03-28 13:52:12
  * @Description:
  */
 
 import request from '@/utils/request'
 
-export function ProcessInfoList(data) { // 获取工单工艺列表
+export function ProcessInfoList(data) { // 获取工单列表
   return request({
     url: '/api/wms/work/order/page',
     method: 'post',

src/lang/i18n/en/module/basicData.js

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-18 14:03:12
+ * @LastEditTime: 2022-03-28 11:13:15
  * @Description: file content
  */
 export default {
@@ -31,6 +31,7 @@ export default {
     Tips: 'Tips',
     TipsBefore: 'Are you sure you want to delete',
     TipsStorageBefore: 'Confirm to add location:',
+    PleaseAddLocationFirst: 'Please Add Location First!',
     Description: 'Description',
     Remarks: 'Remarks',
     Yes: 'Yes',
@@ -55,7 +56,8 @@ export default {
     location: 'Location',
     locationTip: 'Click the picture below to select a point. After selecting a point, select a location in the pop-up box. If you do not select a location when adding a new point, you cannot select the next point. If you want to adjust the order of the points, drag the label at the bottom of the picture to the position you want to adjust. Click to confirm the submission point information and click Reset to reset the point information to the state when the pop-up box is opened',
     locationInfo: 'Location Point Info',
-    storageCode: 'storageBoxCode'
+    storageCode: 'storageBoxCode',
+    storageBoxFid: 'StorageBox FID Code'
   },
   factory: {
     placeholderName: 'Name Or Code',
@@ -175,7 +177,8 @@ export default {
     rowMark: 'Row Mark',
     status: 'Status',
     man: 'Man',
-    woman: 'Woman'
+    woman: 'Woman',
+    locationNumber: 'Location Number'
   },
   storageBox: {
     name: 'Name',
@@ -360,6 +363,11 @@ export default {
     publishTask: 'Publish The Task',
     startPosition: 'Start',
     endPosition: 'End',
-    taskType: 'Task Type'
+    taskType: 'Task Type',
+    ExWarehouse: 'Ex Warehouse',
+    InWarehouse: 'In Warehouse',
+    Circulation: 'Circulation',
+    Initialization: 'Initialization',
+    Damage: 'Damage'
   }
 }

src/lang/i18n/en/module/dashboard.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2022-03-15 16:42:34
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-16 20:01:32
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-06-06 15:53:29
  * @Description: file content
  * @FilePath: \mt-ck-wms-ui\src\lang\i18n\en\module\dashboard.js
  */

src/lang/i18n/zh/module/basicData.js

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-18 14:56:18
+ * @LastEditTime: 2022-03-28 11:13:13
  * * @Description: file content
  */
 export default {
@@ -56,7 +56,8 @@ export default {
     location: '库位',
     locationTip: '点击下方图片选点，选点后在弹出框内选择库位，新增点位时未选择库位无法进行下一个选点，若想调整点位顺序可拖动图片下方的标签到你想调整的位置,点击确定提交点位信息，点击重置将点位信息重置到打开弹出框时的状态',
     locationInfo: '库位点信息',
-    storageCode: '存储箱号'
+    storageCode: '存储箱号',
+    storageBoxFid: '存储箱名FID编码'
   },
   factory: {
     placeholderName: '名称或编码',
@@ -163,7 +164,8 @@ export default {
     sheName: '货架名',
     locaNum: '库存数量',
     man: '男',
-    woman: '女'
+    woman: '女',
+    locationNumber: '库位编号'
   },
   storageBox: {
     name: '存储箱名称',
@@ -365,6 +367,11 @@ export default {
     publishTask: '发布任务',
     startPosition: '起点',
     endPosition: '终点',
-    taskType: '任务类型'
+    taskType: '任务类型',
+    ExWarehouse: '出库',
+    InWarehouse: '入库',
+    Circulation: '流转',
+    Initialization: '初始化',
+    Damage: '损坏'
   }
 }

src/lang/i18n/zh/module/dashboard.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2022-03-15 16:42:34
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-16 20:01:27
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-06-07 15:08:30
  * @Description: file content
  * @FilePath: \mt-ck-wms-ui\src\lang\i18n\zh\module\dashboard.js
  */

src/router/index.js

@@ -216,6 +216,7 @@ export const constantRoutes = [
         path: 'staff',
         component: () => import('@/views/basicData/GroupModule/staff'),
         name: 'staff',
+        hidden: true,
         meta: { title: routerTitle.basicData.teamManage.staff?.[language] || routerTitle.basicData.teamManage.staff.en, icon: 'form', affix: true, required: true, requireToken: true }
       },
       {
@@ -517,7 +518,6 @@ export const constantRoutes = [
         path: 'menumanager',
         component: () => import('@/views/MenuManager'),
         name: 'MenuManager',
-        hidden: true,
         meta: { title: routerTitle.basic.menumanage?.[language] || routerTitle.basic.menumanage.en, icon: 'form', affix: true, required: true, requireToken: true }
       },
       {

src/settings.js

@@ -1,7 +1,7 @@
 /*
  * @Date: 2020-12-14 09:07:03
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-12-06 14:24:30
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-06-06 15:58:41
  * @FilePath: \basic-admin\src\settings.js
  * @Description:
  */

src/views/QualityManager/scrap/index.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 09:54:40
+ * @LastEditTime: 2022-03-28 13:52:30
  * @Description:
 -->
 <template>
@@ -37,8 +37,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('module.basicData.ScrapInfo.workOrderName')" prop="orderId">
-        <el-select v-model="formData.orderId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.workOrderName')])" clearable :style="{width: '100%'}" filterable>
+      <el-form-item :label="$t('module.basicData.ScrapInfo.workOrderName')" prop="workOrderId">
+        <el-select v-model="formData.workOrderId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.workOrderName')])" clearable :style="{width: '100%'}" filterable>
           <el-option
             v-for="(item, index) in orderList"
             :key="index"
@@ -88,7 +88,7 @@ import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
 import { timeFormatter } from '@/filters'
 import i18n from '@/lang'
 import { getEqList } from '@/api/equipment/maintain'
-import { ExecutionInfoList } from '@/api/orderManage/00A'
+import { ProcessInfoList } from '@/api/orderManage/00A'
 // import DictFilter from '@/components/BaseTable/subcomponents/DataDictFilter'
 /**
  * 表格表头配置项 TypeScript接口注释
@@ -182,7 +182,7 @@ export default {
       formData: {
         timeSlot: null,
         substrateId: '',
-        orderId: '',
+        workOrderId: '',
         equipmentId: '',
         current: 1,
         size: 10,
@@ -254,7 +254,7 @@ export default {
       if (result1.code === 0) {
         this.device = result1.data.records
       }
-      const result2 = await ExecutionInfoList({
+      const result2 = await ProcessInfoList({
         current: 1,
         size: 999
       })

src/views/basicData/Cache/components/location-add.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-18 13:53:50
+ * @LastEditTime: 2022-03-19 10:25:46
  * @Description:
 -->
 <template>
@@ -111,6 +111,11 @@ const tableProps = [
     prop: 'statusName',
     label: i18n.t('module.basicData.cache.status'),
     align: 'center'
+  },
+  {
+    prop: 'locationNumber',
+    label: i18n.t('module.basicData.cache.locationNumber'),
+    align: 'center'
   }
 ]
 

src/views/basicData/Cache/components/locationAttr-add.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-15 09:54:52
+ * @LastEditTime: 2022-03-23 11:03:08
  * @Description:
 -->
 <template>
@@ -35,7 +35,7 @@
       <!-- <el-form-item :label="$t('module.basicData.cache.status')" prop="status">
         <el-input v-model="dataForm.status" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.status')])" clearable />
       </el-form-item> -->
-      <el-form-item :label="$t('module.basicData.cache.status')" prop="status">
+      <!-- <el-form-item :label="$t('module.basicData.cache.status')" prop="status">
         <el-select v-model="dataForm.status">
           <el-option
             v-for="item in options"
@@ -44,6 +44,9 @@
             :value="item.value"
           />
         </el-select>
+      </el-form-item> -->
+      <el-form-item :label="$t('module.basicData.cache.locationNumber')" prop="locationNumber">
+        <el-input v-model="dataForm.locationNumber" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.locationNumber')])" clearable />
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -75,7 +78,8 @@ export default {
         locationNameAlias: '',
         rowNum: '',
         status: null,
-        locationType: ''
+        locationType: '',
+        locationNumber: 0
       },
       options: [
         {
@@ -99,10 +103,13 @@ export default {
           { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.LocationCode')]), trigger: 'blur' }
         ],
         layers: [
-          { pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), trigger: 'blur' }
+          { required: true, pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), trigger: 'blur' }
         ],
         columns: [
-          { pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), trigger: 'blur' }
+          { required: true, pattern: /^[1-9]\d*$/, message: this.$t('module.basicData.cache.warning'), trigger: 'blur' }
+        ],
+        locationNumber: [
+          { required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.cache.locationNumber')]), trigger: 'blur' }
         ]
       }
     }
@@ -138,7 +145,8 @@ export default {
             'shelfId': this.shelfId,
             'id': this.dataForm.id,
             'status': this.dataForm.status,
-            'locationType': this.dataForm.locationType
+            'locationType': this.dataForm.locationType,
+            'locationNumber': this.dataForm.locationNumber
           }
           if (this.dataForm.id) {
             locationUpdate(data).then(res => {

src/views/basicData/Cache/components/storageBox-add.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-14 16:23:19
+ * @LastEditTime: 2022-03-23 11:04:20
  * @Description:
 -->
 <template>
@@ -30,6 +30,9 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item :label="$t('module.basicData.visual.storageBoxFid')" prop="storageBoxFid">
+        <el-input v-model="dataForm.storageBoxFid" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.storageBoxFid')])" clearable />
+      </el-form-item>
       <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="note">
         <el-input v-model="dataForm.note" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable />
       </el-form-item>
@@ -54,7 +57,8 @@ export default {
         code: '',
         status: '',
         enName: '',
-        note: ''
+        note: '',
+        storageBoxFid: ''
       },
       options: [
         {

src/views/basicData/Cache/storageBox.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 10:55:34
+ * @LastEditTime: 2022-03-23 11:06:20
  * @Description:
 -->
 <template>
@@ -101,6 +101,11 @@ const tableProps = [
     filter: basicData('storage'),
     align: 'center'
   },
+  {
+    prop: 'storageBoxFid',
+    label: i18n.t('module.basicData.visual.storageBoxFid'),
+    align: 'center'
+  },
   {
     prop: 'note',
     label: i18n.t('module.basicData.storageBox.remark'),
@@ -173,6 +178,7 @@ export default {
       storageBoxList(this.listQuery).then(response => {
         if (response.data.records) {
           this.list = response.data.records
+          console.log(this.list)
         } else {
           this.list.splice(0, this.list.length)
         }

src/views/basicData/GroupModule/staff.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 13:43:01
+ * @LastEditTime: 2022-03-19 10:20:40
  * @Description:
 -->
 <template>

src/views/basicData/Warehouse/CurrentTask.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2020-12-29 15:41:11
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 09:45:43
+ * @LastEditTime: 2022-03-22 10:36:05
  * @Description:
 -->
 <template>
@@ -194,20 +194,20 @@ export default {
         size: 10
       },
       taskTypeList: [{
-        'label': '出库',
+        'label': i18n.t('module.basicData.Warehouse.ExWarehouse'),
         'value': 0
       }, {
-        'label': '入库',
+        'label': i18n.t('module.basicData.Warehouse.InWarehouse'),
         'value': 1
       }, {
-        'label': '流转',
+        'label': i18n.t('module.basicData.Warehouse.Circulation'),
         'value': 2
       }],
       TaskStatusList: [{
-        'label': '初始化',
+        'label': i18n.t('module.basicData.Warehouse.Initialization'),
         'value': 0
       }, {
-        'label': '损坏',
+        'label': i18n.t('module.basicData.Warehouse.Damage'),
         'value': 1
       }],
       VehicleNameList: [{

src/views/dashboard/components/PortDetail.vue

@@ -1,32 +1,52 @@
 <!--
  * @Author: zwq
  * @Date: 2020-12-29 16:37:56
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-18 16:18:38
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-04-02 15:57:14
  * @Description:
 -->
 <template>
   <el-dialog
     :title="'btn.detail' | i18nFilter"
     :visible.sync="visible"
+    width="70%"
   >
-    <el-form ref="dataForm" :model="dataForm" label-width="150px">
-      <el-form-item :label="$t('module.dashboard.name')" prop="name">
-        {{ dataForm.name }}
-      </el-form-item>
-      <el-form-item :label="$t('module.dashboard.attribute')" prop="attribute">
-        {{ dataForm.attribute ? portAttributeObj[dataForm.attribute] : '' }}
-      </el-form-item>
-      <el-form-item :label="$t('module.dashboard.cassetteStatus')" prop="cassetteVoList">
-        {{ dataForm.cassetteVoList && dataForm.cassetteVoList.length && dataForm.cassetteVoList[0].status ? cassetteStatusObj[dataForm.cassetteVoList[0].status] : '' }}
-      </el-form-item>
-      <el-form-item :label="$t('module.dashboard.workOrderNo')" prop="workOrderNo">
-        {{ dataForm.workOrderNo }}
-      </el-form-item>
-      <el-form-item :label="$t('module.dashboard.storageBoxCode')" prop="storageBoxCode">
-        {{ dataForm.storageBoxCode }}
-      </el-form-item>
-    </el-form>
+    <el-row :gutter="10">
+      <el-form ref="dataForm" :model="dataForm" label-width="150px">
+        <el-col :span="8">
+          <el-form-item :label="$t('module.dashboard.name')" prop="name">
+            {{ dataForm.name }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('module.dashboard.attribute')" prop="attribute">
+            {{ dataForm.attribute ? portAttributeObj[dataForm.attribute] : '' }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('module.dashboard.cassetteStatus')" prop="cassetteVoList">
+            {{ dataForm.cassetteVoList && dataForm.cassetteVoList.length && dataForm.cassetteVoList[0].status ? cassetteStatusObj[dataForm.cassetteVoList[0].status] : '' }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('module.dashboard.workOrderNo')" prop="workOrderNo">
+            {{ dataForm.workOrderNo }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="$t('module.dashboard.storageBoxCode')" prop="storageBoxCode">
+            {{ dataForm.storageBoxCode }}
+          </el-form-item>
+        </el-col>
+      </el-form>
+    </el-row>
+    <base-table
+      :page="listQuery.current"
+      :limit="listQuery.size"
+      :table-config="tableProps"
+      :table-data="list"
+      :is-loading="listLoading"
+    />
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
     </span>
@@ -34,11 +54,56 @@
 </template>
 
 <script>
+import i18n from '@/lang'
+import { listSubstrate } from '@/api/report-manage/report'
+import BaseTable from '@/components/BaseTable'
+
+const tableProps = [
+  {
+    prop: 'substrateCode',
+    label: i18n.t('module.report.substrate.substrateCode'),
+    align: 'center'
+  },
+  {
+    prop: 'subPosition',
+    label: i18n.t('module.report.substrate.location'),
+    align: 'center'
+  },
+  {
+    prop: 'storeTime',
+    label: i18n.t('module.report.substrate.storeTime'),
+    align: 'center'
+  },
+  {
+    prop: 'status',
+    label: i18n.t('module.report.substrate.substrateStatus'),
+    align: 'center'
+  },
+  {
+    prop: 'subStorageStatusName',
+    label: i18n.t('module.report.substrate.subStorageStatus'),
+    align: 'center'
+  },
+  {
+    prop: 'machineHandID',
+    label: i18n.t('module.report.substrate.machineHandID'),
+    align: 'center'
+  }
+]
 
 export default {
+  components: { BaseTable },
   data() {
     return {
       visible: false,
+      tableProps,
+      list: [],
+      listLoading: true,
+      listQuery: {
+        current: 1,
+        size: 500,
+        locationStorageSubID: ''
+      },
       dataForm: {
         code: null,
         createTime: null,
@@ -69,6 +134,23 @@ export default {
       console.log(data)
       this.visible = true
       this.dataForm = data
+      this.listQuery.locationStorageSubID = data.locationStorageSubId
+      this.listLoading = true
+      listSubstrate(this.listQuery).then(response => {
+        if (response.data) {
+          this.list = response.data
+          for (var x = 0; x < this.list.length; x++) {
+            if (this.list[x].subStorageStatus === 1) {
+              this.list[x].subStorageStatusName = this.$t('module.report.substrate.load')
+            } else if (this.list[x].subStorageStatus === 2) {
+              this.list[x].subStorageStatusName = this.$t('module.report.substrate.unload')
+            }
+          }
+        } else {
+          this.list.splice(0, this.list.length)
+        }
+        this.listLoading = false
+      })
     }
   }
 }

src/views/orderManage/components/processLinkBtn.vue

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-01-07 20:09:37
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-16 10:02:41
+ * @LastEditTime: 2022-03-19 13:47:06
  * @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
  * @Description:
 -->
@@ -59,6 +59,7 @@ export default {
       }).then(response => {
         this.options = response.data.records
       })
+      this.value = this.injectData.processId
     },
     emitClick() {
       const data = {

src/views/report-manage/CurrentInventory.vue

@@ -4,7 +4,7 @@
  * @Author: fzq
  * @Date: 2022-03-04 20:54:54
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-18 14:55:13
+ * @LastEditTime: 2022-05-30 13:40:33
 -->
 <template>
   <div class="app-container">
@@ -223,6 +223,7 @@ export default {
         //   link.click()
         //   URL.revokeObjectURL(link.href)
         // }
+        this.getList()
       })
     }
     // 新增 / 修改

src/views/report-manage/components/edit-substrate.vue

@@ -4,7 +4,7 @@
  * @Author: fzq
  * @Date: 2022-03-05 17:45:46
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-18 14:46:26
+ * @LastEditTime: 2022-03-20 09:35:03
 -->
 <template>
   <!-- <el-dialog
@@ -19,8 +19,8 @@
       <el-form-item :label="$t('module.report.substrate.substrateCode')" prop="substrateCode">
         <el-input v-model="dataForm.substrateCode" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.substrateCode')])" clearable />
       </el-form-item>
-      <el-form-item :label="$t('module.report.substrate.location')" prop="locationName">
-        <el-input v-model="dataForm.locationName" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.location')])" clearable />
+      <el-form-item :label="$t('module.report.substrate.location')" prop="subPosition">
+        <el-input v-model="dataForm.subPosition" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.location')])" clearable />
       </el-form-item>
       <el-form-item :label="$t('module.report.substrate.storeTime')" prop="storeTime">
         <el-input v-model="dataForm.storeTime" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.storeTime')])" clearable />
@@ -159,7 +159,7 @@ export default {
             'storeTime': this.dataForm.storeTime,
             'id': this.dataForm.id,
             'substrateCode': this.dataForm.substrateCode,
-            'locationName': this.dataForm.locationName,
+            'subPosition': this.dataForm.subPosition,
             // 'interCode': this.dataForm.interCode,
             'storageBoxFid': this.dataForm.storageBoxFid,
             'machineHandID': this.dataForm.machineHandID,

src/views/report-manage/components/viewSubstrate.vue

@@ -4,7 +4,7 @@
  * @Author: fzq
  * @Date: 2022-03-05 15:55:45
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-18 14:39:56
+ * @LastEditTime: 2022-03-20 09:35:05
 -->
 <template>
   <div class="app-container">
@@ -71,7 +71,7 @@ const tableProps = [
     align: 'center'
   },
   {
-    prop: 'locationName',
+    prop: 'subPosition',
     label: i18n.t('module.report.substrate.location'),
     align: 'center'
   },