430/vue_mdc_430_new.git

zhuzhuanzhuan

2023-09-25 1bbc16b3f89e070f849d99522169fa813b49cf8b

优化设备维修休假、假期、计划停机以及非计划停机管理页面导出功能

已修改8个文件

	src/components/table2excel/table2excel.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/mdc/base/MdcDriveTypeParamConfigList.vue	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/mdc/base/MdcplancloseList.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/components/table2excel/table2excel.js

@@ -3,7 +3,6 @@
import jQuery from 'jquery'
(function ( $, window, document, undefined ) {
  var pluginName = "table2excel",

    defaults = {
      exclude: ".noExl",
      name: "Table2Excel",
@@ -253,7 +252,6 @@
        $.data( e, "plugin_" + pluginName, new Plugin( this, options ) );
      }
    });

    // chain jQuery functions
    return e;
  };

 src/views/mdc/base/MdcDriveTypeParamConfigList.vue

@@ -135,7 +135,7 @@
      <a-button
        type="primary"
        icon="download"
        @click="handleExportXls('设备驱动参数配置')"
        @click="handleExportXls('驱动参数管理')"
      >导出</a-button>
      <a-upload
        name="file"
@@ -360,7 +360,6 @@
        deleteBatch: "/mdc/mdcDriveTypeParamConfig/deleteBatch",
        exportXlsUrl: "/mdc/mdcDriveTypeParamConfig/exportXls",
        importExcelUrl: "mdc/mdcDriveTypeParamConfig/importExcel",

      },
      dictOptions: {},
      superFieldList: [],

 src/views/mdc/base/MdcplancloseList.vue

@@ -34,7 +34,7 @@
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-button type="primary" icon="download" @click="importTemplate('计划停机模板')">导入模板</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('计划停机')">导出</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('计划停机管理')">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload>
@@ -156,8 +156,8 @@
          list: "/mdc/mdcPlanClose/list",
          delete: "/mdc/mdcPlanClose/delete",
          deleteBatch: "/mdc/mdcPlanClose/deleteBatch",
          exportXlsUrl: "/plan/mdcplanclose/exportXls",
          importExcelUrl: "plan/mdcplanclose/importExcel",
          exportXlsUrl: "/mdc/mdcPlanClose/exportXls",
          importExcelUrl: "mdc/mdcPlanClose/importExcel",

        },
        dictOptions:{},

 src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue

@@ -177,8 +177,8 @@
          delete: '/mdc/mdcVacationManagement/deleteVacation',
          deleteBatch: '/mdc/mdcVacationManagement/deleteBatchVacation',
          getEquipmentByPid: '/mdc/mdcequipment/getEquipmentByPid',
          exportXlsUrl: "/mdc/MdcTorqueConfig/exportXls",
          importExcelUrl: "/mdc/MdcTorqueConfig/importExcel",
          exportXlsUrl: "/mdc/mdcVacationManagement/exportXls",
          importExcelUrl: "/mdc/mdcVacationManagement/importExcel",
        }
      }
    },

 src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue

@@ -36,7 +36,7 @@
      <a-button @click="handleAdd" type="primary" icon="plus">新增
      </a-button>
      <a-button type="primary" icon="download" @click="importTemplate('非计划停机模板')">导入模板</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('非计划停机')">导出</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('非计划停机管理')">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
      <a-button type="primary" icon="import">导入</a-button>
      </a-upload>
@@ -196,8 +196,8 @@
          delete: '/mdc/mdcNoplanClose/delete',
          deleteBatch: '/mdc/mdcNoplanClose/deleteBatch',
          getEquipmentByPid: '/mdc/mdcequipment/getEquipmentByPid',
          exportXlsUrl: "/mdc/MdcTorqueConfig/exportXls",
          importExcelUrl: "/mdc/MdcTorqueConfig/importExcel",
          exportXlsUrl: "/mdc/mdcNoplanClose/exportXls",
          importExcelUrl: "/mdc/mdcNoplanClose/importExcel",
        }
      }
    },

 src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue

