src/views/basic/alarmInfo.vue

@@ -2,7 +2,15 @@
   <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.paramKey" 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-button @click="getDataList()">查询</el-button>
@@ -25,19 +33,25 @@
         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="remark"
+        header-align="center"
+        align="center"
+        label="报警内容">
       </el-table-column>
       <el-table-column
         fixed="right"
@@ -74,6 +88,7 @@
           paramKey: ''
         },
         dataList: [],
+        options: [],
         pageIndex: 1,
         pageSize: 10,
         totalPage: 0,

src/views/basic/cache.vue

@@ -25,19 +25,31 @@
         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="ename"
+        header-align="center"
+        align="center"
+        label="英文名">
+      </el-table-column>
+      <el-table-column
+        prop="status"
+        header-align="center"
+        align="center"
+        label="状态">
       </el-table-column>
       <el-table-column
         fixed="right"

src/views/basic/carInfo.vue

@@ -2,7 +2,15 @@
   <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.paramKey" 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-button @click="getDataList()">查询</el-button>
@@ -25,19 +33,25 @@
         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="suoxie"
+        header-align="center"
+        align="center"
+        label="缩写">
       </el-table-column>
       <el-table-column
         fixed="right"
@@ -74,6 +88,7 @@
           paramKey: ''
         },
         dataList: [],
+        options: [],
         pageIndex: 1,
         pageSize: 10,
         totalPage: 0,

src/views/basic/components/location.vue

@@ -12,29 +12,47 @@
       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"
         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="rname"
+        header-align="center"
+        align="center"
+        label="别名">
+      </el-table-column>
+      <el-table-column
+        prop="ename"
+        header-align="center"
+        align="center"
+        label="英文名称">
+      </el-table-column>
+      <el-table-column
+        prop="status"
+        header-align="center"
+        align="center"
+        label="状态">
       </el-table-column>
       <el-table-column
         fixed="right"

src/views/basic/equipmentInfo.vue

@@ -1,8 +1,20 @@
 <template>
   <div class="mod-config">
-    <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.paramKey" placeholder="名称或编码" clearable></el-input>
+        <el-select v-model="dataForm.paramKey" filterable placeholder="名称">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button @click="getDataList()">查询</el-button>
@@ -13,41 +25,78 @@
       :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="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="type"
+        header-align="center"
+        align="center"
+        label="类型"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="ename"
+        header-align="center"
+        align="center"
+        label="英文名"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="suoxie"
+        header-align="center"
+        align="center"
+        label="缩写"
+      >
       </el-table-column>
       <el-table-column
         fixed="right"
         header-align="center"
         align="center"
         width="150"
-        label="操作">
+        label="操作"
+      >
         <template slot-scope="scope">
-          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
+          <el-button
-          <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</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>
@@ -58,88 +107,95 @@
       :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>
     <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    <add-or-update
+      v-if="addOrUpdateVisible"
+      ref="addOrUpdate"
+      @refreshDataList="getDataList"
+    ></add-or-update>
   </div>
 </template>
 
 <script>
