更新

Reviewed-on: #23

config/dev.env.js

@@ -2,7 +2,7 @@
  * @Author: gtz
  * @Date: 2021-11-19 10:10:51
  * @LastEditors: gtz
- * @LastEditTime: 2021-12-07 11:07:26
+ * @LastEditTime: 2021-12-08 16:04:49
  * @Description: file content
  * @FilePath: \mt-qj-wms-ui\config\dev.env.js
  */
@@ -12,5 +12,5 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  OPEN_PROXY: false // 是否开启代理, 重置后需重启vue-cli
+  OPEN_PROXY: true // 是否开启代理, 重置后需重启vue-cli
 })

config/index.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-11-19 10:10:51
- * @LastEditors: gtz
- * @LastEditTime: 2021-12-07 11:07:20
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-06 15:07:51
  * @Description: file content
  * @FilePath: \mt-qj-wms-ui\config\index.js
  */
@@ -22,10 +22,10 @@ module.exports = {
     // 代理列表, 是否开启代理通过[./dev.env.js]配置
     proxyTable: devEnv.OPEN_PROXY === false ? {} : {
       '/proxyApi': {
-        target: 'http://192.168.0.109:8080/',
+        target: 'http://192.168.1.18:8080',
         changeOrigin: true,
         pathRewrite: {
-          '^/proxyApi': ''
+          '^/proxyApi': '/api'
         }
       }
     },

index.html

@@ -18,7 +18,7 @@
     <script>document.write('<script src="./config/index.js?t=' + new Date().getTime() + '"><\/script>');</script>
   <% }else { %>
     <!-- 开发环境 -->
-    <link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico">
+    <link rel="shortcut icon" type="image/x-icon" href="./static/img/top.png">
     <script src="./static/config/index.js"></script>
     <script src="./static/plugins/mock-1.0.0-beta3/mock-min.js"></script>
     <script src="./static/plugins/ueditor-1.4.3.3/ueditor.config.js"></script>

package.json

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

src/assets/scss/_base.scss

@@ -122,9 +122,13 @@ img {
   right: 0;
   left: 0;
   z-index: 1030;
-  height: 50px;
+  height: 64px;
   box-shadow: 0 2px 4px rgba(0, 0, 0, .08);
   background-color: $navbar--background-color;
+  
+  &-icon {
+    font-size: 18px;
+  }
 
   &--inverse {
     .site-navbar__body {
@@ -158,17 +162,17 @@ img {
   &__header {
     position: relative;
     float: left;
-    width: 230px;
-    height: 50px;
+    width: 336px;
+    height: 64px;
     overflow: hidden;
   }
   &__brand {
     display: table-cell;
     vertical-align: middle;
-    width: 230px;
-    height: 50px;
+    width: 336px;
+    height: 64px;
     margin: 0;
-    line-height: 50px;
+    line-height: 64px;
     font-size: 20px;
     text-align: center;
     text-transform: uppercase;
@@ -188,6 +192,13 @@ img {
     &-mini {
       display: none;
     }
+    &-lg {
+      text-align: left;
+      text-indent: 15px;
+      font-weight: normal;
+      font-size: 16px;
+      cursor: pointer;
+    }
   }
   &__switch {
     font-size: 18px;
@@ -210,7 +221,7 @@ img {
   }
   &__body {
     position: relative;
-    margin-left: 230px;
+    margin-left: 336px;
     padding-right: 15px;
     background-color: #fff;
   }
@@ -228,8 +239,8 @@ img {
     }
     .el-menu-item,
     .el-submenu > .el-submenu__title {
-      height: 50px;
-      line-height: 50px;
+      height: 64px;
+      line-height: 64px;
     }
     .el-submenu > .el-menu {
       top: 55px;
@@ -249,13 +260,18 @@ img {
 ------------------------------ */
 .site-sidebar {
   position: fixed;
-  top: 50px;
+  top: 64px;
   left: 0;
   bottom: 0;
   z-index: 1020;
-  width: 230px;
+  width: 336px;
   overflow: hidden;
 
+  .el-menu-item, .el-submenu__title {
+    height: 48px;
+    line-height: 48px;
+  }
+
   &--dark,
   &--dark-popper {
     background-color: $sidebar--background-color-dark;
@@ -264,33 +280,33 @@ img {
       background-color: $sidebar--background-color-dark;
       .el-menu-item,
       .el-submenu > .el-submenu__title {
-        color: $sidebar--color-text-dark;
+        color: #fff;
         &:focus,
         &:hover {
-          color: mix(#fff, $sidebar--color-text-dark, 50%);
-          background-color: mix(#fff, $sidebar--background-color-dark, 2.5%);
+          color: #fff;
+          background-color: #2863af;
         }
       }
       .el-menu,
       .el-submenu.is-opened {
-        background-color: mix(#000, $sidebar--background-color-dark, 15%);
+        background-color: #0b253f;
       }
       .el-menu-item.is-active,
       .el-submenu.is-active > .el-submenu__title {
-        color: mix(#fff, $sidebar--color-text-dark, 80%);
+        color: #fff;
       }
     }
   }
   &__inner {
     position: relative;
     z-index: 1;
-    width: 250px;
+    width: 356px;
     height: 100%;
     padding-bottom: 15px;
     overflow-y: scroll;
   }
   &__menu.el-menu {
-    width: 230px;
+    width: 336px;
     border-right: 0;
   }
   &__menu-icon {
@@ -307,12 +323,11 @@ img {
 ------------------------------ */
 .site-content {
   position: relative;
-  padding: 15px;
 
   &__wrapper {
     position: relative;
-    padding-top: 50px;
-    margin-left: 230px;
+    padding-top: 64px;
+    margin-left: 336px;
     min-height: 100%;
     background: $content--background-color;
   }
@@ -322,8 +337,8 @@ img {
   > .el-tabs {
     > .el-tabs__header {
       position: fixed;
-      top: 50px;
-      left: 230px;
+      top: 64px;
+      left: 336px;
       right: 0;
       z-index: 930;
       padding: 0 55px 0 15px;
@@ -337,10 +352,9 @@ img {
       }
     }
     > .el-tabs__content {
-      padding: 0 15px 15px;
       > .site-tabs__tools {
         position: fixed;
-        top: 50px;
+        top: 64px;
         right: 0;
         z-index: 931;
         height: 40px;
@@ -362,3 +376,96 @@ img {
   vertical-align: middle;
   margin-right: 5px;
 }
+
+.mod-config{
+  background-color: #fff;
+  border-radius: 15px;
+  padding: 20px;
+  min-height: calc(100vh - 159px);
+}
+
+.base-container{
+  border-radius: 25px;
+  h3 {
+    margin: 0;
+    font-size: 16px;
+  }
+  .base-container-titleline{
+    position: absolute;
+    width: 4px;
+    height: 16px;
+    background: #3E6AF7;
+    border-radius: 2px;
+    left: -8px;
+    top: 1px
+  }
+  .el-tabs--border-card{
+    border: 0;
+    box-shadow: 0 0 0 0 rgba(0, 0, 0, 0);
+  }
+  .el-tabs__header {
+    border-bottom: 0;
+    background: #fff;
+  }
+  .el-tabs__item{
+    border: 0 !important;
+  }
+  .el-tabs__nav-prev, .el-tabs__nav-next{
+    width: 56px;
+    font-size: 40px;
+  }
+  .el-tabs__nav-next{
+    text-align: right;
+  }
+  .el-tabs__nav-wrap.is-scrollable{
+    padding: 0 56px;
+  }
+  .el-tabs__nav-scroll{
+    padding: 10px;
+  }
+  .el-tabs__nav{
+    .el-tabs__item, .is-active {
+      color: #000000 !important;
+    }
+    .is-active{
+      box-shadow: 0px 4px 16px 0px rgba(0, 0, 0, 0.12);
+      border-radius: 8px;
+    }
+  }
+}
+
+.el-radio-group{
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+}
+
+.el-radio-button__orig-radio:checked+.el-radio-button__inner{
+  border-radius: 4px;
+}
+
+.el-radio-button__inner{
+  border: 0 !important;
+}
+
+.chart-container{
+  .kiln-electric-treebox{
+    width: 100%;
+    border: 1px solid #eeeeee;
+    border-radius: 0 15px 15px 0;
+    overflow: hidden;
+    position: relative;
+    right: 20px;
+    padding: 10px 0;
+    background: #fff;
+    .el-tree-node{
+      height: 56px;
+      .el-tree-node__content{
+        height: 56px;
+        line-height: 56px;
+      }
+      .el-tree-node__content:hover {
+        background: #CEE3FF;
+      }
+    }
+  }
+}

src/assets/scss/_variables.scss

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

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>

src/components/Charts/MixChart.new.vue

@@ -0,0 +1,330 @@
+<template>
+  <div :id="id" :class="className" :style="{ height: height, width: width }" />
+</template>
+
+<script>
+import * as echarts from 'echarts'
+import resize from './mixins/resize'
+
+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.dataList.forEach(item => {
+              this.series.push({
+                name: item[0].code,
+                type: 'line',
+                symbolSize: 5,
+                symbol: 'circle',
+                data: item.map(item1 => {
+                  return item1
+                })
+              })
+            })
+          }
+          this.initChart()
+        }
+      },
+      deep: true
+    },
+    showId: {
+      handler () {
+        this.initChart()
+      }
+    },
+    chartType: {
+      handler (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.dataList.forEach(item => {
+              this.series.push({
+                name: item[0].code,
+                type: 'line',
+                symbolSize: 5,
+                symbol: 'circle',
+                data: item.map(item1 => {
+                  return item1
+                })
+              })
+            })
+          }
+          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.dataList.forEach(item => {
+        this.series.push({
+          name: item[0].code,
+          type: 'line',
+          symbolSize: 5,
+          symbol: 'circle',
+          data: item.map(item1 => {
+            return item1
+          })
+        })
+      })
+    }
+    this.initChart()
+  },
+  methods: {
+    initChart () {
+      if (this.chart) {
+        this.chart.dispose()
+      }
+      this.chart = echarts.init(document.getElementById(this.id))
+      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',
+          confine: true,
+          axisPointer: {
+            textStyle: {
+              color: '#fff'
+            }
+          },
+          formatter: function (params) {
+            let info = params[0].dataIndex + 1 + '<br/>'
+            params.forEach(item => {
+              info += item.marker + item.data.code + '<br/>' + '值: ' + item.value + '<br/>' + '时间: ' + item.data.time.split('T')[0] + ' ' + item.data.time.split('T')[1] + '<br/>'
+            })
+            return info
+          }
+        },
+        grid: {
+          left: '5%',
+          right: '5%',
+          borderWidth: 0,
+          top: 100,
+          bottom: 100,
+          textStyle: {
+            color: '#fff'
+          }
+        },
+        legend: {
+          x: 20,
+          top: 55,
+          textStyle: {
+            color: '#90979c'
+          }
+        },
+        calculable: true,
+        xAxis: [
+          {
+            type: 'category',
+            axisLine: {
+              lineStyle: {
+                color: '#90979c'
+              }
+            },
+            splitLine: {
+              show: false
+            },
+            axisTick: {
+              show: false
+            },
+            splitArea: {
+              show: false
+            },
+            axisLabel: {
+              show: false
+            }
+          }
+        ],
+        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: 20,
+            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: 20
+          }
+        ],
+        series: this.series
+      })
+    }
+  }
+}
+</script>

src/components/Charts/MixChart.vue

@@ -84,19 +84,12 @@ export default {
               type: 'bar',
               barMaxWidth: 35,
               barGap: '10%',
-              itemStyle: {
-                normal: {
-                  color: 'rgba(255,144,128,1)',
-                  label: {
-                    show: true,
-                    textStyle: {
-                      color: '#fff'
-                    },
-                    position: 'insideTop',
-                    formatter (p) {
-                      return p.value > 0 ? p.value : ''
-                    }
-                  }
+              color: '#5AD8A6',
+              label: {
+                show: true,
+                position: 'top',
+                formatter (p) {
+                  return p.value > 0 ? p.value : ''
                 }
               },
               data: this.dataList.map(item => {
@@ -108,19 +101,12 @@ export default {
               type: 'bar',
               barMaxWidth: 35,
               barGap: '10%',
-              itemStyle: {
-                normal: {
-                  color: 'rgba(0,191,183,1)',
-                  label: {
-                    show: true,
-                    textStyle: {
-                      color: '#fff'
-                    },
-                    position: 'insideTop',
-                    formatter (p) {
-                      return p.value > 0 ? p.value : ''
-                    }
-                  }
+              color: '#5B8FF9',
+              label: {
+                show: true,
+                position: 'top',
+                formatter (p) {
+                  return p.value > 0 ? p.value : ''
                 }
               },
               data: this.lastDataList.map(item => {
@@ -134,17 +120,12 @@ export default {
               type: 'line',
               symbolSize: 10,
               symbol: 'circle',
-              itemStyle: {
-                normal: {
-                  color: 'rgba(255,144,128,1)',
-                  barBorderRadius: 0,
-                  label: {
-                    show: true,
-                    position: 'top',
-                    formatter (p) {
-                      return p.value > 0 ? p.value : ''
-                    }
-                  }
+              color: '#5B8FF9',
+              label: {
+                show: true,
+                position: 'top',
+                formatter (p) {
+                  return p.value > 0 ? p.value : ''
                 }
               },
               data: this.dataList.map(item => {
@@ -156,17 +137,12 @@ export default {
               type: 'line',
               symbolSize: 10,
               symbol: 'circle',
-              itemStyle: {
-                normal: {
-                  color: 'rgba(0,191,183,1)',
-                  barBorderRadius: 0,
-                  label: {
-                    show: true,
-                    position: 'top',
-                    formatter (p) {
-                      return p.value > 0 ? p.value : ''
-                    }
-                  }
+              color: '#5AD8A6',
+              label: {
+                show: true,
+                position: 'top',
+                formatter (p) {
+                  return p.value > 0 ? p.value : ''
                 }
               },
               data: this.lastDataList.map(item => {
@@ -195,19 +171,12 @@ export default {
               type: 'bar',
               barMaxWidth: 35,
               barGap: '10%',
-              itemStyle: {
-                normal: {
-                  color: 'rgba(255,144,128,1)',
-                  label: {
-                    show: true,
-                    textStyle: {
-                      color: '#fff'
-                    },
-                    position: 'insideTop',
-                    formatter (p) {
-                      return p.value > 0 ? p.value : ''
-                    }
-                  }
+              color: '#5B8FF9',
+              label: {
+                show: true,
+                position: 'top',
+                formatter (p) {
+                  return p.value > 0 ? p.value : ''
                 }
               },
               data: this.dataList.map(item => {
@@ -219,19 +188,12 @@ export default {
               type: 'bar',
               barMaxWidth: 35,
               barGap: '10%',
-              itemStyle: {
-                normal: {
-                  color: 'rgba(0,191,183,1)',
-                  label: {
-                    show: true,
-                    textStyle: {
-                      color: '#fff'
-                    },
-                    position: 'insideTop',
-                    formatter (p) {
-                      return p.value > 0 ? p.value : ''
-                    }
-                  }
+              color: '#5AD8A6',
+              label: {
+                show: true,
+                position: 'top',
+                formatter (p) {
+                  return p.value > 0 ? p.value : ''
                 }
               },
               data: this.lastDataList.map(item => {
@@ -245,17 +207,13 @@ export default {
               type: 'line',
               symbolSize: 10,
               symbol: 'circle',
-              itemStyle: {
-                normal: {
-                  color: 'rgba(255,144,128,1)',
-                  barBorderRadius: 0,
-                  label: {
-                    show: true,
-                    position: 'top',
-                    formatter (p) {
-                      return p.value > 0 ? p.value : ''
-                    }
-                  }
+              color: '#5B8FF9',
+              barBorderRadius: 0,
+              label: {
+                show: true,
+                position: 'top',
+                formatter (p) {
+                  return p.value > 0 ? p.value : ''
                 }
               },
               data: this.dataList.map(item => {
@@ -267,17 +225,13 @@ export default {
               type: 'line',
               symbolSize: 10,
               symbol: 'circle',
-              itemStyle: {
-                normal: {
-                  color: 'rgba(0,191,183,1)',
-                  barBorderRadius: 0,
-                  label: {
-                    show: true,
-                    position: 'top',
-                    formatter (p) {
-                      return p.value > 0 ? p.value : ''
-                    }
-                  }
+              color: '#5AD8A6',
+              barBorderRadius: 0,
+              label: {
+                show: true,
+                position: 'top',
+                formatter (p) {
+                  return p.value > 0 ? p.value : ''
                 }
               },
               data: this.lastDataList.map(item => {
@@ -301,15 +255,11 @@ export default {
         return item.time
       })
       this.chart.setOption({
-        backgroundColor: '#344b58',
         title: {
           text: this.title === 'Mix-Chart' ? 'Mix-Chart' : this.titleHeader + this.title + this.titleFooter,
-          x: '20',
-          top: '20',
-          textStyle: {
-            color: '#fff',
-            fontSize: '22'
-          },
+          x: '10',
+          top: '10',
+          fontSize: '18',
           subtextStyle: {
             color: '#90979c',
             fontSize: '16'
@@ -327,15 +277,15 @@ export default {
           left: '5%',
           right: '5%',
           borderWidth: 0,
-          top: 150,
-          bottom: 95,
+          top: 100,
+          bottom: 70,
           textStyle: {
             color: '#fff'
           }
         },
         legend: {
-          x: '5%',
-          top: '10%',
+          x: 20,
+          top: 55,
           textStyle: {
             color: '#90979c'
           },
@@ -370,9 +320,9 @@ export default {
         yAxis: [
           {
             type: 'value',
-            splitLine: {
-              show: false
-            },
+            // splitLine: {
+            //   show: false
+            // },
             axisLine: {
               lineStyle: {
                 color: '#90979c'
@@ -394,9 +344,9 @@ export default {
             show: true,
             height: 30,
             xAxisIndex: [0],
-            bottom: 30,
+            bottom: 10,
             start: 0,
-            end: 100,
+            end: 10,
             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: {
@@ -411,8 +361,8 @@ export default {
             type: 'inside',
             show: true,
             height: 15,
-            start: 1,
-            end: 35
+            start: 0,
+            end: 10
           }
         ],
         series: this.series

src/components/Charts/RingChart.vue

@@ -2,9 +2,9 @@
  * @Author: gtz
  * @Date: 2021-11-22 19:03:01
  * @LastEditors: gtz
- * @LastEditTime: 2021-11-30 10:36:52
+ * @LastEditTime: 2021-12-16 19:25:02
  * @Description: file content
- * @FilePath: \mt-qj-wms-ui\src\components\Charts\ringChart.vue
+ * @FilePath: \mt-qj-wms-ui\src\components\Charts\RingChart.vue
 -->
 <template>
   <div class="mod-demo-echarts">
@@ -54,7 +54,7 @@
           series: [
             {
               type: 'pie',
-              radius: ['40%', '70%'],
+              radius: ['55%', '90%'],
               avoidLabelOverlap: false,
               label: {
                 show: false,
@@ -77,7 +77,7 @@
                   name: this.name,
                   itemStyle: {
                     normal: {
-                      color: 'rgba(0, 191, 183, 1)'
+                      color: '#5A55D8'
                     }
                   }
                 },

src/element-ui-theme/index.js

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

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>

src/icons/svg/icon-丙烷.svg

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
+    <title>丙烷</title>
+    <desc>Created with Sketch.</desc>
+    <g id="丙烷" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-7" fill-rule="nonzero">
+            <rect id="矩形" fill="#000000" opacity="0" x="0.48" y="0.48" width="23.04" height="23.04"></rect>
+            <g id="编组-5" transform="translate(0.920000, 0.920000)" fill="#1EECE3" opacity="0.103932">
+                <path d="M11.08,0.08 C5.01103448,0.08 0.08,5.01103448 0.08,11.08 C0.08,17.1489655 5.01103448,22.08 11.08,22.08 C17.1489655,22.08 22.08,17.1489655 22.08,11.08 C22.08,5.01103448 17.1489655,0.08 11.08,0.08 Z" id="形状"></path>
+            </g>
+        </g>
+        <g id="量杯,测验,化学" transform="translate(6.000000, 6.857687)" fill-rule="nonzero">
+            <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="11.1619524" height="11.1619524"></rect>
+            <path d="M11.118351,0 L0.378241942,0 C0.273598638,0 0.179855679,0.0425113422 0.11118351,0.110093476 C0.0425113422,0.178765644 0,0.273598638 0,0.378241942 C0,0.548287311 0.122083855,0.694351923 0.28885912,0.721602783 C1.11510521,0.858947119 1.74405506,1.5772798 1.74405506,2.44167709 L1.74405506,9.76670836 C1.74405506,10.5373627 2.36864478,11.1619524 3.13929912,11.1619524 L9.41789735,11.1619524 C10.1885517,11.1619524 10.8131414,10.5373627 10.8131414,9.76670836 L10.8131414,0.741223402 C10.8131414,0.717242645 10.832762,0.697622026 10.8567428,0.697622026 L11.118351,0.697622026 C11.1423318,0.697622026 11.1619524,0.678001406 11.1619524,0.654020649 L11.1619524,0.0436013766 C11.1619524,0.0196206195 11.1423318,0 11.118351,0 Z M9.06908634,9.72310698 C9.06908634,9.74708774 9.04946572,9.76670836 9.02548496,9.76670836 L6.32219961,9.76670836 C6.29821885,9.76670836 6.27859823,9.74708774 6.27859823,9.72310698 L6.27859823,9.11268771 C6.27859823,9.08870696 6.29821885,9.06908634 6.32219961,9.06908634 L9.02548496,9.06908634 C9.04946572,9.06908634 9.06908634,9.08870696 9.06908634,9.11268771 L9.06908634,9.72310698 Z M9.06908634,8.32786293 C9.06908634,8.35184369 9.04946572,8.37146431 9.02548496,8.37146431 L6.32219961,8.37146431 C6.29821885,8.37146431 6.27859823,8.35184369 6.27859823,8.32786293 L6.27859823,7.71744366 C6.27859823,7.6934629 6.29821885,7.67384228 6.32219961,7.67384228 L9.02548496,7.67384228 C9.04946572,7.67384228 9.06908634,7.6934629 9.06908634,7.71744366 L9.06908634,8.32786293 Z M9.06908634,6.93261888 C9.06908634,6.95659964 9.04946572,6.97622026 9.02548496,6.97622026 L6.32219961,6.97622026 C6.29821885,6.97622026 6.27859823,6.95659964 6.27859823,6.93261888 L6.27859823,6.32219961 C6.27859823,6.29821885 6.29821885,6.27859823 6.32219961,6.27859823 L9.02548496,6.27859823 C9.04946572,6.27859823 9.06908634,6.29821885 9.06908634,6.32219961 L9.06908634,6.93261888 Z M9.06908634,5.53737483 C9.06908634,5.56135559 9.04946572,5.58097621 9.02548496,5.58097621 L6.32219961,5.58097621 C6.29821885,5.58097621 6.27859823,5.56135559 6.27859823,5.53737483 L6.27859823,4.92695556 C6.27859823,4.9029748 6.29821885,4.88335418 6.32219961,4.88335418 L9.02548496,4.88335418 C9.04946572,4.88335418 9.06908634,4.9029748 9.06908634,4.92695556 L9.06908634,5.53737483 Z M9.06908634,4.14213078 C9.06908634,4.16611154 9.04946572,4.18573215 9.02548496,4.18573215 L6.32219961,4.18573215 C6.29821885,4.18573215 6.27859823,4.16611154 6.27859823,4.14213078 L6.27859823,3.53171151 C6.27859823,3.50773075 6.29821885,3.48811013 6.32219961,3.48811013 L9.02548496,3.48811013 C9.04946572,3.48811013 9.06908634,3.50773075 9.06908634,3.53171151 L9.06908634,4.14213078 Z M9.06908634,2.74688673 C9.06908634,2.77086748 9.04946572,2.7904881 9.02548496,2.7904881 L6.32219961,2.7904881 C6.29821885,2.7904881 6.27859823,2.77086748 6.27859823,2.74688673 L6.27859823,2.13646745 C6.27859823,2.1124867 6.29821885,2.09286608 6.32219961,2.09286608 L9.02548496,2.09286608 C9.04946572,2.09286608 9.06908634,2.1124867 9.06908634,2.13646745 L9.06908634,2.74688673 Z" id="形状" fill="#1EECE3"></path>
+        </g>
+        <rect id="矩形备份-5" stroke="#979797" fill="#D8D8D8" opacity="0" x="0.5" y="0.5" width="23" height="22.92"></rect>
+    </g>
+</svg>

src/icons/svg/icon-侧边收纳.svg

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

src/icons/svg/icon-出库.svg

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

src/icons/svg/icon-删除.svg

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

src/icons/svg/icon-总电流.svg

@@ -0,0 +1,24 @@
+<?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>总电流</title>
+    <desc>Created with Sketch.</desc>
+    <g id="登录页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="能源管理/用能源分析" transform="translate(-385.000000, -370.000000)" fill-rule="nonzero">
+            <g id="编组-21" transform="translate(384.000000, 365.000000)">
+                <g id="编组-19备份">
+                    <g id="编组-14" transform="translate(0.000000, 4.000000)">
+                        <g id="编组-13">
+                            <rect id="矩形备份-3" fill="#000000" opacity="0" x="0.4224" y="0.4224" width="23.04" height="23.04"></rect>
+                            <path d="M12,1 C5.93103448,1 1,5.93103448 1,12 C1,18.0689655 5.93103448,23 12,23 C18.0689655,23 23,18.0689655 23,12 C23,5.93103448 18.0689655,1 12,1 Z" id="形状" fill="#E4F8F1"></path>
+                            <g id="电量" transform="translate(3.742400, 3.742400)">
+                                <rect id="矩形" fill="#000000" opacity="0" x="0.2" y="0.2" width="16" height="16"></rect>
+                                <path d="M5.61125776,4.49277942 L10.5619354,4.49277942 L10.5619354,5.71319271 L5.61125776,5.71319271 L5.61125776,4.49277942 L5.61125776,4.49277942 Z M5.61125776,6.3722236 L10.5619354,6.3722236 L10.5619354,7.5926369 L5.61125776,7.5926369 L5.61125776,6.3722236 L5.61125776,6.3722236 Z M5.61125776,8.25166779 L10.5619354,8.25166779 L10.5619354,9.47205355 L5.61125776,9.47205355 L5.61125776,8.25166779 L5.61125776,8.25166779 Z M5.61125776,10.131112 L10.5619354,10.131112 L10.5619354,11.3514977 L5.61125776,11.3514977 L5.61125776,10.131112 L5.61125776,10.131112 Z M5.61125776,12.0105562 L10.5619354,12.0105562 L10.5619354,13.2309419 L5.61125776,13.2309419 L5.61125776,12.0105562 L5.61125776,12.0105562 Z M9.46911861,3.35060056 L9.46911861,2.77164914 L6.70404538,2.77164914 L6.70404538,3.35057303 L4.54329828,3.35057303 L4.54329828,14.2873686 L11.6298948,14.2873686 L11.6298948,3.35060056 L9.46911861,3.35060056 Z M10.9178927,13.5989825 L5.25530041,13.5989825 L5.25530041,4.03901412 L10.9178927,4.03901412 L10.9178927,13.5989825 Z" id="形状" fill="#73DEB3"></path>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/icons/svg/icon-总电量.svg

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

src/icons/svg/icon-成功.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="1639567837666" class="icon" viewBox="0 0 1479 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2179" xmlns:xlink="http://www.w3.org/1999/xlink" width="288.8671875" height="200"><defs><style type="text/css"></style></defs><path d="M1401.287111 0L1479.111111 77.824 544.938667 1012.053333 0 467.114667l136.248889-136.248889 447.601778 291.896889L1401.287111 0z" p-id="2180" fill="#3E8EF7"></path></svg>

src/icons/svg/icon-新建.svg

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

src/icons/svg/icon-日历.svg

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

src/icons/svg/icon-氨气.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
+    <title>氨气</title>
+    <desc>Created with Sketch.</desc>
+    <g id="氨气" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-7" fill-rule="nonzero">
+            <rect id="矩形" fill="#000000" opacity="0" x="0.48" y="0.48" width="23.04" height="23.04"></rect>
+            <g id="编组-5" transform="translate(0.920000, 0.920000)" fill="#F78C3E" opacity="0.103932">
+                <path d="M11.08,0.08 C5.01103448,0.08 0.08,5.01103448 0.08,11.08 C0.08,17.1489655 5.01103448,22.08 11.08,22.08 C17.1489655,22.08 22.08,17.1489655 22.08,11.08 C22.08,5.01103448 17.1489655,0.08 11.08,0.08 Z" id="形状"></path>
+            </g>
+        </g>
+        <path d="M8.47864897,13.2624837 L8.47864897,8.27462828 L9.82447696,8.27462828 L9.82447696,15.5586831 L8.15335406,15.5586831 L6.35466452,10.4560177 L6.35466452,15.5586831 L5.00883654,15.5586831 L5.00883654,8.27462828 L6.6927161,8.27462828 L8.47864897,13.2624837 L8.47864897,13.2624837 Z M12.3375396,8.27462828 L12.3375396,11.0619592 L14.0533109,11.0619592 L14.0533109,8.27462828 L15.5203272,8.27462828 L15.5203272,15.5586831 L14.0533109,15.5586831 L14.0533109,12.3248689 L12.3375396,12.3248689 L12.3375396,15.5586831 L10.8705234,15.5586831 L10.8705234,8.27462828 L12.3375396,8.27462828 Z M17.1468017,14.8443099 C17.2231917,14.9919573 17.383765,15.0760671 17.5486366,15.0547949 C17.6414477,15.059803 17.7339169,15.0399882 17.8165266,14.9973899 C17.8805964,14.9613281 17.9335448,14.9083798 17.9696065,14.8443099 C18.0080986,14.770947 18.0319297,14.6907878 18.0397682,14.6083116 C18.0452758,14.5148438 18.0452758,14.4211328 18.0397682,14.327665 C18.0477582,14.2300271 18.0477582,14.1318997 18.0397682,14.0342618 C18.0270964,13.9490998 17.9989971,13.8669634 17.9568499,13.7918852 C17.9139897,13.7193845 17.8522673,13.6598666 17.7782566,13.6196702 C17.6830775,13.5733322 17.5778617,13.5514123 17.4720966,13.5558869 L17.1659367,13.5558869 L17.1659367,12.9563237 L17.4657183,12.9563237 C17.6299477,12.9591253 17.7831692,12.8740022 17.8675532,12.7330821 C17.9092916,12.6640348 17.9394553,12.5886254 17.9568499,12.5098405 C17.9666461,12.4208125 17.9666461,12.3309786 17.9568499,12.2419506 C17.9713278,12.0811721 17.9332812,11.9200337 17.8484182,11.7827107 C17.764924,11.6886038 17.6421748,11.639032 17.516745,11.6487657 C17.4349853,11.6450257 17.3536582,11.6626099 17.2807467,11.6997924 C17.2179579,11.7354128 17.1669626,11.7886253 17.1340451,11.8528724 C17.0994817,11.9250792 17.0778915,12.0028039 17.0702617,12.0824923 C17.0645331,12.1802095 17.0645331,12.2781784 17.0702617,12.3758955 L16.228322,12.3758955 C16.1989795,12.0098702 16.3211906,11.6478487 16.5663735,11.3744975 C16.8390373,11.1374533 17.1945595,11.0181814 17.555015,11.0428242 C17.8968552,11.0223443 18.2351536,11.1215785 18.5117647,11.3234708 C18.7566926,11.5473503 18.8842593,11.8726452 18.8561946,12.2036806 C18.8598804,12.4300282 18.7954342,12.6522563 18.671223,12.8415138 C18.5515295,13.0109051 18.370981,13.1274617 18.1673348,13.1668087 C18.4224681,13.184668 18.6565528,13.3154238 18.805168,13.5239953 C18.9358564,13.7386968 19.0002065,13.9872213 18.9901396,14.2383684 C18.9894581,14.3973997 18.9701924,14.5558064 18.9327346,14.7103649 C18.8942531,14.8726863 18.8177358,15.0235346 18.709493,15.1504698 C18.5845102,15.2924102 18.4269091,15.4018554 18.2502531,15.4693864 C18.0074026,15.5582526 17.7496802,15.5994016 17.4912316,15.5905747 C17.1278237,15.6172659 16.7703482,15.4872748 16.5089686,15.2333881 C16.276196,14.9486332 16.1599621,14.5862569 16.1836736,14.2192334 L17.0638834,14.2192334 C17.0468888,14.4311146 17.0751536,14.6441874 17.1468017,14.8443099 L17.1468017,14.8443099 Z" id="形状" fill="#F78C3E" fill-rule="nonzero"></path>
+        <rect id="矩形备份-2" stroke="#979797" fill="#D8D8D8" opacity="0" x="0.5" y="0.5" width="23" height="22.92"></rect>
+    </g>
+</svg>

src/icons/svg/icon-氮气.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
+    <title>氮气</title>
+    <desc>Created with Sketch.</desc>
+    <g id="氮气" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-7" fill-rule="nonzero">
+            <rect id="矩形" fill="#000000" opacity="0" x="0.48" y="0.48" width="23.04" height="23.04"></rect>
+            <g id="编组-5" transform="translate(0.920000, 0.920000)" fill="#F74D3E" opacity="0.103932">
+                <path d="M11.08,0.08 C5.01103448,0.08 0.08,5.01103448 0.08,11.08 C0.08,17.1489655 5.01103448,22.08 11.08,22.08 C17.1489655,22.08 22.08,17.1489655 22.08,11.08 C22.08,5.01103448 17.1489655,0.08 11.08,0.08 Z" id="形状"></path>
+            </g>
+        </g>
+        <path d="M11.1315545,7.41029124 L12.7765769,7.41029124 L12.7765769,16.3136828 L10.7339424,16.3136828 L8.53538163,10.0766309 L8.53538163,16.3136828 L6.89035919,16.3136828 L6.89035919,7.41029124 L8.94858632,7.41029124 L11.1315545,13.5070095 L11.1315545,7.41029124 Z M13.6253742,16.5897088 C13.6253742,16.3497576 13.6521255,16.1114278 13.7064388,15.8763406 C13.7566759,15.6561581 13.8357193,15.4435589 13.9415261,15.244037 C14.0533476,15.0362427 14.1864686,14.8406363 14.3387424,14.6603721 C14.512298,14.4538586 14.6991434,14.2588895 14.8980879,14.0767072 L15.3682624,13.6389585 C15.4797402,13.5425181 15.582795,13.4367514 15.6763078,13.3228067 C15.7484553,13.2336357 15.808443,13.1363582 15.8546498,13.0309743 C15.9003471,12.9307635 15.9304197,12.8241424 15.9438209,12.7148225 C15.9519273,12.5851192 15.9519273,12.4554158 15.9438209,12.3257125 C15.9865668,12.1524649 15.946538,11.9691889 15.8354529,11.8295391 C15.7243679,11.6898893 15.5547919,11.6096621 15.3763689,11.6123443 C15.1412866,11.5888427 14.9192968,11.7246872 14.8332363,11.9447091 C14.7845947,12.0580584 14.7544871,12.1784889 14.7440653,12.3013932 L14.7440653,12.7310354 L13.6253742,12.7310354 L13.6253742,12.5364804 C13.5955408,12.084481 13.75061,11.6397543 14.0550164,11.304299 C14.4310414,10.9864937 14.9183231,10.8318474 15.4087947,10.8746568 C15.8773033,10.8368024 16.3422378,10.9820944 16.7058278,11.2799796 C17.0016873,11.5907953 17.1544691,12.0109454 17.1273635,12.4392029 C17.1281724,12.6106323 17.1118788,12.7817149 17.0787248,12.9499097 C17.0464558,13.1070449 16.9947156,13.2595423 16.9247021,13.4038713 C16.8502985,13.5575683 16.7577673,13.7018081 16.6490826,13.8335135 C16.5214749,13.9836804 16.3833143,14.1245501 16.2356533,14.2550492 L15.5871368,14.854927 C15.4335539,14.988679 15.2973803,15.1411934 15.1818139,15.3088886 C15.0991397,15.427719 15.0361811,15.5591109 14.9953654,15.6979985 L17.1597894,15.6979985 L17.1597894,16.5897088 L13.6253742,16.5897088 L13.6253742,16.5897088 Z" id="形状" fill="#F74D3E" fill-rule="nonzero"></path>
+        <rect id="矩形备份-3" stroke="#979797" fill="#D8D8D8" opacity="0" x="0.5" y="0.5" width="23" height="22.92"></rect>
+    </g>
+</svg>

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

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

src/icons/svg/icon-甲醇.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
+    <title>甲醇</title>
+    <desc>Created with Sketch.</desc>
+    <g id="甲醇" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-7" fill-rule="nonzero">
+            <rect id="矩形" fill="#000000" opacity="0" x="0.48" y="0.48" width="23.04" height="23.04"></rect>
+            <g id="编组-5" transform="translate(0.920000, 0.920000)" fill="#403EF7" opacity="0.103932">
+                <path d="M11.08,0.08 C5.01103448,0.08 0.08,5.01103448 0.08,11.08 C0.08,17.1489655 5.01103448,22.08 11.08,22.08 C17.1489655,22.08 22.08,17.1489655 22.08,11.08 C22.08,5.01103448 17.1489655,0.08 11.08,0.08 Z" id="形状"></path>
+            </g>
+        </g>
+        <path d="M15.8788756,7.64322117 L8.09994157,7.64322117 C7.76411233,7.64322117 7.48266603,7.92465454 7.48266603,8.26049671 L7.48266603,10.1471005 L7.01407272,10.1471005 L7.01407272,10.7179209 L7.48266603,10.7179209 L7.48266603,13.7275278 L7.01407272,13.7275278 L7.01407272,14.2852217 L7.48266603,14.2852217 L7.48266603,17.2827245 C7.48266603,17.6185796 7.76411233,17.9 8.09994157,17.9 L15.8788756,17.9 C16.2237837,17.9 16.5052171,17.6185666 16.5052171,17.2827245 L16.5052171,14.3103776 L16.9859273,14.3103776 L16.9859273,13.7275278 L16.5052171,13.7275278 L16.5052171,10.7179209 L16.9859273,10.7179209 L16.9859273,10.1898278 L16.5052171,10.1898278 L16.5052171,8.26049671 C16.5052171,7.92462867 16.2237708,7.64322117 15.8788756,7.64322117 Z M7.48266603,10.7221735 L16.5052171,10.7221735 L16.5052171,11.2864268 L7.48266603,11.2864268 L7.48266603,10.7221735 Z M7.48266603,14.3064604 L16.5052171,14.3064604 L16.5052171,14.8707137 L7.48266603,14.8707137 L7.48266603,14.3064604 Z M8.65345779,6.1 L11.0043918,6.1 L11.0043918,7.08939456 L8.65345779,7.08939456 L8.65345779,6.1 Z" id="形状" fill="#403EF7" fill-rule="nonzero"></path>
+        <rect id="矩形备份-4" stroke="#979797" fill="#D8D8D8" opacity="0" x="0.5" y="0.5" width="23" height="22.92"></rect>
+    </g>
+</svg>

src/icons/svg/icon-电压.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
+    <title>电压</title>
+    <desc>Created with Sketch.</desc>
+    <g id="电压" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="编组-7" fill-rule="nonzero">
+            <rect id="矩形" fill="#000000" opacity="0" x="0.48" y="0.48" width="23.04" height="23.04"></rect>
+            <g id="编组-5" transform="translate(0.920000, 0.920000)" fill="#AD3EF7" opacity="0.103932">
+                <path d="M11.08,0.08 C5.01103448,0.08 0.08,5.01103448 0.08,11.08 C0.08,17.1489655 5.01103448,22.08 11.08,22.08 C17.1489655,22.08 22.08,17.1489655 22.08,11.08 C22.08,5.01103448 17.1489655,0.08 11.08,0.08 Z" id="形状"></path>
+            </g>
+        </g>
+        <path d="M13.8144243,17.0071735 L17.6684529,6.79683636 C17.7417306,6.60270457 17.6437589,6.38592638 17.4496271,6.31264873 C17.3921764,6.29096319 17.3302861,6.28368982 17.2693731,6.29146524 L17.1656733,6.3047023 C16.8422285,6.346038 16.5592242,6.54244031 16.4073797,6.83100291 C13.5269108,12.3049943 11.997501,15.2202924 11.8191502,15.5768973 C11.6358627,15.9433728 11.9086355,15.530083 12.6374685,14.3370278 L12.6374685,14.3370278 C9.96162253,9.69646748 8.35052735,7.0886171 7.80418295,6.5134767 C7.80418295,6.5134767 7.80418295,6.5134767 7.80418295,6.5134767 C7.51163552,6.20551007 7.0248227,6.19301034 6.71685607,6.48555776 C6.49255614,6.69862749 6.41775315,7.02535035 6.52704811,7.31477009 L10.1855757,17.0071735 C10.470523,17.762074 11.1931111,18.2616747 12,18.2616747 C12.8068889,18.2616747 13.529477,17.762074 13.8144243,17.0071735 Z" id="V" fill="#F73EE2" fill-rule="nonzero"></path>
+        <rect id="矩形" stroke="#979797" fill="#D8D8D8" opacity="0" x="0.5" y="0.5" width="23" height="22.92"></rect>
+    </g>
+</svg>

src/icons/svg/icon-维护开始.svg

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

src/icons/svg/icon-编辑.svg

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

src/icons/svg/icon-设置.svg

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

src/icons/svg/icon-详情.svg

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

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

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

src/icons/svg/icon-追加加工.svg

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

src/mock/index.js

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-15 08:20:28
  * @LastEditors: gtz
- * @LastEditTime: 2021-12-07 11:07:41
+ * @LastEditTime: 2021-12-09 10:08:24
  * @Description:
  */
 import Mock from 'mockjs'
@@ -18,14 +18,14 @@ import * as sysUser from './modules/sys-user'
 // tips
 // 1. 开启/关闭[业务模块]拦截, 通过调用fnCreate方法[isOpen参数]设置.
 // 2. 开启/关闭[业务模块中某个请求]拦截, 通过函数返回对象中的[isOpen属性]设置.
-fnCreate(common, true)
-fnCreate(jobSchedule, true)
-fnCreate(oss, true)
-fnCreate(sysConfig, true)
-fnCreate(sysLog, true)
-fnCreate(sysMenu, true)
-fnCreate(sysRole, true)
-fnCreate(sysUser, true)
+fnCreate(common, false)
+fnCreate(jobSchedule, false)
+fnCreate(oss, false)
+fnCreate(sysConfig, false)
+fnCreate(sysLog, false)
+fnCreate(sysMenu, false)
+fnCreate(sysRole, false)
+fnCreate(sysUser, false)
 
 /**
  * 创建mock模拟数据

src/router/index.js

@@ -1,3 +1,10 @@
+/*
+ * @Author: zwq
+ * @Date: 2021-11-15 08:20:28
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-11-23 09:42:21
+ * @Description:
+ */
 /**
  * 全站路由配置
  *
@@ -6,8 +13,6 @@
  */
 import Vue from 'vue'
 import Router from 'vue-router'
-import http from '@/utils/httpRequest'
-import { isURL } from '@/utils/validate'
 import { clearLoginInfo } from '@/utils'
 
 Vue.use(Router)
@@ -18,7 +23,8 @@ const _import = require('./import-' + process.env.NODE_ENV)
 // 全局路由(无需嵌套上左右整体布局)
 const globalRoutes = [
   { path: '/404', component: _import('common/404'), name: '404', meta: { title: '404未找到' } },
-  { path: '/login', component: _import('common/login'), name: 'login', meta: { title: '登录' } }
+  { path: '/login', component: _import('common/login'), name: 'login', meta: { title: '登录' } },
+  { path: '/board', component: _import('common/board'), name: 'board', meta: { title: '车间生产看板', isTab: false } }
 ]
 
 // 主入口路由(需嵌套上左右整体布局)
@@ -33,38 +39,49 @@ const mainRoutes = {
     // 1. isTab: 是否通过tab展示内容, true: 是, false: 否
     // 2. iframeUrl: 是否通过iframe嵌套展示内容, '以http[s]://开头': 是, '': 否
     // 提示: 如需要通过iframe嵌套展示内容, 但不通过tab打开, 请自行创建组件使用iframe处理!
-    { path: '/home', component: _import('common/home'), name: 'home', meta: { title: '首页' } },
-    { path: '/orderProcess', component: _import('common/order-process'), name: 'orderProcess', meta: { title: '订单加工' } },
-    { path: '/exWarehouse', component: _import('common/ex-warehouse'), name: 'exWarehouse', meta: { title: '货物出库' } },
-    { path: '/addProcess', component: _import('common/add-process'), name: 'addProcess', meta: { title: '追加加工' } },
-    { path: '/theme', component: _import('common/theme'), name: 'theme', meta: { title: '主题' } },
+    { path: '/home', component: _import('common/home'), name: 'home', meta: { title: '首页', isTab: true } },
+    { path: '/Problem', component: _import('common/Problem'), name: 'Problem', 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 } },
     { path: '/demo-echarts', component: _import('demo/echarts'), name: 'demo-echarts', meta: { title: 'demo-echarts', isTab: true } },
     { path: '/demo-ueditor', component: _import('demo/ueditor'), name: 'demo-ueditor', meta: { title: 'demo-ueditor', isTab: true } },
-    { path: '/basic-cache', component: _import('basic/cache'), name: 'basic-cache', meta: { title: '缓存区信息' } },
-    { path: '/basic-cache-location', component: _import('basic/components/location'), name: 'basic-cache-location', meta: { title: '库位信息' } },
-    { path: '/basic-equipmentInfo', component: _import('basic/equipmentInfo'), name: 'basic-equipmentInfo', meta: { title: '设备基础信息' } },
-    { path: '/basic-carInfo', component: _import('basic/carInfo'), name: 'basic-carInfo', meta: { title: '车辆信息' } },
-    { path: '/basic-alarmInfo', component: _import('basic/alarmInfo'), name: 'basic-alarmInfo', meta: { title: '报警基础信息' } },
-    { path: '/order-current-order', component: _import('order/current-order'), name: 'order-current-order', meta: { title: '当前订单列表' } },
-    { path: '/order-current-order-task', component: _import('order/components/current-order-task'), name: 'order-current-order-task', meta: { title: '当前订单任务详情' } },
-    { path: '/order-current-task', component: _import('order/current-task'), name: 'order-current-task', meta: { title: '当前执行任务' } },
-    { path: '/order-current-task-detail', component: _import('order/components/current-task-detail'), name: 'order-current-task-detail', meta: { title: '当前执行任务详情' } },
-    { path: '/report-kiln-alarm', component: _import('report/kiln-alarm'), name: 'report-kiln-alarm', meta: { title: '窑炉报警' } },
-    { path: '/report-car-alarm', component: _import('report/car-alarm'), name: 'report-car-alarm', meta: { title: '车辆运行报警' } },
-    { path: '/report-order-history', component: _import('report/order-history'), name: 'report-order-history', meta: { title: '订单历史列表' } },
-    { path: '/report-order-history-task', component: _import('report/components/order-history-task'), name: 'report-order-history-task', meta: { title: '订单历史任务详情' } },
-    { path: '/report-task-history', component: _import('report/task-history'), name: 'report-task-history', meta: { title: '执行任务历史列表' } },
-    { path: '/report-task-history-detail', component: _import('report/components/task-history-detail'), name: 'report-task-history-detail', meta: { title: '执行任务历史详情' } },
-    { path: '/energy-sulfur-dioxide', component: _import('energy/sulfur-dioxide'), name: 'energy-sulfur-dioxide', meta: { title: '二氧化硫流量分析' } },
-    { path: '/energy-electric', component: _import('energy/electric'), name: 'energy-electric', meta: { title: '用电能源分析' } },
-    { path: '/energy-kiln-electric', component: _import('energy/kiln-electric'), name: 'energy-kiln-electric', meta: { title: '窑炉用电分析' } },
-    { path: '/energy-ammonia', component: _import('energy/ammonia'), name: 'energy-ammonia', meta: { title: '氨气流量分析' } },
-    { path: '/energy-nitrogen', component: _import('energy/nitrogen'), name: 'energy-nitrogen', meta: { title: '氮气流量分析' } },
-    { path: '/energy-electric-acquisition', component: _import('energy/electric-acquisition'), name: 'energy-electric-acquisition', meta: { title: '电能采集数据' } },
-    { path: '/energy-process-temperature', component: _import('energy/process-temperature'), name: 'energy-process-temperature', meta: { title: '窑炉加工温度' } },
-    { path: '/energy-sump-temperature', component: _import('energy/sump-temperature'), name: 'energy-sump-temperature', meta: { title: '油槽温度' } },
-    { path: '/energy-ammonia-analysis', component: _import('energy/ammonia-analysis'), name: 'energy-ammonia-analysis', meta: { title: '使用氮气分析' } },
-    { path: '/energy-kiln-speed', component: _import('energy/kiln-speed'), name: 'energy-kiln-speed', meta: { title: '窑炉速度参数' } }
+    { path: '/basic-cache', component: _import('basic/cache'), name: 'basic-cache', meta: { title: '缓存区信息', isTab: true } },
+    { path: '/basic-processInfo', component: _import('basic/processInfo'), name: 'basic-processInfo', meta: { title: '工艺信息', isTab: true } },
+    { path: '/basic-cache-location', component: _import('basic/components/location'), name: 'basic-cache-location', meta: { title: '库位信息', isTab: true } },
+    { path: '/basic-equipmentInfo', component: _import('basic/equipmentInfo'), name: 'basic-equipmentInfo', meta: { title: '设备基础信息', isTab: true } },
+    { path: '/basic-carInfo', component: _import('basic/carInfo'), name: 'basic-carInfo', meta: { title: '车辆信息', isTab: true } },
+    { path: '/basic-alarmInfo', component: _import('basic/alarmInfo'), name: 'basic-alarmInfo', meta: { title: '报警基础信息', isTab: true } },
+    { path: '/order-current-order', component: _import('order/current-order'), name: 'order-current-order', meta: { title: '当前订单列表', isTab: true } },
+    { path: '/order-current-order-task', component: _import('order/components/current-order-task'), name: 'order-current-order-task', meta: { title: '当前订单任务详情', isTab: true } },
+    { path: '/order-current-task', component: _import('order/current-task'), name: 'order-current-task', meta: { title: '当前任务列表', isTab: true } },
+    { path: '/order-current-task-new', component: _import('order/current-task-new'), name: 'order-current-task-new', meta: { title: '任务列表', isTab: true } },
+    { path: '/order-current-task-detail', component: _import('order/components/current-task-detail'), name: 'order-current-task-detail', meta: { title: '当前执行任务详情', isTab: true } },
+    { path: '/report-kiln-alarm', component: _import('report/kiln-alarm'), name: 'report-kiln-alarm', meta: { title: '工业炉报警', isTab: true } },
+    { path: '/report-car-alarm', component: _import('report/car-alarm'), name: 'report-car-alarm', meta: { title: '车辆运行报警', isTab: true } },
+    { path: '/report-order-history', component: _import('report/order-history'), name: 'report-order-history', meta: { title: '订单历史列表', isTab: true } },
+    { path: '/report-APMS-table', component: _import('report/APMS-table'), name: 'report-APMS-table', meta: { title: 'APMS报工', isTab: true } },
+    { path: '/report-APMS-work', component: _import('report/APMS-work'), name: 'report-APMS-work', meta: { title: 'APMS未出单报工', isTab: true } },
+    { 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: '/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')
@@ -79,108 +96,6 @@ const mainRoutes = {
 const router = new Router({
   mode: 'hash',
   scrollBehavior: () => ({ y: 0 }),
-  isAddDynamicMenuRoutes: false, // 是否已经添加动态(菜单)路由
   routes: globalRoutes.concat(mainRoutes)
 })
-
-router.beforeEach((to, from, next) => {
-  // 添加动态(菜单)路由
-  // 1. 已经添加 or 全局路由, 直接访问
-  // 2. 获取菜单列表, 添加并保存本地存储
-  if (router.options.isAddDynamicMenuRoutes || fnCurrentRouteType(to, globalRoutes) === 'global') {
-    next()
-  } else {
-    http({
-      url: http.adornUrl('/sys/menu/nav'),
-      method: 'get',
-      params: http.adornParams()
-    }).then(({data}) => {
-      if (data && data.code === 0) {
-        fnAddDynamicMenuRoutes(data.menuList)
-        router.options.isAddDynamicMenuRoutes = true
-        sessionStorage.setItem('menuList', JSON.stringify(data.menuList || '[]'))
-        sessionStorage.setItem('permissions', JSON.stringify(data.permissions || '[]'))
-        next({ ...to, replace: true })
-      } else {
-        sessionStorage.setItem('menuList', '[]')
-        sessionStorage.setItem('permissions', '[]')
-        next()
-      }
-    }).catch((e) => {
-      console.log(`%c${e} 请求菜单列表和权限失败，跳转至登录页！！`, 'color:blue')
-      router.push({ name: 'login' })
-    })
-  }
-})
-
-/**
- * 判断当前路由类型, global: 全局路由, main: 主入口路由
- * @param {*} route 当前路由
- */
-function fnCurrentRouteType (route, globalRoutes = []) {
-  var temp = []
-  for (var i = 0; i < globalRoutes.length; i++) {
-    if (route.path === globalRoutes[i].path) {
-      return 'global'
-    } else if (globalRoutes[i].children && globalRoutes[i].children.length >= 1) {
-      temp = temp.concat(globalRoutes[i].children)
-    }
-  }
-  return temp.length >= 1 ? fnCurrentRouteType(route, temp) : 'main'
-}
-
-/**
- * 添加动态(菜单)路由
- * @param {*} menuList 菜单列表
- * @param {*} routes 递归创建的动态(菜单)路由
- */
-function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
-  var temp = []
-  for (var i = 0; i < menuList.length; i++) {
-    if (menuList[i].list && menuList[i].list.length >= 1) {
-      temp = temp.concat(menuList[i].list)
-    } else if (menuList[i].url && /\S/.test(menuList[i].url)) {
-      menuList[i].url = menuList[i].url.replace(/^\//, '')
-      var route = {
-        path: menuList[i].url.replace('/', '-'),
-        component: null,
-        name: menuList[i].url.replace('/', '-'),
-        meta: {
-          menuId: menuList[i].menuId,
-          title: menuList[i].name,
-          isDynamic: true,
-          isTab: true,
-          iframeUrl: ''
-        }
-      }
-      // url以http[s]://开头, 通过iframe展示
-      if (isURL(menuList[i].url)) {
-        route['path'] = `i-${menuList[i].menuId}`
-        route['name'] = `i-${menuList[i].menuId}`
-        route['meta']['iframeUrl'] = menuList[i].url
-      } else {
-        try {
-          route['component'] = _import(`modules/${menuList[i].url}`) || null
-        } catch (e) {}
-      }
-      routes.push(route)
-    }
-  }
-  if (temp.length >= 1) {
-    fnAddDynamicMenuRoutes(temp, routes)
-  } else {
-    mainRoutes.name = 'main-dynamic'
-    mainRoutes.children = routes
-    router.addRoutes([
-      mainRoutes,
-      { path: '*', redirect: { name: '404' } }
-    ])
-    sessionStorage.setItem('dynamicMenuRoutes', JSON.stringify(mainRoutes.children || '[]'))
-    console.log('\n')
-    console.log('%c!<-------------------- 动态(菜单)路由 s -------------------->', 'color:blue')
-    console.log(mainRoutes.children)
-    console.log('%c!<-------------------- 动态(菜单)路由 e -------------------->', 'color:blue')
-  }
-}
-
 export default router

src/utils/validate.js

@@ -1,3 +1,10 @@
+/*
+ * @Author: zwq
+ * @Date: 2021-11-15 08:20:28
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-11-30 15:44:44
+ * @Description:
+ */
 /**
  * 邮箱
  * @param {*} s
@@ -29,3 +36,11 @@ export function isPhone (s) {
 export function isURL (s) {
   return /^http[s]?:\/\/.*/.test(s)
 }
+
+/**
+ * 配炉号
+ * @param {*} s
+ */
+export function isStoveCode (s) {
+  return /^[A-Z]{3}\d{1}\W{1}\d{2}\W{1}\d{10}$/.test(s)
+}

src/views/basic/alarmInfo.vue

@@ -1,25 +1,33 @@
 <template>
   <div class="mod-config">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+    <el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form-item>
-        <el-select v-model="dataForm.paramKey" filterable placeholder="报警编码">
+        <!-- <el-select size="small" v-model="dataForm.paramKey" clearable filterable placeholder="报警编码">
           <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
+            v-for="item in dataList"
+            :key="item.id"
+            :label="item.code"
+            :value="item.code"
           >
           </el-option>
-        </el-select>
+        </el-select> -->
+        <el-input size="small" v-model="dataForm.paramKey" placeholder="报警编码" />
       </el-form-item>
       <el-form-item>
-        <el-button @click="getDataList()">查询</el-button>
-        <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
+        <el-button size="small" @click="getDataList()">
+          <icon-svg class="iconClass" name="sousuo"></icon-svg>
+          查询
+        </el-button>
+        <el-button size="small" type="primary" @click="addOrUpdateHandle()">
+          <icon-svg class="iconClass" name="新建"></icon-svg>
+          新增
+        </el-button>
       </el-form-item>
     </el-form>
     <el-table
       :data="dataList"
-      border
+      :stripe="true"
+      :header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
       v-loading="dataListLoading"
       style="width: 100%;">
       <el-table-column
@@ -29,28 +37,22 @@
         label="序号"
         width="50">
       </el-table-column>
-      <el-table-column
-        prop="paramKey"
+      <!-- <el-table-column
+        prop="createTime"
         header-align="center"
         align="center"
         label="添加时间">
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
-        prop="paramValue"
-        header-align="center"
-        align="center"
+        prop="alarmClass"
         label="报警类型">
       </el-table-column>
       <el-table-column
-        prop="remark"
-        header-align="center"
-        align="center"
+        prop="code"
         label="报警编码">
       </el-table-column>
       <el-table-column
-        prop="remark"
-        header-align="center"
-        align="center"
+        prop="alarmInfo"
         label="报警内容">
       </el-table-column>
       <el-table-column
@@ -60,8 +62,16 @@
         width="150"
         label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-          <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">
+            <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.row.id)">
+            <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>
@@ -88,7 +98,6 @@
           paramKey: ''
         },
         dataList: [],
-        options: [],
         pageIndex: 1,
         pageSize: 10,
         totalPage: 0,
@@ -107,17 +116,17 @@
       getDataList () {
         this.dataListLoading = true
         this.$http({
-          url: this.$http.adornUrl('/sys/config/list'),
-          method: 'get',
-          params: this.$http.adornParams({
-            'page': this.pageIndex,
-            'limit': this.pageSize,
-            'paramKey': this.dataForm.paramKey
+          url: this.$http.adornUrl('/alarmBase/page'),
+          method: 'post',
+          data: this.$http.adornData({
+            'current': this.pageIndex,
+            'size': this.pageSize,
+            'alarmClass': this.dataForm.paramKey
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.data.records
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0
@@ -151,9 +160,9 @@
           type: 'warning'
         }).then(() => {
           this.$http({
-            url: this.$http.adornUrl('/sys/config/delete'),
+            url: this.$http.adornUrl('/alarmBase/delete'),
             method: 'post',
-            data: this.$http.adornData(id, false)
+            data: this.$http.adornData({id})
           }).then(({data}) => {
             if (data && data.code === 0) {
               this.$message({

src/views/basic/cache.vue

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

src/views/basic/carInfo.vue

@@ -1,25 +1,39 @@
 <template>
   <div class="mod-config">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+    <el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form-item>
-        <el-select v-model="dataForm.paramKey" filterable placeholder="名称">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
+        <el-button size="small" type="primary" style="float:left" @click="open()">
+          <icon-svg class="iconClass" name="system"></icon-svg>
+          重置
+        </el-button>
       </el-form-item>
       <el-form-item>
-        <el-button @click="getDataList()">查询</el-button>
-        <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
+        <!-- <el-select size="small" v-model="dataForm.paramKey" filterable placeholder="名称">
+          <el-option
+            v-for="item in dataList"
+            :key="item.id"
+            :label="item.vehicleName"
+            :value="item.vehicleName"
+          >
+          </el-option>
+        </el-select> -->
+        <el-input size="small" v-model="dataForm.paramKey" placeholder="名称" />
+      </el-form-item>
+      <el-form-item>
+        <el-button size="small" @click="getDataList()">
+          <icon-svg class="iconClass" name="sousuo"></icon-svg>
+          查询
+        </el-button>
+        <el-button size="small" type="primary" @click="addOrUpdateHandle()">
+          <icon-svg class="iconClass" name="新建"></icon-svg>
+          新增
+        </el-button>
       </el-form-item>
     </el-form>
     <el-table
       :data="dataList"
-      border
+      :stripe="true"
+      :header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
       v-loading="dataListLoading"
       style="width: 100%;">
       <el-table-column
@@ -29,30 +43,44 @@
         label="序号"
         width="50">
       </el-table-column>
-      <el-table-column
-        prop="paramKey"
+      <!-- <el-table-column
+        prop="createTime"
         header-align="center"
         align="center"
         label="添加时间">
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
-        prop="paramValue"
-        header-align="center"
-        align="center"
+        prop="vehicleName"
         label="车辆名称">
       </el-table-column>
       <el-table-column
-        prop="remark"
-        header-align="center"
-        align="center"
+        prop="code"
         label="编码">
       </el-table-column>
       <el-table-column
-        prop="suoxie"
-        header-align="center"
-        align="center"
+        prop="status"
+        label="状态"
+      >
+        <template slot-scope="scope">
+          <span>{{
+            scope.row.status === 0
+              ? "空闲"
+              : "占用"
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="vehicleAlias"
         label="缩写">
       </el-table-column>
+      <el-table-column
+        prop="ip"
+        label="ip">
+      </el-table-column>
+      <el-table-column
+        prop="note"
+        label="备注">
+      </el-table-column>
       <el-table-column
         fixed="right"
         header-align="center"
@@ -60,8 +88,16 @@
         width="150"
         label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-          <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">
+            <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.row.id)">
+            <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>
@@ -88,7 +124,6 @@
           paramKey: ''
         },
         dataList: [],
-        options: [],
         pageIndex: 1,
         pageSize: 10,
         totalPage: 0,
@@ -103,21 +138,49 @@
       this.getDataList()
     },
     methods: {
+      open () {
+        this.$confirm('执行此操作前请确定当前没有任务在使用车辆！是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$http({
+            url: this.$http.adornUrl('/vehicle/resetStatus'),
+            method: 'post'
+          }).then(({data}) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.getDataList()
+                }
+              })
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消操作'
+          })
+        })
+      },
       // 获取数据列表
       getDataList () {
         this.dataListLoading = true
         this.$http({
-          url: this.$http.adornUrl('/sys/config/list'),
-          method: 'get',
-          params: this.$http.adornParams({
-            'page': this.pageIndex,
-            'limit': this.pageSize,
-            'paramKey': this.dataForm.paramKey
+          url: this.$http.adornUrl('/vehicle/page'),
+          method: 'post',
+          data: this.$http.adornData({
+            'current': this.pageIndex,
+            'size': this.pageSize,
+            'vehicleName': this.dataForm.paramKey
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.data.records
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0
@@ -151,9 +214,9 @@
           type: 'warning'
         }).then(() => {
           this.$http({
-            url: this.$http.adornUrl('/sys/config/delete'),
+            url: this.$http.adornUrl('/vehicle/delete'),
             method: 'post',
-            data: this.$http.adornData(id, false)
+            data: this.$http.adornData({id})
           }).then(({data}) => {
             if (data && data.code === 0) {
               this.$message({

src/views/basic/components/alarmInfo-add.vue

@@ -1,17 +1,24 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-13 17:01:47
+ * @Description:
+-->
 <template>
   <el-dialog
     :title="!dataForm.id ? '新增' : '修改'"
     :close-on-click-modal="false"
     :visible.sync="visible">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
-      <el-form-item label="参数名" prop="paramKey">
-        <el-input v-model="dataForm.paramKey" placeholder="参数名"></el-input>
+    <el-form :model="dataForm" :rules="dataRule" v-loading="formLoading" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+      <el-form-item label="报警编码" prop="code">
+        <el-input v-model="dataForm.code" placeholder="报警编码"></el-input>
       </el-form-item>
-      <el-form-item label="参数值" prop="paramValue">
-        <el-input v-model="dataForm.paramValue" placeholder="参数值"></el-input>
+      <el-form-item label="报警类型" prop="alarmClass">
+        <el-input v-model="dataForm.alarmClass" placeholder="报警类型"></el-input>
       </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+      <el-form-item label="报警内容" prop="alarmInfo">
+        <el-input v-model="dataForm.alarmInfo" placeholder="报警内容"></el-input>
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -27,38 +34,54 @@
       return {
         visible: false,
         dataForm: {
-          id: 0,
-          paramKey: '',
-          paramValue: '',
-          remark: ''
+          id: '',
+          code: '',
+          alarmClass: '',
+          alarmInfo: ''
         },
         dataRule: {
-          paramKey: [
-            { required: true, message: '参数名不能为空', trigger: 'blur' }
+          code: [
+            { required: true, message: '报警编码不能为空', trigger: 'blur' }
           ],
-          paramValue: [
-            { required: true, message: '参数值不能为空', trigger: 'blur' }
+          alarmInfo: [
+            { required: true, message: '报警内容不能为空', trigger: 'blur' }
           ]
-        }
+        },
+        formLoading: false
       }
     },
     methods: {
       init (id) {
-        this.dataForm.id = id || 0
+        this.dataForm.id = id || ''
         this.visible = true
         this.$nextTick(() => {
           this.$refs['dataForm'].resetFields()
+          this.formLoading = true
           if (this.dataForm.id) {
             this.$http({
-              url: this.$http.adornUrl(`/sys/config/info/${this.dataForm.id}`),
-              method: 'get',
-              params: this.$http.adornParams()
+              url: this.$http.adornUrl(`/alarmBase/get`),
+              method: 'post',
+              data: this.$http.adornData({id})
             }).then(({data}) => {
               if (data && data.code === 0) {
-                this.dataForm.paramKey = data.config.paramKey
-                this.dataForm.paramValue = data.config.paramValue
-                this.dataForm.remark = data.config.remark
+                this.dataForm = data.data
+              } else {
+                this.$message.error(data.msg)
               }
+              this.formLoading = false
+            })
+          } else {
+            this.$http({
+              url: this.$http.adornUrl(`/alarmBase/codeGenerator`),
+              method: 'post',
+              data: this.$http.adornData()
+            }).then(({data}) => {
+              if (data && data.code === 0) {
+                this.dataForm.code = data.data
+              } else {
+                this.$message.error('编码生成失败')
+              }
+              this.formLoading = false
             })
           }
         })
@@ -68,13 +91,13 @@
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
             this.$http({
-              url: this.$http.adornUrl(`/sys/config/${!this.dataForm.id ? 'save' : 'update'}`),
+              url: this.$http.adornUrl(`/alarmBase/${!this.dataForm.id ? 'add' : 'update'}`),
               method: 'post',
               data: this.$http.adornData({
                 'id': this.dataForm.id || undefined,
-                'paramKey': this.dataForm.paramKey,
-                'paramValue': this.dataForm.paramValue,
-                'remark': this.dataForm.remark
+                'code': this.dataForm.code,
+                'alarmClass': this.dataForm.alarmClass,
+                'alarmInfo': this.dataForm.alarmInfo
               })
             }).then(({data}) => {
               if (data && data.code === 0) {

src/views/basic/components/cache-add.vue

@@ -1,17 +1,66 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-13 16:38:53
+ * @Description:
+-->
 <template>
   <el-dialog
     :title="!dataForm.id ? '新增' : '修改'"
     :close-on-click-modal="false"
-    :visible.sync="visible">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
-      <el-form-item label="参数名" prop="paramKey">
-        <el-input v-model="dataForm.paramKey" placeholder="参数名"></el-input>
+    :visible.sync="visible"
+  >
+    <el-form
+      :model="dataForm"
+      :rules="dataRule"
+      ref="dataForm"
+      v-loading="formLoading"
+      @keyup.enter.native="dataFormSubmit()"
+      label-width="100px"
+    >
+      <el-form-item label="缓存区编码" prop="code">
+        <el-input v-model="dataForm.code" placeholder="缓存区编码"></el-input>
       </el-form-item>
-      <el-form-item label="参数值" prop="paramValue">
-        <el-input v-model="dataForm.paramValue" placeholder="参数值"></el-input>
+      <el-form-item label="缓存区名称" prop="warehouseName">
+        <el-input
+          v-model="dataForm.warehouseName"
+          placeholder="缓存区名称"
+        ></el-input>
       </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+      <el-form-item label="英文名称" prop="englishName">
+        <el-input
+          v-model="dataForm.englishName"
+          placeholder="英文名称"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="缩写" prop="aliasName">
+        <el-input v-model="dataForm.aliasName" placeholder="缩写"></el-input>
+      </el-form-item>
+      <el-form-item label="规格描述" prop="spec">
+        <el-input
+          v-model="dataForm.spec"
+          placeholder="规格描述"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="库位数量" prop="number">
+        <el-input
+          v-model="dataForm.number"
+          placeholder="库位数量"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="当前状态" prop="alarmInfo"
+        ><el-switch
+          v-model="dataForm.alarmInfo"
+          active-color="#13ce66"
+          inactive-color="#ff4949"
+          active-value="1"
+          inactive-value="0"
+        >
+        </el-switch>
+      </el-form-item>
+      <el-form-item label="备注" prop="description">
+        <el-input v-model="dataForm.description" placeholder="备注"></el-input>
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -22,78 +71,102 @@
 </template>
 
 <script>
-  export default {
-    data () {
-      return {
-        visible: false,
-        dataForm: {
-          id: 0,
-          paramKey: '',
-          paramValue: '',
-          remark: ''
-        },
-        dataRule: {
-          paramKey: [
-            { required: true, message: '参数名不能为空', trigger: 'blur' }
-          ],
-          paramValue: [
-            { required: true, message: '参数值不能为空', trigger: 'blur' }
-          ]
-        }
-      }
-    },
-    methods: {
-      init (id) {
-        this.dataForm.id = id || 0
-        this.visible = true
-        this.$nextTick(() => {
-          this.$refs['dataForm'].resetFields()
-          if (this.dataForm.id) {
-            this.$http({
-              url: this.$http.adornUrl(`/sys/config/info/${this.dataForm.id}`),
-              method: 'get',
-              params: this.$http.adornParams()
-            }).then(({data}) => {
-              if (data && data.code === 0) {
-                this.dataForm.paramKey = data.config.paramKey
-                this.dataForm.paramValue = data.config.paramValue
-                this.dataForm.remark = data.config.remark
-              }
-            })
-          }
-        })
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        code: '',
+        description: '',
+        spec: '',
+        number: null,
+        englishName: '',
+        aliasName: '',
+        warehouseName: ''
       },
-      // 表单提交
-      dataFormSubmit () {
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            this.$http({
-              url: this.$http.adornUrl(`/sys/config/${!this.dataForm.id ? 'save' : 'update'}`),
-              method: 'post',
-              data: this.$http.adornData({
-                'id': this.dataForm.id || undefined,
-                'paramKey': this.dataForm.paramKey,
-                'paramValue': this.dataForm.paramValue,
-                'remark': this.dataForm.remark
-              })
-            }).then(({data}) => {
-              if (data && data.code === 0) {
-                this.$message({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {
-                    this.visible = false
-                    this.$emit('refreshDataList')
-                  }
-                })
-              } else {
-                this.$message.error(data.msg)
-              }
+      dataRule: {
+        code: [
+          { required: true, message: '编码不能为空', trigger: 'blur' }
+        ],
+        warehouseName: [
+          { required: true, message: '缓存区名称不能为空', trigger: 'blur' }
+        ]
+      },
+      formLoading: false
+    }
+  },
+  methods: {
+    init (id) {
+      this.dataForm.id = id || ''
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        this.formLoading = true
+        if (this.dataForm.id) {
+          this.$http({
+            url: this.$http.adornUrl(`/warehouse/get`),
+            method: 'post',
+            data: this.$http.adornData({ id })
+          }).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.dataForm = data.data
+            } else {
+              this.$message.error(data.msg)
+            }
+            this.formLoading = false
+          })
+        } else {
+          this.formLoading = true
+          this.$http({
+            url: this.$http.adornUrl(`/warehouse/codeGenerator`),
+            method: 'post',
+            data: this.$http.adornData()
+          }).then(({data}) => {
+            if (data && data.code === 0) {
+              this.dataForm.code = data.data
+            } else {
+              this.$message.error('编码生成失败')
+            }
+            this.formLoading = false
+          })
+        }
+      })
+    },
+    // 表单提交
+    dataFormSubmit () {
+      this.$refs['dataForm'].validate(valid => {
+        if (valid) {
+          this.$http({
+            url: this.$http.adornUrl(
+              `/warehouse/${!this.dataForm.id ? 'add' : 'update'}`
+            ),
+            method: 'post',
+            data: this.$http.adornData({
+              id: this.dataForm.id || undefined,
+              code: this.dataForm.code,
+              description: this.dataForm.description,
+              warehouseName: this.dataForm.warehouseName,
+              spec: this.dataForm.spec
             })
-          }
-        })
-      }
+          }).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.visible = false
+                  this.$emit('refreshDataList')
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }
+      })
     }
   }
+}
 </script>

src/views/basic/components/carInfo-add.vue

@@ -1,17 +1,30 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-13 16:56:03
+ * @Description:
+-->
 <template>
   <el-dialog
     :title="!dataForm.id ? '新增' : '修改'"
     :close-on-click-modal="false"
     :visible.sync="visible">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
-      <el-form-item label="参数名" prop="paramKey">
-        <el-input v-model="dataForm.paramKey" placeholder="参数名"></el-input>
+    <el-form :model="dataForm" ref="dataForm" v-loading="formLoading" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+      <el-form-item label="车辆编码" prop="code">
+        <el-input v-model="dataForm.code" placeholder="车辆编码"></el-input>
       </el-form-item>
-      <el-form-item label="参数值" prop="paramValue">
-        <el-input v-model="dataForm.paramValue" placeholder="参数值"></el-input>
+      <el-form-item label="车辆名称" prop="vehicleName">
+        <el-input v-model="dataForm.vehicleName" placeholder="车辆名称"></el-input>
       </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+      <el-form-item label="缩写" prop="vehicleAlias">
+        <el-input v-model="dataForm.vehicleAlias" placeholder="缩写"></el-input>
+      </el-form-item>
+      <el-form-item label="IP地址" prop="ip">
+        <el-input v-model="dataForm.ip" placeholder="IP地址"></el-input>
+      </el-form-item>
+      <el-form-item label="备注" prop="note">
+        <el-input v-model="dataForm.note" placeholder="备注"></el-input>
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -27,38 +40,48 @@
       return {
         visible: false,
         dataForm: {
-          id: 0,
-          paramKey: '',
-          paramValue: '',
-          remark: ''
+          id: '',
+          code: '',
+          ip: '',
+          vehicleName: '',
+          vehicleAlias: '',
+          note: ''
         },
-        dataRule: {
-          paramKey: [
-            { required: true, message: '参数名不能为空', trigger: 'blur' }
-          ],
-          paramValue: [
-            { required: true, message: '参数值不能为空', trigger: 'blur' }
-          ]
-        }
+        formLoading: false
       }
     },
     methods: {
       init (id) {
-        this.dataForm.id = id || 0
+        this.dataForm.id = id || ''
         this.visible = true
         this.$nextTick(() => {
           this.$refs['dataForm'].resetFields()
+          this.formLoading = true
           if (this.dataForm.id) {
             this.$http({
-              url: this.$http.adornUrl(`/sys/config/info/${this.dataForm.id}`),
-              method: 'get',
-              params: this.$http.adornParams()
+              url: this.$http.adornUrl(`/vehicle/get`),
+              method: 'post',
+              data: this.$http.adornData({id})
             }).then(({data}) => {
               if (data && data.code === 0) {
-                this.dataForm.paramKey = data.config.paramKey
-                this.dataForm.paramValue = data.config.paramValue
-                this.dataForm.remark = data.config.remark
+                this.dataForm = data.data
+              } else {
+                this.$message.error(data.msg)
               }
+              this.formLoading = false
+            })
+          } else {
+            this.$http({
+              url: this.$http.adornUrl(`/vehicle/codeGenerator`),
+              method: 'post',
+              data: this.$http.adornData()
+            }).then(({data}) => {
+              if (data && data.code === 0) {
+                this.dataForm.code = data.data
+              } else {
+                this.$message.error('编码生成失败')
+              }
+              this.formLoading = false
             })
           }
         })
@@ -68,13 +91,15 @@
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
             this.$http({
-              url: this.$http.adornUrl(`/sys/config/${!this.dataForm.id ? 'save' : 'update'}`),
+              url: this.$http.adornUrl(`/vehicle/${!this.dataForm.id ? 'add' : 'update'}`),
               method: 'post',
               data: this.$http.adornData({
                 'id': this.dataForm.id || undefined,
-                'paramKey': this.dataForm.paramKey,
-                'paramValue': this.dataForm.paramValue,
-                'remark': this.dataForm.remark
+                'code': this.dataForm.code,
+                'vehicleName': this.dataForm.vehicleName,
+                'ip': this.dataForm.ip,
+                'vehicleAlias': this.dataForm.vehicleAlias,
+                'note': this.dataForm.note
               })
             }).then(({data}) => {
               if (data && data.code === 0) {

src/views/basic/components/equipmentInfo-add.vue

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

src/views/basic/components/location-add.vue

@@ -1,18 +1,35 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-13 17:03:41
+ * @Description:
+-->
 <template>
   <el-dialog
     :title="!dataForm.id ? '新增' : '修改'"
     :close-on-click-modal="false"
     :visible.sync="visible">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
-      <el-form-item label="参数名" prop="paramKey">
-        <el-input v-model="dataForm.paramKey" placeholder="参数名"></el-input>
+    <el-form :model="dataForm" :rules="dataRule" v-loading="formLoading" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
+      <el-form-item label="库位名称" prop="locationName">
+        <el-input v-model="dataForm.locationName" placeholder="库位名称"></el-input>
       </el-form-item>
-      <el-form-item label="参数值" prop="paramValue">
-        <el-input v-model="dataForm.paramValue" placeholder="参数值"></el-input>
+      <el-form-item label="库位编码" prop="code">
+        <el-input v-model="dataForm.code" placeholder="库位编码"></el-input>
       </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+      <el-form-item label="当前状态" prop="status">
+        <el-radio-group v-model="dataForm.status">
+          <el-radio :label="0">空闲</el-radio>
+          <el-radio :label="1">使用</el-radio>
+          <el-radio :label="2">不可用</el-radio>
+        </el-radio-group>
       </el-form-item>
+      <el-form-item label="库位别名" prop="locationNameAlias">
+        <el-input v-model="dataForm.locationNameAlias" placeholder="库位别名"></el-input>
+      </el-form-item>
+      <!-- <el-form-item label="英文名称" prop="englishName">
+        <el-input v-model="dataForm.englishName" placeholder="英文名称"></el-input>
+      </el-form-item> -->
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取消</el-button>
@@ -27,38 +44,55 @@
       return {
         visible: false,
         dataForm: {
-          id: 0,
-          paramKey: '',
-          paramValue: '',
-          remark: ''
+          id: '',
+          code: '',
+          status: 0,
+          locationName: '',
+          locationNameAlias: '',
+          englishName: '',
+          warehouseId: ''
         },
         dataRule: {
-          paramKey: [
-            { required: true, message: '参数名不能为空', trigger: 'blur' }
-          ],
-          paramValue: [
-            { required: true, message: '参数值不能为空', trigger: 'blur' }
+          code: [
+            { required: true, message: '编码不能为空', trigger: 'blur' }
           ]
-        }
+        },
+        formLoading: false
       }
     },
     methods: {
-      init (id) {
-        this.dataForm.id = id || 0
+      init (id, warehouseId) {
+        this.dataForm.id = id || ''
+        this.dataForm.warehouseId = warehouseId
         this.visible = true
         this.$nextTick(() => {
           this.$refs['dataForm'].resetFields()
+          this.formLoading = true
           if (this.dataForm.id) {
             this.$http({
-              url: this.$http.adornUrl(`/sys/config/info/${this.dataForm.id}`),
-              method: 'get',
-              params: this.$http.adornParams()
+              url: this.$http.adornUrl(`/locationInfo/get`),
+              method: 'post',
+              data: this.$http.adornData({id})
             }).then(({data}) => {
               if (data && data.code === 0) {
-                this.dataForm.paramKey = data.config.paramKey
-                this.dataForm.paramValue = data.config.paramValue
-                this.dataForm.remark = data.config.remark
+                this.dataForm = data.data
+              } else {
+                this.$message.error(data.msg)
               }
+              this.formLoading = false
+            })
+          } else {
+            this.$http({
+              url: this.$http.adornUrl(`/locationInfo/codeGenerator`),
+              method: 'post',
+              data: this.$http.adornData()
+            }).then(({data}) => {
+              if (data && data.code === 0) {
+                this.dataForm.code = data.data
+              } else {
+                this.$message.error('编码生成失败')
+              }
+              this.formLoading = false
             })
           }
         })
@@ -68,13 +102,15 @@
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
             this.$http({
-              url: this.$http.adornUrl(`/sys/config/${!this.dataForm.id ? 'save' : 'update'}`),
+              url: this.$http.adornUrl(`/locationInfo/${!this.dataForm.id ? 'add' : 'update'}`),
               method: 'post',
               data: this.$http.adornData({
                 'id': this.dataForm.id || undefined,
-                'paramKey': this.dataForm.paramKey,
-                'paramValue': this.dataForm.paramValue,
-                'remark': this.dataForm.remark
+                'code': this.dataForm.code,
+                'locationName': this.dataForm.locationName,
+                'warehouseId': this.dataForm.warehouseId,
+                'locationNameAlias': this.dataForm.locationNameAlias,
+                'status': this.dataForm.status
               })
             }).then(({data}) => {
               if (data && data.code === 0) {

src/views/basic/components/location.vue

@@ -1,14 +1,15 @@
 <template>
   <div class="mod-config">
-    <el-form :inline="true">
+    <el-form style="display: flex; align-items: center; justify-content: right;" :inline="true">
       <el-form-item>
-        <el-button type="success" @click="$router.push({ name: 'basic-cache' })">返回缓存区</el-button>
-        <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
+        <el-button size="small" type="success" @click="$router.push({ name: 'basic-cache' })">返回缓存区</el-button>
+        <el-button size="small" type="primary" @click="addOrUpdateHandle()">新增</el-button>
       </el-form-item>
     </el-form>
     <el-table
       :data="dataList"
-      border
+      :stripe="true"
+      :header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
       v-loading="dataListLoading"
       style="width: 100%;">
       <el-table-column
@@ -18,41 +19,36 @@
         label="序号"
         width="50">
       </el-table-column>
-      <el-table-column
-        prop="paramKey"
+      <!-- <el-table-column
+        prop="createTime"
         header-align="center"
         align="center"
         label="添加时间">
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
-        prop="paramValue"
-        header-align="center"
-        align="center"
+        prop="locationName"
         label="库位名称">
       </el-table-column>
       <el-table-column
-        prop="remark"
-        header-align="center"
-        align="center"
+        prop="code"
         label="编码">
       </el-table-column>
       <el-table-column
-        prop="rname"
-        header-align="center"
-        align="center"
+        prop="locationNameAlias"
         label="别名">
       </el-table-column>
-      <el-table-column
-        prop="ename"
+      <!-- <el-table-column
+        prop="englishName"
         header-align="center"
         align="center"
         label="英文名称">
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         prop="status"
-        header-align="center"
-        align="center"
         label="状态">
+        <template slot-scope="scope">
+          <span>{{scope.row.status === 0?'空闲':scope.row.status === 1?'使用中':'不可使用'}}</span>
+        </template>
       </el-table-column>
       <el-table-column
         fixed="right"
@@ -85,6 +81,7 @@
   export default {
     data () {
       return {
+        warehouseId: '',
         dataList: [],
         pageIndex: 1,
         pageSize: 10,
@@ -101,22 +98,24 @@
     },
     created () {
       console.log(this.$route.query.id)
+      this.warehouseId = this.$route.query.id
     },
     methods: {
       // 获取数据列表
       getDataList () {
         this.dataListLoading = true
         this.$http({
-          url: this.$http.adornUrl('/sys/config/list'),
-          method: 'get',
-          params: this.$http.adornParams({
-            'page': this.pageIndex,
-            'limit': this.pageSize
+          url: this.$http.adornUrl('/locationInfo/page'),
+          method: 'post',
+          data: this.$http.adornData({
+            'current': this.pageIndex,
+            'size': this.pageSize,
+            'warehouseId': this.warehouseId
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.dataList = data.data.records
+            this.totalPage = data.data.total
           } else {
             this.dataList = []
             this.totalPage = 0
@@ -139,9 +138,12 @@
       addOrUpdateHandle (id) {
         this.addOrUpdateVisible = true
         this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(id)
+          this.$refs.addOrUpdate.init(id, this.warehouseId)
         })
       },
+      LocationBtn (id) {
+        this.$router.push({name: 'basic-cache-location', query: {id}})
+      },
       // 删除
       deleteHandle (id) {
         this.$confirm(`确定对[id=${id}]进行删除操作?`, '提示', {
@@ -150,9 +152,9 @@
           type: 'warning'
         }).then(() => {
           this.$http({
-            url: this.$http.adornUrl('/sys/config/delete'),
+            url: this.$http.adornUrl('/locationInfo/delete'),
             method: 'post',
-            data: this.$http.adornData(id, false)
+            data: this.$http.adornData({id})
           }).then(({data}) => {
             if (data && data.code === 0) {
               this.$message({

src/views/basic/components/processInfo-add.vue

@@ -0,0 +1,140 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: gtz
+ * @LastEditTime: 2022-03-05 12:03:46
+ * @Description:
+-->
+<template>
+  <el-dialog
+    :title="!dataForm.id ? '新增' : '修改'"
+    :close-on-click-modal="false"
+    :visible.sync="visible">
+    <el-form :model="dataForm" :rules="dataRule" v-loading="formLoading" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="100px">
+      <el-form-item label="工艺编码" prop="code">
+        <el-input v-model="dataForm.code" placeholder="工艺编码"></el-input>
+      </el-form-item>
+      <el-form-item label="工艺号" prop="craftCode">
+        <el-input v-model="dataForm.craftCode" placeholder="工艺号"></el-input>
+      </el-form-item>
+      <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-switch
+          v-model="dataForm.alarmInfo"
+          active-color="#13ce66"
+          inactive-color="#ff4949"
+          active-value="1"
+          inactive-value="0"
+        >
+        </el-switch>
+      </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">
+      <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: {
+          id: '',
+          code: '',
+          content: '',
+          plcValue: '',
+          craftCode: ''
+        },
+        dataRule: {
+          code: [
+            { required: true, message: '工艺编码不能为空', trigger: 'blur' }
+          ],
+          craftCode: [
+            { required: true, message: '工艺号不能为空', trigger: 'blur' }
+          ],
+          plcValue: [
+            { required: true, message: '对应PLC值不能为空', trigger: 'blur' }
+          ]
+        },
+        formLoading: false
+      }
+    },
+    methods: {
+      init (id) {
+        this.dataForm.id = id || ''
+        this.visible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].resetFields()
+          this.formLoading = true
+          if (this.dataForm.id) {
+            this.$http({
+              url: this.$http.adornUrl(`/craftInfo/get`),
+              method: 'post',
+              data: this.$http.adornData({id})
+            }).then(({data}) => {
+              if (data && data.code === 0) {
+                this.dataForm = data.data
+              } else {
+                this.$message.error(data.msg)
+              }
+              this.formLoading = false
+            })
+          } else {
+            this.$http({
+              url: this.$http.adornUrl(`/craftInfo/codeGenerator`),
+              method: 'post',
+              data: this.$http.adornData()
+            }).then(({data}) => {
+              if (data && data.code === 0) {
+                this.dataForm.code = data.data
+              } else {
+                this.$message.error('编码生成失败')
+              }
+              this.formLoading = false
+            })
+          }
+        })
+      },
+      // 表单提交
+      dataFormSubmit () {
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            this.$http({
+              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,
+                'content': this.dataForm.content,
+                'plcValue': this.dataForm.plcValue,
+                'craftCode': this.dataForm.craftCode
+              })
+            }).then(({data}) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {
+                    this.visible = false
+                    this.$emit('refreshDataList')
+                  }
+                })
+              } else {
+                this.$message.error(data.msg)
+              }
+            })
+          }
+        })
+      }
+    }
+  }
+</script>

src/views/basic/equipmentInfo.vue

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

src/views/basic/processInfo.vue

@@ -0,0 +1,192 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true" style="display: flex; align-items: center; justify-content: right;" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form-item>
+        <!-- <el-select size="small" v-model="dataForm.paramKey" filterable placeholder="工艺号">
+          <el-option
+            v-for="item in dataList"
+            :key="item.id"
+            :label="item.code"
+            :value="item.code"
+          >
+          </el-option>
+        </el-select> -->
+        <el-input size="small" v-model="dataForm.paramKey" placeholder="工艺号" />
+      </el-form-item>
+      <el-form-item>
+        <el-button size="small" @click="getDataList()">
+          <icon-svg class="iconClass" name="sousuo"></icon-svg>
+          查询
+        </el-button>
+        <el-button size="small" type="primary" @click="addOrUpdateHandle()">
+          <icon-svg class="iconClass" name="新建"></icon-svg>
+          新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      :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="createTime"
+        header-align="center"
+        align="center"
+        label="添加时间">
+      </el-table-column> -->
+      <el-table-column
+        prop="craftCode"
+        label="工艺号">
+      </el-table-column>
+      <el-table-column
+        prop="code"
+        label="工艺编码">
+      </el-table-column>
+      <el-table-column
+        prop="plcValue"
+        label="对应PLC值">
+      </el-table-column>
+      <!-- <el-table-column
+        prop="alarmInfo"
+        label="状态">
+      </el-table-column> -->
+      <el-table-column
+        prop="content"
+        label="说明">
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="150"
+        label="操作">
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">
+            <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.row.id)">
+            <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>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <!-- 弹窗, 新增 / 修改 -->
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+  </div>
+</template>
+
+<script>
+  import AddOrUpdate from './components/processInfo-add'
+  export default {
+    data () {
+      return {
+        dataForm: {
+          paramKey: ''
+        },
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false,
+        addOrUpdateVisible: false
+      }
+    },
+    components: {
+      AddOrUpdate
+    },
+    activated () {
+      this.getDataList()
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        this.dataListLoading = true
+        this.$http({
+          url: this.$http.adornUrl('/craftInfo/page'),
+          method: 'post',
+          data: this.$http.adornData({
+            'current': this.pageIndex,
+            'size': this.pageSize,
+            'alarmClass': this.dataForm.paramKey
+          })
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.dataList = data.data.records
+            this.totalPage = data.data.total
+          } else {
+            this.dataList = []
+            this.totalPage = 0
+          }
+          this.dataListLoading = false
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+      // 新增 / 修改
+      addOrUpdateHandle (id) {
+        this.addOrUpdateVisible = true
+        this.$nextTick(() => {
+          this.$refs.addOrUpdate.init(id)
+        })
+      },
+      // 删除
+      deleteHandle (id) {
+        this.$confirm(`确定对[id=${id}]进行删除操作?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$http({
+            url: this.$http.adornUrl('/craftInfo/delete'),
+            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>

src/views/common/Problem-add.vue

@@ -0,0 +1,96 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-08-11 16:51:45
+ * @Description:
+-->
+<template>
+  <el-dialog title="新增" :visible.sync="visible">
+    <el-form
+      :model="dataForm"
+      :rules="dataRule"
+      ref="dataForm"
+      @keyup.enter.native="dataFormSubmit()"
+      label-width="80px"
+    >
+      <el-form-item label="问题" prop="question">
+        <el-input
+          type="textarea"
+          :rows="3"
+          v-model="dataForm.question"
+          placeholder="问题"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="解答" prop="answer">
+        <el-input
+          type="textarea"
+          :rows="5"
+          v-model="dataForm.answer"
+          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: {
+        question: '',
+        answer: ''
+      },
+      dataRule: {
+        question: [
+          { required: true, message: '问题不能为空', trigger: 'blur' }
+        ],
+        answer: [{ required: true, message: '解答不能为空', trigger: 'blur' }]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+      })
+    },
+    // 表单提交
+    dataFormSubmit () {
+      this.$refs['dataForm'].validate(valid => {
+        if (valid) {
+          this.$http({
+            url: this.$http.adornUrl('/questionAnswer/add'),
+            method: 'post',
+            data: this.$http.adornData({
+              question: this.dataForm.question,
+              answer: this.dataForm.answer
+            })
+          }).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.visible = false
+                  this.$emit('refreshDataList')
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>

src/views/common/Problem.vue

@@ -0,0 +1,106 @@
+<!--
+ * @Author: zwq
+ * @Date: 2022-08-11 16:22:07
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-08-11 16:48:39
+ * @Description:
+-->
+<template>
+  <div class="mod-config">
+    <el-form
+      :inline="true"
+      style="display: flex; align-items: center; justify-content: right;"
+      @keyup.enter.native="getDataList()"
+    >
+      <el-form-item>
+        <el-input
+          size="small"
+          v-model="key"
+          placeholder="搜索问题"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button size="small" @click="getDataList()">
+          <icon-svg class="iconClass" name="sousuo"></icon-svg>
+          查询
+        </el-button>
+        <el-button size="small" type="primary" @click="addOrUpdateHandle()">
+          <icon-svg class="iconClass" name="新建"></icon-svg>
+          新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+    <el-collapse v-model="activeNames">
+      <el-collapse-item
+        v-for="(item, index) in problemArr"
+        :key="index"
+        :name="index"
+      >
+        <template slot="title">
+          <span style="color:#409EFF">
+            {{ item.question }}<i class="el-icon-question"></i>
+          </span>
+        </template>
+        <div>
+          {{ item.answer }}
+        </div>
+      </el-collapse-item>
+    </el-collapse>
+    <!-- 弹窗, 新增 / 修改 -->
+    <problem-add
+      v-if="addOrUpdateVisible"
+      ref="addOrUpdate"
+      @refreshDataList="getDataList"
+    ></problem-add>
+  </div>
+</template>
+
+<script>
+import ProblemAdd from './Problem-add'
+export default {
+  data () {
+    return {
+      key: '',
+      addOrUpdateVisible: false,
+      activeNames: [],
+      problemArr: []
+    }
+  },
+  components: {
+    ProblemAdd
+  },
+  created () {
+    this.getDataList()
+  },
+  methods: {
+    getDataList () {
+      this.$http({
+        url: this.$http.adornUrl('/questionAnswer/page'),
+        method: 'post',
+        data: this.$http.adornData({
+          current: 1,
+          size: 200,
+          key: this.key
+          // paramKey: this.dataForm.paramKey
+        })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.problemArr = data.data.records
+        } else {
+          this.problemArr = []
+        }
+      })
+    },
+    // 新增
+    addOrUpdateHandle () {
+      this.addOrUpdateVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init()
+      })
+    }
+  }
+}
+</script>
+
+<style></style>

src/views/common/add-process.vue

@@ -13,7 +13,7 @@
         <el-button style="margin-left:10px" type="primary" @click="getPoint(0)">{{startBtnName}}</el-button>
       </el-form-item>
       <el-form-item style="margin-left:2%">
-        窑炉 :
+        工业炉 :
         <el-button style="margin-left:10px" type="primary" @click="getPoint(1)">{{kilnBtnName}}</el-button>
       </el-form-item>
       <el-form-item style="margin-left:10%">
@@ -115,7 +115,7 @@
     data () {
       return {
         startBtnName: '选择起点',
-        kilnBtnName: '选择窑炉',
+        kilnBtnName: '选择工业炉',
         dataList: [],
         processType: 1,
         pageIndex: 1,
@@ -198,9 +198,9 @@
             message: '请选择任务起点',
             type: 'warning'
           })
-        } else if (this.kilnBtnName === '选择窑炉') {
+        } else if (this.kilnBtnName === '选择工业炉') {
           this.$message({
-            message: '请选择窑炉',
+            message: '请选择工业炉',
             type: 'warning'
           })
         }

src/views/common/board-part-table.vue

@@ -0,0 +1,52 @@
+<!--
+ * @Author: zwq
+ * @Date: 2022-03-07 15:31:13
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-05 16:11:42
+ * @Description:
+-->
+<template>
+  <div class="main-body">
+    <el-table
+      size='mini'
+      :data="tableData"
+      :header-cell-style="{background:'#082c34',color:'#acb9be',padding:'0px'}"
+      :cell-style="{background:'#04222d',color:'#acb9be',padding:'5px 0px'}"
+      style="width: 100%"
+    >
+      <el-table-column type="index" label="序号" width="30" align="center"> </el-table-column>
+      <el-table-column prop="customer" label="客户名称" align="center"> </el-table-column>
+      <el-table-column prop="orderNo" label="订单编号" align="center"> </el-table-column>
+      <el-table-column prop="quantity" label="数量" width="50" align="center"> </el-table-column>
+      <el-table-column prop="productName" label="产品名称" align="center"> </el-table-column>
+      <el-table-column prop="weight" label="重量" width="50" align="center"> </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'board-part-table',
+  components: {},
+  props: {
+    tableData: {
+      type: Array,
+      default: []
+    }
+  },
+  data () {
+    return {}
+  },
+  created () {},
+  methods: {}
+}
+</script>
+
+<style lang="scss" scoped>
+.main-body{
+  margin: 5px;
+}
+.main-body /deep/ .cell{
+  padding: 0px;
+}
+</style>

src/views/common/board-part.vue

@@ -0,0 +1,150 @@
+<!--
+ * @Author: zwq
+ * @Date: 2022-03-07 15:31:13
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-12 11:31:05
+ * @Description:
+-->
+<template>
+  <div class="container">
+    <div class="title">
+      <div class="tipDiv"></div>
+      加工单信息
+    </div>
+    <div class="main-body">
+      <div class="main-header">
+        <el-row :gutter="8">
+          <el-col :span="8">
+            <div class="front">
+              <img
+                :src="cdnUrl + '/static/img/lu/'+imgUrl+'.png'"
+                style="display:block;margin:auto"
+              />炉号
+            </div>
+          </el-col>
+          <el-col :span="8">
+            <el-row>
+              <div class="mid top-info">
+                {{wbData.taskCode}}
+                <div style="color: #fff;margin: 5px 0;">加工单编号</div>
+              </div>
+            </el-row>
+            <el-row>
+              <div class="mid bottom-info">
+                {{wbData.plcValue}}
+                <div style="color: #fff;margin: 5px 0;">工艺号</div>
+              </div>
+            </el-row>
+          </el-col>
+          <el-col :span="8">
+            <div class="back">
+              <el-progress
+                :percentage="wbData.completeness"
+                :stroke-width="8"
+                :show-text="false"
+              ></el-progress>
+              <div style="margin: 5px 0;">{{ wbData.remainingTime}}</div>
+                <div style="color: #fff;font-size:14px">剩余时间</div>
+            </div>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="main-table">
+      <div class="tipDiv"></div>
+      标识信息卡
+      </div>
+      <part-table :tableData="wbData.currTaskDetVoList"></part-table>
+    </div>
+  </div>
+</template>
+
+<script>
+import partTable from './board-part-table.vue'
+export default {
+  components: {partTable},
+  props: {
+    wbData: {
+      type: Object,
+      default: () => {}
+    },
+    imgUrl: {
+      type: String,
+      default: 'BMA1'
+    }
+  },
+  data () {
+    return {
+      cdnUrl: ''
+    }
+  },
+  created () {
+    this.cdnUrl = window.SITE_CONFIG.cdnUrl
+  },
+  mounted () {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.container{
+  width: 30%;
+}
+.title {
+  color: #ffffff;
+  font-size: 22px;
+  margin: 8px 0;
+  .tipDiv {
+    border-radius: 3px;
+    width: 8px;
+    height: 22px;
+    margin-right: 20px;
+    background-color: #54fdef;
+    float: left;
+  }
+}
+.main-body{
+  background-color: #04242d;
+.main-header {
+  .front {
+    min-height: 136px;
+    border-radius: 4px;
+    padding: 6px;
+    color: #ffffff;
+    text-align: center;
+    background: linear-gradient(to bottom, #133e46 0%, #04202c 100%);
+  }
+  .mid {
+    min-height: 64px;
+    border-radius: 4px;
+    margin-bottom: 5px;
+    padding: 6px;
+    color: #48dcd1;
+    text-align: center;
+    background: linear-gradient(to bottom, #0b2c36 0%, #04202c 100%);
+  }
+  .back {
+    min-height: 136px;
+    padding: 25px 5px;
+    text-align: center;
+    font-size: 30px;
+    color: #48dcd1;
+  }
+  .back /deep/ .el-progress-bar__inner {
+    background: linear-gradient(to right, #62fbb9 0%, #fdd64a 100%);
+  }
+}
+.main-table{
+  color: #ffffff;
+  margin: 10px;
+  .tipDiv{
+    width: 8px;
+    height: 8px;
+    margin: 3px 10px 3px 0;
+    background-color: #54fdef;
+    float: left;
+  }
+}
+}
+</style>

src/views/common/board.vue

@@ -0,0 +1,103 @@
+<!--
+ * @Author: zwq
+ * @Date: 2022-03-07 15:31:13
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-08 08:36:01
+ * @Description:
+-->
+<template>
+  <div class="main-body">
+    <div class="container-title">
+      浙江求精科技车间生产看板
+    </div>
+    <div class="container-body">
+      <board v-for="(item,index) in wbData" :key="index" :wbData="item" :imgUrl="item.kilnCode"></board>
+    </div>
+  </div>
+</template>
+
+<script>
+import board from './board-part'
+export default {
+  name: 'Board',
+  components: { board },
+  data () {
+    return {
+      websock: '',
+      url: '',
+      wbData: []
+    }
+  },
+  created () {
+    this.url = window.SITE_CONFIG.wbUrl
+    this.initWebSocket()
+  },
+  destroyed () {
+    // 页面销毁时关闭ws连接
+    if (this.websock) {
+      this.websock.close() // 关闭websocket
+    }
+  },
+  methods: {
+    initWebSocket () {
+      // 初始化weosocket
+      const path = `ws://${this.url}/qj/websocket/2`
+      this.websock = new WebSocket(path)
+      this.websock.onmessage = this.websocketonmessage
+      this.websock.onopen = this.websocketonopen
+      this.websock.onerror = this.websocketonerror
+      this.websock.onclose = this.websocketclose
+    },
+    websocketonopen () {
+      // 连接建立之后执行send方法发送数据
+      this.websocketsend(JSON.stringify('2'))
+    },
+    websocketonerror () {
+      // 连接建立失败重连
+      this.initWebSocket()
+    },
+    websocketonmessage (e) {
+      // 数据接收
+      this.wbData = JSON.parse(e.data)
+      console.log(this.wbData)
+    },
+    websocketsend (val) {
+      // 数据发送
+      this.websock.send(val)
+    },
+    websocketclose (e) {
+      // 关闭
+      console.log('断开连接', e)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.main-body {
+  min-height: 100vh;
+  width: 100%;
+  background: url(~@/assets/img/board/1.png) center no-repeat;
+  background-size: cover;
+  overflow: hidden;
+
+  .container-title {
+    width: 100%;
+    height: 80px;
+    background: url(~@/assets/img/board/2.png) no-repeat;
+    background-size: 100% 100%;
+    color: #00fff0;
+    font-size: 28px;
+    line-height: 80px;
+    text-align: center;
+  }
+
+  .container-body {
+    display: flex;
+    margin: auto;
+    flex-wrap: wrap;
+    flex-direction: row;
+    justify-content: space-around;
+  }
+}
+</style>

src/views/common/ex-warehouse-info.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zwq
  * @Date: 2021-11-17 15:49:18
- * @LastEditors: zwq
- * @LastEditTime: 2021-11-17 15:58:31
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-21 10:23:09
  * @Description:
 -->
 <template>
@@ -11,7 +11,9 @@
     :visible.sync="visible">
     <el-table
       :data="dataList"
-      border
+      v-loading="formLoading"
+      :stripe="true"
+      :header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
       style="width: 100%;">
       <el-table-column
         type="index"
@@ -21,19 +23,19 @@
         width="50">
       </el-table-column>
       <el-table-column
-        prop="id"
+        prop="idenCardNum"
         header-align="center"
         align="center"
         label="标识卡">
       </el-table-column>
       <el-table-column
-        prop="id1"
+        prop="customer"
         header-align="center"
         align="center"
         label="客户信息">
       </el-table-column>
       <el-table-column
-        prop="number"
+        prop="quantity"
         header-align="center"
         align="center"
         label="数量">
@@ -56,24 +58,27 @@
     data () {
       return {
         visible: false,
-        dataList: []
+        dataList: [],
+        formLoading: false
       }
     },
     methods: {
       init (id) {
         this.visible = true
+        this.formLoading = true
         this.$nextTick(() => {
           if (id) {
             this.$http({
-              url: this.$http.adornUrl(`/sys/config/info/${this.dataForm.id}`),
-              method: 'get',
-              params: this.$http.adornParams()
+              url: this.$http.adornUrl(`/outStock/get`),
+              method: 'post',
+              data: this.$http.adornData({ id })
             }).then(({data}) => {
               if (data && data.code === 0) {
-                this.dataForm.paramKey = data.config.paramKey
-                this.dataForm.paramValue = data.config.paramValue
-                this.dataForm.remark = data.config.remark
+                this.dataList = data.data
+              } else {
+                this.$message.error(data.msg)
               }
+              this.formLoading = false
             })
           }
         })

src/views/common/ex-warehouse.vue

@@ -2,49 +2,45 @@
  * @Author: zwq
  * @Date: 2021-11-15 15:17:30
  * @LastEditors: zwq
- * @LastEditTime: 2021-11-17 16:07:04
+ * @LastEditTime: 2022-07-13 09:51:46
  * @Description:
 -->
 <template>
-  <div>
-    <div class="mainDiv" style="margin:10px 0 100px">
-      <div class="flexDiv">
-        <div
-          class="wareBox"
-          :class="[
-            count > Math.round(Math.random() * 10) ? 'enableBox' : 'disableBox',
-            { active: count === isActive }
-          ]"
-          @click="selectBox(count)"
-          v-for="count in 10"
-          v-bind:key="count"
-        >
-          <div class="plat">库位{{ count }}</div>
-        </div>
-      </div>
-      <div class="flexDiv">
-        <div
-          class="wareBox"
-          :class="[
-            count > Math.round(Math.random() * 10) ? 'enableBox' : 'disableBox',
-            { active: count + 10 === isActive }
-          ]"
-          @click="selectBox(count + 10)"
-          v-for="count in 10"
-          v-bind:key="count"
-        >
-          <div class="plat">库位{{ count + 10 }}</div>
-        </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>
+  <div v-loading="dataListLoading">
+    <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"
@@ -59,31 +55,71 @@ export default {
   data () {
     return {
       isActive: '',
-      ExWarehouseInfoVisible: false
+      ExWarehouseInfoVisible: false,
+      dataListLoading: false,
+      warehouseList: []
     }
   },
   components: {
     ExWarehouseInfo
   },
-  created () {},
+  activated () {
+    this.getWarehouseList()
+  },
   methods: {
-    selectBox (count) {
-      this.isActive = count
+    getWarehouseList () {
+      this.dataListLoading = true
+      this.$http({
+        url: this.$http.adornUrl('/outStock/list'),
+        method: 'post'
+      }).then(({data}) => {
+        if (data && data.code === 0) {
+          this.warehouseList = data.data
+        } else {
+          this.warehouseList = []
+        }
+        this.dataListLoading = false
+      })
+    },
+    selectBox (id) {
+      if (this.isActive === id) {
+        this.isActive = null
+      } else {
+        this.isActive = id
+      }
+    },
+    showDetail (id) {
       this.ExWarehouseInfoVisible = true
       this.$nextTick(() => {
-        this.$refs.ExWarehouseInfoRef.init()
+        this.$refs.ExWarehouseInfoRef.init(id)
       })
     },
     selectPlat (count) {
       if (this.isActive) {
-        this.$confirm(`确认从库位${this.isActive}出库至提升台${count}?`, '提示', {
+        this.$confirm(`确认从库位id为[${this.isActive}]出库至提升台${count}?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'info '
         }).then(() => {
-          this.$message({
-            type: 'success',
-            message: '出库成功!'
+          this.$http({
+            url: this.$http.adornUrl('/outStock/runOutTask'),
+            method: 'post',
+            data: this.$http.adornData({
+              code: 'YYT00' + count,
+              localtionId: this.isActive
+            })
+          }).then(({data}) => {
+            if (data && data.code === 0) {
+              this.$message({
+                type: 'success',
+                message: '出库成功!'
+              })
+              this.isActive = null
+              this.getWarehouseList()
+            } else {
+              this.$message.error(data.msg)
+            }
+            this.dataListLoading = false
           })
         }).catch(() => {
           this.$message({
@@ -102,45 +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;
-  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;
@@ -150,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>

src/views/common/home.vue

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

src/views/common/login.vue

@@ -9,23 +9,12 @@
         <div class="login-main">
           <h3 class="login-title">管理员登录</h3>
           <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" status-icon>
-            <el-form-item prop="userName">
-              <el-input v-model="dataForm.userName" placeholder="帐号"></el-input>
+            <el-form-item prop="mobile">
+              <el-input v-model="dataForm.mobile" placeholder="帐号"></el-input>
             </el-form-item>
             <el-form-item prop="password">
               <el-input v-model="dataForm.password" type="password" placeholder="密码"></el-input>
             </el-form-item>
-            <el-form-item prop="captcha">
-              <el-row :gutter="20">
-                <el-col :span="14">
-                  <el-input v-model="dataForm.captcha" placeholder="验证码">
-                  </el-input>
-                </el-col>
-                <el-col :span="10" class="login-captcha">
-                  <img :src="captchaPath" @click="getCaptcha()" alt="">
-                </el-col>
-              </el-row>
-            </el-form-item>
             <el-form-item>
               <el-button class="login-btn-submit" type="primary" @click="dataFormSubmit()">登录</el-button>
             </el-form-item>
@@ -37,32 +26,25 @@
 </template>
 
 <script>
-  import { getUUID } from '@/utils'
   export default {
     data () {
       return {
         dataForm: {
-          userName: '',
-          password: '',
-          uuid: '',
-          captcha: ''
+          mobile: '13588441519',
+          password: '123abc.'
         },
         dataRule: {
-          userName: [
+          mobile: [
             { required: true, message: '帐号不能为空', trigger: 'blur' }
           ],
           password: [
             { required: true, message: '密码不能为空', trigger: 'blur' }
-          ],
-          captcha: [
-            { required: true, message: '验证码不能为空', trigger: 'blur' }
           ]
         },
         captchaPath: ''
       }
     },
     created () {
-      this.getCaptcha()
     },
     methods: {
       // 提交表单
@@ -70,17 +52,18 @@
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
             this.$http({
-              url: this.$http.adornUrl('/sys/login'),
+              url: this.$http.adornUrl('/passport/login'),
               method: 'post',
               data: this.$http.adornData({
-                'username': this.dataForm.userName,
+                'mobile': this.dataForm.mobile,
                 'password': this.dataForm.password,
-                'uuid': this.dataForm.uuid,
-                'captcha': this.dataForm.captcha
+                'appType': 1,
+                'userType': 1,
+                'openId': 13588441519
               })
             }).then(({data}) => {
               if (data && data.code === 0) {
-                this.$cookie.set('token', data.token)
+                this.$cookie.set('token', data.data.token)
                 this.$router.replace({ name: 'home' })
               } else {
                 this.getCaptcha()
@@ -89,11 +72,6 @@
             })
           }
         })
-      },
-      // 获取验证码
-      getCaptcha () {
-        this.dataForm.uuid = getUUID()
-        this.captchaPath = this.$http.adornUrl(`/captcha.jpg?uuid=${this.dataForm.uuid}`)
       }
     }
   }
@@ -106,7 +84,6 @@
     right: 0;
     bottom: 0;
     left: 0;
-    background-color: rgba(38, 50, 56, .6);
     overflow: hidden;
     &:before {
       position: fixed;
@@ -116,8 +93,8 @@
       width: 100%;
       height: 100%;
       content: "";
-      background-image: url(~@/assets/img/login_bg.jpg);
-      background-size: cover;
+      background-image: url(~@/assets/img/bg.jpeg);
+      background-size: 100% 100%;
     }
     .site-content__wrapper {
       position: absolute;

src/views/common/order-auto-add.vue

@@ -0,0 +1,208 @@
+<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"
+          :max="dataForm.targetQuantity"
+          @change="changes"
+          type="number"
+          placeholder="数量"
+          style="width:200px"
+        ></el-input>
+        <el-tag>数量最大值:{{dataForm.targetQuantity}}</el-tag>
+      </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"
+          type="number"
+          :max="dataForm.targetWeight"
+          @change="changeWeight"
+          placeholder="重量"
+          style="width:200px"
+        ></el-input>
+        <el-tag>重量最大值:{{dataForm.targetWeight}}</el-tag>
+      </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,
+        targetQuantity: null,
+        quantity: null,
+        unit: null,
+        targetWeight: 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: {
+    changes (value) {
+      if (/[\u4E00-\u9FA5]/g.test(value)) {
+        this.dataForm.quantity = null
+      }
+      if (value > this.dataForm.targetQuantity) {
+        this.dataForm.quantity = null
+      }
+    },
+    changeWeight (value) {
+      if (/[\u4E00-\u9FA5]/g.test(value)) {
+        this.dataForm.weight = null
+      }
+      if (value > this.dataForm.targetWeight) {
+        this.dataForm.weight = null
+      }
+    },
+    init (row, idx) {
+      this.visible = true
+      this.row = null
+      this.editIndex = null
+      this.formLoading = false
+      this.dataForm.targetQuantity = null
+      this.dataForm.targetWeight = null
+      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 }) => {
+          if (data && data.code === 0) {
+            this.dataForm = data.data
+            this.dataForm.targetQuantity = data.data.quantity - data.data.finishQuantity - data.data.waitQuantity
+            this.dataForm.targetWeight = data.data.weight - data.data.finishWeight - data.data.waitWeight
+            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 || this.editIndex === 0) {
+            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)
+            const taskList1 = taskList.reduce((all, next) => all.some((item) => item.idenCardNum === next.idenCardNum) ? all : [...all, next], [])
+            sessionStorage.setItem('autoTaskList', JSON.stringify(taskList1))
+          } 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>

src/views/common/order-auto-submit.vue

@@ -0,0 +1,303 @@
+<!--
+ * @Author: gtz
+ * @Date: 2022-03-04 10:22:13
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-08-05 09:05:08
+ * @Description: file content
+ * @FilePath: \mt-qj-wms-ui\src\views\common\order-auto-submit.vue
+-->
+
+<template>
+  <el-dialog
+    title="提交任务"
+    :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="YYT001" label="液压台1"></el-option>
+            <el-option value="YYT002" label="液压台2"></el-option>
+            <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" @change="handleChange($event,0)" :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) || processDis.firstProcess">
+            <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="dataForm.autoTaskType !== 2?'第一步':'第二步'">
+        <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="YYT001" label="液压台1"></el-option>
+            <el-option value="YYT002" label="液压台2"></el-option>
+            <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" @change="handleChange($event,1)" :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) || processDis.secProcess">
+            <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="dataForm.autoTaskType !== 2?'第二步':'第三步'">
+        <el-form-item label="加工炉" prop="thirdPosition" style="margin-bottom: 24px">
+          <el-select v-model="dataForm.thirdPosition" @change="handleChange($event,2)" :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) || processDis.thirdProcess">
+            <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" :loading="btnLoad"  @click="dataFormSubmit()">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+  export default {
+    props: {
+      kilnList: {
+        type: Array,
+        default: () => []
+      },
+      processList: {
+        type: Array,
+        default: () => []
+      }
+    },
+    data () {
+      return {
+        visible: false,
+        btnLoad: 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' }
+          ],
+          thirdPosition: [
+            { required: true, message: '加工炉不能为空', trigger: 'blur' }
+          ],
+          thirdProcess: [
+            { required: true, message: '工艺不能为空', trigger: 'blur' }
+          ]
+        },
+        dataList: [],
+        formLoading: false,
+        editIndex: null,
+        processDis: {
+          secProcess: false,
+          thirdPosition: false,
+          thirdProcess: false
+        }
+      }
+    },
+    methods: {
+      handleChange (e, step) {
+        const sArr = ['firstProcess', 'secProcess', 'thirdProcess']
+        this.processDis[sArr[step]] = false
+        this.dataForm[sArr[step]] = null
+        this.kilnList.find(item => {
+          if (item.id === e.split(',')[0]) {
+            if (item.type === 4) {
+              this.dataForm[sArr[step]] = 1
+              this.processDis[sArr[step]] = true
+            }
+          }
+        }
+        )
+      },
+      init (list) {
+        this.dataList.splice(0, this.dataList.length)
+        this.dataList = list
+        this.btnLoad = false
+        this.processDis = {
+          secProcess: false,
+          thirdPosition: false,
+          thirdProcess: false
+        }
+        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.firstProcess,
+                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.btnLoad = true
+            this.$http({
+              url: this.$http.adornUrl(`/currTask/createAutoTask`),
+              method: 'post',
+              data: this.$http.adornData(requestData)
+            }).then(({data}) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 1500,
+                  onClose: () => {
+                    this.btnLoad = false
+                    this.visible = false
+                    sessionStorage.setItem('autoTaskList', '')
+                    this.$emit('refreshDataList')
+                  }
+                })
+              } else {
+                this.btnLoad = false
+                this.$message.warning(data.msg)
+              }
+            })
+          }
+        })
+      }
+    }
+  }
+</script>

src/views/common/order-auto.vue

@@ -0,0 +1,348 @@
+<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" v-if="false">
+      <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 () {
+        if (this.dataList.length) {
+          this.submitFormVisible = true
+          this.$nextTick(() => {
+            this.$refs.submitForm.init(this.dataList)
+          })
+        } else {
+          this.$message.warning('请至少添加一条任务！')
+        }
+      },
+      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>

src/views/common/order-process-add.vue

@@ -1,20 +1,52 @@
 <template>
   <el-dialog
-    :title="!dataForm.id ? '新增' : '修改'"
+    :title="!row ? '新增' : '修改'"
     :close-on-click-modal="false"
     :visible.sync="visible">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
-      <el-form-item label="标识卡" prop="paramKey">
-        <el-input v-model="dataForm.paramKey" placeholder="标识卡"></el-input>
+    <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="paramValue">
-        <el-input v-model="dataForm.paramValue" placeholder="产品名称"></el-input>
+      <el-form-item label="客户名称" prop="customerName">
+        <el-input v-model="dataForm.customerName" disabled placeholder="客户名称"></el-input>
       </el-form-item>
-      <el-form-item label="数量" prop="number">
-        <el-input v-model="dataForm.remark" placeholder="数量"></el-input>
+      <el-form-item label="材料牌号" prop="materialDes">
+        <el-input v-model="dataForm.materialDes" disabled placeholder="材料牌号"></el-input>
       </el-form-item>
-      <el-form-item label="重量" prop="remark">
-        <el-input v-model="dataForm.remark" placeholder="重量"></el-input>
+      <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"
+          :max="dataForm.targetQuantity"
+          @change="changes"
+          type="number"
+          placeholder="数量"
+          style="width:200px"
+        ></el-input>
+        <el-tag>数量最大值:{{dataForm.targetQuantity}}</el-tag>
+      </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"
+          type="number"
+          :max="dataForm.targetWeight"
+          @change="changeWeight"
+          placeholder="重量"
+          style="width:200px"
+        ></el-input>
+        <el-tag>重量最大值:{{dataForm.targetWeight}}</el-tag>
       </el-form-item>
     </el-form>
     <span slot="footer" class="dialog-footer">
@@ -30,68 +62,116 @@
       return {
         visible: false,
         dataForm: {
-          id: 0,
-          paramKey: '',
-          paramValue: '',
-          remark: ''
+          idenCardNum: null,
+          customerName: null,
+          materialDes: null,
+          orderNo: null,
+          productName: null,
+          targetQuantity: null,
+          quantity: null,
+          unit: null,
+          targetWeight: null,
+          weight: null
         },
         dataRule: {
-          paramKey: [
-            { required: true, message: '参数名不能为空', trigger: 'blur' }
+          idenCardNum: [
+            { required: true, message: '标识卡号不能为空', trigger: 'blur' }
           ],
-          paramValue: [
-            { 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 (id) {
-        this.dataForm.id = id || 0
+      changes (value) {
+        if (/[\u4E00-\u9FA5]/g.test(value)) {
+          this.dataForm.quantity = null
+        }
+        if (value > this.dataForm.targetQuantity) {
+          this.dataForm.quantity = null
+        }
+      },
+      changeWeight (value) {
+        if (/[\u4E00-\u9FA5]/g.test(value)) {
+          this.dataForm.weight = null
+        }
+        if (value > this.dataForm.targetWeight) {
+          this.dataForm.weight = null
+        }
+      },
+      init (row, idx) {
         this.visible = true
+        this.row = null
+        this.editIndex = null
+        this.formLoading = false
+        this.dataForm.targetQuantity = null
+        this.dataForm.targetWeight = null
         this.$nextTick(() => {
           this.$refs['dataForm'].resetFields()
-          if (this.dataForm.id) {
-            this.$http({
-              url: this.$http.adornUrl(`/sys/config/info/${this.dataForm.id}`),
-              method: 'get',
-              params: this.$http.adornParams()
-            }).then(({data}) => {
-              if (data && data.code === 0) {
-                this.dataForm.paramKey = data.config.paramKey
-                this.dataForm.paramValue = data.config.paramValue
-                this.dataForm.remark = data.config.remark
-              }
-            })
+          if (row) {
+            this.row = JSON.parse(JSON.stringify(row))
+            this.dataForm = JSON.parse(JSON.stringify(row))
+            this.editIndex = JSON.parse(JSON.stringify(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}) => {
+            if (data && data.code === 0) {
+              this.dataForm = data.data
+              this.dataForm.targetQuantity = data.data.quantity - data.data.finishQuantity - data.data.waitQuantity
+              this.dataForm.targetWeight = data.data.weight - data.data.finishWeight - data.data.waitWeight
+              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) {
-            this.$http({
-              url: this.$http.adornUrl(`/sys/config/${!this.dataForm.id ? 'save' : 'update'}`),
-              method: 'post',
-              data: this.$http.adornData({
-                'id': this.dataForm.id || undefined,
-                'paramKey': this.dataForm.paramKey,
-                'paramValue': this.dataForm.paramValue,
-                'remark': this.dataForm.remark
-              })
-            }).then(({data}) => {
-              if (data && data.code === 0) {
-                this.$message({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {
-                    this.visible = false
-                    this.$emit('refreshDataList')
-                  }
-                })
-              } else {
-                this.$message.error(data.msg)
+            if (this.editIndex || this.editIndex === 0) {
+              const taskList = JSON.parse(sessionStorage.getItem('taskList'))
+              taskList.splice(this.editIndex, 1, this.dataForm)
+              sessionStorage.setItem('taskList', JSON.stringify(taskList))
+            } else if (sessionStorage.getItem('taskList')) {
+              const taskList = JSON.parse(sessionStorage.getItem('taskList'))
+              taskList.push(this.dataForm)
+              const taskList1 = taskList.reduce((all, next) => all.some((item) => item.idenCardNum === next.idenCardNum) ? all : [...all, next], [])
+              sessionStorage.setItem('taskList', JSON.stringify(taskList1))
+            } else {
+              const arr = [this.dataForm]
+              sessionStorage.setItem('taskList', JSON.stringify(arr))
+            }
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refreshDataList')
               }
             })
           }

src/views/common/order-process-point.vue

@@ -7,12 +7,12 @@
 -->
 <template>
   <el-dialog
-    :title="!pointType ? '选择起点' : '选择窑炉'"
+    :title="!pointType ? '选择起点' : '选择工业炉'"
     :close-on-click-modal="false"
     :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)
     }
   }
 }

src/views/common/order-process-submit.vue

@@ -0,0 +1,144 @@
+<!--
+ * @Author: gtz
+ * @Date: 2022-03-04 10:22:13
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-08-05 09:29:56
+ * @Description: file content
+ * @FilePath: \mt-qj-wms-ui\src\views\common\order-auto-submit.vue
+-->
+
+<template>
+  <el-dialog
+    title="提交任务"
+    :visible.sync="visible">
+    <el-form :model="dataForm" v-loading="formLoading" :rules="dataRule" ref="dataForm" label-width="120px">
+      <el-form-item label="加工类型" prop="processType">
+        <el-select v-model="dataForm.processType" size="small" placeholder="加工类型" clearable>
+          <el-option :value="0" label="初始加工" />
+          <el-option :value="1" label="复加工" />
+        </el-select>
+      </el-form-item>
+        <el-form-item label="加工起点" prop="startPosition" style="margin-bottom: 24px">
+        <el-select v-model="dataForm.startPosition" size="small" placeholder="任务起点位置" clearable>
+          <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>
+        <el-form-item label="加工炉" prop="kilnId" style="margin-bottom: 24px">
+        <el-select v-model="dataForm.kilnId" size="small" @change="handleChange($event)" placeholder="加工炉" clearable>
+          <el-option v-for="item in kilnList" :key="item.id" :value="item.id" :label="item.kilnName" />
+        </el-select>
+        <!-- <el-button style="margin-left:10px" type="primary" @click="getPoint(1)">{{kilnId}}</el-button> -->
+      </el-form-item>
+        <el-form-item label="工艺" prop="craftCode" style="margin-bottom: 24px">
+          <el-select v-model="dataForm.craftCode" placeholder="工艺">
+            <el-option v-for="item in processList" :key="item.id" :value="item.code" :label="item.craftCode" />
+          </el-select>
+        </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取消</el-button>
+      <el-button type="primary" :loading="btnLoad"  @click="dataFormSubmit()">确定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+  export default {
+    props: {
+      kilnList: {
+        type: Array,
+        default: () => []
+      },
+      processList: {
+        type: Array,
+        default: () => []
+      }
+    },
+    data () {
+      return {
+        visible: false,
+        btnLoad: false,
+        dataForm: {
+          craftCode: null,
+          processType: null,
+          startPosition: null,
+          kilnId: null
+        },
+        dataRule: {
+          craftCode: [
+            { required: true, message: '工艺不能为空', trigger: 'blur' }
+          ],
+          processType: [
+            { required: true, message: '加工类型不能为空', trigger: 'blur' }
+          ],
+          startPosition: [
+            { required: true, message: '加工起点不能为空', trigger: 'blur' }
+          ],
+          kilnId: [
+            { required: true, message: '工业炉不能为空', trigger: 'blur' }
+          ]
+        },
+        dataList: [],
+        formLoading: false
+      }
+    },
+    methods: {
+      handleChange (e) {
+        this.dataForm.craftCode = null
+        this.kilnList.find(item => {
+          if (item.id === e) {
+            if (item.type === 4) {
+              this.dataForm.craftCode = 1
+            }
+          }
+        }
+        )
+      },
+      init (list) {
+        this.dataList.splice(0, this.dataList.length)
+        this.dataList = list
+        this.btnLoad = false
+        this.visible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].resetFields()
+        })
+      },
+      // 表单提交
+      dataFormSubmit () {
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            this.btnLoad = true
+            this.$http({
+              url: this.$http.adornUrl(`/currTask/createProcessTask`),
+              method: 'post',
+              data: this.$http.adornData({
+                craftCode: this.dataForm.craftCode,
+                detParams: this.dataList,
+                kilnId: this.dataForm.kilnId,
+                processType: this.dataForm.processType,
+                startPosition: this.dataForm.startPosition,
+                targetPosition: this.dataForm.kilnId
+                // this.targetPosition
+              })
+            }).then(({data}) => {
+              if (data && data.code === 0) {
+                this.$message.success('任务提交成功')
+                this.btnLoad = false
+                this.visible = false
+                sessionStorage.setItem('taskList', '')
+                this.$emit('refreshDataList')
+              } else {
+                this.btnLoad = false
+                this.$message.warning(data.msg)
+              }
+            })
+          }
+        })
+      }
+    }
+  }
+</script>

src/views/common/order-process.vue

@@ -1,24 +1,20 @@
 <template>
   <div class="mod-config">
-    <el-form :inline="true">
-      <el-form-item>
-        <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
+    <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:8%">
-        任务起点位置 :
-        <el-button style="margin-left:10px" type="primary" @click="getPoint(0)">{{startBtnName}}</el-button>
-      </el-form-item>
-      <el-form-item style="margin-left:2%">
-        窑炉 :
-        <el-button style="margin-left:10px" type="primary" @click="getPoint(1)">{{kilnBtnName}}</el-button>
-      </el-form-item>
-      <el-form-item style="margin-left:10%">
-        <el-button type="primary" @click="submitTask()">提交任务</el-button>
+      <el-form-item style="margin-left:1%">
+        <el-button type="primary" size="small" @click="submitTask()">提交任务</el-button>
       </el-form-item>
     </el-form>
     <el-table
       :data="dataList"
-      border
+      :stripe="true"
+      :header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
       v-loading="dataListLoading"
       style="width: 100%;">
       <el-table-column
@@ -29,57 +25,42 @@
         width="50">
       </el-table-column>
       <el-table-column
-        prop="id"
-        header-align="center"
-        align="center"
+        prop="idenCardNum"
         label="标识卡">
       </el-table-column>
       <el-table-column
-        prop="paramKey"
-        header-align="center"
-        align="center"
-        label="客户信息">
+        prop="customerName"
+        label="客户名称">
       </el-table-column>
       <el-table-column
-        prop="paramValue"
-        header-align="center"
-        align="center"
+        prop="orderNo"
         label="订单号">
       </el-table-column>
       <el-table-column
-        prop="remark"
-        header-align="center"
-        align="center"
+        prop="productName"
         label="产品名称">
       </el-table-column>
       <el-table-column
-        prop="card"
-        header-align="center"
-        align="center"
+        prop="materialDes"
         label="材料号牌">
       </el-table-column>
       <el-table-column
-        prop="num"
-        header-align="center"
-        align="center"
+        prop="finishQuantity"
         label="已完成数">
+        <template slot-scope="scope">
+          {{ `${scope.row.finishQuantity}/${scope.row.targetQuantity}` }}
+        </template>
       </el-table-column>
       <el-table-column
-        prop="number"
-        header-align="center"
-        align="center"
+        prop="quantity"
         label="数量">
       </el-table-column>
       <el-table-column
         prop="weight"
-        header-align="center"
-        align="center"
         label="重量">
       </el-table-column>
       <el-table-column
         prop="unit"
-        header-align="center"
-        align="center"
         label="单位">
       </el-table-column>
       <el-table-column
@@ -88,88 +69,103 @@
         align="center"
         label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-          <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
+          <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>
-    <el-pagination
-      @size-change="sizeChangeHandle"
-      @current-change="currentChangeHandle"
-      :current-page="pageIndex"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="pageSize"
-      :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper">
-    </el-pagination>
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    <submit-form v-if="submitFormVisible" ref="submitForm" :kilnList="eqList" :processList="processList" @refreshDataList="getDataList" />
     <process-point v-if="processPointVisible" ref="processPoint" @refreshPoint="setPoint"></process-point>
   </div>
 </template>
 
 <script>
   import AddOrUpdate from './order-process-add'
+  import SubmitForm from './order-process-submit'
   import ProcessPoint from './order-process-point'
   export default {
     data () {
       return {
-        startBtnName: '选择起点',
-        kilnBtnName: '选择窑炉',
+        startPosition: '',
+        kilnId: '',
+        craftCode: '',
+        targetPosition: '',
         dataList: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPage: 0,
+        submitFormVisible: false,
+        processType: null,
         dataListLoading: false,
         addOrUpdateVisible: false,
-        processPointVisible: false
+        processPointVisible: false,
+        eqList: [],
+        processList: []
       }
     },
     components: {
       AddOrUpdate,
-      ProcessPoint
+      ProcessPoint,
+      SubmitForm
     },
     activated () {
-      this.getDataList()
+      this.getEqList()
     },
     methods: {
-      // 获取数据列表
-      getDataList () {
-        this.dataListLoading = true
+      // 获取工业炉列表
+      getEqList () {
         this.$http({
-          url: this.$http.adornUrl('/sys/config/list'),
-          method: 'get',
-          params: this.$http.adornParams({
-            'page': this.pageIndex,
-            'limit': this.pageSize
+          url: this.$http.adornUrl('/kilnInfo/page'),
+          method: 'post',
+          data: this.$http.adornData({
+            current: 1,
+            size: 999
           })
-        }).then(({data}) => {
+        }).then(({ data }) => {
           if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
+            this.eqList = data.data.records
           } else {
-            this.dataList = []
-            this.totalPage = 0
+            this.eqList = []
+          }
+          this.getDataList()
+        })
+
+        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 = []
           }
-          this.dataListLoading = false
         })
       },
-      // 每页数
-      sizeChangeHandle (val) {
-        this.pageSize = val
-        this.pageIndex = 1
-        this.getDataList()
-      },
-      // 当前页
-      currentChangeHandle (val) {
-        this.pageIndex = val
-        this.getDataList()
+      // 获取数据列表
+      getDataList () {
+        this.dataList = sessionStorage.getItem('taskList') ? JSON.parse(sessionStorage.getItem('taskList')) : []
+        // if (data && data.code === 0) {
+        //   this.dataList = data.data.records
+        // } else {
+        //   this.dataList = []
+        // }
       },
       // 新增 / 修改
-      addOrUpdateHandle (id) {
+      addOrUpdateHandle (row, idx) {
         this.addOrUpdateVisible = true
         this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(id)
+          this.$refs.addOrUpdate.init(row, idx)
         })
       },
       // 获取点位
@@ -181,54 +177,32 @@
       },
       setPoint (count, pointType) {
         if (!pointType) {
-          this.startBtnName = count
+          this.startPosition = count
         } else {
-          this.kilnBtnName = count
+          this.kilnId = count
+          this.targetPosition = count
         }
       },
       submitTask () {
-        if (this.dataList.length === 0) {
-          this.$message({
-            message: '任务为空，请新增一条托盘信息',
-            type: 'warning'
-          })
-        } else if (this.startBtnName === '选择起点') {
-          this.$message({
-            message: '请选择任务起点',
-            type: 'warning'
-          })
-        } else if (this.kilnBtnName === '选择窑炉') {
-          this.$message({
-            message: '请选择窑炉',
-            type: 'warning'
+        if (this.dataList.length) {
+          this.submitFormVisible = true
+          this.$nextTick(() => {
+            this.$refs.submitForm.init(this.dataList)
           })
+        } else {
+          this.$message.warning('请至少添加一条任务！')
         }
       },
       // 删除
-      deleteHandle (id) {
-        this.$confirm(`确定对[id=${id}]进行删除]操作?`, '提示', {
+      deleteHandle (idx) {
+        console.log(idx)
+        this.$confirm(`确定对第${idx + 1}项进行删除操作?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.$http({
-            url: this.$http.adornUrl('/sys/config/delete'),
-            method: 'post',
-            data: this.$http.adornData(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)
-            }
-          })
+          this.dataList.splice(idx, 1)
+          sessionStorage.setItem('taskList', JSON.stringify(this.dataList))
         }).catch(() => {})
       }
     }

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": ""
+    }
+  ]
+}

src/views/energy/ammonia-analysis.vue

@@ -2,43 +2,42 @@
  * @Author: zwq
  * @Date: 2021-11-19 10:55:33
  * @LastEditors: gtz
- * @LastEditTime: 2021-12-01 09:18:32
+ * @LastEditTime: 2021-12-16 15:39:28
  * @Description:
 -->
 <template>
   <div class="chart-container">
     <el-row>
-      <el-col :span="4">
+      <el-col :span="2">
         <div class="kiln-electric-treebox">
           <el-tree :data="yaoluList" @node-click="handleNode" />
         </div>
       </el-col>
-      <el-col :span="20">
-        <el-row style="margin: 20px 0" :gutter="20">
-          <el-col style="margin: 20px 0">
-            <el-checkbox-group :min="1" v-model="chartType" style="float: left">
+      <el-col :span="22">
+        <el-card class="base-container" style="min-height: 540px">
+          <el-row style="position: absolute; z-index: 10; right: 20px">
+            <el-checkbox-group size="small" :min="1" v-model="chartType" style="float: left">
               <el-checkbox-button label="折线" />
               <el-checkbox-button label="柱状" />
             </el-checkbox-group>
-            <el-row style="float: right">
-              <el-radio-group v-model="eleType" @change="changeEleType">
-                <el-radio-button label="日"></el-radio-button>
-                <el-radio-button label="周"></el-radio-button>
-                <el-radio-button label="月"></el-radio-button>
-                <el-radio-button label="年"></el-radio-button>
-              </el-radio-group>
-              <el-date-picker
-                v-model="date"
-                :type="datePickerType[eleType].type"
-                :format="datePickerType[eleType].format"
-                :placeholder="'选择' + datePickerType[eleType].placeholder"
-              />
-            </el-row>
-          </el-col>
+            <el-radio-group style="margin: 0 10px; position:relative; bottom: 2px" size="small" v-model="eleType" @change="changeEleType">
+              <el-radio-button label="日"></el-radio-button>
+              <el-radio-button label="周"></el-radio-button>
+              <el-radio-button label="月"></el-radio-button>
+              <el-radio-button label="年"></el-radio-button>
+            </el-radio-group>
+            <el-date-picker
+              size="small"
+              v-model="date"
+              :type="datePickerType[eleType].type"
+              :format="datePickerType[eleType].format"
+              :placeholder="'选择' + datePickerType[eleType].placeholder"
+            />
+          </el-row>
           <el-col style="height: 500px">
             <chart height="100%" width="100%" :title="eleType" :showId="showId" :titleHeader="yaoluName" titleFooter="氮气用量（㎡）" :dataList="dataList" :lastDataList="lastDataList" :chartType="chartType" />
           </el-col>
-        </el-row>
+        </el-card>
       </el-col>
     </el-row>
   </div>
@@ -251,11 +250,11 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    label: '窑炉1',
+    label: '工业炉1',
     value: 63,
     percent: 11,
     data: [
@@ -289,7 +288,7 @@ const yaoluList = [
   },
   {
     id: 2,
-    label: '窑炉2',
+    label: '工业炉2',
     value: 44,
     percent: 8,
     data: [
@@ -323,7 +322,7 @@ const yaoluList = [
   },
   {
     id: 3,
-    label: '窑炉3',
+    label: '工业炉3',
     value: 56,
     percent: 9,
     data: [
@@ -357,7 +356,7 @@ const yaoluList = [
   },
   {
     id: 4,
-    label: '窑炉4',
+    label: '工业炉4',
     value: 56,
     percent: 9,
     data: [
@@ -391,7 +390,7 @@ const yaoluList = [
   },
   {
     id: 5,
-    label: '窑炉5',
+    label: '工业炉5',
     value: 56,
     percent: 9,
     data: [
@@ -425,7 +424,7 @@ const yaoluList = [
   },
   {
     id: 6,
-    label: '窑炉6',
+    label: '工业炉6',
     value: 56,
     percent: 9,
     data: [
@@ -459,7 +458,7 @@ const yaoluList = [
   },
   {
     id: 7,
-    label: '窑炉7',
+    label: '工业炉7',
     value: 56,
     percent: 9,
     data: [
@@ -493,7 +492,7 @@ const yaoluList = [
   },
   {
     id: 8,
-    label: '窑炉8',
+    label: '工业炉8',
     value: 56,
     percent: 9,
     data: [
@@ -527,7 +526,7 @@ const yaoluList = [
   },
   {
     id: 9,
-    label: '窑炉9',
+    label: '工业炉9',
     value: 56,
     percent: 9,
     data: [
@@ -561,7 +560,7 @@ const yaoluList = [
   },
   {
     id: 10,
-    label: '窑炉10',
+    label: '工业炉10',
     value: 56,
     percent: 9,
     data: [
@@ -595,7 +594,7 @@ const yaoluList = [
   },
   {
     id: 11,
-    label: '窑炉11',
+    label: '工业炉11',
     value: 56,
     percent: 9,
     data: [
@@ -699,21 +698,18 @@ export default {
 .chart-container {
   position: relative;
   width: 100%;
-  min-height: calc(100vh - 124px);
-  .kiln-electric-treebox {
-    width: 100%;
-    border: 1px solid #eeeeee;
-    border-radius: 5px;
-    padding: 10px;
-  }
+  min-height: calc(100vh - 138px);
+
 }
 </style>
 
 <style lang="scss">
-.el-tabs__item{
-  height: 120px;
-}
-.el-tabs__nav-next, .el-tabs__nav-prev {
-  line-height: 120px;
+.chart-container {
+  .el-tabs__item{
+    height: 120px;
+  }
+  .el-tabs__nav-next, .el-tabs__nav-prev {
+    line-height: 120px;
+  }
 }
 </style>

src/views/energy/ammonia.vue

@@ -2,58 +2,64 @@
  * @Author: zwq
  * @Date: 2021-11-19 10:55:33
  * @LastEditors: gtz
- * @LastEditTime: 2021-12-01 09:17:51
+ * @LastEditTime: 2021-12-16 20:13:35
  * @Description:
 -->
 <template>
   <div class="chart-container">
     <el-row>
-      <el-col :span="4">
+      <el-col :span="2">
         <div class="kiln-electric-treebox">
           <el-tree :data="yaoluList" @node-click="handleNode" />
         </div>
       </el-col>
-      <el-col :span="20">
+      <el-col :span="22">
         <el-row>
-          <el-row style="margin: 20px 0" :gutter="20">
-            <el-col>
-              <h3>氨气流量分析</h3>
-            </el-col>
-          </el-row>
-          <el-row style="margin: 20px 0" :gutter="20">
-            <el-col style="width: 400px">
-              <el-card>
-                <p style="font-size: 18px">氨气流量（立方米）：<strong style="font-size: 22px">123,109</strong></p>
-                <p>昨日氨气流量(立方米)：1145</p>
-              </el-card>
-            </el-col>
-          </el-row>
+          <el-col :span="8">
+            <el-card class="base-container" style="height: 214px">
+              <el-row style="position: relative;">
+                <div class="base-container-titleline"></div>
+                <h3>氨气流量分析</h3>
+              </el-row>
+              <el-row>
+                <el-col style="padding: 24px 0">
+                  <p
+                    :title="'氨气流量（立方米）：123,109'"
+                    style="font-size: 16px; overflow: hidden; text-overflow:ellipsis; white-space: nowrap;"
+                  >
+                    <icon-svg style="position: relative; top: 2px" class="iconClass" name="氨气"></icon-svg>
+                    氨气流量（立方米）：<strong style="font-size: 32px; color: #f78c3e">123,109</strong>
+                  </p>
+                  <p style="font-size: 14px; text-indent: 20px;">昨日氨气流量(立方米)：1145</p>
+                </el-col>
+              </el-row>
+            </el-card>
+          </el-col>
         </el-row>
-        <el-row style="margin: 20px 0" :gutter="20">
-          <el-col style="margin: 20px 0">
-            <el-checkbox-group :min="1" v-model="chartType" style="float: left">
+        <el-card class="base-container" style="margin-top: 20px; min-height: 540px">
+          <el-row style="position: absolute; z-index: 10; right: 20px">
+            <el-checkbox-group size="small" :min="1" v-model="chartType" style="float: left">
               <el-checkbox-button label="折线" />
               <el-checkbox-button label="柱状" />
             </el-checkbox-group>
-            <el-row style="float: right">
-              <el-radio-group v-model="eleType" @change="changeEleType">
-                <el-radio-button label="日"></el-radio-button>
-                <el-radio-button label="周"></el-radio-button>
-                <el-radio-button label="月"></el-radio-button>
-                <el-radio-button label="年"></el-radio-button>
-              </el-radio-group>
-              <el-date-picker
-                v-model="date"
-                :type="datePickerType[eleType].type"
-                :format="datePickerType[eleType].format"
-                :placeholder="'选择' + datePickerType[eleType].placeholder"
-              />
-            </el-row>
-          </el-col>
+            <el-radio-group style="margin: 0 10px; position:relative; bottom: 2px" size="small" v-model="eleType" @change="changeEleType">
+              <el-radio-button label="日"></el-radio-button>
+              <el-radio-button label="周"></el-radio-button>
+              <el-radio-button label="月"></el-radio-button>
+              <el-radio-button label="年"></el-radio-button>
+            </el-radio-group>
+            <el-date-picker
+              size="small"
+              v-model="date"
+              :type="datePickerType[eleType].type"
+              :format="datePickerType[eleType].format"
+              :placeholder="'选择' + datePickerType[eleType].placeholder"
+            />
+          </el-row>
           <el-col style="height: 500px">
             <chart height="100%" width="100%" :title="eleType" :showId="showId" :titleHeader="yaoluName" titleFooter="氨气使用量（㎡）" :dataList="dataList" :lastDataList="lastDataList" :chartType="chartType" />
           </el-col>
-        </el-row>
+        </el-card>
       </el-col>
     </el-row>
   </div>
@@ -266,11 +272,11 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    label: '窑炉1',
+    label: '工业炉1',
     value: 63,
     percent: 11,
     data: [
@@ -304,7 +310,7 @@ const yaoluList = [
   },
   {
     id: 2,
-    label: '窑炉2',
+    label: '工业炉2',
     value: 44,
     percent: 8,
     data: [
@@ -338,7 +344,7 @@ const yaoluList = [
   },
   {
     id: 3,
-    label: '窑炉3',
+    label: '工业炉3',
     value: 56,
     percent: 9,
     data: [
@@ -372,7 +378,7 @@ const yaoluList = [
   },
   {
     id: 4,
-    label: '窑炉4',
+    label: '工业炉4',
     value: 56,
     percent: 9,
     data: [
@@ -406,7 +412,7 @@ const yaoluList = [
   },
   {
     id: 5,
-    label: '窑炉5',
+    label: '工业炉5',
     value: 56,
     percent: 9,
     data: [
@@ -440,7 +446,7 @@ const yaoluList = [
   },
   {
     id: 6,
-    label: '窑炉6',
+    label: '工业炉6',
     value: 56,
     percent: 9,
     data: [
@@ -474,7 +480,7 @@ const yaoluList = [
   },
   {
     id: 7,
-    label: '窑炉7',
+    label: '工业炉7',
     value: 56,
     percent: 9,
     data: [
@@ -508,7 +514,7 @@ const yaoluList = [
   },
   {
     id: 8,
-    label: '窑炉8',
+    label: '工业炉8',
     value: 56,
     percent: 9,
     data: [
@@ -542,7 +548,7 @@ const yaoluList = [
   },
   {
     id: 9,
-    label: '窑炉9',
+    label: '工业炉9',
     value: 56,
     percent: 9,
     data: [
@@ -576,7 +582,7 @@ const yaoluList = [
   },
   {
     id: 10,
-    label: '窑炉10',
+    label: '工业炉10',
     value: 56,
     percent: 9,
     data: [
@@ -610,7 +616,7 @@ const yaoluList = [
   },
   {
     id: 11,
-    label: '窑炉11',
+    label: '工业炉11',
     value: 56,
     percent: 9,
     data: [
@@ -714,21 +720,18 @@ export default {
 .chart-container {
   position: relative;
   width: 100%;
-  min-height: calc(100vh - 124px);
-  .kiln-electric-treebox {
-    width: 100%;
-    border: 1px solid #eeeeee;
-    border-radius: 5px;
-    padding: 10px;
-  }
+  min-height: calc(100vh - 138px);
+
 }
 </style>
 
 <style lang="scss">
-.el-tabs__item{
-  height: 120px;
-}
-.el-tabs__nav-next, .el-tabs__nav-prev {
-  line-height: 120px;
+.chart-container {
+  .el-tabs__item{
+    height: 120px;
+  }
+  .el-tabs__nav-next, .el-tabs__nav-prev {
+    line-height: 120px;
+  }
 }
 </style>

src/views/energy/electric-acquisition.vue

@@ -1,319 +1,275 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-19 10:55:33
+ * @LastEditors: zwq
+ * @LastEditTime: 2021-12-17 16:10:47
+ * @Description:
+-->
 <template>
-  <div class="mod-config">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-      <el-form-item>
-        <el-radio-group v-model="dataForm.type" @change="changeType">
-          <el-radio-button label="日" />
-          <el-radio-button label="周" />
-          <el-radio-button label="月" />
-          <el-radio-button label="年" />
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="选择时间">
-        <el-date-picker
-          v-model="dataForm.date"
-          :type="datePickerType[dataForm.type].type"
-          :format="datePickerType[dataForm.type].format"
-          :placeholder="'选择' + datePickerType[dataForm.type].placeholder"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="getDataList()">查询</el-button>
-      </el-form-item>
-    </el-form>
-    <el-table
-      :data="dataList"
-      border
-      v-loading="dataListLoading"
-      style="width: 100%;">
-      <el-table-column
-        prop="time"
-        header-align="center"
-        align="center"
-        label="时间"
-      />
-      <el-table-column
-        v-for="item in yaoluList"
-        :prop="item.id"
-        header-align="center"
-        align="center"
-        :label="item.name"
-        :key="item.id"
-      />
-    </el-table>
+  <div class="chart-container">
+    <el-row>
+      <el-col :span="2">
+        <div class="kiln-electric-treebox">
+          <el-tree
+            :data="yaoluList"
+            @node-click="handleNode"
+            :highlight-current="true"
+          />
+        </div>
+      </el-col>
+      <el-col :span="22">
+        <el-card class="base-container" style="min-height: 540px">
+          <el-row style="z-index: 10;float:right;margin-right:20px">
+            <el-radio-group
+              style="margin: 0 20px; position:relative; bottom: 2px"
+              size="small"
+              v-model="eleType"
+              @change="changeEleType"
+            >
+              <el-radio-button label="日"></el-radio-button>
+              <el-radio-button label="周"></el-radio-button>
+              <el-radio-button label="月"></el-radio-button>
+              <el-radio-button label="年"></el-radio-button>
+            </el-radio-group>
+            <el-date-picker
+              size="small"
+              v-model="date"
+              :type="datePickerType[eleType].type"
+              :format="datePickerType[eleType].format"
+              :placeholder="'选择' + datePickerType[eleType].placeholder"
+            />
+            <el-button size="small" @click="getDataList()">
+              <icon-svg class="iconClass" name="sousuo"></icon-svg>
+              查询
+            </el-button>
+          </el-row>
+          <el-col style="height: 600px">
+            <el-table
+              :data="dataList"
+              :stripe="true"
+              :header-cell-style="{
+                background: '#eef1f6',
+                color: '#606266',
+                height: '56px'
+              }"
+              v-loading="dataListLoading"
+              style="width: 100%;padding:20px"
+            >
+              <el-table-column
+                type="index"
+                header-align="center"
+                align="center"
+                label="序号"
+                width="50"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="createTime"
+                header-align="center"
+                align="center"
+                label="采集时间"
+              >
+              </el-table-column>
+              <el-table-column prop="vehicleName" label="A相电压">
+              </el-table-column>
+              <el-table-column prop="code" label="B相电压"> </el-table-column>
+              <el-table-column prop="vehicleAlias" label="C相电压">
+              </el-table-column>
+              <el-table-column prop="anqi" label="A相电流"> </el-table-column>
+              <el-table-column prop="anqi" label="B相电流"> </el-table-column>
+              <el-table-column prop="anqi" label="C相电流"> </el-table-column>
+              <el-table-column prop="anqi" label="功率值"> </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>
+          </el-col>
+        </el-card>
+      </el-col>
+    </el-row>
   </div>
 </template>
 
 <script>
-// 窑炉列表
-const yaoluList = [
-  {
-    id: '1',
-    name: '窑炉1',
-    data: [
-      { time: '0:00', value: 24 },
-      { time: '2:00', value: 43 },
-      { time: '4:00', value: 33 },
-      { time: '6:00', value: 25 },
-      { time: '8:00', value: 44 },
-      { time: '10:00', value: 46 },
-      { time: '12:00', value: 16 },
-      { time: '14:00', value: 47 },
-      { time: '16:00', value: 86 },
-      { time: '18:00', value: 22 },
-      { time: '20:00', value: 25 },
-      { time: '22:00', value: 27 }
-    ]
-  },
-  {
-    id: '2',
-    name: '窑炉2',
-    data: [
-      { time: '0:00', value: 24 },
-      { time: '2:00', value: 43 },
-      { time: '4:00', value: 33 },
-      { time: '6:00', value: 25 },
-      { time: '8:00', value: 44 },
-      { time: '10:00', value: 46 },
-      { time: '12:00', value: 16 },
-      { time: '14:00', value: 47 },
-      { time: '16:00', value: 86 },
-      { time: '18:00', value: 22 },
-      { time: '20:00', value: 25 },
-      { time: '22:00', value: 27 }
-    ]
-  },
-  {
-    id: '3',
-    name: '窑炉3',
-    data: [
-      { time: '0:00', value: 24 },
-      { time: '2:00', value: 43 },
-      { time: '4:00', value: 33 },
-      { time: '6:00', value: 25 },
-      { time: '8:00', value: 44 },
-      { time: '10:00', value: 46 },
-      { time: '12:00', value: 16 },
-      { time: '14:00', value: 47 },
-      { time: '16:00', value: 86 },
-      { time: '18:00', value: 22 },
-      { time: '20:00', value: 25 },
-      { time: '22:00', value: 27 }
-    ]
-  },
-  {
-    id: '4',
-    name: '窑炉4',
-    data: [
-      { time: '0:00', value: 24 },
-      { time: '2:00', value: 43 },
-      { time: '4:00', value: 33 },
-      { time: '6:00', value: 25 },
-      { time: '8:00', value: 44 },
-      { time: '10:00', value: 46 },
-      { time: '12:00', value: 16 },
-      { time: '14:00', value: 47 },
-      { time: '16:00', value: 86 },
-      { time: '18:00', value: 22 },
-      { time: '20:00', value: 25 },
-      { time: '22:00', value: 27 }
-    ]
-  },
-  {
-    id: '5',
-    name: '窑炉5',
-    data: [
-      { time: '0:00', value: 24 },
-      { time: '2:00', value: 43 },
-      { time: '4:00', value: 33 },
-      { time: '6:00', value: 25 },
-      { time: '8:00', value: 44 },
-      { time: '10:00', value: 46 },
-      { time: '12:00', value: 16 },
-      { time: '14:00', value: 47 },
-      { time: '16:00', value: 86 },
-      { time: '18:00', value: 22 },
-      { time: '20:00', value: 25 },
-      { time: '22:00', value: 27 }
-    ]
-  },
-  {
-    id: '6',
-    name: '窑炉6',
-    data: [
-      { time: '0:00', value: 24 },
-      { time: '2:00', value: 43 },
-      { time: '4:00', value: 33 },
-      { time: '6:00', value: 25 },
-      { time: '8:00', value: 44 },
-      { time: '10:00', value: 46 },
-      { time: '12:00', value: 16 },
-      { time: '14:00', value: 47 },
-      { time: '16:00', value: 86 },
-      { time: '18:00', value: 22 },
-      { time: '20:00', value: 25 },
-      { time: '22:00', value: 27 }
-    ]
-  },
-  {
-    id: '7',
-    name: '窑炉7',
-    data: [
-      { time: '0:00', value: 24 },
-      { time: '2:00', value: 43 },
-      { time: '4:00', value: 33 },
-      { time: '6:00', value: 25 },
-      { time: '8:00', value: 44 },
-      { time: '10:00', value: 46 },
-      { time: '12:00', value: 16 },
-      { time: '14:00', value: 47 },
-      { time: '16:00', value: 86 },
-      { time: '18:00', value: 22 },
-      { time: '20:00', value: 25 },
-      { time: '22:00', value: 27 }
-    ]
-  },
-  {
-    id: '8',
-    name: '窑炉8',
-    data: [
-      { time: '0:00', value: 24 },
-      { time: '2:00', value: 43 },
-      { time: '4:00', value: 33 },
-      { time: '6:00', value: 25 },
-      { time: '8:00', value: 44 },
-      { time: '10:00', value: 46 },
-      { time: '12:00', value: 16 },
-      { time: '14:00', value: 47 },
-      { time: '16:00', value: 86 },
-      { time: '18:00', value: 22 },
-      { time: '20:00', value: 25 },
-      { time: '22:00', value: 27 }
-    ]
-  },
-  {
-    id: '9',
-    name: '窑炉9',
-    data: [
-      { time: '0:00', value: 24 },
-      { time: '2:00', value: 43 },
-      { time: '4:00', value: 33 },
-      { time: '6:00', value: 25 },
-      { time: '8:00', value: 44 },
-      { time: '10:00', value: 46 },
-      { time: '12:00', value: 16 },
-      { time: '14:00', value: 47 },
-      { time: '16:00', value: 86 },
-      { time: '18:00', value: 22 },
-      { time: '20:00', value: 25 },
-      { time: '22:00', value: 27 }
-    ]
-  },
-  {
-    id: '10',
-    name: '窑炉10',
-    data: [
-      { time: '0:00', value: 24 },
-      { time: '2:00', value: 43 },
-      { time: '4:00', value: 33 },
-      { time: '6:00', value: 25 },
-      { time: '8:00', value: 44 },
-      { time: '10:00', value: 46 },
-      { time: '12:00', value: 16 },
-      { time: '14:00', value: 47 },
-      { time: '16:00', value: 86 },
-      { time: '18:00', value: 22 },
-      { time: '20:00', value: 25 },
-      { time: '22:00', value: 27 }
-    ]
-  },
-  {
-    id: '11',
-    name: '窑炉11',
-    data: [
-      { time: '0:00', value: 24 },
-      { time: '2:00', value: 43 },
-      { time: '4:00', value: 33 },
-      { time: '6:00', value: 25 },
-      { time: '8:00', value: 44 },
-      { time: '10:00', value: 46 },
-      { time: '12:00', value: 16 },
-      { time: '14:00', value: 47 },
-      { time: '16:00', value: 86 },
-      { time: '18:00', value: 22 },
-      { time: '20:00', value: 25 },
-      { time: '22:00', value: 27 }
-    ]
-  }
-]
-
 // 日期类型
 const datePickerType = {
-  '日': {
+  日: {
     type: 'date',
     format: '',
     placeholder: '日期'
   },
-  '周': {
+  周: {
     type: 'week',
     format: 'yyyy 第 WW 周',
     placeholder: '周'
   },
-  '月': {
+  月: {
     type: 'month',
     format: '',
     placeholder: '月'
   },
-  '年': {
+  年: {
     type: 'year',
     format: '',
     placeholder: '年'
   }
 }
 
+// 工业炉列表
+const yaoluList = [
+  {
+    id: 1,
+    label: '工业炉1'
+  },
+  {
+    id: 2,
+    label: '工业炉2'
+  },
+  {
+    id: 3,
+    label: '工业炉3'
+  },
+  {
+    id: 4,
+    label: '工业炉4'
+  },
+  {
+    id: 5,
+    label: '工业炉5'
+  },
+  {
+    id: 6,
+    label: '工业炉6'
+  },
+  {
+    id: 7,
+    label: '工业炉7'
+  },
+  {
+    id: 8,
+    label: '工业炉8'
+  },
+  {
+    id: 9,
+    label: '工业炉9'
+  },
+  {
+    id: 10,
+    label: '工业炉10'
+  },
+  {
+    id: 11,
+    label: '工业炉11'
+  }
+]
+
 export default {
+  name: 'gas-acquisition',
   data () {
     return {
-      dataForm: {
-        type: '日',
-        date: new Date()
-      },
+      datePickerType,
+      yaoluList,
+      date: new Date(),
+      eleType: '年',
+      showId: 0,
+      yaoluIndex: 0,
+      yaoluName: '',
       dataList: [],
       pageIndex: 1,
       pageSize: 10,
       totalPage: 0,
-      dataListLoading: false,
-      orderDetailVisible: false,
-      yaoluList,
-      datePickerType
+      dataListLoading: false
     }
   },
-  created () {
+  mounted () {
+    this.showId = this.yaoluList[0].id
+    this.yaoluName = this.yaoluList[0].label
+  },
+  activated () {
     this.getDataList()
   },
   methods: {
-    // 获取数据列表
+      // 获取数据列表
     getDataList () {
-      this.dataList = []
       this.dataListLoading = true
-      this.yaoluList.map((item, index) => {
-        if (index === 0) {
-          item.data.map(i => {
-            this.dataList.push({
-              time: i.time,
-              [item.id]: i.value
-            })
-          })
+      this.$http({
+        url: this.$http.adornUrl('/vehicle/page'),
+        method: 'post',
+        data: this.$http.adornData({
+          'current': this.pageIndex,
+          'size': this.pageSize
+        })
+      }).then(({data}) => {
+        if (data && data.code === 0) {
+          this.dataList = data.data.records
+          this.totalPage = data.data.total
         } else {
-          item.data.map((i, idx) => {
-            this.dataList[idx][item.id] = i.value
-          })
+          this.dataList = []
+          this.totalPage = 0
         }
+        this.dataListLoading = false
       })
-      this.dataListLoading = false
     },
-    // 切换查询类型
-    changeType (v) {}
+    changeEleType (v) {
+      switch (v) {
+        case '日':
+          this.date = new Date()
+          break
+        case '周':
+          this.date = new Date()
+          break
+        case '月':
+          this.date = new Date()
+          break
+        case '年':
+          this.date = new Date()
+          break
+      }
+    },
+      // 每页数
+    sizeChangeHandle (val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+      // 当前页
+    currentChangeHandle (val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+    handleNode (obj, node, e) {
+      if (!obj.children) {
+        this.showId = obj.id
+        this.yaoluName = obj.label
+      }
+    }
   }
 }
 </script>
+
+<style lang="scss" 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>

src/views/energy/electric.vue

@@ -2,60 +2,74 @@
  * @Author: zwq
  * @Date: 2021-11-19 10:55:33
  * @LastEditors: gtz
- * @LastEditTime: 2021-12-01 09:15:35
+ * @LastEditTime: 2021-12-16 19:57:51
  * @Description:
 -->
 <template>
   <div class="chart-container">
-    <el-row>
-      <el-row style="margin: 20px 0" :gutter="20">
-        <el-col>
-          <h3>用电分析</h3>
-        </el-col>
-      </el-row>
-      <el-row style="margin: 20px 0" :gutter="20">
-        <el-col style="width: 300px">
-          <el-card>
-            <p style="font-size: 18px">总电量（KW）：<strong style="font-size: 22px">123,109</strong></p>
-            <p>昨日用电量(KW)：1145</p>
-          </el-card>
-        </el-col>
-        <el-col style="width: 300px">
-          <el-card>
-            <p style="font-size: 18px">总电流（A）：<strong style="font-size: 22px">123,109</strong></p>
-            <p>昨日用电流（A）：1145</p>
-          </el-card>
-        </el-col>
-      </el-row>
+    <el-row :gutter="20">
+      <el-col :span="8">
+        <el-card class="base-container" style="height: 344px">
+          <el-row style="position: relative;">
+            <div class="base-container-titleline"></div>
+            <h3>用电分析</h3>
+          </el-row>
+          <el-row>
+            <el-col style="padding: 24px 0;border-bottom: 1px solid #EBEEF5">
+              <p
+                :title="'总电量（KW）：123,109'"
+                style="font-size: 16px; overflow: hidden; text-overflow:ellipsis; white-space: nowrap;"
+              >
+                <icon-svg style="position: relative; top: 2px" class="iconClass" name="总电量"></icon-svg>
+                总电量（KW）：<strong style="font-size: 32px; color: #3E6AF7">123,109</strong>
+              </p>
+              <p style="font-size: 14px; text-indent: 20px;">昨日用电量(KW)：1145</p>
+            </el-col>
+            <el-col style="padding: 24px 0;">
+              <p
+                :title="'总电流（A）：123,109'"
+                style="font-size: 16px; overflow: hidden; text-overflow:ellipsis; white-space: nowrap;"
+              >
+                <icon-svg style="position: relative; top: 2px" class="iconClass" name="总电流"></icon-svg>
+                总电流（A）：<strong style="font-size: 32px; color: #73DEB3">123,109</strong>
+              </p>
+              <p style="font-size: 14px; text-indent: 20px;">昨日用电流（A）：1145</p>
+            </el-col>
+          </el-row>
+        </el-card>
+      </el-col>
+      <el-col :span="16">
+        <el-card class="base-container" style="height: 344px; position: relative;">
+          <el-row style="position: absolute; z-index: 10; right: 20px">
+            <el-checkbox-group size="small" :min="1" v-model="chartType" style="float: left">
+              <el-checkbox-button label="折线" />
+              <el-checkbox-button label="柱状" />
+            </el-checkbox-group>
+            <el-radio-group style="margin: 0 10px; position:relative; bottom: 2px" size="small" v-model="eleType" @change="changeEleType">
+              <el-radio-button label="日"></el-radio-button>
+              <el-radio-button label="周"></el-radio-button>
+              <el-radio-button label="月"></el-radio-button>
+              <el-radio-button label="年"></el-radio-button>
+            </el-radio-group>
+            <el-date-picker
+              size="small"
+              v-model="date"
+              :type="datePickerType[eleType].type"
+              :format="datePickerType[eleType].format"
+              :placeholder="'选择' + datePickerType[eleType].placeholder"
+            />
+          </el-row>
+          <el-row style="height: 300px">
+            <chart height="100%" width="100%" :title="eleType" titleFooter="用电量（KW）" :dataList="dataList" :lastDataList="lastDataList" :chartType="chartType" />
+          </el-row>
+        </el-card>
+      </el-col>
     </el-row>
-    <el-row style="margin: 20px 0" :gutter="20">
-      <el-col style="margin: 20px 0">
-        <el-checkbox-group :min="1" v-model="chartType" style="float: left">
-          <el-checkbox-button label="折线" />
-          <el-checkbox-button label="柱状" />
-        </el-checkbox-group>
-        <el-row style="float: right">
-          <el-radio-group v-model="eleType" @change="changeEleType">
-            <el-radio-button label="日"></el-radio-button>
-            <el-radio-button label="周"></el-radio-button>
-            <el-radio-button label="月"></el-radio-button>
-            <el-radio-button label="年"></el-radio-button>
-          </el-radio-group>
-          <el-date-picker
-            v-model="date"
-            :type="datePickerType[eleType].type"
-            :format="datePickerType[eleType].format"
-            :placeholder="'选择' + datePickerType[eleType].placeholder"
-          />
-        </el-row>
-      </el-col>
-      <el-col style="height: 500px">
-        <chart height="100%" width="100%" :title="eleType" titleFooter="用电量（KW）" :dataList="dataList" :lastDataList="lastDataList" :chartType="chartType" />
-      </el-col>
+    <el-card class="base-container" style="margin-top: 20px; min-height: 540px">
       <el-col style="margin: 20px 0">
         <el-tabs type="border-card">
           <el-tab-pane v-for="item in yaoluList" :key="item.id">
-            <el-row style="width: 200px; height: 120px" slot="label" @click.native="handleTab(item.id)">
+            <el-row style="width: 174px; height: 110px; text-align: right" slot="label" @click.native="handleTab(item.id)">
               <el-col :span="12">
                 <el-row style="margin-top: 24px; line-height: 24px; height: 24px; font-size: 16px; font-weight: bold">
                   {{ item.name }}(KW)
@@ -72,26 +86,25 @@
               </el-col>
             </el-row>
             <el-row style="height: 300px">
-              <el-col style="margin: 20px 0">
-                <el-checkbox-group :min="1" v-model="chartType" style="float: left">
+              <el-row style="position: absolute; z-index: 10; right: 20px">
+                <el-checkbox-group size="small" :min="1" v-model="chartType" style="float: left">
                   <el-checkbox-button label="折线" />
                   <el-checkbox-button label="柱状" />
                 </el-checkbox-group>
-                <el-row style="float: right">
-                  <el-radio-group v-model="eleType" @change="changeEleType">
-                    <el-radio-button label="日"></el-radio-button>
-                    <el-radio-button label="周"></el-radio-button>
-                    <el-radio-button label="月"></el-radio-button>
-                    <el-radio-button label="年"></el-radio-button>
-                  </el-radio-group>
-                  <el-date-picker
-                    v-model="date"
-                    :type="datePickerType[eleType].type"
-                    :format="datePickerType[eleType].format"
-                    :placeholder="'选择' + datePickerType[eleType].placeholder"
-                  />
-                </el-row>
-              </el-col>
+                <el-radio-group style="margin: 0 10px; position:relative; bottom: 2px" size="small" v-model="eleType" @change="changeEleType">
+                  <el-radio-button label="日"></el-radio-button>
+                  <el-radio-button label="周"></el-radio-button>
+                  <el-radio-button label="月"></el-radio-button>
+                  <el-radio-button label="年"></el-radio-button>
+                </el-radio-group>
+                <el-date-picker
+                  size="small"
+                  v-model="date"
+                  :type="datePickerType[eleType].type"
+                  :format="datePickerType[eleType].format"
+                  :placeholder="'选择' + datePickerType[eleType].placeholder"
+                />
+              </el-row>
               <el-col style="height: 500px">
                 <chart height="100%" width="100%" :id="item.id" :showId="showId" :title="eleType" :titleHeader="item.name" titleFooter="用电量（KW）" :dataList="dataList" :lastDataList="lastDataList" :chartType="chartType" />
               </el-col>
@@ -99,7 +112,7 @@
           </el-tab-pane>
         </el-tabs>
       </el-col>
-    </el-row>
+    </el-card>
   </div>
 </template>
 
@@ -310,11 +323,11 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    name: '窑炉1',
+    name: '工业炉1',
     value: 63,
     percent: 11,
     data: [
@@ -348,7 +361,7 @@ const yaoluList = [
   },
   {
     id: 2,
-    name: '窑炉2',
+    name: '工业炉2',
     value: 44,
     percent: 8,
     data: [
@@ -382,7 +395,7 @@ const yaoluList = [
   },
   {
     id: 3,
-    name: '窑炉3',
+    name: '工业炉3',
     value: 56,
     percent: 9,
     data: [
@@ -416,7 +429,7 @@ const yaoluList = [
   },
   {
     id: 4,
-    name: '窑炉4',
+    name: '工业炉4',
     value: 56,
     percent: 9,
     data: [
@@ -450,7 +463,7 @@ const yaoluList = [
   },
   {
     id: 5,
-    name: '窑炉5',
+    name: '工业炉5',
     value: 56,
     percent: 9,
     data: [
@@ -484,7 +497,7 @@ const yaoluList = [
   },
   {
     id: 6,
-    name: '窑炉6',
+    name: '工业炉6',
     value: 56,
     percent: 9,
     data: [
@@ -518,7 +531,7 @@ const yaoluList = [
   },
   {
     id: 7,
-    name: '窑炉7',
+    name: '工业炉7',
     value: 56,
     percent: 9,
     data: [
@@ -552,7 +565,7 @@ const yaoluList = [
   },
   {
     id: 8,
-    name: '窑炉8',
+    name: '工业炉8',
     value: 56,
     percent: 9,
     data: [
@@ -586,7 +599,7 @@ const yaoluList = [
   },
   {
     id: 9,
-    name: '窑炉9',
+    name: '工业炉9',
     value: 56,
     percent: 9,
     data: [
@@ -620,7 +633,7 @@ const yaoluList = [
   },
   {
     id: 10,
-    name: '窑炉10',
+    name: '工业炉10',
     value: 56,
     percent: 9,
     data: [
@@ -654,7 +667,7 @@ const yaoluList = [
   },
   {
     id: 11,
-    name: '窑炉11',
+    name: '工业炉11',
     value: 56,
     percent: 9,
     data: [
@@ -752,15 +765,17 @@ export default {
 .chart-container {
   position: relative;
   width: 100%;
-  min-height: calc(100vh - 124px);
+  min-height: calc(100vh - 138px);
 }
 </style>
 
 <style lang="scss">
-.el-tabs__item{
-  height: 120px;
-}
-.el-tabs__nav-next, .el-tabs__nav-prev {
-  line-height: 120px;
+.chart-container {
+  .el-tabs__item{
+    height: 120px;
+  }
+  .el-tabs__nav-next, .el-tabs__nav-prev {
+    line-height: 120px;
+  }
 }
 </style>

src/views/energy/gas-acquisition.vue

@@ -0,0 +1,272 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-19 10:55:33
+ * @LastEditors: zwq
+ * @LastEditTime: 2021-12-17 16:01:13
+ * @Description:
+-->
+<template>
+  <div class="chart-container">
+    <el-row>
+      <el-col :span="2">
+        <div class="kiln-electric-treebox">
+          <el-tree
+            :data="yaoluList"
+            @node-click="handleNode"
+            :highlight-current="true"
+          />
+        </div>
+      </el-col>
+      <el-col :span="22">
+        <el-card class="base-container" style="min-height: 540px">
+          <el-row style="z-index: 10;float:right;margin-right:20px">
+            <el-radio-group
+              style="margin: 0 20px; position:relative; bottom: 2px"
+              size="small"
+              v-model="eleType"
+              @change="changeEleType"
+            >
+              <el-radio-button label="日"></el-radio-button>
+              <el-radio-button label="周"></el-radio-button>
+              <el-radio-button label="月"></el-radio-button>
+              <el-radio-button label="年"></el-radio-button>
+            </el-radio-group>
+            <el-date-picker
+              size="small"
+              v-model="date"
+              :type="datePickerType[eleType].type"
+              :format="datePickerType[eleType].format"
+              :placeholder="'选择' + datePickerType[eleType].placeholder"
+            />
+            <el-button size="small" @click="getDataList()">
+              <icon-svg class="iconClass" name="sousuo"></icon-svg>
+              查询
+            </el-button>
+          </el-row>
+          <el-col style="height: 600px">
+            <el-table
+              :data="dataList"
+              :stripe="true"
+              :header-cell-style="{
+                background: '#eef1f6',
+                color: '#606266',
+                height: '56px'
+              }"
+              v-loading="dataListLoading"
+              style="width: 100%;padding:20px"
+            >
+              <el-table-column
+                type="index"
+                header-align="center"
+                align="center"
+                label="序号"
+                width="50"
+              >
+              </el-table-column>
+              <el-table-column
+                prop="createTime"
+                header-align="center"
+                align="center"
+                label="采集时间"
+              >
+              </el-table-column>
+              <el-table-column prop="vehicleName" label="氮气流量">
+              </el-table-column>
+              <el-table-column prop="code" label="甲醇流量"> </el-table-column>
+              <el-table-column prop="vehicleAlias" label="丙烷流量">
+              </el-table-column>
+              <el-table-column prop="anqi" label="氨气流量"> </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>
+          </el-col>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+// 日期类型
+const datePickerType = {
+  日: {
+    type: 'date',
+    format: '',
+    placeholder: '日期'
+  },
+  周: {
+    type: 'week',
+    format: 'yyyy 第 WW 周',
+    placeholder: '周'
+  },
+  月: {
+    type: 'month',
+    format: '',
+    placeholder: '月'
+  },
+  年: {
+    type: 'year',
+    format: '',
+    placeholder: '年'
+  }
+}
+
+// 工业炉列表
+const yaoluList = [
+  {
+    id: 1,
+    label: '工业炉1'
+  },
+  {
+    id: 2,
+    label: '工业炉2'
+  },
+  {
+    id: 3,
+    label: '工业炉3'
+  },
+  {
+    id: 4,
+    label: '工业炉4'
+  },
+  {
+    id: 5,
+    label: '工业炉5'
+  },
+  {
+    id: 6,
+    label: '工业炉6'
+  },
+  {
+    id: 7,
+    label: '工业炉7'
+  },
+  {
+    id: 8,
+    label: '工业炉8'
+  },
+  {
+    id: 9,
+    label: '工业炉9'
+  },
+  {
+    id: 10,
+    label: '工业炉10'
+  },
+  {
+    id: 11,
+    label: '工业炉11'
+  }
+]
+
+export default {
+  name: 'gas-acquisition',
+  data () {
+    return {
+      datePickerType,
+      yaoluList,
+      date: new Date(),
+      eleType: '年',
+      showId: 0,
+      yaoluIndex: 0,
+      yaoluName: '',
+      dataList: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPage: 0,
+      dataListLoading: false
+    }
+  },
+  mounted () {
+    this.showId = this.yaoluList[0].id
+    this.yaoluName = this.yaoluList[0].label
+  },
+  activated () {
+    this.getDataList()
+  },
+  methods: {
+      // 获取数据列表
+    getDataList () {
+      this.dataListLoading = true
+      this.$http({
+        url: this.$http.adornUrl('/vehicle/page'),
+        method: 'post',
+        data: this.$http.adornData({
+          'current': this.pageIndex,
+          'size': this.pageSize
+        })
+      }).then(({data}) => {
+        if (data && data.code === 0) {
+          this.dataList = data.data.records
+          this.totalPage = data.data.total
+        } else {
+          this.dataList = []
+          this.totalPage = 0
+        }
+        this.dataListLoading = false
+      })
+    },
+    changeEleType (v) {
+      switch (v) {
+        case '日':
+          this.date = new Date()
+          break
+        case '周':
+          this.date = new Date()
+          break
+        case '月':
+          this.date = new Date()
+          break
+        case '年':
+          this.date = new Date()
+          break
+      }
+    },
+      // 每页数
+    sizeChangeHandle (val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+      // 当前页
+    currentChangeHandle (val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+    handleNode (obj, node, e) {
+      if (!obj.children) {
+        this.showId = obj.id
+        this.yaoluName = obj.label
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" 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>

src/views/energy/kiln-electric.vue

@@ -2,110 +2,124 @@
  * @Author: zwq
  * @Date: 2021-11-19 10:55:33
  * @LastEditors: gtz
- * @LastEditTime: 2021-12-01 09:16:16
+ * @LastEditTime: 2021-12-16 19:58:14
  * @Description:
 -->
 <template>
   <div class="chart-container">
     <el-row>
-      <el-col :span="4">
+      <el-col :span="2">
         <div class="kiln-electric-treebox">
           <el-tree :data="yaoluList" @node-click="handleNode" />
         </div>
       </el-col>
-      <el-col :span="20">
-        <el-row>
-          <el-row style="margin: 20px 0" :gutter="20">
-            <el-col>
-              <h3>用电分析</h3>
-            </el-col>
-          </el-row>
-          <el-row style="margin: 20px 0" :gutter="20">
-            <el-col style="width: 300px">
-              <el-card>
-                <p style="font-size: 18px">总电量（KW）：<strong style="font-size: 22px">123,109</strong></p>
-                <p>昨日用电量(KW)：1145</p>
-              </el-card>
-            </el-col>
-            <el-col style="width: 300px">
-              <el-card>
-                <p style="font-size: 18px">总电流（A）：<strong style="font-size: 22px">123,109</strong></p>
-                <p>昨日用电流（A）：1145</p>
-              </el-card>
-            </el-col>
-          </el-row>
+      <el-col :span="22">
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-card class="base-container" style="height: 344px">
+              <el-row style="position: relative;">
+                <div class="base-container-titleline"></div>
+                <h3>用电分析</h3>
+              </el-row>
+              <el-row>
+                <el-col style="padding: 24px 0;border-bottom: 1px solid #EBEEF5">
+                  <p
+                    :title="'总电量（KW）：123,109'"
+                    style="font-size: 16px; overflow: hidden; text-overflow:ellipsis; white-space: nowrap;"
+                  >
+                    <icon-svg style="position: relative; top: 2px" class="iconClass" name="总电量"></icon-svg>
+                    总电量（KW）：<strong style="font-size: 32px; color: #3E6AF7">123,109</strong>
+                  </p>
+                  <p style="font-size: 14px; text-indent: 20px;">昨日用电量(KW)：1145</p>
+                </el-col>
+                <el-col style="padding: 24px 0;">
+                  <p
+                    :title="'总电流（A）：123,109'"
+                    style="font-size: 16px; overflow: hidden; text-overflow:ellipsis; white-space: nowrap;"
+                  >
+                    <icon-svg style="position: relative; top: 2px" class="iconClass" name="总电流"></icon-svg>
+                    总电流（A）：<strong style="font-size: 32px; color: #73DEB3">123,109</strong>
+                  </p>
+                  <p style="font-size: 14px; text-indent: 20px;">昨日用电流（A）：1145</p>
+                </el-col>
+              </el-row>
+            </el-card>
+          </el-col>
+          <el-col :span="16">
+            <el-card class="base-container" style="height: 344px; position: relative;">
+              <el-row style="position: absolute; z-index: 10; right: 20px">
+                <el-checkbox-group size="small" :min="1" v-model="chartType" style="float: left">
+                  <el-checkbox-button label="折线" />
+                  <el-checkbox-button label="柱状" />
+                </el-checkbox-group>
+                <el-radio-group style="margin: 0 10px; position:relative; bottom: 2px" size="small" v-model="eleType" @change="changeEleType">
+                  <el-radio-button label="日"></el-radio-button>
+                  <el-radio-button label="周"></el-radio-button>
+                  <el-radio-button label="月"></el-radio-button>
+                  <el-radio-button label="年"></el-radio-button>
+                </el-radio-group>
+                <el-date-picker
+                  size="small"
+                  v-model="date"
+                  :type="datePickerType[eleType].type"
+                  :format="datePickerType[eleType].format"
+                  :placeholder="'选择' + datePickerType[eleType].placeholder"
+                />
+              </el-row>
+              <el-col style="height: 300px">
+                <chart height="100%" width="100%" :showId="showId" :title="eleType" :titleHeader="yaoluName" titleFooter="用电量（KW）" :dataList="dataList" :lastDataList="lastDataList" :chartType="chartType" />
+              </el-col>
+            </el-card>
+          </el-col>
         </el-row>
-        <el-row style="margin: 20px 0" :gutter="20">
-          <el-col style="margin: 20px 0">
-            <el-checkbox-group :min="1" v-model="chartType" style="float: left">
+        <el-card class="base-container" style="margin-top: 20px; min-height: 540px">
+          <el-row style="position: absolute; z-index: 10; right: 20px">
+            <el-checkbox-group size="small" :min="1" v-model="chartType" style="float: left">
               <el-checkbox-button label="折线" />
               <el-checkbox-button label="柱状" />
             </el-checkbox-group>
-            <el-row style="float: right">
-              <el-radio-group v-model="eleType" @change="changeEleType">
-                <el-radio-button label="日"></el-radio-button>
-                <el-radio-button label="周"></el-radio-button>
-                <el-radio-button label="月"></el-radio-button>
-                <el-radio-button label="年"></el-radio-button>
-              </el-radio-group>
-              <el-date-picker
-                v-model="date"
-                :type="datePickerType[eleType].type"
-                :format="datePickerType[eleType].format"
-                :placeholder="'选择' + datePickerType[eleType].placeholder"
-              />
-            </el-row>
-          </el-col>
-          <el-col style="height: 500px">
-            <chart height="100%" width="100%" :showId="showId" :title="eleType" :titleHeader="yaoluName" titleFooter="用电量（KW）" :dataList="dataList" :lastDataList="lastDataList" :chartType="chartType" />
-          </el-col>
-          <el-col style="margin: 20px 0">
-            <el-checkbox-group :min="1" v-model="chartType" style="float: left">
-              <el-checkbox-button label="折线" />
-              <el-checkbox-button label="柱状" />
-            </el-checkbox-group>
-            <el-row style="float: right">
-              <el-radio-group v-model="eleType" @change="changeEleType">
-                <el-radio-button label="日"></el-radio-button>
-                <el-radio-button label="周"></el-radio-button>
-                <el-radio-button label="月"></el-radio-button>
-                <el-radio-button label="年"></el-radio-button>
-              </el-radio-group>
-              <el-date-picker
-                v-model="date"
-                :type="datePickerType[eleType].type"
-                :format="datePickerType[eleType].format"
-                :placeholder="'选择' + datePickerType[eleType].placeholder"
-              />
-            </el-row>
-          </el-col>
+            <el-radio-group style="margin: 0 10px; position:relative; bottom: 2px" size="small" v-model="eleType" @change="changeEleType">
+              <el-radio-button label="日"></el-radio-button>
+              <el-radio-button label="周"></el-radio-button>
+              <el-radio-button label="月"></el-radio-button>
+              <el-radio-button label="年"></el-radio-button>
+            </el-radio-group>
+            <el-date-picker
+              size="small"
+              v-model="date"
+              :type="datePickerType[eleType].type"
+              :format="datePickerType[eleType].format"
+              :placeholder="'选择' + datePickerType[eleType].placeholder"
+            />
+          </el-row>
           <el-col style="height: 500px">
             <chart height="100%" width="100%" :id="1" :showId="showId" :title="eleType" :titleHeader="yaoluName" titleFooter="电流趋势（A）" :dataList="dataList" :lastDataList="lastDataList" :chartType="chartType" />
           </el-col>
-          <el-col style="margin: 20px 0">
-            <el-checkbox-group :min="1" v-model="chartType" style="float: left">
+        </el-card>
+        <el-card class="base-container" style="margin-top: 20px; min-height: 540px">
+          <el-row style="position: absolute; z-index: 10; right: 20px">
+            <el-checkbox-group size="small" :min="1" v-model="chartType" style="float: left">
               <el-checkbox-button label="折线" />
               <el-checkbox-button label="柱状" />
             </el-checkbox-group>
-            <el-row style="float: right">
-              <el-radio-group v-model="eleType" @change="changeEleType">
-                <el-radio-button label="日"></el-radio-button>
-                <el-radio-button label="周"></el-radio-button>
-                <el-radio-button label="月"></el-radio-button>
-                <el-radio-button label="年"></el-radio-button>
-              </el-radio-group>
-              <el-date-picker
-                v-model="date"
-                :type="datePickerType[eleType].type"
-                :format="datePickerType[eleType].format"
-                :placeholder="'选择' + datePickerType[eleType].placeholder"
-              />
-            </el-row>
-          </el-col>
+            <el-radio-group style="margin: 0 10px; position:relative; bottom: 2px" size="small" v-model="eleType" @change="changeEleType">
+              <el-radio-button label="日"></el-radio-button>
+              <el-radio-button label="周"></el-radio-button>
+              <el-radio-button label="月"></el-radio-button>
+              <el-radio-button label="年"></el-radio-button>
+            </el-radio-group>
+            <el-date-picker
+              size="small"
+              v-model="date"
+              :type="datePickerType[eleType].type"
+              :format="datePickerType[eleType].format"
+              :placeholder="'选择' + datePickerType[eleType].placeholder"
+            />
+          </el-row>
           <el-col style="height: 500px">
             <chart height="100%" width="100%" :id="2" :showId="showId" :title="eleType" :titleHeader="yaoluName" titleFooter="电压趋势（V）" :dataList="dataList" :lastDataList="lastDataList" :chartType="chartType" />
           </el-col>
-        </el-row>
+        </el-card>
       </el-col>
     </el-row>
   </div>
@@ -318,11 +332,11 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    label: '窑炉1',
+    label: '工业炉1',
     value: 63,
     percent: 11,
     data: [
@@ -356,7 +370,7 @@ const yaoluList = [
   },
   {
     id: 2,
-    label: '窑炉2',
+    label: '工业炉2',
     value: 44,
     percent: 8,
     data: [
@@ -390,7 +404,7 @@ const yaoluList = [
   },
   {
     id: 3,
-    label: '窑炉3',
+    label: '工业炉3',
     value: 56,
     percent: 9,
     data: [
@@ -424,7 +438,7 @@ const yaoluList = [
   },
   {
     id: 4,
-    label: '窑炉4',
+    label: '工业炉4',
     value: 56,
     percent: 9,
     data: [
@@ -458,7 +472,7 @@ const yaoluList = [
   },
   {
     id: 5,
-    label: '窑炉5',
+    label: '工业炉5',
     value: 56,
     percent: 9,
     data: [
@@ -492,7 +506,7 @@ const yaoluList = [
   },
   {
     id: 6,
-    label: '窑炉6',
+    label: '工业炉6',
     value: 56,
     percent: 9,
     data: [
@@ -526,7 +540,7 @@ const yaoluList = [
   },
   {
     id: 7,
-    label: '窑炉7',
+    label: '工业炉7',
     value: 56,
     percent: 9,
     data: [
@@ -560,7 +574,7 @@ const yaoluList = [
   },
   {
     id: 8,
-    label: '窑炉8',
+    label: '工业炉8',
     value: 56,
     percent: 9,
     data: [
@@ -594,7 +608,7 @@ const yaoluList = [
   },
   {
     id: 9,
-    label: '窑炉9',
+    label: '工业炉9',
     value: 56,
     percent: 9,
     data: [
@@ -628,7 +642,7 @@ const yaoluList = [
   },
   {
     id: 10,
-    label: '窑炉10',
+    label: '工业炉10',
     value: 56,
     percent: 9,
     data: [
@@ -662,7 +676,7 @@ const yaoluList = [
   },
   {
     id: 11,
-    label: '窑炉11',
+    label: '工业炉11',
     value: 56,
     percent: 9,
     data: [
@@ -771,21 +785,18 @@ export default {
 .chart-container {
   position: relative;
   width: 100%;
-  min-height: calc(100vh - 124px);
-  .kiln-electric-treebox {
-    width: 100%;
-    border: 1px solid #eeeeee;
-    border-radius: 5px;
-    padding: 10px;
-  }
+  min-height: calc(100vh - 138px);
+
 }
 </style>
 
 <style lang="scss">
-.el-tabs__item{
-  height: 120px;
-}
-.el-tabs__nav-next, .el-tabs__nav-prev {
-  line-height: 120px;
+.chart-container {
+  .el-tabs__item{
+    height: 120px;
+  }
+  .el-tabs__nav-next, .el-tabs__nav-prev {
+    line-height: 120px;
+  }
 }
 </style>

src/views/energy/kiln-speed.vue

@@ -2,50 +2,49 @@
  * @Author: zwq
  * @Date: 2021-11-19 10:55:33
  * @LastEditors: gtz
- * @LastEditTime: 2021-12-01 10:54:45
+ * @LastEditTime: 2021-12-16 15:41:00
  * @Description:
 -->
 <template>
   <div class="chart-container">
     <el-row>
-      <el-col :span="4">
+      <el-col :span="2">
         <div class="kiln-electric-treebox">
           <el-tree :data="yaoluList" @node-click="handleNode" />
         </div>
       </el-col>
-      <el-col :span="20">
-        <el-row style="margin: 20px 0" :gutter="20">
-          <el-col style="margin: 20px 0">
-            <el-checkbox-group :min="1" v-model="chartType" style="float: left">
+      <el-col :span="22">
+        <el-card class="base-container" style="min-height: 540px">
+          <el-row style="position: absolute; z-index: 10; right: 20px">
+            <el-checkbox-group size="small" :min="1" v-model="chartType" style="float: left">
               <el-checkbox-button label="折线" />
               <el-checkbox-button label="柱状" />
             </el-checkbox-group>
-            <el-row style="float: right">
-              <el-radio-group v-model="eleType" @change="changeEleType">
-                <el-radio-button label="日"></el-radio-button>
-                <el-radio-button label="周"></el-radio-button>
-                <el-radio-button label="月"></el-radio-button>
-                <el-radio-button label="年"></el-radio-button>
-              </el-radio-group>
-              <el-date-picker
-                v-model="date"
-                :type="datePickerType[eleType].type"
-                :format="datePickerType[eleType].format"
-                :placeholder="'选择' + datePickerType[eleType].placeholder"
-              />
-            </el-row>
-          </el-col>
+            <el-radio-group style="margin: 0 10px; position:relative; bottom: 2px" size="small" v-model="eleType" @change="changeEleType">
+              <el-radio-button label="日"></el-radio-button>
+              <el-radio-button label="周"></el-radio-button>
+              <el-radio-button label="月"></el-radio-button>
+              <el-radio-button label="年"></el-radio-button>
+            </el-radio-group>
+            <el-date-picker
+              size="small"
+              v-model="date"
+              :type="datePickerType[eleType].type"
+              :format="datePickerType[eleType].format"
+              :placeholder="'选择' + datePickerType[eleType].placeholder"
+            />
+          </el-row>
           <el-col style="height: 500px">
             <chart height="100%" width="100%" :showId="showId" :title="eleType" :titleHeader="yaoluName" titleFooter="速度参数（转/s）" :dataList="dataList" :lastDataList="lastDataList" :chartType="chartType" />
           </el-col>
-        </el-row>
+        </el-card>
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
-import Chart from '@/components/Charts/MixChart.1'
+import Chart from '@/components/Charts/MixChart'
 import ringChart from '@/components/Charts/RingChart'
 import lineChart from '@/components/Charts/LineChart.1'
 
@@ -251,11 +250,11 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    label: '窑炉1',
+    label: '工业炉1',
     value: 63,
     percent: 11,
     data: [
@@ -289,7 +288,7 @@ const yaoluList = [
   },
   {
     id: 2,
-    label: '窑炉2',
+    label: '工业炉2',
     value: 44,
     percent: 8,
     data: [
@@ -323,7 +322,7 @@ const yaoluList = [
   },
   {
     id: 3,
-    label: '窑炉3',
+    label: '工业炉3',
     value: 56,
     percent: 9,
     data: [
@@ -357,7 +356,7 @@ const yaoluList = [
   },
   {
     id: 4,
-    label: '窑炉4',
+    label: '工业炉4',
     value: 56,
     percent: 9,
     data: [
@@ -391,7 +390,7 @@ const yaoluList = [
   },
   {
     id: 5,
-    label: '窑炉5',
+    label: '工业炉5',
     value: 56,
     percent: 9,
     data: [
@@ -425,7 +424,7 @@ const yaoluList = [
   },
   {
     id: 6,
-    label: '窑炉6',
+    label: '工业炉6',
     value: 56,
     percent: 9,
     data: [
@@ -459,7 +458,7 @@ const yaoluList = [
   },
   {
     id: 7,
-    label: '窑炉7',
+    label: '工业炉7',
     value: 56,
     percent: 9,
     data: [
@@ -493,7 +492,7 @@ const yaoluList = [
   },
   {
     id: 8,
-    label: '窑炉8',
+    label: '工业炉8',
     value: 56,
     percent: 9,
     data: [
@@ -527,7 +526,7 @@ const yaoluList = [
   },
   {
     id: 9,
-    label: '窑炉9',
+    label: '工业炉9',
     value: 56,
     percent: 9,
     data: [
@@ -561,7 +560,7 @@ const yaoluList = [
   },
   {
     id: 10,
-    label: '窑炉10',
+    label: '工业炉10',
     value: 56,
     percent: 9,
     data: [
@@ -595,7 +594,7 @@ const yaoluList = [
   },
   {
     id: 11,
-    label: '窑炉11',
+    label: '工业炉11',
     value: 56,
     percent: 9,
     data: [
@@ -699,21 +698,18 @@ export default {
 .chart-container {
   position: relative;
   width: 100%;
-  min-height: calc(100vh - 124px);
-  .kiln-electric-treebox {
-    width: 100%;
-    border: 1px solid #eeeeee;
-    border-radius: 5px;
-    padding: 10px;
-  }
+  min-height: calc(100vh - 138px);
+
 }
 </style>
 
 <style lang="scss">
-.el-tabs__item{
-  height: 120px;
-}
-.el-tabs__nav-next, .el-tabs__nav-prev {
-  line-height: 120px;
+.chart-container {
+  .el-tabs__item{
+    height: 120px;
+  }
+  .el-tabs__nav-next, .el-tabs__nav-prev {
+    line-height: 120px;
+  }
 }
 </style>

src/views/energy/methanol.vue

@@ -0,0 +1,737 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-19 10:55:33
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-17 17:16:10
+ * @Description:
+-->
+<template>
+  <div class="chart-container">
+    <el-row>
+      <el-col :span="2">
+        <div class="kiln-electric-treebox">
+          <el-tree :data="yaoluList" @node-click="handleNode" />
+        </div>
+      </el-col>
+      <el-col :span="22">
+        <el-row>
+          <el-col :span="8">
+            <el-card class="base-container" style="height: 214px">
+              <el-row style="position: relative;">
+                <div class="base-container-titleline"></div>
+                <h3>甲醇流量分析</h3>
+              </el-row>
+              <el-row>
+                <el-col style="padding: 24px 0">
+                  <p
+                    :title="'甲醇流量（立方米）：123,109'"
+                    style="font-size: 16px; overflow: hidden; text-overflow:ellipsis; white-space: nowrap;"
+                  >
+                    <icon-svg style="position: relative; top: 2px" class="iconClass" name="甲醇"></icon-svg>
+                    甲醇流量（立方米）：<strong style="font-size: 32px; color: #403ef7">123,109</strong>
+                  </p>
+                  <p style="font-size: 14px; text-indent: 20px;">昨日甲醇流量(立方米)：1145</p>
+                </el-col>
+              </el-row>
+            </el-card>
+          </el-col>
+        </el-row>
+        <el-card class="base-container" style="margin-top: 20px; min-height: 540px">
+          <el-row style="position: absolute; z-index: 10; right: 20px">
+            <el-checkbox-group size="small" :min="1" v-model="chartType" style="float: left">
+              <el-checkbox-button label="折线" />
+              <el-checkbox-button label="柱状" />
+            </el-checkbox-group>
+            <el-radio-group style="margin: 0 10px; position:relative; bottom: 2px" size="small" v-model="eleType" @change="changeEleType">
+              <el-radio-button label="日"></el-radio-button>
+              <el-radio-button label="周"></el-radio-button>
+              <el-radio-button label="月"></el-radio-button>
+              <el-radio-button label="年"></el-radio-button>
+            </el-radio-group>
+            <el-date-picker
+              size="small"
+              v-model="date"
+              :type="datePickerType[eleType].type"
+              :format="datePickerType[eleType].format"
+              :placeholder="'选择' + datePickerType[eleType].placeholder"
+            />
+          </el-row>
+          <el-col style="height: 500px">
+            <chart height="100%" width="100%" :title="eleType" :showId="showId" :titleHeader="yaoluName" titleFooter="甲醇使用量（㎡）" :dataList="dataList" :lastDataList="lastDataList" :chartType="chartType" />
+          </el-col>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import Chart from '@/components/Charts/MixChart'
+import ringChart from '@/components/Charts/RingChart'
+import lineChart from '@/components/Charts/LineChart.1'
+
+// 日发电数据
+const eleDayList = [
+  { time: '01:00', value: 22 },
+  { time: '02:00', value: 12 },
+  { time: '03:00', value: 32 },
+  { time: '04:00', value: 52 },
+  { time: '05:00', value: 22 },
+  { time: '06:00', value: 12 },
+  { time: '07:00', value: 42 },
+  { time: '08:00', value: 32 },
+  { time: '09:00', value: 22 },
+  { time: '10:00', value: 12 },
+  { time: '11:00', value: 12 },
+  { time: '12:00', value: 52 },
+  { time: '13:00', value: 62 },
+  { time: '14:00', value: 62 },
+  { time: '15:00', value: 32 },
+  { time: '16:00', value: 22 },
+  { time: '17:00', value: 12 },
+  { time: '18:00', value: 2 },
+  { time: '19:00', value: 92 },
+  { time: '20:00', value: 12 },
+  { time: '21:00', value: 52 },
+  { time: '22:00', value: 26 },
+  { time: '23:00', value: 21 },
+  { time: '24:00', value: 28 }
+]
+
+// 前日发电数据
+const lastEleDayList = [
+  { time: '01:00', value: 22 },
+  { time: '02:00', value: 62 },
+  { time: '03:00', value: 23 },
+  { time: '04:00', value: 25 },
+  { time: '05:00', value: 72 },
+  { time: '06:00', value: 21 },
+  { time: '07:00', value: 24 },
+  { time: '08:00', value: 23 },
+  { time: '09:00', value: 20 },
+  { time: '10:00', value: 14 },
+  { time: '11:00', value: 18 },
+  { time: '12:00', value: 72 },
+  { time: '13:00', value: 22 },
+  { time: '14:00', value: 12 },
+  { time: '15:00', value: 62 },
+  { time: '16:00', value: 72 },
+  { time: '17:00', value: 22 },
+  { time: '18:00', value: 46 },
+  { time: '19:00', value: 52 },
+  { time: '20:00', value: 22 },
+  { time: '21:00', value: 25 },
+  { time: '22:00', value: 62 },
+  { time: '23:00', value: 12 },
+  { time: '24:00', value: 82 }
+]
+
+// 周发电数据
+const eleWeekList = [
+  { time: '周日', value: 22 },
+  { time: '周一', value: 12 },
+  { time: '周二', value: 32 },
+  { time: '周三', value: 52 },
+  { time: '周四', value: 22 },
+  { time: '周五', value: 12 },
+  { time: '周六', value: 42 }
+]
+
+// 上周发电数据
+const lastEleWeekList = [
+  { time: '周日', value: 111 },
+  { time: '周一', value: 72 },
+  { time: '周二', value: 312 },
+  { time: '周三', value: 52 },
+  { time: '周四', value: 82 },
+  { time: '周五', value: 152 },
+  { time: '周六', value: 52 }
+]
+
+// 月发电数据
+const eleMonthList = [
+  { time: '1日', value: 12 },
+  { time: '2日', value: 12 },
+  { time: '3日', value: 32 },
+  { time: '4日', value: 52 },
+  { time: '5日', value: 22 },
+  { time: '6日', value: 12 },
+  { time: '7日', value: 42 },
+  { time: '8日', value: 32 },
+  { time: '9日', value: 75 },
+  { time: '10日', value: 124 },
+  { time: '11日', value: 234 },
+  { time: '12日', value: 542 },
+  { time: '13日', value: 644 },
+  { time: '14日', value: 62 },
+  { time: '15日', value: 32 },
+  { time: '16日', value: 565 },
+  { time: '17日', value: 12 },
+  { time: '18日', value: 2 },
+  { time: '19日', value: 92 },
+  { time: '20日', value: 12 },
+  { time: '21日', value: 52 },
+  { time: '22日', value: 176 },
+  { time: '23日', value: 21 },
+  { time: '24日', value: 64 },
+  { time: '25日', value: 92 },
+  { time: '26日', value: 124 },
+  { time: '27日', value: 44 },
+  { time: '28日', value: 226 },
+  { time: '29日', value: 17 },
+  { time: '30日', value: 28 }
+]
+
+// 上月发电数据
+const lastEleMonthList = [
+  { time: '1日', value: 22 },
+  { time: '2日', value: 236 },
+  { time: '3日', value: 32 },
+  { time: '4日', value: 312 },
+  { time: '5日', value: 22 },
+  { time: '6日', value: 12 },
+  { time: '7日', value: 42 },
+  { time: '8日', value: 32 },
+  { time: '9日', value: 22 },
+  { time: '10日', value: 84 },
+  { time: '11日', value: 25 },
+  { time: '12日', value: 52 },
+  { time: '13日', value: 122 },
+  { time: '14日', value: 62 },
+  { time: '15日', value: 32 },
+  { time: '16日', value: 22 },
+  { time: '17日', value: 12 },
+  { time: '18日', value: 2 },
+  { time: '19日', value: 92 },
+  { time: '20日', value: 12 },
+  { time: '21日', value: 52 },
+  { time: '22日', value: 26 },
+  { time: '23日', value: 81 },
+  { time: '24日', value: 28 },
+  { time: '25日', value: 52 },
+  { time: '26日', value: 12 },
+  { time: '27日', value: 47 },
+  { time: '28日', value: 12 },
+  { time: '29日', value: 21 },
+  { time: '30日', value: 28 }
+]
+
+// 年发电数据
+const eleYearList = [
+  { time: '1月', value: 256 },
+  { time: '2月', value: 12 },
+  { time: '3月', value: 32 },
+  { time: '4月', value: 52 },
+  { time: '5月', value: 22 },
+  { time: '6月', value: 12 },
+  { time: '7月', value: 42 },
+  { time: '8月', value: 32 },
+  { time: '9月', value: 22 },
+  { time: '10月', value: 12 },
+  { time: '11月', value: 12 },
+  { time: '12月', value: 52 }
+]
+
+// 去年发电数据
+const lastEleYearList = [
+  { time: '1月', value: 22 },
+  { time: '2月', value: 12 },
+  { time: '3月', value: 42 },
+  { time: '4月', value: 52 },
+  { time: '5月', value: 224 },
+  { time: '6月', value: 12 },
+  { time: '7月', value: 42 },
+  { time: '8月', value: 32 },
+  { time: '9月', value: 44 },
+  { time: '10月', value: 12 },
+  { time: '11月', value: 168 },
+  { time: '12月', value: 51 }
+]
+
+// 日期类型
+const datePickerType = {
+  '日': {
+    type: 'date',
+    format: '',
+    placeholder: '日期'
+  },
+  '周': {
+    type: 'week',
+    format: 'yyyy 第 WW 周',
+    placeholder: '周'
+  },
+  '月': {
+    type: 'month',
+    format: '',
+    placeholder: '月'
+  },
+  '年': {
+    type: 'year',
+    format: '',
+    placeholder: '年'
+  }
+}
+
+// 工业炉列表
+const yaoluList = [
+  {
+    id: 1,
+    label: '工业炉1',
+    value: 63,
+    percent: 11,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 2,
+    label: '工业炉2',
+    value: 44,
+    percent: 8,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 3,
+    label: '工业炉3',
+    value: 56,
+    percent: 9,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 4,
+    label: '工业炉4',
+    value: 56,
+    percent: 9,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 5,
+    label: '工业炉5',
+    value: 56,
+    percent: 9,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 6,
+    label: '工业炉6',
+    value: 56,
+    percent: 9,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 7,
+    label: '工业炉7',
+    value: 56,
+    percent: 9,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 8,
+    label: '工业炉8',
+    value: 56,
+    percent: 9,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 9,
+    label: '工业炉9',
+    value: 56,
+    percent: 9,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 10,
+    label: '工业炉10',
+    value: 56,
+    percent: 9,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 11,
+    label: '工业炉11',
+    value: 56,
+    percent: 9,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  }
+]
+
+export default {
+  name: 'methanol',
+  components: { Chart, ringChart, lineChart },
+  data () {
+    return {
+      eleDayList,
+      eleWeekList,
+      eleMonthList,
+      eleYearList,
+      lastEleDayList,
+      lastEleWeekList,
+      lastEleMonthList,
+      lastEleYearList,
+      datePickerType,
+      yaoluList,
+      date: new Date(),
+      dataList: [],
+      lastDataList: [],
+      chartType: ['柱状'],
+      eleType: '年',
+      showId: 0,
+      yaoluIndex: 0,
+      yaoluName: ''
+    }
+  },
+  mounted () {
+    this.dataList = this.eleYearList
+    this.lastDataList = this.lastEleYearList
+    this.showId = this.yaoluList[0].id
+    this.yaoluName = this.yaoluList[0].label
+  },
+  methods: {
+    changeEleType (v) {
+      switch (v) {
+        case '日':
+          this.dataList = this.eleDayList
+          this.lastDataList = this.lastEleDayList
+          this.date = new Date()
+          break
+        case '周':
+          this.dataList = this.eleWeekList
+          this.lastDataList = this.lastEleWeekList
+          this.date = new Date()
+          break
+        case '月':
+          this.dataList = this.eleMonthList
+          this.lastDataList = this.lastEleMonthList
+          this.date = new Date()
+          break
+        case '年':
+          this.dataList = this.eleYearList
+          this.lastDataList = this.lastEleYearList
+          this.date = new Date()
+          break
+      }
+    },
+    handleNode (obj, node, e) {
+      if (!(obj.children)) {
+        this.showId = obj.id
+        this.yaoluName = obj.label
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" 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>

src/views/energy/nitrogen.vue

@@ -2,58 +2,64 @@
  * @Author: zwq
  * @Date: 2021-11-19 10:55:33
  * @LastEditors: gtz
- * @LastEditTime: 2021-12-01 09:17:20
+ * @LastEditTime: 2021-12-16 20:53:52
  * @Description:
 -->
 <template>
   <div class="chart-container">
     <el-row>
-      <el-col :span="4">
+      <el-col :span="2">
         <div class="kiln-electric-treebox">
           <el-tree :data="yaoluList" @node-click="handleNode" />
         </div>
       </el-col>
-      <el-col :span="20">
+      <el-col :span="22">
         <el-row>
-          <el-row style="margin: 20px 0" :gutter="20">
-            <el-col>
-              <h3>氮气流量分析</h3>
-            </el-col>
-          </el-row>
-          <el-row style="margin: 20px 0" :gutter="20">
-            <el-col style="width: 400px">
-              <el-card>
-                <p style="font-size: 18px">氮气流量（立方米）：<strong style="font-size: 22px">123,109</strong></p>
-                <p>昨日氮气流量(立方米)：1145</p>
-              </el-card>
-            </el-col>
-          </el-row>
+          <el-col :span="8">
+            <el-card class="base-container" style="height: 214px">
+              <el-row style="position: relative;">
+                <div class="base-container-titleline"></div>
+                <h3>氮气流量分析</h3>
+              </el-row>
+              <el-row>
+                <el-col style="padding: 24px 0">
+                  <p
+                    :title="'氮气流量（立方米）：123,109'"
+                    style="font-size: 16px; overflow: hidden; text-overflow:ellipsis; white-space: nowrap;"
+                  >
+                    <icon-svg style="position: relative; top: 2px" class="iconClass" name="氮气"></icon-svg>
+                    氮气流量（立方米）：<strong style="font-size: 32px; color: #f74d3e">123,109</strong>
+                  </p>
+                  <p style="font-size: 14px; text-indent: 20px;">昨日氮气流量(立方米)：1145</p>
+                </el-col>
+              </el-row>
+            </el-card>
+          </el-col>
         </el-row>
-        <el-row style="margin: 20px 0" :gutter="20">
-          <el-col style="margin: 20px 0">
-            <el-checkbox-group :min="1" v-model="chartType" style="float: left">
+        <el-card class="base-container" style="margin-top: 20px; min-height: 540px">
+          <el-row style="position: absolute; z-index: 10; right: 20px">
+            <el-checkbox-group size="small" :min="1" v-model="chartType" style="float: left">
               <el-checkbox-button label="折线" />
               <el-checkbox-button label="柱状" />
             </el-checkbox-group>
-            <el-row style="float: right">
-              <el-radio-group v-model="eleType" @change="changeEleType">
-                <el-radio-button label="日"></el-radio-button>
-                <el-radio-button label="周"></el-radio-button>
-                <el-radio-button label="月"></el-radio-button>
-                <el-radio-button label="年"></el-radio-button>
-              </el-radio-group>
-              <el-date-picker
-                v-model="date"
-                :type="datePickerType[eleType].type"
-                :format="datePickerType[eleType].format"
-                :placeholder="'选择' + datePickerType[eleType].placeholder"
-              />
-            </el-row>
-          </el-col>
+            <el-radio-group style="margin: 0 10px; position:relative; bottom: 2px" size="small" v-model="eleType" @change="changeEleType">
+              <el-radio-button label="日"></el-radio-button>
+              <el-radio-button label="周"></el-radio-button>
+              <el-radio-button label="月"></el-radio-button>
+              <el-radio-button label="年"></el-radio-button>
+            </el-radio-group>
+            <el-date-picker
+              size="small"
+              v-model="date"
+              :type="datePickerType[eleType].type"
+              :format="datePickerType[eleType].format"
+              :placeholder="'选择' + datePickerType[eleType].placeholder"
+            />
+          </el-row>
           <el-col style="height: 500px">
             <chart height="100%" width="100%" :showId="showId" :title="eleType" :titleHeader="yaoluName" titleFooter="氮气使用量（㎡）" :dataList="dataList" :lastDataList="lastDataList" :chartType="chartType" />
           </el-col>
-        </el-row>
+        </el-card>
       </el-col>
     </el-row>
   </div>
@@ -266,11 +272,11 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    label: '窑炉1',
+    label: '工业炉1',
     value: 63,
     percent: 11,
     data: [
@@ -304,7 +310,7 @@ const yaoluList = [
   },
   {
     id: 2,
-    label: '窑炉2',
+    label: '工业炉2',
     value: 44,
     percent: 8,
     data: [
@@ -338,7 +344,7 @@ const yaoluList = [
   },
   {
     id: 3,
-    label: '窑炉3',
+    label: '工业炉3',
     value: 56,
     percent: 9,
     data: [
@@ -372,7 +378,7 @@ const yaoluList = [
   },
   {
     id: 4,
-    label: '窑炉4',
+    label: '工业炉4',
     value: 56,
     percent: 9,
     data: [
@@ -406,7 +412,7 @@ const yaoluList = [
   },
   {
     id: 5,
-    label: '窑炉5',
+    label: '工业炉5',
     value: 56,
     percent: 9,
     data: [
@@ -440,7 +446,7 @@ const yaoluList = [
   },
   {
     id: 6,
-    label: '窑炉6',
+    label: '工业炉6',
     value: 56,
     percent: 9,
     data: [
@@ -474,7 +480,7 @@ const yaoluList = [
   },
   {
     id: 7,
-    label: '窑炉7',
+    label: '工业炉7',
     value: 56,
     percent: 9,
     data: [
@@ -508,7 +514,7 @@ const yaoluList = [
   },
   {
     id: 8,
-    label: '窑炉8',
+    label: '工业炉8',
     value: 56,
     percent: 9,
     data: [
@@ -542,7 +548,7 @@ const yaoluList = [
   },
   {
     id: 9,
-    label: '窑炉9',
+    label: '工业炉9',
     value: 56,
     percent: 9,
     data: [
@@ -576,7 +582,7 @@ const yaoluList = [
   },
   {
     id: 10,
-    label: '窑炉10',
+    label: '工业炉10',
     value: 56,
     percent: 9,
     data: [
@@ -610,7 +616,7 @@ const yaoluList = [
   },
   {
     id: 11,
-    label: '窑炉11',
+    label: '工业炉11',
     value: 56,
     percent: 9,
     data: [
@@ -714,21 +720,17 @@ export default {
 .chart-container {
   position: relative;
   width: 100%;
-  min-height: calc(100vh - 124px);
-  .kiln-electric-treebox {
-    width: 100%;
-    border: 1px solid #eeeeee;
-    border-radius: 5px;
-    padding: 10px;
-  }
+  min-height: calc(100vh - 138px);
 }
 </style>
 
 <style lang="scss">
-.el-tabs__item{
-  height: 120px;
-}
-.el-tabs__nav-next, .el-tabs__nav-prev {
-  line-height: 120px;
+.chart-container {
+  .el-tabs__item{
+    height: 120px;
+  }
+  .el-tabs__nav-next, .el-tabs__nav-prev {
+    line-height: 120px;
+  }
 }
 </style>

src/views/energy/process-temperature.vue

@@ -2,43 +2,42 @@
  * @Author: zwq
  * @Date: 2021-11-19 10:55:33
  * @LastEditors: gtz
- * @LastEditTime: 2021-12-01 09:18:17
+ * @LastEditTime: 2021-12-16 20:15:11
  * @Description:
 -->
 <template>
   <div class="chart-container">
     <el-row>
-      <el-col :span="4">
+      <el-col :span="2">
         <div class="kiln-electric-treebox">
           <el-tree :data="yaoluList" @node-click="handleNode" />
         </div>
       </el-col>
-      <el-col :span="20">
-        <el-row style="margin: 20px 0" :gutter="20">
-          <el-col style="margin: 20px 0">
-            <el-checkbox-group :min="1" v-model="chartType" style="float: left">
+      <el-col :span="22">
+        <el-card class="base-container" style="min-height: 540px">
+          <el-row style="position: absolute; z-index: 10; right: 20px">
+            <el-checkbox-group size="small" :min="1" v-model="chartType" style="float: left">
               <el-checkbox-button label="折线" />
               <el-checkbox-button label="柱状" />
             </el-checkbox-group>
-            <el-row style="float: right">
-              <el-radio-group v-model="eleType" @change="changeEleType">
-                <el-radio-button label="日"></el-radio-button>
-                <el-radio-button label="周"></el-radio-button>
-                <el-radio-button label="月"></el-radio-button>
-                <el-radio-button label="年"></el-radio-button>
-              </el-radio-group>
-              <el-date-picker
-                v-model="date"
-                :type="datePickerType[eleType].type"
-                :format="datePickerType[eleType].format"
-                :placeholder="'选择' + datePickerType[eleType].placeholder"
-              />
-            </el-row>
-          </el-col>
+            <el-radio-group style="margin: 0 10px; position:relative; bottom: 2px" size="small" v-model="eleType" @change="changeEleType">
+              <el-radio-button label="日"></el-radio-button>
+              <el-radio-button label="周"></el-radio-button>
+              <el-radio-button label="月"></el-radio-button>
+              <el-radio-button label="年"></el-radio-button>
+            </el-radio-group>
+            <el-date-picker
+              size="small"
+              v-model="date"
+              :type="datePickerType[eleType].type"
+              :format="datePickerType[eleType].format"
+              :placeholder="'选择' + datePickerType[eleType].placeholder"
+            />
+          </el-row>
           <el-col style="height: 500px">
             <chart height="100%" width="100%" :title="eleType" :showId="showId" :titleHeader="yaoluName" titleFooter="加工温度（℃）" :dataList="dataList" :lastDataList="lastDataList" :chartType="chartType" />
           </el-col>
-        </el-row>
+        </el-card>
       </el-col>
     </el-row>
   </div>
@@ -251,11 +250,11 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    label: '窑炉1',
+    label: '工业炉1',
     value: 63,
     percent: 11,
     data: [
@@ -289,7 +288,7 @@ const yaoluList = [
   },
   {
     id: 2,
-    label: '窑炉2',
+    label: '工业炉2',
     value: 44,
     percent: 8,
     data: [
@@ -323,7 +322,7 @@ const yaoluList = [
   },
   {
     id: 3,
-    label: '窑炉3',
+    label: '工业炉3',
     value: 56,
     percent: 9,
     data: [
@@ -357,7 +356,7 @@ const yaoluList = [
   },
   {
     id: 4,
-    label: '窑炉4',
+    label: '工业炉4',
     value: 56,
     percent: 9,
     data: [
@@ -391,7 +390,7 @@ const yaoluList = [
   },
   {
     id: 5,
-    label: '窑炉5',
+    label: '工业炉5',
     value: 56,
     percent: 9,
     data: [
@@ -425,7 +424,7 @@ const yaoluList = [
   },
   {
     id: 6,
-    label: '窑炉6',
+    label: '工业炉6',
     value: 56,
     percent: 9,
     data: [
@@ -459,7 +458,7 @@ const yaoluList = [
   },
   {
     id: 7,
-    label: '窑炉7',
+    label: '工业炉7',
     value: 56,
     percent: 9,
     data: [
@@ -493,7 +492,7 @@ const yaoluList = [
   },
   {
     id: 8,
-    label: '窑炉8',
+    label: '工业炉8',
     value: 56,
     percent: 9,
     data: [
@@ -527,7 +526,7 @@ const yaoluList = [
   },
   {
     id: 9,
-    label: '窑炉9',
+    label: '工业炉9',
     value: 56,
     percent: 9,
     data: [
@@ -561,7 +560,7 @@ const yaoluList = [
   },
   {
     id: 10,
-    label: '窑炉10',
+    label: '工业炉10',
     value: 56,
     percent: 9,
     data: [
@@ -595,7 +594,7 @@ const yaoluList = [
   },
   {
     id: 11,
-    label: '窑炉11',
+    label: '工业炉11',
     value: 56,
     percent: 9,
     data: [
@@ -699,21 +698,18 @@ export default {
 .chart-container {
   position: relative;
   width: 100%;
-  min-height: calc(100vh - 124px);
-  .kiln-electric-treebox {
-    width: 100%;
-    border: 1px solid #eeeeee;
-    border-radius: 5px;
-    padding: 10px;
-  }
+  min-height: calc(100vh - 138px);
+
 }
 </style>
 
 <style lang="scss">
-.el-tabs__item{
-  height: 120px;
-}
-.el-tabs__nav-next, .el-tabs__nav-prev {
-  line-height: 120px;
+.chart-container {
+  .el-tabs__item{
+    height: 120px;
+  }
+  .el-tabs__nav-next, .el-tabs__nav-prev {
+    line-height: 120px;
+  }
 }
 </style>

src/views/energy/propane.vue

@@ -0,0 +1,737 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-19 10:55:33
+ * @LastEditors: gtz
+ * @LastEditTime: 2021-12-17 17:16:51
+ * @Description:
+-->
+<template>
+  <div class="chart-container">
+    <el-row>
+      <el-col :span="2">
+        <div class="kiln-electric-treebox">
+          <el-tree :data="yaoluList" @node-click="handleNode" />
+        </div>
+      </el-col>
+      <el-col :span="22">
+        <el-row>
+          <el-col :span="8">
+            <el-card class="base-container" style="height: 214px">
+              <el-row style="position: relative;">
+                <div class="base-container-titleline"></div>
+                <h3>丙烷流量分析</h3>
+              </el-row>
+              <el-row>
+                <el-col style="padding: 24px 0">
+                  <p
+                    :title="'丙烷流量（立方米）：123,109'"
+                    style="font-size: 16px; overflow: hidden; text-overflow:ellipsis; white-space: nowrap;"
+                  >
+                    <icon-svg style="position: relative; top: 2px" class="iconClass" name="丙烷"></icon-svg>
+                    丙烷流量（立方米）：<strong style="font-size: 32px; color: #1eece3">123,109</strong>
+                  </p>
+                  <p style="font-size: 14px; text-indent: 20px;">昨日丙烷流量(立方米)：1145</p>
+                </el-col>
+              </el-row>
+            </el-card>
+          </el-col>
+        </el-row>
+        <el-card class="base-container" style="margin-top: 20px; min-height: 540px">
+          <el-row style="position: absolute; z-index: 10; right: 20px">
+            <el-checkbox-group size="small" :min="1" v-model="chartType" style="float: left">
+              <el-checkbox-button label="折线" />
+              <el-checkbox-button label="柱状" />
+            </el-checkbox-group>
+            <el-radio-group style="margin: 0 10px; position:relative; bottom: 2px" size="small" v-model="eleType" @change="changeEleType">
+              <el-radio-button label="日"></el-radio-button>
+              <el-radio-button label="周"></el-radio-button>
+              <el-radio-button label="月"></el-radio-button>
+              <el-radio-button label="年"></el-radio-button>
+            </el-radio-group>
+            <el-date-picker
+              size="small"
+              v-model="date"
+              :type="datePickerType[eleType].type"
+              :format="datePickerType[eleType].format"
+              :placeholder="'选择' + datePickerType[eleType].placeholder"
+            />
+          </el-row>
+          <el-col style="height: 500px">
+            <chart height="100%" width="100%" :title="eleType" :showId="showId" :titleHeader="yaoluName" titleFooter="丙烷使用量（㎡）" :dataList="dataList" :lastDataList="lastDataList" :chartType="chartType" />
+          </el-col>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import Chart from '@/components/Charts/MixChart'
+import ringChart from '@/components/Charts/RingChart'
+import lineChart from '@/components/Charts/LineChart.1'
+
+// 日发电数据
+const eleDayList = [
+  { time: '01:00', value: 22 },
+  { time: '02:00', value: 12 },
+  { time: '03:00', value: 32 },
+  { time: '04:00', value: 52 },
+  { time: '05:00', value: 22 },
+  { time: '06:00', value: 12 },
+  { time: '07:00', value: 42 },
+  { time: '08:00', value: 32 },
+  { time: '09:00', value: 22 },
+  { time: '10:00', value: 12 },
+  { time: '11:00', value: 12 },
+  { time: '12:00', value: 52 },
+  { time: '13:00', value: 62 },
+  { time: '14:00', value: 62 },
+  { time: '15:00', value: 32 },
+  { time: '16:00', value: 22 },
+  { time: '17:00', value: 12 },
+  { time: '18:00', value: 2 },
+  { time: '19:00', value: 92 },
+  { time: '20:00', value: 12 },
+  { time: '21:00', value: 52 },
+  { time: '22:00', value: 26 },
+  { time: '23:00', value: 21 },
+  { time: '24:00', value: 28 }
+]
+
+// 前日发电数据
+const lastEleDayList = [
+  { time: '01:00', value: 22 },
+  { time: '02:00', value: 62 },
+  { time: '03:00', value: 23 },
+  { time: '04:00', value: 25 },
+  { time: '05:00', value: 72 },
+  { time: '06:00', value: 21 },
+  { time: '07:00', value: 24 },
+  { time: '08:00', value: 23 },
+  { time: '09:00', value: 20 },
+  { time: '10:00', value: 14 },
+  { time: '11:00', value: 18 },
+  { time: '12:00', value: 72 },
+  { time: '13:00', value: 22 },
+  { time: '14:00', value: 12 },
+  { time: '15:00', value: 62 },
+  { time: '16:00', value: 72 },
+  { time: '17:00', value: 22 },
+  { time: '18:00', value: 46 },
+  { time: '19:00', value: 52 },
+  { time: '20:00', value: 22 },
+  { time: '21:00', value: 25 },
+  { time: '22:00', value: 62 },
+  { time: '23:00', value: 12 },
+  { time: '24:00', value: 82 }
+]
+
+// 周发电数据
+const eleWeekList = [
+  { time: '周日', value: 22 },
+  { time: '周一', value: 12 },
+  { time: '周二', value: 32 },
+  { time: '周三', value: 52 },
+  { time: '周四', value: 22 },
+  { time: '周五', value: 12 },
+  { time: '周六', value: 42 }
+]
+
+// 上周发电数据
+const lastEleWeekList = [
+  { time: '周日', value: 111 },
+  { time: '周一', value: 72 },
+  { time: '周二', value: 312 },
+  { time: '周三', value: 52 },
+  { time: '周四', value: 82 },
+  { time: '周五', value: 152 },
+  { time: '周六', value: 52 }
+]
+
+// 月发电数据
+const eleMonthList = [
+  { time: '1日', value: 12 },
+  { time: '2日', value: 12 },
+  { time: '3日', value: 32 },
+  { time: '4日', value: 52 },
+  { time: '5日', value: 22 },
+  { time: '6日', value: 12 },
+  { time: '7日', value: 42 },
+  { time: '8日', value: 32 },
+  { time: '9日', value: 75 },
+  { time: '10日', value: 124 },
+  { time: '11日', value: 234 },
+  { time: '12日', value: 542 },
+  { time: '13日', value: 644 },
+  { time: '14日', value: 62 },
+  { time: '15日', value: 32 },
+  { time: '16日', value: 565 },
+  { time: '17日', value: 12 },
+  { time: '18日', value: 2 },
+  { time: '19日', value: 92 },
+  { time: '20日', value: 12 },
+  { time: '21日', value: 52 },
+  { time: '22日', value: 176 },
+  { time: '23日', value: 21 },
+  { time: '24日', value: 64 },
+  { time: '25日', value: 92 },
+  { time: '26日', value: 124 },
+  { time: '27日', value: 44 },
+  { time: '28日', value: 226 },
+  { time: '29日', value: 17 },
+  { time: '30日', value: 28 }
+]
+
+// 上月发电数据
+const lastEleMonthList = [
+  { time: '1日', value: 22 },
+  { time: '2日', value: 236 },
+  { time: '3日', value: 32 },
+  { time: '4日', value: 312 },
+  { time: '5日', value: 22 },
+  { time: '6日', value: 12 },
+  { time: '7日', value: 42 },
+  { time: '8日', value: 32 },
+  { time: '9日', value: 22 },
+  { time: '10日', value: 84 },
+  { time: '11日', value: 25 },
+  { time: '12日', value: 52 },
+  { time: '13日', value: 122 },
+  { time: '14日', value: 62 },
+  { time: '15日', value: 32 },
+  { time: '16日', value: 22 },
+  { time: '17日', value: 12 },
+  { time: '18日', value: 2 },
+  { time: '19日', value: 92 },
+  { time: '20日', value: 12 },
+  { time: '21日', value: 52 },
+  { time: '22日', value: 26 },
+  { time: '23日', value: 81 },
+  { time: '24日', value: 28 },
+  { time: '25日', value: 52 },
+  { time: '26日', value: 12 },
+  { time: '27日', value: 47 },
+  { time: '28日', value: 12 },
+  { time: '29日', value: 21 },
+  { time: '30日', value: 28 }
+]
+
+// 年发电数据
+const eleYearList = [
+  { time: '1月', value: 256 },
+  { time: '2月', value: 12 },
+  { time: '3月', value: 32 },
+  { time: '4月', value: 52 },
+  { time: '5月', value: 22 },
+  { time: '6月', value: 12 },
+  { time: '7月', value: 42 },
+  { time: '8月', value: 32 },
+  { time: '9月', value: 22 },
+  { time: '10月', value: 12 },
+  { time: '11月', value: 12 },
+  { time: '12月', value: 52 }
+]
+
+// 去年发电数据
+const lastEleYearList = [
+  { time: '1月', value: 22 },
+  { time: '2月', value: 12 },
+  { time: '3月', value: 42 },
+  { time: '4月', value: 52 },
+  { time: '5月', value: 224 },
+  { time: '6月', value: 12 },
+  { time: '7月', value: 42 },
+  { time: '8月', value: 32 },
+  { time: '9月', value: 44 },
+  { time: '10月', value: 12 },
+  { time: '11月', value: 168 },
+  { time: '12月', value: 51 }
+]
+
+// 日期类型
+const datePickerType = {
+  '日': {
+    type: 'date',
+    format: '',
+    placeholder: '日期'
+  },
+  '周': {
+    type: 'week',
+    format: 'yyyy 第 WW 周',
+    placeholder: '周'
+  },
+  '月': {
+    type: 'month',
+    format: '',
+    placeholder: '月'
+  },
+  '年': {
+    type: 'year',
+    format: '',
+    placeholder: '年'
+  }
+}
+
+// 工业炉列表
+const yaoluList = [
+  {
+    id: 1,
+    label: '工业炉1',
+    value: 63,
+    percent: 11,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 2,
+    label: '工业炉2',
+    value: 44,
+    percent: 8,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 3,
+    label: '工业炉3',
+    value: 56,
+    percent: 9,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 4,
+    label: '工业炉4',
+    value: 56,
+    percent: 9,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 5,
+    label: '工业炉5',
+    value: 56,
+    percent: 9,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 6,
+    label: '工业炉6',
+    value: 56,
+    percent: 9,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 7,
+    label: '工业炉7',
+    value: 56,
+    percent: 9,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 8,
+    label: '工业炉8',
+    value: 56,
+    percent: 9,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 9,
+    label: '工业炉9',
+    value: 56,
+    percent: 9,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 10,
+    label: '工业炉10',
+    value: 56,
+    percent: 9,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  },
+  {
+    id: 11,
+    label: '工业炉11',
+    value: 56,
+    percent: 9,
+    data: [
+      { time: '0:00', value: 24 },
+      { time: '2:00', value: 43 },
+      { time: '4:00', value: 33 },
+      { time: '6:00', value: 25 },
+      { time: '8:00', value: 44 },
+      { time: '10:00', value: 46 },
+      { time: '12:00', value: 16 },
+      { time: '14:00', value: 47 },
+      { time: '16:00', value: 86 },
+      { time: '18:00', value: 22 },
+      { time: '20:00', value: 25 },
+      { time: '22:00', value: 27 }
+    ],
+    lastData: [
+      { time: '0:00', value: 54 },
+      { time: '2:00', value: 13 },
+      { time: '4:00', value: 63 },
+      { time: '6:00', value: 85 },
+      { time: '8:00', value: 14 },
+      { time: '10:00', value: 26 },
+      { time: '12:00', value: 56 },
+      { time: '14:00', value: 37 },
+      { time: '16:00', value: 36 },
+      { time: '18:00', value: 12 },
+      { time: '20:00', value: 35 },
+      { time: '22:00', value: 17 }
+    ]
+  }
+]
+
+export default {
+  name: 'propane',
+  components: { Chart, ringChart, lineChart },
+  data () {
+    return {
+      eleDayList,
+      eleWeekList,
+      eleMonthList,
+      eleYearList,
+      lastEleDayList,
+      lastEleWeekList,
+      lastEleMonthList,
+      lastEleYearList,
+      datePickerType,
+      yaoluList,
+      date: new Date(),
+      dataList: [],
+      lastDataList: [],
+      chartType: ['柱状'],
+      eleType: '年',
+      showId: 0,
+      yaoluIndex: 0,
+      yaoluName: ''
+    }
+  },
+  mounted () {
+    this.dataList = this.eleYearList
+    this.lastDataList = this.lastEleYearList
+    this.showId = this.yaoluList[0].id
+    this.yaoluName = this.yaoluList[0].label
+  },
+  methods: {
+    changeEleType (v) {
+      switch (v) {
+        case '日':
+          this.dataList = this.eleDayList
+          this.lastDataList = this.lastEleDayList
+          this.date = new Date()
+          break
+        case '周':
+          this.dataList = this.eleWeekList
+          this.lastDataList = this.lastEleWeekList
+          this.date = new Date()
+          break
+        case '月':
+          this.dataList = this.eleMonthList
+          this.lastDataList = this.lastEleMonthList
+          this.date = new Date()
+          break
+        case '年':
+          this.dataList = this.eleYearList
+          this.lastDataList = this.lastEleYearList
+          this.date = new Date()
+          break
+      }
+    },
+    handleNode (obj, node, e) {
+      if (!(obj.children)) {
+        this.showId = obj.id
+        this.yaoluName = obj.label
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" 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>