1、全局调整样式名称 2、新增倍率报表页面

zhaowei

3 天以前 7a0d7a81f02515bbb185a4cb954e9debb07bff6c

1、全局调整样式名称
2、新增倍率报表页面

 src/components/jeecgbiz/modal/JSelectDepartModal.vue

@@ -30,7 +30,7 @@
    </a-spin>
    <!--底部父子关联操作和确认取消按钮-->
    <template slot="footer" v-if="treeOpera && multi">
      <div class="drawer-bootom-button">
      <div class="drawer-bottom-button">
        <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
          <a-menu slot="overlay">
            <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
@@ -286,7 +286,7 @@
    }
    overflow-y: scroll;
  }
  .drawer-bootom-button {
  .drawer-bottom-button {
    position: absolute;
    bottom: 0;
    width: 100%;

 src/components/jeecgbiz/modal/JSelectEquipmentDepartModal.vue

@@ -40,7 +40,7 @@
    </a-spin>
    <!--底部父子关联操作和确认取消按钮-->
    <!--<template slot="footer" v-if="treeOpera && multi">-->
      <!--<div class="drawer-bootom-button">-->
      <!--<div class="drawer-bottom-button">-->
        <!--<a-dropdown style="float: left" :trigger="['click']" placement="topCenter">-->
          <!--<a-menu slot="overlay">-->
            <!--<a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>-->
@@ -348,7 +348,7 @@
    }
    overflow-y: scroll;
  }
  .drawer-bootom-button {
  .drawer-bottom-button {
    position: absolute;
    bottom: 0;
    width: 100%;

 src/components/jeecgbiz/modal/JSelectEquipmentProductionModal.vue

@@ -36,7 +36,7 @@
    </a-spin>
    <!--底部父子关联操作和确认取消按钮-->
    <!--<template slot="footer">-->
    <!--<div class="drawer-bootom-button">-->
    <!--<div class="drawer-bottom-button">-->
    <!--<a-dropdown style="float: left" :trigger="['click']" placement="topCenter">-->
    <!--<a-menu slot="overlay">-->
    <!--<a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>-->
@@ -334,7 +334,7 @@
    }
    overflow-y: scroll;
  }
  .drawer-bootom-button {
  .drawer-bottom-button {
    position: absolute;
    bottom: 0;
    width: 100%;

 src/components/jeecgbiz/modal/JSelectProductionModal.vue

@@ -36,7 +36,7 @@
    </a-spin>
    <!--底部父子关联操作和确认取消按钮-->
    <!--<template slot="footer">-->
      <!--<div class="drawer-bootom-button">-->
      <!--<div class="drawer-bottom-button">-->
        <!--<a-dropdown style="float: left" :trigger="['click']" placement="topCenter">-->
          <!--<a-menu slot="overlay">-->
            <!--<a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>-->
@@ -296,7 +296,7 @@
    }
    overflow-y: scroll;
  }
  .drawer-bootom-button {
  .drawer-bottom-button {
    position: absolute;
    bottom: 0;
    width: 100%;

 src/views/mdc/base/IdleDataMaintenance.vue

ÎļþÒÑɾ³ý

 src/views/mdc/base/MagnificationReport.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
<template>
  <div style="width: 100%; height: 100%;">
    <a-card :bordered="false">
      <a-row type="flex" :gutter="16">
        <a-col :md="5">
          <a-tabs :activeKey="activeKey" @change="tabChange">
            <a-tab-pane key="1" tab="车间层级" force-render>
              <base-tree @getCurrSelected="changeSelectionNode"></base-tree>
            </a-tab-pane>
            <a-tab-pane v-if="isDepartType == 0" key="2" tab="部门层级">,
              <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
            </a-tab-pane>
          </a-tabs>
        </a-col>
        <a-col :md="19">
          <MagnificationReportList :nodePeople='selectPeople' :nodeTree='selectEquipment' :Type="selectTypeTree"/>
        </a-col>
      </a-row>
    </a-card>
  </div>

</template>

<script>
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import BaseTree from '../common/BaseTree'
  import MagnificationReportList from './modules/MagnificationReport/MagnificationReportList'
  import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
  import { mapActions } from 'vuex'

  export default {
    name: 'MagnificationReport',
    components: {
      BaseTree,
      DepartTree,
      MagnificationReportList
    },
    data() {
      return {
        activeKey: '1',
        selectEquipmentId: '',
        selectEquipment: {},
        selectPeople: {},
        selectTypeTree: '',
        isDepartType: ''
      }
    },
    created() {
      this.queryTreeData()
    },
    methods: {
      ...mapActions(['QueryDepartTree']),
      queryTreeData() {
        this.QueryDepartTree().then(res => {
          if (res.success) {
            this.isDepartType = res.result[0].value
          } else {
            // this.$message.warn(res.message)
            this.$notification.warning({
              message: '消息',
              description: res.message
            })
          }
        }).finally(() => {
        })
      },
      tabChange(val) {
        this.activeKey = val
        this.selectTypeTree = val
      },
      changeSelectionNode(val) {
        this.selectEquipment = val
        this.selectTypeTree = '1'
      },
      changeSelectionNodedd(val) {
        this.selectPeople = val
        this.selectTypeTree = '2'
      }
    }

  }
</script>

 src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue

@@ -7,7 +7,7 @@
          <a v-if="this.currSelected.title" style="margin-left: 10px" @click="onClearSelected">取消</a>
        </div>
      </a-alert>
      <div class="drawer-bootom-button">
      <div class="drawer-bottom-button">
        <a-dropdown :trigger="['click']" placement="bottomCenter">
          <a-menu slot="overlay">
            <a-menu-item key="1" @click="expandAll">展开所有</a-menu-item>
@@ -369,7 +369,7 @@
    padding: 5px 15px 5px 37px;
  }

  .drawer-bootom-button {
  .drawer-bottom-button {
    position: absolute;
    top: 1px;
    /* padding: 10px 16px; */

 src/views/mdc/base/modules/EquipmentFailureRepaireReport/EquipmentFailureRepaireReportList.vue

@@ -132,7 +132,7 @@
            width: 150
          },
          {
            title: '日期',
            title: '月份',
            align: 'center',
            dataIndex: 'theDate',
            width: 150

 src/views/mdc/base/modules/EquipmentList/EquipmentModal.vue

@@ -116,7 +116,7 @@
    </a-spin>


    <div class="drawer-bootom-button" v-show="!disableSubmit">
    <div class="drawer-bottom-button" v-show="!disableSubmit">
      <a-popconfirm title="确定放弃编辑？" @confirm="handleCancel" okText="确定" cancelText="取消">
        <a-button style="margin-right: .8rem">取消</a-button>
      </a-popconfirm>
@@ -539,7 +539,7 @@
    padding-bottom:10px;
  }

  .drawer-bootom-button {
  .drawer-bottom-button {
    position: absolute;
    bottom: -8px;
    width: 100%;

 src/views/mdc/base/modules/IdleDataMaintenance/IdleDataMaintenanceModal.vue

ÎļþÒÑɾ³ý

 src/views/mdc/base/modules/MagnificationReport/MagnificationReportList.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,207 @@
<template>
  <div class="device_list">
    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="设备编号">
              <a-input placeholder="请输入设备编号" v-model="queryParam.equipmentId"/>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="日期">
              <a-range-picker value-format="YYYY-MM-DD" v-model="queryParam.dates" @change="dateParamChange"/>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <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>
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->

    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
      <a-button type="primary" icon="download" @click="handleExportXls('倍率报表')">导出</a-button>
    </div>

    <!-- table区域-begin -->
    <div id="DeviceList" style="flex: 1;overflow: hidden">
      <a-table :scroll="{x:'max-content',y:scrollY}" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
               :pagination="ipagination" :loading="loading" @change="handleTableChange"/>
    </div>
  </div>
</template>

<script>
  import moment from 'moment'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'

  export default {
    name: 'MagnificationReportList',
    mixins: [JeecgListMixin],
    components: {},
    props: { nodeTree: '', Type: '', nodePeople: '' },
    data() {
      return {
        disableMixinCreated: true,
        /* åˆ†é¡µå‚æ•° */
        ipagination: {
          current: 1,
          pageSize: 30,
          pageSizeOptions: ['30', '50', '100'],
          showTotal: (total, range) => {
            return range[0] + '-' + range[1] + ' å…±' + total + '条'
          },
          showQuickJumper: true,
          showSizeChanger: true,
          total: 0
        },
        queryParam: {
          dates: [moment().subtract(1, 'day').startOf('day'), moment().subtract(1, 'day').endOf('day')]
        },
        // è¡¨å¤´
        columns: [
          {
            title: '#',
            dataIndex: '',
            key: 'rowIndex',
            width: 60,
            align: 'center',
            customRender: function(t, r, index) {
              return parseInt(index) + 1
            }
          },
          {
            title: '设备编号',
            align: 'center',
            dataIndex: 'equipmentId',
            width: 300
          },
          {
            title: '主轴倍率平均值',
            align: 'center',
            dataIndex: 'spindlebeilv'
          },
          {
            title: '进给倍率平均值',
            align: 'center',
            dataIndex: 'feedbeilv'
          },
          {
            title: '日期',
            align: 'center',
            dataIndex: 'theDate',
            width: 300
          }
        ],
        scrollY: 465,
        url: {
          list: '/mdc/magnification/list',
          exportXlsUrl: '/mdc/magnification/exportXls'
        }
      }
    },
    watch: {
      Type(valmath) {
        this.dataList = []
        this.queryParam.typeTree = valmath
      },
      nodeTree(val) { //监听currSelected å˜åŒ–，将变化后的数值传递给 getCurrSelected äº‹ä»¶
        if (JSON.stringify(val) != '{}') {
          if (val.equipmentId) {
            this.queryParam.parentId = ''
            this.queryParam.equipmentId = val.equipmentId
          } else {
            this.queryParam.parentId = val.key
            this.queryParam.equipmentId = ''
          }
          this.searchQuery()
        }
      },
      nodePeople(val) {
        if (JSON.stringify(val) != '{}') {
          if (val.equipmentId) {
            this.queryParam.parentId = ''
            this.queryParam.equipmentId = val.equipmentId
          } else {
            this.queryParam.parentId = val.key
            this.queryParam.equipmentId = ''
          }
          this.searchQuery()
        }
      }
    },
    created() {
      this.queryParam.startTime = moment(this.queryParam.dates[0]).format('YYYY-MM-DD')
      this.queryParam.endTime = moment(this.queryParam.dates[1]).format('YYYY-MM-DD')
      this.loadData(1)
    },
    mounted() {
      window.addEventListener('resize', this.handleWindowResize)
      this.handleWindowResize()
    },
    beforeDestroy() {
      window.removeEventListener('resize', this.handleWindowResize)
    },
    methods: {
      dateParamChange(dateArray) {
        this.queryParam.startTime = dateArray[0]
        this.queryParam.endTime = dateArray[1]
      },

      /**
       * å½“浏览器可视窗口尺寸发生改变时触发
       */
      handleWindowResize() {
        const boxHeight = +window.getComputedStyle(document.getElementById('DeviceList')).height.slice(0, -2)
        const tableHeadHeight = +window.getComputedStyle(document.querySelector('.ant-table-thead th')).height.slice(0, -2)
        this.scrollY = boxHeight - tableHeadHeight - 100
      }
    }
  }
</script>
<style scoped>
  @import '~@assets/less/common.less';

  .device_list {
    display: flex;
    flex-direction: column;
    overflow: hidden;
  }

  @media screen and (min-width: 1920px) {
    .device_list {
      height: 811px !important;
    }
  }

  @media screen and (min-width: 1680px) and (max-width: 1920px) {
    .device_list {
      height: 811px !important;
    }
  }

  @media screen and (min-width: 1400px) and (max-width: 1680px) {
    .device_list {
      height: 663px !important;
    }
  }

  @media screen and (min-width: 1280px) and (max-width: 1400px) {
    .device_list {
      height: 564px !important;
    }
  }

  @media screen and (max-width: 1280px) {
    .device_list {
      height: 564px !important;
    }
  }
</style>

 src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue

@@ -8,7 +8,7 @@
          <span v-else>无</span>
        </div>
      </a-alert>
      <div class="drawer-bootom-button">
      <div class="drawer-bottom-button">
        <a-dropdown :trigger="['click']" placement="bottomCenter">
          <a-menu slot="overlay">
            <!--<a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>-->
@@ -51,7 +51,7 @@


  </a-card>
    <!--<div class="drawer-bootom-button">-->
    <!--<div class="drawer-bottom-button">-->
      <!--<a-dropdown style="float: left" :trigger="['click']" placement="topCenter">-->
        <!--<a-menu slot="overlay">-->
          <!--<a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>-->
@@ -412,7 +412,7 @@
  /*.tree_con{*/
    /*position: relative;*/
  /*}*/
  .drawer-bootom-button {
  .drawer-bottom-button {
    position: absolute;
    top: 1px;
    /* padding: 10px 16px; */
@@ -486,7 +486,7 @@
    padding: 5px 15px 5px 37px;
  }

  /*.drawer-bootom-button {*/
  /*.drawer-bottom-button {*/
    /*position: absolute;*/
    /*bottom: 1px;*/
     /*padding: 10px 16px;*/

 src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddTree.vue

@@ -31,7 +31,7 @@
      </a-form-item>
    </a-form>

    <!--<div class="drawer-bootom-button">-->
    <!--<div class="drawer-bottom-button">-->
      <!--<a-dropdown style="float: left" :trigger="['click']" placement="topCenter">-->
        <!--<a-menu slot="overlay">-->
          <!--<a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>-->
@@ -241,7 +241,7 @@

</script>
<style lang="less" scoped>
  .drawer-bootom-button {
  .drawer-bottom-button {
    position: absolute;
    bottom: 0;
    width: 100%;

 src/views/system/DepartList.vue

@@ -53,7 +53,7 @@
        </div>
      </a-card>
      <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
      <div class="drawer-bootom-button">
      <div class="drawer-bottom-button">
        <a-dropdown :trigger="['click']" placement="topCenter">
          <a-menu slot="overlay">
            <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
@@ -624,7 +624,7 @@
    margin-left: 3px
  }

  .drawer-bootom-button {
  .drawer-bottom-button {
    /*position: absolute;*/
    bottom: 0;
    width: 100%;

 src/views/system/DepartListSync.vue

@@ -54,7 +54,7 @@
        </div>
      </a-card>
      <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
      <div class="drawer-bootom-button">
      <div class="drawer-bottom-button">
        <a-dropdown :trigger="['click']" placement="topCenter">
          <a-menu slot="overlay">
            <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
@@ -677,7 +677,7 @@
  }

  /** Button按钮间距 */
  .drawer-bootom-button {
  .drawer-bottom-button {
    /*position: absolute;*/
    bottom: 0;
    width: 100%;

 src/views/system/modules/DeptRoleAuthModal.vue

@@ -31,7 +31,7 @@
      </a-form-item>
    </a-form>

    <div class="drawer-bootom-button">
    <div class="drawer-bottom-button">
      <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
@@ -198,7 +198,7 @@

</script>
<style lang="less" scoped>
  .drawer-bootom-button {
  .drawer-bottom-button {
    position: absolute;
    bottom: 0;
    width: 100%;

 src/views/system/modules/DeptRoleUserModal.vue

@@ -30,7 +30,7 @@
      </a-form>
      <div v-else><h3>无可配置角色!</h3></div>
    </a-spin>
    <div class="drawer-bootom-button">
    <div class="drawer-bottom-button">
      <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="checkALL">全部勾选</a-menu-item>
@@ -186,7 +186,7 @@
</script>

<style scoped>
  .drawer-bootom-button {
  .drawer-bottom-button {
    position: absolute;
    bottom: 0;
    width: 100%;

 src/views/system/modules/GateWayRouteModal.vue

@@ -104,7 +104,7 @@
          </a-dropdown>
        </p>
      </a-form-model-item>
      <a-row :style="{textAlign:'right'}" class="drawer-bootom-button">
      <a-row :style="{textAlign:'right'}" class="drawer-bottom-button">
        <a-button :style="{marginRight: '8px'}" @click="handleCancel">
          å…³é—­
        </a-button>
@@ -368,7 +368,7 @@

</script>
<style lang="less" scoped>
  .drawer-bootom-button {
  .drawer-bottom-button {
    position: absolute;
    bottom: 0;
    width: 100%;

 src/views/system/modules/UserRoleModal.vue

@@ -28,7 +28,7 @@
      </a-form-item>
    </a-form>

    <div class="drawer-bootom-button">
    <div class="drawer-bottom-button">
      <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
@@ -185,7 +185,7 @@

</script>
<style lang="less" scoped>
  .drawer-bootom-button {
  .drawer-bottom-button {
    position: absolute;
    bottom: 0;
    width: 100%;