From 504cf1af058e48f9c8787bdbd49bd23d6d210744 Mon Sep 17 00:00:00 2001
From: gtz217 <535262213@qq.com>
Date: Tue, 4 Jan 2022 08:51:40 +0800
Subject: [PATCH 1/2] update

---
 src/assets/img/1.png                   | Bin 0 -> 10323 bytes
 src/assets/img/2.png                   | Bin 0 -> 17225 bytes
 src/views/common/ex-warehouse-info.vue |   4 +-
 src/views/common/ex-warehouse.vue      | 146 ++++++++++++++-----------
 src/views/main-sidebar.vue             |   4 +-
 5 files changed, 87 insertions(+), 67 deletions(-)
 create mode 100644 src/assets/img/1.png
 create mode 100644 src/assets/img/2.png

diff --git a/src/assets/img/1.png b/src/assets/img/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..54a6a105d0906cc41475f3e8e8ff2a2e605c2d35
GIT binary patch
literal 10323
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

literal 0
HcmV?d00001

diff --git a/src/assets/img/2.png b/src/assets/img/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..778b73bbc873c4b32812e4f595aadb2045d1cd45
GIT binary patch
literal 17225
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

literal 0
HcmV?d00001

diff --git a/src/views/common/ex-warehouse-info.vue b/src/views/common/ex-warehouse-info.vue
index c3e5e68..3fa3d8e 100644
--- a/src/views/common/ex-warehouse-info.vue
+++ b/src/views/common/ex-warehouse-info.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-17 15:49:18
  * @LastEditors: gtz
- * @LastEditTime: 2021-12-17 17:02:25
+ * @LastEditTime: 2021-12-21 10:23:09
  * @Description:
 -->
 <template>
@@ -74,7 +74,7 @@
               data: this.$http.adornData({ id })
             }).then(({data}) => {
               if (data && data.code === 0) {
-                this.dataForm = data.data
+                this.dataList = data.data
               } else {
                 this.$message.error(data.msg)
               }
diff --git a/src/views/common/ex-warehouse.vue b/src/views/common/ex-warehouse.vue
index 79ba0de..f303d1c 100644
--- a/src/views/common/ex-warehouse.vue
+++ b/src/views/common/ex-warehouse.vue
@@ -2,33 +2,45 @@
  * @Author: zwq
  * @Date: 2021-11-15 15:17:30
  * @LastEditors: gtz
- * @LastEditTime: 2021-12-17 17:05:22
+ * @LastEditTime: 2021-12-21 15:33:40
  * @Description:
 -->
 <template>
   <div v-loading="dataListLoading">
-    <div class="mainDiv" style="margin:10px 0 100px">
-      <div
-          class="wareBox"
-          :class="[
-            item.empty === 1 ? 'enableBox' : 'disableBox',
-            { active: item.locationId === isActive }
-          ]"
-          @click="selectBox(item.locationId)"
-          v-for="item in warehouseList"
-          :key="item.locationId"
-        >
-          <div class="plat">{{ item.locationName }}</div>
-        </div>
-    </div>
-    <div class="line"></div>
-    <div class="mainDiv" style="margin:100px 0 10px">
-      <div class="flexDiv">
-        <div class="wareBox end-plat" @click="selectPlat(count)" v-for="count in 4" v-bind:key="count">
-          <div class="plat">提升台{{ count }}</div>
-        </div>
-      </div>
-    </div>
+    <el-card class="base-container" style="min-height: 300px">
+      <el-card
+        class="wareBox"
+        shadow="hover"
+        :class="[
+          item.empty ? 'disableBox' : 'enableBox',
+          { active: item.locationId === isActive }
+        ]"
+        :disabled="item.empty"
+        @click.native="item.empty ? '' : selectBox(item.locationId)"
+        v-for="item in warehouseList"
+        :key="item.locationId"
+      >
+        <div class="plat">{{ item.locationName }}</div>
+        <el-button
+          v-if="!item.empty"
+          @click.stop="showDetail(item.locationId)"
+          class="wareBox-button"
+          type="text"
+          size="mini"
+          icon="el-icon-search"
+          circle
+        />
+      </el-card>
+    </el-card>
+    <el-card class="base-container" style="margin-top: 20px; min-height: 200px">
+      <el-row :gutter="30" style="padding: 20px;">
+        <el-col class="footer-item-container" :span="6" v-for="count in 4" :key="count">
+          <el-card class="footer-item-box base-container" @click.native="selectPlat(count)">
+            <div class="plat" style="font-size: 24px">提升台{{ count }}</div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </el-card>
     <ex-warehouse-info
       v-if="ExWarehouseInfoVisible"
       ref="ExWarehouseInfoRef"