@@ -26,7 +26,8 @@
            <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
          </a-col>
          <a-col :lg="2" :md="3" :sm="3" :xs="3">
            <a-button type="primary" @click="exportExcel" icon="download">导出</a-button>
            <!--<a-button type="primary" @click="exportExcel" icon="download">导出</a-button>-->
            <a-button type="primary" @click="handleExportXls('维修休班管理')" icon="download">导出</a-button>
          </a-col>
        </a-row>
      </a-form>
@@ -163,6 +164,7 @@
          list: '/mdc/mdcEquipmentRepair/pageList',
          deleteBatch: '/mdc/mdcEquipmentRepair/delete',
          getEquipmentByPid: '/mdc/mdcequipment/getEquipmentByPid',
          exportXlsUrl:'/mdc/mdcEquipmentRepair/exportXls'
        }
      }
    },
@@ -541,7 +543,7 @@
        $("#DeviceList").table2excel({
          exclude: ".noExl",
          name: "Excel Document Name",
          filename: "设备维修详情",
          filename: "维修休班管理",
          exclude_img: true,
          fileext: ".xls",
          exclude_links: true,

 src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue

@@ -142,7 +142,7 @@
      dataList: [],
      url: {
        list: '/mdc/efficiencyReport/efficiencyList',
        listByType: '/mdc/MdcUtilizationRate/getByType'
        listByType: '/mdc/MdcUtilizationRate/getByType',
      },
      tableHeads: [],

@@ -319,7 +319,7 @@
      $("#Efficiency").table2excel({
        exclude: ".noExl",
        name: "Excel Document Name",
        filename: "利用率",
        filename: "设备利用率",
        exclude_img: true,
        fileext: ".xls",
        exclude_links: true,

 src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue

@@ -36,7 +36,7 @@
      <a-button @click="handleAdd" type="primary" icon="plus">新增
      </a-button>
      <a-button type="primary" icon="download" @click="importTemplate('加工数量模板')">导入模板</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('加工数量')">导出</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('加工数量管理')">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
      <a-button type="primary" icon="import">导入</a-button>
      </a-upload>

			@@ -3,7 +3,6 @@
			import jQuery from 'jquery'
			(function ( $, window, document, undefined ) {
			var pluginName = "table2excel",

			defaults = {
			exclude: ".noExl",
			name: "Table2Excel",
			@@ -253,7 +252,6 @@
			$.data( e, "plugin_" + pluginName, new Plugin( this, options ) );
			}
			});

			// chain jQuery functions
			return e;
			};

			@@ -135,7 +135,7 @@
			<a-button
			type="primary"
			icon="download"
			@click="handleExportXls('设备驱动参数配置')"
			@click="handleExportXls('驱动参数管理')"
			>导出</a-button>
			<a-upload
			name="file"
			@@ -360,7 +360,6 @@
			deleteBatch: "/mdc/mdcDriveTypeParamConfig/deleteBatch",
			exportXlsUrl: "/mdc/mdcDriveTypeParamConfig/exportXls",
			importExcelUrl: "mdc/mdcDriveTypeParamConfig/importExcel",

			},
			dictOptions: {},
			superFieldList: [],

			@@ -34,7 +34,7 @@
			<div class="table-operator">
			<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
			<a-button type="primary" icon="download" @click="importTemplate('计划停机模板')">导入模板</a-button>
			<a-button type="primary" icon="download" @click="handleExportXls('计划停机')">导出</a-button>
			<a-button type="primary" icon="download" @click="handleExportXls('计划停机管理')">导出</a-button>
			<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
			<a-button type="primary" icon="import">导入</a-button>
			</a-upload>
			@@ -156,8 +156,8 @@
			list: "/mdc/mdcPlanClose/list",
			delete: "/mdc/mdcPlanClose/delete",
			deleteBatch: "/mdc/mdcPlanClose/deleteBatch",
			exportXlsUrl: "/plan/mdcplanclose/exportXls",
			importExcelUrl: "plan/mdcplanclose/importExcel",
			exportXlsUrl: "/mdc/mdcPlanClose/exportXls",
			importExcelUrl: "mdc/mdcPlanClose/importExcel",

			},
			dictOptions:{},

			@@ -177,8 +177,8 @@
			delete: '/mdc/mdcVacationManagement/deleteVacation',
			deleteBatch: '/mdc/mdcVacationManagement/deleteBatchVacation',
			getEquipmentByPid: '/mdc/mdcequipment/getEquipmentByPid',
			exportXlsUrl: "/mdc/MdcTorqueConfig/exportXls",
			importExcelUrl: "/mdc/MdcTorqueConfig/importExcel",
			exportXlsUrl: "/mdc/mdcVacationManagement/exportXls",
			importExcelUrl: "/mdc/mdcVacationManagement/importExcel",
			}
			}
			},

			@@ -36,7 +36,7 @@
			<a-button @click="handleAdd" type="primary" icon="plus">新增
			</a-button>
			<a-button type="primary" icon="download" @click="importTemplate('非计划停机模板')">导入模板</a-button>
			<a-button type="primary" icon="download" @click="handleExportXls('非计划停机')">导出</a-button>
			<a-button type="primary" icon="download" @click="handleExportXls('非计划停机管理')">导出</a-button>
			<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
			<a-button type="primary" icon="import">导入</a-button>
			</a-upload>
			@@ -196,8 +196,8 @@
			delete: '/mdc/mdcNoplanClose/delete',
			deleteBatch: '/mdc/mdcNoplanClose/deleteBatch',
			getEquipmentByPid: '/mdc/mdcequipment/getEquipmentByPid',
			exportXlsUrl: "/mdc/MdcTorqueConfig/exportXls",
			importExcelUrl: "/mdc/MdcTorqueConfig/importExcel",
			exportXlsUrl: "/mdc/mdcNoplanClose/exportXls",
			importExcelUrl: "/mdc/mdcNoplanClose/importExcel",
			}
			}
			},

			@@ -26,7 +26,8 @@
			<a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
			</a-col>
			<a-col :lg="2" :md="3" :sm="3" :xs="3">
			<a-button type="primary" @click="exportExcel" icon="download">导出</a-button>
			<!--<a-button type="primary" @click="exportExcel" icon="download">导出</a-button>-->
			<a-button type="primary" @click="handleExportXls('维修休班管理')" icon="download">导出</a-button>
			</a-col>
			</a-row>
			</a-form>
			@@ -163,6 +164,7 @@
			list: '/mdc/mdcEquipmentRepair/pageList',
			deleteBatch: '/mdc/mdcEquipmentRepair/delete',
			getEquipmentByPid: '/mdc/mdcequipment/getEquipmentByPid',
			exportXlsUrl:'/mdc/mdcEquipmentRepair/exportXls'
			}
			}
			},
			@@ -541,7 +543,7 @@
			$("#DeviceList").table2excel({
			exclude: ".noExl",
			name: "Excel Document Name",
			filename: "设备维修详情",
			filename: "维修休班管理",
			exclude_img: true,
			fileext: ".xls",
			exclude_links: true,

			@@ -142,7 +142,7 @@
			dataList: [],
			url: {
			list: '/mdc/efficiencyReport/efficiencyList',
			listByType: '/mdc/MdcUtilizationRate/getByType'
			listByType: '/mdc/MdcUtilizationRate/getByType',
			},
			tableHeads: [],

			@@ -319,7 +319,7 @@
			$("#Efficiency").table2excel({
			exclude: ".noExl",
			name: "Excel Document Name",
			filename: "利用率",
			filename: "设备利用率",
			exclude_img: true,
			fileext: ".xls",
			exclude_links: true,