From 4fba1be16ab3c6c005b499f3820a3aa2a1e7ec1e Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期五, 01 三月 2024 10:09:04 +0800 Subject: [PATCH] 1、车间看板页面缩放和拖拽时增加辅助线 2、驱动参数管理页面调整英文名称字段验证输入字数长度由2-18位调整为为仅验证非空 3、设备日志页面采样周期字段默认值由1000调整为100 4、设备日志页面设备日志列表中若时段状态为关机则不弹出工作曲线 5、设备综合效率分析页面增加表格数据加载动画 6、jQuery.table2excel组件导出表格数据功能增加日期格式的转换 7、设备日志页面工作曲线Y轴增加颜色区分,与对应数据颜色保持一致 8、设备管理页面表单填写界面设备功率增加计量单位kw --- src/views/eam/PrecisionParametersTemplateList.vue | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/src/views/eam/PrecisionParametersTemplateList.vue b/src/views/eam/PrecisionParametersTemplateList.vue index 759709a..369d6f7 100644 --- a/src/views/eam/PrecisionParametersTemplateList.vue +++ b/src/views/eam/PrecisionParametersTemplateList.vue @@ -32,6 +32,9 @@ <div class="table-operator"> <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button> <a-button @click="handleCopy" type="primary" icon="copy" :disabled="selectedRowKeys.length!=1">澶嶅埗</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> </div> <!-- table鍖哄煙-begin --> @@ -177,6 +180,7 @@ list: "/eam/precisionParametersTemplate/list", delete: "/eam/precisionParametersTemplate/delete", deleteBatch: "/eam/precisionParametersTemplate/deleteBatch", + importExcelUrl: "/eam/precisionParametersTemplate/importExcel", }, dictOptions:{ }, @@ -274,7 +278,12 @@ record.num = ''; this.handleEdit(record); } - } + }, + computed: { + importExcelUrl: function(){ + return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; + } + }, } </script> <style scoped> -- Gitblit v1.9.3