mt-ck/mt-qj-wms-ui
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: mt-ck:7f4d5b0ff8a0050d6758cd34a9a6e6c97f84b730
Branches Tags
mt-ck:master
mt-ck:zwq
mt-ck:gtz
..
compare: mt-ck:2fda922944142c66ef95b8af4268a6fccb6f7ba5
Branches Tags
mt-ck:zwq
mt-ck:master
mt-ck:gtz

No commits in common. "7f4d5b0ff8a0050d6758cd34a9a6e6c97f84b730" and "2fda922944142c66ef95b8af4268a6fccb6f7ba5" have entirely different histories.
7f4d5b0ff8 ... 2fda922944

58 changed files with 1447 additions and 1538 deletions
Show Stats Expand all files Collapse all files

11
config/dev.env.js
View File

@ -1,10 +1,9 @@
/* /*
* @Author: gtz * @Author: zwq
* @Date: 2021-11-19 10:10:51 * @Date: 2021-11-15 08:20:28
* @LastEditors: gtz * @LastEditors: zwq
* @LastEditTime: 2021-12-08 16:04:49 * @LastEditTime: 2021-12-06 15:34:11
* @Description: file content * @Description:
* @FilePath: \mt-qj-wms-ui\config\dev.env.js
*/ */
'use strict' 'use strict'
const merge = require('webpack-merge') const merge = require('webpack-merge')

13
config/index.js
View File

