修改字段

2021-12-01 16:46:26 +08:00
parent 6073b6d43b
commit 5579b657d5
16 changed files with 696 additions and 240 deletions
--- a/src/views/report/car-alarm.vue
+++ b/src/views/report/car-alarm.vue
@@ -2,7 +2,25 @@
  <div class="mod-log">
    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
      <el-form-item>
-        <el-input v-model="dataForm.key" placeholder="用户名／用户操作" clearable></el-input>
+        <el-select v-model="dataForm.key" filterable placeholder="车辆名称">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="dataForm.time"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button @click="getDataList()">查询</el-button>
@@ -62,9 +80,11 @@
    data () {
      return {
        dataForm: {
-          key: ''
+          key: '',
+          time: []
        },
        dataList: [],
+        options: [],
        pageIndex: 1,
        pageSize: 10,
        totalPage: 0,
--- a/src/views/report/components/order-history-task.vue
+++ b/src/views/report/components/order-history-task.vue
@@ -11,29 +11,82 @@
      v-loading="dataListLoading"
      style="width: 100%;">
      <el-table-column
-        prop="id"
+        type="index"
        header-align="center"
        align="center"
-        width="80"
-        label="ID">
+        label="序号"
+        width="50">
      </el-table-column>
      <el-table-column
        prop="paramKey"
        header-align="center"
        align="center"
-        label="参数名">
+        label="任务编码">
+      </el-table-column><el-table-column
+        prop="start"
+        header-align="center"
+        align="center"
+        label="发起时间">
+      </el-table-column>
+      <el-table-column
+        prop="end"
+        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="paramValue"
        header-align="center"
        align="center"
-        label="参数值">
+        label="任务类型">
      </el-table-column>
      <el-table-column
        prop="remark"
        header-align="center"
        align="center"
-        label="备注">
+        label="当前工序">
+      </el-table-column>
+      <el-table-column
+        prop="unit"
+        header-align="center"
+        align="center"
+        label="单位">
+      </el-table-column>
+      <el-table-column
+        prop="num"
+        header-align="center"
+        align="center"
+        label="数量">
+      </el-table-column>
+      <el-table-column
+        prop="weight"
+        header-align="center"
+        align="center"
+        label="重量">
+      </el-table-column>
+      <el-table-column
+        prop="start"
+        header-align="center"
+        align="center"
+        label="开始位置">
+      </el-table-column>
+      <el-table-column
+        prop="end"
+        header-align="center"
+        align="center"
+        label="目标位置">
+      </el-table-column>
+      <el-table-column
+        prop="name"
+        header-align="center"
+        align="center"
+        label="车辆名称">
      </el-table-column>
    </el-table>
    <el-pagination
--- a/src/views/report/components/task-history-detail.vue
+++ b/src/views/report/components/task-history-detail.vue
@@ -11,29 +11,71 @@
      v-loading="dataListLoading"
      style="width: 100%;">
      <el-table-column
-        prop="id"
+        type="index"
        header-align="center"
        align="center"
-        width="80"
-        label="ID">
+        label="序号"
+        width="50">
      </el-table-column>
      <el-table-column
        prop="paramKey"
        header-align="center"
        align="center"
-        label="参数名">
+        label="标识卡号">
      </el-table-column>
      <el-table-column
        prop="paramValue"
        header-align="center"
        align="center"
-        label="参数值">
+        label="订单名">
      </el-table-column>
      <el-table-column
        prop="remark"
        header-align="center"
        align="center"
-        label="备注">
+        label="客户名称">
+      </el-table-column>
+      <el-table-column
+        prop="name"
+        header-align="center"
+        align="center"
+        label="产品名称">
+      </el-table-column>
+      <el-table-column
+        prop="type"
+        header-align="center"
+        align="center"
+        label="产品型号">
+      </el-table-column>
+      <el-table-column
+        prop="card"
+        header-align="center"
+        align="center"
+        label="材料号牌">
+      </el-table-column>
+      <el-table-column
+        prop="need"
+        header-align="center"
+        align="center"
+        label="生产工艺要求">
+      </el-table-column>
+      <el-table-column
+        prop="unit"
+        header-align="center"
+        align="center"
+        label="单位">
+      </el-table-column>
+      <el-table-column
+        prop="num"
+        header-align="center"
+        align="center"
+        label="数量">
+      </el-table-column>
+      <el-table-column
+        prop="weight"
+        header-align="center"
+        align="center"
+        label="重量">
      </el-table-column>
    </el-table>
    <el-pagination
--- a/src/views/report/kiln-alarm.vue
+++ b/src/views/report/kiln-alarm.vue
@@ -1,8 +1,30 @@
 <template>
  <div class="mod-log">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+    <el-form
+      :inline="true"
+      :model="dataForm"
+      @keyup.enter.native="getDataList()"
+    >
      <el-form-item>
-        <el-input v-model="dataForm.key" placeholder="用户名／用户操作" clearable></el-input>
+        <el-select v-model="dataForm.key" filterable placeholder="窑炉名称">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="dataForm.time"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button @click="getDataList()">查询</el-button>
@@ -12,37 +34,43 @@
      :data="dataList"
      border
      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="username"
        header-align="center"
        align="center"
-        label="窑炉名称">
+        label="窑炉名称"
+      >
      </el-table-column>
      <el-table-column
        prop="operation"
        header-align="center"
        align="center"
-        label="报警时间">
+        label="报警时间"
+      >
      </el-table-column>
      <el-table-column
        prop="time"
        header-align="center"
        align="center"
-        label="报警级别">
+        label="报警级别"
+      >
      </el-table-column>
      <el-table-column
        prop="ip"
        header-align="center"
        align="center"
-        label="报警内容">
+        label="报警内容"
+      >
      </el-table-column>
    </el-table>
    <el-pagination
@@ -52,63 +80,66 @@
      :page-sizes="[10, 20, 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>
-  export default {
-    data () {
-      return {
-        dataForm: {
-          key: ''
-        },
-        dataList: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPage: 0,
-        dataListLoading: false,
-        selectionDataList: []
-      }
+export default {
+  data () {
+    return {
+      dataForm: {
+        key: '',
+        time: []
+      },
+      dataList: [],
+      options: [],
+      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
+      })
    },
-    created () {
+    // 每页数
+    sizeChangeHandle (val) {
+      this.pageSize = val
+      this.pageIndex = 1
      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()
-      }
+    // 当前页
+    currentChangeHandle (val) {
+      this.pageIndex = val
+      this.getDataList()
    }
  }
+}
 </script>
--- a/src/views/report/order-history.vue
+++ b/src/views/report/order-history.vue
@@ -2,7 +2,26 @@
  <div class="mod-config">
    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
      <el-form-item>
-        <el-input v-model="dataForm.paramKey" placeholder="名称或编码" clearable></el-input>
+        <el-select v-model="dataForm.card" filterable placeholder="标识卡号">
+          <el-option
+            v-for="item in options1"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="dataForm.orderid" filterable placeholder="订单号">
+          <el-option
+            v-for="item in options2"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
      </el-form-item>
      <el-form-item>
        <el-button @click="getDataList()">查询</el-button>
@@ -38,6 +57,18 @@
        align="center"
        label="订单号">
      </el-table-column>
+      <el-table-column
+        prop="start"
+        header-align="center"
+        align="center"
+        label="发起时间">
+      </el-table-column>
+      <el-table-column
+        prop="end"
+        header-align="center"
+        align="center"
+        label="完成时间">
+      </el-table-column>
      <el-table-column
        prop="paramKey"
        header-align="center"
@@ -69,28 +100,16 @@
        label="产品名称">
      </el-table-column>
      <el-table-column
-        prop="paramKey"
+        prop="card"
        header-align="center"
        align="center"
-        label="物料名称">
+        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="实际加工重量">
+        label="数量">
      </el-table-column>
      <el-table-column
        fixed="right"
@@ -133,9 +152,12 @@
    data () {
      return {
        dataForm: {
-          paramKey: ''
+          card: '',
+          orderid: ''
        },
        dataList: [],
+        options1: [],
+        options2: [],
        pageIndex: 1,
        pageSize: 10,
        totalPage: 0,
@@ -159,7 +181,7 @@
          params: this.$http.adornParams({
            'page': this.pageIndex,
            'limit': this.pageSize,
-            'paramKey': this.dataForm.paramKey
+            'card': this.dataForm.card
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
--- a/src/views/report/task-history.vue
+++ b/src/views/report/task-history.vue
@@ -2,7 +2,36 @@
  <div class="mod-config">
    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
      <el-form-item>
-        <el-input v-model="dataForm.paramKey" placeholder="名称或编码" clearable></el-input>
+        <el-select v-model="dataForm.card" filterable placeholder="标识卡号">
+          <el-option
+            v-for="item in options1"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="dataForm.orderid" filterable placeholder="车辆名称">
+          <el-option
+            v-for="item in options2"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="dataForm.time"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button @click="getDataList()">查询</el-button>
@@ -24,7 +53,7 @@
        prop="paramKey"
        header-align="center"
        align="center"
-        label="获取时间">
+        label="任务编码">
      </el-table-column>
      <el-table-column
        prop="paramValue"
@@ -33,10 +62,10 @@
        label="标识卡号">
      </el-table-column>
      <el-table-column
-        prop="paramKey"
+        prop="start"
        header-align="center"
        align="center"
-        label="订单号">
+        label="发起时间">
      </el-table-column>
      <el-table-column
        prop="paramKey"
@@ -54,43 +83,25 @@
        prop="paramKey"
        header-align="center"
        align="center"
-        label="订单状态">
+        label="任务类型">
      </el-table-column>
      <el-table-column
-        prop="paramKey"
+        prop="start"
        header-align="center"
        align="center"
-        label="客户名称">
+        label="开始位置">
      </el-table-column>
      <el-table-column
-        prop="paramKey"
+        prop="end"
        header-align="center"
        align="center"
-        label="产品名称">
+        label="目标位置">
      </el-table-column>
      <el-table-column
-        prop="paramKey"
+        prop="name"
        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="实际加工重量">
+        label="车辆名称">
      </el-table-column>
      <el-table-column
        fixed="right"
@@ -120,9 +131,13 @@
    data () {
      return {
        dataForm: {
-          paramKey: ''
+          card: '',
+          orderid: '',
+          time: []
        },
        dataList: [],
+        options1: [],
+        options2: [],
        pageIndex: 1,
        pageSize: 10,
        totalPage: 0,
@@ -143,7 +158,7 @@
          params: this.$http.adornParams({
            'page': this.pageIndex,
            'limit': this.pageSize,
-            'paramKey': this.dataForm.paramKey
+            'card': this.dataForm.card
          })
        }).then(({data}) => {
          if (data && data.code === 0) {