From 109e5dc919a0c11614213e9efe7747b346447cfe Mon Sep 17 00:00:00 2001 From: T-95707 Date: Thu, 24 Sep 2020 13:28:23 +0800 Subject: [PATCH] 20200924 zjt --- .../controller/EngineParamController.java | 8 +- .../modules/param/util/ExcelUtil.java | 9 +- .../statics/js/modules/param/engineParam.js | 139 ++++++++++-------- .../templates/modules/param/engineParam.html | 57 ++++--- 4 files changed, 128 insertions(+), 85 deletions(-) diff --git a/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/controller/EngineParamController.java b/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/controller/EngineParamController.java index c810947..3a89651 100644 --- a/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/controller/EngineParamController.java +++ b/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/controller/EngineParamController.java @@ -259,7 +259,7 @@ public class EngineParamController { continue; } Object value = getValue ( cell ); - str[cellNum]=value.toString(); + str[cellNum]="'"+value+"'"; } StringBuffer d = new StringBuffer("(null,"); // 创建时间 @@ -316,15 +316,15 @@ public class EngineParamController { private Map checkTitle(String[] arr,XSSFRow row){ Map result = new HashMap(); - if(arr.length != row.getLastCellNum()){ + if(row == null || arr.length != row.getLastCellNum()){ result.put("code","500"); - result.put("msg","表头数量不正确，请重新下载模板"); + result.put("msg","表头数量不正确，请重新选择文件或下载模板"); return result; } for(int i=0;i fieldsMappingFirstRow = (List) param.get("fieldsName"); SXSSFRow firstRow = sheet.createRow(0); @@ -44,6 +46,7 @@ public class ExcelUtil { SXSSFCell cell = firstRow.createCell(i); cell.setCellStyle(FirstRowCellStyle); cell.setCellValue(fieldsMappingFirstRow.get(i)); + sheet.setDefaultColumnStyle(i,css); } diff --git a/neuray-admin/src/main/resources/statics/js/modules/param/engineParam.js b/neuray-admin/src/main/resources/statics/js/modules/param/engineParam.js index 7a2280c..992919f 100644 --- a/neuray-admin/src/main/resources/statics/js/modules/param/engineParam.js +++ b/neuray-admin/src/main/resources/statics/js/modules/param/engineParam.js @@ -1,65 +1,32 @@ $(function () { - - // zTree 的参数配置，深入使用请参考 API 文档（setting 配置详解） - /*var setting = { - callback: { - onClick: chooseNode - } - };*/ - -// zTree 的数据属性，深入使用请参考 API 文档（zTreeNode 节点数据详解） - /*$.get(baseURL + "engine/manage/listnopage/", function(r){ - var children = r.page - var zNodes = [ - { - name: "发动机", - open: true, - children: children + var ajaxupload =new AjaxUpload($('#test8'),{ + action: baseURL + "engine/param/importExcel", + type:'POST', + data:{}, + autoSubmit:false, + responseType:'json', + name:'file', + onChange: function(file, ext){ + if(ext && !(/^(xlsx)$/.test(ext) )){ + alert("只支持xlsx格式的文件"); + }else{ + $("#fileName").val(file); } - ]; - $.fn.zTree.init($("#tree"), setting, zNodes); - new MtrSearchZTree(); - });*/ - /* function chooseNode (e,tId,tNode){ - alert - initGrid() - } - function initGrid (paramGrid){ - $.get(baseURL + "engine/param/list", function(r){ - $("#jqGrid").jqGrid({ - //url: baseURL + 'engine/param/list', - datatype: "local", - colModel: r.ret.column, - viewrecords: true, - height: 385, - //rowNum: 10, - //rowList : [10,30,50], - rownumbers: true, - rownumWidth: 25, - autowidth:true, - multiselect: true, - //pager: "#jqGridPager", - /!*jsonReader : { - root: "page.list", - page: "page.currPage", - total: "page.totalPage", - records: "page.totalCount" - },*!/ - /!*prmNames : { - page:"page", - rows:"limit", - order: "order" - },*!/ - gridComplete:function(){ - //隐藏grid底部滚动条 - $("#jqGrid").closest(".ui-jqgrid-bdiv").css({ "overflow-x" : "hidden" }); - } - }); - for ( var i = 0; i <= r.ret.ret.length; i++){ - jQuery("#jqGrid").jqGrid('addRowData', i + 1, r.ret.ret[i]); + }, + onComplete: function(file, resp){ + if(resp.code === 0){ + layer.msg("导入成功", {icon: 1}); + $("#fileName").val(''); + }else if(resp.code === 500){ + $("#fileName").val(''); + layer.msg(resp.msg, {icon: 2}); } - }); - }*/ + } + }); + $("#test9").click(function(){ + ajaxupload.setData({id:vm.engineObj.id}); + ajaxupload.submit(); + }); }); @@ -76,7 +43,8 @@ var vm = new Vue({ id : '', engineObj:{}, showTree: true, - style: {width: '20%',float: 'left'} + style: {width: '20%',float: 'left'}, + showImport: false, }, created () { @@ -275,6 +243,55 @@ var vm = new Vue({ page:page }).trigger("reloadGrid"); - } + }, + importReload: function (event) { + /*vm.showList = true; + vm.style = {width: '20%',float: 'left'} + var page = $("#jqGrid").jqGrid('getGridParam','page'); + $("#jqGrid").jqGrid("clearGridData") + vm.initGrid()*/ + vm.style = {width: '20%',float: 'left'} + vm.showList = true; + vm.showImport = false; + var page = $("#jqGrid").jqGrid('getGridParam','page'); + $("#jqGrid").jqGrid('setGridParam',{ + page:page + }).trigger("reloadGrid"); + + }, + import: function (event) { + vm.showList = true; + var page = $("#jqGrid").jqGrid('getGridParam','page'); + $("#jqGrid").jqGrid('setGridParam',{ + page:page + }).trigger("reloadGrid"); + }, + download: function (event) { + if(vm.engineObj.id === undefined){ + alert("请选择一台发动机"); + return ; + } + var url = "engine/param/download/"+vm.engineObj.id; + window.location.href = baseURL + url; + }, + exportExcel: function (event) { + if(vm.engineObj.id === undefined){ + alert("请选择一台发动机"); + return ; + } + var url = "engine/param/export/"+vm.engineObj.id; + window.location.href = baseURL + url; + }, + openImport:function (event) { + if(vm.engineObj.id === undefined){ + alert("请选择一台发动机"); + return ; + } + vm.style = {width: '20%',float: 'left',display:'none'} + vm.showList = false; + vm.showImport = true; + vm.title = "导入"; + vm.paramList = {}; + }, } }); \ No newline at end of file diff --git a/neuray-admin/src/main/resources/templates/modules/param/engineParam.html b/neuray-admin/src/main/resources/templates/modules/param/engineParam.html index 113e65e..86d1cb4 100644 --- a/neuray-admin/src/main/resources/templates/modules/param/engineParam.html +++ b/neuray-admin/src/main/resources/templates/modules/param/engineParam.html @@ -13,7 +13,7 @@
    -
    +
    <#if shiro.hasPermission("engine:manage:save")>  新增 @@ -24,35 +24,58 @@ <#if shiro.hasPermission("engine:manage:delete")>  删除 + <#if shiro.hasPermission("engine:param:export")> +  导出 + + <#if shiro.hasPermission("engine:param:openImport")> +  导入 +
    -
    -
    {{title}}
    -
    +
    +
    {{title}}
    + -
    -
    {{item.paramName}}
    -
    - +
    +
    {{item.paramName}}
    +
    + +
    -
    -
    -
    - -    -
    - -
    +
    +
    + +    +
    + +
    + +
    +
    +
    +  下载模板

    +  选择文件 + +  开始上传 +
    +
    +
    +    +
    +
    +
    +
    + \ No newline at end of file -- Gitee