@ -1,10 +1,9 @@
/* /*
* @Author: gtz * @Author: zwq
* @Date: 2021-11-19 10:10:51 * @Date: 2021-11-15 08:20:28
* @LastEditors: gtz * @LastEditors: zwq
* @LastEditTime: 2021-12-15 17:19:13 * @LastEditTime: 2021-12-07 14:48:25
* @Description: file content * @Description:
* @FilePath: \mt-qj-wms-ui\config\index.js
*/ */
'use strict' 'use strict'
// Template version: 1.2.5 // Template version: 1.2.5
@ -22,7 +21,7 @@ module.exports = {
// 代理列表, 是否开启代理通过[./dev.env.js]配置 // 代理列表, 是否开启代理通过[./dev.env.js]配置
proxyTable: devEnv.OPEN_PROXY === false ? {} : { proxyTable: devEnv.OPEN_PROXY === false ? {} : {
'/proxyApi': { '/proxyApi': {
target: 'http://192.168.0.183:8080', target: 'http://192.168.0.134:8080/',
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
'^/proxyApi': '/api' '^/proxyApi': '/api'

665
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -25,7 +25,7 @@
"gulp-replace": "0.6.1", "gulp-replace": "0.6.1",
"gulp-shell": "0.6.5", "gulp-shell": "0.6.5",
"lodash": "4.17.5", "lodash": "4.17.5",
"node-sass": "^4.14.1", "node-sass": "^6.0.1",
"npm": "^6.9.0", "npm": "^6.9.0",
"sass-loader": "6.0.6", "sass-loader": "6.0.6",
"svg-sprite-loader": "3.7.3", "svg-sprite-loader": "3.7.3",

BIN
src/assets/img/出库.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

BIN
src/assets/img/进工业炉加工.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
src/assets/img/追加加工.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.0 KiB

9
src/assets/scss/_base.scss
View File

@ -307,6 +307,7 @@ img {
------------------------------ */ ------------------------------ */
.site-content { .site-content {
position: relative; position: relative;
padding: 15px;
&__wrapper { &__wrapper {
position: relative; position: relative;
@ -336,6 +337,7 @@ img {
} }
} }
> .el-tabs__content { > .el-tabs__content {
padding: 0 15px 15px;
> .site-tabs__tools { > .site-tabs__tools {
position: fixed; position: fixed;
top: 50px; top: 50px;
@ -360,10 +362,3 @@ img {
vertical-align: middle; vertical-align: middle;
margin-right: 5px; margin-right: 5px;
} }
.mod-config{
background-color: #fff;
border-radius: 15px;
padding: 20px;
min-height: calc(100vh - 145px);
}

2
src/assets/scss/_variables.scss
View File

@ -1,6 +1,6 @@
// 站点主色 // 站点主色
// tips: 要达到整站主题修改效果, 请确保[$--color-primary]站点主色与[/src/element-ui-theme/index.js]文件中[import './element-[#17B3A3]/index.css']当前主题色一致 // tips: 要达到整站主题修改效果, 请确保[$--color-primary]站点主色与[/src/element-ui-theme/index.js]文件中[import './element-[#17B3A3]/index.css']当前主题色一致
$--color-primary: #3E8EF7; $--color-primary: #17B3A3;
// Navbar // Navbar
$navbar--background-color: $--color-primary; $navbar--background-color: $--color-primary;

10
src/element-ui-theme/index.js
View File

@ -1,11 +1,3 @@
/*
* @Author: gtz
* @Date: 2021-11-19 10:10:51
* @LastEditors: gtz
* @LastEditTime: 2021-12-09 19:38:26
* @Description: file content
* @FilePath: \mt-qj-wms-ui\src\element-ui-theme\index.js
*/
/** /**
* element-ui组件主题 * element-ui组件主题
* *
@ -13,7 +5,7 @@
* 1. 此处只包含element-ui组件主题 * 1. 此处只包含element-ui组件主题
* 2. 要达到整站主题修改效果, 请确保[import './element-[#17B3A3]/index.css']当前主题色与[/src/assets/scss/_variables.scss]文件中[$--color-primary]属性值一致 * 2. 要达到整站主题修改效果, 请确保[import './element-[#17B3A3]/index.css']当前主题色与[/src/assets/scss/_variables.scss]文件中[$--color-primary]属性值一致
*/ */
import './element-#3E8EF7/index.css' // 当前主题色 import './element-#17B3A3/index.css' // 当前主题色
export default { export default {
list: [ list: [
'#0BB2D4', // 青色 '#0BB2D4', // 青色

16
src/icons/svg/icon-侧边收纳.svg
View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="18px" viewBox="0 0 20 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 60 (88103) - https://sketch.com -->
<title>outdent</title>
<desc>Created with Sketch.</desc>
<g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.649999976">
<g id="进工业炉加工_录入托盘标识卡信息" transform="translate(-370.000000, -23.000000)" fill="#000000" fill-rule="nonzero">
<g id="编组-18" transform="translate(336.000000, 0.000000)">
<g id="outdent" transform="translate(32.000000, 20.000000)">
<rect id="矩形" opacity="0" x="0" y="0" width="24" height="24"></rect>
<path d="M9.5625,10.359375 L20.8125,10.359375 C20.915625,10.359375 21,10.275 21,10.171875 L21,8.859375 C21,8.75625 20.915625,8.671875 20.8125,8.671875 L9.5625,8.671875 C9.459375,8.671875 9.375,8.75625 9.375,8.859375 L9.375,10.171875 C9.375,10.275 9.459375,10.359375 9.5625,10.359375 Z M9.375,15.140625 C9.375,15.24375 9.459375,15.328125 9.5625,15.328125 L20.8125,15.328125 C20.915625,15.328125 21,15.24375 21,15.140625 L21,13.828125 C21,13.725 20.915625,13.640625 20.8125,13.640625 L9.5625,13.640625 C9.459375,13.640625 9.375,13.725 9.375,13.828125 L9.375,15.140625 Z M21.1875,3.75 L2.8125,3.75 C2.709375,3.75 2.625,3.834375 2.625,3.9375 L2.625,5.25 C2.625,5.353125 2.709375,5.4375 2.8125,5.4375 L21.1875,5.4375 C21.290625,5.4375 21.375,5.353125 21.375,5.25 L21.375,3.9375 C21.375,3.834375 21.290625,3.75 21.1875,3.75 Z M21.1875,18.5625 L2.8125,18.5625 C2.709375,18.5625 2.625,18.646875 2.625,18.75 L2.625,20.0625 C2.625,20.165625 2.709375,20.25 2.8125,20.25 L21.1875,20.25 C21.290625,20.25 21.375,20.165625 21.375,20.0625 L21.375,18.75 C21.375,18.646875 21.290625,18.5625 21.1875,18.5625 Z M2.7046875,12.1617187 L6.36796875,15.046875 C6.50390625,15.1546875 6.70546875,15.0585937 6.70546875,14.8851562 L6.70546875,9.11484375 C6.70546875,8.94140625 6.50625,8.8453125 6.36796875,8.953125 L2.7046875,11.8382812 C2.59921875,11.9203125 2.59921875,12.0796875 2.7046875,12.1617187 Z" id="形状"></path>
</g>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

24
src/icons/svg/icon-出库.svg
View File

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 60 (88103) - https://sketch.com -->
<title>出库on</title>
<desc>Created with Sketch.</desc>
<defs>
<linearGradient x1="50%" y1="-35.9917859%" x2="50%" y2="100%" id="linearGradient-1">
<stop stop-color="#F933FE" offset="0%"></stop>
<stop stop-color="#735EEE" offset="100%"></stop>
</linearGradient>
</defs>
<g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="首页" transform="translate(-947.000000, -171.000000)" fill-rule="nonzero">
<g id="编组-19备份" transform="translate(944.000000, 168.000000)">
<g id="编组-3">
<g id="出库on">
<rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="24" height="24"></rect>
<path d="M18.1023088,5.62885904 L3.32441522,5.62885904 L4.82259866,3.24536587 C4.88541044,3.14544223 4.9951571,3.08480025 5.11318276,3.08480025 L16.3135198,3.08480025 C16.4315455,3.08480025 16.5412922,3.14544223 16.6041039,3.24536587 L18.1023088,5.62885904 L18.1023088,5.62885904 Z M18.3505903,6.65853839 L18.3505903,20.5806612 C18.3505903,20.7702295 18.1969321,20.9238877 18.0073638,20.9238877 L3.41933878,20.9238877 C3.22977052,20.9238877 3.07611233,20.7702295 3.07611233,20.5806612 L3.07611233,6.65853839 L18.3505903,6.65853839 Z M14.1717439,13.8227416 L11.6974888,16.2970182 C11.5634589,16.4310695 11.5634589,16.6483962 11.6974888,16.7824262 L11.9401928,17.0251302 C12.0742227,17.1591601 12.2915494,17.1591601 12.4255793,17.0251302 L15.7574501,13.6932594 C15.958495,13.4922145 15.958495,13.1662352 15.7574501,12.9651903 L12.3121859,9.51994758 C12.178156,9.3858962 11.9608293,9.3858962 11.8267994,9.51994758 L11.5840954,9.76263013 C11.4500654,9.89668151 11.4500654,10.1140082 11.5840954,10.2480381 L14.1291624,12.7930623 L6.07582569,12.7930623 C5.88625743,12.7930623 5.73259924,12.9467419 5.73259924,13.1362887 L5.73259924,13.4795151 C5.73259924,13.6690834 5.88625743,13.8227416 6.07582569,13.8227416 L14.1717439,13.8227416 Z M20.9238877,20.9151997 L19.7907041,20.9151997 L19.7907041,3.07611233 L20.9238877,3.07611233 L20.9238877,20.9151997 Z" id="形状" fill="url(#linearGradient-1)"></path>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

16
src/icons/svg/icon-删除.svg
View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 60 (88103) - https://sketch.com -->
<title>删除</title>
<desc>Created with Sketch.</desc>
<g id="2_设备管理" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="2-4-2设备维护计划" transform="translate(-1822.000000, -159.000000)" fill="#FF5454" fill-rule="nonzero">
<g id="编组-10" transform="translate(1821.000000, 158.000000)">
<g id="删除">
<rect id="矩形" opacity="0" x="0" y="0" width="16" height="16"></rect>
<path d="M9.39137788,11.7149165 C9.13431614,11.7149165 8.92716929,11.5077697 8.92716929,11.2507079 L8.92716929,6.14191781 C8.92716929,5.88485607 9.13431613,5.67770922 9.39137788,5.67770922 C9.64843963,5.67770922 9.85558647,5.88485606 9.85558647,6.14191781 L9.85558647,11.2482122 C9.85558647,11.5052739 9.64843961,11.7149165 9.39137788,11.7149165 Z M6.60612639,11.7149165 C6.34906466,11.7149165 6.1419178,11.5077697 6.1419178,11.2507079 L6.1419178,6.14191781 C6.1419178,5.88485607 6.34906466,5.67770922 6.60612641,5.67770922 C6.86318814,5.67770922 7.07033499,5.88485606 7.07033499,6.14191781 L7.07033499,11.2482122 C7.07033499,11.5052739 6.86318814,11.7149165 6.60612639,11.7149165 Z M14.0359594,3.82087491 L11.7149165,3.82087491 L11.7149165,2.89245775 C11.7149165,2.12376827 11.0959718,1.499832 10.3322738,1.499832 L5.67770923,1.499832 C4.90901976,1.499832 4.28508349,2.12376827 4.28508349,2.89245775 L4.28508349,3.82087491 L1.96404059,3.82087491 C1.70697885,3.82087491 1.499832,4.02802174 1.499832,4.28508349 C1.499832,4.54214524 1.70697884,4.74929208 1.96404059,4.74929208 L14.0359594,4.74929208 C14.2930211,4.74929208 14.500168,4.54214524 14.500168,4.28508349 C14.500168,4.02802174 14.2930212,3.82087491 14.0359594,3.82087491 Z M5.21350066,2.89245775 C5.21350066,2.63789175 5.42314324,2.42824916 5.67770925,2.42824916 L10.3322738,2.42824916 C10.5868398,2.42824916 10.7864994,2.63290025 10.7864994,2.89245775 L10.7864994,3.82087491 L5.21350066,3.82087491 L5.21350066,2.89245775 L5.21350066,2.89245775 Z M11.2507079,14.500168 L4.75178782,14.500168 C3.98309834,14.500168 3.35916207,13.8762317 3.35916207,13.1075423 L3.35916207,6.13692631 C3.35916207,5.87986457 3.56630891,5.67271772 3.82337066,5.67271772 C4.08043241,5.67271772 4.28757925,5.87986456 4.28757925,6.13692631 L4.28757925,13.1075423 C4.28757925,13.364604 4.49722183,13.5717508 4.75178783,13.5717508 L11.2532037,13.5717508 C11.5102654,13.5717508 11.7174123,13.364604 11.7174123,13.1075423 L11.7174123,6.15439653 C11.7174123,5.89733479 11.9245591,5.69018794 12.1816209,5.69018794 C12.4386826,5.69018794 12.6458294,5.89733478 12.6458294,6.15439653 L12.6458294,13.1075423 C12.6433337,13.873736 12.0193974,14.500168 11.2507079,14.500168 Z" id="形状"></path>
</g>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 3.0 KiB

24
src/icons/svg/icon-总电流.svg
View File

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 60 (88103) - https://sketch.com -->
<title>编组 13</title>
<desc>Created with Sketch.</desc>
<g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="能源管理/用能源分析" transform="translate(-385.000000, -370.000000)" fill-rule="nonzero">
<g id="编组-21" transform="translate(384.000000, 365.000000)">
<g id="编组-19备份">
<g id="编组-14" transform="translate(0.000000, 4.000000)">
<g id="编组-13">
<rect id="矩形备份-3" fill="#000000" opacity="0" x="0.4224" y="0.4224" width="23.04" height="23.04"></rect>
<path d="M12,1 C5.93103448,1 1,5.93103448 1,12 C1,18.0689655 5.93103448,23 12,23 C18.0689655,23 23,18.0689655 23,12 C23,5.93103448 18.0689655,1 12,1 Z" id="形状" fill="#E4F8F1"></path>
<g id="电量" transform="translate(3.742400, 3.742400)">
<rect id="矩形" fill="#000000" opacity="0" x="0.2" y="0.2" width="16" height="16"></rect>
<path d="M5.61125776,4.49277942 L10.5619354,4.49277942 L10.5619354,5.71319271 L5.61125776,5.71319271 L5.61125776,4.49277942 L5.61125776,4.49277942 Z M5.61125776,6.3722236 L10.5619354,6.3722236 L10.5619354,7.5926369 L5.61125776,7.5926369 L5.61125776,6.3722236 L5.61125776,6.3722236 Z M5.61125776,8.25166779 L10.5619354,8.25166779 L10.5619354,9.47205355 L5.61125776,9.47205355 L5.61125776,8.25166779 L5.61125776,8.25166779 Z M5.61125776,10.131112 L10.5619354,10.131112 L10.5619354,11.3514977 L5.61125776,11.3514977 L5.61125776,10.131112 L5.61125776,10.131112 Z M5.61125776,12.0105562 L10.5619354,12.0105562 L10.5619354,13.2309419 L5.61125776,13.2309419 L5.61125776,12.0105562 L5.61125776,12.0105562 Z M9.46911861,3.35060056 L9.46911861,2.77164914 L6.70404538,2.77164914 L6.70404538,3.35057303 L4.54329828,3.35057303 L4.54329828,14.2873686 L11.6298948,14.2873686 L11.6298948,3.35060056 L9.46911861,3.35060056 Z M10.9178927,13.5989825 L5.25530041,13.5989825 L5.25530041,4.03901412 L10.9178927,4.03901412 L10.9178927,13.5989825 Z" id="形状" fill="#73DEB3"></path>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

23
src/icons/svg/icon-总电量.svg
View File

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 60 (88103) - https://sketch.com -->
<title>编组 7</title>
<desc>Created with Sketch.</desc>
<g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="能源管理/用能源分析" transform="translate(-385.000000, -239.000000)">
<g id="编组-20" transform="translate(384.000000, 234.000000)">
<g id="编组-19">
<g id="编组-14" transform="translate(0.000000, 4.000000)">
<g id="编组-7">
<rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="0.48" y="0.48" width="23.04" height="23.04"></rect>
<g id="编组-5" transform="translate(0.920000, 0.920000)">
<path d="M11.08,0.08 C5.01103448,0.08 0.08,5.01103448 0.08,11.08 C0.08,17.1489655 5.01103448,22.08 11.08,22.08 C17.1489655,22.08 22.08,17.1489655 22.08,11.08 C22.08,5.01103448 17.1489655,0.08 11.08,0.08 Z" id="形状" fill="#ECF5FE" fill-rule="nonzero"></path>
<path d="M15.9471065,10.7552208 L9.42864928,17.923599 C9.34022059,18.0278663 9.20126123,18.08 9.07493454,18.08 C8.99913853,18.08 8.92334251,18.0669666 8.86017917,18.0278663 C8.67068913,17.923599 8.56962778,17.702031 8.60752578,17.4804629 L9.66866999,12.0324955 L6.56103339,12.0324955 C6.37154335,12.0324955 6.19468598,11.9151947 6.11888997,11.7327269 C6.04309395,11.5502591 6.08099196,11.3417245 6.20731865,11.1983569 L12.5362859,4.23851335 C12.6752452,4.08211237 12.9026333,4.02997871 13.0921233,4.13424603 C13.2816134,4.22547993 13.3953074,4.43401457 13.3574094,4.65558263 L12.6499799,9.92108226 L15.5807591,9.92108226 C15.7702492,9.92108226 15.9471065,10.038383 16.0229026,10.2208508 C16.1239639,10.4033186 16.0860659,10.6118532 15.9471065,10.7552208 L15.9471065,10.7552208 Z" id="路径" fill="#3E6AF7"></path>
</g>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

1
src/icons/svg/icon-成功.svg
View File

@ -1 +0,0 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1639567837666" class="icon" viewBox="0 0 1479 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2179" xmlns:xlink="http://www.w3.org/1999/xlink" width="288.8671875" height="200"><defs><style type="text/css"></style></defs><path d="M1401.287111 0L1479.111111 77.824 544.938667 1012.053333 0 467.114667l136.248889-136.248889 447.601778 291.896889L1401.287111 0z" p-id="2180" fill="#3E8EF7"></path></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 555 B

13
src/icons/svg/icon-新建.svg
View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 60 (88103) - https://sketch.com -->
<title>Shape</title>
<desc>Created with Sketch.</desc>
<g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="进工业炉加工_录入托盘标识卡信息" transform="translate(-1840.000000, -90.000000)" fill="#FFFFFF">
<g id="添加按钮" transform="translate(1828.000000, 82.000000)">
<path d="M25.3488372,15.6671018 L19.5878553,15.6671018 L19.5878553,21.3420366 C19.5878553,21.7057441 19.2966408,22 18.9366925,22 L18.9366925,22 C18.5767442,22 18.2855297,21.7057441 18.2855297,21.3420366 L18.2855297,15.6671018 L12.6511628,15.6671018 C12.2912145,15.6671018 12,15.372846 12,15.0091384 L12,15.0091384 C12,14.6454308 12.2912145,14.3511749 12.6511628,14.3511749 L18.2855297,14.3511749 L18.2855297,8.65796345 C18.2855297,8.29425587 18.5767442,8 18.9366925,8 L18.9366925,8 C19.2966408,8 19.5878553,8.29425587 19.5878553,8.65796345 L19.5878553,14.3511749 L25.3488372,14.3511749 C25.7087855,14.3511749 26,14.6454308 26,15.0091384 L26,15.0091384 C26,15.372846 25.7087855,15.6671018 25.3488372,15.6671018 L25.3488372,15.6671018 Z" id="Shape" transform="translate(19.000000, 15.000000) scale(1, -1) translate(-19.000000, -15.000000) "></path>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

13
src/icons/svg/icon-日历.svg
View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="12px" viewBox="0 0 14 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 60 (88103) - https://sketch.com -->
<title>编组</title>
<desc>Created with Sketch.</desc>
<g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.5">
<g id="select/时间_开始" transform="translate(-194.000000, -9.000000)" fill="#000000">
<g id="编组" transform="translate(194.000000, 9.000000)">
<path d="M9.92698943,6.540625 L4.07145242,6.540625 C3.80189204,6.540625 3.5837507,6.321875 3.5837507,6.0515625 L3.5837507,6.0515625 C3.5837507,5.78125 3.80189204,5.5625 4.07145242,5.5625 L9.92854758,5.5625 C10.198108,5.5625 10.4162493,5.78125 10.4162493,6.0515625 L10.4162493,6.0515625 C10.4146912,6.321875 10.1965498,6.540625 9.92698943,6.540625 L9.92698943,6.540625 Z M9.92698943,3.8921875 L4.07145242,3.8921875 C3.80189204,3.8921875 3.5837507,3.6734375 3.5837507,3.403125 L3.5837507,3.403125 C3.5837507,3.1328125 3.80189204,2.9140625 4.07145242,2.9140625 L9.92854758,2.9140625 C10.198108,2.9140625 10.4162493,3.1328125 10.4162493,3.403125 L10.4162493,3.403125 C10.4146912,3.6734375 10.1965498,3.8921875 9.92698943,3.8921875 L9.92698943,3.8921875 Z M12.8765721,11.125 L11.0753478,11.125 L11.0753478,11.5109375 C11.0753478,11.78125 10.8572065,12 10.5876461,12 L10.5876461,12 C10.3180857,12 10.0999444,11.78125 10.0999444,11.5109375 L10.0999444,11.125 L3.8984975,11.125 L3.8984975,11.5109375 C3.8984975,11.78125 3.68035615,12 3.41079577,12 L3.41079577,12 C3.14123539,12 2.92309405,11.78125 2.92309405,11.5109375 L2.92309405,11.125 L1.12186978,11.125 C0.501725097,11.125 0,10.621875 0,10 L0,1.125 C0,0.503125 0.501725097,-3.55271368e-15 1.12186978,-3.55271368e-15 L12.8781302,-3.55271368e-15 C13.4982749,-3.55271368e-15 14,0.503125 14,1.125 L14,10 C13.9984418,10.6203125 13.4967168,11.125 12.8765721,11.125 L12.8765721,11.125 Z M1.12186978,10 L2.9246522,10 L2.9246522,9.746875 C2.9246522,9.4765625 3.14279354,9.2578125 3.41235392,9.2578125 L3.41235392,9.2578125 C3.6819143,9.2578125 3.90005565,9.4765625 3.90005565,9.746875 L3.90005565,10 L10.1015025,10 L10.1015025,9.746875 C10.1015025,9.4765625 10.3196439,9.2578125 10.5892042,9.2578125 L10.5892042,9.2578125 C10.8587646,9.2578125 11.076906,9.4765625 11.076906,9.746875 L11.076906,10 L12.8796884,10 L12.8796884,10 L12.8796884,8.4671875 L1.12186978,8.4671875 L1.12186978,10 L1.12186978,10 L1.12186978,10 Z M12.8765721,1.125 L1.12186978,1.125 L1.12186978,1.125 L1.12186978,7.49375 L12.8781302,7.49375 L12.8781302,1.125 L12.8765721,1.125 L12.8765721,1.125 Z" id="Shape" transform="translate(7.000000, 6.000000) scale(1, -1) translate(-7.000000, -6.000000) "></path>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

16
src/icons/svg/icon-用户名更多.svg
View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="11px" height="6px" viewBox="0 0 11 6" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 60 (88103) - https://sketch.com -->
<title>箭头 右</title>
<desc>Created with Sketch.</desc>
<g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="进工业炉加工_录入托盘标识卡信息" transform="translate(-1882.000000, -29.000000)" fill="#000000" fill-rule="nonzero">
<g id="编组-18" transform="translate(336.000000, 0.000000)">
<g id="箭头-右" transform="translate(1552.000000, 32.000000) rotate(-270.000000) translate(-1552.000000, -32.000000) translate(1544.000000, 24.000000)">
<rect id="矩形" opacity="0" x="-5.68434189e-14" y="0" width="16" height="16"></rect>
<path d="M5.78697774,13.1623804 C5.59894466,13.1623804 5.47358928,13.0997027 5.34823389,12.9743473 C5.09752312,12.7236365 5.16020081,12.3475704 5.41091159,12.0968596 L9.42228387,8.46155347 C9.54763926,8.33619808 9.61031695,8.2108427 9.61031695,8.08548732 C9.61031695,7.96013193 9.54763926,7.83477655 9.42228387,7.70942116 L5.34823389,4.2621481 C5.09752312,4.01143732 5.03484544,3.63537117 5.2855562,3.38466041 C5.53626697,3.13394964 5.91233312,3.07127196 6.16304389,3.32198272 L10.1744162,6.76925578 C10.5504823,7.08264424 10.8011931,7.58406579 10.8011931,8.08548732 C10.8011931,8.58690886 10.61316,9.0256527 10.2370939,9.40171885 L6.22572158,13.037025 C6.10036619,13.0997027 5.91233312,13.1623804 5.78697774,13.1623804 L5.78697774,13.1623804 Z" id="路径"></path>
</g>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

18
src/icons/svg/icon-维护开始.svg
View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="15px" height="14px" viewBox="0 0 15 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 60 (88103) - https://sketch.com -->
<title>编组 33</title>
<desc>Created with Sketch.</desc>
<g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="icon/界面内/维护开始" transform="translate(-1.000000, -1.000000)">
<g id="编组-33">
<rect id="矩形" fill="#D8D8D8" opacity="0" x="0" y="0" width="16" height="16"></rect>
<g id="编组-31" transform="translate(0.500000, 1.000000)" fill="#0B58FF" fill-rule="nonzero">
<g id="编组-29备份">
<path d="M9.9533767,0.402734375 L9.9940017,0.416796875 C10.7830642,0.699609375 11.5080642,1.11835938 12.1486892,1.66210938 L12.1815017,1.69023438 C12.3393142,1.82460938 12.3986892,2.04179688 12.3299392,2.23867188 L11.8783767,3.50898438 C12.2627517,3.97773438 12.5658767,4.50117188 12.7783767,5.06679688 L14.1065017,5.31210938 C14.3111892,5.34960938 14.4705642,5.51054688 14.5080642,5.71523438 L14.5158767,5.75742188 C14.6627517,6.57148438 14.6627517,7.42773438 14.5158767,8.24179688 L14.5080642,8.28398438 C14.4705642,8.48867188 14.3111892,8.64960938 14.1065017,8.68710938 L12.7721267,8.93398438 C12.5596267,9.49492188 12.2580642,10.0152344 11.8752517,10.4808594 L12.3299392,11.7605469 C12.3986892,11.9558594 12.3408767,12.1746094 12.1815017,12.3089844 L12.1486892,12.3371094 C11.5065017,12.8808594 10.7815017,13.2996094 9.9940017,13.5824219 L9.9533767,13.5964844 C9.7580642,13.6667969 9.5393142,13.6089844 9.4033767,13.4511719 L8.5190017,12.4152344 C8.2252517,12.4636719 7.9252517,12.4871094 7.6268142,12.4871094 C7.3268142,12.4871094 7.0268142,12.4636719 6.7346267,12.4152344 L5.8502517,13.4511719 C5.7158767,13.6089844 5.4971267,13.6667969 5.3002517,13.5964844 L5.2596267,13.5824219 C4.4721267,13.2996094 3.7455642,12.8808594 3.1049392,12.3371094 L3.0721267,12.3089844 C2.9143142,12.1746094 2.8549392,11.9574219 2.9236892,11.7605469 L3.3783767,10.4808594 C2.9955642,10.0152344 2.6924392,9.49492188 2.4815017,8.93398438 L1.1471267,8.68710938 C0.9424392,8.64960938 0.7830642,8.48867188 0.7455642,8.28398438 L0.7377517,8.24179688 C0.6643142,7.83398438 0.6268142,7.41679688 0.6268142,6.99960938 C0.6268142,6.58242188 0.6643142,6.16367188 0.7377517,5.75742188 L0.7455642,5.71523438 C0.7830642,5.51054688 0.9424392,5.34960938 1.1471267,5.31210938 L2.4752517,5.06679688 C2.6877517,4.50117188 2.9893142,3.97773438 3.3752517,3.50898438 L2.9236892,2.23867188 C2.8549392,2.04335938 2.9127517,1.82460938 3.0721267,1.69023438 L3.1049392,1.66210938 C3.7471267,1.11835938 4.4721267,0.699609375 5.2596267,0.416796875 L5.3002517,0.402734375 C5.4924392,0.332421875 5.7111892,0.390234375 5.8471267,0.548046875 L6.7221267,1.57148438 C7.0190017,1.52304688 7.3221267,1.49804688 7.6252517,1.49804688 C7.9283767,1.49804688 8.2315017,1.52304688 8.5283767,1.57148438 L9.4033767,0.548046875 C9.5377517,0.390234375 9.7565017,0.332421875 9.9533767,0.402734375 Z M9.9658767,1.61523438 L8.9674392,2.78242188 L8.3440017,2.68085938 C8.1080642,2.64179688 7.8658767,2.62148438 7.6236892,2.62148438 C7.3815017,2.62148438 7.1393142,2.64179688 6.9033767,2.68085938 L6.2768142,2.78398438 L5.2783767,1.61679688 C4.8705642,1.79335938 4.4861892,2.01679688 4.1283767,2.28242188 L4.6424392,3.73242188 L4.2393142,4.22304688 C3.9330642,4.59648438 3.6924392,5.01210938 3.5236892,5.46210938 L3.3002517,6.05742188 L1.7846267,6.33710938 C1.7346267,6.77617188 1.7346267,7.22460938 1.7846267,7.66523438 L3.3033767,7.94492188 L3.5299392,8.53554688 C3.6986892,8.98085938 3.9393142,9.39492188 4.2440017,9.76523438 L4.6486892,10.2558594 L4.1299392,11.7152344 C4.4877517,11.9808594 4.8736892,12.2027344 5.2799392,12.3808594 L6.2877517,11.2011719 L6.9127517,11.3027344 C7.1455642,11.3402344 7.3861892,11.3605469 7.6236892,11.3605469 C7.8627517,11.3605469 8.1018142,11.3417969 8.3346267,11.3027344 L8.9596267,11.2011719 L9.9674392,12.3808594 C10.3752517,12.2042969 10.7596267,11.9808594 11.1174392,11.7152344 L10.5986892,10.2558594 L11.0033767,9.76523438 C11.3080642,9.39492188 11.5486892,8.98085938 11.7174392,8.53554688 L11.9408767,7.94335938 L13.4596267,7.66367188 C13.5096267,7.22460938 13.5096267,6.77617188 13.4596267,6.33554688 L11.9440017,6.05585938 L11.7205642,5.46054688 C11.5518142,5.01210938 11.3111892,4.59492188 11.0049392,4.22148438 L10.6018142,3.73085938 L11.1158767,2.28085938 C10.7580642,2.01523438 10.3721267,1.79335938 9.9658767,1.61523438 Z M6.07014098,4.62654496 C6.21251373,4.38993428 6.5197405,4.31353935 6.75635117,4.4559121 L6.75635117,4.4559121 L10.2300442,6.5460935 C10.2987727,6.58744863 10.356543,6.64473184 10.3984787,6.71310766 C10.54285,6.94850422 10.4690594,7.2563669 10.2336629,7.4007382 L10.2336629,7.4007382 L6.75996986,9.53119236 C6.68131109,9.57943465 6.59083666,9.60496919 6.4985625,9.60496919 C6.22242013,9.60496919 5.9985625,9.38111156 5.9985625,9.10496919 L5.9985625,9.10496919 L5.9985625,4.88433363 C5.9985625,4.79349746 6.02330791,4.7043773 6.07014098,4.62654496 Z" id="形状结合"></path>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 5.2 KiB

16
src/icons/svg/icon-维护结束.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 6.0 KiB

14
src/icons/svg/icon-编辑.svg
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 60 (88103) - https://sketch.com -->
<title>常用购票人／编辑32</title>
<desc>Created with Sketch.</desc>
<g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="icon/界面内/编辑" transform="translate(-1.000000, -1.000000)" fill-rule="nonzero">
<g id="常用购票人／编辑32">
<rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
<path d="M13.5,7.8285 C13.5,7.55235763 13.7238576,7.3285 14,7.3285 C14.2761424,7.3285 14.5,7.55235763 14.5,7.8285 L14.5,12 C14.5,13.3807119 13.3807119,14.5 12,14.5 L4,14.5 C2.61928813,14.5 1.5,13.3807119 1.5,12 L1.5,4 C1.5,2.61928813 2.61928813,1.5 4,1.5 L8.759,1.5 C8.9376328,1.5 9.10269631,1.59529946 9.19201271,1.75 C9.28132911,1.90470054 9.28132911,2.09529946 9.19201271,2.25 C9.10269631,2.40470054 8.9376328,2.5 8.759,2.5 L4,2.5 C3.17157288,2.5 2.5,3.17157288 2.5,4 L2.5,12 C2.5,12.8284271 3.17157288,13.5 4,13.5 L12,13.5 C12.8284271,13.5 13.5,12.8284271 13.5,12 L13.5,7.8285 Z M13.284,2.312 C13.4738226,2.11757837 13.784168,2.11034095 13.9828473,2.2957025 C14.1815266,2.48106405 14.1958051,2.79116533 14.015,2.994 L8.56,8.845 C8.43817243,8.97566989 8.25588756,9.03141962 8.08181033,8.9912488 C7.90773311,8.95107798 7.76830999,8.82108951 7.71606033,8.65024879 C7.66381067,8.47940808 7.70667243,8.29366989 7.8285,8.163 L13.284,2.312 Z" id="形状" stroke="#0B58FF" stroke-width="0.1" fill="#0B58FF"></path>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

16
src/icons/svg/icon-设置.svg
View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 60 (88103) - https://sketch.com -->
<title>3.1 设置</title>
<desc>Created with Sketch.</desc>
<g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="进工业炉加工_录入托盘标识卡信息" transform="translate(-1744.000000, -22.000000)" fill="#000000" fill-rule="nonzero">
<g id="编组-18" transform="translate(336.000000, 0.000000)">
<g id="3.1-设置" transform="translate(1406.000000, 20.000000)">
<rect id="矩形" opacity="0" x="0" y="0" width="24" height="24"></rect>
<path d="M21.4204889,10.12097 C21.3061584,9.5166757 20.9354897,9.12590864 20.4607796,9.12590864 L20.3784674,9.12590864 C19.0956971,9.12590864 18.0523325,8.08256803 18.0523325,6.79943798 C18.0523325,6.39408881 18.2468406,5.93189817 18.2543475,5.91352664 C18.4910191,5.38096772 18.3094142,4.7283462 17.8306268,4.3933893 L15.4235708,3.05315398 L15.3881948,3.03583772 C14.9066492,2.8270113 14.2475521,2.96067267 13.8884915,3.33474705 C13.6286517,3.60274134 12.7328591,4.36688726 12.0493225,4.36688726 C11.356888,4.36688726 10.4591047,3.58741575 10.1979457,3.31433688 C9.83950875,2.93752835 9.18722299,2.79607226 8.70023318,3.00453893 L6.20748326,4.37029294 L6.17006862,4.39410879 C5.69123327,4.72772259 5.50895686,5.38032014 5.74430927,5.91084045 C5.75243977,5.9302433 5.94766739,6.38866847 5.94766739,6.79946196 C5.94766739,8.08259201 4.90430278,9.12593262 3.6215565,9.12593262 L3.52430243,9.12593262 C3.06451017,9.12593262 2.69381749,9.5166757 2.57955898,10.120994 C2.57104474,10.1635171 2.37821548,11.1861358 2.37821548,12.0060679 C2.37821548,12.8249447 2.57104474,13.8472036 2.57955898,13.889391 C2.69381752,14.494069 3.06451017,14.8851719 3.5392443,14.8851719 L3.6215565,14.8851719 C4.9043028,14.8851719 5.94766739,15.9285365 5.94766739,17.2112828 C5.94766739,17.6193661 5.75246374,18.0798299 5.7449808,18.0975059 C5.50898081,18.6310961 5.68991414,19.2826863 6.16735842,19.6159644 L8.52884534,20.9409221 L8.56489289,20.957255 C9.05324979,21.1721973 9.71366602,21.0320603 10.0707599,20.641677 C10.4006083,20.2852546 11.2943623,19.5452124 11.9506773,19.5452124 C12.662107,19.5452124 13.5783098,20.3736587 13.8422269,20.6647493 C14.0856858,20.9313765 14.4597841,21.0919477 14.8427085,21.0919477 C15.0215793,21.0919477 15.1909284,21.0565237 15.3460073,20.9898969 L17.7945792,19.6404998 L17.8306267,19.6173075 C18.3094141,19.2827103 18.4917145,18.6311201 18.2557385,18.100264 C18.24756,18.0805254 18.0523564,17.6220762 18.0523564,17.2113068 C18.0523564,15.9285604 19.095721,14.8851959 20.3784913,14.8851959 L20.4744262,14.8851959 C20.9348421,14.8851959 21.3061823,14.494093 21.4204888,13.889415 C21.4286433,13.8472276 21.6217843,12.8249687 21.6217843,12.0060919 C21.6217843,11.1861118 21.4286434,10.1634931 21.4204889,10.12097 M20.2261467,12.0060439 C20.2261467,12.5358687 20.1207142,13.2167191 20.0724109,13.5010223 C18.1482435,13.6588113 16.6566708,15.2667052 16.6566708,17.2112587 C16.6566708,17.7601506 16.8308167,18.2858981 16.923322,18.5277262 L14.8345542,19.6812481 C14.7318318,19.5738009 14.4284855,19.2676965 14.0156534,18.9602489 C13.290601,18.4229412 12.5954563,18.1484713 11.9506534,18.1484713 C11.3113189,18.1484713 10.6216665,18.4161298 9.90001978,18.9466501 C9.48920231,19.2459192 9.18995721,19.5438213 9.08519623,19.6540026 L7.07603044,18.5290693 C7.17398004,18.2750095 7.3433532,17.7560494 7.3433532,17.2112587 C7.3433532,15.2667052 5.85178048,13.6588113 3.92830859,13.5010223 C3.8793338,13.216719 3.77390128,12.5358926 3.77390128,12.0060439 C3.77390128,11.4751638 3.8793338,10.7940017 3.92830859,10.5096984 C5.85178048,10.3522452 7.3433532,8.74401555 7.3433532,6.79946196 C7.3433532,6.25364004 7.16923125,5.72618965 7.07672597,5.48472136 L9.21717874,4.30839091 C9.31035558,4.40159173 9.61574051,4.70050106 10.0333454,4.99773155 C10.744799,5.5054673 11.4222677,5.76257299 12.0493465,5.76257299 C12.6703095,5.76257299 13.3429815,5.51024006 14.0496623,5.01236163 C14.4706729,4.71649823 14.7753863,4.42166613 14.8637903,4.33834662 L16.9239695,5.48268277 C16.8307927,5.72278397 16.6566468,6.24853153 16.6566468,6.79946198 C16.6566468,8.74401558 18.1482195,10.3522452 20.0723869,10.5096984 C20.1207142,10.7946492 20.2261467,11.4785695 20.2261467,12.0060439 M11.9581844,8.56953387 C10.07076,8.56953387 8.53498528,10.1053326 8.53498528,11.9927569 C8.53498528,13.880493 10.070784,15.4156442 11.9581844,15.4156442 C13.8456087,15.4156442 15.3814074,13.880493 15.3814074,11.9927569 C15.3814074,10.1053326 13.8456087,8.56953387 11.9581844,8.56953387 M13.9857457,11.9927569 C13.9857457,13.110567 13.0763782,14.0199105 11.9581843,14.0199105 C10.8400144,14.0199105 9.93131855,13.110567 9.93131855,11.9927569 C9.93131855,10.8755944 10.8400144,9.96589113 11.9581843,9.96589113 C13.0763782,9.96589113 13.9857457,10.8755944 13.9857457,11.9927569" id="形状"></path>
</g>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 5.0 KiB

14
src/icons/svg/icon-详情.svg
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="14px" height="12px" viewBox="0 0 14 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 60 (88103) - https://sketch.com -->
<title>详情备份</title>
<desc>Created with Sketch.</desc>
<g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="icon/界面内/详情" transform="translate(-1.000000, -2.000000)" fill-rule="nonzero">
<g id="详情备份">
<rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
<path d="M14.25,3 L5.125,3 C5.05625,3 5,3.05625 5,3.125 L5,4 C5,4.06875 5.05625,4.125 5.125,4.125 L14.25,4.125 C14.31875,4.125 14.375,4.06875 14.375,4 L14.375,3.125 C14.375,3.05625 14.31875,3 14.25,3 Z M14.25,7.4375 L5.125,7.4375 C5.05625,7.4375 5,7.49375 5,7.5625 L5,8.4375 C5,8.50625 5.05625,8.5625 5.125,8.5625 L14.25,8.5625 C14.31875,8.5625 14.375,8.50625 14.375,8.4375 L14.375,7.5625 C14.375,7.49375 14.31875,7.4375 14.25,7.4375 Z M14.25,11.875 L5.125,11.875 C5.05625,11.875 5,11.93125 5,12 L5,12.875 C5,12.94375 5.05625,13 5.125,13 L14.25,13 C14.31875,13 14.375,12.94375 14.375,12.875 L14.375,12 C14.375,11.93125 14.31875,11.875 14.25,11.875 Z M1.625,3.5625 C1.625,3.87510739 1.79177405,4.16396854 2.0625,4.32027224 C2.33322594,4.47657594 2.66677406,4.47657594 2.9375,4.32027224 C3.20822595,4.16396854 3.375,3.87510739 3.375,3.5625 C3.375,3.24989261 3.20822595,2.96103146 2.9375,2.80472776 C2.66677406,2.64842406 2.33322594,2.64842406 2.0625,2.80472776 C1.79177405,2.96103146 1.625,3.24989261 1.625,3.5625 L1.625,3.5625 Z M1.625,8 C1.625,8.31260739 1.79177405,8.60146854 2.0625,8.75777224 C2.33322594,8.91407594 2.66677406,8.91407594 2.9375,8.75777224 C3.20822595,8.60146854 3.375,8.31260739 3.375,8 C3.375,7.68739261 3.20822595,7.39853146 2.9375,7.24222776 C2.66677406,7.08592406 2.33322594,7.08592406 2.0625,7.24222776 C1.79177405,7.39853146 1.625,7.68739261 1.625,8 L1.625,8 Z M1.625,12.4375 C1.625,12.7501074 1.79177405,13.0389685 2.0625,13.1952722 C2.33322594,13.3515759 2.66677406,13.3515759 2.9375,13.1952722 C3.20822595,13.0389685 3.375,12.7501074 3.375,12.4375 C3.375,12.1248926 3.20822595,11.8360315 2.9375,11.6797278 C2.66677406,11.5234241 2.33322594,11.5234241 2.0625,11.6797278 C1.79177405,11.8360315 1.625,12.1248926 1.625,12.4375 L1.625,12.4375 Z" id="形状" fill="#0B58FF"></path>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

24
src/icons/svg/icon-进工业炉加工.svg
View File

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 60 (88103) - https://sketch.com -->
<title>生产和加工情况</title>
<desc>Created with Sketch.</desc>
<defs>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
<stop stop-color="#76E1FF" offset="0%"></stop>
<stop stop-color="#1FACFD" offset="100%"></stop>
</linearGradient>
</defs>
<g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="首页" transform="translate(-434.000000, -171.000000)" fill-rule="nonzero">
<g id="编组-19" transform="translate(432.000000, 168.000000)">
<g id="编组-3">
<g id="生产和加工情况" transform="translate(0.000000, 1.000000)">
<rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="24" height="24"></rect>
<path d="M8.14453125,15.590625 C8.14453125,14.5851563 8.34140625,13.6101563 8.73046875,12.6914063 C9.10546875,11.803125 9.6421875,11.0085938 10.3265625,10.3242188 C11.0109375,9.63984375 11.8054687,9.103125 12.69375,8.728125 C13.6125,8.3390625 14.5875,8.1421875 15.5929688,8.1421875 C16.5984375,8.1421875 17.5734375,8.3390625 18.4921875,8.728125 C18.7757813,8.84765625 19.0476563,8.98359375 19.3125,9.1359375 L19.3125,2.9484375 C19.3125,2.62734375 19.0523437,2.3671875 18.73125,2.3671875 L13.1625,2.3671875 C13.1742187,2.42109375 13.1789063,2.475 13.1789063,2.53125 L13.1789063,5.653125 C13.1789063,6.103125 12.8132813,6.46875 12.3632813,6.46875 L9.3140625,6.46875 C8.8640625,6.46875 8.4984375,6.103125 8.4984375,5.653125 L8.4984375,2.53359375 C8.4984375,2.47734375 8.503125,2.4234375 8.51484375,2.36953125 L2.94609375,2.36953125 C2.625,2.36953125 2.36484375,2.6296875 2.36484375,2.95078125 L2.36484375,18.8085938 C2.36484375,19.1296875 2.625,19.3898438 2.94609375,19.3898438 L9.18515625,19.3898438 C9.0140625,19.1015625 8.86171875,18.8015625 8.73046875,18.4921875 C8.34140625,17.5710938 8.14453125,16.5960938 8.14453125,15.590625 Z M15.5929687,9.5484375 C12.2554687,9.5484375 9.55078125,12.253125 9.55078125,15.590625 C9.55078125,18.928125 12.2554687,21.6328125 15.5929687,21.6328125 C18.9304687,21.6328125 21.6351562,18.928125 21.6351562,15.590625 C21.6351562,12.253125 18.9304687,9.5484375 15.5929687,9.5484375 Z M18.2226562,16.425 C17.5429688,17.1046875 16.5609375,17.3015625 15.7078125,17.015625 L14.1023438,18.6210938 C13.678125,19.0453125 12.9867187,19.0453125 12.5625,18.6210938 C12.1382813,18.196875 12.1382813,17.5054688 12.5625,17.08125 L14.1679688,15.4757813 C13.8820312,14.6226563 14.0765625,13.640625 14.7585937,12.9609375 C15.4921875,12.2273438 16.5726562,12.05625 17.4679687,12.4453125 L15.8953125,14.0179688 L16.1507812,15.0234375 L17.165625,15.2882813 L18.7382812,13.715625 C19.1273437,14.6132812 18.9539062,15.69375 18.2226562,16.425 L18.2226562,16.425 Z M13.0640625,17.6296875 C13.0640625,17.8046918 13.1574262,17.9664025 13.3089844,18.0539047 C13.4605426,18.1414068 13.6472699,18.1414068 13.7988281,18.0539047 C13.9503863,17.9664025 14.04375,17.8046918 14.04375,17.6296875 C14.04375,17.4546832 13.9503863,17.2929725 13.7988281,17.2054703 C13.6472699,17.1179682 13.4605426,17.1179682 13.3089844,17.2054703 C13.1574262,17.2929725 13.0640625,17.4546832 13.0640625,17.6296875 Z" id="形状" fill="url(#linearGradient-1)"></path>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 3.5 KiB

26
src/icons/svg/icon-追加加工.svg
View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="22px" height="22px" viewBox="0 0 22 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 60 (88103) - https://sketch.com -->
<title>编组 15</title>
<desc>Created with Sketch.</desc>
<defs>
<linearGradient x1="50%" y1="0.100295608%" x2="50%" y2="100%" id="linearGradient-1">
<stop stop-color="#FFD730" offset="0%"></stop>
<stop stop-color="#FF9D4F" offset="100%"></stop>
</linearGradient>
</defs>
<g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="首页" transform="translate(-1465.000000, -170.000000)" fill-rule="nonzero">
<g id="编组-19备份-2" transform="translate(1464.000000, 168.000000)">
<g id="编组-3">
<g id="编组-15" transform="translate(0.000000, 1.000000)">
<g id="追加" fill="#000000" opacity="0">
<rect id="矩形" x="0" y="0" width="24" height="24"></rect>
</g>
<path d="M16.4322694,5.34917373 C17.6095644,5.34917373 18.5728058,6.31241512 18.5728058,7.48971015 L18.5728058,7.48971015 L18.5728058,20.3329286 C18.5728058,21.5102237 17.6095644,22.4734651 16.4322694,22.4734651 L16.4322694,22.4734651 L3.58905088,22.4734651 C2.41175585,22.4734651 1.44851447,21.5102237 1.44851447,20.3329286 L1.44851447,20.3329286 L1.44851447,7.48971015 C1.44851447,6.31241512 2.41175585,5.34917373 3.58905088,5.34917373 L3.58905088,5.34917373 Z M10.0106601,9.63024656 C9.47552602,9.63024656 8.94039192,10.1653807 8.94039192,10.7005148 L8.94039192,12.8410512 L6.7998555,12.8410512 C6.2647214,12.8410512 5.7295873,13.3761853 5.7295873,13.9113194 C5.7295873,14.4464535 6.2647214,14.9815876 6.7998555,14.9815876 L8.94039192,14.9815876 L8.94039192,17.122124 C8.94039192,17.6572581 9.47552602,18.1923922 10.0106601,18.1923922 C10.5457942,18.1923922 11.0809283,17.6572581 11.0809283,17.122124 L11.0809283,14.9815876 L13.2214648,14.9815876 C13.7565989,14.9815876 14.291733,14.4464535 14.291733,13.9113194 C14.291733,13.3761853 13.7565989,12.8410512 13.2214648,12.8410512 L11.0809283,12.8410512 L11.0809283,10.7005148 C11.0809283,10.1653807 10.5457942,9.63024656 10.0106601,9.63024656 Z M20.4109491,1 C21.5882441,1 22.5514855,1.96324139 22.5514855,3.14053642 L22.5514855,15.9837549 C22.5514855,17.1610499 21.5882441,18.1242913 20.4109491,18.1242913 L19.7890134,18.1242913 L19.7890134,5.93020465 C19.7890134,4.82563515 18.8935829,3.93020465 17.7890134,3.93020465 L5.42719421,3.93020465 L5.42719421,3.14053642 C5.42719421,1.96324139 6.3904356,1 7.56773062,1 L20.4109491,1 Z" id="形状结合" fill="url(#linearGradient-1)"></path>
</g>
</g>
</g>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

4
src/mock/index.js
View File

@ -1,8 +1,8 @@
/* /*
* @Author: zwq * @Author: zwq
* @Date: 2021-11-15 08:20:28 * @Date: 2021-11-15 08:20:28
* @LastEditors: gtz * @LastEditors: zwq
* @LastEditTime: 2021-12-09 10:08:24 * @LastEditTime: 2021-12-06 15:15:08
* @Description: * @Description:
*/ */
import Mock from 'mockjs' import Mock from 'mockjs'

64
src/router/index.js
View File

@ -1,8 +1,8 @@
/* /*
* @Author: zwq * @Author: zwq
* @Date: 2021-11-15 08:20:28 * @Date: 2021-11-15 08:20:28
* @LastEditors: gtz * @LastEditors: zwq
* @LastEditTime: 2021-12-09 16:23:55 * @LastEditTime: 2021-12-08 14:18:09
* @Description: * @Description:
*/ */
/** /**
@ -38,39 +38,39 @@ const mainRoutes = {
// 1. isTab: 是否通过tab展示内容, true: 是, false: 否 // 1. isTab: 是否通过tab展示内容, true: 是, false: 否
// 2. iframeUrl: 是否通过iframe嵌套展示内容, '以http[s]://开头': 是, '': 否 // 2. iframeUrl: 是否通过iframe嵌套展示内容, '以http[s]://开头': 是, '': 否
// 提示: 如需要通过iframe嵌套展示内容, 但不通过tab打开, 请自行创建组件使用iframe处理! // 提示: 如需要通过iframe嵌套展示内容, 但不通过tab打开, 请自行创建组件使用iframe处理!
{ path: '/home', component: _import('common/home'), name: 'home', meta: { title: '首页', isTab: true } }, { path: '/home', component: _import('common/home'), name: 'home', meta: { title: '首页' } },
{ path: '/orderProcess', component: _import('common/order-process'), name: 'orderProcess', meta: { title: '订单加工', isTab: true } }, { path: '/orderProcess', component: _import('common/order-process'), name: 'orderProcess', meta: { title: '订单加工' } },
{ path: '/exWarehouse', component: _import('common/ex-warehouse'), name: 'exWarehouse', meta: { title: '货物出库', isTab: true } }, { path: '/exWarehouse', component: _import('common/ex-warehouse'), name: 'exWarehouse', meta: { title: '货物出库' } },
{ path: '/addProcess', component: _import('common/add-process'), name: 'addProcess', meta: { title: '追加加工', isTab: true } }, { path: '/addProcess', component: _import('common/add-process'), name: 'addProcess', meta: { title: '追加加工' } },
{ path: '/theme', component: _import('common/theme'), name: 'theme', meta: { title: '主题', isTab: true } }, { path: '/theme', component: _import('common/theme'), name: 'theme', meta: { title: '主题' } },
{ path: '/demo-echarts', component: _import('demo/echarts'), name: 'demo-echarts', meta: { title: 'demo-echarts', isTab: true } }, { path: '/demo-echarts', component: _import('demo/echarts'), name: 'demo-echarts', meta: { title: 'demo-echarts', isTab: true } },
{ path: '/demo-ueditor', component: _import('demo/ueditor'), name: 'demo-ueditor', meta: { title: 'demo-ueditor', isTab: true } }, { path: '/demo-ueditor', component: _import('demo/ueditor'), name: 'demo-ueditor', meta: { title: 'demo-ueditor', isTab: true } },
{ path: '/basic-cache', component: _import('basic/cache'), name: 'basic-cache', meta: { title: '缓存区信息', isTab: true } }, { path: '/basic-cache', component: _import('basic/cache'), name: 'basic-cache', meta: { title: '缓存区信息' } },
{ path: '/basic-processInfo', component: _import('basic/processInfo'), name: 'basic-processInfo', meta: { title: '工艺信息', isTab: true } }, { path: '/basic-processInfo', component: _import('basic/processInfo'), name: 'basic-processInfo', meta: { title: '工艺信息' } },
{ path: '/basic-cache-location', component: _import('basic/components/location'), name: 'basic-cache-location', meta: { title: '库位信息', isTab: true } }, { path: '/basic-cache-location', component: _import('basic/components/location'), name: 'basic-cache-location', meta: { title: '库位信息' } },
{ path: '/basic-equipmentInfo', component: _import('basic/equipmentInfo'), name: 'basic-equipmentInfo', meta: { title: '设备基础信息', isTab: true } }, { path: '/basic-equipmentInfo', component: _import('basic/equipmentInfo'), name: 'basic-equipmentInfo', meta: { title: '设备基础信息' } },
{ path: '/basic-carInfo', component: _import('basic/carInfo'), name: 'basic-carInfo', meta: { title: '车辆信息', isTab: true } }, { path: '/basic-carInfo', component: _import('basic/carInfo'), name: 'basic-carInfo', meta: { title: '车辆信息' } },
{ path: '/basic-alarmInfo', component: _import('basic/alarmInfo'), name: 'basic-alarmInfo', meta: { title: '报警基础信息', isTab: true } }, { path: '/basic-alarmInfo', component: _import('basic/alarmInfo'), name: 'basic-alarmInfo', meta: { title: '报警基础信息' } },
{ path: '/order-current-order', component: _import('order/current-order'), name: 'order-current-order', meta: { title: '当前订单列表', isTab: true } }, { path: '/order-current-order', component: _import('order/current-order'), name: 'order-current-order', meta: { title: '当前订单列表' } },
{ path: '/order-current-order-task', component: _import('order/components/current-order-task'), name: 'order-current-order-task', meta: { title: '当前订单任务详情', isTab: true } }, { path: '/order-current-order-task', component: _import('order/components/current-order-task'), name: 'order-current-order-task', meta: { title: '当前订单任务详情' } },
{ path: '/order-current-task', component: _import('order/current-task'), name: 'order-current-task', meta: { title: '当前执行任务', isTab: true } }, { path: '/order-current-task', component: _import('order/current-task'), name: 'order-current-task', meta: { title: '当前执行任务' } },
{ path: '/order-current-task-detail', component: _import('order/components/current-task-detail'), name: 'order-current-task-detail', meta: { title: '当前执行任务详情', isTab: true } }, { path: '/order-current-task-detail', component: _import('order/components/current-task-detail'), name: 'order-current-task-detail', meta: { title: '当前执行任务详情' } },
{ path: '/report-kiln-alarm', component: _import('report/kiln-alarm'), name: 'report-kiln-alarm', meta: { title: '窑炉报警', isTab: true } }, { path: '/report-kiln-alarm', component: _import('report/kiln-alarm'), name: 'report-kiln-alarm', meta: { title: '窑炉报警' } },
{ path: '/report-car-alarm', component: _import('report/car-alarm'), name: 'report-car-alarm', meta: { title: '车辆运行报警', isTab: true } }, { path: '/report-car-alarm', component: _import('report/car-alarm'), name: 'report-car-alarm', meta: { title: '车辆运行报警' } },
{ path: '/report-order-history', component: _import('report/order-history'), name: 'report-order-history', meta: { title: '订单历史列表', isTab: true } }, { path: '/report-order-history', component: _import('report/order-history'), name: 'report-order-history', meta: { title: '订单历史列表' } },
{ path: '/report-order-history-task', component: _import('report/components/order-history-task'), name: 'report-order-history-task', meta: { title: '订单历史任务详情', isTab: true } }, { path: '/report-order-history-task', component: _import('report/components/order-history-task'), name: 'report-order-history-task', meta: { title: '订单历史任务详情' } },
{ path: '/report-task-history', component: _import('report/task-history'), name: 'report-task-history', meta: { title: '执行任务历史列表', isTab: true } }, { path: '/report-task-history', component: _import('report/task-history'), name: 'report-task-history', meta: { title: '执行任务历史列表' } },
{ path: '/report-task-history-detail', component: _import('report/components/task-history-detail'), name: 'report-task-history-detail', meta: { title: '执行任务历史详情', isTab: true } }, { path: '/report-task-history-detail', component: _import('report/components/task-history-detail'), name: 'report-task-history-detail', meta: { title: '执行任务历史详情' } },
{ path: '/energy-sulfur-dioxide', component: _import('energy/sulfur-dioxide'), name: 'energy-sulfur-dioxide', meta: { title: '二氧化硫流量分析', isTab: true } }, { path: '/energy-sulfur-dioxide', component: _import('energy/sulfur-dioxide'), name: 'energy-sulfur-dioxide', meta: { title: '二氧化硫流量分析' } },
{ path: '/energy-electric', component: _import('energy/electric'), name: 'energy-electric', meta: { title: '用电能源分析' } }, { path: '/energy-electric', component: _import('energy/electric'), name: 'energy-electric', meta: { title: '用电能源分析' } },
{ path: '/energy-kiln-electric', component: _import('energy/kiln-electric'), name: 'energy-kiln-electric', meta: { title: '窑炉用电分析', isTab: true } }, { path: '/energy-kiln-electric', component: _import('energy/kiln-electric'), name: 'energy-kiln-electric', meta: { title: '窑炉用电分析' } },
{ path: '/energy-ammonia', component: _import('energy/ammonia'), name: 'energy-ammonia', meta: { title: '氨气流量分析', isTab: true } }, { path: '/energy-ammonia', component: _import('energy/ammonia'), name: 'energy-ammonia', meta: { title: '氨气流量分析' } },
{ path: '/energy-nitrogen', component: _import('energy/nitrogen'), name: 'energy-nitrogen', meta: { title: '氮气流量分析', isTab: true } }, { path: '/energy-nitrogen', component: _import('energy/nitrogen'), name: 'energy-nitrogen', meta: { title: '氮气流量分析' } },
{ path: '/energy-electric-acquisition', component: _import('energy/electric-acquisition'), name: 'energy-electric-acquisition', meta: { title: '电能采集数据', isTab: true } }, { path: '/energy-electric-acquisition', component: _import('energy/electric-acquisition'), name: 'energy-electric-acquisition', meta: { title: '电能采集数据' } },
{ path: '/energy-process-temperature', component: _import('energy/process-temperature'), name: 'energy-process-temperature', meta: { title: '窑炉加工温度', isTab: true } }, { path: '/energy-process-temperature', component: _import('energy/process-temperature'), name: 'energy-process-temperature', meta: { title: '窑炉加工温度' } },
{ path: '/energy-sump-temperature', component: _import('energy/sump-temperature'), name: 'energy-sump-temperature', meta: { title: '油槽温度', isTab: true } }, { path: '/energy-sump-temperature', component: _import('energy/sump-temperature'), name: 'energy-sump-temperature', meta: { title: '油槽温度' } },
{ path: '/energy-ammonia-analysis', component: _import('energy/ammonia-analysis'), name: 'energy-ammonia-analysis', meta: { title: '使用氮气分析', isTab: true } }, { path: '/energy-ammonia-analysis', component: _import('energy/ammonia-analysis'), name: 'energy-ammonia-analysis', meta: { title: '使用氮气分析' } },
{ path: '/energy-kiln-speed', component: _import('energy/kiln-speed'), name: 'energy-kiln-speed', meta: { title: '窑炉速度参数', isTab: true } } { path: '/energy-kiln-speed', component: _import('energy/kiln-speed'), name: 'energy-kiln-speed', meta: { title: '窑炉速度参数' } }
], ],
beforeEnter (to, from, next) { beforeEnter (to, from, next) {
let token = Vue.cookie.get('token') let token = Vue.cookie.get('token')

46
src/views/basic/alarmInfo.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item> <el-form-item>
<!-- <el-select size="small" v-model="dataForm.paramKey" clearable filterable placeholder="报警编码"> <el-select v-model="dataForm.paramKey" filterable placeholder="报警编码">
<el-option <el-option
v-for="item in dataList" v-for="item in dataList"
:key="item.id" :key="item.id"
@ -10,24 +10,16 @@
:value="item.code" :value="item.code"
> >
</el-option> </el-option>
</el-select> --> </el-select>
<el-input size="small" v-model="dataForm.paramKey" placeholder="报警编码" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" @click="getDataList()"> <el-button @click="getDataList()">查询</el-button>
<icon-svg class="iconClass" name="sousuo"></icon-svg> <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
查询
</el-button>
<el-button size="small" type="primary" @click="addOrUpdateHandle()">
<icon-svg class="iconClass" name="新建"></icon-svg>
新增
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
:data="dataList" :data="dataList"
:stripe="true" border
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column
@ -37,22 +29,28 @@
label="序号" label="序号"
width="50"> width="50">
</el-table-column> </el-table-column>
<!-- <el-table-column <el-table-column
prop="createTime" prop="createTime"
header-align="center" header-align="center"
align="center" align="center"
label="添加时间"> label="添加时间">
</el-table-column> --> </el-table-column>
<el-table-column <el-table-column
prop="alarmClass" prop="alarmClass"
header-align="center"
align="center"
label="报警类型"> label="报警类型">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="code" prop="code"
header-align="center"
align="center"
label="报警编码"> label="报警编码">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="alarmInfo" prop="alarmInfo"
header-align="center"
align="center"
label="报警内容"> label="报警内容">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -62,16 +60,8 @@
width="150" width="150"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)"> <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
<el-tooltip class="item" effect="dark" content="修改" placement="top"> <el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
<icon-svg class="iconClass" name="编辑"></icon-svg>
</el-tooltip>
</el-button>
<el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.row.id)">
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<icon-svg class="iconClass" name="删除"></icon-svg>
</el-tooltip>
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -116,7 +106,7 @@
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/alarmBase/page'), url: this.$http.adornUrl('alarmBase/page'),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'current': this.pageIndex, 'current': this.pageIndex,
@ -160,7 +150,7 @@
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl('/alarmBase/delete'), url: this.$http.adornUrl('alarmBase/delete'),
method: 'post', method: 'post',
data: this.$http.adornData({id}) data: this.$http.adornData({id})
}).then(({data}) => { }).then(({data}) => {

51
src/views/basic/cache.vue
View File

@ -1,24 +1,17 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form :inline="true" style="display: flex; align-items: center; justify-content: right;" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item> <el-form-item>
<el-input size="small" v-model="dataForm.paramKey" placeholder="名称或编码" clearable></el-input> <el-input v-model="dataForm.paramKey" placeholder="名称或编码" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" @click="getDataList()"> <el-button @click="getDataList()">查询</el-button>
<icon-svg class="iconClass" name="sousuo"></icon-svg> <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
查询
</el-button>
<el-button size="small" type="primary" @click="addOrUpdateHandle()">
<icon-svg class="iconClass" name="新建"></icon-svg>
新增
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
:data="dataList" :data="dataList"
:stripe="true" border
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column
@ -28,30 +21,34 @@
label="序号" label="序号"
width="50"> width="50">
</el-table-column> </el-table-column>
<!-- <el-table-column <el-table-column
prop="createTime" prop="createTime"
header-align="center" header-align="center"
align="center" align="center"
label="添加时间"> label="添加时间">
</el-table-column> --> </el-table-column>
<el-table-column <el-table-column
prop="warehouseName" prop="warehouseName"
header-align="center"
align="center"
label="缓存区名称"> label="缓存区名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="code" prop="code"
header-align="center"
align="center"
label="编码"> label="编码">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="englishName" prop="ename"
header-align="center"
align="center"
label="英文名"> label="英文名">
</el-table-column> </el-table-column>
<el-table-column
prop="number"
label="库位数量">
</el-table-column>
<el-table-column <el-table-column
prop="status" prop="status"
header-align="center"
align="center"
label="状态"> label="状态">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -71,16 +68,8 @@
width="150" width="150"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)"> <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
<el-tooltip class="item" effect="dark" content="修改" placement="top"> <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
<icon-svg class="iconClass" name="编辑"></icon-svg>
</el-tooltip>
</el-button>
<el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.row.id)">
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<icon-svg class="iconClass" name="删除"></icon-svg>
</el-tooltip>
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -125,7 +114,7 @@
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/warehouse/page'), url: this.$http.adornUrl('warehouse/page'),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'current': this.pageIndex, 'current': this.pageIndex,
@ -172,7 +161,7 @@
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl('/warehouse/delete'), url: this.$http.adornUrl('warehouse/delete'),
method: 'post', method: 'post',
data: this.$http.adornData({id}) data: this.$http.adornData({id})
}).then(({data}) => { }).then(({data}) => {

54
src/views/basic/carInfo.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item> <el-form-item>
<!-- <el-select size="small" v-model="dataForm.paramKey" filterable placeholder="名称"> <el-select v-model="dataForm.paramKey" filterable placeholder="名称">
<el-option <el-option
v-for="item in dataList" v-for="item in dataList"
:key="item.id" :key="item.id"
@ -10,24 +10,16 @@
:value="item.vehicleName" :value="item.vehicleName"
> >
</el-option> </el-option>
</el-select> --> </el-select>
<el-input size="small" v-model="dataForm.paramKey" placeholder="名称" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" @click="getDataList()"> <el-button @click="getDataList()">查询</el-button>
<icon-svg class="iconClass" name="sousuo"></icon-svg> <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
查询
</el-button>
<el-button size="small" type="primary" @click="addOrUpdateHandle()">
<icon-svg class="iconClass" name="新建"></icon-svg>
新增
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
:data="dataList" :data="dataList"
:stripe="true" border
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column
@ -37,32 +29,30 @@
label="序号" label="序号"
width="50"> width="50">
</el-table-column> </el-table-column>
<!-- <el-table-column <el-table-column
prop="createTime" prop="createTime"
header-align="center" header-align="center"
align="center" align="center"
label="添加时间"> label="添加时间">
</el-table-column> --> </el-table-column>
<el-table-column <el-table-column
prop="vehicleName" prop="vehicleName"
header-align="center"
align="center"
label="车辆名称"> label="车辆名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="code" prop="code"
header-align="center"
align="center"
label="编码"> label="编码">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="vehicleAlias" prop="vehicleAlias"
header-align="center"
align="center"
label="缩写"> label="缩写">
</el-table-column> </el-table-column>
<el-table-column
prop="ip"
label="ip">
</el-table-column>
<el-table-column
prop="note"
label="备注">
</el-table-column>
<el-table-column <el-table-column
fixed="right" fixed="right"
header-align="center" header-align="center"
@ -70,16 +60,8 @@
width="150" width="150"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)"> <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
<el-tooltip class="item" effect="dark" content="修改" placement="top"> <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
<icon-svg class="iconClass" name="编辑"></icon-svg>
</el-tooltip>
</el-button>
<el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.row.id)">
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<icon-svg class="iconClass" name="删除"></icon-svg>
</el-tooltip>
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -124,7 +106,7 @@
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/vehicle/page'), url: this.$http.adornUrl('vehicle/page'),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'current': this.pageIndex, 'current': this.pageIndex,
@ -168,7 +150,7 @@
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl('/vehicle/delete'), url: this.$http.adornUrl('vehicle/delete'),
method: 'post', method: 'post',
data: this.$http.adornData({id}) data: this.$http.adornData({id})
}).then(({data}) => { }).then(({data}) => {

26
src/views/basic/components/alarmInfo-add.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: gtz * @LastEditors: zwq
* @LastEditTime: 2021-12-13 17:01:47 * @LastEditTime: 2021-12-08 11:15:12
* @Description: * @Description:
--> -->
<template> <template>
@ -10,7 +10,7 @@
:title="!dataForm.id ? '新增' : '修改'" :title="!dataForm.id ? '新增' : '修改'"
:close-on-click-modal="false" :close-on-click-modal="false"
:visible.sync="visible"> :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" v-loading="formLoading" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="报警编码" prop="code"> <el-form-item label="报警编码" prop="code">
<el-input v-model="dataForm.code" placeholder="报警编码"></el-input> <el-input v-model="dataForm.code" placeholder="报警编码"></el-input>
</el-form-item> </el-form-item>
@ -46,8 +46,7 @@
alarmInfo: [ alarmInfo: [
{ required: true, message: '报警内容不能为空', trigger: 'blur' } { required: true, message: '报警内容不能为空', trigger: 'blur' }
] ]
}, }
formLoading: false
} }
}, },
methods: { methods: {
@ -56,32 +55,23 @@
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
this.formLoading = true
if (this.dataForm.id) { if (this.dataForm.id) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/alarmBase/get`), url: this.$http.adornUrl(`alarmBase/get`),
method: 'post', method: 'post',
data: this.$http.adornData({id}) data: this.$http.adornData({id})
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm = data.data this.dataForm = data.data
} else {
this.$message.error(data.msg)
} }
this.formLoading = false
}) })
} else { } else {
this.$http({ this.$http({
url: this.$http.adornUrl(`/alarmBase/codeGenerator`), url: this.$http.adornUrl(`alarmBase/codeGenerator`),
method: 'post', method: 'post',
data: this.$http.adornData() data: this.$http.adornData()
}).then(({data}) => { }).then((data) => {
if (data && data.code === 0) {
this.dataForm.code = data.data this.dataForm.code = data.data
} else {
this.$message.error('编码生成失败')
}
this.formLoading = false
}) })
} }
}) })
@ -91,7 +81,7 @@
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/alarmBase/${!this.dataForm.id ? 'add' : 'update'}`), url: this.$http.adornUrl(`alarmBase/${!this.dataForm.id ? 'add' : 'update'}`),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'id': this.dataForm.id || undefined, 'id': this.dataForm.id || undefined,

49
src/views/basic/components/cache-add.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: gtz * @LastEditors: zwq
* @LastEditTime: 2021-12-13 16:38:53 * @LastEditTime: 2021-12-08 14:03:15
* @Description: * @Description:
--> -->
<template> <template>
@ -15,9 +15,8 @@
:model="dataForm" :model="dataForm"
:rules="dataRule" :rules="dataRule"
ref="dataForm" ref="dataForm"
v-loading="formLoading"
@keyup.enter.native="dataFormSubmit()" @keyup.enter.native="dataFormSubmit()"
label-width="100px" label-width="80px"
> >
<el-form-item label="缓存区编码" prop="code"> <el-form-item label="缓存区编码" prop="code">
<el-input v-model="dataForm.code" placeholder="缓存区编码"></el-input> <el-input v-model="dataForm.code" placeholder="缓存区编码"></el-input>
@ -28,14 +27,14 @@
placeholder="缓存区名称" placeholder="缓存区名称"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="英文名称" prop="englishName"> <el-form-item label="英文名称" prop="alarmInfo">
<el-input <el-input
v-model="dataForm.englishName" v-model="dataForm.alarmInfo"
placeholder="英文名称" placeholder="英文名称"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="缩写" prop="aliasName"> <el-form-item label="缩写" prop="alarmInfo">
<el-input v-model="dataForm.aliasName" placeholder="缩写"></el-input> <el-input v-model="dataForm.alarmInfo" placeholder="缩写"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="规格描述" prop="spec"> <el-form-item label="规格描述" prop="spec">
<el-input <el-input
@ -43,9 +42,9 @@
placeholder="规格描述" placeholder="规格描述"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="库位数量" prop="number"> <el-form-item label="库位数量" prop="alarmInfo">
<el-input <el-input
v-model="dataForm.number" v-model="dataForm.alarmInfo"
placeholder="库位数量" placeholder="库位数量"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@ -80,20 +79,10 @@ export default {
code: '', code: '',
description: '', description: '',
spec: '', spec: '',
number: null,
englishName: '',
aliasName: '',
warehouseName: '' warehouseName: ''
}, },
dataRule: { dataRule: {
code: [ }
{ required: true, message: '编码不能为空', trigger: 'blur' }
],
warehouseName: [
{ required: true, message: '缓存区名称不能为空', trigger: 'blur' }
]
},
formLoading: false
} }
}, },
methods: { methods: {
@ -102,33 +91,23 @@ export default {
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
this.formLoading = true
if (this.dataForm.id) { if (this.dataForm.id) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/warehouse/get`), url: this.$http.adornUrl(`warehouse/get`),
method: 'post', method: 'post',
data: this.$http.adornData({ id }) data: this.$http.adornData({ id })
}).then(({ data }) => { }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm = data.data this.dataForm = data.data
} else {
this.$message.error(data.msg)
} }
this.formLoading = false
}) })
} else { } else {
this.formLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl(`/warehouse/codeGenerator`), url: this.$http.adornUrl(`warehouse/codeGenerator`),
method: 'post', method: 'post',
data: this.$http.adornData() data: this.$http.adornData()
}).then(({data}) => { }).then(data => {
if (data && data.code === 0) {
this.dataForm.code = data.data this.dataForm.code = data.data
} else {
this.$message.error('编码生成失败')
}
this.formLoading = false
}) })
} }
}) })
@ -139,7 +118,7 @@ export default {
if (valid) { if (valid) {
this.$http({ this.$http({
url: this.$http.adornUrl( url: this.$http.adornUrl(
`/warehouse/${!this.dataForm.id ? 'add' : 'update'}` `warehouse/${!this.dataForm.id ? 'add' : 'update'}`
), ),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({

35
src/views/basic/components/carInfo-add.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: gtz * @LastEditors: zwq
* @LastEditTime: 2021-12-13 16:56:03 * @LastEditTime: 2021-12-08 11:22:54
* @Description: * @Description:
--> -->
<template> <template>
@ -10,7 +10,7 @@
:title="!dataForm.id ? '新增' : '修改'" :title="!dataForm.id ? '新增' : '修改'"
:close-on-click-modal="false" :close-on-click-modal="false"
:visible.sync="visible"> :visible.sync="visible">
<el-form :model="dataForm" ref="dataForm" v-loading="formLoading" @keyup.enter.native="dataFormSubmit()" label-width="80px"> <el-form :model="dataForm" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="车辆编码" prop="code"> <el-form-item label="车辆编码" prop="code">
<el-input v-model="dataForm.code" placeholder="车辆编码"></el-input> <el-input v-model="dataForm.code" placeholder="车辆编码"></el-input>
</el-form-item> </el-form-item>
@ -23,9 +23,6 @@
<el-form-item label="IP地址" prop="ip"> <el-form-item label="IP地址" prop="ip">
<el-input v-model="dataForm.ip" placeholder="IP地址"></el-input> <el-input v-model="dataForm.ip" placeholder="IP地址"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="note">
<el-input v-model="dataForm.note" placeholder="备注"></el-input>
</el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button> <el-button @click="visible = false">取消</el-button>
@ -44,10 +41,8 @@
code: '', code: '',
ip: '', ip: '',
vehicleName: '', vehicleName: '',
vehicleAlias: '', vehicleAlias: ''
note: '' }
},
formLoading: false
} }
}, },
methods: { methods: {
@ -56,32 +51,23 @@
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
this.formLoading = true
if (this.dataForm.id) { if (this.dataForm.id) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/vehicle/get`), url: this.$http.adornUrl(`vehicle/get`),
method: 'post', method: 'post',
data: this.$http.adornData({id}) data: this.$http.adornData({id})
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm = data.data this.dataForm = data.data
} else {
this.$message.error(data.msg)
} }
this.formLoading = false
}) })
} else { } else {
this.$http({ this.$http({
url: this.$http.adornUrl(`/vehicle/codeGenerator`), url: this.$http.adornUrl(`vehicle/codeGenerator`),
method: 'post', method: 'post',
data: this.$http.adornData() data: this.$http.adornData()
}).then(({data}) => { }).then((data) => {
if (data && data.code === 0) {
this.dataForm.code = data.data this.dataForm.code = data.data
} else {
this.$message.error('编码生成失败')
}
this.formLoading = false
}) })
} }
}) })
@ -91,15 +77,14 @@
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/vehicle/${!this.dataForm.id ? 'add' : 'update'}`), url: this.$http.adornUrl(`vehicle/${!this.dataForm.id ? 'add' : 'update'}`),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'id': this.dataForm.id || undefined, 'id': this.dataForm.id || undefined,
'code': this.dataForm.code, 'code': this.dataForm.code,
'vehicleName': this.dataForm.vehicleName, 'vehicleName': this.dataForm.vehicleName,
'ip': this.dataForm.ip, 'ip': this.dataForm.ip,
'vehicleAlias': this.dataForm.vehicleAlias, 'vehicleAlias': this.dataForm.vehicleAlias
'note': this.dataForm.note
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {

99
src/views/basic/components/equipmentInfo-add.vue
View File

@ -1,37 +1,17 @@
<!--
* @Author: gtz
* @Date: 2021-11-19 10:10:52
* @LastEditors: gtz
* @LastEditTime: 2021-12-13 17:00:12
* @Description: file content
* @FilePath: \mt-qj-wms-ui\src\views\basic\components\equipmentInfo-add.vue
-->
<template> <template>
<el-dialog <el-dialog
:title="!dataForm.id ? '新增' : '修改'" :title="!dataForm.id ? '新增' : '修改'"
:close-on-click-modal="false" :close-on-click-modal="false"
:visible.sync="visible"> :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" v-loading="formLoading" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="名称" prop="kilnName"> <el-form-item label="参数名" prop="paramKey">
<el-input v-model="dataForm.kilnName" placeholder="名称"></el-input> <el-input v-model="dataForm.paramKey" placeholder="参数名"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="编码" prop="code"> <el-form-item label="参数值" prop="paramValue">
<el-input v-model="dataForm.code" placeholder="编码"></el-input> <el-input v-model="dataForm.paramValue" placeholder="参数值"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="别名" prop="kilnAlias"> <el-form-item label="备注" prop="remark">
<el-input v-model="dataForm.kilnAlias" placeholder="别名"></el-input> <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
</el-form-item>
<el-form-item label="英文名" prop="en">
<el-input v-model="dataForm.en" placeholder="英文名"></el-input>
</el-form-item>
<el-form-item label="ip" prop="ip">
<el-input v-model="dataForm.ip" placeholder="ip"></el-input>
</el-form-item>
<el-form-item label="端口号" prop="portNumber">
<el-input v-model="dataForm.portNumber" placeholder="端口号"></el-input>
</el-form-item>
<el-form-item label="备注" prop="note">
<el-input v-model="dataForm.note" placeholder="备注"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
@ -48,27 +28,18 @@
visible: false, visible: false,
dataForm: { dataForm: {
id: 0, id: 0,
code: null, paramKey: '',
description: null, paramValue: '',
en: null, remark: ''
ip: null,
kilnAlias: null,
kilnName: null,
note: null,
portNumber: null
}, },
dataRule: { dataRule: {
kilnName: [ paramKey: [
{ required: true, message: '名称不能为空', trigger: 'blur' } { required: true, message: '参数名不能为空', trigger: 'blur' }
], ],
ip: [ paramValue: [
{ required: true, message: 'ip不能为空', trigger: 'blur' } { required: true, message: '参数值不能为空', trigger: 'blur' }
],
portNumber: [
{ required: true, message: '端口号不能为空', trigger: 'blur' }
] ]
}, }
formLoading: true
} }
}, },
methods: { methods: {
@ -77,32 +48,17 @@
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
this.formLoading = true
if (this.dataForm.id) { if (this.dataForm.id) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/kilnInfo/get`), url: this.$http.adornUrl(`/sys/config/info/${this.dataForm.id}`),
method: 'post', method: 'get',
data: this.$http.adornData({ id }) params: this.$http.adornParams()
}).then(({ data }) => {
if (data && data.code === 0) {
this.dataForm = data.data
} else {
this.$message.error(data.msg)
}
this.formLoading = false
})
} else {
this.$http({
url: this.$http.adornUrl(`/kilnInfo/codeGenerator`),
method: 'post',
data: this.$http.adornData()
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm.code = data.data this.dataForm.paramKey = data.config.paramKey
} else { this.dataForm.paramValue = data.config.paramValue
this.$message.error('编码生成失败') this.dataForm.remark = data.config.remark
} }
this.formLoading = false
}) })
} }
}) })
@ -112,18 +68,13 @@
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/kilnInfo/${!this.dataForm.id ? 'add' : 'update'}`), url: this.$http.adornUrl(`/sys/config/${!this.dataForm.id ? 'save' : 'update'}`),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'id': this.dataForm.id || undefined, 'id': this.dataForm.id || undefined,
'code': this.dataForm.code, 'paramKey': this.dataForm.paramKey,
'description': this.dataForm.description, 'paramValue': this.dataForm.paramValue,
'en': this.dataForm.en, 'remark': this.dataForm.remark
'ip': this.dataForm.ip,
'kilnAlias': this.dataForm.kilnAlias,
'kilnName': this.dataForm.kilnName,
'note': this.dataForm.note,
'portNumber': this.dataForm.portNumber
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {

52
src/views/basic/components/location-add.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: gtz * @LastEditors: zwq
* @LastEditTime: 2021-12-13 17:03:41 * @LastEditTime: 2021-12-08 14:11:44
* @Description: * @Description:
--> -->
<template> <template>
@ -10,26 +10,29 @@
:title="!dataForm.id ? '新增' : '修改'" :title="!dataForm.id ? '新增' : '修改'"
:close-on-click-modal="false" :close-on-click-modal="false"
:visible.sync="visible"> :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" v-loading="formLoading" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="库位名称" prop="locationName"> <el-form-item label="库位名称" prop="locationName">
<el-input v-model="dataForm.locationName" placeholder="库位名称"></el-input> <el-input v-model="dataForm.locationName" placeholder="库位名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="库位编码" prop="code"> <el-form-item label="库位编码" prop="code">
<el-input v-model="dataForm.code" placeholder="库位编码"></el-input> <el-input v-model="dataForm.code" placeholder="库位编码"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="当前状态" prop="status"> <el-form-item label="当前状态" prop="alarmInfo"
<el-radio-group v-model="dataForm.status"> ><el-switch
<el-radio :label="0">空闲</el-radio> v-model="dataForm.alarmInfo"
<el-radio :label="1">使用</el-radio> active-color="#13ce66"
<el-radio :label="2">不可用</el-radio> inactive-color="#ff4949"
</el-radio-group> active-value="1"
inactive-value="0"
>
</el-switch>
</el-form-item> </el-form-item>
<el-form-item label="库位别名" prop="locationNameAlias"> <el-form-item label="库位别名" prop="locationNameAlias">
<el-input v-model="dataForm.locationNameAlias" placeholder="库位别名"></el-input> <el-input v-model="dataForm.locationNameAlias" placeholder="库位别名"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="英文名称" prop="englishName"> <el-form-item label="英文名称" prop="alarmInfo">
<el-input v-model="dataForm.englishName" placeholder="英文名称"></el-input> <el-input v-model="dataForm.alarmInfo" placeholder="英文名称"></el-input>
</el-form-item> --> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button> <el-button @click="visible = false">取消</el-button>
@ -46,18 +49,15 @@
dataForm: { dataForm: {
id: '', id: '',
code: '', code: '',
status: 0,
locationName: '', locationName: '',
locationNameAlias: '', locationNameAlias: '',
englishName: '',
warehouseId: '' warehouseId: ''
}, },
dataRule: { dataRule: {
code: [ code: [
{ required: true, message: '编码不能为空', trigger: 'blur' } { required: true, message: '编码不能为空', trigger: 'blur' }
] ]
}, }
formLoading: false
} }
}, },
methods: { methods: {
@ -67,32 +67,23 @@
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
this.formLoading = true
if (this.dataForm.id) { if (this.dataForm.id) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/locationInfo/get`), url: this.$http.adornUrl(`locationInfo/get`),
method: 'post', method: 'post',
data: this.$http.adornData({id}) data: this.$http.adornData({id})
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm = data.data this.dataForm = data.data
} else {
this.$message.error(data.msg)
} }
this.formLoading = false
}) })
} else { } else {
this.$http({ this.$http({
url: this.$http.adornUrl(`/locationInfo/codeGenerator`), url: this.$http.adornUrl(`locationInfo/codeGenerator`),
method: 'post', method: 'post',
data: this.$http.adornData() data: this.$http.adornData()
}).then(({data}) => { }).then((data) => {
if (data && data.code === 0) {
this.dataForm.code = data.data this.dataForm.code = data.data
} else {
this.$message.error('编码生成失败')
}
this.formLoading = false
}) })
} }
}) })
@ -102,15 +93,14 @@
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/locationInfo/${!this.dataForm.id ? 'add' : 'update'}`), url: this.$http.adornUrl(`locationInfo/${!this.dataForm.id ? 'add' : 'update'}`),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'id': this.dataForm.id || undefined, 'id': this.dataForm.id || undefined,
'code': this.dataForm.code, 'code': this.dataForm.code,
'locationName': this.dataForm.locationName, 'locationName': this.dataForm.locationName,
'warehouseId': this.dataForm.warehouseId, 'warehouseId': this.dataForm.warehouseId,
'locationNameAlias': this.dataForm.locationNameAlias, 'locationNameAlias': this.dataForm.locationNameAlias
'status': this.dataForm.status
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {

31
src/views/basic/components/location.vue
View File

@ -1,15 +1,14 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true"> <el-form :inline="true">
<el-form-item> <el-form-item>
<el-button size="small" type="success" @click="$router.push({ name: 'basic-cache' })">返回缓存区</el-button> <el-button type="success" @click="$router.push({ name: 'basic-cache' })">返回缓存区</el-button>
<el-button size="small" type="primary" @click="addOrUpdateHandle()">新增</el-button> <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
:data="dataList" :data="dataList"
:stripe="true" border
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column
@ -19,32 +18,40 @@
label="序号" label="序号"
width="50"> width="50">
</el-table-column> </el-table-column>
<!-- <el-table-column <el-table-column
prop="createTime" prop="createTime"
header-align="center" header-align="center"
align="center" align="center"
label="添加时间"> label="添加时间">
</el-table-column> --> </el-table-column>
<el-table-column <el-table-column
prop="locationName" prop="locationName"
header-align="center"
align="center"
label="库位名称"> label="库位名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="code" prop="code"
header-align="center"
align="center"
label="编码"> label="编码">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="locationNameAlias" prop="locationNameAlias"
header-align="center"
align="center"
label="别名"> label="别名">
</el-table-column> </el-table-column>
<!-- <el-table-column <el-table-column
prop="englishName" prop="ename"
header-align="center" header-align="center"
align="center" align="center"
label="英文名称"> label="英文名称">
</el-table-column> --> </el-table-column>
<el-table-column <el-table-column
prop="status" prop="status"
header-align="center"
align="center"
label="状态"> label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.status === 0?'空闲':scope.row.status === 1?'使用中':'不可使用'}}</span> <span>{{scope.row.status === 0?'空闲':scope.row.status === 1?'使用中':'不可使用'}}</span>
@ -105,7 +112,7 @@
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/locationInfo/page'), url: this.$http.adornUrl('locationInfo/page'),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'current': this.pageIndex, 'current': this.pageIndex,
@ -152,7 +159,7 @@
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl('/locationInfo/delete'), url: this.$http.adornUrl('locationInfo/delete'),
method: 'post', method: 'post',
data: this.$http.adornData({id}) data: this.$http.adornData({id})
}).then(({data}) => { }).then(({data}) => {

26
src/views/basic/components/processInfo-add.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: gtz * @LastEditors: zwq
* @LastEditTime: 2021-12-13 17:05:54 * @LastEditTime: 2021-12-08 14:21:48
* @Description: * @Description:
--> -->
<template> <template>
@ -10,7 +10,7 @@
:title="!dataForm.id ? '新增' : '修改'" :title="!dataForm.id ? '新增' : '修改'"
:close-on-click-modal="false" :close-on-click-modal="false"
:visible.sync="visible"> :visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" v-loading="formLoading" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="100px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="100px">
<el-form-item label="工艺编码" prop="code"> <el-form-item label="工艺编码" prop="code">
<el-input v-model="dataForm.code" placeholder="工艺编码"></el-input> <el-input v-model="dataForm.code" placeholder="工艺编码"></el-input>
</el-form-item> </el-form-item>
@ -60,8 +60,7 @@
alarmInfo: [ alarmInfo: [
{ required: true, message: '对应PLC值不能为空', trigger: 'blur' } { required: true, message: '对应PLC值不能为空', trigger: 'blur' }
] ]
}, }
formLoading: false
} }
}, },
methods: { methods: {
@ -70,32 +69,23 @@
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
this.formLoading = true
if (this.dataForm.id) { if (this.dataForm.id) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/alarmBase/get`), url: this.$http.adornUrl(`alarmBase/get`),
method: 'post', method: 'post',
data: this.$http.adornData({id}) data: this.$http.adornData({id})
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm = data.data this.dataForm = data.data
} else {
this.$message.error(data.msg)
} }
this.formLoading = false
}) })
} else { } else {
this.$http({ this.$http({
url: this.$http.adornUrl(`/alarmBase/codeGenerator`), url: this.$http.adornUrl(`alarmBase/codeGenerator`),
method: 'post', method: 'post',
data: this.$http.adornData() data: this.$http.adornData()
}).then(({data}) => { }).then((data) => {
if (data && data.code === 0) {
this.dataForm.code = data.data this.dataForm.code = data.data
} else {
this.$message.error('编码生成失败')
}
this.formLoading = false
}) })
} }
}) })
@ -105,7 +95,7 @@
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/alarmBase/${!this.dataForm.id ? 'add' : 'update'}`), url: this.$http.adornUrl(`alarmBase/${!this.dataForm.id ? 'add' : 'update'}`),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'id': this.dataForm.id || undefined, 'id': this.dataForm.id || undefined,

99
src/views/basic/equipmentInfo.vue
View File

@ -4,9 +4,8 @@
:inline="true" :inline="true"
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataList()" @keyup.enter.native="getDataList()"
style="display: flex; align-items: center; justify-content: right;"
> >
<!-- <el-form-item> <el-form-item>
<el-select v-model="dataForm.paramKey" filterable placeholder="名称"> <el-select v-model="dataForm.paramKey" filterable placeholder="名称">
<el-option <el-option
v-for="item in options" v-for="item in options"
@ -16,22 +15,15 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> --> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" @click="getDataList()"> <el-button @click="getDataList()">查询</el-button>
<icon-svg class="iconClass" name="sousuo"></icon-svg> <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
查询
</el-button>
<el-button size="small" type="primary" @click="addOrUpdateHandle()">
<icon-svg class="iconClass" name="新建"></icon-svg>
新增
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
:data="dataList" :data="dataList"
:stripe="true" border
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;" style="width: 100%;"
> >
@ -44,40 +36,45 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="kilnName" prop="paramKey"
label="名称" header-align="center"
align="center"
label="添加时间"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="code" prop="paramValue"
header-align="center"
align="center"
label="设备名称"
>
</el-table-column>
<el-table-column
prop="remark"
header-align="center"
align="center"
label="编码" label="编码"
> >
</el-table-column> </el-table-column>
<!-- <el-table-column <el-table-column
prop="type" prop="type"
header-align="center" header-align="center"
align="center" align="center"
label="类型" label="类型"
> >
</el-table-column> --> </el-table-column>
<el-table-column <el-table-column
prop="en" prop="ename"
header-align="center"
align="center"
label="英文名" label="英文名"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="kilnAlias" prop="suoxie"
label="别名" header-align="center"
> align="center"
</el-table-column> label="缩写"
<el-table-column
prop="ip"
label="ip"
>
</el-table-column>
<el-table-column
prop="portNumber"
label="端口号"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -88,16 +85,18 @@
label="操作" label="操作"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)"> <el-button
<el-tooltip class="item" effect="dark" content="修改" placement="top"> type="text"
<icon-svg class="iconClass" name="编辑"></icon-svg> size="small"
</el-tooltip> @click="addOrUpdateHandle(scope.row.id)"
</el-button> >修改</el-button
<el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.row.id)"> >
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-button
<icon-svg class="iconClass" name="删除"></icon-svg> type="text"
</el-tooltip> size="small"
</el-button> @click="deleteHandle(scope.row.id)"
>删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -126,7 +125,7 @@ export default {
data () { data () {
return { return {
dataForm: { dataForm: {
// paramKey: '' paramKey: ''
}, },
dataList: [], dataList: [],
options: [], options: [],
@ -148,17 +147,17 @@ export default {
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/kilnInfo/page'), url: this.$http.adornUrl('/sys/config/list'),
method: 'post', method: 'get',
data: this.$http.adornData({ params: this.$http.adornParams({
current: this.pageIndex, page: this.pageIndex,
size: this.pageSize limit: this.pageSize,
// paramKey: this.dataForm.paramKey paramKey: this.dataForm.paramKey
}) })
}).then(({ data }) => { }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.data.records this.dataList = data.page.list
this.totalPage = data.data.total this.totalPage = data.page.totalCount
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

50
src/views/basic/processInfo.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form :inline="true" style="display: flex; align-items: center; justify-content: right;" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item> <el-form-item>
<!-- <el-select size="small" v-model="dataForm.paramKey" filterable placeholder="工艺号"> <el-select v-model="dataForm.paramKey" filterable placeholder="工艺号">
<el-option <el-option
v-for="item in dataList" v-for="item in dataList"
:key="item.id" :key="item.id"
@ -10,24 +10,16 @@
:value="item.code" :value="item.code"
> >
</el-option> </el-option>
</el-select> --> </el-select>
<el-input size="small" v-model="dataForm.paramKey" placeholder="工艺号" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" @click="getDataList()"> <el-button @click="getDataList()">查询</el-button>
<icon-svg class="iconClass" name="sousuo"></icon-svg> <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
查询
</el-button>
<el-button size="small" type="primary" @click="addOrUpdateHandle()">
<icon-svg class="iconClass" name="新建"></icon-svg>
新增
</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
:data="dataList" :data="dataList"
:stripe="true" border
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column
@ -37,30 +29,40 @@
label="序号" label="序号"
width="50"> width="50">
</el-table-column> </el-table-column>
<!-- <el-table-column <el-table-column
prop="createTime" prop="createTime"
header-align="center" header-align="center"
align="center" align="center"
label="添加时间"> label="添加时间">
</el-table-column> --> </el-table-column>
<el-table-column <el-table-column
prop="alarmClass" prop="alarmClass"
header-align="center"
align="center"
label="工艺号"> label="工艺号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="code" prop="code"
header-align="center"
align="center"
label="工艺编码"> label="工艺编码">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="alarmInfo" prop="alarmInfo"
header-align="center"
align="center"
label="对应PLC值"> label="对应PLC值">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="alarmInfo" prop="alarmInfo"
header-align="center"
align="center"
label="状态"> label="状态">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="alarmInfo" prop="alarmInfo"
header-align="center"
align="center"
label="说明"> label="说明">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -70,16 +72,8 @@
width="150" width="150"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)"> <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
<el-tooltip class="item" effect="dark" content="修改" placement="top"> <el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
<icon-svg class="iconClass" name="编辑"></icon-svg>
</el-tooltip>
</el-button>
<el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.row.id)">
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<icon-svg class="iconClass" name="删除"></icon-svg>
</el-tooltip>
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -124,7 +118,7 @@
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/alarmBase/page'), url: this.$http.adornUrl('alarmBase/page'),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'current': this.pageIndex, 'current': this.pageIndex,
@ -168,7 +162,7 @@
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl('/alarmBase/delete'), url: this.$http.adornUrl('alarmBase/delete'),
method: 'post', method: 'post',
data: this.$http.adornData({id}) data: this.$http.adornData({id})
}).then(({data}) => { }).then(({data}) => {

135
src/views/common/home.vue
View File

@ -1,57 +1,52 @@
<template> <template>
<div> <div>
<el-row :gutter="20"> <el-row type="flex" justify="space-around">
<el-col :span="8"> <el-col :span="6">
<el-card :style="{height: boxHeight + 'px'}" class="box-card box-card-jg" shadow="hover" @click.native="$router.push({ name: 'orderProcess' })"> <el-card class="box-card" shadow="hover" @click.native="$router.push({ name: 'orderProcess' })">
<p class="box-card-header"> <icon-svg class="iconClass" name="guolu"></icon-svg>
<icon-svg class="iconClass" name="进工业炉加工"></icon-svg> <h2>进工业炉加工</h2>
进工业炉加工
</p>
<p class="box-card-footer">Processing</p>
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-card :style="{height: boxHeight + 'px'}" class="box-card box-card-ck" shadow="hover" @click.native="$router.push({ name: 'exWarehouse' })"> <el-card class="box-card" shadow="hover" @click.native="$router.push({ name: 'exWarehouse' })">
<p class="box-card-header"> <icon-svg class="iconClass" name="chuku"></icon-svg>
<icon-svg class="iconClass" name="出库"></icon-svg> <h2>出库</h2>
出库
</p>
<p class="box-card-footer">Warehouse</p>
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="6">
<el-card :style="{height: boxHeight + 'px'}" class="box-card box-card-zj" shadow="hover" @click.native="$router.push({ name: 'addProcess' })"> <el-card class="box-card" shadow="hover" @click.native="$router.push({ name: 'addProcess' })">
<p class="box-card-header"> <icon-svg class="iconClass" name="zaijiagong"></icon-svg>
<icon-svg class="iconClass" name="追加加工"></icon-svg> <h2>追加加工</h2>
追加加工
</p>
<p class="box-card-footer">Append</p>
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
<el-card class="mod-log"> <div class="mod-log">
<h3>当前任务列表</h3> <h3>当前任务列表</h3>
<el-table <el-table
:data="dataList" :data="dataList"
:stripe="true" border
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}" height="500px"
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%; min-height: 500px" style="width: 100%"
> >
<el-table-column <el-table-column
type="index" type="index"
label="序号"
header-align="center" header-align="center"
align="center" align="center"
label="序号"
width="50" width="50"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="taskCode" prop="taskCode"
header-align="center"
align="center"
label="任务编号" label="任务编号"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="idens" prop="idens"
header-align="center"
align="center"
label="标识卡" label="标识卡"
> >
<template slot-scope="scope"> <template slot-scope="scope">
@ -62,6 +57,8 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="materials" prop="materials"
header-align="center"
align="center"
label="物料名" label="物料名"
> >
<template slot-scope="scope"> <template slot-scope="scope">
@ -72,6 +69,8 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="customers" prop="customers"
header-align="center"
align="center"
label="客户" label="客户"
> >
<template slot-scope="scope"> <template slot-scope="scope">
@ -82,19 +81,22 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="kilnName" prop="kilnName"
header-align="center"
align="center"
label="窑炉" label="窑炉"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="status" prop="status"
header-align="center"
align="center"
label="当前状态" label="当前状态"
> >
<template slot-scope="scope">
{{ scope.row.status >= 0 ? statusList[scope.row.status] : '' }}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="taskType" prop="taskType"
header-align="center"
align="center"
label="任务类型" label="任务类型"
> >
<template slot-scope="scope"> <template slot-scope="scope">
@ -111,66 +113,49 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="startPosition" prop="startPosition"
header-align="center"
align="center"
label="开始位置" label="开始位置"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="targetPosition" prop="targetPosition"
header-align="center"
align="center"
label="目标位置" label="目标位置"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="locationName" prop="locationName"
header-align="center"
align="center"
label="库位" label="库位"
> >
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </div>
</div> </div>
</template> </template>
<script> <script>
// 任务状态列表
const statusList = {
0: '等待执行',
1: '执行中',
2: '执行完成',
3: '追加后完成'
}
export default { export default {
data () { data () {
return { return {
dataList: [], dataList: [],
pageIndex: 1, pageIndex: 1,
pageSize: 500, pageSize: 500,
dataListLoading: false, dataListLoading: false
statusList,
boxHeight: 0
} }
}, },
created () { created () {
this.getDataList() this.getDataList()
if (document.body.offsetWidth > 1180) {
this.boxHeight = (document.body.offsetWidth - 330) * 40 / 183
// * 320 / (3 * 488)
} else {
this.boxHeight = 186
}
window.addEventListener('resize', () => {
if (document.body.offsetWidth > 1180) {
this.boxHeight = (document.body.offsetWidth - 330) * 40 / 183
} else {
this.boxHeight = 186
}
})
}, },
methods: { methods: {
// 获取数据列表 // 获取数据列表
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/currTask/mainCurrentTaskNow'), url: this.$http.adornUrl('currTask/mainCurrentTaskNow'),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
current: this.pageIndex, current: this.pageIndex,
@ -189,43 +174,17 @@ export default {
} }
</script> </script>
<style lang="scss" scoped> <style scoped>
.mod-log { .mod-log {
margin-top: 20px; margin-top: 100px;
border-radius: 15px;
} }
.box-card{ .box-card{
background-color: rgb(235, 254, 255);
text-align: center;
cursor: pointer; cursor: pointer;
background-repeat: no-repeat;
background-size: 100% 100%;
background-color: transparent;
border-radius: 25px;
padding-left: 20px;
padding-top: 40px;
.box-card-header{
font-size: 18px;
letter-spacing: 3px;
}
.box-card-footer{
font-size: 24px;
}
p {
margin: 10px 0;
}
}
.box-card-jg{
background-image: url('../../assets/img/进工业炉加工.png');
}
.box-card-ck{
background-image: url('../../assets/img/出库.png');
}
.box-card-zj{
background-image: url('../../assets/img/追加加工.png');
} }
.iconClass{ .iconClass{
/* width: 20px; width: 100px;
height: 20px; */ height: 100px;
position: relative;
top: 2px;
} }
</style> </style>

6
src/views/common/login.vue
View File

@ -30,8 +30,8 @@
data () { data () {
return { return {
dataForm: { dataForm: {
mobile: '13588441519', mobile: '',
password: '123abc.' password: ''
}, },
dataRule: { dataRule: {
mobile: [ mobile: [
@ -52,7 +52,7 @@
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
this.$http({ this.$http({
url: this.$http.adornUrl('/passport/login'), url: this.$http.adornUrl('passport/login'),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'mobile': this.dataForm.mobile, 'mobile': this.dataForm.mobile,

123
src/views/common/order-process-add.vue
View File

@ -1,32 +1,20 @@
<template> <template>
<el-dialog <el-dialog
:title="!row ? '新增' : '修改'" :title="!dataForm.id ? '新增' : '修改'"
:close-on-click-modal="false" :close-on-click-modal="false"
:visible.sync="visible"> :visible.sync="visible">
<el-form :model="dataForm" v-loading="formLoading" :rules="dataRule" ref="dataForm" label-width="80px"> <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="标识卡号" prop="idenCardNum"> <el-form-item label="标识卡" prop="paramKey">
<el-input v-model="dataForm.idenCardNum" @change="setIdenCardNum" ref="idenCardNum" placeholder="标识卡号"></el-input> <el-input v-model="dataForm.paramKey" placeholder="标识卡"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="客户名称" prop="customerName"> <el-form-item label="产品名称" prop="paramValue">
<el-input v-model="dataForm.customerName" disabled placeholder="客户名称"></el-input> <el-input v-model="dataForm.paramValue" placeholder="产品名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="材料牌号" prop="materialDes"> <el-form-item label="数量" prop="number">
<el-input v-model="dataForm.materialDes" disabled placeholder="材料牌号"></el-input> <el-input v-model="dataForm.remark" placeholder="数量"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="订单号" prop="orderNo"> <el-form-item label="重量" prop="remark">
<el-input v-model="dataForm.orderNo" disabled placeholder="订单号"></el-input> <el-input v-model="dataForm.remark" placeholder="重量"></el-input>
</el-form-item>
<el-form-item label="产品名称" prop="productName">
<el-input v-model="dataForm.productName" disabled placeholder="产品名称"></el-input>
</el-form-item>
<el-form-item label="数量" prop="quantity">
<el-input v-model="dataForm.quantity" placeholder="数量"></el-input>
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input v-model="dataForm.unit" disabled placeholder="单位"></el-input>
</el-form-item>
<el-form-item label="重量" prop="weight">
<el-input v-model="dataForm.weight" placeholder="重量"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
@ -42,86 +30,57 @@
return { return {
visible: false, visible: false,
dataForm: { dataForm: {
idenCardNum: null, id: 0,
customerName: null, paramKey: '',
materialDes: null, paramValue: '',
orderNo: null, remark: ''
productName: null,
quantity: null,
unit: null,
weight: null
}, },
dataRule: { dataRule: {
idenCardNum: [ paramKey: [
{ required: true, message: '标识卡号不能为空', trigger: 'blur' } { required: true, message: '参数名不能为空', trigger: 'blur' }
], ],
quantity: [ paramValue: [
{ required: true, message: '数量不能为空', trigger: 'blur' } { required: true, message: '参数值不能为空', trigger: 'blur' }
],
weight: [
{ required: true, message: '重量不能为空', trigger: 'blur' }
] ]
}, }
formLoading: false,
row: null,
editIndex: null
} }
}, },
methods: { methods: {
init (row, idx) { init (id) {
this.dataForm.id = id || 0
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
if (row) { if (this.dataForm.id) {
this.row = row
this.dataForm = row
this.editIndex = idx
}
this.$refs['idenCardNum'].focus()
})
},
setIdenCardNum () {
this.formLoading = true
if (this.dataForm.idenCardNum) {
this.$http({ this.$http({
url: this.$http.adornUrl(`/orderInfo/getTaskInfoByIdenCardNum`), url: this.$http.adornUrl(`/sys/config/info/${this.dataForm.id}`),
method: 'get', method: 'get',
params: this.$http.adornParams({ params: this.$http.adornParams()
'idenCardNum': this.dataForm.idenCardNum
})
}).then(({data}) => { }).then(({data}) => {
console.log(data)
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm = data.data this.dataForm.paramKey = data.config.paramKey
this.dataForm.targetQuantity = data.data.quantity this.dataForm.paramValue = data.config.paramValue
this.dataForm.targetWeight = data.data.weight this.dataForm.remark = data.config.remark
this.dataForm.weight = null
this.dataForm.quantity = null
} else {
this.$message.warning(data.msg)
} }
this.formLoading = false
}) })
} else {
this.$message.warning('请输入标识卡号')
} }
})
}, },
// 表单提交 // 表单提交
dataFormSubmit () { dataFormSubmit () {
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
if (this.editIndex) { this.$http({
const taskList = JSON.parse(sessionStorage.getItem('taskList')) url: this.$http.adornUrl(`/sys/config/${!this.dataForm.id ? 'save' : 'update'}`),
taskList.splice(this.editIndex, 1, this.dataForm) method: 'post',
sessionStorage.setItem('taskList', JSON.stringify(taskList)) data: this.$http.adornData({
} else if (sessionStorage.getItem('taskList')) { 'id': this.dataForm.id || undefined,
const taskList = JSON.parse(sessionStorage.getItem('taskList')) 'paramKey': this.dataForm.paramKey,
taskList.push(this.dataForm) 'paramValue': this.dataForm.paramValue,
sessionStorage.setItem('taskList', JSON.stringify(taskList)) 'remark': this.dataForm.remark
} else { })
const arr = [this.dataForm] }).then(({data}) => {
sessionStorage.setItem('taskList', JSON.stringify(arr)) if (data && data.code === 0) {
}
this.$message({ this.$message({
message: '操作成功', message: '操作成功',
type: 'success', type: 'success',
@ -131,6 +90,10 @@
this.$emit('refreshDataList') this.$emit('refreshDataList')
} }
}) })
} else {
this.$message.error(data.msg)
}
})
} }
}) })
} }

229
src/views/common/order-process.vue
View File

@ -1,41 +1,25 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form :inline="true" style="display: flex; align-items: center; justify-content: right;"> <div style="color:#67c23a;background:#f0f9eb;padding:5px;margin-bottom:5px;text-align:center">录入托盘标识卡信息</div>
<el-form-item style="flex: 1;float: left"> <el-form :inline="true">
<el-button size="small" type="primary" @click="addOrUpdateHandle()">
<icon-svg class="iconClass" name="新建"></icon-svg>
新增
</el-button>
</el-form-item>
<el-form-item> <el-form-item>
<el-select v-model="processType" size="small" placeholder="加工类型" clearable> <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
<el-option :value="0" label="初始加工" />
<el-option :value="1" label="复加工" />
</el-select>
</el-form-item> </el-form-item>
<el-form-item style="margin-left:1%"> <el-form-item style="margin-left:8%">
<el-select v-model="startPosition" size="small" placeholder="任务起点位置" clearable> 任务起点位置 :
<el-option :value="1" label="提升平台1" /> <el-button style="margin-left:10px" type="primary" @click="getPoint(0)">{{startBtnName}}</el-button>
<el-option :value="2" label="提升平台2" />
<el-option :value="3" label="提升平台3" />
<el-option :value="4" label="提升平台4" />
</el-select>
<!-- <el-button style="margin-left:10px" type="primary" @click="getPoint(0)">{{startPosition}}</el-button> -->
</el-form-item> </el-form-item>
<el-form-item style="margin-left:1%"> <el-form-item style="margin-left:2%">
<el-select v-model="kilnId" size="small" placeholder="窑炉" clearable> 窑炉 :
<el-option v-for="item in eqList" :key="item.id" :value="item.id" :label="item.kilnName" /> <el-button style="margin-left:10px" type="primary" @click="getPoint(1)">{{kilnBtnName}}</el-button>
</el-select>
<!-- <el-button style="margin-left:10px" type="primary" @click="getPoint(1)">{{kilnId}}</el-button> -->
</el-form-item> </el-form-item>
<el-form-item style="margin-left:1%"> <el-form-item style="margin-left:10%">
<el-button type="primary" size="small" @click="submitTask()">提交任务</el-button> <el-button type="primary" @click="submitTask()">提交任务</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
:data="dataList" :data="dataList"
:stripe="true" border
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column
@ -46,42 +30,57 @@
width="50"> width="50">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="idenCardNum" prop="id"
header-align="center"
align="center"
label="标识卡"> label="标识卡">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="customerName" prop="paramKey"
label="客户名称"> header-align="center"
align="center"
label="客户信息">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="orderNo" prop="paramValue"
header-align="center"
align="center"
label="订单号"> label="订单号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productName" prop="remark"
header-align="center"
align="center"
label="产品名称"> label="产品名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="materialDes" prop="card"
header-align="center"
align="center"
label="材料号牌"> label="材料号牌">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="finishQuantity" prop="num"
header-align="center"
align="center"
label="已完成数"> label="已完成数">
<template slot-scope="scope">
{{ `${scope.row.finishQuantity}/${scope.row.targetQuantity}` }}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="quantity" prop="number"
header-align="center"
align="center"
label="数量"> label="数量">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="weight" prop="weight"
header-align="center"
align="center"
label="重量"> label="重量">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="unit" prop="unit"
header-align="center"
align="center"
label="单位"> label="单位">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -90,19 +89,20 @@
align="center" align="center"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row, scope.$index)"> <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
<el-tooltip class="item" effect="dark" content="修改" placement="top"> <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
<icon-svg class="iconClass" name="编辑"></icon-svg>
</el-tooltip>
</el-button>
<el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.$index)">
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<icon-svg class="iconClass" name="删除"></icon-svg>
</el-tooltip>
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
:page-sizes="[10, 20, 50, 100]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update> <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
<process-point v-if="processPointVisible" ref="processPoint" @refreshPoint="setPoint"></process-point> <process-point v-if="processPointVisible" ref="processPoint" @refreshPoint="setPoint"></process-point>
@ -115,15 +115,15 @@
export default { export default {
data () { data () {
return { return {
startPosition: '', startBtnName: '选择起点',
kilnId: '', kilnBtnName: '选择窑炉',
targetPosition: '',
dataList: [], dataList: [],
processType: null, pageIndex: 1,
pageSize: 10,
totalPage: 0,
dataListLoading: false, dataListLoading: false,
addOrUpdateVisible: false, addOrUpdateVisible: false,
processPointVisible: false, processPointVisible: false
eqList: []
} }
}, },
components: { components: {
@ -131,41 +131,46 @@
ProcessPoint ProcessPoint
}, },
activated () { activated () {
this.getEqList() this.getDataList()
}, },
methods: { methods: {
// 获取窑炉列表
getEqList () {
this.$http({
url: this.$http.adornUrl('/kilnInfo/page'),
method: 'post',
data: this.$http.adornData({
current: 1,
size: 999
})
}).then(({ data }) => {
if (data && data.code === 0) {
this.eqList = data.data.records
} else {
this.eqList = []
}
this.getDataList()
})
},
// 获取数据列表 // 获取数据列表
getDataList () { getDataList () {
this.dataList = sessionStorage.getItem('taskList') ? JSON.parse(sessionStorage.getItem('taskList')) : [] this.dataListLoading = true
// if (data && data.code === 0) { this.$http({
// this.dataList = data.data.records url: this.$http.adornUrl('/sys/config/list'),
// } else { method: 'get',
// this.dataList = [] params: this.$http.adornParams({
// } 'page': this.pageIndex,
'limit': this.pageSize
})
}).then(({data}) => {
if (data && data.code === 0) {
this.dataList = data.page.list
this.totalPage = data.page.totalCount
} else {
this.dataList = []
this.totalPage = 0
}
this.dataListLoading = false
})
},
// 每页数
sizeChangeHandle (val) {
this.pageSize = val
this.pageIndex = 1
this.getDataList()
},
// 当前页
currentChangeHandle (val) {
this.pageIndex = val
this.getDataList()
}, },
// 新增 / 修改 // 新增 / 修改
addOrUpdateHandle (row, idx) { addOrUpdateHandle (id) {
this.addOrUpdateVisible = true this.addOrUpdateVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.addOrUpdate.init(row, idx) this.$refs.addOrUpdate.init(id)
}) })
}, },
// 获取点位 // 获取点位
@ -177,10 +182,9 @@
}, },
setPoint (count, pointType) { setPoint (count, pointType) {
if (!pointType) { if (!pointType) {
this.startPosition = count this.startBtnName = count
} else { } else {
this.kilnId = count this.kilnBtnName = count
this.targetPosition = count
} }
}, },
submitTask () { submitTask () {
@ -189,62 +193,43 @@
message: '任务为空，请新增一条托盘信息', message: '任务为空，请新增一条托盘信息',
type: 'warning' type: 'warning'
}) })
} else if (!this.startPosition) { } else if (this.startBtnName === '选择起点') {
this.$message({ this.$message({
message: '请选择任务起点', message: '请选择任务起点',
type: 'warning' type: 'warning'
}) })
} else if (!this.kilnId) { } else if (this.kilnBtnName === '选择窑炉') {
this.$message({ this.$message({
message: '请选择窑炉', message: '请选择窑炉',
type: 'warning' type: 'warning'
}) })
} else if (!this.processType) { }
this.$message.warning('请选择加工类型') },
} else { // 删除
this.$confirm(`确定提交任务?`, '提示', { deleteHandle (id) {
this.$confirm(`确定对[id=${id}]进行删除]操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl(`currTask/createProcessTask`), url: this.$http.adornUrl('/sys/config/delete'),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData(id, false)
craftCode: '',
detParams: this.dataList,
kilnId: this.kilnId,
processType: this.processType,
startPosition: this.startPosition,
targetPosition: this.kilnId
// this.targetPosition
})
}).then(({data}) => { }).then(({data}) => {
console.log(data)
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message.success('任务提交成功') this.$message({
this.dataList = [] message: '操作成功',
sessionStorage.setItem('taskList', '') type: 'success',
this.startPosition = '选择起点' duration: 1500,
this.kilnId = '选择窑炉' onClose: () => {
this.targetPosition = null this.getDataList()
} else {
this.$message.warning(data.msg)
} }
}) })
}).catch(() => {}) } else {
this.$message.error(data.msg)
} }
}, })
// 删除
deleteHandle (idx) {
console.log(idx)
this.$confirm(`确定对第${idx + 1}项进行删除操作?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.dataList.splice(idx, 1)
sessionStorage.setItem('taskList', JSON.stringify(this.dataList))
}).catch(() => {}) }).catch(() => {})
} }
} }

