1、设备综合效率分析页面新增百分比筛选查询
2、新增OEE统计页面并完成相应功能
已添加1个文件
已修改1个文件
215 ■■■■ 文件已修改
src/views/mdc/base/OEEStatistics.vue 119 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue 96 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/OEEStatistics.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,119 @@
<template>
  <a-card :bordered="false">
    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :md="4" :sm="4">
            <a-form-item label="月份">
              <a-month-picker
                placeholder="月份"
                format="YYYY-MM"
                value-format="YYYY-MM"
                v-model="queryParam.date"
                @change="handleDateChange"
                style="width: 100%"
              />
            </a-form-item>
          </a-col>
          <a-col :md="6" :sm="6">
            <a-space>
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            </a-space>
          </a-col>
        </a-row>
      </a-form>
    </div>
    <a-table
      ref="table"
      bordered
      size="middle"
      rowKey="productionId"
      :scroll="{x:'max-content',y:600}"
      :columns="columns"
      :dataSource="dataSource"
      :pagination="false"
      :loading="loading"
    ></a-table>
  </a-card>
</template>
<script>
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import moment from 'moment'
  export default {
    name: 'OEEStatistics',
    mixins: [JeecgListMixin],
    created() {
    },
    data() {
      return {
        name: 'OEEStatistics',
        description: '这是OEE统计页面',
        queryParam: {
          date: moment().subtract('month', 1).format('YYYY-MM')
        },
        columns: [
          {
            title: '#',
            dataIndex: '',
            key: 'rowIndex',
            width: 60,
            align: 'center',
            customRender: function(t, r, index) {
              return parseInt(index) + 1
            }
          },
          {
            title: '车间名称',
            align: 'center',
            dataIndex: 'productionName',
            width: 250
          },
          {
            title: '小于5%',
            align: 'center',
            dataIndex: 'level1',
            width: 250
          },
          {
            title: '5%-10%',
            align: 'center',
            width: 250,
            dataIndex: 'level2'
          },
          {
            title: '10%-30%',
            align: 'center',
            width: 250,
            dataIndex: 'level3'
          },
          {
            title: '30%-60%',
            align: 'center',
            width: 250,
            dataIndex: 'level4'
          },
          {
            title: '60%以上',
            align: 'center',
            width: 250,
            dataIndex: 'level5'
          }
        ],
        url: {
          list: '/mdc/mdcOverallEquipmentEfficiency/oeeStatisticsList',
        }
      }
    },
    methods: {
    }
  }
</script>
<style scoped>
  @import '~@assets/less/common.less'
</style>
src/views/mdc/base/modules/OEEAnalysis/OEEAnalysisList.vue
@@ -5,7 +5,7 @@
      <div class="table-page-search-wrapper">
        <a-form layout="inline" @keyup.enter.native="searchQuery">
          <a-row :gutter="24">
            <a-col :md="5" :sm="5" :xs="5">
            <a-col :md="6" :sm="6" :xs="6">
              <a-form-item label="设备类型">
                <a-select
                  :value="queryParams.equipmentType"
@@ -49,22 +49,22 @@
                />
              </a-form-item>
            </a-col>
<!--            <a-col :md="5" :sm="5" :xs="5">-->
<!--              <a-form-item label="设备种类">-->
<!--                <a-select-->
<!--                  :value="queryParams.deviceCategory"-->
<!--                  mode="multiple"-->
<!--                  placeholder="请选择设备种类"-->
<!--                  allow-clear-->
<!--                  :maxTagCount="1"-->
<!--                  @change="selectChange($event,'deviceCategory')"-->
<!--                >-->
<!--                  <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">-->
<!--                    {{item.label}}-->
<!--                  </a-select-option>-->
<!--                </a-select>-->
<!--              </a-form-item>-->
<!--            </a-col>-->
            <!--            <a-col :md="5" :sm="5" :xs="5">-->
            <!--              <a-form-item label="设备种类">-->
            <!--                <a-select-->
            <!--                  :value="queryParams.deviceCategory"-->
            <!--                  mode="multiple"-->
            <!--                  placeholder="请选择设备种类"-->
            <!--                  allow-clear-->
            <!--                  :maxTagCount="1"-->
            <!--                  @change="selectChange($event,'deviceCategory')"-->
            <!--                >-->
            <!--                  <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">-->
            <!--                    {{item.label}}-->
            <!--                  </a-select-option>-->
            <!--                </a-select>-->
            <!--              </a-form-item>-->
            <!--            </a-col>-->
            <a-col :md="5" :sm="5" :xs="5">
              <a-form-item label="设备级别">
                <a-select
