diff --git a/config/index.js b/config/index.js index 32a0eb5..8589293 100644 --- a/config/index.js +++ b/config/index.js @@ -2,7 +2,7 @@ * @Author: gtz * @Date: 2021-11-19 10:10:51 * @LastEditors: gtz - * @LastEditTime: 2021-12-14 18:43:02 + * @LastEditTime: 2021-12-15 17:19:13 * @Description: file content * @FilePath: \mt-qj-wms-ui\config\index.js */ @@ -22,7 +22,7 @@ module.exports = { // 代理列表, 是否开启代理通过[./dev.env.js]配置 proxyTable: devEnv.OPEN_PROXY === false ? {} : { '/proxyApi': { - target: 'http://192.168.0.189:8080', + target: 'http://192.168.0.183:8080', changeOrigin: true, pathRewrite: { '^/proxyApi': '/api' diff --git a/src/assets/img/出库.png b/src/assets/img/出库.png new file mode 100644 index 0000000..c470ffb Binary files /dev/null and b/src/assets/img/出库.png differ diff --git a/src/assets/img/进工业炉加工.png b/src/assets/img/进工业炉加工.png new file mode 100644 index 0000000..7a964f8 Binary files /dev/null and b/src/assets/img/进工业炉加工.png differ diff --git a/src/assets/img/追加加工.png b/src/assets/img/追加加工.png new file mode 100644 index 0000000..3235027 Binary files /dev/null and b/src/assets/img/追加加工.png differ diff --git a/src/assets/scss/_base.scss b/src/assets/scss/_base.scss index 6078621..6e3f351 100644 --- a/src/assets/scss/_base.scss +++ b/src/assets/scss/_base.scss @@ -307,7 +307,6 @@ img { ------------------------------ */ .site-content { position: relative; - padding: 15px; &__wrapper { position: relative; @@ -337,7 +336,6 @@ img { } } > .el-tabs__content { - padding: 0 15px 15px; > .site-tabs__tools { position: fixed; top: 50px; @@ -362,3 +360,10 @@ img { vertical-align: middle; margin-right: 5px; } + +.mod-config{ + background-color: #fff; + border-radius: 15px; + padding: 20px; + min-height: calc(100vh - 145px); +} diff --git a/src/icons/svg/icon-侧边收纳.svg b/src/icons/svg/icon-侧边收纳.svg new file mode 100644 index 0000000..338485b --- /dev/null +++ b/src/icons/svg/icon-侧边收纳.svg @@ -0,0 +1,16 @@ + + + + outdent + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-出库.svg b/src/icons/svg/icon-出库.svg new file mode 100644 index 0000000..3acb3b1 --- /dev/null +++ b/src/icons/svg/icon-出库.svg @@ -0,0 +1,24 @@ + + + + 出库on + Created with Sketch. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-删除.svg b/src/icons/svg/icon-删除.svg new file mode 100644 index 0000000..faf0658 --- /dev/null +++ b/src/icons/svg/icon-删除.svg @@ -0,0 +1,16 @@ + + + + 删除 + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-总电流.svg b/src/icons/svg/icon-总电流.svg new file mode 100644 index 0000000..262dbc6 --- /dev/null +++ b/src/icons/svg/icon-总电流.svg @@ -0,0 +1,24 @@ + + + + 编组 13 + Created with Sketch. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-总电量.svg b/src/icons/svg/icon-总电量.svg new file mode 100644 index 0000000..4fd9dec --- /dev/null +++ b/src/icons/svg/icon-总电量.svg @@ -0,0 +1,23 @@ + + + + 编组 7 + Created with Sketch. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-成功.svg b/src/icons/svg/icon-成功.svg new file mode 100644 index 0000000..2f011c8 --- /dev/null +++ b/src/icons/svg/icon-成功.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/icon-新建.svg b/src/icons/svg/icon-新建.svg new file mode 100644 index 0000000..dd2d931 --- /dev/null +++ b/src/icons/svg/icon-新建.svg @@ -0,0 +1,13 @@ + + + + Shape + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-日历.svg b/src/icons/svg/icon-日历.svg new file mode 100644 index 0000000..d7c92af --- /dev/null +++ b/src/icons/svg/icon-日历.svg @@ -0,0 +1,13 @@ + + + + 编组 + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-用户名更多.svg b/src/icons/svg/icon-用户名更多.svg new file mode 100644 index 0000000..9d33a24 --- /dev/null +++ b/src/icons/svg/icon-用户名更多.svg @@ -0,0 +1,16 @@ + + + + 箭头 右 + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-维护开始.svg b/src/icons/svg/icon-维护开始.svg new file mode 100644 index 0000000..8351e42 --- /dev/null +++ b/src/icons/svg/icon-维护开始.svg @@ -0,0 +1,18 @@ + + + + 编组 33 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-维护结束.svg b/src/icons/svg/icon-维护结束.svg new file mode 100644 index 0000000..e1d7932 --- /dev/null +++ b/src/icons/svg/icon-维护结束.svg @@ -0,0 +1,16 @@ + + + + 编组 32 + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-编辑.svg b/src/icons/svg/icon-编辑.svg new file mode 100644 index 0000000..fdc6dc1 --- /dev/null +++ b/src/icons/svg/icon-编辑.svg @@ -0,0 +1,14 @@ + + + + 常用购票人/编辑32 + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-设置.svg b/src/icons/svg/icon-设置.svg new file mode 100644 index 0000000..3b8ffa2 --- /dev/null +++ b/src/icons/svg/icon-设置.svg @@ -0,0 +1,16 @@ + + + + 3.1 设置 + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-详情.svg b/src/icons/svg/icon-详情.svg new file mode 100644 index 0000000..38dbd1b --- /dev/null +++ b/src/icons/svg/icon-详情.svg @@ -0,0 +1,14 @@ + + + + 详情备份 + Created with Sketch. + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-进工业炉加工.svg b/src/icons/svg/icon-进工业炉加工.svg new file mode 100644 index 0000000..50d5f2c --- /dev/null +++ b/src/icons/svg/icon-进工业炉加工.svg @@ -0,0 +1,24 @@ + + + + 生产和加工情况 + Created with Sketch. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/icon-追加加工.svg b/src/icons/svg/icon-追加加工.svg new file mode 100644 index 0000000..63eae85 --- /dev/null +++ b/src/icons/svg/icon-追加加工.svg @@ -0,0 +1,26 @@ + + + + 编组 15 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/basic/alarmInfo.vue b/src/views/basic/alarmInfo.vue index 46aa5ed..f9f3130 100644 --- a/src/views/basic/alarmInfo.vue +++ b/src/views/basic/alarmInfo.vue @@ -1,8 +1,8 @@ - + - + + - 查询 - 新增 + + + 查询 + + + + 新增 + --> - 修改 - 删除 + + + + + + + + + + diff --git a/src/views/basic/cache.vue b/src/views/basic/cache.vue index eb7dead..ec1ef97 100644 --- a/src/views/basic/cache.vue +++ b/src/views/basic/cache.vue @@ -1,17 +1,24 @@ - + - + - 查询 - 新增 + + + 查询 + + + + 新增 + --> - 修改 - 删除 + + + + + + + + + + diff --git a/src/views/basic/carInfo.vue b/src/views/basic/carInfo.vue index 5502f3c..0f6c414 100644 --- a/src/views/basic/carInfo.vue +++ b/src/views/basic/carInfo.vue @@ -1,8 +1,8 @@ - + - + + - 查询 - 新增 + + + 查询 + + + + 新增 + --> - 修改 - 删除 + + + + + + + + + + diff --git a/src/views/basic/components/location.vue b/src/views/basic/components/location.vue index 4236d70..122c4c5 100644 --- a/src/views/basic/components/location.vue +++ b/src/views/basic/components/location.vue @@ -1,14 +1,15 @@ - + - 返回缓存区 - 新增 + 返回缓存区 + 新增 --> {{scope.row.status === 0?'空闲':scope.row.status === 1?'使用中':'不可使用'}} diff --git a/src/views/basic/equipmentInfo.vue b/src/views/basic/equipmentInfo.vue index 05e49ee..4e18c0b 100644 --- a/src/views/basic/equipmentInfo.vue +++ b/src/views/basic/equipmentInfo.vue @@ -4,6 +4,7 @@ :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" + style="display: flex; align-items: center; justify-content: right;" > - 查询 - 新增 + + + 查询 + + + + 新增 + @@ -37,15 +45,11 @@ @@ -58,29 +62,21 @@ --> @@ -92,18 +88,16 @@ label="操作" > - 修改 - 删除 + + + + + + + + + + diff --git a/src/views/basic/processInfo.vue b/src/views/basic/processInfo.vue index d3e1609..18774f3 100644 --- a/src/views/basic/processInfo.vue +++ b/src/views/basic/processInfo.vue @@ -1,8 +1,8 @@ - + - + + - 查询 - 新增 + + + 查询 + + + + 新增 + --> - 修改 - 删除 + + + + + + + + + + diff --git a/src/views/common/home.vue b/src/views/common/home.vue index fc10261..e1dc9b4 100644 --- a/src/views/common/home.vue +++ b/src/views/common/home.vue @@ -1,52 +1,57 @@ - - - - - 进工业炉加工 + + + + + + 进工业炉加工 + + Processing - - - - 出库 + + + + + 出库 + + Warehouse - - - - 追加加工 + + + + + 追加加工 + + Append - + 当前任务列表 @@ -57,8 +62,6 @@ @@ -69,8 +72,6 @@ @@ -81,22 +82,19 @@ + + {{ scope.row.status >= 0 ? statusList[scope.row.status] : '' }} + @@ -113,42 +111,59 @@ - + - diff --git a/src/views/common/order-process.vue b/src/views/common/order-process.vue index 124851f..3a75a7f 100644 --- a/src/views/common/order-process.vue +++ b/src/views/common/order-process.vue @@ -1,30 +1,41 @@ - - - 新增 + + + + + 新增 + - - + + - - 任务起点位置 : - {{startPosition}} + + + + + + + + - - 窑炉 : - {{kilnId}} + + + + + - - 提交任务 + + 提交任务 {{ `${scope.row.finishQuantity}/${scope.row.targetQuantity}` }} @@ -75,20 +74,14 @@ - 修改 - 删除 + + + + + + + + + + @@ -114,14 +115,15 @@ export default { data () { return { - startPosition: '选择起点', - kilnId: '选择窑炉', + startPosition: '', + kilnId: '', targetPosition: '', dataList: [], processType: null, dataListLoading: false, addOrUpdateVisible: false, - processPointVisible: false + processPointVisible: false, + eqList: [] } }, components: { @@ -129,9 +131,27 @@ ProcessPoint }, activated () { - this.getDataList() + this.getEqList() }, 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 () { this.dataList = sessionStorage.getItem('taskList') ? JSON.parse(sessionStorage.getItem('taskList')) : [] @@ -169,12 +189,12 @@ message: '任务为空,请新增一条托盘信息', type: 'warning' }) - } else if (this.startPosition === '选择起点') { + } else if (!this.startPosition) { this.$message({ message: '请选择任务起点', type: 'warning' }) - } else if (this.kilnId === '选择窑炉') { + } else if (!this.kilnId) { this.$message({ message: '请选择窑炉', type: 'warning' @@ -196,7 +216,8 @@ kilnId: this.kilnId, processType: this.processType, startPosition: this.startPosition, - targetPosition: this.targetPosition + targetPosition: this.kilnId + // this.targetPosition }) }).then(({data}) => { console.log(data) diff --git a/src/views/main-content.vue b/src/views/main-content.vue index f4b9f7a..efa90a0 100644 --- a/src/views/main-content.vue +++ b/src/views/main-content.vue @@ -21,7 +21,7 @@ :key="item.name" :label="item.title" :name="item.name"> - + - + @@ -124,4 +124,3 @@ } } - diff --git a/src/views/order/components/current-order-detail.vue b/src/views/order/components/current-order-detail.vue index 82245c1..d658aba 100644 --- a/src/views/order/components/current-order-detail.vue +++ b/src/views/order/components/current-order-detail.vue @@ -21,9 +21,9 @@ readonly > - - - + + + @@ -137,7 +137,7 @@ const statusList = [ { value: 3, label: '追加后完成' } ] // 订单状态列表 -const validList = [ +const orderVoidList = [ { value: 0, label: '不可用' }, { value: 1, label: '可用' }, { value: 2, label: '停止' } @@ -150,7 +150,7 @@ export default { dataForm: {}, formLoading: false, statusList, - validList + orderVoidList } }, methods: { diff --git a/src/views/order/components/current-order-task.vue b/src/views/order/components/current-order-task.vue index 2b1772b..13e639f 100644 --- a/src/views/order/components/current-order-task.vue +++ b/src/views/order/components/current-order-task.vue @@ -1,8 +1,9 @@ - + 返回当前订单列表 @@ -25,78 +27,56 @@ diff --git a/src/views/order/components/current-task-detail.vue b/src/views/order/components/current-task-detail.vue index fe8c392..1bc7e09 100644 --- a/src/views/order/components/current-task-detail.vue +++ b/src/views/order/components/current-task-detail.vue @@ -14,9 +14,10 @@ --> - + 返回当前执行任务列表 diff --git a/src/views/order/current-order.vue b/src/views/order/current-order.vue index 5188636..5eba88c 100644 --- a/src/views/order/current-order.vue +++ b/src/views/order/current-order.vue @@ -1,19 +1,20 @@ - - - - - - + + + - 查询 + + + + 查询 {{ scope.row.status >= 0 ? statusList[scope.row.status] : '' }} - {{ scope.row.valid >= 0 ? validList[scope.row.valid] : '' }} + {{ scope.row.orderVoid >= 0 ? orderVoidList[scope.row.orderVoid] : '' }} - 完成 - 作废 + + + + + + @@ -152,7 +135,7 @@ 3: '追加后完成' } // 订单状态列表 - const validList = { + const orderVoidList = { 0: '不可用', 1: '可用', 2: '停止' @@ -182,7 +165,7 @@ ] }, statusList, - validList + orderVoidList } }, components: { diff --git a/src/views/order/current-task.vue b/src/views/order/current-task.vue index 4787e89..165fea3 100644 --- a/src/views/order/current-task.vue +++ b/src/views/order/current-task.vue @@ -1,8 +1,8 @@ - + - + - 查询 + 查询 {{ scope.row.status >= 0 ? statusList[scope.row.status] : '' }} @@ -58,8 +51,6 @@ {{ @@ -75,20 +66,14 @@ - 执行 - 删除 + + + + + + + + + + diff --git a/src/views/report/components/order-history-detail.vue b/src/views/report/components/order-history-detail.vue index abe8ecc..e612c74 100644 --- a/src/views/report/components/order-history-detail.vue +++ b/src/views/report/components/order-history-detail.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2021-11-19 11:23:44 * @LastEditors: gtz - * @LastEditTime: 2021-12-14 20:32:36 + * @LastEditTime: 2021-12-15 17:30:43 * @Description: --> @@ -21,9 +21,9 @@ readonly > - - - + + + @@ -158,7 +158,7 @@ const statusList = [ { value: 3, label: '追加后完成' } ] // 订单状态列表 -const validList = [ +const orderVoidList = [ { value: 0, label: '不可用' }, { value: 1, label: '可用' }, { value: 2, label: '停止' } @@ -171,7 +171,7 @@ export default { dataForm: {}, formLoading: false, statusList, - validList + orderVoidList } }, methods: { diff --git a/src/views/report/components/order-history-task.vue b/src/views/report/components/order-history-task.vue index 818b478..e11e85f 100644 --- a/src/views/report/components/order-history-task.vue +++ b/src/views/report/components/order-history-task.vue @@ -1,8 +1,9 @@ - + 返回订单历史列表 @@ -25,85 +27,61 @@ diff --git a/src/views/report/components/task-history-detail.vue b/src/views/report/components/task-history-detail.vue index aaebbf6..15e27b0 100644 --- a/src/views/report/components/task-history-detail.vue +++ b/src/views/report/components/task-history-detail.vue @@ -1,13 +1,14 @@ - + - 返回执行任务历史列表 + 返回执行任务历史列表 diff --git a/src/views/report/order-history.vue b/src/views/report/order-history.vue index 10d27d2..001375e 100644 --- a/src/views/report/order-history.vue +++ b/src/views/report/order-history.vue @@ -1,8 +1,8 @@ - + - + - + - 查询 + 查询 {{ scope.row.status >= 0 ? statusList[scope.row.status] : '' }} - {{ scope.row.valid >= 0 ? validList[scope.row.valid] : '' }} + {{ scope.row.orderVoid >= 0 ? orderVoidList[scope.row.orderVoid] : '' }} - 查询 + 查询 @@ -51,29 +55,21 @@ @@ -82,8 +78,6 @@ @@ -100,22 +94,16 @@
+ + 进工业炉加工 +
Processing
+ + 出库 +
Warehouse
+ + 追加加工 +
Append