5
src/views/main-content.vue
View File

@ -21,7 +21,7 @@
:key="item.name" :key="item.name"
:label="item.title" :label="item.title"
:name="item.name"> :name="item.name">
<el-card :body-style="siteContentViewHeight" style="background: transparent; border: 0; box-shadow: 0 0 0 0 rgba(0, 0, 0, 0)"> <el-card :body-style="siteContentViewHeight">
<iframe <iframe
v-if="item.type === 'iframe'" v-if="item.type === 'iframe'"
:src="item.iframeUrl" :src="item.iframeUrl"
@ -34,7 +34,7 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<!-- 主入口标签页 e --> <!-- 主入口标签页 e -->
<el-card v-else :body-style="siteContentViewHeight" style="background: transparent; border: 0; box-shadow: 0 0 0 0 rgba(0, 0, 0, 0)"> <el-card v-else :body-style="siteContentViewHeight">
<keep-alive> <keep-alive>
<router-view /> <router-view />
</keep-alive> </keep-alive>
@ -124,3 +124,4 @@
} }
} }
</script> </script>

16
src/views/main-navbar.vue
View File

@ -96,16 +96,16 @@
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
// this.$http({ this.$http({
// url: this.$http.adornUrl('/sys/logout'), url: this.$http.adornUrl('/sys/logout'),
// method: 'post', method: 'post',
// data: this.$http.adornData() data: this.$http.adornData()
// }).then(({data}) => { }).then(({data}) => {
// if (data && data.code === 0) { if (data && data.code === 0) {
clearLoginInfo() clearLoginInfo()
this.$router.push({ name: 'login' }) this.$router.push({ name: 'login' })
// } }
// }) })
}).catch(() => {}) }).catch(() => {})
} }
} }

