订单和报表

src/router/index.js

@@ -46,11 +46,15 @@ const mainRoutes = {
     { path: '/basic-carInfo', component: _import('basic/carInfo'), name: 'basic-carInfo', meta: { title: '车辆信息' } },
     { path: '/basic-alarmInfo', component: _import('basic/alarmInfo'), name: 'basic-alarmInfo', meta: { title: '报警基础信息' } },
     { path: '/order-current-order', component: _import('order/current-order'), name: 'order-current-order', meta: { title: '当前订单列表' } },
+    { path: '/order-current-order-task', component: _import('order/components/current-order-task'), name: 'order-current-order-task', meta: { title: '当前订单任务详情' } },
     { path: '/order-current-task', component: _import('order/current-task'), name: 'order-current-task', meta: { title: '当前执行任务' } },
+    { path: '/order-current-task-detail', component: _import('order/components/current-task-detail'), name: 'order-current-task-detail', meta: { title: '当前执行任务详情' } },
     { path: '/report-kiln-alarm', component: _import('report/kiln-alarm'), name: 'report-kiln-alarm', meta: { title: '窑炉报警' } },
     { path: '/report-car-alarm', component: _import('report/car-alarm'), name: 'report-car-alarm', meta: { title: '车辆运行报警' } },
     { path: '/report-order-history', component: _import('report/order-history'), name: 'report-order-history', meta: { title: '订单历史列表' } },
+    { path: '/report-order-history-task', component: _import('report/components/order-history-task'), name: 'report-order-history-task', meta: { title: '订单历史任务详情' } },
     { path: '/report-task-history', component: _import('report/task-history'), name: 'report-task-history', meta: { title: '执行任务历史列表' } },
+    { path: '/report-task-history-detail', component: _import('report/components/task-history-detail'), name: 'report-task-history-detail', meta: { title: '执行任务历史详情' } },
     { path: '/energy-sulfur-dioxide', component: _import('energy/sulfur-dioxide'), name: 'energy-sulfur-dioxide', meta: { title: '二氧化硫流量分析' } },
     { path: '/energy-electric', component: _import('energy/electric'), name: 'energy-electric', meta: { title: '用电能源分析' } },
     { path: '/energy-kiln-electric', component: _import('energy/kiln-electric'), name: 'energy-kiln-electric', meta: { title: '窑炉用电分析' } },

src/views/basic/alarmInfo.vue

@@ -15,11 +15,11 @@
       v-loading="dataListLoading"
       style="width: 100%;">
       <el-table-column
-        prop="id"
+        type="index"
         header-align="center"
         align="center"
-        width="80"
+        label="序号"
-        label="ID">
+        width="50">
       </el-table-column>
       <el-table-column
         prop="paramKey"

src/views/basic/cache.vue

@@ -15,11 +15,11 @@
       v-loading="dataListLoading"
       style="width: 100%;">
       <el-table-column
-        prop="id"
+        type="index"
         header-align="center"
         align="center"
-        width="80"
+        label="序号"
-        label="ID">
+        width="50">
       </el-table-column>
       <el-table-column
         prop="paramKey"

src/views/basic/carInfo.vue

@@ -15,11 +15,11 @@
       v-loading="dataListLoading"
       style="width: 100%;">
       <el-table-column
-        prop="id"
+        type="index"
         header-align="center"
         align="center"
-        width="80"
+        label="序号"
-        label="ID">
+        width="50">
       </el-table-column>
       <el-table-column
         prop="paramKey"

src/views/basic/equipmentInfo.vue

@@ -15,11 +15,11 @@
       v-loading="dataListLoading"
       style="width: 100%;">
       <el-table-column
-        prop="id"
+        type="index"
         header-align="center"
         align="center"
-        width="80"
+        label="序号"
-        label="ID">
+        width="50">
       </el-table-column>
       <el-table-column
         prop="paramKey"

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

@@ -0,0 +1,66 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-19 11:23:44
+ * @LastEditors: zwq
+ * @LastEditTime: 2021-11-19 11:31:16
+ * @Description:
+-->
+<template>
+  <el-dialog
+    title="订单详情"
+    :close-on-click-modal="false"
+    :visible.sync="visible">
+    <el-form :model="dataForm" ref="dataForm" label-width="80px">
+      <el-form-item label="参数名" prop="paramKey">
+        <el-input v-model="dataForm.paramKey" placeholder="参数名"></el-input>
+      </el-form-item>
+      <el-form-item label="参数值" prop="paramValue">
+        <el-input v-model="dataForm.paramValue" placeholder="参数值"></el-input>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取消</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        visible: false,
+        dataForm: {
+          id: 0,
+          paramKey: '',
+          paramValue: '',
+          remark: ''
+        }
+      }
+    },
+    methods: {
+      init (id) {
+        this.dataForm.id = id || 0
+        this.visible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].resetFields()
+          if (this.dataForm.id) {
+            this.$http({
+              url: this.$http.adornUrl(`/sys/config/info/${this.dataForm.id}`),
+              method: 'get',
+              params: this.$http.adornParams()
+            }).then(({data}) => {
+              if (data && data.code === 0) {
+                this.dataForm.paramKey = data.config.paramKey
+                this.dataForm.paramValue = data.config.paramValue
+                this.dataForm.remark = data.config.remark
+              }
+            })
+          }
+        })
+      }
+    }
+  }
+</script>

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