@@ -70,7 +82,13 @@ export default {
       })
     },
     selectBox (id) {
-      this.isActive = id
+      if (this.isActive === id) {
+        this.isActive = null
+      } else {
+        this.isActive = id
+      }
+    },
+    showDetail (id) {
       this.ExWarehouseInfoVisible = true
       this.$nextTick(() => {
         this.$refs.ExWarehouseInfoRef.init(id)
@@ -94,11 +112,10 @@ export default {
             if (data && data.code === 0) {
               this.$message({
                 type: 'success',
-                message: '出库成功!',
-                onClose: () => {
-                  this.getWarehouseList()
-                }
+                message: '出库成功!'
               })
+              this.isActive = null
+              this.getWarehouseList()
             } else {
               this.$message.error(data.msg)
             }
@@ -121,46 +138,27 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .mainDiv {
   border: 2px solid rgb(145, 174, 255);
   padding: 20px 0;
 }
-.flexDiv {
-  display: -webkit-flex;
-  display: flex;
-  -webkit-justify-content: space-around;
-  justify-content: space-around;
-}
-/* 边框特效 */
-.wareBox:hover {
-  background: linear-gradient(to left, deepskyblue, deepskyblue) left top
-      no-repeat,
-    linear-gradient(to bottom, deepskyblue, deepskyblue) left top no-repeat,
-    linear-gradient(to left, deepskyblue, deepskyblue) right top no-repeat,
-    linear-gradient(to bottom, deepskyblue, deepskyblue) right top no-repeat,
-    linear-gradient(to left, deepskyblue, deepskyblue) left bottom no-repeat,
-    linear-gradient(to bottom, deepskyblue, deepskyblue) left bottom no-repeat,
-    linear-gradient(to left, deepskyblue, deepskyblue) right bottom no-repeat,
-    linear-gradient(to left, deepskyblue, deepskyblue) right bottom no-repeat;
-  background-size: 5px 30px, 30px 5px;
-  color: black;
-  border-radius: 5px;
-  background-color: rgb(190, 224, 241);
-}
+
 .wareBox {
   cursor: pointer;
+  display: inline-block;
   margin: 10px;
-  width: 100px;
-  height: 100px;
-  padding: 10px;
-  line-height: 90px;
+  width: 104px;
+  height: 112px;
+  line-height: 72px;
   text-align: center;
-  border: 2px solid #cdcdc5;
-  border-radius: 5px;
-}
-.plat {
-  min-width: 80px;
+  padding: 0;
+  position: relative;
+  .wareBox-button {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+  }
 }
 .line {
   margin: 20px 0;
@@ -170,16 +168,38 @@ export default {
   border-right: 200px solid #ddd;
 }
 .enableBox {
-  background: rgb(0, 189, 16);
+  background: #EFF3FF;
 }
 .disableBox {
-  background: #ddd;
+  background: #F4F4F4;
   cursor: not-allowed;
 }
 .end-plat {
   background-color: rgb(195, 246, 255);
 }
+.plat {
+  font-size: 16px;
+}
 .active {
-  border: 2px solid red;
+  border: 2px solid #F56C6C;
+}
+.footer-item-container{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .footer-item-box{
+    width: 100%;
+    height: 200px;
+    padding: 0 !important;
+    cursor: pointer;
+    line-height: 160px;
+    text-align: center;
+    background-image: url('../../assets/img/1.png');
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    background-color: transparent;
+    border-radius: 25px;
+    margin-bottom: 20px;
+  }
 }
 </style>
diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue
index d84ea3a..8fa85d9 100644
--- a/src/views/main-sidebar.vue
+++ b/src/views/main-sidebar.vue
@@ -252,7 +252,7 @@
               <span slot="title">油槽温度</span>
             </el-menu-item>
           </el-submenu>
-          <el-submenu index="gas">
+          <!-- <el-submenu index="gas">
             <template slot="title">
               <icon-svg
                 name="config"
@@ -270,7 +270,7 @@
               ></icon-svg>
               <span slot="title">使用氮气分析</span>
             </el-menu-item>
-          </el-submenu>
+          </el-submenu> -->
           <el-menu-item
             index="kiln-speed"
             @click="$router.push({ name: 'energy-kiln-speed' })"
-- 
2.45.2


From d894c8bbfa3212da0efe29e374fe68ba3c4ea156 Mon Sep 17 00:00:00 2001
From: gtz217 <535262213@qq.com>
Date: Fri, 18 Mar 2022 08:26:53 +0800
Subject: [PATCH 2/2] update

---
 config/index.js                               |   6 +-
 package-lock.json                             |  46 +--
 package.json                                  |   1 +
 src/components/Charts/LineChart.new.vue       | 139 +++++++
 src/components/Charts/MixChart.new.vue        | 355 ++++++++++++++++++
 src/icons/svg/icon-stop.svg                   |   1 +
 src/router/index.js                           |  34 +-
 .../basic/components/processInfo-add.vue      |  40 +-
 src/views/basic/processInfo.vue               |  14 +-
 src/views/common/order-auto-add.vue           | 139 +++++++
 src/views/common/order-auto-detail.vue        |   0
 src/views/common/order-auto-submit.vue        | 268 +++++++++++++
 src/views/common/order-auto.vue               | 344 +++++++++++++++++
 src/views/common/testdata.js                  | 135 +++++++
 src/views/main-sidebar.vue                    |  19 +-
 src/views/order/current-task.vue              |  28 +-
 src/views/report/components/task-ele.vue      | 143 +++++++
 src/views/report/task-history.vue             |  16 +
 18 files changed, 1646 insertions(+), 82 deletions(-)
 create mode 100644 src/components/Charts/LineChart.new.vue
 create mode 100644 src/components/Charts/MixChart.new.vue
 create mode 100644 src/icons/svg/icon-stop.svg
 create mode 100644 src/views/common/order-auto-add.vue
 create mode 100644 src/views/common/order-auto-detail.vue
 create mode 100644 src/views/common/order-auto-submit.vue
 create mode 100644 src/views/common/order-auto.vue
 create mode 100644 src/views/common/testdata.js
 create mode 100644 src/views/report/components/task-ele.vue

diff --git a/config/index.js b/config/index.js
index ac43d18..2c6b413 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-17 14:40:57
+ * @LastEditTime: 2022-03-05 16:16:24
  * @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.1.66:8080',
         changeOrigin: true,
         pathRewrite: {
           '^/proxyApi': '/api'
@@ -31,7 +31,7 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: 'localhost', // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
     port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
diff --git a/package-lock.json b/package-lock.json
index a82eaf3..08e225b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5572,8 +5572,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5594,14 +5593,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5616,20 +5613,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5746,8 +5740,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5759,7 +5752,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5774,7 +5766,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5782,14 +5773,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5808,7 +5797,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5889,8 +5877,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5902,7 +5889,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5988,8 +5974,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -6025,7 +6010,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -6045,7 +6029,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -6089,14 +6072,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -10381,6 +10362,11 @@
         }
       }
     },
+    "moment": {
+      "version": "2.29.1",
+      "resolved": "https://registry.npmmirror.com/moment/-/moment-2.29.1.tgz",
+      "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
diff --git a/package.json b/package.json
index 503cf92..85f1cdf 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
     "gulp-replace": "0.6.1",
     "gulp-shell": "0.6.5",
     "lodash": "4.17.5",
+    "moment": "^2.29.1",
     "node-sass": "^4.14.1",
     "npm": "^6.9.0",
     "sass-loader": "6.0.6",
diff --git a/src/components/Charts/LineChart.new.vue b/src/components/Charts/LineChart.new.vue
new file mode 100644
index 0000000..181cf1d
--- /dev/null
+++ b/src/components/Charts/LineChart.new.vue
@@ -0,0 +1,139 @@
+<template>
+  <div class="mod-demo-echarts">
+    <el-row :gutter="20">
+      <el-col :span="24">
+        <el-card>
+          <div :id="'J_chartLineBox' + id" class="chart-box"></div>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+  import * as echarts from 'echarts'
+  export default {
+    props: {
+      id: {
+        type: Number,
+        default: 1
+      },
+      showId: {
+        type: Number,
+        default: 0
+      },
+      name: {
+        type: String,
+        default: ''
+      },
+      dataList: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      lastDataList: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      }
+    },
+    data () {
+      return {
+        chartLine: null
+      }
+    },
+    watch: {
+      showId: function (v) {
+        if (v === this.id) {
+          this.initChartLine()
+        }
+      }
+    },
+    mounted () {
+      this.initChartLine()
+    },
+    activated () {
+      // 由于给echart添加了resize事件, 在组件激活时需要重新resize绘画一次, 否则出现空白bug
+      if (this.chartLine) {
+        this.chartLine.resize()
+      }
+    },
+    methods: {
+      // 折线图
+      initChartLine () {
+        if (this.chartLine) {
+          this.chartLine.dispose()
+        }
+        var option = {
+          title: {
+            text: this.name
+          },
+          tooltip: {
+            trigger: 'axis'
+          },
+          legend: {
+            data: [ '当前', '上一个单位' ]
+          },
+          grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true
+          },
+          xAxis: {
+            type: 'category',
+            boundaryGap: false,
+            data: this.dataList.map(item => {
+              return item.time
+            })
+          },
+          yAxis: {
+            type: 'value'
+          },
+          series: [
+            {
+              name: '当前',
+              type: 'line',
+              data: this.dataList.map(item => {
+                return item.value
+              })
+            },
+            {
+              name: '上一个单位',
+              type: 'line',
+              data: this.lastDataList.map(item => {
+                return item.value
+              })
+            }
+          ]
+        }
+        this.chartLine = echarts.init(document.getElementById('J_chartLineBox' + this.id))
+        this.chartLine.setOption(option)
+        window.addEventListener('resize', () => {
+          this.chartLine.resize()
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .mod-demo-echarts {
+    > .el-alert {
+      margin-bottom: 10px;
+    }
+    > .el-row {
+      margin-top: -10px;
+      margin-bottom: -10px;
+      .el-col {
+        padding-top: 10px;
+        padding-bottom: 10px;
+      }
+    }
+    .chart-box {
+      min-height: 300px;
+    }
+  }
+</style>
diff --git a/src/components/Charts/MixChart.new.vue b/src/components/Charts/MixChart.new.vue
new file mode 100644
index 0000000..62e142a
--- /dev/null
+++ b/src/components/Charts/MixChart.new.vue
@@ -0,0 +1,355 @@
+<template>
+  <div :id="id" :class="className" :style="{ height: height, width: width }" />
+</template>
+
+<script>
+import * as echarts from 'echarts'
+import resize from './mixins/resize'
+import moment from 'moment'
+
+export default {
+  mixins: [resize],
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    id: {
+      type: String,
+      default: 'MixChart'
+    },
+    showId: {
+      type: Number,
+      default: 0
+    },
+    width: {
+      type: String,
+      default: '200px'
+    },
+    height: {
+      type: String,
+      default: '200px'
+    },
+    title: {
+      type: String,
+      default: 'Mix-Chart'
+    },
+    titleFooter: {
+      type: String,
+      default: ''
+    },
+    titleHeader: {
+      type: String,
+      default: ''
+    },
+    dataList: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    lastDataList: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    chartType: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data () {
+    return {
+      chart: null,
+      series: []
+    }
+  },
+  beforeDestroy () {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  watch: {
+    dataList: {
+      handler (val) {
+        if (val) {
+          this.series = []
+          if (this.chartType.indexOf('柱状') >= 0) {
+            this.series.push({
+              name: this.title + 'bar',
+              type: 'bar',
+              barMaxWidth: 35,
+              barGap: '10%',
+              color: '#5AD8A6',
+              colorBy: 'data',
+              label: {
+                show: true,
+                position: 'top',
+                formatter (p) {
+                  return p.value > 0 ? p.value : ''
+                }
+              },
+              data: this.dataList.map(item => {
+                return item.value
+              })
+            })
+          }
+          if (this.chartType.indexOf('折线') >= 0) {
+            this.series.push({
+              name: this.title + 'line',
+              type: 'line',
+              symbolSize: 10,
+              symbol: 'circle',
+              colorBy: 'data',
+              color: '#5B8FF9',
+              label: {
+                show: true,
+                position: 'top',
+                formatter (p) {
+                  return p.value > 0 ? p.value : ''
+                }
+              },
+              data: this.dataList.map(item => {
+                return item.value
+              })
+            })
+          }
+          this.initChart()
+        }
+      },
+      deep: true
+    },
+    showId: {
+      handler () {
+        this.initChart()
+      }
+    },
+    chartType: {
+      handler (val) {
+        console.log(val)
+        if (val.length) {
+          this.series = []
+          if (val.indexOf('柱状') >= 0) {
+            this.series.push({
+              name: this.title + 'bar',
+              type: 'bar',
+              barMaxWidth: 35,
+              barGap: '10%',
+              color: '#5AD8A6',
+              colorBy: 'data',
+              label: {
+                show: true,
+                position: 'top',
+                formatter (p) {
+                  return p.value > 0 ? p.value : ''
+                }
+              },
+              data: this.dataList.map(item => {
+                return item.value
+              })
+            })
+          }
+          if (val.indexOf('折线') >= 0) {
+            this.series.push({
+              name: this.title + 'line',
+              type: 'line',
+              symbolSize: 10,
+              symbol: 'circle',
+              color: '#5B8FF9',
+              colorBy: 'data',
+              barBorderRadius: 0,
+              label: {
+                show: true,
+                position: 'top',
+                formatter (p) {
+                  return p.value > 0 ? p.value : ''
+                }
+              },
+              data: this.dataList.map(item => {
+                return item.value
+              })
+            })
+          }
+          this.initChart()
+        }
+      },
+      deep: true
+    }
+  },
+  mounted () {
+    this.series = []
+    if (this.chartType.indexOf('柱状') >= 0) {
+      this.series.push({
+        name: this.title + 'bar',
+        type: 'bar',
+        barMaxWidth: 35,
+        barGap: '10%',
+        color: '#5AD8A6',
+        colorBy: 'data',
+        label: {
+          show: true,
+          position: 'top',
+          formatter (p) {
+            return p.value > 0 ? p.value : ''
+          }
+        },
+        data: this.dataList.map(item => {
+          return item.value
+        })
+      })
+    }
+    if (this.chartType.indexOf('折线') >= 0) {
+      this.series.push({
+        name: this.title + 'line',
+        type: 'line',
+        symbolSize: 10,
+        symbol: 'circle',
+        color: '#5B8FF9',
+        colorBy: 'data',
+        label: {
+          show: true,
+          position: 'top',
+          formatter (p) {
+            return p.value > 0 ? p.value : ''
+          }
+        },
+        data: this.dataList.map(item => {
+          return item.value
+        })
+      })
+    }
+    this.initChart()
+  },
+  methods: {
+    initChart () {
+      if (this.chart) {
+        this.chart.dispose()
+      }
+      this.chart = echarts.init(document.getElementById(this.id))
+      const xData = this.dataList.map(item => {
+        return moment(item.time).format('M-D HH:mm')
+      })
+      this.chart.setOption({
+        title: {
+          text: this.title === 'Mix-Chart' ? 'Mix-Chart' : this.titleHeader + this.title + this.titleFooter,
+          x: '10',
+          top: '10',
+          fontSize: '18',
+          subtextStyle: {
+            color: '#90979c',
+            fontSize: '16'
+          }
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            textStyle: {
+              color: '#fff'
+            }
+          }
+        },
+        grid: {
+          left: '5%',
+          right: '5%',
+          borderWidth: 0,
+          top: 100,
+          bottom: 100,
+          textStyle: {
+            color: '#fff'
+          }
+        },
+        legend: {
+          x: 20,
+          top: 55,
+          textStyle: {
+            color: '#90979c'
+          },
+          data: this.series.map(item => {
+            console.log(item)
+            return this.title + item.type
+          })
+        },
+        calculable: true,
+        xAxis: [
+          {
+            type: 'category',
+            axisLine: {
+              lineStyle: {
+                color: '#90979c'
+              }
+            },
+            splitLine: {
+              show: false
+            },
+            axisTick: {
+              show: false
+            },
+            splitArea: {
+              show: false
+            },
+            axisLabel: {
+              interval: 0,
+              rotate: 45
+            },
+            data: xData
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            // splitLine: {
+            //   show: false
+            // },
+            axisLine: {
+              lineStyle: {
+                color: '#90979c'
+              }
+            },
+            axisTick: {
+              show: false
+            },
+            axisLabel: {
+              interval: 0
+            },
+            splitArea: {
+              show: false
+            }
+          }
+        ],
+        dataZoom: [
+          {
+            show: true,
+            height: 30,
+            xAxisIndex: [0],
+            bottom: 10,
+            start: 0,
+            end: 100,
+            handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
+            handleSize: '110%',
+            handleStyle: {
+              color: '#d3dee5'
+            },
+            textStyle: {
+              color: '#fff'
+            },
+            borderColor: '#90979c'
+          },
+          {
+            type: 'inside',
+            show: true,
+            height: 15,
+            start: 1,
+            end: 35
+          }
+        ],
+        series: this.series
+      })
+    }
+  }
+}
+</script>
diff --git a/src/icons/svg/icon-stop.svg b/src/icons/svg/icon-stop.svg
new file mode 100644
index 0000000..b272431
--- /dev/null
+++ b/src/icons/svg/icon-stop.svg
@@ -0,0 +1 @@
+<?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="1646463566954" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2063" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 967.111111c-250.311111 0-455.111111-204.8-455.111111-455.111111s204.8-455.111111 455.111111-455.111111 455.111111 204.8 455.111111 455.111111-204.8 455.111111-455.111111 455.111111z m0-56.888889c221.866667 0 398.222222-176.355556 398.222222-398.222222s-176.355556-398.222222-398.222222-398.222222-398.222222 176.355556-398.222222 398.222222 176.355556 398.222222 398.222222 398.222222z" fill="#ff0000" p-id="2064"></path><path d="M341.333333 341.333333h341.333334v341.333334H341.333333z" fill="#ff0000" p-id="2065"></path></svg>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 10dff3f..f562a8e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,8 +1,8 @@
 /*
  * @Author: zwq
  * @Date: 2021-11-15 08:20:28
- * @LastEditors: zwq
- * @LastEditTime: 2021-12-17 14:51:08
+ * @LastEditors: gtz
+ * @LastEditTime: 2022-03-05 16:05:35
  * @Description:
  */
 /**
@@ -40,6 +40,7 @@ const mainRoutes = {
     // 提示: 如需要通过iframe嵌套展示内容, 但不通过tab打开, 请自行创建组件使用iframe处理!
     { path: '/home', component: _import('common/home'), name: 'home', meta: { title: '首页', isTab: true } },
     { path: '/orderProcess', component: _import('common/order-process'), name: 'orderProcess', meta: { title: '订单加工', isTab: true } },
+    { path: '/orderAuto', component: _import('common/order-auto'), name: 'orderAuto', meta: { title: '自动任务', isTab: true } },
     { path: '/exWarehouse', component: _import('common/ex-warehouse'), name: 'exWarehouse', meta: { title: '货物出库', isTab: true } },
     { path: '/addProcess', component: _import('common/add-process'), name: 'addProcess', meta: { title: '追加加工', isTab: true } },
     { path: '/theme', component: _import('common/theme'), name: 'theme', meta: { title: '主题', isTab: true } },
@@ -61,20 +62,21 @@ const mainRoutes = {
     { path: '/report-order-history-task', component: _import('report/components/order-history-task'), name: 'report-order-history-task', meta: { title: '订单历史任务详情', isTab: true } },
     { path: '/report-task-history', component: _import('report/task-history'), name: 'report-task-history', meta: { title: '执行任务历史列表', isTab: true } },
     { path: '/report-task-history-detail', component: _import('report/components/task-history-detail'), name: 'report-task-history-detail', meta: { title: '执行任务历史详情', isTab: true } },
-    { path: '/energy-sulfur-dioxide', component: _import('energy/sulfur-dioxide'), name: 'energy-sulfur-dioxide', meta: { title: '二氧化硫流量分析', isTab: true } },
-    { path: '/energy-electric', component: _import('energy/electric'), name: 'energy-electric', meta: { title: '用电能源分析', isTab: true } },
-    { path: '/energy-kiln-electric', component: _import('energy/kiln-electric'), name: 'energy-kiln-electric', meta: { title: '窑炉用电分析', isTab: true } },
-    { path: '/energy-ammonia', component: _import('energy/ammonia'), name: 'energy-ammonia', meta: { title: '氨气流量分析', isTab: true } },
-    { path: '/energy-methanol', component: _import('energy/methanol'), name: 'energy-methanol', meta: { title: '甲醇流量分析', isTab: true } },
-    { path: '/energy-propane', component: _import('energy/propane'), name: 'energy-propane', meta: { title: '丙烷流量分析', isTab: true } },
-    { path: '/energy-nitrogen', component: _import('energy/nitrogen'), name: 'energy-nitrogen', meta: { title: '氮气流量分析', isTab: true } },
-    { path: '/energy-electric-acquisition', component: _import('energy/electric-acquisition'), name: 'energy-electric-acquisition', meta: { title: '电能采集数据', isTab: true } },
-    { path: '/energy-gas-acquisition', component: _import('energy/gas-acquisition'), name: 'energy-gas-acquisition', meta: { title: '用气采集数据', isTab: true } },
-    { path: '/energy-temperature-acquisition', component: _import('energy/temperature-acquisition'), name: 'energy-temperature-acquisition', meta: { title: '温度采集数据', isTab: true } },
-    { path: '/energy-process-temperature', component: _import('energy/process-temperature'), name: 'energy-process-temperature', meta: { title: '窑炉加工温度', isTab: true } },
-    { path: '/energy-sump-temperature', component: _import('energy/sump-temperature'), name: 'energy-sump-temperature', meta: { title: '油槽温度', isTab: true } },
-    { path: '/energy-ammonia-analysis', component: _import('energy/ammonia-analysis'), name: 'energy-ammonia-analysis', meta: { title: '使用氮气分析', isTab: true } },
-    { path: '/energy-kiln-speed', component: _import('energy/kiln-speed'), name: 'energy-kiln-speed', meta: { title: '窑炉速度参数', isTab: true } }
+    { path: '/report-task-ele', component: _import('report/components/task-ele'), name: 'report-task-ele', meta: { title: '任务能源消耗' } }
+    // { path: '/energy-sulfur-dioxide', component: _import('energy/sulfur-dioxide'), name: 'energy-sulfur-dioxide', meta: { title: '二氧化硫流量分析', isTab: true } },
+    // { path: '/energy-electric', component: _import('energy/electric'), name: 'energy-electric', meta: { title: '用电能源分析', isTab: true } },
+    // { path: '/energy-kiln-electric', component: _import('energy/kiln-electric'), name: 'energy-kiln-electric', meta: { title: '窑炉用电分析', isTab: true } },
+    // { path: '/energy-ammonia', component: _import('energy/ammonia'), name: 'energy-ammonia', meta: { title: '氨气流量分析', isTab: true } },
+    // { path: '/energy-methanol', component: _import('energy/methanol'), name: 'energy-methanol', meta: { title: '甲醇流量分析', isTab: true } },
+    // { path: '/energy-propane', component: _import('energy/propane'), name: 'energy-propane', meta: { title: '丙烷流量分析', isTab: true } },
+    // { path: '/energy-nitrogen', component: _import('energy/nitrogen'), name: 'energy-nitrogen', meta: { title: '氮气流量分析', isTab: true } },
+    // { path: '/energy-electric-acquisition', component: _import('energy/electric-acquisition'), name: 'energy-electric-acquisition', meta: { title: '电能采集数据', isTab: true } },
+    // { path: '/energy-gas-acquisition', component: _import('energy/gas-acquisition'), name: 'energy-gas-acquisition', meta: { title: '用气采集数据', isTab: true } },
+    // { path: '/energy-temperature-acquisition', component: _import('energy/temperature-acquisition'), name: 'energy-temperature-acquisition', meta: { title: '温度采集数据', isTab: true } },
+    // { path: '/energy-process-temperature', component: _import('energy/process-temperature'), name: 'energy-process-temperature', meta: { title: '窑炉加工温度', isTab: true } },
+    // { path: '/energy-sump-temperature', component: _import('energy/sump-temperature'), name: 'energy-sump-temperature', meta: { title: '油槽温度', isTab: true } },
+    // { path: '/energy-ammonia-analysis', component: _import('energy/ammonia-analysis'), name: 'energy-ammonia-analysis', meta: { title: '使用氮气分析', isTab: true } },
+    // { path: '/energy-kiln-speed', component: _import('energy/kiln-speed'), name: 'energy-kiln-speed', meta: { title: '窑炉速度参数', isTab: true } }
   ],
   beforeEnter (to, from, next) {
     let token = Vue.cookie.get('token')
diff --git a/src/views/basic/components/processInfo-add.vue b/src/views/basic/components/processInfo-add.vue
index d77ef3d..8c40f07 100644
--- a/src/views/basic/components/processInfo-add.vue
+++ b/src/views/basic/components/processInfo-add.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: gtz
- * @LastEditTime: 2021-12-13 17:05:54
+ * @LastEditTime: 2022-03-05 12:03:46
  * @Description:
 -->
 <template>
@@ -14,13 +14,13 @@
       <el-form-item label="工艺编码" prop="code">
         <el-input v-model="dataForm.code" placeholder="工艺编码"></el-input>
       </el-form-item>
-      <el-form-item label="工艺号" prop="alarmClass">
-        <el-input v-model="dataForm.alarmClass" placeholder="工艺号"></el-input>
+      <el-form-item label="工艺号" prop="craftCode">
+        <el-input v-model="dataForm.craftCode" placeholder="工艺号"></el-input>
       </el-form-item>
-      <el-form-item label="对应PLC值" prop="alarmInfo">
-        <el-input v-model="dataForm.alarmInfo" placeholder="对应PLC值"></el-input>
+      <el-form-item label="对应PLC值" prop="plcValue">
+        <el-input v-model="dataForm.plcValue" placeholder="对应PLC值"></el-input>
       </el-form-item>
-      <el-form-item label="当前状态" prop="alarmInfo"
+      <!-- <el-form-item label="当前状态" prop="alarmInfo"
         ><el-switch
           v-model="dataForm.alarmInfo"
           active-color="#13ce66"
@@ -29,9 +29,9 @@
           inactive-value="0"
         >
         </el-switch>
-      </el-form-item>
-      <el-form-item label="说明" prop="remark">
-        <el-input v-model="dataForm.remark" placeholder="说明"></el-input>
+      </el-form-item> -->
+      <el-form-item label="说明" prop="content">
+        <el-input v-model="dataForm.content" placeholder="说明"></el-input>
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -49,15 +49,18 @@
         dataForm: {
           id: '',
           code: '',
-          alarmClass: '',
-          alarmInfo: '',
-          remark: ''
+          content: '',
+          plcValue: '',
+          craftCode: ''
         },
         dataRule: {
           code: [
             { required: true, message: '工艺编码不能为空', trigger: 'blur' }
           ],
-          alarmInfo: [
+          craftCode: [
+            { required: true, message: '工艺号不能为空', trigger: 'blur' }
+          ],
+          plcValue: [
             { required: true, message: '对应PLC值不能为空', trigger: 'blur' }
           ]
         },
@@ -73,7 +76,7 @@
           this.formLoading = true
           if (this.dataForm.id) {
             this.$http({
-              url: this.$http.adornUrl(`/alarmBase/get`),
+              url: this.$http.adornUrl(`/craftInfo/get`),
               method: 'post',
               data: this.$http.adornData({id})
             }).then(({data}) => {
@@ -86,7 +89,7 @@
             })
           } else {
             this.$http({
-              url: this.$http.adornUrl(`/alarmBase/codeGenerator`),
+              url: this.$http.adornUrl(`/craftInfo/codeGenerator`),
               method: 'post',
               data: this.$http.adornData()
             }).then(({data}) => {
@@ -105,13 +108,14 @@
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
             this.$http({
-              url: this.$http.adornUrl(`/alarmBase/${!this.dataForm.id ? 'add' : 'update'}`),
+              url: this.$http.adornUrl(`/craftInfo/${!this.dataForm.id ? 'add' : 'update'}`),
               method: 'post',
               data: this.$http.adornData({
                 'id': this.dataForm.id || undefined,
                 'code': this.dataForm.code,
-                'alarmClass': this.dataForm.alarmClass,
-                'alarmInfo': this.dataForm.alarmInfo
+                'content': this.dataForm.content,
+                'plcValue': this.dataForm.plcValue,
+                'craftCode': this.dataForm.craftCode
               })
             }).then(({data}) => {
               if (data && data.code === 0) {
diff --git a/src/views/basic/processInfo.vue b/src/views/basic/processInfo.vue
index 18774f3..86758d5 100644
--- a/src/views/basic/processInfo.vue
+++ b/src/views/basic/processInfo.vue
@@ -44,7 +44,7 @@
         label="添加时间">
       </el-table-column> -->
       <el-table-column
-        prop="alarmClass"
+        prop="craftCode"
         label="工艺号">
       </el-table-column>
       <el-table-column
@@ -52,15 +52,15 @@
         label="工艺编码">
       </el-table-column>
       <el-table-column
-        prop="alarmInfo"
+        prop="plcValue"
         label="对应PLC值">
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="alarmInfo"
         label="状态">
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
-        prop="alarmInfo"
+        prop="content"
         label="说明">
       </el-table-column>
       <el-table-column
@@ -124,7 +124,7 @@
       getDataList () {
         this.dataListLoading = true
         this.$http({
-          url: this.$http.adornUrl('/alarmBase/page'),
+          url: this.$http.adornUrl('/craftInfo/page'),
           method: 'post',
           data: this.$http.adornData({
             'current': this.pageIndex,
@@ -168,7 +168,7 @@
           type: 'warning'
         }).then(() => {
           this.$http({
-            url: this.$http.adornUrl('/alarmBase/delete'),
+            url: this.$http.adornUrl('/craftInfo/delete'),
             method: 'post',
             data: this.$http.adornData({id})
           }).then(({data}) => {
diff --git a/src/views/common/order-auto-add.vue b/src/views/common/order-auto-add.vue
new file mode 100644
index 0000000..38aeefe
--- /dev/null
+++ b/src/views/common/order-auto-add.vue
@@ -0,0 +1,139 @@
+<template>
+  <el-dialog
+    :title="!row ? '新增' : '修改'"
+    :close-on-click-modal="false"
+    :visible.sync="visible">
+    <el-form :model="dataForm" v-loading="formLoading" :rules="dataRule" ref="dataForm" label-width="80px">
+      <el-form-item label="标识卡号" prop="idenCardNum">
+        <el-input v-model="dataForm.idenCardNum" @change="setIdenCardNum" ref="idenCardNum" placeholder="标识卡号"></el-input>
+      </el-form-item>
+      <el-form-item label="客户名称" prop="customerName">
+        <el-input v-model="dataForm.customerName" disabled placeholder="客户名称"></el-input>
+      </el-form-item>
+      <el-form-item label="材料牌号" prop="materialDes">
+        <el-input v-model="dataForm.materialDes" disabled placeholder="材料牌号"></el-input>
+      </el-form-item>
+      <el-form-item label="订单号" prop="orderNo">
+        <el-input v-model="dataForm.orderNo" disabled 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>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取消</el-button>
+      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        visible: false,
+        dataForm: {
+          idenCardNum: null,
+          customerName: null,
+          materialDes: null,
+          orderNo: null,
+          productName: null,
+          quantity: null,
+          unit: null,
+          weight: null
+        },
+        dataRule: {
+          idenCardNum: [
+            { required: true, message: '标识卡号不能为空', trigger: 'blur' }
+          ],
+          quantity: [
+            { required: true, message: '数量不能为空', trigger: 'blur' }
+          ],
+          weight: [
+            { required: true, message: '重量不能为空', trigger: 'blur' }
+          ]
+        },
+        formLoading: false,
+        row: null,
+        editIndex: null
+      }
+    },
+    methods: {
+      init (row, idx) {
+        this.visible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].resetFields()
+          if (row) {
+            this.row = row
+            this.dataForm = row
+            this.editIndex = idx
+          }
+          this.$refs['idenCardNum'].focus()
+        })
+      },
+      setIdenCardNum () {
+        this.formLoading = true
+        if (this.dataForm.idenCardNum) {
+          this.$http({
+            url: this.$http.adornUrl(`/orderInfo/getTaskInfoByIdenCardNum`),
+            method: 'get',
+            params: this.$http.adornParams({
+              'idenCardNum': this.dataForm.idenCardNum
+            })
+          }).then(({data}) => {
+            console.log(data)
+            if (data && data.code === 0) {
+              this.dataForm = data.data
+              this.dataForm.targetQuantity = data.data.quantity
+              this.dataForm.targetWeight = data.data.weight
+              this.dataForm.weight = null
+              this.dataForm.quantity = null
+            } else {
+              this.$message.warning(data.msg)
+            }
+            this.formLoading = false
+          })
+        } else {
+          this.$message.warning('请输入标识卡号')
+        }
+      },
+      // 表单提交
+      dataFormSubmit () {
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            if (this.editIndex) {
+              const taskList = JSON.parse(sessionStorage.getItem('autoTaskList'))
+              taskList.splice(this.editIndex, 1, this.dataForm)
+              sessionStorage.setItem('autoTaskList', JSON.stringify(taskList))
+            } else if (sessionStorage.getItem('autoTaskList')) {
+              const taskList = JSON.parse(sessionStorage.getItem('autoTaskList'))
+              taskList.push(this.dataForm)
+              sessionStorage.setItem('autoTaskList', JSON.stringify(taskList))
+            } else {
+              const arr = [this.dataForm]
+              sessionStorage.setItem('autoTaskList', JSON.stringify(arr))
+            }
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refreshDataList')
+              }
+            })
+          }
+        })
+      }
+    }
+  }
+</script>
diff --git a/src/views/common/order-auto-detail.vue b/src/views/common/order-auto-detail.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/common/order-auto-submit.vue b/src/views/common/order-auto-submit.vue
new file mode 100644
index 0000000..cde789f
--- /dev/null
+++ b/src/views/common/order-auto-submit.vue
@@ -0,0 +1,268 @@
+<!--
+ * @Author: gtz
+ * @Date: 2022-03-04 10:22:13
+ * @LastEditors: gtz
+ * @LastEditTime: 2022-03-05 12:09:38
+ * @Description: file content
+ * @FilePath: \mt-qj-wms-ui\src\views\common\order-auto-submit.vue
+-->
+
+<template>
+  <el-dialog
+    :title="!row ? '新增' : '修改'"
+    :close-on-click-modal="false"
+    :visible.sync="visible">
+    <el-form :model="dataForm" v-loading="formLoading" :rules="dataRule" ref="dataForm" label-width="120px">
+      <el-form-item label="自动任务类型" prop="autoTaskType">
+        <el-select v-model="dataForm.autoTaskType" clearable @change="changeAutoTaskType">
+          <el-option :value="1" label="淡化炉加工"></el-option>
+          <el-option :value="2" label="多功能炉加工"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="加工类型" prop="processType">
+        <el-select v-model="dataForm.processType" clearable>
+          <el-option :value="0" label="初始加工" />
+          <el-option :value="1" label="复加工" />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="dataForm.autoTaskType === 2" label="开始加工炉">
+        <el-form-item label="加工起点" prop="startPosition" style="margin-bottom: 24px">
+          <el-select v-model="dataForm.startPosition" :disabled="!(dataForm.autoTaskType)">
+            <el-option value="YYT003" label="液压台3"></el-option>
+            <el-option value="YYT004" label="液压台4"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="加工炉" prop="firstPosition" style="margin-bottom: 24px">
+          <el-select v-model="dataForm.firstPosition" :disabled="!(dataForm.autoTaskType)">
+            <el-option v-for="item in kilnList" :key="item.id" :value="item.id + ',' + item.code" :label="item.kilnName" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="工艺" prop="firstProcess" style="margin-bottom: 24px">
+          <el-select v-model="dataForm.firstProcess" :disabled="!(dataForm.autoTaskType)">
+            <el-option v-for="item in processList" :key="item.id" :value="item.code" :label="item.craftCode" />
+          </el-select>
+        </el-form-item>
+      </el-form-item>
+      <el-form-item label="清洗炉">
+        <el-form-item label="加工起点" v-if="dataForm.autoTaskType !== 2" prop="startPosition" style="margin-bottom: 24px">
+          <el-select v-model="dataForm.startPosition" :disabled="!(dataForm.autoTaskType)">
+            <el-option value="YYT003" label="液压台3"></el-option>
+            <el-option value="YYT004" label="液压台4"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="加工炉" prop="secPosition" style="margin-bottom: 24px">
+          <el-select v-model="dataForm.secPosition" :disabled="!(dataForm.autoTaskType)">
+            <el-option v-for="item in kilnList" :key="item.id" :value="item.id + ',' + item.code" :label="item.kilnName" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="工艺" prop="secProcess" style="margin-bottom: 24px">
+          <el-select v-model="dataForm.secProcess" :disabled="!(dataForm.autoTaskType)">
+            <el-option v-for="item in processList" :key="item.id" :value="item.code" :label="item.craftCode" />
+          </el-select>
+        </el-form-item>
+      </el-form-item>
+      <el-form-item label="结束加工炉">
+        <el-form-item label="加工炉" prop="thirdPosition" style="margin-bottom: 24px">
+          <el-select v-model="dataForm.thirdPosition" :disabled="!(dataForm.autoTaskType)">
+            <el-option v-for="item in kilnList" :key="item.id" :value="item.id + ',' + item.code" :label="item.kilnName" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="工艺" prop="thirdProcess" style="margin-bottom: 24px">
+          <el-select v-model="dataForm.thirdProcess" :disabled="!(dataForm.autoTaskType)">
+            <el-option v-for="item in processList" :key="item.id" :value="item.code" :label="item.craftCode" />
+          </el-select>
+        </el-form-item>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取消</el-button>
+      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+  export default {
+    props: {
+      kilnList: {
+        type: Array,
+        default: () => []
+      },
+      processList: {
+        type: Array,
+        default: () => []
+      }
+    },
+    data () {
+      return {
+        visible: false,
+        dataForm: {
+          autoTaskType: null,
+          processType: null,
+          startPosition: null,
+          firstPosition: null,
+          firstProcess: null,
+          secPosition: null,
+          secProcess: null,
+          thirdPosition: null,
+          thirdProcess: null
+        },
+        dataRule: {
+          autoTaskType: [
+            { required: true, message: '自动任务类型不能为空', trigger: 'blur' }
+          ],
+          processType: [
+            { required: true, message: '加工类型不能为空', trigger: 'blur' }
+          ],
+          startPosition: [
+            { required: true, message: '加工起点不能为空', trigger: 'blur' }
+          ],
+          firstPosition: [
+            { required: true, message: '加工炉不能为空', trigger: 'blur' }
+          ],
+          firstProcess: [
+            { required: true, message: '工艺不能为空', trigger: 'blur' }
+          ],
+          secPosition: [
+            { required: true, message: '加工炉不能为空', trigger: 'blur' }
+          ],
+          secProcess: [
+            { required: true, message: '工艺不能为空', trigger: 'blur' }
+          ],
+          thirdPosition: [
+            { required: true, message: '加工炉不能为空', trigger: 'blur' }
+          ],
+          thirdProcess: [
+            { required: true, message: '工艺不能为空', trigger: 'blur' }
+          ]
+        },
+        dataList: [],
+        formLoading: false,
+        row: null,
+        editIndex: null
+      }
+    },
+    methods: {
+      init (list) {
+        this.dataList = list
+        this.visible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].resetFields()
+        })
+      },
+      changeAutoTaskType () {
+        this.dataForm.startPosition = null
+        this.dataForm.firstPosition = null
+        this.dataForm.firstProcess = null
+        this.dataForm.secPosition = null
+        this.dataForm.secProcess = null
+        this.dataForm.thirdPosition = null
+        this.dataForm.thirdProcess = null
+      },
+      setIdenCardNum () {
+        this.formLoading = true
+        if (this.dataForm.idenCardNum) {
+          this.$http({
+            url: this.$http.adornUrl(`/orderInfo/getTaskInfoByIdenCardNum`),
+            method: 'get',
+            params: this.$http.adornParams({
+              'idenCardNum': this.dataForm.idenCardNum
+            })
+          }).then(({data}) => {
+            console.log(data)
+            if (data && data.code === 0) {
+              this.dataForm = data.data
+              this.dataForm.targetQuantity = data.data.quantity
+              this.dataForm.targetWeight = data.data.weight
+              this.dataForm.weight = null
+              this.dataForm.quantity = null
+            } else {
+              this.$message.warning(data.msg)
+            }
+            this.formLoading = false
+          })
+        } else {
+          this.$message.warning('请输入标识卡号')
+        }
+      },
+      // 表单提交
+      dataFormSubmit () {
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            const requestData = {
+              taskCreateParamList: []
+            }
+            if (this.dataForm.autoTaskType === 1) {
+              requestData.taskCreateParamList.push({
+                autoTaskStep: 1,
+                autoTaskType: this.dataForm.autoTaskType,
+                craftCode: this.dataForm.secProcess,
+                detParams: this.dataList,
+                kilnId: this.dataForm.secPosition.split(',')[0],
+                processType: this.dataForm.processType,
+                startPosition: this.dataForm.startPosition,
+                targetPosition: this.dataForm.secPosition.split(',')[1]
+              })
+              requestData.taskCreateParamList.push({
+                autoTaskStep: 2,
+                autoTaskType: this.dataForm.autoTaskType,
+                craftCode: this.dataForm.thirdProcess,
+                detParams: this.dataList,
+                kilnId: this.dataForm.thirdPosition.split(',')[0],
+                processType: this.dataForm.processType,
+                startPosition: this.dataForm.secPosition.split(',')[1],
+                targetPosition: this.dataForm.thirdPosition.split(',')[1]
+              })
+            } else if (this.dataForm.autoTaskType === 2) {
+              requestData.taskCreateParamList.push({
+                autoTaskStep: 1,
+                autoTaskType: this.dataForm.autoTaskType,
+                craftCode: this.dataForm.secProcess,
+                detParams: this.dataList,
+                kilnId: this.dataForm.firstPosition.split(',')[0],
+                processType: this.dataForm.processType,
+                startPosition: this.dataForm.startPosition,
+                targetPosition: this.dataForm.firstPosition.split(',')[1]
+              })
+              requestData.taskCreateParamList.push({
+                autoTaskStep: 2,
+                autoTaskType: this.dataForm.autoTaskType,
+                craftCode: this.dataForm.secProcess,
+                detParams: this.dataList,
+                kilnId: this.dataForm.secPosition.split(',')[0],
+                processType: this.dataForm.processType,
+                startPosition: this.dataForm.firstPosition.split(',')[1],
+                targetPosition: this.dataForm.secPosition.split(',')[1]
+              })
+              requestData.taskCreateParamList.push({
+                autoTaskStep: 3,
+                autoTaskType: this.dataForm.autoTaskType,
+                craftCode: this.dataForm.thirdProcess,
+                detParams: this.dataList,
+                kilnId: this.dataForm.thirdPosition.split(',')[0],
+                processType: this.dataForm.processType,
+                startPosition: this.dataForm.secPosition.split(',')[1],
+                targetPosition: this.dataForm.thirdPosition.split(',')[1]
+              })
+            }
+            this.$http({
+              url: this.$http.adornUrl(`currTask/createAutoTask`),
+              method: 'post',
+              data: this.$http.adornData(requestData)
+            }).then(({data}) => {
+              console.log(data)
+              if (data && data.code === 0) {
+                this.$message.success('任务提交成功')
+                this.dataList = []
+                sessionStorage.setItem('autoTaskList', '')
+                this.$emit('refreshDataList')
+              } else {
+                this.$message.warning(data.msg)
+              }
+            })
+          }
+        })
+      }
+    }
+  }
+</script>
diff --git a/src/views/common/order-auto.vue b/src/views/common/order-auto.vue
new file mode 100644
index 0000000..dbc9e91
--- /dev/null
+++ b/src/views/common/order-auto.vue
@@ -0,0 +1,344 @@
+<template>
+  <div class="mod-config">
+    <div class="auto-session">
+      <el-row style="margin: 10px 0; font-weight: bold">
+        未下发自动任务
+      </el-row>
+      <el-form :inline="true" style="display: flex; align-items: center; justify-content: right;">
+        <el-form-item style="flex: 1;float: left">
+          <el-button size="small" type="primary" @click="addOrUpdateHandle()">
+            <icon-svg class="iconClass" name="新建"></icon-svg>
+            新增
+          </el-button>
+        </el-form-item>
+        <el-form-item style="margin-left:1%">
+          <el-button type="primary" size="small" @click="handleSubmit()">提交任务</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        :data="dataList"
+        :stripe="true"
+        :header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
+        style="width: 100%;">
+        <el-table-column
+          type="index"
+          header-align="center"
+          align="center"
+          label="序号"
+          width="50">
+        </el-table-column>
+        <el-table-column
+          prop="idenCardNum"
+          label="标识卡">
+        </el-table-column>
+        <el-table-column
+          prop="customerName"
+          label="客户名称">
+        </el-table-column>
+        <el-table-column
+          prop="orderNo"
+          label="订单号">
+        </el-table-column>
+        <el-table-column
+          prop="productName"
+          label="产品名称">
+        </el-table-column>
+        <el-table-column
+          prop="materialDes"
+          label="材料号牌">
+        </el-table-column>
+        <el-table-column
+          prop="finishQuantity"
+          label="已完成数">
+          <template slot-scope="scope">
+            {{ `${scope.row.finishQuantity}/${scope.row.targetQuantity}` }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="quantity"
+          label="数量">
+        </el-table-column>
+        <el-table-column
+          prop="weight"
+          label="重量">
+        </el-table-column>
+        <el-table-column
+          prop="unit"
+          label="单位">
+        </el-table-column>
+        <el-table-column
+          fixed="right"
+          header-align="center"
+          align="center"
+          label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row, scope.$index)">
+              <el-tooltip class="item" effect="dark" content="修改" placement="top">
+                <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>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="auto-undo">
+      <el-row style="margin: 10px 0; font-weight: bold">
+        未完成自动任务
+      </el-row>
+      <el-table
+        :data="autoList"
+        :stripe="true"
+        :header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
+        v-loading="dataListLoading"
+        style="width: 100%;">
+        <el-table-column
+          type="index"
+          header-align="center"
+          align="center"
+          label="序号"
+          width="50">
+        </el-table-column>
+        <el-table-column
+          prop="processFlowType"
+          label="自动任务类型">
+          <template slot-scope="scope">
+            {{ scope.row.processFlowType === 1 ? '淡化炉加工' : scope.row.processFlowType === 2 ? '多功能炉加工' : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="status"
+          label="状态">
+          <template slot-scope="scope">
+            {{ scope.row.status === 0 ? '未开始' : scope.row.status === 1 ? '执行中' : scope.row.status === 2 ? '完成' : scope.row.status === 3 ? '终止' : '' }}
+          </template>
+        </el-table-column>
+        <!-- <el-table-column
+          label="详情">
+          <template slot-scope="scope">
+            <el-button type="text" @click="handleAutoDetail(scope.row.id)">详情</el-button>
+          </template>
+        </el-table-column> -->
+        <el-table-column
+          fixed="right"
+          header-align="center"
+          align="center"
+          label="操作">
+          <template slot-scope="scope">
+            <el-button type="text" style="color:red" size="small" @click="stopHandle(scope.row.id)">
+              <el-tooltip class="item" effect="dark" content="停止" placement="top">
+                <icon-svg class="iconClass" name="stop"></icon-svg>
+              </el-tooltip>
+            </el-button>
+          </template>
+        </el-table-column>
+      </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>
+    </div>
+    <!-- 弹窗, 新增 / 修改 -->
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList" />
+    <process-point v-if="processPointVisible" ref="processPoint" @refreshPoint="setPoint" />
+    <submit-form v-if="submitFormVisible" ref="submitForm" :kilnList="eqList" :processList="processList" @refreshDataList="getDataList" />
+    <auto-detail v-if="autoDetailVisible" ref="autoDetail" />
+  </div>
+</template>
+
+<script>
+  import AddOrUpdate from './order-auto-add'
+  import SubmitForm from './order-auto-submit'
+  import ProcessPoint from './order-process-point'
+  import AutoDetail from './order-auto-detail'
+  export default {
+    data () {
+      return {
+        startPosition: '',
+        kilnId: '',
+        targetPosition: '',
+        dataList: [],
+        autoList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false,
+        processType: null,
+        addOrUpdateVisible: false,
+        processPointVisible: false,
+        submitFormVisible: false,
+        autoDetailVisible: false,
+        eqList: [],
+        processList: []
+      }
+    },
+    components: {
+      AddOrUpdate,
+      ProcessPoint,
+      SubmitForm,
+      AutoDetail
+    },
+    activated () {
+      this.getDictList()
+      this.getDataList()
+      this.getAutoDataList()
+    },
+    methods: {
+      // 获取窑炉、工艺列表
+      getDictList () {
+        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.$http({
+          url: this.$http.adornUrl('/craftInfo/page'),
+          method: 'post',
+          data: this.$http.adornData({
+            current: 1,
+            size: 999
+          })
+        }).then(({ data }) => {
+          if (data && data.code === 0) {
+            this.processList = data.data.records
+          } else {
+            this.processList = []
+          }
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getAutoDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getAutoDataList()
+      },
+      // 获取数据列表
+      getDataList () {
+        this.dataList = sessionStorage.getItem('autoTaskList') ? JSON.parse(sessionStorage.getItem('autoTaskList')) : []
+        // if (data && data.code === 0) {
+        //   this.dataList = data.data.records
+        // } else {
+        //   this.dataList = []
+        // }
+      },
+      // 获取已下发自动任务
+      getAutoDataList () {
+        this.dataListLoading = true
+        this.$http({
+          url: this.$http.adornUrl('/autoTask/page'),
+          method: 'post',
+          data: this.$http.adornData({
+            'current': this.pageIndex,
+            'size': this.pageSize
+          })
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.autoList = data.data.records
+            this.totalPage = data.data.total
+          } else {
+            this.autoList = []
+            this.totalPage = 0
+          }
+          this.dataListLoading = false
+        })
+      },
+      // 新增 / 修改
+      addOrUpdateHandle (row, idx) {
+        this.addOrUpdateVisible = true
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(row, idx)
+        })
+      },
+      // 获取点位
+      getPoint (pointType) {
+        this.processPointVisible = true
+        this.$nextTick(() => {
+          this.$refs.processPoint.init(pointType)
+        })
+      },
+      setPoint (count, pointType) {
+        if (!pointType) {
+          this.startPosition = count
+        } else {
+          this.kilnId = count
+          this.targetPosition = count
+        }
+      },
+      // 弹出提交任务弹窗
+      handleSubmit () {
+        this.submitFormVisible = true
+        this.$nextTick(() => {
+          this.$refs.submitForm.init(this.dataList)
+        })
+      },
+      handleAutoDetail (id) {
+        this.autoDetailVisible = true
+        this.$nextTick(() => {
+          this.$refs.autoDetail.init(id)
+        })
+      },
+      // 删除
+      deleteHandle (idx) {
+        console.log(idx)
+        this.$confirm(`确定对第${idx + 1}项进行删除操作?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.dataList.splice(idx, 1)
+          sessionStorage.setItem('autoTaskList', JSON.stringify(this.dataList))
+        }).catch(() => {})
+      },
+      // 终止自动任务
+      stopHandle (id) {
+        this.$confirm(`确定对[id=${id}]进行停止操作?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$http({
+            url: this.$http.adornUrl('/autoTask/stop'),
+            method: 'post',
+            data: this.$http.adornData({id})
+          }).then(({data}) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.getDataList()
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }).catch(() => {})
+      }
+    }
+  }
+</script>
diff --git a/src/views/common/testdata.js b/src/views/common/testdata.js
new file mode 100644
index 0000000..6044395
--- /dev/null
+++ b/src/views/common/testdata.js
@@ -0,0 +1,135 @@
+/*
+ * @Author: gtz
+ * @Date: 2022-03-04 14:09:53
+ * @LastEditors: gtz
+ * @LastEditTime: 2022-03-04 14:15:15
+ * @Description: file content
+ * @FilePath: \mt-qj-wms-ui\src\views\common\testdata.js
+ */
+export default {
+  "taskCreateParamList": [
+    {
+      "autoTaskStep": 0,
+      "autoTaskType": 0,
+      "craftCode": "",
+      "detParams": [
+        {
+          "customerName": "",
+          "idenCardNum": "",
+          "materialDes": "",
+          "orderNo": "",
+          "productName": "",
+          "quantity": 0,
+          "unit": "",
+          "weight": 0
+        },
+        {
+          "customerName": "",
+          "idenCardNum": "",
+          "materialDes": "",
+          "orderNo": "",
+          "productName": "",
+          "quantity": 0,
+          "unit": "",
+          "weight": 0
+        },
+        {
+          "customerName": "",
+          "idenCardNum": "",
+          "materialDes": "",
+          "orderNo": "",
+          "productName": "",
+          "quantity": 0,
+          "unit": "",
+          "weight": 0
+        }
+      ],
+      "kilnId": 1,
+      "processType": 0,
+      "startPosition": "",
+      "targetPosition": ""
+    },
+    {
+      "autoTaskStep": 1,
+      "autoTaskType": 0,
+      "craftCode": "",
+      "detParams": [
+        {
+          "customerName": "",
+          "idenCardNum": "",
+          "materialDes": "",
+          "orderNo": "",
+          "productName": "",
+          "quantity": 0,
+          "unit": "",
+          "weight": 0
+        },
+        {
+          "customerName": "",
+          "idenCardNum": "",
+          "materialDes": "",
+          "orderNo": "",
+          "productName": "",
+          "quantity": 0,
+          "unit": "",
+          "weight": 0
+        },
+        {
+          "customerName": "",
+          "idenCardNum": "",
+          "materialDes": "",
+          "orderNo": "",
+          "productName": "",
+          "quantity": 0,
+          "unit": "",
+          "weight": 0
+        }
+      ],
+      "kilnId": 1,
+      "processType": 0,
+      "startPosition": "",
+      "targetPosition": ""
+    },
+    {
+      "autoTaskStep": 2,
+      "autoTaskType": 0,
+      "craftCode": "",
+      "detParams": [
+        {
+          "customerName": "",
+          "idenCardNum": "",
+          "materialDes": "",
+          "orderNo": "",
+          "productName": "",
+          "quantity": 0,
+          "unit": "",
+          "weight": 0
+        },
+        {
+          "customerName": "",
+          "idenCardNum": "",
+          "materialDes": "",
+          "orderNo": "",
+          "productName": "",
+          "quantity": 0,
+          "unit": "",
+          "weight": 0
+        },
+        {
+          "customerName": "",
+          "idenCardNum": "",
+          "materialDes": "",
+          "orderNo": "",
+          "productName": "",
+          "quantity": 0,
+          "unit": "",
+          "weight": 0
+        }
+      ],
+      "kilnId": 1,
+      "processType": 0,
+      "startPosition": "",
+      "targetPosition": ""
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue
index 8fa85d9..0b396a1 100644
--- a/src/views/main-sidebar.vue
+++ b/src/views/main-sidebar.vue
@@ -18,6 +18,13 @@
               >任务管理</span
             >
           </template>
+          <el-menu-item
+            index="orderProcess"
+            @click="$router.push({ name: 'orderAuto' })"
+          >
+            <icon-svg name="tubiao" class="site-sidebar__menu-icon"></icon-svg>
+            <span slot="title">自动任务</span>
+          </el-menu-item>
           <el-menu-item
             index="orderProcess"
             @click="$router.push({ name: 'orderProcess' })"
@@ -124,7 +131,7 @@
             <span slot="title">当前执行任务</span>
           </el-menu-item>
         </el-submenu>
-        <el-submenu index="energy">
+        <!-- <el-submenu index="energy">
           <template slot="title">
             <icon-svg name="config" class="site-sidebar__menu-icon"></icon-svg>
             <span>能源管理</span>
@@ -151,7 +158,7 @@
               ></icon-svg>
               <span>窑炉用气分析</span>
             </template>
-            <!-- <el-menu-item
+            <el-menu-item
               index="sulfur-dioxide"
               @click="$router.push({ name: 'energy-sulfur-dioxide' })"
             >
@@ -160,7 +167,7 @@
                 class="site-sidebar__menu-icon"
               ></icon-svg>
               <span slot="title">二氧化硫流量分析</span>
-            </el-menu-item> -->
+            </el-menu-item>
             <el-menu-item
               index="methanol"
               @click="$router.push({ name: 'energy-methanol' })"
@@ -252,7 +259,7 @@
               <span slot="title">油槽温度</span>
             </el-menu-item>
           </el-submenu>
-          <!-- <el-submenu index="gas">
+          <el-submenu index="gas">
             <template slot="title">
               <icon-svg
                 name="config"
@@ -270,7 +277,7 @@
               ></icon-svg>
               <span slot="title">使用氮气分析</span>
             </el-menu-item>
-          </el-submenu> -->
+          </el-submenu>
           <el-menu-item
             index="kiln-speed"
             @click="$router.push({ name: 'energy-kiln-speed' })"
@@ -278,7 +285,7 @@
             <icon-svg name="tubiao" class="site-sidebar__menu-icon"></icon-svg>
             <span slot="title">窑炉速度参数</span>
           </el-menu-item>
-        </el-submenu>
+        </el-submenu> -->
         <el-submenu index="report">
           <template slot="title">
             <icon-svg name="config" class="site-sidebar__menu-icon"></icon-svg>
diff --git a/src/views/order/current-task.vue b/src/views/order/current-task.vue
index 165fea3..197f352 100644
--- a/src/views/order/current-task.vue
+++ b/src/views/order/current-task.vue
@@ -98,7 +98,7 @@
               <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-button type="text" v-if="!(scope.row.isAuto)" 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>
@@ -186,7 +186,31 @@
       },
       // 执行
       addOrUpdateHandle (id) {
-        console.log('执行')
+        this.$confirm(`确定对[任务id=${id}]进行删除操作?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$http({
+            url: this.$http.adornUrl('/currTask/runTask'),
+            method: 'post',
+            data: this.$http.adornData({ id })
+            // params: this.$http.adornParams({ id }, false)
+          }).then(({data}) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.getDataList()
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }).catch(() => {})
       },
       // 删除
       deleteHandle (sheetNo) {
diff --git a/src/views/report/components/task-ele.vue b/src/views/report/components/task-ele.vue
new file mode 100644
index 0000000..f8320d5
--- /dev/null
+++ b/src/views/report/components/task-ele.vue
@@ -0,0 +1,143 @@
+<!--
+ * @Author: gtz
+ * @Date: 2022-03-05 16:06:02
+ * @LastEditors: gtz
+ * @LastEditTime: 2022-03-05 17:59:47
+ * @Description: file content
+ * @FilePath: \mt-qj-wms-ui\src\views\report\components\task-ele.vue
+-->
+<template>
+  <div class="chart-container">
+    <el-row :gutter="20">
+      <el-col :span="12" v-for="(item, index) in dataList.ele" v-if="item.length" :key="'ele' + index">
+        <el-card class="base-container" style="height: 444px; position: relative; margin: 10px 0">
+          <el-row style="position: absolute; z-index: 10; right: 20px">
+            <el-checkbox-group size="small" :min="1" v-model="chartTypeEle[index]" style="float: left">
+              <el-checkbox-button label="折线" />
+              <el-checkbox-button label="柱状" />
+            </el-checkbox-group>
+          </el-row>
+          <el-row style="height: 400px">
+            <chart height="100%" width="100%" :title="item[0].name" :id="'ele' + index" :dataList="item" :chartType="chartTypeEle[index]" />
+          </el-row>
+        </el-card>
+      </el-col>
+      <el-col :span="12" v-for="(item, index) in dataList.gas" v-if="item.length" :key="'gas' + index">
+        <el-card class="base-container" style="height: 444px; position: relative; margin: 10px 0">
+          <el-row style="position: absolute; z-index: 10; right: 20px">
+            <el-checkbox-group size="small" :min="1" v-model="chartTypeGas[index]" style="float: left">
+              <el-checkbox-button label="折线" />
+              <el-checkbox-button label="柱状" />
+            </el-checkbox-group>
+          </el-row>
+          <el-row style="height: 400px">
+            <chart height="100%" width="100%" :title="item[0].name" :id="'gas' + index" :dataList="item" :chartType="chartTypeGas[index]" />
+          </el-row>
+        </el-card>
+      </el-col>
+      <el-col :span="12" v-for="(item, index) in dataList.rot" v-if="item.length" :key="'rot' + index">
+        <el-card class="base-container" style="height: 444px; position: relative; margin: 10px 0">
+          <el-row style="position: absolute; z-index: 10; right: 20px">
+            <el-checkbox-group size="small" :min="1" v-model="chartTypeRot[index]" style="float: left">
+              <el-checkbox-button label="折线" />
+              <el-checkbox-button label="柱状" />
+            </el-checkbox-group>
+          </el-row>
+          <el-row style="height: 400px">
+            <chart height="100%" width="100%" :title="item[0].name" :id="'rot' + index" :dataList="item" :chartType="chartTypeRot[index]" />
+          </el-row>
+        </el-card>
+      </el-col>
+      <el-col :span="12" v-for="(item, index) in dataList.temp" v-if="item.length" :key="'temp' + index">
+        <el-card class="base-container" style="height: 444px; position: relative; margin: 10px 0">
+          <el-row style="position: absolute; z-index: 10; right: 20px">
+            <el-checkbox-group size="small" :min="1" v-model="chartTypeTemp[index]" style="float: left">
+              <el-checkbox-button label="折线" />
+              <el-checkbox-button label="柱状" />
+            </el-checkbox-group>
+          </el-row>
+          <el-row style="height: 400px">
+            <chart height="100%" width="100%" :title="item[0].name" :id="'temp' + index" :dataList="item" :chartType="chartTypeTemp[index]" />
+          </el-row>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import Chart from '@/components/Charts/MixChart.new'
+import lineChart from '@/components/Charts/LineChart.new'
+
+export default {
+  name: 'electric',
+  components: { Chart, lineChart },
+  data () {
+    return {
+      dataList: {
+        ele: [],
+        gas: [],
+        rot: [],
+        temp: []
+      },
+      chartTypeEle: [],
+      chartTypeGas: [],
+      chartTypeRot: [],
+      chartTypeTemp: [],
+      showId: 0
+    }
+  },
+  activated () {
+    this.getEleList()
+  },
+  mounted () {},
+  methods: {
+    // 获取能源信息
+    getEleList () {
+      this.$http({
+        url: this.$http.adornUrl('/electric/energyList'),
+        method: 'post',
+        data: this.$http.adornData({
+          'taskId': this.$route.query.taskId
+        })
+      }).then(({data}) => {
+        if (data.code === 0 && data.data) {
+          console.log(JSON.parse(data.data))
+          this.dataList = JSON.parse(data.data)
+          this.dataList.ele.map(item => {
+            this.chartTypeEle.push(['柱状'])
+          })
+          this.dataList.gas.map(item => {
+            this.chartTypeGas.push(['柱状'])
+          })
+          this.dataList.rot.map(item => {
+            this.chartTypeRot.push(['柱状'])
+          })
+          this.dataList.temp.map(item => {
+            this.chartTypeTemp.push(['柱状'])
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.chart-container {
+  position: relative;
+  width: 100%;
+  min-height: calc(100vh - 138px);
+}
+</style>
+
+<style lang="scss">
+.chart-container {
+  .el-tabs__item{
+    height: 120px;
+  }
+  .el-tabs__nav-next, .el-tabs__nav-prev {
+    line-height: 120px;
+  }
+}
+</style>
diff --git a/src/views/report/task-history.vue b/src/views/report/task-history.vue
index 8709274..b3e94b7 100644
--- a/src/views/report/task-history.vue
+++ b/src/views/report/task-history.vue
@@ -107,6 +107,16 @@
         label="车辆名称"
       >
       </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="80"
+        label="能耗情况">
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="eleHandle(scope.row.id)">详情</el-button>
+        </template>
+      </el-table-column>
       <el-table-column
         fixed="right"
         header-align="center"
@@ -208,6 +218,12 @@ export default {
     },
     LocationBtn (id) {
       this.$router.push({ name: 'report-task-history-detail', query: { id } })
+    },
+    eleHandle (taskId) {
+      this.$router.push({
+        name: 'report-task-ele',
+        query: { taskId }
+      })
     }
   }
 }
-- 
2.45.2