@@ -96,22 +96,22 @@
          <a-row :gutter="24" v-if="toggleSearchStatus">
            <!--<a-col :md="5" :sm="5" :xs="5">-->
              <!--<a-form-item label="数据分布">-->
                <!--<a-select-->
                  <!--:value="queryParams.deviceLevel"-->
                  <!--mode="multiple"-->
                  <!--placeholder="请选择数据分布"-->
                  <!--allow-clear-->
                  <!--:maxTagCount="1"-->
                  <!--@change="selectChange($event,'deviceLevel')"-->
                <!--&gt;-->
                  <!--<a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">-->
                    <!--{{item.label}}-->
                  <!--</a-select-option>-->
                <!--</a-select>-->
              <!--</a-form-item>-->
            <!--<a-form-item label="数据分布">-->
            <!--<a-select-->
            <!--:value="queryParams.deviceLevel"-->
            <!--mode="multiple"-->
            <!--placeholder="请选择数据分布"-->
            <!--allow-clear-->
            <!--:maxTagCount="1"-->
            <!--@change="selectChange($event,'deviceLevel')"-->
            <!--&gt;-->
            <!--<a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">-->
            <!--{{item.label}}-->
            <!--</a-select-option>-->
            <!--</a-select>-->
            <!--</a-form-item>-->
            <!--</a-col>-->
            <a-col :md="5" :sm="5" :xs="5">
            <a-col :md="6" :sm="6" :xs="6">
              <a-form-item label="重要程度">
                <a-select
                  :value="queryParams.deviceImportanceLevel"
@@ -122,6 +122,24 @@
                  @change="selectChange($event,'deviceImportanceLevel')"
                >
                  <a-select-option v-for="(item,index) in device_importance_level_list" :value="item.value"
                                   :key="index">
                    {{item.label}}
                  </a-select-option>
                </a-select>
              </a-form-item>
            </a-col>
            <a-col :md="6" :sm="6" :xs="6">
              <a-form-item label="百分比筛选">
                <a-select
                  :value="queryParams.percentageLevel"
                  mode="multiple"
                  placeholder="请选择百分比筛选"
                  allow-clear
                  :maxTagCount="1"
                  @change="selectChange($event,'percentageLevel')"
                >
                  <a-select-option v-for="(item,index) in percentage_level_list" :value="item.value"
                                   :key="index">
                    {{item.label}}
                  </a-select-option>
@@ -197,7 +215,8 @@
          driveType: [],
          deviceLevel: [],
          deviceCategory: [],
          deviceImportanceLevel: []
          deviceImportanceLevel: [],
          percentageLevel: []
        },
        queryParamEquip: {},
        queryParamPeople: {},
@@ -398,6 +417,7 @@
        equipmentTypeList: [],
        device_level_list: [],
        device_category_list: [],
        percentage_level_list: [],
        scrollY: 465,
        tableLoading: false,
        toggleSearchStatus: false
@@ -422,6 +442,7 @@
      this.initDictData('device_level')
      this.initDictData('device_category')
      this.initDictData('device_importance_level')
      this.initDictData('percentage_level')
    },
    mounted() {
      window.addEventListener('resize', this.handleWindowResize)
@@ -516,9 +537,12 @@
          this.queryParam.equipmentId = ''
        }
        Object.keys(this.queryParams).forEach(item => {
          this.queryParam[item] = this.queryParams[item].join()
          // æ­¤å¤„为保证接口参数不多余,可省略
          if (this.queryParams[item].length === 0) delete this.queryParam[item]
          if (Array.isArray(this.queryParams[item])) {
            // æ­¤å¤„为保证接口参数不多余,可省略
            this.queryParam[item] = this.queryParams[item].join()
            if (this.queryParams[item].length === 0) delete this.queryParam[item]
            console.log('this.queryParam', this.queryParam)
          }
        })
        this.loadData()
      },