@@ -0,0 +1,103 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true">
+      <el-form-item>
+        <el-button type="success" @click="$router.push({ name: 'order-current-order' })">返回当前订单列表</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        prop="id"
+        header-align="center"
+        align="center"
+        width="80"
+        label="ID">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="参数名">
+      </el-table-column>
+      <el-table-column
+        prop="paramValue"
+        header-align="center"
+        align="center"
+        label="参数值">
+      </el-table-column>
+      <el-table-column
+        prop="remark"
+        header-align="center"
+        align="center"
+        label="备注">
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false
+      }
+    },
+    activated () {
+      this.getDataList()
+    },
+    created () {
+      console.log(this.$route.query.id)
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        this.dataListLoading = true
+        this.$http({
+          url: this.$http.adornUrl('/sys/config/list'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'page': this.pageIndex,
+            'limit': this.pageSize
+          })
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.dataList = data.page.list
+            this.totalPage = data.page.totalCount
+          } 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()
+      }
+    }
+  }
+</script>

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

@@ -0,0 +1,115 @@
+<template>
+  <div class="mod-config">
+    <el-form :model="dataForm" ref="dataForm" label-width="80px">
+      <el-form-item>
+        <el-button type="success" @click="$router.push({ name: 'order-current-task' })">返回当前执行任务</el-button>
+      </el-form-item>
+      <el-form-item label="参数名" prop="paramKey">
+        <el-input v-model="dataForm.paramKey" placeholder="参数名"></el-input>
+      </el-form-item>
+      <el-form-item label="参数值" prop="paramValue">
+        <el-input v-model="dataForm.paramValue" placeholder="参数值"></el-input>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        prop="id"
+        header-align="center"
+        align="center"
+        width="80"
+        label="ID">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="参数名">
+      </el-table-column>
+      <el-table-column
+        prop="paramValue"
+        header-align="center"
+        align="center"
+        label="参数值">
+      </el-table-column>
+      <el-table-column
+        prop="remark"
+        header-align="center"
+        align="center"
+        label="备注">
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        dataForm: {
+          paramKey: '',
+          paramValue: '',
+          remark: ''
+        },
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false
+      }
+    },
+    activated () {
+      this.getDataList()
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        this.dataListLoading = true
+        this.$http({
+          url: this.$http.adornUrl('/sys/config/list'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'page': this.pageIndex,
+            'limit': this.pageSize,
+            'paramKey': this.dataForm.paramKey
+          })
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.dataList = data.page.list
+            this.totalPage = data.page.totalCount
+          } 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()
+      }
+    }
+  }
+</script>

src/views/order/current-order.vue

