430/vue_mdc_430_new.git

			@@ -17,26 +17,26 @@
			/>
			</a-form-item>
			</a-col>
			<a-col :md="5" :sm="5" :xs="5">
			<a-form-item label="班制">
			<a-select v-model="queryParam.shiftId" placeholder="请选择班制"
			@change="initShiftSubList" :allowClear="allowClear">
			<a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
			{{ em.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 v-model="queryParam.shiftSubId" placeholder="请选择班次" @change="initShiftSubListChange"
			:allowClear="allowClearSu">
			<a-select-option v-for="(em,index) in shiftSubList" :key="index" :value="em.value">
			{{ em.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 v-model="queryParam.shiftId" placeholder="请选择班制"-->
			<!--@change="initShiftSubList" :allowClear="allowClear">-->
			<!--<a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">-->
			<!--{{ em.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 v-model="queryParam.shiftSubId" placeholder="请选择班次" @change="initShiftSubListChange"-->
			<!--:allowClear="allowClearSu">-->
			<!--<a-select-option v-for="(em,index) in shiftSubList" :key="index" :value="em.value">-->
			<!--{{ em.label }}-->
			<!--</a-select-option>-->
			<!--</a-select>-->
			<!--</a-form-item>-->
			<!--</a-col>-->

			<a-col :md="8" :sm="8" :xs="8">
			<a-space>
			@@ -54,8 +54,7 @@
			<div class="container" id="EfficiencyShift" style="margin-top: 20px;">
			<div class="table2">
			<a-table :columns="columns" :dataSource="dataSource.records" :pagination="false" bordered
			:scroll="{ x: 1500, y: false }">

			:scroll="{ x: 3200, y: false }">
			</a-table>
			</div>
			</div>
			@@ -67,7 +66,7 @@
			:default-current="1"
			:current=+queryParam.pageNo
			show-size-changer
			:pageSizeOptions="['10','15','20','25']"
			:pageSizeOptions="['20','30','40','50']"
			@change="handlePageNoChange"
			@showSizeChange="handlePageSizeChange"
			/>
			@@ -96,7 +95,7 @@
			dates: [moment().subtract('month', 1), moment().subtract('month', 1)],
			identifying: [],
			queryParam: {
			pageSize: 10,
			pageSize: 20,
			pageNo: 1
			},
			queryParamEquip: {},
			@@ -117,22 +116,22 @@
			align: 'center',
			customRender: function(t, r, index) {
			return parseInt(index) + 1
			},
			fixed: 'left'
			}
			// fixed: 'left'
			},
			{
			title: '设备统一编号',
			align: 'center',
			dataIndex: 'equipmentId',
			width: 120,
			fixed: 'left'
			width: 120
			// fixed: 'left'
			},
			{
			title: '设备名称',
			align: 'center',
			width: 150,
			dataIndex: 'equipmentName',
			fixed: 'left'
			width: 200,
			dataIndex: 'equipmentName'
			// fixed: 'left'
			},
			{
			title: '设备型号',
			@@ -149,8 +148,9 @@
			{
			title: '班次',
			align: 'center',
			width: 80,
			dataIndex: 'shift'
			width: 300,
			dataIndex: 'shift',
			ellipsis: true,
			},
			{
			title: '每班小时',
			@@ -410,18 +410,11 @@
			},

			searchReset() {
			this.typeTree = this.queryParam.typeTree
			this.typeParent = this.queryParam.parentId
			this.typeEquipment = this.queryParam.equipmentId
			this.queryParam = {
			pageSize: 10,
			pageSize: 20,
			pageNo: 1
			}
			this.dates = []
			this.shiftSubList = []
			this.queryParam.typeTree = this.typeTree
			this.queryParam.parentId = this.typeParent
			this.queryParam.equipmentId = this.typeEquipment
			this.loadData()
			},