8
src/views/main-sidebar.vue
View File

@ -32,15 +32,15 @@
<icon-svg name="tubiao" class="site-sidebar__menu-icon"></icon-svg> <icon-svg name="tubiao" class="site-sidebar__menu-icon"></icon-svg>
<span slot="title">货物出库</span> <span slot="title">货物出库</span>
</el-menu-item> </el-menu-item>
<!-- <el-menu-item <el-menu-item
index="addProcess" index="addProcess"
@click="$router.push({ name: 'addProcess' })" @click="$router.push({ name: 'addProcess' })"
> >
<icon-svg name="tubiao" class="site-sidebar__menu-icon"></icon-svg> <icon-svg name="tubiao" class="site-sidebar__menu-icon"></icon-svg>
<span slot="title">追加加工</span> <span slot="title">追加加工</span>
</el-menu-item> --> </el-menu-item>
</el-submenu> </el-submenu>
<!-- <el-submenu index="demo"> <el-submenu index="demo">
<template slot="title"> <template slot="title">
<icon-svg <icon-svg
name="shoucang" name="shoucang"
@ -62,7 +62,7 @@
<icon-svg name="editor" class="site-sidebar__menu-icon"></icon-svg> <icon-svg name="editor" class="site-sidebar__menu-icon"></icon-svg>
<span slot="title">ueditor</span> <span slot="title">ueditor</span>
</el-menu-item> </el-menu-item>
</el-submenu> --> </el-submenu>
<el-submenu index="basic"> <el-submenu index="basic">
<template slot="title"> <template slot="title">
<icon-svg name="bianji" class="site-sidebar__menu-icon"></icon-svg> <icon-svg name="bianji" class="site-sidebar__menu-icon"></icon-svg>