@@ -1,7 +1,236 @@
-<!--
+<template>
- * @Author: zwq
+  <div class="mod-config">
- * @Date: 2021-11-19 10:59:57
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
- * @LastEditors: zwq
+      <el-form-item>
- * @LastEditTime: 2021-11-19 10:59:57
+        <el-input v-model="dataForm.paramKey" placeholder="名称或编码" clearable></el-input>
- * @Description:
+      </el-form-item>
--->
+      <el-form-item>
+        <el-button @click="getDataList()">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        type="index"
+        header-align="center"
+        align="center"
+        label="序号"
+        width="50">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="获取时间">
+      </el-table-column>
+      <el-table-column
+        prop="paramValue"
+        header-align="center"
+        align="center"
+        label="标识卡号">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="订单号">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="任务来源">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="任务状态">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="订单状态">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="客户名称">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="产品名称">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="物料名称">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="物料数量">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="物料重量">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        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="LocationBtn(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="addOrUpdateHandle(scope.row.id)">订单详情</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        header-align="center"
+        align="center"
+        width="150"
+        label="操作">
+        <template slot-scope="scope">
+          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">完成</el-button>
+          <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">作废</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <!-- 弹窗, 新增 / 修改 -->
+    <order-detail v-if="orderDetailVisible" ref="orderDetail"></order-detail>
+  </div>
+</template>
+
+<script>
+  import orderDetail from './components/current-order-detail'
+  export default {
+    data () {
+      return {
+        dataForm: {
+          paramKey: ''
+        },
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false,
+        orderDetailVisible: false
+      }
+    },
+    components: {
+      orderDetail
+    },
+    activated () {
+      this.getDataList()
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        this.dataListLoading = true
+        this.$http({
+          url: this.$http.adornUrl('/sys/config/list'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'page': this.pageIndex,
+            'limit': this.pageSize,
+            'paramKey': this.dataForm.paramKey
+          })
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.dataList = data.page.list
+            this.totalPage = data.page.totalCount
+          } else {
+            this.dataList = []
+            this.totalPage = 0
+          }
+          this.dataListLoading = false
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+      // 新增 / 修改
+      addOrUpdateHandle (id) {
+        this.orderDetailVisible = true
+        this.$nextTick(() => {
+          this.$refs.orderDetail.init(id)
+        })
+      },
+      LocationBtn (id) {
+        this.$router.push({name: 'order-current-order-task', query: {id}})
+      },
+      // 删除
+      deleteHandle (id) {
+        this.$confirm(`确定对[id=${id}]进行删除操作?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$http({
+            url: this.$http.adornUrl('/sys/config/delete'),
+            method: 'post',
+            data: this.$http.adornData(id, false)
+          }).then(({data}) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.getDataList()
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }).catch(() => {})
+      }
+    }
+  }
+</script>

src/views/order/current-task.vue

@@ -1,7 +1,151 @@
-<!--
+<template>
- * @Author: zwq
+  <div class="mod-config">
- * @Date: 2021-11-19 11:00:26
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
- * @LastEditors: zwq
+      <el-form-item>
- * @LastEditTime: 2021-11-19 11:00:26
+        <el-input v-model="dataForm.paramKey" placeholder="名称或编码" clearable></el-input>
- * @Description:
+      </el-form-item>
--->
+      <el-form-item>
+        <el-button @click="getDataList()">查询</el-button>
+        <el-button type="primary" @click="handTask()">手动执行任务</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        type="index"
+        header-align="center"
+        align="center"
+        label="序号"
+        width="50">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="参数名">
+      </el-table-column>
+      <el-table-column
+        prop="paramValue"
+        header-align="center"
+        align="center"
+        label="参数值">
+      </el-table-column>
+      <el-table-column
+        prop="remark"
+        header-align="center"
+        align="center"
+        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="Detail(scope.row.id)">详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        dataForm: {
+          paramKey: ''
+        },
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false
+      }
+    },
+    activated () {
+      this.getDataList()
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        this.dataListLoading = true
+        this.$http({
+          url: this.$http.adornUrl('/sys/config/list'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'page': this.pageIndex,
+            'limit': this.pageSize,
+            'paramKey': this.dataForm.paramKey
+          })
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.dataList = data.page.list
+            this.totalPage = data.page.totalCount
+          } 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'})
+      },
+      // 删除
+      deleteHandle (id) {
+        this.$confirm(`确定对[id=${id}]进行删除操作?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$http({
+            url: this.$http.adornUrl('/sys/config/delete'),
+            method: 'post',
+            data: this.$http.adornData(id, false)
+          }).then(({data}) => {
+            if (data && data.code === 0) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.getDataList()
+                }
+              })
+            } else {
+              this.$message.error(data.msg)
+            }
+          })
+        }).catch(() => {})
+      }
+    }
+  }
+</script>