-  import AddOrUpdate from './components/equipmentInfo-add'
+import AddOrUpdate from './components/equipmentInfo-add'
-  export default {
+export default {
-    data () {
+  data () {
-      return {
+    return {
-        dataForm: {
+      dataForm: {
-          paramKey: ''
+        paramKey: ''
-        },
+      },
-        dataList: [],
+      dataList: [],
-        pageIndex: 1,
+      options: [],
-        pageSize: 10,
+      pageIndex: 1,
-        totalPage: 0,
+      pageSize: 10,
-        dataListLoading: false,
+      totalPage: 0,
-        addOrUpdateVisible: false
+      dataListLoading: false,
-      }
+      addOrUpdateVisible: false
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  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
+      })
     },
-    components: {
+    // 每页数
-      AddOrUpdate
+    sizeChangeHandle (val) {
-    },
+      this.pageSize = val
-    activated () {
+      this.pageIndex = 1
       this.getDataList()
     },
-    methods: {
+    // 当前页
-      // 获取数据列表
+    currentChangeHandle (val) {
-      getDataList () {
+      this.pageIndex = val
-        this.dataListLoading = true
+      this.getDataList()
-        this.$http({
+    },
-          url: this.$http.adornUrl('/sys/config/list'),
+    // 新增 / 修改
-          method: 'get',
+    addOrUpdateHandle (id) {
-          params: this.$http.adornParams({
+      this.addOrUpdateVisible = true
-            'page': this.pageIndex,
+      this.$nextTick(() => {
-            'limit': this.pageSize,
+        this.$refs.addOrUpdate.init(id)
-            'paramKey': this.dataForm.paramKey
+      })
-          })
+    },
-        }).then(({data}) => {
+    // 删除
-          if (data && data.code === 0) {
+    deleteHandle (id) {
-            this.dataList = data.page.list
+      this.$confirm(`确定对[id=${id}]进行删除操作?`, '提示', {
-            this.totalPage = data.page.totalCount
+        confirmButtonText: '确定',
-          } else {
+        cancelButtonText: '取消',
-            this.dataList = []
+        type: 'warning'
-            this.totalPage = 0
+      })
-          }
+        .then(() => {
-          this.dataListLoading = false
-        })
-      },
-      // 每页数
-      sizeChangeHandle (val) {
-        this.pageSize = val
-        this.pageIndex = 1
-        this.getDataList()
-      },
-      // 当前页
-      currentChangeHandle (val) {
-        this.pageIndex = val
-        this.getDataList()
-      },
-      // 新增 / 修改
-      addOrUpdateHandle (id) {
-        this.addOrUpdateVisible = true
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(id)
-        })
-      },
-      // 删除
-      deleteHandle (id) {
-        this.$confirm(`确定对[id=${id}]进行删除操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
           this.$http({
             url: this.$http.adornUrl('/sys/config/delete'),
             method: 'post',
             data: this.$http.adornData(id, false)
-          }).then(({data}) => {
+          }).then(({ data }) => {
             if (data && data.code === 0) {
               this.$message({
                 message: '操作成功',
@@ -153,8 +209,9 @@
               this.$message.error(data.msg)
             }
           })
-        }).catch(() => {})
+        })
-      }
+        .catch(() => {})
     }
   }
+}
 </script>

src/views/common/order-process.vue

@@ -32,7 +32,6 @@
         prop="id"
         header-align="center"
         align="center"
-        width="80"
         label="标识卡">
       </el-table-column>
       <el-table-column
@@ -59,6 +58,12 @@
         align="center"
         label="材料号牌">
       </el-table-column>
+      <el-table-column
+        prop="num"
+        header-align="center"
+        align="center"
+        label="已完成数">
+      </el-table-column>
       <el-table-column
         prop="number"
         header-align="center"
@@ -81,7 +86,6 @@
         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>

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

@@ -11,29 +11,77 @@
       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"
         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="type"
+        header-align="center"
+        align="center"
+        label="任务类型">
+      </el-table-column>
+      <el-table-column
+        prop="precess"
+        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-column
+        prop="luzi"
+        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

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

@@ -20,29 +20,71 @@
       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"
         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

src/views/order/current-order.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>
@@ -90,7 +109,7 @@
         prop="paramKey"
         header-align="center"
         align="center"
-        label="实际加工重量">
+        label="实际重量">
       </el-table-column>
       <el-table-column
         fixed="right"
@@ -144,9 +163,12 @@
     data () {
       return {
         dataForm: {
-          paramKey: ''
+          card: '',
+          orderid: ''
         },
         dataList: [],
+        options1: [],
+        options2: [],
         pageIndex: 1,
         pageSize: 10,
         totalPage: 0,
@@ -170,7 +192,8 @@
           params: this.$http.adornParams({
             'page': this.pageIndex,
             'limit': this.pageSize,
-            'paramKey': this.dataForm.paramKey
+            'orderid': this.dataForm.orderid,
+            'card': this.dataForm.card
           })
         }).then(({data}) => {
           if (data && data.code === 0) {

src/views/order/current-task.vue

@@ -2,7 +2,15 @@
   <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.paramKey" 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-button @click="getDataList()">查询</el-button>
@@ -25,19 +33,49 @@
         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="status"
+        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="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-column
         fixed="right"
@@ -70,6 +108,7 @@
           paramKey: ''
         },
         dataList: [],
+        options: [],
         pageIndex: 1,
         pageSize: 10,
         totalPage: 0,

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,

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="序号"
-        label="ID">
+        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

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="序号"
-        label="ID">
+        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

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 {
+export default {
-    data () {
+  data () {
-      return {
+    return {
-        dataForm: {
+      dataForm: {
-          key: ''
+        key: '',
-        },
+        time: []
-        dataList: [],
+      },
-        pageIndex: 1,
+      dataList: [],
-        pageSize: 10,
+      options: [],
-        totalPage: 0,
+      pageIndex: 1,
-        dataListLoading: false,
+      pageSize: 10,
-        selectionDataList: []
+      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: {
+    // 当前页
-      // 获取数据列表
+    currentChangeHandle (val) {
-      getDataList () {
+      this.pageIndex = val
-        this.dataListLoading = true
+      this.getDataList()
-        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

@@ -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="物料数量">
+        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"
@@ -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) {

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="物料名称">
+        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"
@@ -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) {