74
src/views/order/components/current-order-detail.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: zwq * @Author: zwq
* @Date: 2021-11-19 11:23:44 * @Date: 2021-11-19 11:23:44
* @LastEditors: gtz * @LastEditors: zwq
* @LastEditTime: 2021-12-14 19:08:20 * @LastEditTime: 2021-12-08 14:42:18
* @Description: * @Description:
--> -->
<template> <template>
@ -11,7 +11,7 @@
:close-on-click-modal="false" :close-on-click-modal="false"
:visible.sync="visible" :visible.sync="visible"
> >
<el-form v-loading="formLoading" :model="dataForm" ref="dataForm" label-width="100px"> <el-form :model="dataForm" ref="dataForm" label-width="100px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="标识卡号" prop="idenCardNum"> <el-form-item label="标识卡号" prop="idenCardNum">
@ -21,10 +21,12 @@
readonly readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="订单状态" prop="orderVoid"> <el-form-item label="订单状态" prop="taskType">
<el-select v-model="dataForm.orderVoid" disabled placeholder="订单状态"> <el-input
<el-option v-for="item in orderVoidList" :key="item.value" :value="item.value" :label="item.label" /> v-model="dataForm.taskType"
</el-select> placeholder="订单状态"
readonly
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="物料名称" prop="startPosition"> <el-form-item label="物料名称" prop="startPosition">
<el-input <el-input
@ -47,6 +49,13 @@
readonly readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="任务状态" prop="status">
<el-input
v-model="dataForm.status"
placeholder="任务状态"
readonly
></el-input>
</el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="订单号" prop="orderNo"> <el-form-item label="订单号" prop="orderNo">
@ -84,8 +93,22 @@
readonly readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="物料重量" prop="weight">
<el-input
v-model="dataForm.weight"
placeholder="物料重量"
readonly
></el-input>
</el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="任务来源" prop="orderSource">
<el-input
v-model="dataForm.orderSource"
placeholder="任务来源"
readonly
></el-input>
</el-form-item>
<el-form-item label="单位" prop="unit"> <el-form-item label="单位" prop="unit">
<el-input <el-input
v-model="dataForm.unit" v-model="dataForm.unit"
@ -100,13 +123,6 @@
readonly readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="物料重量" prop="weight">
<el-input
v-model="dataForm.weight"
placeholder="物料重量"
readonly
></el-input>
</el-form-item>
<el-form-item label="实际加工重量" prop="finishWeight"> <el-form-item label="实际加工重量" prop="finishWeight">
<el-input <el-input
v-model="dataForm.finishWeight" v-model="dataForm.finishWeight"
@ -114,11 +130,6 @@
readonly readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="任务状态" prop="status">
<el-select v-model="dataForm.status" disabled placeholder="任务状态">
<el-option v-for="item in statusList" :key="item.value" :value="item.value" :label="item.label" />
</el-select>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -129,28 +140,11 @@
</template> </template>
<script> <script>
// 任务状态列表
const statusList = [
{ value: 0, label: '等待执行' },
{ value: 1, label: '执行中' },
{ value: 2, label: '执行完成' },
{ value: 3, label: '追加后完成' }
]
// 订单状态列表
const orderVoidList = [
{ value: 0, label: '不可用' },
{ value: 1, label: '可用' },
{ value: 2, label: '停止' }
]
export default { export default {
data () { data () {
return { return {
visible: false, visible: false,
dataForm: {}, dataForm: {}
formLoading: false,
statusList,
orderVoidList
} }
}, },
methods: { methods: {
@ -158,18 +152,14 @@ export default {
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
this.formLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl(`/orderInfo/getDet`), url: this.$http.adornUrl(`orderInfo/getDet`),
method: 'post', method: 'post',
data: this.$http.adornData({ id: id }) data: this.$http.adornData({ id: id })
}).then(({ data }) => { }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm = data.data this.dataForm = data.data
} else {
this.$message.error(data.msg)
} }
this.formLoading = false
}) })
}) })
} }