src/views/report/car-alarm.vue

@@ -1,7 +1,114 @@
-<!--
+<template>
- * @Author: zwq
+  <div class="mod-log">
- * @Date: 2021-11-19 10:51:05
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
- * @LastEditors: zwq
+      <el-form-item>
- * @LastEditTime: 2021-11-19 10:51:05
+        <el-input v-model="dataForm.key" placeholder="用户名／用户操作" clearable></el-input>
- * @Description:
+      </el-form-item>
--->
+      <el-form-item>
+        <el-button @click="getDataList()">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%">
+      <el-table-column
+        type="index"
+        header-align="center"
+        align="center"
+        label="序号"
+        width="50">
+      </el-table-column>
+      <el-table-column
+        prop="username"
+        header-align="center"
+        align="center"
+        label="车辆名称">
+      </el-table-column>
+      <el-table-column
+        prop="operation"
+        header-align="center"
+        align="center"
+        label="报警时间">
+      </el-table-column>
+      <el-table-column
+        prop="time"
+        header-align="center"
+        align="center"
+        label="报警级别">
+      </el-table-column>
+      <el-table-column
+        prop="ip"
+        header-align="center"
+        align="center"
+        label="报警内容">
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        dataForm: {
+          key: ''
+        },
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false,
+        selectionDataList: []
+      }
+    },
+    created () {
+      this.getDataList()
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        this.dataListLoading = true
+        this.$http({
+          url: this.$http.adornUrl('/sys/log/list'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'page': this.pageIndex,
+            'limit': this.pageSize,
+            'key': this.dataForm.key
+          })
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.dataList = data.page.list
+            this.totalPage = data.page.totalCount
+          } 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()
+      }
+    }
+  }
+</script>

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

@@ -0,0 +1,66 @@
+<!--
+ * @Author: zwq
+ * @Date: 2021-11-19 11:23:44
+ * @LastEditors: zwq
+ * @LastEditTime: 2021-11-19 11:31:16
+ * @Description:
+-->
+<template>
+  <el-dialog
+    title="订单详情"
+    :close-on-click-modal="false"
+    :visible.sync="visible">
+    <el-form :model="dataForm" ref="dataForm" label-width="80px">
+      <el-form-item label="参数名" prop="paramKey">
+        <el-input v-model="dataForm.paramKey" placeholder="参数名"></el-input>
+      </el-form-item>
+      <el-form-item label="参数值" prop="paramValue">
+        <el-input v-model="dataForm.paramValue" placeholder="参数值"></el-input>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取消</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        visible: false,
+        dataForm: {
+          id: 0,
+          paramKey: '',
+          paramValue: '',
+          remark: ''
+        }
+      }
+    },
+    methods: {
+      init (id) {
+        this.dataForm.id = id || 0
+        this.visible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].resetFields()
+          if (this.dataForm.id) {
+            this.$http({
+              url: this.$http.adornUrl(`/sys/config/info/${this.dataForm.id}`),
+              method: 'get',
+              params: this.$http.adornParams()
+            }).then(({data}) => {
+              if (data && data.code === 0) {
+                this.dataForm.paramKey = data.config.paramKey
+                this.dataForm.paramValue = data.config.paramValue
+                this.dataForm.remark = data.config.remark
+              }
+            })
+          }
+        })
+      }
+    }
+  }
+</script>

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

