From 34311763b18fbeffebce5094922cc17db946db30 Mon Sep 17 00:00:00 2001
From: gtz217 <535262213@qq.com>
Date: Sat, 19 Mar 2022 11:48:15 +0800
Subject: [PATCH] update

---
 config/index.js                          |  2 +-
 package-lock.json                        | 28 ++++++++++++++++++------
 src/icons/svg/icon-侧边收纳.svg          |  2 +-
 src/icons/svg/icon-出库.svg              |  2 +-
 src/icons/svg/icon-总电流.svg            |  2 +-
 src/icons/svg/icon-总电量.svg            |  2 +-
 src/icons/svg/icon-新建.svg              |  2 +-
 src/icons/svg/icon-日历.svg              |  2 +-
 src/icons/svg/icon-用户名更多.svg        |  2 +-
 src/icons/svg/icon-维护开始.svg          |  2 +-
 src/icons/svg/icon-维护结束.svg          |  2 +-
 src/icons/svg/icon-编辑.svg              |  2 +-
 src/icons/svg/icon-设置.svg              |  2 +-
 src/icons/svg/icon-详情.svg              |  2 +-
 src/icons/svg/icon-进工业炉加工.svg      |  2 +-
 src/icons/svg/icon-追加加工.svg          |  2 +-
 src/views/common/order-auto-submit.vue   |  2 +-
 src/views/common/order-auto.vue          | 12 ++++++----
 src/views/common/order-process-point.vue |  4 ++--
 src/views/common/order-process.vue       | 10 ++++-----
 20 files changed, 52 insertions(+), 34 deletions(-)

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 @@
 <?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>
+    <title></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">
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 @@
 <?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>
+    <title>出库</title>
     <desc>Created with Sketch.</desc>
     <defs>
         <linearGradient x1="50%" y1="-35.9917859%" x2="50%" y2="100%" id="linearGradient-1">
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 @@
 <?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>
+    <title>总电流</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">
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 @@
 <?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>
+    <title>总电量</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)">
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 @@
 <?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>
+    <title>新建</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">
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 @@
 <?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>
+    <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">
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 @@
 <?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>
+    <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">
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 @@
 <?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>
+    <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, -1.000000)">
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 @@
 <?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>编组 32</title>
+    <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, -1.000000)">
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 @@
 <?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>
+    <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, -1.000000)" fill-rule="nonzero">
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 @@
 <?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>
+    <title>设置</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">
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 @@
 <?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>
+    <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">
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 @@
 <?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>
+    <title>进工业炉加工</title>
     <desc>Created with Sketch.</desc>
     <defs>
         <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
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 @@
 <?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>
+    <title>追加加工</title>
     <desc>Created with Sketch.</desc>
     <defs>
         <linearGradient x1="50%" y1="0.100295608%" x2="50%" y2="100%" id="linearGradient-1">
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"
   >
     <div class="wareBox" v-for="count in 4" v-bind:key="count" @click="setPoint(count)">
-      <div class="plat">提升平台{{count}}</div>
+      <div class="plat">液压台{{count}}</div>
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取消</el-button>
@@ -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 @@
       </el-form-item>
       <el-form-item style="margin-left:1%">
         <el-select v-model="startPosition" size="small" placeholder="任务起点位置" clearable>
-          <el-option :value="1" label="提升平台1" />
-          <el-option :value="2" label="提升平台2" />
-          <el-option :value="3" label="提升平台3" />
-          <el-option :value="4" label="提升平台4" />
+          <el-option value="YYT001" label="液压台1" />
+          <el-option value="YYT002" label="液压台2" />
+          <el-option value="YYT003" label="液压台3" />
+          <el-option value="YYT004" label="液压台4" />
         </el-select>
         <!-- <el-button style="margin-left:10px" type="primary" @click="getPoint(0)">{{startPosition}}</el-button> -->
       </el-form-item>
@@ -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: '',