28
src/views/order/components/current-order-task.vue
View File

@ -1,9 +1,8 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true"> <el-form :inline="true">
<el-form-item> <el-form-item>
<el-button <el-button
size="small"
type="success" type="success"
@click="$router.push({ name: 'order-current-order' })" @click="$router.push({ name: 'order-current-order' })"
>返回当前订单列表</el-button >返回当前订单列表</el-button
@ -12,8 +11,7 @@
</el-form> </el-form>
<el-table <el-table
:data="dataList" :data="dataList"
:stripe="true" border
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;" style="width: 100%;"
> >
@ -27,56 +25,78 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="taskCode" prop="taskCode"
header-align="center"
align="center"
label="任务编码" label="任务编码"
> >
</el-table-column </el-table-column
><el-table-column ><el-table-column
prop="abeginTime" prop="abeginTime"
header-align="center"
align="center"
label="发起时间" label="发起时间"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="aendTime" prop="aendTime"
header-align="center"
align="center"
label="完成时间" label="完成时间"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="taskType" prop="taskType"
header-align="center"
align="center"
label="任务类型" label="任务类型"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="remark" prop="remark"
header-align="center"
align="center"
label="当前工序" label="当前工序"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="startPosition" prop="startPosition"
header-align="center"
align="center"
label="开始位置" label="开始位置"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="targetPosition" prop="targetPosition"
header-align="center"
align="center"
label="目标位置" label="目标位置"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="vehicleName" prop="vehicleName"
header-align="center"
align="center"
label="车辆名称" label="车辆名称"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="kilnName" prop="kilnName"
header-align="center"
align="center"
label="加工炉" label="加工炉"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="quantity" prop="quantity"
header-align="center"
align="center"
label="加工数量" label="加工数量"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="weight" prop="weight"
header-align="center"
align="center"
label="重量" label="重量"
> >
</el-table-column> </el-table-column>