@@ -0,0 +1,103 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true">
+      <el-form-item>
+        <el-button type="success" @click="$router.push({ name: 'report-order-history' })">返回订单历史列表</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        prop="id"
+        header-align="center"
+        align="center"
+        width="80"
+        label="ID">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="参数名">
+      </el-table-column>
+      <el-table-column
+        prop="paramValue"
+        header-align="center"
+        align="center"
+        label="参数值">
+      </el-table-column>
+      <el-table-column
+        prop="remark"
+        header-align="center"
+        align="center"
+        label="备注">
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false
+      }
+    },
+    activated () {
+      this.getDataList()
+    },
+    created () {
+      console.log(this.$route.query.id)
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        this.dataListLoading = true
+        this.$http({
+          url: this.$http.adornUrl('/sys/config/list'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'page': this.pageIndex,
+            'limit': this.pageSize
+          })
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.dataList = data.page.list
+            this.totalPage = data.page.totalCount
+          } 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()
+      }
+    }
+  }
+</script>

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

@@ -0,0 +1,103 @@
+<template>
+  <div class="mod-config">
+    <el-form :inline="true">
+      <el-form-item>
+        <el-button type="success" @click="$router.push({ name: 'report-task-history' })">返回执行任务历史列表</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        prop="id"
+        header-align="center"
+        align="center"
+        width="80"
+        label="ID">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="参数名">
+      </el-table-column>
+      <el-table-column
+        prop="paramValue"
+        header-align="center"
+        align="center"
+        label="参数值">
+      </el-table-column>
+      <el-table-column
+        prop="remark"
+        header-align="center"
+        align="center"
+        label="备注">
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false
+      }
+    },
+    activated () {
+      this.getDataList()
+    },
+    created () {
+      console.log(this.$route.query.id)
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        this.dataListLoading = true
+        this.$http({
+          url: this.$http.adornUrl('/sys/config/list'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'page': this.pageIndex,
+            'limit': this.pageSize
+          })
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.dataList = data.page.list
+            this.totalPage = data.page.totalCount
+          } 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()
+      }
+    }
+  }
+</script>

src/views/report/kiln-alarm.vue

@@ -1,7 +1,114 @@
-<!--
+<template>
- * @Author: zwq
+  <div class="mod-log">
- * @Date: 2021-11-19 10:50:45
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
- * @LastEditors: zwq
+      <el-form-item>
- * @LastEditTime: 2021-11-19 10:50:46
+        <el-input v-model="dataForm.key" placeholder="用户名／用户操作" clearable></el-input>
- * @Description:
+      </el-form-item>
--->
+      <el-form-item>
+        <el-button @click="getDataList()">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%">
+      <el-table-column
+        type="index"
+        header-align="center"
+        align="center"
+        label="序号"
+        width="50">
+      </el-table-column>
+      <el-table-column
+        prop="username"
+        header-align="center"
+        align="center"
+        label="窑炉名称">
+      </el-table-column>
+      <el-table-column
+        prop="operation"
+        header-align="center"
+        align="center"
+        label="报警时间">
+      </el-table-column>
+      <el-table-column
+        prop="time"
+        header-align="center"
+        align="center"
+        label="报警级别">
+      </el-table-column>
+      <el-table-column
+        prop="ip"
+        header-align="center"
+        align="center"
+        label="报警内容">
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        dataForm: {
+          key: ''
+        },
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false,
+        selectionDataList: []
+      }
+    },
+    created () {
+      this.getDataList()
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        this.dataListLoading = true
+        this.$http({
+          url: this.$http.adornUrl('/sys/log/list'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'page': this.pageIndex,
+            'limit': this.pageSize,
+            'key': this.dataForm.key
+          })
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.dataList = data.page.list
+            this.totalPage = data.page.totalCount
+          } 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()
+      }
+    }
+  }
+</script>

src/views/report/order-history.vue

