diff --git a/config/index.js b/config/index.js index 2c6b413..505ca0f 100644 --- a/config/index.js +++ b/config/index.js @@ -22,7 +22,7 @@ module.exports = { // 代理列表, 是否开启代理通过[./dev.env.js]配置 proxyTable: devEnv.OPEN_PROXY === false ? {} : { '/proxyApi': { - target: 'http://192.168.1.66:8080', + target: 'http://192.168.1.7:8080', changeOrigin: true, pathRewrite: { '^/proxyApi': '/api' diff --git a/package-lock.json b/package-lock.json index 08e225b..98c2ec0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5593,12 +5593,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5613,17 +5615,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -5740,7 +5745,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -5752,6 +5758,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5766,6 +5773,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5773,12 +5781,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5797,6 +5807,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -5877,7 +5888,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5889,6 +5901,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -6010,6 +6023,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/src/icons/svg/icon-侧边收纳.svg b/src/icons/svg/icon-侧边收纳.svg index 338485b..a9515f3 100644 --- a/src/icons/svg/icon-侧边收纳.svg +++ b/src/icons/svg/icon-侧边收纳.svg @@ -1,7 +1,7 @@ - outdent + Created with Sketch. diff --git a/src/icons/svg/icon-出库.svg b/src/icons/svg/icon-出库.svg index 3acb3b1..53047f1 100644 --- a/src/icons/svg/icon-出库.svg +++ b/src/icons/svg/icon-出库.svg @@ -1,7 +1,7 @@ - 出库on + 出库 Created with Sketch. diff --git a/src/icons/svg/icon-总电流.svg b/src/icons/svg/icon-总电流.svg index 262dbc6..2ec4e6b 100644 --- a/src/icons/svg/icon-总电流.svg +++ b/src/icons/svg/icon-总电流.svg @@ -1,7 +1,7 @@ - 编组 13 + 总电流 Created with Sketch. diff --git a/src/icons/svg/icon-总电量.svg b/src/icons/svg/icon-总电量.svg index 4fd9dec..96f1092 100644 --- a/src/icons/svg/icon-总电量.svg +++ b/src/icons/svg/icon-总电量.svg @@ -1,7 +1,7 @@ - 编组 7 + 总电量 Created with Sketch. diff --git a/src/icons/svg/icon-新建.svg b/src/icons/svg/icon-新建.svg index dd2d931..ec64b7a 100644 --- a/src/icons/svg/icon-新建.svg +++ b/src/icons/svg/icon-新建.svg @@ -1,7 +1,7 @@ - Shape + 新建 Created with Sketch. diff --git a/src/icons/svg/icon-日历.svg b/src/icons/svg/icon-日历.svg index d7c92af..7b2538c 100644 --- a/src/icons/svg/icon-日历.svg +++ b/src/icons/svg/icon-日历.svg @@ -1,7 +1,7 @@ - 编组 + 日历 Created with Sketch. diff --git a/src/icons/svg/icon-用户名更多.svg b/src/icons/svg/icon-用户名更多.svg index 9d33a24..7f84767 100644 --- a/src/icons/svg/icon-用户名更多.svg +++ b/src/icons/svg/icon-用户名更多.svg @@ -1,7 +1,7 @@ - 箭头 右 + 更多 Created with Sketch. diff --git a/src/icons/svg/icon-维护开始.svg b/src/icons/svg/icon-维护开始.svg index 8351e42..3a46657 100644 --- a/src/icons/svg/icon-维护开始.svg +++ b/src/icons/svg/icon-维护开始.svg @@ -1,7 +1,7 @@ - 编组 33 + 维护开始 Created with Sketch. diff --git a/src/icons/svg/icon-维护结束.svg b/src/icons/svg/icon-维护结束.svg index e1d7932..f852f11 100644 --- a/src/icons/svg/icon-维护结束.svg +++ b/src/icons/svg/icon-维护结束.svg @@ -1,7 +1,7 @@ - 编组 32 + 维护结束 Created with Sketch. diff --git a/src/icons/svg/icon-编辑.svg b/src/icons/svg/icon-编辑.svg index fdc6dc1..c65d9ee 100644 --- a/src/icons/svg/icon-编辑.svg +++ b/src/icons/svg/icon-编辑.svg @@ -1,7 +1,7 @@ - 常用购票人/编辑32 + 修改 Created with Sketch. diff --git a/src/icons/svg/icon-设置.svg b/src/icons/svg/icon-设置.svg index 3b8ffa2..fca375b 100644 --- a/src/icons/svg/icon-设置.svg +++ b/src/icons/svg/icon-设置.svg @@ -1,7 +1,7 @@ - 3.1 设置 + 设置 Created with Sketch. diff --git a/src/icons/svg/icon-详情.svg b/src/icons/svg/icon-详情.svg index 38dbd1b..0d991b1 100644 --- a/src/icons/svg/icon-详情.svg +++ b/src/icons/svg/icon-详情.svg @@ -1,7 +1,7 @@ - 详情备份 + 详情 Created with Sketch. diff --git a/src/icons/svg/icon-进工业炉加工.svg b/src/icons/svg/icon-进工业炉加工.svg index 50d5f2c..d1aeb5c 100644 --- a/src/icons/svg/icon-进工业炉加工.svg +++ b/src/icons/svg/icon-进工业炉加工.svg @@ -1,7 +1,7 @@ - 生产和加工情况 + 进工业炉加工 Created with Sketch. diff --git a/src/icons/svg/icon-追加加工.svg b/src/icons/svg/icon-追加加工.svg index 63eae85..5fd30d3 100644 --- a/src/icons/svg/icon-追加加工.svg +++ b/src/icons/svg/icon-追加加工.svg @@ -1,7 +1,7 @@ - 编组 15 + 追加加工 Created with Sketch. diff --git a/src/views/common/order-auto-submit.vue b/src/views/common/order-auto-submit.vue index cde789f..535e4e1 100644 --- a/src/views/common/order-auto-submit.vue +++ b/src/views/common/order-auto-submit.vue @@ -246,7 +246,7 @@ }) } this.$http({ - url: this.$http.adornUrl(`currTask/createAutoTask`), + url: this.$http.adornUrl(`/currTask/createAutoTask`), method: 'post', data: this.$http.adornData(requestData) }).then(({data}) => { diff --git a/src/views/common/order-auto.vue b/src/views/common/order-auto.vue index dbc9e91..01e120a 100644 --- a/src/views/common/order-auto.vue +++ b/src/views/common/order-auto.vue @@ -289,10 +289,14 @@ }, // 弹出提交任务弹窗 handleSubmit () { - this.submitFormVisible = true - this.$nextTick(() => { - this.$refs.submitForm.init(this.dataList) - }) + if (this.dataList.length) { + this.submitFormVisible = true + this.$nextTick(() => { + this.$refs.submitForm.init(this.dataList) + }) + } else { + this.$message.warning('请至少添加一条任务!') + } }, handleAutoDetail (id) { this.autoDetailVisible = true diff --git a/src/views/common/order-process-point.vue b/src/views/common/order-process-point.vue index d69e848..f36e263 100644 --- a/src/views/common/order-process-point.vue +++ b/src/views/common/order-process-point.vue @@ -12,7 +12,7 @@ :visible.sync="visible" >
-
提升平台{{count}}
+
液压台{{count}}
取消 @@ -39,7 +39,7 @@ export default { setPoint (count) { console.log(count, this.pointType) this.visible = false - this.$emit('refreshPoint', count, this.pointType) + this.$emit('refreshPoint', 'YYT00' + count, this.pointType) } } } diff --git a/src/views/common/order-process.vue b/src/views/common/order-process.vue index 3a75a7f..ee2a79e 100644 --- a/src/views/common/order-process.vue +++ b/src/views/common/order-process.vue @@ -15,10 +15,10 @@ - - - - + + + + @@ -208,7 +208,7 @@ type: 'warning' }).then(() => { this.$http({ - url: this.$http.adornUrl(`currTask/createProcessTask`), + url: this.$http.adornUrl(`/currTask/createProcessTask`), method: 'post', data: this.$http.adornData({ craftCode: '',