35
src/views/order/components/current-task-detail.vue
View File

@ -14,20 +14,9 @@
<el-input v-model="dataForm.remark" placeholder="备注"></el-input> <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
</el-form-item> </el-form-item>
</el-form> --> </el-form> -->
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true">
<el-form-item>
<el-button
size="small"
type="success"
@click="$router.push({ name: 'order-current-task' })"
>返回当前执行任务列表</el-button
>
</el-form-item>
</el-form>
<el-table <el-table
:data="dataList" :data="dataList"
:stripe="true" border
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column
@ -39,43 +28,63 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="idenCardNum" prop="idenCardNum"
header-align="center"
align="center"
label="标识卡号"> label="标识卡号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="orderNo" prop="orderNo"
header-align="center"
align="center"
label="订单名"> label="订单名">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="customer" prop="customerName"
header-align="center"
align="center"
label="客户名称"> label="客户名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productName" prop="productName"
header-align="center"
align="center"
label="产品名称"> label="产品名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productModel" prop="productModel"
header-align="center"
align="center"
label="产品型号"> label="产品型号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="materialDes" prop="materialDes"
header-align="center"
align="center"
label="材料号牌"> label="材料号牌">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="craftIll" prop="craftIll"
header-align="center"
align="center"
width="120" width="120"
label="生产工艺要求"> label="生产工艺要求">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="unit" prop="unit"
header-align="center"
align="center"
label="单位"> label="单位">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="quantity" prop="quantity"
header-align="center"
align="center"
label="数量"> label="数量">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="weight" prop="weight"
header-align="center"
align="center"
label="重量"> label="重量">
</el-table-column> </el-table-column>
</el-table> </el-table>

131
src/views/order/current-order.vue
View File