@@ -1,7 +1,198 @@
-<!--
+<template>
- * @Author: zwq
+  <div class="mod-config">
- * @Date: 2021-11-19 10:52:29
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
- * @LastEditors: zwq
+      <el-form-item>
- * @LastEditTime: 2021-11-19 10:52:29
+        <el-input v-model="dataForm.paramKey" placeholder="名称或编码" clearable></el-input>
- * @Description:
+      </el-form-item>
--->
+      <el-form-item>
+        <el-button @click="getDataList()">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        type="index"
+        header-align="center"
+        align="center"
+        label="序号"
+        width="50">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="获取时间">
+      </el-table-column>
+      <el-table-column
+        prop="paramValue"
+        header-align="center"
+        align="center"
+        label="标识卡号">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="订单号">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="任务来源">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="任务状态">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="订单状态">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="客户名称">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="产品名称">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="物料名称">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="物料数量">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="物料重量">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        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="LocationBtn(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="addOrUpdateHandle(scope.row.id)">订单详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <!-- 弹窗, 新增 / 修改 -->
+    <order-detail v-if="orderDetailVisible" ref="orderDetail"></order-detail>
+  </div>
+</template>
+
+<script>
+  import orderDetail from './components/order-history-detail'
+  export default {
+    data () {
+      return {
+        dataForm: {
+          paramKey: ''
+        },
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false,
+        orderDetailVisible: false
+      }
+    },
+    components: {
+      orderDetail
+    },
+    activated () {
+      this.getDataList()
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        this.dataListLoading = true
+        this.$http({
+          url: this.$http.adornUrl('/sys/config/list'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'page': this.pageIndex,
+            'limit': this.pageSize,
+            'paramKey': this.dataForm.paramKey
+          })
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.dataList = data.page.list
+            this.totalPage = data.page.totalCount
+          } else {
+            this.dataList = []
+            this.totalPage = 0
+          }
+          this.dataListLoading = false
+        })
+      },
+      // 每页数
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.getDataList()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.getDataList()
+      },
+      // 新增 / 修改
+      addOrUpdateHandle (id) {
+        this.orderDetailVisible = true
+        this.$nextTick(() => {
+          this.$refs.orderDetail.init(id)
+        })
+      },
+      LocationBtn (id) {
+        this.$router.push({name: 'report-order-history-task', query: {id}})
+      }
+    }
+  }
+</script>

src/views/report/task-history.vue

@@ -1,7 +1,175 @@
-<!--
+<template>
- * @Author: zwq
+  <div class="mod-config">
- * @Date: 2021-11-19 10:52:19
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
- * @LastEditors: zwq
+      <el-form-item>
- * @LastEditTime: 2021-11-19 10:52:20
+        <el-input v-model="dataForm.paramKey" placeholder="名称或编码" clearable></el-input>
- * @Description:
+      </el-form-item>
--->
+      <el-form-item>
+        <el-button @click="getDataList()">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      style="width: 100%;">
+      <el-table-column
+        type="index"
+        header-align="center"
+        align="center"
+        label="序号"
+        width="50">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="获取时间">
+      </el-table-column>
+      <el-table-column
+        prop="paramValue"
+        header-align="center"
+        align="center"
+        label="标识卡号">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="订单号">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="任务来源">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="任务状态">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="订单状态">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="客户名称">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="产品名称">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="物料名称">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="物料数量">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        label="物料重量">
+      </el-table-column>
+      <el-table-column
+        prop="paramKey"
+        header-align="center"
+        align="center"
+        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="LocationBtn(scope.row.id)">订单详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+        dataForm: {
+          paramKey: ''
+        },
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 10,
+        totalPage: 0,
+        dataListLoading: false,
+        orderDetailVisible: false
+      }
+    },
+    activated () {
+      this.getDataList()
+    },
+    methods: {
+      // 获取数据列表
+      getDataList () {
+        this.dataListLoading = true
+        this.$http({
+          url: this.$http.adornUrl('/sys/config/list'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'page': this.pageIndex,
+            'limit': this.pageSize,
+            'paramKey': this.dataForm.paramKey
+          })
+        }).then(({data}) => {
+          if (data && data.code === 0) {
+            this.dataList = data.page.list
+            this.totalPage = data.page.totalCount
+          } 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()
+      },
+      LocationBtn (id) {
+        this.$router.push({name: 'report-task-history-detail', query: {id}})
+      }
+    }
+  }
+</script>