Merge pull request '更新' (#23) from zwq into master

Reviewed-on: #23

config/index.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-11-19 10:10:51
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-05 16:16:24
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-06 15:07:51
  * @Description: file content
  * @FilePath: \mt-qj-wms-ui\config\index.js
  */
@@ -22,7 +22,7 @@ module.exports = {
     // 代理列表, 是否开启代理通过[./dev.env.js]配置
     proxyTable: devEnv.OPEN_PROXY === false ? {} : {
       '/proxyApi': {
-        target: 'http://192.168.1.7:8080',
+        target: 'http://192.168.1.18:8080',
         changeOrigin: true,
         pathRewrite: {
           '^/proxyApi': '/api'
@@ -31,7 +31,7 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: 'localhost', // can be overwritten by process.env.HOST
     port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

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>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="15px" height="14px" viewBox="0 0 15 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 60 (88103) - https://sketch.com -->
-    <title>维护开始</title>
+    <title>执行</title>
     <desc>Created with Sketch.</desc>
     <g id="组件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="icon/界面内/维护开始" transform="translate(-1.000000, -1.000000)">

src/router/index.js

@@ -1,8 +1,8 @@
 /*
  * @Author: zwq
  * @Date: 2021-11-15 08:20:28
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-05 16:05:35
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-09-06 15:26:36
  * @Description:
  */
 /**
@@ -23,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 } }
 ]
 
 // 主入口路由(需嵌套上左右整体布局)
@@ -39,7 +40,8 @@ const mainRoutes = {
     // 2. iframeUrl: 是否通过iframe嵌套展示内容, '以http[s]://开头': 是, '': 否
     // 提示: 如需要通过iframe嵌套展示内容, 但不通过tab打开, 请自行创建组件使用iframe处理!
     { path: '/home', component: _import('common/home'), name: 'home', meta: { title: '首页', isTab: true } },
-    { path: '/orderProcess', component: _import('common/order-process'), name: 'orderProcess', meta: { title: '订单加工', isTab: true } },
+    { path: '/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 } },
@@ -54,18 +56,20 @@ const mainRoutes = {
     { 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', 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-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-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-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 } },
@@ -73,10 +77,10 @@ const mainRoutes = {
     // { 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-process-temperature', component: _import('energy/process-temperature'), name: 'energy-process-temperature', meta: { title: '工业炉加工温度', isTab: true } },
     // { path: '/energy-sump-temperature', component: _import('energy/sump-temperature'), name: 'energy-sump-temperature', meta: { title: '油槽温度', isTab: true } },
     // { path: '/energy-ammonia-analysis', component: _import('energy/ammonia-analysis'), name: 'energy-ammonia-analysis', meta: { title: '使用氮气分析', isTab: true } },
-    // { path: '/energy-kiln-speed', component: _import('energy/kiln-speed'), name: 'energy-kiln-speed', meta: { title: '窑炉速度参数', isTab: true } }
+    // { path: '/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')

src/views/basic/carInfo.vue

@@ -1,6 +1,12 @@
 <template>
   <div class="mod-config">
     <el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form-item>
+        <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-select size="small" v-model="dataForm.paramKey" filterable placeholder="名称">
           <el-option
@@ -51,6 +57,18 @@
         prop="code"
         label="编码">
       </el-table-column>
+      <el-table-column
+        prop="status"
+        label="状态"
+      >
+        <template slot-scope="scope">
+          <span>{{
+            scope.row.status === 0
+              ? "空闲"
+              : "占用"
+          }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="vehicleAlias"
         label="缩写">
@@ -120,6 +138,34 @@
       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

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.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-15 15:17:30
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-18 15:00:32
+ * @LastEditTime: 2022-07-13 09:51:46
  * @Description:
 -->
 <template>
@@ -36,7 +36,7 @@
       <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>
+            <div class="plat" style="font-size: 24px">出库液压台{{ count }}</div>
           </el-card>
         </el-col>
       </el-row>
@@ -63,7 +63,7 @@ export default {
   components: {
     ExWarehouseInfo
   },
-  created () {
+  activated () {
     this.getWarehouseList()
   },
   methods: {

src/views/common/home.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row :gutter="20">
-      <el-col :span="8">
+      <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>
@@ -10,7 +10,7 @@
           <p class="box-card-footer">Processing</p>
         </el-card>
       </el-col>
-      <el-col :span="8">
+      <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>
@@ -19,7 +19,7 @@
           <p class="box-card-footer">Warehouse</p>
         </el-card>
       </el-col>
-      <el-col :span="8">
+      <!-- <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>
@@ -27,7 +27,7 @@
           </p>
           <p class="box-card-footer">Append</p>
         </el-card>
-      </el-col>
+      </el-col> -->
     </el-row>
     <el-card class="mod-log">
       <h3>当前任务列表</h3>
@@ -82,7 +82,7 @@
         </el-table-column>
         <el-table-column
           prop="kilnName"
-          label="窑炉"
+          label="工业炉"
         >
         </el-table-column>
         <el-table-column
@@ -100,7 +100,7 @@
         <template slot-scope="scope">
           <span>{{
             scope.row.taskType === 0
-              ? "缓存到窑炉加工"
+              ? "缓存到工业炉加工"
               : scope.row.taskType === 1
               ? "出炉到缓存"
               : scope.row.taskType === 2

src/views/common/login.vue

@@ -84,7 +84,6 @@
     right: 0;
     bottom: 0;
     left: 0;
-    background-color: rgba(38, 50, 56, .6);
     overflow: hidden;
     &:before {
       position: fixed;
@@ -94,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

@@ -2,31 +2,79 @@
   <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">
+    :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-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-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-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-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-input
+          v-model="dataForm.productName"
+          disabled
+          placeholder="产品名称"
+        ></el-input>
       </el-form-item>
       <el-form-item label="数量" prop="quantity">
-        <el-input v-model="dataForm.quantity" placeholder="数量"></el-input>
+        <el-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-input
+          v-model="dataForm.unit"
+          disabled
+          placeholder="单位"
+        ></el-input>
       </el-form-item>
       <el-form-item label="重量" prop="weight">
-        <el-input v-model="dataForm.weight" placeholder="重量"></el-input>
+        <el-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">
@@ -37,103 +85,123 @@
 </template>
 
 <script>
-  export default {
-    data () {
-      return {
-        visible: false,
-        dataForm: {
-          idenCardNum: null,
-          customerName: null,
-          materialDes: null,
-          orderNo: null,
-          productName: null,
-          quantity: null,
-          unit: null,
-          weight: null
-        },
-        dataRule: {
-          idenCardNum: [
-            { required: true, message: '标识卡号不能为空', trigger: 'blur' }
-          ],
-          quantity: [
-            { required: true, message: '数量不能为空', trigger: 'blur' }
-          ],
-          weight: [
-            { required: true, message: '重量不能为空', trigger: 'blur' }
-          ]
-        },
-        formLoading: false,
-        row: null,
-        editIndex: null
+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
       }
     },
-    methods: {
-      init (row, idx) {
-        this.visible = true
-        this.$nextTick(() => {
-          this.$refs['dataForm'].resetFields()
-          if (row) {
-            this.row = row
-            this.dataForm = row
-            this.editIndex = idx
-          }
-          this.$refs['idenCardNum'].focus()
-        })
-      },
-      setIdenCardNum () {
-        this.formLoading = true
-        if (this.dataForm.idenCardNum) {
-          this.$http({
-            url: this.$http.adornUrl(`/orderInfo/getTaskInfoByIdenCardNum`),
-            method: 'get',
-            params: this.$http.adornParams({
-              'idenCardNum': this.dataForm.idenCardNum
-            })
-          }).then(({data}) => {
-            console.log(data)
-            if (data && data.code === 0) {
-              this.dataForm = data.data
-              this.dataForm.targetQuantity = data.data.quantity
-              this.dataForm.targetWeight = data.data.weight
-              this.dataForm.weight = null
-              this.dataForm.quantity = null
-            } else {
-              this.$message.warning(data.msg)
-            }
-            this.formLoading = false
-          })
-        } else {
-          this.$message.warning('请输入标识卡号')
-        }
-      },
-      // 表单提交
-      dataFormSubmit () {
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            if (this.editIndex) {
-              const taskList = JSON.parse(sessionStorage.getItem('autoTaskList'))
-              taskList.splice(this.editIndex, 1, this.dataForm)
-              sessionStorage.setItem('autoTaskList', JSON.stringify(taskList))
-            } else if (sessionStorage.getItem('autoTaskList')) {
-              const taskList = JSON.parse(sessionStorage.getItem('autoTaskList'))
-              taskList.push(this.dataForm)
-              sessionStorage.setItem('autoTaskList', JSON.stringify(taskList))
-            } else {
-              const arr = [this.dataForm]
-              sessionStorage.setItem('autoTaskList', JSON.stringify(arr))
-            }
-            this.$message({
-              message: '操作成功',
-              type: 'success',
-              duration: 1500,
-              onClose: () => {
-                this.visible = false
-                this.$emit('refreshDataList')
-              }
-            })
-          }
-        })
+    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)
+            sessionStorage.setItem('autoTaskList', JSON.stringify(taskList))
+          } else {
+            const arr = [this.dataForm]
+            sessionStorage.setItem('autoTaskList', JSON.stringify(arr))
+          }
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }
+      })
     }
   }
+}
 </script>

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

@@ -1,21 +1,21 @@
 <!--
  * @Author: gtz
  * @Date: 2022-03-04 10:22:13
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-05 12:09:38
+ * @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="!row ? '新增' : '修改'"
+    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="1" label="氮化炉加工"></el-option>
           <el-option :value="2" label="多功能炉加工"></el-option>
         </el-select>
       </el-form-item>
@@ -25,50 +25,54 @@
           <el-option :value="1" label="复加工" />
         </el-select>
       </el-form-item>
-      <el-form-item v-if="dataForm.autoTaskType === 2" label="开始加工炉">
+      <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" :disabled="!(dataForm.autoTaskType)">
+          <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)">
+          <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="清洗炉">
+      <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" :disabled="!(dataForm.autoTaskType)">
+          <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)">
+          <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="结束加工炉">
+      <el-form-item :label="dataForm.autoTaskType !== 2?'第二步':'第三步'">
         <el-form-item label="加工炉" prop="thirdPosition" style="margin-bottom: 24px">
-          <el-select v-model="dataForm.thirdPosition" :disabled="!(dataForm.autoTaskType)">
+          <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)">
+          <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>
@@ -76,7 +80,7 @@
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
+      <el-button type="primary" :loading="btnLoad"  @click="dataFormSubmit()">确定</el-button>
     </span>
   </el-dialog>
 </template>
@@ -96,6 +100,7 @@
     data () {
       return {
         visible: false,
+        btnLoad: false,
         dataForm: {
           autoTaskType: null,
           processType: null,
@@ -126,9 +131,6 @@
           secPosition: [
             { required: true, message: '加工炉不能为空', trigger: 'blur' }
           ],
-          secProcess: [
-            { required: true, message: '工艺不能为空', trigger: 'blur' }
-          ],
           thirdPosition: [
             { required: true, message: '加工炉不能为空', trigger: 'blur' }
           ],
@@ -138,13 +140,38 @@
         },
         dataList: [],
         formLoading: false,
-        row: null,
-        editIndex: null
+        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()
@@ -217,7 +244,7 @@
               requestData.taskCreateParamList.push({
                 autoTaskStep: 1,
                 autoTaskType: this.dataForm.autoTaskType,
-                craftCode: this.dataForm.secProcess,
+                craftCode: this.dataForm.firstProcess,
                 detParams: this.dataList,
                 kilnId: this.dataForm.firstPosition.split(',')[0],
                 processType: this.dataForm.processType,
@@ -245,18 +272,26 @@
                 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}) => {
-              console.log(data)
               if (data && data.code === 0) {
-                this.$message.success('任务提交成功')
-                this.dataList = []
-                sessionStorage.setItem('autoTaskList', '')
-                this.$emit('refreshDataList')
+                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)
               }
             })

src/views/common/order-auto.vue

@@ -86,7 +86,7 @@
         </el-table-column>
       </el-table>
     </div>
-    <div class="auto-undo">
+    <div class="auto-undo" v-if="false">
       <el-row style="margin: 10px 0; font-weight: bold">
         未完成自动任务
       </el-row>
@@ -193,7 +193,7 @@
       this.getAutoDataList()
     },
     methods: {
-      // 获取窑炉、工艺列表
+      // 获取工业炉、工艺列表
       getDictList () {
         this.$http({
           url: this.$http.adornUrl('/kilnInfo/page'),

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

@@ -20,13 +20,33 @@
         <el-input v-model="dataForm.productName" disabled placeholder="产品名称"></el-input>
       </el-form-item>
       <el-form-item label="数量" prop="quantity">
-        <el-input v-model="dataForm.quantity" placeholder="数量"></el-input>
+        <el-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-input
+          v-model="dataForm.unit"
+          disabled
+          placeholder="单位"
+        ></el-input>
       </el-form-item>
       <el-form-item label="重量" prop="weight">
-        <el-input v-model="dataForm.weight" placeholder="重量"></el-input>
+        <el-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">
@@ -47,8 +67,10 @@
           materialDes: null,
           orderNo: null,
           productName: null,
+          targetQuantity: null,
           quantity: null,
           unit: null,
+          targetWeight: null,
           weight: null
         },
         dataRule: {
@@ -68,14 +90,35 @@
       }
     },
     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.row = JSON.parse(JSON.stringify(row))
+            this.dataForm = JSON.parse(JSON.stringify(row))
+            this.editIndex = JSON.parse(JSON.stringify(idx))
           }
           this.$refs['idenCardNum'].focus()
         })
@@ -90,11 +133,10 @@
               '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.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 {
@@ -110,7 +152,7 @@
       dataFormSubmit () {
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
-            if (this.editIndex) {
+            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))

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

@@ -7,7 +7,7 @@
 -->
 <template>
   <el-dialog
-    :title="!pointType ? '选择起点' : '选择窑炉'"
+    :title="!pointType ? '选择起点' : '选择工业炉'"
     :close-on-click-modal="false"
     :visible.sync="visible"
   >

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

@@ -7,27 +7,6 @@
           新增
         </el-button>
       </el-form-item>
-      <el-form-item>
-        <el-select v-model="processType" size="small" placeholder="加工类型" clearable>
-          <el-option :value="0" label="初始加工" />
-          <el-option :value="1" label="复加工" />
-        </el-select>
-      </el-form-item>
-      <el-form-item style="margin-left:1%">
-        <el-select v-model="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 style="margin-left:1%">
-        <el-select v-model="kilnId" size="small" placeholder="窑炉" clearable>
-          <el-option v-for="item in eqList" :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 style="margin-left:1%">
         <el-button type="primary" size="small" @click="submitTask()">提交任务</el-button>
       </el-form-item>
@@ -105,36 +84,42 @@
     </el-table>
     <!-- 弹窗, 新增 / 修改 -->
     <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 {
         startPosition: '',
         kilnId: '',
+        craftCode: '',
         targetPosition: '',
         dataList: [],
+        submitFormVisible: false,
         processType: null,
         dataListLoading: false,
         addOrUpdateVisible: false,
         processPointVisible: false,
-        eqList: []
+        eqList: [],
+        processList: []
       }
     },
     components: {
       AddOrUpdate,
-      ProcessPoint
+      ProcessPoint,
+      SubmitForm
     },
     activated () {
       this.getEqList()
     },
     methods: {
-      // 获取窑炉列表
+      // 获取工业炉列表
       getEqList () {
         this.$http({
           url: this.$http.adornUrl('/kilnInfo/page'),
@@ -151,6 +136,21 @@
           }
           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 = []
+          }
+        })
       },
       // 获取数据列表
       getDataList () {
@@ -184,55 +184,13 @@
         }
       },
       submitTask () {
-        if (this.dataList.length === 0) {
-          this.$message({
-            message: '任务为空，请新增一条托盘信息',
-            type: 'warning'
+        if (this.dataList.length) {
+          this.submitFormVisible = true
+          this.$nextTick(() => {
+            this.$refs.submitForm.init(this.dataList)
           })
-        } else if (!this.startPosition) {
-          this.$message({
-            message: '请选择任务起点',
-            type: 'warning'
-          })
-        } else if (!this.kilnId) {
-          this.$message({
-            message: '请选择窑炉',
-            type: 'warning'
-          })
-        } else if (!this.processType) {
-          this.$message.warning('请选择加工类型')
         } else {
-          this.$confirm(`确定提交任务?`, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            this.$http({
-              url: this.$http.adornUrl(`/currTask/createProcessTask`),
-              method: 'post',
-              data: this.$http.adornData({
-                craftCode: '',
-                detParams: this.dataList,
-                kilnId: this.kilnId,
-                processType: this.processType,
-                startPosition: this.startPosition,
-                targetPosition: this.kilnId
-                // this.targetPosition
-              })
-            }).then(({data}) => {
-              console.log(data)
-              if (data && data.code === 0) {
-                this.$message.success('任务提交成功')
-                this.dataList = []
-                sessionStorage.setItem('taskList', '')
-                this.startPosition = '选择起点'
-                this.kilnId = '选择窑炉'
-                this.targetPosition = null
-              } else {
-                this.$message.warning(data.msg)
-              }
-            })
-          }).catch(() => {})
+          this.$message.warning('请至少添加一条任务！')
         }
       },
       // 删除

src/views/energy/ammonia-analysis.vue

@@ -250,11 +250,11 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    label: '窑炉1',
+    label: '工业炉1',
     value: 63,
     percent: 11,
     data: [
@@ -288,7 +288,7 @@ const yaoluList = [
   },
   {
     id: 2,
-    label: '窑炉2',
+    label: '工业炉2',
     value: 44,
     percent: 8,
     data: [
@@ -322,7 +322,7 @@ const yaoluList = [
   },
   {
     id: 3,
-    label: '窑炉3',
+    label: '工业炉3',
     value: 56,
     percent: 9,
     data: [
@@ -356,7 +356,7 @@ const yaoluList = [
   },
   {
     id: 4,
-    label: '窑炉4',
+    label: '工业炉4',
     value: 56,
     percent: 9,
     data: [
@@ -390,7 +390,7 @@ const yaoluList = [
   },
   {
     id: 5,
-    label: '窑炉5',
+    label: '工业炉5',
     value: 56,
     percent: 9,
     data: [
@@ -424,7 +424,7 @@ const yaoluList = [
   },
   {
     id: 6,
-    label: '窑炉6',
+    label: '工业炉6',
     value: 56,
     percent: 9,
     data: [
@@ -458,7 +458,7 @@ const yaoluList = [
   },
   {
     id: 7,
-    label: '窑炉7',
+    label: '工业炉7',
     value: 56,
     percent: 9,
     data: [
@@ -492,7 +492,7 @@ const yaoluList = [
   },
   {
     id: 8,
-    label: '窑炉8',
+    label: '工业炉8',
     value: 56,
     percent: 9,
     data: [
@@ -526,7 +526,7 @@ const yaoluList = [
   },
   {
     id: 9,
-    label: '窑炉9',
+    label: '工业炉9',
     value: 56,
     percent: 9,
     data: [
@@ -560,7 +560,7 @@ const yaoluList = [
   },
   {
     id: 10,
-    label: '窑炉10',
+    label: '工业炉10',
     value: 56,
     percent: 9,
     data: [
@@ -594,7 +594,7 @@ const yaoluList = [
   },
   {
     id: 11,
-    label: '窑炉11',
+    label: '工业炉11',
     value: 56,
     percent: 9,
     data: [

src/views/energy/ammonia.vue

@@ -272,11 +272,11 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    label: '窑炉1',
+    label: '工业炉1',
     value: 63,
     percent: 11,
     data: [
@@ -310,7 +310,7 @@ const yaoluList = [
   },
   {
     id: 2,
-    label: '窑炉2',
+    label: '工业炉2',
     value: 44,
     percent: 8,
     data: [
@@ -344,7 +344,7 @@ const yaoluList = [
   },
   {
     id: 3,
-    label: '窑炉3',
+    label: '工业炉3',
     value: 56,
     percent: 9,
     data: [
@@ -378,7 +378,7 @@ const yaoluList = [
   },
   {
     id: 4,
-    label: '窑炉4',
+    label: '工业炉4',
     value: 56,
     percent: 9,
     data: [
@@ -412,7 +412,7 @@ const yaoluList = [
   },
   {
     id: 5,
-    label: '窑炉5',
+    label: '工业炉5',
     value: 56,
     percent: 9,
     data: [
@@ -446,7 +446,7 @@ const yaoluList = [
   },
   {
     id: 6,
-    label: '窑炉6',
+    label: '工业炉6',
     value: 56,
     percent: 9,
     data: [
@@ -480,7 +480,7 @@ const yaoluList = [
   },
   {
     id: 7,
-    label: '窑炉7',
+    label: '工业炉7',
     value: 56,
     percent: 9,
     data: [
@@ -514,7 +514,7 @@ const yaoluList = [
   },
   {
     id: 8,
-    label: '窑炉8',
+    label: '工业炉8',
     value: 56,
     percent: 9,
     data: [
@@ -548,7 +548,7 @@ const yaoluList = [
   },
   {
     id: 9,
-    label: '窑炉9',
+    label: '工业炉9',
     value: 56,
     percent: 9,
     data: [
@@ -582,7 +582,7 @@ const yaoluList = [
   },
   {
     id: 10,
-    label: '窑炉10',
+    label: '工业炉10',
     value: 56,
     percent: 9,
     data: [
@@ -616,7 +616,7 @@ const yaoluList = [
   },
   {
     id: 11,
-    label: '窑炉11',
+    label: '工业炉11',
     value: 56,
     percent: 9,
     data: [

src/views/energy/electric-acquisition.vue

@@ -122,51 +122,51 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    label: '窑炉1'
+    label: '工业炉1'
   },
   {
     id: 2,
-    label: '窑炉2'
+    label: '工业炉2'
   },
   {
     id: 3,
-    label: '窑炉3'
+    label: '工业炉3'
   },
   {
     id: 4,
-    label: '窑炉4'
+    label: '工业炉4'
   },
   {
     id: 5,
-    label: '窑炉5'
+    label: '工业炉5'
   },
   {
     id: 6,
-    label: '窑炉6'
+    label: '工业炉6'
   },
   {
     id: 7,
-    label: '窑炉7'
+    label: '工业炉7'
   },
   {
     id: 8,
-    label: '窑炉8'
+    label: '工业炉8'
   },
   {
     id: 9,
-    label: '窑炉9'
+    label: '工业炉9'
   },
   {
     id: 10,
-    label: '窑炉10'
+    label: '工业炉10'
   },
   {
     id: 11,
-    label: '窑炉11'
+    label: '工业炉11'
   }
 ]
 

src/views/energy/electric.vue

@@ -323,11 +323,11 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    name: '窑炉1',
+    name: '工业炉1',
     value: 63,
     percent: 11,
     data: [
@@ -361,7 +361,7 @@ const yaoluList = [
   },
   {
     id: 2,
-    name: '窑炉2',
+    name: '工业炉2',
     value: 44,
     percent: 8,
     data: [
@@ -395,7 +395,7 @@ const yaoluList = [
   },
   {
     id: 3,
-    name: '窑炉3',
+    name: '工业炉3',
     value: 56,
     percent: 9,
     data: [
@@ -429,7 +429,7 @@ const yaoluList = [
   },
   {
     id: 4,
-    name: '窑炉4',
+    name: '工业炉4',
     value: 56,
     percent: 9,
     data: [
@@ -463,7 +463,7 @@ const yaoluList = [
   },
   {
     id: 5,
-    name: '窑炉5',
+    name: '工业炉5',
     value: 56,
     percent: 9,
     data: [
@@ -497,7 +497,7 @@ const yaoluList = [
   },
   {
     id: 6,
-    name: '窑炉6',
+    name: '工业炉6',
     value: 56,
     percent: 9,
     data: [
@@ -531,7 +531,7 @@ const yaoluList = [
   },
   {
     id: 7,
-    name: '窑炉7',
+    name: '工业炉7',
     value: 56,
     percent: 9,
     data: [
@@ -565,7 +565,7 @@ const yaoluList = [
   },
   {
     id: 8,
-    name: '窑炉8',
+    name: '工业炉8',
     value: 56,
     percent: 9,
     data: [
@@ -599,7 +599,7 @@ const yaoluList = [
   },
   {
     id: 9,
-    name: '窑炉9',
+    name: '工业炉9',
     value: 56,
     percent: 9,
     data: [
@@ -633,7 +633,7 @@ const yaoluList = [
   },
   {
     id: 10,
-    name: '窑炉10',
+    name: '工业炉10',
     value: 56,
     percent: 9,
     data: [
@@ -667,7 +667,7 @@ const yaoluList = [
   },
   {
     id: 11,
-    name: '窑炉11',
+    name: '工业炉11',
     value: 56,
     percent: 9,
     data: [

src/views/energy/gas-acquisition.vue

@@ -119,51 +119,51 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    label: '窑炉1'
+    label: '工业炉1'
   },
   {
     id: 2,
-    label: '窑炉2'
+    label: '工业炉2'
   },
   {
     id: 3,
-    label: '窑炉3'
+    label: '工业炉3'
   },
   {
     id: 4,
-    label: '窑炉4'
+    label: '工业炉4'
   },
   {
     id: 5,
-    label: '窑炉5'
+    label: '工业炉5'
   },
   {
     id: 6,
-    label: '窑炉6'
+    label: '工业炉6'
   },
   {
     id: 7,
-    label: '窑炉7'
+    label: '工业炉7'
   },
   {
     id: 8,
-    label: '窑炉8'
+    label: '工业炉8'
   },
   {
     id: 9,
-    label: '窑炉9'
+    label: '工业炉9'
   },
   {
     id: 10,
-    label: '窑炉10'
+    label: '工业炉10'
   },
   {
     id: 11,
-    label: '窑炉11'
+    label: '工业炉11'
   }
 ]
 

src/views/energy/kiln-electric.vue

@@ -332,11 +332,11 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    label: '窑炉1',
+    label: '工业炉1',
     value: 63,
     percent: 11,
     data: [
@@ -370,7 +370,7 @@ const yaoluList = [
   },
   {
     id: 2,
-    label: '窑炉2',
+    label: '工业炉2',
     value: 44,
     percent: 8,
     data: [
@@ -404,7 +404,7 @@ const yaoluList = [
   },
   {
     id: 3,
-    label: '窑炉3',
+    label: '工业炉3',
     value: 56,
     percent: 9,
     data: [
@@ -438,7 +438,7 @@ const yaoluList = [
   },
   {
     id: 4,
-    label: '窑炉4',
+    label: '工业炉4',
     value: 56,
     percent: 9,
     data: [
@@ -472,7 +472,7 @@ const yaoluList = [
   },
   {
     id: 5,
-    label: '窑炉5',
+    label: '工业炉5',
     value: 56,
     percent: 9,
     data: [
@@ -506,7 +506,7 @@ const yaoluList = [
   },
   {
     id: 6,
-    label: '窑炉6',
+    label: '工业炉6',
     value: 56,
     percent: 9,
     data: [
@@ -540,7 +540,7 @@ const yaoluList = [
   },
   {
     id: 7,
-    label: '窑炉7',
+    label: '工业炉7',
     value: 56,
     percent: 9,
     data: [
@@ -574,7 +574,7 @@ const yaoluList = [
   },
   {
     id: 8,
-    label: '窑炉8',
+    label: '工业炉8',
     value: 56,
     percent: 9,
     data: [
@@ -608,7 +608,7 @@ const yaoluList = [
   },
   {
     id: 9,
-    label: '窑炉9',
+    label: '工业炉9',
     value: 56,
     percent: 9,
     data: [
@@ -642,7 +642,7 @@ const yaoluList = [
   },
   {
     id: 10,
-    label: '窑炉10',
+    label: '工业炉10',
     value: 56,
     percent: 9,
     data: [
@@ -676,7 +676,7 @@ const yaoluList = [
   },
   {
     id: 11,
-    label: '窑炉11',
+    label: '工业炉11',
     value: 56,
     percent: 9,
     data: [

src/views/energy/kiln-speed.vue

@@ -250,11 +250,11 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    label: '窑炉1',
+    label: '工业炉1',
     value: 63,
     percent: 11,
     data: [
@@ -288,7 +288,7 @@ const yaoluList = [
   },
   {
     id: 2,
-    label: '窑炉2',
+    label: '工业炉2',
     value: 44,
     percent: 8,
     data: [
@@ -322,7 +322,7 @@ const yaoluList = [
   },
   {
     id: 3,
-    label: '窑炉3',
+    label: '工业炉3',
     value: 56,
     percent: 9,
     data: [
@@ -356,7 +356,7 @@ const yaoluList = [
   },
   {
     id: 4,
-    label: '窑炉4',
+    label: '工业炉4',
     value: 56,
     percent: 9,
     data: [
@@ -390,7 +390,7 @@ const yaoluList = [
   },
   {
     id: 5,
-    label: '窑炉5',
+    label: '工业炉5',
     value: 56,
     percent: 9,
     data: [
@@ -424,7 +424,7 @@ const yaoluList = [
   },
   {
     id: 6,
-    label: '窑炉6',
+    label: '工业炉6',
     value: 56,
     percent: 9,
     data: [
@@ -458,7 +458,7 @@ const yaoluList = [
   },
   {
     id: 7,
-    label: '窑炉7',
+    label: '工业炉7',
     value: 56,
     percent: 9,
     data: [
@@ -492,7 +492,7 @@ const yaoluList = [
   },
   {
     id: 8,
-    label: '窑炉8',
+    label: '工业炉8',
     value: 56,
     percent: 9,
     data: [
@@ -526,7 +526,7 @@ const yaoluList = [
   },
   {
     id: 9,
-    label: '窑炉9',
+    label: '工业炉9',
     value: 56,
     percent: 9,
     data: [
@@ -560,7 +560,7 @@ const yaoluList = [
   },
   {
     id: 10,
-    label: '窑炉10',
+    label: '工业炉10',
     value: 56,
     percent: 9,
     data: [
@@ -594,7 +594,7 @@ const yaoluList = [
   },
   {
     id: 11,
-    label: '窑炉11',
+    label: '工业炉11',
     value: 56,
     percent: 9,
     data: [

src/views/energy/methanol.vue

@@ -272,11 +272,11 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    label: '窑炉1',
+    label: '工业炉1',
     value: 63,
     percent: 11,
     data: [
@@ -310,7 +310,7 @@ const yaoluList = [
   },
   {
     id: 2,
-    label: '窑炉2',
+    label: '工业炉2',
     value: 44,
     percent: 8,
     data: [
@@ -344,7 +344,7 @@ const yaoluList = [
   },
   {
     id: 3,
-    label: '窑炉3',
+    label: '工业炉3',
     value: 56,
     percent: 9,
     data: [
@@ -378,7 +378,7 @@ const yaoluList = [
   },
   {
     id: 4,
-    label: '窑炉4',
+    label: '工业炉4',
     value: 56,
     percent: 9,
     data: [
@@ -412,7 +412,7 @@ const yaoluList = [
   },
   {
     id: 5,
-    label: '窑炉5',
+    label: '工业炉5',
     value: 56,
     percent: 9,
     data: [
@@ -446,7 +446,7 @@ const yaoluList = [
   },
   {
     id: 6,
-    label: '窑炉6',
+    label: '工业炉6',
     value: 56,
     percent: 9,
     data: [
@@ -480,7 +480,7 @@ const yaoluList = [
   },
   {
     id: 7,
-    label: '窑炉7',
+    label: '工业炉7',
     value: 56,
     percent: 9,
     data: [
@@ -514,7 +514,7 @@ const yaoluList = [
   },
   {
     id: 8,
-    label: '窑炉8',
+    label: '工业炉8',
     value: 56,
     percent: 9,
     data: [
@@ -548,7 +548,7 @@ const yaoluList = [
   },
   {
     id: 9,
-    label: '窑炉9',
+    label: '工业炉9',
     value: 56,
     percent: 9,
     data: [
@@ -582,7 +582,7 @@ const yaoluList = [
   },
   {
     id: 10,
-    label: '窑炉10',
+    label: '工业炉10',
     value: 56,
     percent: 9,
     data: [
@@ -616,7 +616,7 @@ const yaoluList = [
   },
   {
     id: 11,
-    label: '窑炉11',
+    label: '工业炉11',
     value: 56,
     percent: 9,
     data: [

src/views/energy/nitrogen.vue

@@ -272,11 +272,11 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    label: '窑炉1',
+    label: '工业炉1',
     value: 63,
     percent: 11,
     data: [
@@ -310,7 +310,7 @@ const yaoluList = [
   },
   {
     id: 2,
-    label: '窑炉2',
+    label: '工业炉2',
     value: 44,
     percent: 8,
     data: [
@@ -344,7 +344,7 @@ const yaoluList = [
   },
   {
     id: 3,
-    label: '窑炉3',
+    label: '工业炉3',
     value: 56,
     percent: 9,
     data: [
@@ -378,7 +378,7 @@ const yaoluList = [
   },
   {
     id: 4,
-    label: '窑炉4',
+    label: '工业炉4',
     value: 56,
     percent: 9,
     data: [
@@ -412,7 +412,7 @@ const yaoluList = [
   },
   {
     id: 5,
-    label: '窑炉5',
+    label: '工业炉5',
     value: 56,
     percent: 9,
     data: [
@@ -446,7 +446,7 @@ const yaoluList = [
   },
   {
     id: 6,
-    label: '窑炉6',
+    label: '工业炉6',
     value: 56,
     percent: 9,
     data: [
@@ -480,7 +480,7 @@ const yaoluList = [
   },
   {
     id: 7,
-    label: '窑炉7',
+    label: '工业炉7',
     value: 56,
     percent: 9,
     data: [
@@ -514,7 +514,7 @@ const yaoluList = [
   },
   {
     id: 8,
-    label: '窑炉8',
+    label: '工业炉8',
     value: 56,
     percent: 9,
     data: [
@@ -548,7 +548,7 @@ const yaoluList = [
   },
   {
     id: 9,
-    label: '窑炉9',
+    label: '工业炉9',
     value: 56,
     percent: 9,
     data: [
@@ -582,7 +582,7 @@ const yaoluList = [
   },
   {
     id: 10,
-    label: '窑炉10',
+    label: '工业炉10',
     value: 56,
     percent: 9,
     data: [
@@ -616,7 +616,7 @@ const yaoluList = [
   },
   {
     id: 11,
-    label: '窑炉11',
+    label: '工业炉11',
     value: 56,
     percent: 9,
     data: [

src/views/energy/process-temperature.vue

@@ -250,11 +250,11 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    label: '窑炉1',
+    label: '工业炉1',
     value: 63,
     percent: 11,
     data: [
@@ -288,7 +288,7 @@ const yaoluList = [
   },
   {
     id: 2,
-    label: '窑炉2',
+    label: '工业炉2',
     value: 44,
     percent: 8,
     data: [
@@ -322,7 +322,7 @@ const yaoluList = [
   },
   {
     id: 3,
-    label: '窑炉3',
+    label: '工业炉3',
     value: 56,
     percent: 9,
     data: [
@@ -356,7 +356,7 @@ const yaoluList = [
   },
   {
     id: 4,
-    label: '窑炉4',
+    label: '工业炉4',
     value: 56,
     percent: 9,
     data: [
@@ -390,7 +390,7 @@ const yaoluList = [
   },
   {
     id: 5,
-    label: '窑炉5',
+    label: '工业炉5',
     value: 56,
     percent: 9,
     data: [
@@ -424,7 +424,7 @@ const yaoluList = [
   },
   {
     id: 6,
-    label: '窑炉6',
+    label: '工业炉6',
     value: 56,
     percent: 9,
     data: [
@@ -458,7 +458,7 @@ const yaoluList = [
   },
   {
     id: 7,
-    label: '窑炉7',
+    label: '工业炉7',
     value: 56,
     percent: 9,
     data: [
@@ -492,7 +492,7 @@ const yaoluList = [
   },
   {
     id: 8,
-    label: '窑炉8',
+    label: '工业炉8',
     value: 56,
     percent: 9,
     data: [
@@ -526,7 +526,7 @@ const yaoluList = [
   },
   {
     id: 9,
-    label: '窑炉9',
+    label: '工业炉9',
     value: 56,
     percent: 9,
     data: [
@@ -560,7 +560,7 @@ const yaoluList = [
   },
   {
     id: 10,
-    label: '窑炉10',
+    label: '工业炉10',
     value: 56,
     percent: 9,
     data: [
@@ -594,7 +594,7 @@ const yaoluList = [
   },
   {
     id: 11,
-    label: '窑炉11',
+    label: '工业炉11',
     value: 56,
     percent: 9,
     data: [

src/views/energy/propane.vue

@@ -272,11 +272,11 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    label: '窑炉1',
+    label: '工业炉1',
     value: 63,
     percent: 11,
     data: [
@@ -310,7 +310,7 @@ const yaoluList = [
   },
   {
     id: 2,
-    label: '窑炉2',
+    label: '工业炉2',
     value: 44,
     percent: 8,
     data: [
@@ -344,7 +344,7 @@ const yaoluList = [
   },
   {
     id: 3,
-    label: '窑炉3',
+    label: '工业炉3',
     value: 56,
     percent: 9,
     data: [
@@ -378,7 +378,7 @@ const yaoluList = [
   },
   {
     id: 4,
-    label: '窑炉4',
+    label: '工业炉4',
     value: 56,
     percent: 9,
     data: [
@@ -412,7 +412,7 @@ const yaoluList = [
   },
   {
     id: 5,
-    label: '窑炉5',
+    label: '工业炉5',
     value: 56,
     percent: 9,
     data: [
@@ -446,7 +446,7 @@ const yaoluList = [
   },
   {
     id: 6,
-    label: '窑炉6',
+    label: '工业炉6',
     value: 56,
     percent: 9,
     data: [
@@ -480,7 +480,7 @@ const yaoluList = [
   },
   {
     id: 7,
-    label: '窑炉7',
+    label: '工业炉7',
     value: 56,
     percent: 9,
     data: [
@@ -514,7 +514,7 @@ const yaoluList = [
   },
   {
     id: 8,
-    label: '窑炉8',
+    label: '工业炉8',
     value: 56,
     percent: 9,
     data: [
@@ -548,7 +548,7 @@ const yaoluList = [
   },
   {
     id: 9,
-    label: '窑炉9',
+    label: '工业炉9',
     value: 56,
     percent: 9,
     data: [
@@ -582,7 +582,7 @@ const yaoluList = [
   },
   {
     id: 10,
-    label: '窑炉10',
+    label: '工业炉10',
     value: 56,
     percent: 9,
     data: [
@@ -616,7 +616,7 @@ const yaoluList = [
   },
   {
     id: 11,
-    label: '窑炉11',
+    label: '工业炉11',
     value: 56,
     percent: 9,
     data: [

src/views/energy/sulfur-dioxide.vue

@@ -272,11 +272,11 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    label: '窑炉1',
+    label: '工业炉1',
     value: 63,
     percent: 11,
     data: [
@@ -310,7 +310,7 @@ const yaoluList = [
   },
   {
     id: 2,
-    label: '窑炉2',
+    label: '工业炉2',
     value: 44,
     percent: 8,
     data: [
@@ -344,7 +344,7 @@ const yaoluList = [
   },
   {
     id: 3,
-    label: '窑炉3',
+    label: '工业炉3',
     value: 56,
     percent: 9,
     data: [
@@ -378,7 +378,7 @@ const yaoluList = [
   },
   {
     id: 4,
-    label: '窑炉4',
+    label: '工业炉4',
     value: 56,
     percent: 9,
     data: [
@@ -412,7 +412,7 @@ const yaoluList = [
   },
   {
     id: 5,
-    label: '窑炉5',
+    label: '工业炉5',
     value: 56,
     percent: 9,
     data: [
@@ -446,7 +446,7 @@ const yaoluList = [
   },
   {
     id: 6,
-    label: '窑炉6',
+    label: '工业炉6',
     value: 56,
     percent: 9,
     data: [
@@ -480,7 +480,7 @@ const yaoluList = [
   },
   {
     id: 7,
-    label: '窑炉7',
+    label: '工业炉7',
     value: 56,
     percent: 9,
     data: [
@@ -514,7 +514,7 @@ const yaoluList = [
   },
   {
     id: 8,
-    label: '窑炉8',
+    label: '工业炉8',
     value: 56,
     percent: 9,
     data: [
@@ -548,7 +548,7 @@ const yaoluList = [
   },
   {
     id: 9,
-    label: '窑炉9',
+    label: '工业炉9',
     value: 56,
     percent: 9,
     data: [
@@ -582,7 +582,7 @@ const yaoluList = [
   },
   {
     id: 10,
-    label: '窑炉10',
+    label: '工业炉10',
     value: 56,
     percent: 9,
     data: [
@@ -616,7 +616,7 @@ const yaoluList = [
   },
   {
     id: 11,
-    label: '窑炉11',
+    label: '工业炉11',
     value: 56,
     percent: 9,
     data: [

src/views/energy/sump-temperature.vue

@@ -250,11 +250,11 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    label: '窑炉1',
+    label: '工业炉1',
     value: 63,
     percent: 11,
     data: [
@@ -288,7 +288,7 @@ const yaoluList = [
   },
   {
     id: 2,
-    label: '窑炉2',
+    label: '工业炉2',
     value: 44,
     percent: 8,
     data: [
@@ -322,7 +322,7 @@ const yaoluList = [
   },
   {
     id: 3,
-    label: '窑炉3',
+    label: '工业炉3',
     value: 56,
     percent: 9,
     data: [
@@ -356,7 +356,7 @@ const yaoluList = [
   },
   {
     id: 4,
-    label: '窑炉4',
+    label: '工业炉4',
     value: 56,
     percent: 9,
     data: [
@@ -390,7 +390,7 @@ const yaoluList = [
   },
   {
     id: 5,
-    label: '窑炉5',
+    label: '工业炉5',
     value: 56,
     percent: 9,
     data: [
@@ -424,7 +424,7 @@ const yaoluList = [
   },
   {
     id: 6,
-    label: '窑炉6',
+    label: '工业炉6',
     value: 56,
     percent: 9,
     data: [
@@ -458,7 +458,7 @@ const yaoluList = [
   },
   {
     id: 7,
-    label: '窑炉7',
+    label: '工业炉7',
     value: 56,
     percent: 9,
     data: [
@@ -492,7 +492,7 @@ const yaoluList = [
   },
   {
     id: 8,
-    label: '窑炉8',
+    label: '工业炉8',
     value: 56,
     percent: 9,
     data: [
@@ -526,7 +526,7 @@ const yaoluList = [
   },
   {
     id: 9,
-    label: '窑炉9',
+    label: '工业炉9',
     value: 56,
     percent: 9,
     data: [
@@ -560,7 +560,7 @@ const yaoluList = [
   },
   {
     id: 10,
-    label: '窑炉10',
+    label: '工业炉10',
     value: 56,
     percent: 9,
     data: [
@@ -594,7 +594,7 @@ const yaoluList = [
   },
   {
     id: 11,
-    label: '窑炉11',
+    label: '工业炉11',
     value: 56,
     percent: 9,
     data: [

src/views/energy/temperature-acquisition.vue

@@ -121,51 +121,51 @@ const datePickerType = {
   }
 }
 
-// 窑炉列表
+// 工业炉列表
 const yaoluList = [
   {
     id: 1,
-    label: '窑炉1'
+    label: '工业炉1'
   },
   {
     id: 2,
-    label: '窑炉2'
+    label: '工业炉2'
   },
   {
     id: 3,
-    label: '窑炉3'
+    label: '工业炉3'
   },
   {
     id: 4,
-    label: '窑炉4'
+    label: '工业炉4'
   },
   {
     id: 5,
-    label: '窑炉5'
+    label: '工业炉5'
   },
   {
     id: 6,
-    label: '窑炉6'
+    label: '工业炉6'
   },
   {
     id: 7,
-    label: '窑炉7'
+    label: '工业炉7'
   },
   {
     id: 8,
-    label: '窑炉8'
+    label: '工业炉8'
   },
   {
     id: 9,
-    label: '窑炉9'
+    label: '工业炉9'
   },
   {
     id: 10,
-    label: '窑炉10'
+    label: '工业炉10'
   },
   {
     id: 11,
-    label: '窑炉11'
+    label: '工业炉11'
   }
 ]
 

src/views/main-sidebar.vue

@@ -11,6 +11,10 @@
           <icon-svg name="shouye" class="site-sidebar__menu-icon"></icon-svg>
           <span slot="title">首页</span>
         </el-menu-item>
+        <el-menu-item index="board" @click="getUrl">
+          <icon-svg name="shanchu" class="site-sidebar__menu-icon"></icon-svg>
+          <span slot="title">车间生产看板</span>
+        </el-menu-item>
         <el-submenu index="task">
           <template slot="title">
             <icon-svg name="config" class="site-sidebar__menu-icon"></icon-svg>
@@ -23,14 +27,14 @@
             @click="$router.push({ name: 'orderAuto' })"
           >
             <icon-svg name="tubiao" class="site-sidebar__menu-icon"></icon-svg>
-            <span slot="title">自动任务</span>
+            <span slot="title">多步骤自动任务</span>
           </el-menu-item>
           <el-menu-item
             index="orderProcess"
             @click="$router.push({ name: 'orderProcess' })"
           >
             <icon-svg name="tubiao" class="site-sidebar__menu-icon"></icon-svg>
-            <span slot="title">订单加工</span>
+            <span slot="title">单步骤任务</span>
           </el-menu-item>
           <el-menu-item
             index="exWarehouse"
@@ -128,7 +132,14 @@
             @click="$router.push({ name: 'order-current-task' })"
           >
             <icon-svg name="editor" class="site-sidebar__menu-icon"></icon-svg>
-            <span slot="title">当前执行任务</span>
+            <span slot="title">当前任务列表</span>
+          </el-menu-item>
+          <el-menu-item
+            index="current-task"
+            @click="$router.push({ name: 'order-current-task-new' })"
+          >
+            <icon-svg name="editor" class="site-sidebar__menu-icon"></icon-svg>
+            <span slot="title">任务列表</span>
           </el-menu-item>
         </el-submenu>
         <!-- <el-submenu index="energy">
@@ -148,7 +159,7 @@
             @click="$router.push({ name: 'energy-kiln-electric' })"
           >
             <icon-svg name="tubiao" class="site-sidebar__menu-icon"></icon-svg>
-            <span slot="title">窑炉用电分析</span>
+            <span slot="title">工业炉用电分析</span>
           </el-menu-item>
           <el-submenu index="kiln-gas">
             <template slot="title">
@@ -156,7 +167,7 @@
                 name="config"
                 class="site-sidebar__menu-icon"
               ></icon-svg>
-              <span>窑炉用气分析</span>
+              <span>工业炉用气分析</span>
             </template>
             <el-menu-item
               index="sulfur-dioxide"
@@ -246,7 +257,7 @@
                 name="tubiao"
                 class="site-sidebar__menu-icon"
               ></icon-svg>
-              <span slot="title">窑炉加工温度</span>
+              <span slot="title">工业炉加工温度</span>
             </el-menu-item>
             <el-menu-item
               index="sump-temperature"
@@ -283,7 +294,7 @@
             @click="$router.push({ name: 'energy-kiln-speed' })"
           >
             <icon-svg name="tubiao" class="site-sidebar__menu-icon"></icon-svg>
-            <span slot="title">窑炉速度参数</span>
+            <span slot="title">工业炉速度参数</span>
           </el-menu-item>
         </el-submenu> -->
         <el-submenu index="report">
@@ -304,7 +315,7 @@
               @click="$router.push({ name: 'report-kiln-alarm' })"
             >
               <icon-svg name="job" class="site-sidebar__menu-icon"></icon-svg>
-              <span slot="title">窑炉报警</span>
+              <span slot="title">工业炉报警</span>
             </el-menu-item>
             <el-menu-item
               index="car-alarm"
@@ -328,7 +339,18 @@
             <icon-svg name="job" class="site-sidebar__menu-icon"></icon-svg>
             <span slot="title">执行任务历史列表</span>
           </el-menu-item>
+          <el-menu-item
+            index="report-APMS-work"
+            @click="$router.push({ name: 'report-APMS-work' })"
+          >
+            <icon-svg name="job" class="site-sidebar__menu-icon"></icon-svg>
+            <span slot="title">APMS报工</span>
+          </el-menu-item>
         </el-submenu>
+        <el-menu-item index="Problem" @click="$router.push({ name: 'Problem' })">
+          <icon-svg name="log" class="site-sidebar__menu-icon"></icon-svg>
+          <span slot="title">常见问题汇总</span>
+        </el-menu-item>
         <!-- <sub-menu
           v-for="menu in menuList"
           :key="menu.menuId"
@@ -408,6 +430,10 @@ export default {
     this.routeHandle(this.$route)
   },
   methods: {
+    getUrl () {
+      let routeData = this.$router.resolve({ path: '/board' })
+      window.open(routeData.href, '_blank')
+    },
     // 路由操作
     routeHandle (route) {
       if (route.meta.isTab) {

src/views/main.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-15 08:20:28
  * @LastEditors: zwq
- * @LastEditTime: 2022-03-18 14:48:46
+ * @LastEditTime: 2022-07-07 10:51:59
  * @Description:
 -->
 <template>
@@ -67,8 +67,7 @@
       }
     },
     created () {
-      const baseurl = window.SITE_CONFIG.baseUrl
-      this.url = baseurl.slice(5)
+      this.url = window.SITE_CONFIG.wbUrl
       this.getUserInfo()
       this.initWebSocket()
     },
@@ -98,7 +97,7 @@
         // })
       },
       initWebSocket () { // 初始化weosocket
-        const path = `ws:${this.url}/qj/websocket/${'id'}`
+        const path = `ws://${this.url}/qj/websocket/1`
         this.websock = new WebSocket(path)
         this.websock.onmessage = this.websocketonmessage
         this.websock.onopen = this.websocketonopen
@@ -106,7 +105,7 @@
         this.websock.onclose = this.websocketclose
       },
       websocketonopen () { // 连接建立之后执行send方法发送数据
-        this.websocketsend(JSON.stringify())
+        this.websocketsend(JSON.stringify(1))
       },
       websocketonerror () { // 连接建立失败重连
         this.initWebSocket()
@@ -118,8 +117,8 @@
           duration: 15000
         })
       },
-      websocketsend () { // 数据发送
-        this.websock.send()
+      websocketsend (val) { // 数据发送
+        this.websock.send(val)
       },
       websocketclose (e) {  // 关闭
         console.log('断开连接', e)

src/views/order/components/current-order-task.vue

@@ -34,16 +34,25 @@
         prop="abeginTime"
         label="发起时间"
       >
+        <template slot-scope="scope">
+          {{ scope.row.abeginTime ? scope.row.abeginTime.replace('T', ' ') : '' }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="aendTime"
         label="完成时间"
       >
+        <template slot-scope="scope">
+          {{ scope.row.aendTime ? scope.row.aendTime.replace('T', ' ') : '' }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="taskType"
         label="任务类型"
       >
+        <template slot-scope="scope">
+          {{ scope.row.taskType === 0 ? '初始加工' : '复加工' }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="remark"
@@ -60,11 +69,6 @@
         label="目标位置"
       >
       </el-table-column>
-      <el-table-column
-        prop="vehicleName"
-        label="车辆名称"
-      >
-      </el-table-column>
       <el-table-column
         prop="kilnName"
         label="加工炉"

src/views/order/components/current-task-new-add.vue

@@ -0,0 +1,150 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-18 14:16:25
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-09-09 16:26:17
+ * @Description:
+-->
+<template>
+  <el-dialog title="修改"
+      :before-close="handleClose"
+       :visible.sync="visible">
+    <el-form
+      :model="dataForm"
+      :rules="dataRule"
+      ref="dataForm"
+      @keyup.enter.native="dataFormSubmit()"
+      label-width="80px"
+    >
+      <el-form-item label="加工炉" prop="kilnId">
+        <el-select
+          v-model="dataForm.kilnId"
+          filterable
+          placeholder="请选择加工炉"
+        >
+          <el-option
+            v-for="item in kilnInfoArr"
+            :key="item.id"
+            :label="item.kilnName"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="dataForm.status"
+          filterable
+          placeholder="请选择状态"
+        >
+          <el-option
+            v-for="item in statusList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </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: {
+    kilnInfoArr: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data () {
+    return {
+      visible: false,
+      btnLoad: false,
+      dataForm: {
+        id: '',
+        kilnId: '',
+        status: ''
+      },
+      statusList: [
+        {
+          value: 0,
+          label: '等待执行'
+        },
+        {
+          value: 1,
+          label: '执行中'
+        },
+        {
+          value: 2,
+          label: '执行完成'
+        }
+      ],
+      dataRule: {
+        kilnId: [
+          { required: true, message: '加工炉不能为空', trigger: 'change' }
+        ],
+        status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
+      }
+    }
+  },
+  methods: {
+    init (id, status, kilnId) {
+      this.btnLoad = false
+      this.dataForm = {
+        id: '',
+        kilnId: '',
+        status: ''
+      }
+      this.dataForm.id = id
+      this.dataForm.status = status
+      this.dataForm.kilnId = kilnId
+      this.visible = true
+    },
+    // 表单提交
+    dataFormSubmit () {
+      this.$refs['dataForm'].validate(valid => {
+        if (valid) {
+          this.btnLoad = true
+          this.$http({
+            url: this.$http.adornUrl('/currTask/updateCurrTaskStatus'),
+            method: 'post',
+            data: this.$http.adornData({
+              id: this.dataForm.id || undefined,
+              kilnId: this.dataForm.kilnId,
+              status: this.dataForm.status
+            })
+          }).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.btnLoad = false
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.visible = false
+                  this.$emit('refreshDataList')
+                }
+              })
+            } else {
+              this.btnLoad = false
+              this.$message.error(data.msg)
+            }
+          })
+        }
+      })
+    },
+    handleClose () {
+      this.visible = false
+      this.$refs['dataForm'].resetFields()
+    }
+  }
+}
+</script>

src/views/order/components/current-task-new-table1.vue

@@ -0,0 +1,243 @@
+<template>
+  <div style="margin:20px">
+    <el-table
+      :data="dataList"
+      ref="dataList"
+      size="mini"
+      height="250"
+      :header-cell-style="{
+        background: '#eef1f6',
+        color: '#606266',
+        width: '100%'
+      }"
+    >
+      <el-table-column
+        type="index"
+        header-align="center"
+        align="center"
+        label="序号"
+        width="50"
+      >
+      </el-table-column>
+      <el-table-column prop="taskCode" label="任务编码"> </el-table-column>
+      <el-table-column prop="createTime" label="发起时间">
+        <template slot-scope="scope">
+          {{
+            scope.row.createTime ? scope.row.createTime.replace("T", " ") : ""
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="kilnName" label="工业炉">
+        <template slot-scope="scope">
+          <span>{{
+            kilnInfoArr.find(item => {
+              return item.id === scope.row.kilnId;
+            })
+              ? kilnInfoArr.find(item => {
+                  return item.id === scope.row.kilnId;
+                }).kilnName
+              : ""
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="status" label="任务状态">
+        <template slot-scope="scope">
+          {{ scope.row.status >= 0 ? statusList[scope.row.status] : "" }}
+        </template>
+      </el-table-column>
+      <!-- <el-table-column 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="isAuto" label="多步骤">
+        <template slot-scope="scope">
+          <span>{{ scope.row.isAuto === 1 ? "是" : "否" }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="craftCodeId" label="工艺"> </el-table-column>
+      <el-table-column prop="startPosition" label="开始位置"> </el-table-column>
+      <el-table-column prop="targetPosition" 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,
+                scope.row.status,
+                scope.row.kilnId
+              )
+            "
+          >
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="修改"
+              placement="top"
+            >
+              <icon-svg class="iconClass" name="编辑"></icon-svg>
+            </el-tooltip>
+          </el-button>
+          <el-button
+            type="text"
+            :disabled="scope.row.status === 1"
+            size="small"
+            @click="runTask(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>
+    <!-- 弹窗, 新增 / 修改 -->
+    <add-or-update
+      v-if="addOrUpdateVisible"
+      ref="addOrUpdate"
+      :kiln-info-arr="kilnInfoArr"
+      @refreshDataList="reDataList"
+    ></add-or-update>
+  </div>
+</template>
+
+<script>
+import AddOrUpdate from './current-task-new-add'
+// 任务状态列表
+const statusList = {
+  0: '等待执行',
+  1: '执行中',
+  2: '执行完成'
+}
+export default {
+  props: {
+    dataList: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    kilnInfoArr: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data () {
+    return {
+      statusList,
+      addOrUpdateVisible: false
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  activated () {},
+  methods: {
+    init () {
+      console.log(1)
+    },
+    // 新增 / 修改
+    addOrUpdateHandle (id, status, kilnId) {
+      this.addOrUpdateVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id, status, kilnId)
+      })
+    },
+    reDataList () {
+      this.$emit('refreshDataList')
+    },
+    // 删除
+    deleteHandle (id) {
+      this.$confirm(`确定对[${id}]进行删除操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          this.$http({
+            url: this.$http.adornUrl('/currTask/deleteById'),
+            method: 'post',
+            data: this.$http.adornData({ id })
+          }).then(({ data }) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.reDataList()
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        })
+        .catch(() => {})
+    },
+    // 执行
+    runTask (id) {
+      this.$http({
+        url: this.$http.adornUrl('/currTask/runTask'),
+        method: 'post',
+        data: this.$http.adornData({ id })
+        // params: this.$http.adornParams({ id }, false)
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500,
+            onClose: () => {
+              this.reDataList()
+            }
+          })
+        } else {
+          this.$message.error(data.msg)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style></style>

src/views/order/components/current-task-new-table2.vue

@@ -0,0 +1,78 @@
+<!--
+ * @Author: zwq
+ * @Date: 2022-09-09 14:35:52
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-09-09 15:25:54
+ * @Description:
+-->
+<template>
+  <div style="margin:20px">
+    <el-table
+      :data="detDataList"
+      :stripe="true"
+      size="mini"
+      ref="detDataList"
+      height="250"
+      :header-cell-style="{
+        background: '#eef1f6',
+        color: '#606266',
+        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="orderNo" label="订单名"> </el-table-column>
+      <el-table-column prop="customer" label="客户名称"> </el-table-column>
+      <el-table-column prop="productName" label="产品名称"> </el-table-column>
+      <el-table-column prop="productModel" label="产品型号"> </el-table-column>
+      <el-table-column prop="materialDes" label="材料号牌"> </el-table-column>
+      <el-table-column prop="craftIll" width="120" label="生产工艺要求">
+      </el-table-column>
+      <el-table-column prop="unit" label="单位"> </el-table-column>
+      <el-table-column prop="quantity" label="数量"> </el-table-column>
+      <el-table-column prop="weight" label="重量"> </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+// 任务状态列表
+const statusList = {
+  0: '等待执行',
+  1: '执行中',
+  2: '执行完成',
+  3: '追加后完成'
+}
+export default {
+  props: {
+    detDataList: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data () {
+    return {
+      statusList
+    }
+  },
+  components: {
+  },
+  activated () {},
+  methods: {
+    init () {
+      console.log(2)
+    }
+  }
+}
+</script>
+
+<style></style>

src/views/order/components/current-task-new-table3.vue

@@ -0,0 +1,105 @@
+<!--
+ * @Author: zwq
+ * @Date: 2022-09-09 15:19:56
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-09-09 15:26:04
+ * @Description:
+-->
+<template>
+  <div style="margin:20px">
+    <el-table
+      :data="dataList"
+      ref="dataList"
+      size="mini"
+      height="250"
+      :header-cell-style="{
+        background: '#eef1f6',
+        color: '#606266',
+        width: '100%'
+      }"
+    >
+      <el-table-column
+        type="index"
+        header-align="center"
+        align="center"
+        label="序号"
+        width="50"
+      >
+      </el-table-column>
+      <el-table-column prop="inTime" label="入库时间">
+        <template slot-scope="scope">
+          {{
+            scope.row.inTime ? scope.row.inTime.replace("T", " ") : ""
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="kilnName" label="工业炉名称"></el-table-column>
+      <el-table-column prop="locationName" label="	库位名称"> </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="80"
+        label="置顶"
+      >
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="topList(scope.row.id)"
+            >置顶</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+// 任务状态列表
+const statusList = {
+  0: '等待执行',
+  1: '执行中',
+  2: '执行完成',
+  3: '追加后完成'
+}
+export default {
+  props: {
+    dataList: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    }
+  },
+  data () {
+    return {
+      statusList
+    }
+  },
+  components: {
+  },
+  activated () {},
+  methods: {
+    init () {
+      console.log(3)
+    },
+    topList (id) {
+      this.$http({
+        url: this.$http.adornUrl('/inStockInfo/top'),
+        method: 'post',
+        data: this.$http.adornData({ id })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500
+          })
+        } else {
+          this.$message.error(data.msg)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style></style>

src/views/order/current-order.vue

@@ -24,18 +24,10 @@
         label="序号"
         width="50">
       </el-table-column>
-      <el-table-column
-        prop="createTime"
-        label="获取时间">
-      </el-table-column>
       <el-table-column
         prop="idenCardNum"
         label="标识卡号">
       </el-table-column>
-      <el-table-column
-        prop="orderNo"
-        label="订单号">
-      </el-table-column>
       <el-table-column
         prop="status"
         label="任务状态">
@@ -66,13 +58,28 @@
         prop="quantity"
         label="物料数量">
       </el-table-column>
+      <el-table-column
+        prop="targetQuantity"
+        label="剩余数量">
+      </el-table-column>
       <el-table-column
         prop="weight"
         label="物料重量">
       </el-table-column>
       <el-table-column
-        prop="waitWeight"
-        label="实际重量">
+        prop="targetWeight"
+        label="剩余重量">
+      </el-table-column>
+      <el-table-column
+        prop="orderNo"
+        label="订单号">
+      </el-table-column>
+      <el-table-column
+        prop="createTime"
+        label="获取时间">
+        <template slot-scope="scope">
+          {{ scope.row.createTime ? scope.row.createTime.replace('T', ' ') : '' }}
+        </template>
       </el-table-column>
       <el-table-column
         fixed="right"
@@ -171,7 +178,7 @@
     components: {
       orderDetail
     },
-    created () {
+    activated () {
       this.getDataList()
     },
     methods: {
@@ -190,6 +197,10 @@
         }).then(({data}) => {
           if (data && data.code === 0) {
             this.dataList = data.data.records
+            this.dataList.forEach(item => {
+              item.targetQuantity = item.quantity - item.finishQuantity - item.waitQuantity
+              item.targetWeight = item.weight - item.finishWeight - item.waitWeight
+            })
             this.totalPage = data.data.total
           } else {
             this.dataList = []

src/views/order/current-task-new.vue

@@ -0,0 +1,196 @@
+<template>
+  <div class="mod-config">
+    <el-table
+      :data="dataList"
+      :row-class-name="tableRowClassName"
+      :header-cell-style="{
+        background: '#eef1f6',
+        color: '#606266',
+        height: '56px'
+      }"
+      v-loading="dataListLoading"
+      style="width: 100%;"
+      ref="dataList"
+    >
+      <el-table-column type="expand">
+        <template slot-scope="props">
+          <div style="height:300px">
+            <el-tabs @tab-click="val => handleClick(val, props.row)">
+              <el-tab-pane label="任务步骤详情">
+                <tab-table1
+                  :data-list="props.row.currTaskVoList"
+                  :kiln-info-arr="kilnInfoArr"
+                  ref="tab1Ref"
+                  @refreshDataList="getDataList"
+                >
+                </tab-table1>
+              </el-tab-pane>
+              <el-tab-pane label="缓存详情">
+                <tab-table3
+                  :data-list="props.row.inStockInfoVoList"
+                  ref="tab3Ref"
+                  @refreshDataList="getDataList"
+                >
+                </tab-table3>
+              </el-tab-pane>
+              <el-tab-pane label="标识卡详情">
+                <tab-table2
+                  :det-data-list="props.row.currTaskDetVoList"
+                  ref="tab2Ref"
+                  @refreshDataList="getDataList"
+                >
+                </tab-table2>
+              </el-tab-pane>
+            </el-tabs>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        type="index"
+        header-align="center"
+        align="center"
+        label="序号"
+        width="50"
+      >
+      </el-table-column>
+      <el-table-column prop="status" label="状态">
+        <template slot-scope="scope">
+          <span>{{
+            scope.row.status === 0
+              ? "等待执行"
+              : scope.row.status === 1
+              ? "执行中"
+              : "缓存中"
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="allStep" width="250" label="所有步骤">
+      </el-table-column>
+      <el-table-column prop="nowStep" label="当前步骤"> </el-table-column>
+      <el-table-column prop="isAuto" label="多步骤">
+        <template slot-scope="scope">
+          <span>{{ scope.row.isAuto === 0 ? "否" : "是" }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="sheetNo" label="生产单号"> </el-table-column>
+      <el-table-column prop="startPosition" label="开始位置"> </el-table-column>
+      <el-table-column
+        prop="createTime"
+        header-align="center"
+        align="center"
+        label="添加时间"
+      >
+        <template slot-scope="scope">
+          {{
+            scope.row.createTime ? scope.row.createTime.replace("T", " ") : ""
+          }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 弹窗, 新增 / 修改 -->
+    <add-or-update
+      v-if="addOrUpdateVisible"
+      ref="addOrUpdate"
+      @refreshDataList="getDataList"
+    ></add-or-update>
+  </div>
+</template>
+
+<script>
+import AddOrUpdate from './components/current-task-new-add'
+import tabTable1 from './components/current-task-new-table1'
+import tabTable2 from './components/current-task-new-table2'
+import tabTable3 from './components/current-task-new-table3'
+export default {
+  data () {
+    return {
+      dataList: [],
+      kilnInfoArr: [],
+      dataListLoading: false,
+      addOrUpdateVisible: false
+    }
+  },
+  components: {
+    AddOrUpdate,
+    tabTable1,
+    tabTable2,
+    tabTable3
+  },
+  activated () {
+    this.getDataList()
+  },
+  created () {
+    this.$http({
+      url: this.$http.adornUrl('/kilnInfo/list'),
+      method: 'post',
+      data: this.$http.adornData({
+        current: 1,
+        size: 500
+      })
+    }).then(({ data }) => {
+      if (data && data.code === 0) {
+        this.kilnInfoArr = data.data
+      } else {
+        this.kilnInfoArr = []
+      }
+    })
+  },
+  methods: {
+    // 获取数据列表
+    getDataList () {
+      this.dataListLoading = true
+      this.$http({
+        url: this.$http.adornUrl('/currTask/currentTaskInfo'),
+        method: 'post',
+        data: this.$http.adornData({
+          current: 1,
+          size: 500
+        })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.dataList = data.data
+        } else {
+          this.dataList = []
+        }
+        this.dataListLoading = false
+      })
+    },
+    // 新增 / 修改
+    addOrUpdateHandle (id) {
+      this.addOrUpdateVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id)
+      })
+    },
+    handleClick (tab) {
+      if (tab.index === '0') {
+        this.$nextTick(() => {
+          this.$refs.tab1Ref.init()
+        })
+      } else {
+        this.$nextTick(() => {
+          this.$refs.tab2Ref.init()
+        })
+      }
+    },
+    tableRowClassName ({ row, rowIndex }) {
+      if (row.status === 1) {
+        return 'success-row'
+      } else if (row.status === 2) {
+        return 'warning-row'
+      }
+      return ''
+    }
+  }
+}
+</script>
+
+<style>
+.el-table .warning-row {
+  background-color: oldlace;
+}
+
+.el-table .success-row {
+  background-color: #f0f9eb;
+}
+</style>

src/views/order/current-task.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="mod-config">
-    <el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+    <div style="margin-bottom:10px;float:right">
+      <el-tag type="success">加工中</el-tag>
+      <el-tag type="warning">缓存中</el-tag>
+    </div>
+    <!-- <el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form-item>
         <el-select size="small" v-model="dataForm.vehicleId" filterable placeholder="车辆名称">
           <el-option
@@ -14,76 +18,87 @@
       </el-form-item>
       <el-form-item>
         <el-button size="small" @click="getDataList()">查询</el-button>
-        <!-- <el-button type="primary" @click="handTask()">手动执行任务</el-button> -->
+        <el-button type="primary" @click="handTask()">手动执行任务</el-button>
       </el-form-item>
-    </el-form>
+    </el-form> -->
     <el-table
       :data="dataList"
-      :stripe="true"
-      :header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
+      :header-cell-style="{
+        background: '#eef1f6',
+        color: '#606266',
+        height: '56px'
+      }"
+      :row-class-name="tableRowClassName"
       v-loading="dataListLoading"
-      style="width: 100%;">
+      style="width: 100%;"
+    >
       <el-table-column
         type="index"
         header-align="center"
         align="center"
         label="序号"
-        width="50">
+        width="50"
+      >
       </el-table-column>
-      <el-table-column
-        prop="taskCode"
-        label="任务编码">
-      </el-table-column>
-      <el-table-column
-        prop="createTime"
-        label="发起时间">
-      </el-table-column>
-      <el-table-column
-        prop="taskSource"
-        label="任务来源">
-      </el-table-column>
-      <el-table-column
-        prop="status"
-        label="任务状态">
+      <el-table-column prop="taskCode" label="任务编码"> </el-table-column>
+      <el-table-column prop="createTime" label="发起时间">
         <template slot-scope="scope">
-          {{ scope.row.status >= 0 ? statusList[scope.row.status] : '' }}
+          {{
+            scope.row.createTime ? scope.row.createTime.replace("T", " ") : ""
+          }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="taskType"
-        label="任务类型">
+      <el-table-column prop="status" label="任务状态">
+        <template slot-scope="scope">
+          {{ scope.row.status >= 0 ? statusList[scope.row.status] : "" }}
+        </template>
+      </el-table-column>
+      <el-table-column 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="startPosition"
-        label="开始位置">
+      <el-table-column prop="isAuto" label="多步骤">
+        <template slot-scope="scope">
+          <span>{{ scope.row.isAuto === 1 ? "是" : "否" }}</span>
+        </template>
       </el-table-column>
-      <el-table-column
-        prop="targetPosition"
-        label="目标位置">
-      </el-table-column>
-      <el-table-column
-        prop="vehicleName"
-        label="车辆名称">
+      <el-table-column prop="craftCodeId" label="工艺"> </el-table-column>
+      <el-table-column prop="startPosition" label="开始位置"> </el-table-column>
+      <el-table-column prop="targetPosition" label="目标位置">
       </el-table-column>
       <el-table-column
         fixed="right"
         header-align="center"
         align="center"
         width="80"
-        label="详情">
+        label="置顶"
+      >
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="Detail(scope.row.id)">详情</el-button>
+          <el-button type="text" size="small" @click="topList(scope.row.id)"
+            >置顶</el-button
+          >
+        </template>
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="80"
+        label="详情"
+      >
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="Detail(scope.row.id)"
+            >详情</el-button
+          >
         </template>
       </el-table-column>
       <el-table-column
@@ -91,15 +106,37 @@
         header-align="center"
         align="center"
         width="120"
-        label="操作">
+        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">
+          <el-button
+            type="text"
+            :disabled="scope.row.status === 1"
+            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" v-if="!(scope.row.isAuto)" style="color:red" size="small" @click="deleteHandle(scope.row.sheetNo)">
-            <el-tooltip class="item" effect="dark" content="删除" placement="top">
+          <el-button
+            type="text"
+            :disabled="scope.row.status === 1"
+            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>
@@ -110,114 +147,161 @@
       @size-change="sizeChangeHandle"
       @current-change="currentChangeHandle"
       :current-page="pageIndex"
-      :page-sizes="[10, 20, 50, 100]"
+      :page-sizes="[10, 20, 30, 50, 100]"
       :page-size="pageSize"
       :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper">
+      layout="total, sizes, prev, pager, next, jumper"
+    >
     </el-pagination>
   </div>
 </template>
 
 <script>
-  // 任务状态列表
-  const statusList = {
-    0: '等待执行',
-    1: '执行中',
-    2: '执行完成',
-    3: '追加后完成'
-  }
-  export default {
-    data () {
-      return {
-        dataForm: {
-          vehicleId: ''
-        },
-        dataList: [],
-        options: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPage: 0,
-        dataListLoading: false,
-        statusList
-      }
+// 任务状态列表
+const statusList = {
+  0: '等待执行',
+  1: '执行中',
+  2: '执行完成',
+  3: '追加后完成'
+}
+export default {
+  data () {
+    return {
+      dataForm: {
+        vehicleId: ''
+      },
+      timer: '',
+      dataList: [],
+      options: [],
+      pageIndex: 1,
+      pageSize: 30,
+      totalPage: 0,
+      dataListLoading: false,
+      statusList,
+      processList: []
+    }
+  },
+  activated () {
+    this.getDataList()
+    this.timer = setInterval(this.getDataList, 180000)
+    // 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.splice(0, this.processList.length)
+    //   }
+    // })
+  },
+  methods: {
+    // 获取数据列表
+    getDataList () {
+      this.dataListLoading = true
+      this.$http({
+        url: this.$http.adornUrl('/currTask/currentTaskNow'),
+        method: 'post',
+        data: this.$http.adornData({
+          current: this.pageIndex,
+          size: this.pageSize,
+          vehicleId: this.dataForm.vehicleId
+        })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          const resData = data.data.records
+          // resData.forEach(item => {
+          //   if (item.craftCodeId) {
+          //     this.processList.find(item1 => {
+          //       if (item1.id === item.craftCodeId) { item.craftName = item1.craftCode }
+          //     })
+          //   }
+          // })
+          this.dataList = resData
+          this.totalPage = data.data.total
+        } else {
+          this.dataList = []
+          this.totalPage = 0
+        }
+        this.dataListLoading = false
+      })
     },
-    activated () {
+    // 每页数
+    sizeChangeHandle (val) {
+      this.pageSize = val
+      this.pageIndex = 1
       this.getDataList()
     },
-    methods: {
-      // 获取数据列表
-      getDataList () {
-        this.dataListLoading = true
-        this.$http({
-          url: this.$http.adornUrl('/currTask/currentTaskNow'),
-          method: 'post',
-          data: this.$http.adornData({
-            'current': this.pageIndex,
-            'size': this.pageSize,
-            'vehicleId': this.dataForm.vehicleId
+    // 当前页
+    currentChangeHandle (val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+    Detail (id) {
+      this.$router.push({ name: 'order-current-task-detail', query: { id } })
+    },
+    handTask () {
+      this.$router.push({ name: 'orderProcess' })
+    },
+    // 执行
+    addOrUpdateHandle (id) {
+      this.$http({
+        url: this.$http.adornUrl('/currTask/runTask'),
+        method: 'post',
+        data: this.$http.adornData({ id })
+        // params: this.$http.adornParams({ id }, false)
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.$message({
+            message: '操作成功',
+            type: 'success',
+            duration: 1500,
+            onClose: () => {
+              this.getDataList()
+            }
           })
-        }).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()
-      },
-      Detail (id) {
-        this.$router.push({name: 'order-current-task-detail', query: {id}})
-      },
-      handTask () {
-        this.$router.push({name: 'orderProcess'})
-      },
-      // 执行
-      addOrUpdateHandle (id) {
-        this.$http({
-          url: this.$http.adornUrl('/currTask/runTask'),
-          method: 'post',
-          data: this.$http.adornData({ id })
-            // params: this.$http.adornParams({ id }, false)
-        }).then(({data}) => {
-          if (data && data.code === 0) {
-            this.$message({
-              message: '操作成功',
-              type: 'success',
-              duration: 1500,
-              onClose: () => {
-                this.getDataList()
-              }
-            })
-          } else {
-            this.$message.error(data.msg)
-          }
-        })
-      },
-      // 删除
-      deleteHandle (sheetNo) {
-        this.$confirm(`确定对[生产单编号=${sheetNo}]进行删除操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
+        } else {
+          this.$message.error(data.msg)
+        }
+      })
+    },
+    topList (id) {
+      this.$http({
+        url: this.$http.adornUrl('/currTask/top'),
+        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)
+        }
+      })
+    },
+    // 删除
+    deleteHandle (id) {
+      this.$confirm(`确定对[${id}]进行删除操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
           this.$http({
-            url: this.$http.adornUrl('/currTask/deleteBySheetNo'),
+            url: this.$http.adornUrl('/currTask/deleteById'),
             method: 'post',
-            data: this.$http.adornData(sheetNo)
-          }).then(({data}) => {
+            data: this.$http.adornData({ id })
+          }).then(({ data }) => {
             if (data && data.code === 0) {
               this.$message({
                 message: '操作成功',
@@ -231,8 +315,30 @@
               this.$message.error(data.msg)
             }
           })
-        }).catch(() => {})
+        })
+        .catch(() => {})
+    },
+    tableRowClassName ({ row, rowIndex }) {
+      if (row.status === 1) {
+        return 'success-row'
+      } else if (row.isCache === 1) {
+        return 'warning-row'
       }
+      return ''
     }
+  },
+  beforeDestroy () {
+    clearInterval(this.timer)
   }
+}
 </script>
+
+<style>
+.el-table .warning-row {
+  background-color: oldlace;
+}
+
+.el-table .success-row {
+  background-color: #f0f9eb;
+}
+</style>

src/views/report/APMS-work.vue

@@ -0,0 +1,310 @@
+<template>
+  <div class="mod-config">
+    <el-button type="primary" @click="submit()" size="small">提交</el-button>
+    <el-form
+      ref="dataForm"
+      :model="dataForm"
+      :rules="rules"
+      size="medium"
+      label-width="110px"
+    >
+      <div>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="开始加工时间" prop="startTime">
+              <el-date-picker
+                v-model="dataForm.startTime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :style="{ width: '100%' }"
+                type="datetime"
+                placeholder="请选择开始加工时间"
+                clearable
+              ></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="账号" prop="startUser">
+              <el-input
+                v-model="dataForm.startUser"
+                placeholder="请输入账号"
+                readonly
+                prefix-icon="el-icon-user-solid"
+                :style="{ width: '100%' }"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="配炉号" prop="stoveCode">
+              <el-select
+                v-model="dataForm.stoveCode"
+                :style="{ width: '100%' }"
+                filterable
+                placeholder="请选择配炉号"
+              >
+                <el-option
+                  v-for="item in stoveCodeArr"
+                  :key="item.id"
+                  :label="item.code"
+                  :value="item.code"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="车间编码" prop="workShopCode">
+              <el-input
+                v-model="dataForm.workShopCode"
+                placeholder="请输入车间编码"
+                readonly
+                :style="{ width: '100%' }"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="工艺号" prop="techCode">
+              <el-select
+                v-model="dataForm.techCode"
+                :style="{ width: '100%' }"
+                filterable
+                placeholder="请选择工艺号"
+              >
+                <el-option
+                  v-for="item in techCodeArr"
+                  :key="item.id"
+                  :label="item.craftCode"
+                  :value="item.craftCode"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="炉号备注" prop="stoveRemark">
+              <el-input
+                v-model="dataForm.stoveRemark"
+                placeholder="请输入炉号备注"
+                clearable
+                :style="{ width: '100%' }"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="备注" prop="remark">
+              <el-input
+                v-model="dataForm.remark"
+                placeholder="请输入备注"
+                clearable
+                :style="{ width: '100%' }"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </div>
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>生产单</span>
+          <el-tooltip effect="dark" content="新增" placement="top">
+            <el-button
+              style="float: right; padding: 0px;color:#409EFF;font-size:20px;border:none"
+              icon="el-icon-circle-plus"
+              @click="itemsPlus()"
+            ></el-button>
+          </el-tooltip>
+        </div>
+        <div v-for="(item, index) in dataForm.items" :key="index">
+          <el-row :gutter="20">
+            <el-col :span="1">
+              <el-tooltip effect="dark" content="删除" placement="top">
+                <el-button
+                  style="color:red"
+                  icon="el-icon-delete"
+                  @click="itemsDelete(index)"
+                ></el-button>
+              </el-tooltip>
+            </el-col>
+            <el-col :span="7">
+              <el-form-item label="标识卡号" prop="itemCode">
+                <el-input
+                  v-model="item.itemCode"
+                  placeholder="请输入标识卡号"
+                  clearable
+                  :style="{ width: '100%' }"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="加工数量" prop="quantity">
+                <el-input-number
+                  v-model="item.quantity"
+                  placeholder="加工数量"
+                  :step="1"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="加工重量" prop="weight">
+                <el-input-number
+                  v-model="item.weight"
+                  placeholder="加工重量"
+                  :step="1"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-card>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {},
+  props: [],
+  data () {
+    return {
+      stoveCodeArr: [],
+      techCodeArr: [],
+      dataForm: {
+        startTime: null,
+        startUser: 'QJJP03',
+        stoveCode: undefined,
+        workShopCode: 'BM',
+        techCode: undefined,
+        stoveRemark: undefined,
+        remark: undefined,
+        items: [
+          {
+            itemCode: undefined,
+            quantity: 0,
+            weight: 0
+          }
+        ]
+      },
+      rules: {
+        startTime: [
+          {
+            required: true,
+            message: '请选择开始加工时间',
+            trigger: 'change'
+          }
+        ],
+        startUser: [
+          {
+            required: true,
+            message: '请输入账号',
+            trigger: 'blur'
+          }
+        ],
+        stoveCode: [
+          {
+            required: true,
+            message: '请输入配炉号',
+            trigger: 'blur'
+          }
+        ],
+        workShopCode: [
+          {
+            required: true,
+            message: '请输入车间编码',
+            trigger: 'blur'
+          }
+        ],
+        techCode: [],
+        stoveRemark: [],
+        remark: [],
+        itemCode: []
+      }
+    }
+  },
+  created () {
+    this.init()
+  },
+  methods: {
+    init () {
+      this.$http({
+        url: this.$http.adornUrl('/kilnInfo/page'),
+        method: 'post',
+        data: this.$http.adornData({
+          current: 1,
+          size: 200
+          // paramKey: this.dataForm.paramKey
+        })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.stoveCodeArr = data.data.records
+        } else {
+          this.stoveCodeArr = []
+        }
+      })
+      this.$http({
+        url: this.$http.adornUrl('/craftInfo/page'),
+        method: 'post',
+        data: this.$http.adornData({
+          current: 1,
+          size: 200
+          // paramKey: this.dataForm.paramKey
+        })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.techCodeArr = data.data.records
+        } else {
+          this.techCodeArr = []
+        }
+      })
+    },
+    itemsPlus () {
+      const obj = {
+        itemCode: undefined,
+        quantity: 0,
+        weight: 0
+      }
+      this.dataForm.items.push(obj)
+    },
+    itemsDelete (index) {
+      this.dataForm.items.splice(index, 1)
+    },
+    submit () {
+      this.$refs['dataForm'].validate(valid => {
+        if (valid) {
+          let scheck = true
+          this.dataForm.items.find(item => {
+            if (!item.itemCode) {
+              scheck = false
+            }
+          })
+          if (scheck) {
+            this.$http({
+              url: this.$http.adornUrl('/apms/createProcessSheet'),
+              method: 'post',
+              data: this.$http.adornData(this.dataForm)
+            }).then(({ data }) => {
+              if (data && data.code === 0) {
+                this.$message({
+                  message: '操作成功',
+                  type: 'success',
+                  duration: 3000,
+                  onClose: () => {
+                    this.$refs['dataForm'].resetFields()
+                    this.dataForm.items.splice(0, this.dataForm.items.length)
+                    this.itemsPlus()
+                  }
+                })
+              } else {
+                this.$message.error(data.msg)
+              }
+            })
+          } else {
+            this.$message.info('请填写完整生产单')
+          }
+        }
+      })
+    }
+  }
+}
+</script>
+<style scoped></style>

src/views/report/car-alarm.vue

@@ -52,6 +52,9 @@
       <el-table-column
         prop="createTime"
         label="报警时间">
+        <template slot-scope="scope">
+          {{ scope.row.createTime ? scope.row.createTime.replace('T', ' ') : '' }}
+        </template>
       </el-table-column>
       <!-- <el-table-column
         prop="time"
@@ -91,7 +94,7 @@
         carList: []
       }
     },
-    created () {
+    activated () {
       this.getCarList()
     },
     methods: {

src/views/report/components/order-history-task.vue

@@ -34,11 +34,17 @@
         prop="abeginTime"
         label="发起时间"
       >
+        <template slot-scope="scope">
+          {{ scope.row.abeginTime ? scope.row.abeginTime.replace('T', ' ') : '' }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="aendTime"
         label="完成时间"
       >
+        <template slot-scope="scope">
+          {{ scope.row.aendTime ? scope.row.aendTime.replace('T', ' ') : '' }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="orderSource"

src/views/report/components/task-history-result.vue

@@ -0,0 +1,256 @@
+<!--
+ * @Author: zwq
+ * @Date: 2022-07-29 09:56:45
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-29 11:23:47
+ * @Description:
+-->
+<template>
+  <el-dialog
+    title="检验结果"
+    :visible.sync="visible"
+    width="85%"
+  >
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;"
+    >
+      <el-table-column
+        prop="createTime"
+        header-align="center"
+        align="center"
+        width="95"
+        label="添加时间"
+      >
+        <template slot-scope="scope">
+          {{ scope.row.createTime ? scope.row.createTime.replace('T', ' ') : '' }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="sheetNo"
+        header-align="center"
+        align="center"
+        label="生产单号"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="idenCardNum"
+        header-align="center"
+        align="center"
+        label="标识卡号"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="hardness"
+        header-align="center"
+        align="center"
+        label="硬度检验"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="metallography"
+        header-align="center"
+        align="center"
+        label="金相检验"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="heartHardness"
+        header-align="center"
+        align="center"
+        label="心部硬度"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="remake"
+        header-align="center"
+        align="center"
+        label="备注"
+      >
+      </el-table-column>
+      <el-table-column
+        header-align="center"
+        label="硬度检验">
+      <el-table-column
+        prop="hardnessValueOne"
+        header-align="center"
+        align="center"
+        label="结果1"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="hardnessValueTwo"
+        header-align="center"
+        align="center"
+        label="结果2"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="hardnessValueThree"
+        header-align="center"
+        align="center"
+        label="结果3"
+      >
+      </el-table-column>
+      </el-table-column>
+      <el-table-column
+        header-align="center"
+        label="金相检验渗碳淬火">
+        <el-table-column
+          prop="metallographyStchStccsd"
+          header-align="center"
+          align="center"
+          label="渗碳层深度"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="metallographyStchMstost"
+          header-align="center"
+          align="center"
+          label="表面为马氏体、残余奥氏体(级)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="metallographyStchXxklzthw"
+          header-align="center"
+          align="center"
+          label="细小颗粒状碳化物"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="metallographyStchDtmstyltst"
+          header-align="center"
+          align="center"
+          label="心部为低碳马氏体加游离铁素体(级)"
+        >
+        </el-table-column>
+      </el-table-column>
+      <el-table-column
+        header-align="center"
+        label="金相检验整体淬火">
+        <el-table-column
+          prop="metallographyZtchHhmst"
+          header-align="center"
+          align="center"
+          label="基体为回火马氏体(级)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="metallographyZtchHhtst"
+          header-align="center"
+          align="center"
+          label="基体为回火托式体(级)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="metallographyXchHhsst"
+          header-align="center"
+          align="center"
+          label="基体为回火素式体(级)"
+        >
+        </el-table-column>
+      </el-table-column>
+      <el-table-column
+        header-align="center"
+        label="金相检验氮化">
+        <el-table-column
+          prop="metallographyDhDhhwcs"
+          header-align="center"
+          align="center"
+          label="表面亮白色的为氮化合物层深"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="metallographyDhKscs"
+          header-align="center"
+          align="center"
+          label="向内为扩散层深"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="metallographyDhXb"
+          header-align="center"
+          align="center"
+          label="心部"
+        >
+        </el-table-column>
+      </el-table-column>
+      <el-table-column
+        header-align="center"
+        label="金相检验表面淬火">
+        <el-table-column
+          prop="metallographyBmchBtmst"
+          header-align="center"
+          align="center"
+          label="表面为板条马氏体(级)"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="metallographyBmchXb"
+          header-align="center"
+          align="center"
+          label="心部"
+        >
+        </el-table-column>
+      </el-table-column>
+      <el-table-column
+        header-align="center"
+        label="金相检验">
+      <el-table-column
+        prop="metallographyBz"
+        header-align="center"
+        align="center"
+        label="备注"
+      >
+      </el-table-column>
+        <el-table-column
+          prop="metallographyXbydXbydjyjg"
+          header-align="center"
+          align="center"
+          label="心部硬度"
+        >
+        </el-table-column>
+      </el-table-column>
+    </el-table>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      visible: false,
+      sheetNo: '',
+      dataList: [],
+      dataListLoading: false
+    }
+  },
+  methods: {
+    init (sheetNo) {
+      this.sheetNo = sheetNo || ''
+      this.visible = true
+      this.getDataList()
+    },
+    // 获取数据列表
+    getDataList () {
+      this.dataListLoading = true
+      this.$http({
+        url: this.$http.adornUrl('/electric/checkResultList'),
+        method: 'post',
+        data: this.$http.adornData(
+          {sheetNo: this.sheetNo}
+        )
+      }).then(({ data }) => {
+        if (data) {
+          this.dataList = data
+        } else {
+          this.dataList = []
+        }
+        this.dataListLoading = false
+      })
+    }
+  }
+}
+</script>

src/views/report/kiln-alarm.vue

@@ -2,7 +2,7 @@
   <div class="mod-config">
     <el-form style="display: flex; align-items: center; justify-content: right;" :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form-item>
-        <el-select size="small" v-model="dataForm.equipmentId" clearable filterable placeholder="窑炉名称">
+        <el-select size="small" v-model="dataForm.equipmentId" clearable filterable placeholder="工业炉名称">
           <el-option
             v-for="item in kilnList"
             :key="item.id"
@@ -45,7 +45,7 @@
       </el-table-column>
       <el-table-column
         prop="equipmentName"
-        label="窑炉名称"
+        label="工业炉名称"
       >
       </el-table-column>
       <el-table-column
@@ -57,6 +57,9 @@
         prop="createTime"
         label="报警时间"
       >
+        <template slot-scope="scope">
+          {{ scope.row.createTime ? scope.row.createTime.replace('T', ' ') : '' }}
+        </template>
       </el-table-column>
       <!-- <el-table-column
         prop="time"
@@ -99,11 +102,11 @@ export default {
       kilnList: []
     }
   },
-  created () {
+  activated () {
     this.getKilnList()
   },
   methods: {
-    // 获取窑炉列表
+    // 获取工业炉列表
     getKilnList () {
       this.dataListLoading = true
       this.$http({

src/views/report/order-history.vue

@@ -43,6 +43,9 @@
       <el-table-column
         prop="createTime"
         label="获取时间">
+        <template slot-scope="scope">
+          {{ scope.row.createTime ? scope.row.createTime.replace('T', ' ') : '' }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="idenCardNum"
@@ -55,10 +58,16 @@
       <el-table-column
         prop="abeginTime"
         label="发起时间">
+        <template slot-scope="scope">
+          {{ scope.row.abeginTime ? scope.row.abeginTime.replace('T', ' ') : '' }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="aendTime"
         label="完成时间">
+        <template slot-scope="scope">
+          {{ scope.row.aendTime ? scope.row.aendTime.replace('T', ' ') : '' }}
+        </template>
       </el-table-column>
       <!-- <el-table-column
         prop="orderSource"

src/views/report/task-history.vue

@@ -6,7 +6,7 @@
       :model="dataForm"
       @keyup.enter.native="getDataList()"
     >
-      <el-form-item>
+      <!-- <el-form-item>
         <el-select
           size="small"
           v-model="dataForm.vehicleId"
@@ -21,7 +21,7 @@
           >
           </el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-date-picker
           size="small"
@@ -62,6 +62,9 @@
         prop="createTime"
         label="发起时间"
       >
+        <template slot-scope="scope">
+          {{ scope.row.createTime ? scope.row.createTime.replace('T', ' ') : '' }}
+        </template>
       </el-table-column>
       <el-table-column
         prop="taskSource"
@@ -83,12 +86,12 @@
         <template slot-scope="scope">
           <span>{{
             scope.row.taskType === 0
-              ? "缓存到窑炉加工"
+              ? "入库到工业炉"
               : scope.row.taskType === 1
-              ? "出炉到缓存"
+              ? "入库到缓存"
               : scope.row.taskType === 2
-              ? "缓存出库"
-              : "入库缓存"
+              ? "工业炉出库到缓存区"
+              : "缓存区出库"
           }}</span>
         </template>
       </el-table-column>
@@ -102,10 +105,20 @@
         label="目标位置"
       >
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="vehicleName"
         label="车辆名称"
       >
+      </el-table-column> -->
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="80"
+        label="检验">
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="checkResult(scope.row.sheetNo)">检验结果</el-button>
+        </template>
       </el-table-column>
       <el-table-column
         fixed="right"
@@ -114,7 +127,7 @@
         width="80"
         label="能耗情况">
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="eleHandle(scope.row.id)">详情</el-button>
+          <el-button type="text" size="small" @click="eleHandle(scope.row.taskId)">详情</el-button>
         </template>
       </el-table-column>
       <el-table-column
@@ -125,7 +138,7 @@
         label="订单详情"
       >
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="LocationBtn(scope.row.id)"
+          <el-button type="text" size="small" @click="LocationBtn(scope.row.taskId)"
             >订单详情</el-button
           >
         </template>
@@ -141,10 +154,12 @@
       layout="total, sizes, prev, pager, next, jumper"
     >
     </el-pagination>
+    <task-history-result v-if="taskHistoryResultVisible" ref="addOrUpdate" @refreshDataList="getDataList"></task-history-result>
   </div>
 </template>
 
 <script>
+import taskHistoryResult from './components/task-history-result'
 // 任务状态列表
 const statusList = {
   0: '等待执行',
@@ -160,6 +175,7 @@ export default {
         vehicleId: '',
         time: []
       },
+      taskHistoryResultVisible: false,
       dataList: [],
       options2: [],
       pageIndex: 1,
@@ -170,6 +186,9 @@ export default {
       statusList
     }
   },
+  components: {
+    taskHistoryResult
+  },
   activated () {
     this.getDataList()
   },
@@ -224,6 +243,12 @@ export default {
         name: 'report-task-ele',
         query: { taskId }
       })
+    },
+    checkResult (sheetNo) {
+      this.taskHistoryResultVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(sheetNo)
+      })
     }
   }
 }

static/config/index-prod.js

@@ -1,8 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-11-19 10:10:52
- * @LastEditors: gtz
- * @LastEditTime: 2021-12-09 11:08:41
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-07 10:51:22
  * @Description: file content
  * @FilePath: \mt-qj-wms-ui\static\config\index-prod.js
  */
@@ -10,13 +10,14 @@
  * 生产环境
  */
 ;(function () {
-  window.SITE_CONFIG = {};
+  window.SITE_CONFIG = {}
 
   // api接口请求地址
-  window.SITE_CONFIG['baseUrl'] = '/api';
+  window.SITE_CONFIG['baseUrl'] = '/api'
+  window.SITE_CONFIG['wbUrl'] = '192.168.1.18:8080'
 
   // cdn地址 = 域名 + 版本号
-  window.SITE_CONFIG['domain']  = './'; // 域名
-  window.SITE_CONFIG['version'] = '';   // 版本号(年月日时分)
-  window.SITE_CONFIG['cdnUrl']  = window.SITE_CONFIG.domain + window.SITE_CONFIG.version;
-})();
+  window.SITE_CONFIG['domain'] = './' // 域名
+  window.SITE_CONFIG['version'] = ''   // 版本号(年月日时分)
+  window.SITE_CONFIG['cdnUrl'] = window.SITE_CONFIG.domain + window.SITE_CONFIG.version
+})()

static/config/index.js

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-15 08:20:28
  * @LastEditors: zwq
- * @LastEditTime: 2021-12-07 14:48:08
+ * @LastEditTime: 2022-07-08 09:06:37
  * @Description:
  */
 /**
@@ -12,7 +12,8 @@
   window.SITE_CONFIG = {}
 
   // api接口请求地址
-  window.SITE_CONFIG['baseUrl'] = 'http://192.168.0.134:8080/'
+  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.18:8080/api/'
+  window.SITE_CONFIG['wbUrl'] = '192.168.1.18:8080'
 
   // cdn地址 = 域名 + 版本号
   window.SITE_CONFIG['domain'] = './' // 域名

static/config/init.js

@@ -1,19 +1,19 @@
 /*
  * @Author: gtz
  * @Date: 2021-11-19 10:10:52
- * @LastEditors: gtz
- * @LastEditTime: 2021-11-30 09:40:45
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-07-12 10:47:39
  * @Description: file content
  * @FilePath: \mt-qj-wms-ui\static\config\init.js
  */
 /**
  * 动态加载初始资源
  */
-;(function() {
+;(function () {
   var resList = {
-    icon: window.SITE_CONFIG.cdnUrl + '/static/img/favicon.ico',
+    icon: window.SITE_CONFIG.cdnUrl + '/static/img/top.png',
     css: [
-      window.SITE_CONFIG.cdnUrl + '/static/css/app.css',
+      window.SITE_CONFIG.cdnUrl + '/static/css/app.css'
     ],
     js: [
       // 插件, 放置业务之前加载, 以免业务需求依赖插件时, 还未加载出错
@@ -30,53 +30,53 @@
 
   // 图标
   (function () {
-    var _icon = document.createElement('link');
-    _icon.setAttribute('rel', 'shortcut icon');
-    _icon.setAttribute('type', 'image/x-icon');
-    _icon.setAttribute('href', resList.icon);
-    document.getElementsByTagName('head')[0].appendChild(_icon);
+    var _icon = document.createElement('link')
+    _icon.setAttribute('rel', 'shortcut icon')
+    _icon.setAttribute('type', 'image/x-icon')
+    _icon.setAttribute('href', resList.icon)
+    document.getElementsByTagName('head')[0].appendChild(_icon)
   })();
 
   // 样式
   (function () {
-    document.getElementsByTagName('html')[0].style.opacity = 0;
-    var i = 0;
-    var _style = null;
+    document.getElementsByTagName('html')[0].style.opacity = 0
+    var i = 0
+    var _style = null
     var createStyles = function () {
       if (i >= resList.css.length) {
-        document.getElementsByTagName('html')[0].style.opacity = 1;
-        return;
+        document.getElementsByTagName('html')[0].style.opacity = 1
+        return
       }
-      _style = document.createElement('link');
-      _style.href = resList.css[i];
-      _style.setAttribute('rel', 'stylesheet');
+      _style = document.createElement('link')
+      _style.href = resList.css[i]
+      _style.setAttribute('rel', 'stylesheet')
       _style.onload = function () {
-        i++;
-        createStyles();
+        i++
+        createStyles()
       }
-      document.getElementsByTagName('head')[0].appendChild(_style);
+      document.getElementsByTagName('head')[0].appendChild(_style)
     }
-    createStyles();
-  })();
+    createStyles()
+  })()
 
   // 脚本
   document.onreadystatechange = function () {
     if (document.readyState === 'interactive') {
-      var i = 0;
-      var _script = null;
+      var i = 0
+      var _script = null
       var createScripts = function () {
         if (i >= resList.js.length) {
-          return;
+          return
         }
-        _script = document.createElement('script');
-        _script.src = resList.js[i];
+        _script = document.createElement('script')
+        _script.src = resList.js[i]
         _script.onload = function () {
-          i++;
-          createScripts();
+          i++
+          createScripts()
         }
-        document.getElementsByTagName('body')[0].appendChild(_script);
+        document.getElementsByTagName('body')[0].appendChild(_script)
       }
-      createScripts();
+      createScripts()
     }
-  };
-})();
+  }
+})()