@ -1,20 +1,35 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" ref="dataForm" :rules="dataRule" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" ref="dataForm" :rules="dataRule" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item> <el-form-item>
<el-input size="small" v-model="dataForm.idenCardNum" placeholder="标识卡号" /> <el-select v-model="dataForm.idenCardNum" filterable placeholder="标识卡号">
<el-option
v-for="item in options1"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-input size="small" v-model="dataForm.idenCardNum" placeholder="订单号" /> <el-select v-model="dataForm.orderNo" filterable placeholder="订单号">
<el-option
v-for="item in options2"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" @click="getDataList()">查询</el-button> <el-button @click="getDataList()">查询</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
:data="dataList" :data="dataList"
:stripe="true" border
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column
@ -26,52 +41,74 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="createTime" prop="createTime"
header-align="center"
align="center"
label="获取时间"> label="获取时间">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="idenCardNum" prop="idenCardNum"
header-align="center"
align="center"
label="标识卡号"> label="标识卡号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="orderNo" prop="orderNo"
header-align="center"
align="center"
label="订单号"> label="订单号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="status" prop="orderSource"
label="任务状态"> header-align="center"
<template slot-scope="scope"> align="center"
{{ scope.row.status >= 0 ? statusList[scope.row.status] : '' }} label="任务来源">
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="orderVoid" prop="status"
header-align="center"
align="center"
label="任务状态">
</el-table-column>
<el-table-column
prop="paramKey"
header-align="center"
align="center"
label="订单状态"> label="订单状态">
<template slot-scope="scope">
{{ scope.row.orderVoid >= 0 ? orderVoidList[scope.row.orderVoid] : '' }}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="customerName" prop="customerName"
header-align="center"
align="center"
label="客户名称"> label="客户名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productName" prop="productName"
header-align="center"
align="center"
label="产品名称"> label="产品名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="materialDes" prop="materialDes"
header-align="center"
align="center"
label="物料名称"> label="物料名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="quantity" prop="quantity"
header-align="center"
align="center"
label="物料数量"> label="物料数量">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="weight" prop="weight"
header-align="center"
align="center"
label="物料重量"> label="物料重量">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="waitWeight" prop="waitWeight"
header-align="center"
align="center"
label="实际重量"> label="实际重量">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -101,12 +138,8 @@
width="150" width="150"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.status < 2 && scope.row.orderVoid === 1" type="text" size="small" @click="completeOrder(scope.row.id)"> <el-button type="text" size="small" @click="completeOrder(scope.row.id)">完成</el-button>
<el-tooltip class="item" effect="dark" content="完成" placement="top"> <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">作废</el-button>
<icon-svg class="iconClass" name="成功"></icon-svg>
</el-tooltip>
</el-button>
<!-- <el-button v-if="scope.row.orderVoid !== 0" type="text" size="small" @click="deleteHandle(scope.row.id)">作废</el-button> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -126,21 +159,6 @@
<script> <script>
import orderDetail from './components/current-order-detail' import orderDetail from './components/current-order-detail'
// 任务状态列表
const statusList = {
0: '等待执行',
1: '执行中',
2: '执行完成',
3: '追加后完成'
}
// 订单状态列表
const orderVoidList = {
0: '不可用',
1: '可用',
2: '停止'
}
export default { export default {
data () { data () {
return { return {
@ -163,23 +181,21 @@
orderNo: [ orderNo: [
{ required: true, message: '订单号不能为空', trigger: 'change' } { required: true, message: '订单号不能为空', trigger: 'change' }
] ]
}, }
statusList,
orderVoidList
} }
}, },
components: { components: {
orderDetail orderDetail
}, },
created () {
this.getDataList()
},
methods: { methods: {
// 获取数据列表 // 获取数据列表
getDataList () { getDataList () {
this.$refs['dataForm'].validate((valid) => {
console.log(valid)
if (valid) {
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/orderInfo/page'), url: this.$http.adornUrl('orderInfo/page'),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'current': this.pageIndex, 'current': this.pageIndex,
@ -189,14 +205,16 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.data.records this.dataList = data.page.list
this.totalPage = data.data.total this.totalPage = data.page.totalCount
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0
} }
this.dataListLoading = false this.dataListLoading = false
}) })
}
})
}, },
// 每页数 // 每页数
sizeChangeHandle (val) { sizeChangeHandle (val) {
@ -210,30 +228,23 @@
this.getDataList() this.getDataList()
}, },
completeOrder (id) { // 完成订单 completeOrder (id) { // 完成订单
this.$confirm(`确定对[id=${id}]进行完成操作?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl('/orderInfo/completeOrder'), url: this.$http.adornUrl('orderInfo/completeOrder'),
method: 'post', method: 'post',
data: this.$http.adornData({ id }) data: this.$http.adornData({
'id': id
})
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message({ this.$message({
message: '操作成功', message: '操作成功',
type: 'success', type: 'success',
duration: 1500, duration: 1500
onClose: () => {
this.getDataList()
}
}) })
} else { } else {
this.$message.error(data.msg) this.$message.error(data.msg)
} }
}) })
})
}, },
// 新增 / 修改 // 新增 / 修改
addOrUpdateHandle (id) { addOrUpdateHandle (id) {
@ -247,15 +258,15 @@
}, },
// 删除 // 删除
deleteHandle (id) { deleteHandle (id) {
this.$confirm(`确定对[id=${id}]进行作废操作?`, '提示', { this.$confirm(`确定对[id=${id}]进行删除操作?`, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl('/orderInfo/voidOrder'), url: this.$http.adornUrl('orderInfo/voidOrder'),
method: 'post', method: 'post',
data: this.$http.adornData({ id }) data: this.$http.adornData(id, false)
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.$message({ this.$message({

58
src/views/order/current-task.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item> <el-form-item>
<el-select size="small" v-model="dataForm.vehicleId" filterable placeholder="车辆名称"> <el-select v-model="dataForm.vehicleId" filterable placeholder="车辆名称">
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.value"
@ -13,14 +13,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" @click="getDataList()">查询</el-button> <el-button @click="getDataList()">查询</el-button>
<!-- <el-button type="primary" @click="handTask()">手动执行任务</el-button> --> <!-- <el-button type="primary" @click="handTask()">手动执行任务</el-button> -->
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
:data="dataList" :data="dataList"
:stripe="true" border
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column
@ -32,25 +31,32 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="taskCode" prop="taskCode"
header-align="center"
align="center"
label="任务编码"> label="任务编码">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="createTime" prop="createTime"
header-align="center"
align="center"
label="发起时间"> label="发起时间">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="taskSource" prop="taskSource"
header-align="center"
align="center"
label="任务来源"> label="任务来源">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="status" prop="status"
header-align="center"
align="center"
label="任务状态"> label="任务状态">
<template slot-scope="scope">
{{ scope.row.status >= 0 ? statusList[scope.row.status] : '' }}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="taskType" prop="taskType"
header-align="center"
align="center"
label="任务类型"> label="任务类型">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
@ -66,14 +72,20 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="startPosition" prop="startPosition"
header-align="center"
align="center"
label="开始位置"> label="开始位置">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="targetPosition" prop="targetPosition"
header-align="center"
align="center"
label="目标位置"> label="目标位置">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="vehicleName" prop="vehicleName"
header-align="center"
align="center"
label="车辆名称"> label="车辆名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -93,16 +105,8 @@
width="120" width="120"
label="操作"> label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)"> <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">执行</el-button>
<el-tooltip class="item" effect="dark" content="执行" placement="top"> <el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.row.sheetNo)">删除</el-button>
<icon-svg class="iconClass" name="维护开始"></icon-svg>
</el-tooltip>
</el-button>
<el-button type="text" style="color:red" size="small" @click="deleteHandle(scope.row.sheetNo)">
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<icon-svg class="iconClass" name="删除"></icon-svg>
</el-tooltip>
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -119,13 +123,6 @@
</template> </template>
<script> <script>
// 任务状态列表
const statusList = {
0: '等待执行',
1: '执行中',
2: '执行完成',
3: '追加后完成'
}
export default { export default {
data () { data () {
return { return {
@ -137,8 +134,7 @@
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
totalPage: 0, totalPage: 0,
dataListLoading: false, dataListLoading: false
statusList
} }
}, },
activated () { activated () {
@ -149,7 +145,7 @@
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/currTask/currentTaskNow'), url: this.$http.adornUrl('currTask/currentTaskNow'),
method: 'post', method: 'post',
data: this.$http.adornData({ data: this.$http.adornData({
'current': this.pageIndex, 'current': this.pageIndex,
@ -184,10 +180,6 @@
handTask () { handTask () {
this.$router.push({name: 'orderProcess'}) this.$router.push({name: 'orderProcess'})
}, },
// 执行
addOrUpdateHandle (id) {
console.log('执行')
},
// 删除 // 删除
deleteHandle (sheetNo) { deleteHandle (sheetNo) {
this.$confirm(`确定对[生产单编号=${sheetNo}]进行删除操作?`, '提示', { this.$confirm(`确定对[生产单编号=${sheetNo}]进行删除操作?`, '提示', {
@ -196,7 +188,7 @@
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http({ this.$http({
url: this.$http.adornUrl('/currTask/deleteBySheetNo'), url: this.$http.adornUrl('currTask/deleteBySheetNo'),
method: 'post', method: 'post',
data: this.$http.adornData(sheetNo) data: this.$http.adornData(sheetNo)
}).then(({data}) => { }).then(({data}) => {

175
src/views/report/components/order-history-detail.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: zwq * @Author: zwq
* @Date: 2021-11-19 11:23:44 * @Date: 2021-11-19 11:23:44
* @LastEditors: gtz * @LastEditors: zwq
* @LastEditTime: 2021-12-15 17:30:43 * @LastEditTime: 2021-12-08 10:38:21
* @Description: * @Description:
--> -->
<template> <template>
@ -11,131 +11,105 @@
:close-on-click-modal="false" :close-on-click-modal="false"
:visible.sync="visible" :visible.sync="visible"
> >
<el-form v-loading="formLoading" :model="dataForm" ref="dataForm" label-width="100px"> <el-form :model="dataForm" ref="dataForm" label-width="100px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <el-col :span="12">
<el-form-item label="标识卡号" prop="idenCardNum"> <el-form-item label="任务编码" prop="taskCode">
<el-input <el-input
v-model="dataForm.idenCardNum" v-model="dataForm.taskCode"
placeholder="标识卡号" placeholder="任务编码"
readonly readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="订单状态" prop="orderVoid"> <el-form-item label="任务类型" prop="taskType">
<el-select v-model="dataForm.orderVoid" disabled placeholder="订单状态">
<el-option v-for="item in orderVoidList" :key="item.value" :value="item.value" :label="item.label" />
</el-select>
</el-form-item>
<el-form-item label="产品名称" prop="productName">
<el-input <el-input
v-model="dataForm.productName" v-model="dataForm.taskType"
placeholder="产品名称" placeholder="任务类型"
readonly readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="物料名称" prop="paramKey"> <el-form-item label="开始位置" prop="startPosition">
<el-input
v-model="dataForm.startPosition"
placeholder="开始位置"
readonly
></el-input>
</el-form-item>
<el-form-item label="托盘编号" prop="paramKey">
<el-input <el-input
v-model="dataForm.paramKey" v-model="dataForm.paramKey"
placeholder="物料名称" placeholder="托盘编号"
readonly readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="物料重量" prop="paramKey"> <el-form-item label="当前工序" prop="paramKey">
<el-input <el-input
v-model="dataForm.paramKey" v-model="dataForm.paramKey"
placeholder="物料重量" placeholder="当前工序"
readonly readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="获取时间" prop="createTime"> <el-form-item label="是否到缓存区" prop="paramKey">
<el-input
v-model="dataForm.createTime"
placeholder="获取时间"
readonly
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="订单号" prop="orderNo">
<el-input
v-model="dataForm.orderNo"
placeholder="订单号"
readonly
></el-input>
</el-form-item>
<el-form-item label="客户名称" prop="customerName">
<el-input
v-model="dataForm.customerName"
placeholder="客户名称"
readonly
></el-input>
</el-form-item>
<el-form-item label="材料牌号" prop="materialDes">
<el-input
v-model="dataForm.materialDes"
placeholder="材料牌号"
readonly
></el-input>
</el-form-item>
<el-form-item label="物料数量" prop="paramKey">
<el-input <el-input
v-model="dataForm.paramKey" v-model="dataForm.paramKey"
placeholder="物料数量" placeholder="是否到缓存区"
readonly
></el-input>
</el-form-item>
<el-form-item label="实际加工数量" prop="finishQuantity">
<el-input
v-model="dataForm.finishQuantity"
placeholder="实际加工数量"
readonly
></el-input>
</el-form-item>
<el-form-item label="任务发起时间" prop="abeginTime">
<el-input
v-model="dataForm.abeginTime"
placeholder="任务发起时间"
readonly
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="订单来源" prop="orderSource">
<el-input
v-model="dataForm.orderSource"
placeholder="订单来源"
readonly readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="任务状态" prop="status"> <el-form-item label="任务状态" prop="status">
<el-select v-model="dataForm.status" disabled placeholder="任务状态">
<el-option v-for="item in statusList" :key="item.value" :value="item.value" :label="item.label" />
</el-select>
</el-form-item>
<el-form-item label="生产工艺要求" prop="craftIll">
<el-input <el-input
v-model="dataForm.craftIll" v-model="dataForm.status"
placeholder="生产工艺要求" placeholder="任务状态"
readonly readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="单位" prop="unit"> </el-col>
<el-col :span="12">
<el-form-item label="任务执行时间" prop="createTime">
<el-input <el-input
v-model="dataForm.unit" v-model="dataForm.createTime"
placeholder="单位" placeholder="任务执行时间"
readonly readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="实际加工重量" prop="finishWeight"> <el-form-item label="运行车辆名" prop="vehicleName">
<el-input <el-input
v-model="dataForm.finishWeight" v-model="dataForm.vehicleName"
placeholder="实际加工重量" placeholder="运行车辆名"
readonly readonly
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="任务完成时间" prop="aendTime"> <el-form-item label="目标位位置" prop="targetPosition">
<el-input <el-input
v-model="dataForm.aendTime" v-model="dataForm.targetPosition"
placeholder="目标位位置"
readonly
></el-input>
</el-form-item>
<el-form-item label="任务执行时间" prop="updateTime">
<el-input
v-model="dataForm.updateTime"
placeholder="任务执行时间"
readonly
></el-input>
</el-form-item>
<el-form-item label="下一个工序" prop="paramKey">
<el-input
v-model="dataForm.paramKey"
placeholder="下一个工序"
readonly
></el-input>
</el-form-item>
<el-form-item label="窑炉名称" prop="kilnName">
<el-input
v-model="dataForm.kilnName"
placeholder="窑炉名称"
readonly
></el-input>
</el-form-item>
<el-form-item label="任务完成时间" prop="paramKey">
<el-input
v-model="dataForm.paramKey"
placeholder="任务完成时间" placeholder="任务完成时间"
readonly readonly
></el-input> ></el-input>
@ -150,28 +124,11 @@
</template> </template>
<script> <script>
// 任务状态列表
const statusList = [
{ value: 0, label: '等待执行' },
{ value: 1, label: '执行中' },
{ value: 2, label: '执行完成' },
{ value: 3, label: '追加后完成' }
]
// 订单状态列表
const orderVoidList = [
{ value: 0, label: '不可用' },
{ value: 1, label: '可用' },
{ value: 2, label: '停止' }
]
export default { export default {
data () { data () {
return { return {
visible: false, visible: false,
dataForm: {}, dataForm: {}
formLoading: false,
statusList,
orderVoidList
} }
}, },
methods: { methods: {
@ -179,7 +136,6 @@ export default {
this.visible = true this.visible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
this.formLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl(`/orderInfoHis/getDet`), url: this.$http.adornUrl(`/orderInfoHis/getDet`),
method: 'post', method: 'post',
@ -187,10 +143,7 @@ export default {
}).then(({ data }) => { }).then(({ data }) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataForm = data.data this.dataForm = data.data
} else {
this.$message.error(data.msg)
} }
this.formLoading = false
}) })
}) })
} }

38
src/views/report/components/order-history-task.vue
View File

@ -1,9 +1,8 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true"> <el-form :inline="true">
<el-form-item> <el-form-item>
<el-button <el-button
size="small"
type="success" type="success"
@click="$router.push({ name: 'report-order-history' })" @click="$router.push({ name: 'report-order-history' })"
>返回订单历史列表</el-button >返回订单历史列表</el-button
@ -12,8 +11,7 @@
</el-form> </el-form>
<el-table <el-table
:data="dataList" :data="dataList"
:stripe="true" border
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;" style="width: 100%;"
> >
@ -27,61 +25,85 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="taskCode" prop="taskCode"
header-align="center"
align="center"
label="任务编码" label="任务编码"
> >
</el-table-column </el-table-column
><el-table-column ><el-table-column
prop="abeginTime" prop="abeginTime"
header-align="center"
align="center"
label="发起时间" label="发起时间"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="aendTime" prop="aendTime"
header-align="center"
align="center"
label="完成时间" label="完成时间"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="orderSource" prop="paramKey"
header-align="center"
align="center"
label="任务来源" label="任务来源"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="taskType" prop="taskType"
header-align="center"
align="center"
label="任务类型" label="任务类型"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="paramKey" prop="remark"
header-align="center"
align="center"
label="当前工序" label="当前工序"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="unit" prop="unit"
header-align="center"
align="center"
label="单位" label="单位"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="finishQuantity" prop="quantity"
header-align="center"
align="center"
label="数量" label="数量"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="finishWeight" prop="weight"
header-align="center"
align="center"
label="重量" label="重量"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="startPosition" prop="startPosition"
header-align="center"
align="center"
label="开始位置" label="开始位置"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="targetPosition" prop="targetPosition"
header-align="center"
align="center"
label="目标位置" label="目标位置"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="vehicleName" prop="vehicleName"
header-align="center"
align="center"
label="车辆名称" label="车辆名称"
> >
</el-table-column> </el-table-column>

29
src/views/report/components/task-history-detail.vue
View File

@ -1,14 +1,13 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true"> <el-form :inline="true">
<el-form-item> <el-form-item>
<el-button size="small" type="success" @click="$router.push({ name: 'report-task-history' })">返回执行任务历史列表</el-button> <el-button type="success" @click="$router.push({ name: 'report-task-history' })">返回执行任务历史列表</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
:data="dataList" :data="dataList"
:stripe="true" border
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column
@ -20,43 +19,63 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="idenCardNum" prop="idenCardNum"
header-align="center"
align="center"
label="标识卡号"> label="标识卡号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="orderNo" prop="orderNo"
header-align="center"
align="center"
label="订单名"> label="订单名">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="customer" prop="customerName"
header-align="center"
align="center"
label="客户名称"> label="客户名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productName" prop="productName"
header-align="center"
align="center"
label="产品名称"> label="产品名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productModel" prop="productModel"
header-align="center"
align="center"
label="产品型号"> label="产品型号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="materialDes" prop="materialDes"
header-align="center"
align="center"
label="材料号牌"> label="材料号牌">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="craftIll" prop="craftIll"
header-align="center"
align="center"
width="120" width="120"
label="生产工艺要求"> label="生产工艺要求">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="unit" prop="unit"
header-align="center"
align="center"
label="单位"> label="单位">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="quantity" prop="quantity"
header-align="center"
align="center"
label="数量"> label="数量">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="weight" prop="weight"
header-align="center"
align="center"
label="重量"> label="重量">
</el-table-column> </el-table-column>
</el-table> </el-table>

69
src/views/report/order-history.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item> <el-form-item>
<el-select size="small" v-model="dataForm.idenCardNum" filterable placeholder="标识卡号"> <el-select v-model="dataForm.idenCardNum" filterable placeholder="标识卡号">
<el-option <el-option
v-for="item in options1" v-for="item in options1"
:key="item.value" :key="item.value"
@ -13,7 +13,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-select size="small" v-model="dataForm.orderNo" filterable placeholder="订单号"> <el-select v-model="dataForm.orderNo" filterable placeholder="订单号">
<el-option <el-option
v-for="item in options2" v-for="item in options2"
:key="item.value" :key="item.value"
@ -24,13 +24,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" @click="getDataList()">查询</el-button> <el-button @click="getDataList()">查询</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
:data="dataList" :data="dataList"
:stripe="true" border
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column
@ -42,58 +41,74 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="createTime" prop="createTime"
header-align="center"
align="center"
label="获取时间"> label="获取时间">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="idenCardNum" prop="idenCardNum"
header-align="center"
align="center"
label="标识卡号"> label="标识卡号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="orderNo" prop="orderNo"
header-align="center"
align="center"
label="订单号"> label="订单号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="abeginTime" prop="abeginTime"
header-align="center"
align="center"
label="发起时间"> label="发起时间">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="aendTime" prop="aendTime"
header-align="center"
align="center"
label="完成时间"> label="完成时间">
</el-table-column> </el-table-column>
<!-- <el-table-column <el-table-column
prop="orderSource" prop="orderSource"
header-align="center" header-align="center"
align="center" align="center"
label="任务来源"> label="任务来源">
</el-table-column> -->
<el-table-column
prop="status"
label="任务状态">
<template slot-scope="scope">
{{ scope.row.status >= 0 ? statusList[scope.row.status] : '' }}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="orderVoid" prop="status"
header-align="center"
align="center"
label="任务状态">
</el-table-column>
<el-table-column
prop="paramKey"
header-align="center"
align="center"
label="订单状态"> label="订单状态">
<template slot-scope="scope">
{{ scope.row.orderVoid >= 0 ? orderVoidList[scope.row.orderVoid] : '' }}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="customerName" prop="customerName"
header-align="center"
align="center"
label="客户名称"> label="客户名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productName" prop="productName"
header-align="center"
align="center"
label="产品名称"> label="产品名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="materialDes" prop="materialDes"
header-align="center"
align="center"
label="材料号牌"> label="材料号牌">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="quantity" prop="quantity"
header-align="center"
align="center"
label="数量"> label="数量">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -133,20 +148,6 @@
<script> <script>
import orderDetail from './components/order-history-detail' import orderDetail from './components/order-history-detail'
// 任务状态列表
const statusList = {
0: '等待执行',
1: '执行中',
2: '执行完成',
3: '追加后完成'
}
// 订单状态列表
const orderVoidList = {
0: '不可用',
1: '可用',
2: '停止'
}
export default { export default {
data () { data () {
return { return {
@ -161,9 +162,7 @@
pageSize: 10, pageSize: 10,
totalPage: 0, totalPage: 0,
dataListLoading: false, dataListLoading: false,
orderDetailVisible: false, orderDetailVisible: false
statusList,
orderVoidList
} }
}, },
components: { components: {

38
src/views/report/task-history.vue
View File

@ -1,14 +1,12 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form <el-form
style="display: flex; align-items: center; justify-content: right;"
:inline="true" :inline="true"
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataList()" @keyup.enter.native="getDataList()"
> >
<el-form-item> <el-form-item>
<el-select <el-select
size="small"
v-model="dataForm.vehicleId" v-model="dataForm.vehicleId"
filterable filterable
placeholder="车辆名称" placeholder="车辆名称"
@ -24,7 +22,6 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-date-picker <el-date-picker
size="small"
v-model="dataForm.time" v-model="dataForm.time"
type="daterange" type="daterange"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -35,13 +32,12 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" @click="getDataList()">查询</el-button> <el-button @click="getDataList()">查询</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table
:data="dataList" :data="dataList"
:stripe="true" border
:header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
v-loading="dataListLoading" v-loading="dataListLoading"
style="width: 100%;" style="width: 100%;"
> >
@ -55,29 +51,36 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="taskCode" prop="taskCode"
header-align="center"
align="center"
label="任务编码" label="任务编码"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="createTime" prop="createTime"
header-align="center"
align="center"
label="发起时间" label="发起时间"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="taskSource" prop="taskSource"
header-align="center"
align="center"
label="任务来源" label="任务来源"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="status" prop="status"
header-align="center"
align="center"
label="任务状态" label="任务状态"
> >
<template slot-scope="scope">
{{ scope.row.status >= 0 ? statusList[scope.row.status] : '' }}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="taskType" prop="taskType"
header-align="center"
align="center"
label="任务类型" label="任务类型"
> >
<template slot-scope="scope"> <template slot-scope="scope">
@ -94,16 +97,22 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="startPosition" prop="startPosition"
header-align="center"
align="center"
label="开始位置" label="开始位置"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="targetPosition" prop="targetPosition"
header-align="center"
align="center"
label="目标位置" label="目标位置"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="vehicleName" prop="vehicleName"
header-align="center"
align="center"
label="车辆名称" label="车辆名称"
> >
</el-table-column> </el-table-column>
@ -135,14 +144,6 @@
</template> </template>
<script> <script>
// 任务状态列表
const statusList = {
0: '等待执行',
1: '执行中',
2: '执行完成',
3: '追加后完成'
}
export default { export default {
data () { data () {
return { return {
@ -156,8 +157,7 @@ export default {
pageSize: 10, pageSize: 10,
totalPage: 0, totalPage: 0,
dataListLoading: false, dataListLoading: false,
orderDetailVisible: false, orderDetailVisible: false
statusList
} }
}, },
activated () { activated () {

10
static/config/index-prod.js
View File

@ -1,11 +1,3 @@
/*
* @Author: gtz
* @Date: 2021-11-19 10:10:52
* @LastEditors: gtz
* @LastEditTime: 2021-12-09 11:08:41
* @Description: file content
* @FilePath: \mt-qj-wms-ui\static\config\index-prod.js
*/
/** /**
* 生产环境 * 生产环境
*/ */
@ -13,7 +5,7 @@
window.SITE_CONFIG = {}; window.SITE_CONFIG = {};
// api接口请求地址 // api接口请求地址
window.SITE_CONFIG['baseUrl'] = '/api'; window.SITE_CONFIG['baseUrl'] = 'http://demo.open.renren.io/renren-fast-server';
// cdn地址 = 域名 + 版本号 // cdn地址 = 域名 + 版本号
window.SITE_CONFIG['domain'] = './'; // 域名 window.SITE_CONFIG['domain'] = './'; // 域名