储备管理进度模块导出修改，页面调整

src/main/java/com/jeeplus/modules/sg/managementcenter/project/mapper/ProjectMapper.java

@@ -10,7 +10,6 @@ import com.jeeplus.modules.sg.managementcenter.activiti.entity.Quantity;
 import com.jeeplus.modules.sg.managementcenter.materialinfo.entity.MaterialInfo;
 import com.jeeplus.modules.sg.managementcenter.project.entity.*;
 import org.apache.ibatis.annotations.Param;
-import sun.tools.tree.PreIncExpression;
 
 import java.util.List;
 

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/utils/ReserveExportUtil.java

@@ -0,0 +1,247 @@
+package com.jeeplus.modules.sg.managementcenter.reserveManagement.utils;
+
+import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveManagement;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.xssf.usermodel.XSSFCellStyle;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URLEncoder;
+import java.util.List;
+
+public class ReserveExportUtil {
+
+    private  XSSFCellStyle style = null;
+
+    public static ReserveExportUtil getOne(){
+
+        return new ReserveExportUtil();
+    }
+
+    /**
+     * 传入excel模板名称 获取workbook对象
+     * @param fileName excel模板名称
+     * @return
+     */
+    public  XSSFWorkbook getWorkbook(String fileName){
+        InputStream inputStream = null;
+        XSSFWorkbook workbook = null;
+        try {
+            File file = new File(this.getClass().getResource("/").getPath() + "/freemarker/excelmodel/"+fileName+".xlsx");
+            inputStream = new FileInputStream(file);// 将excel文件转为输入流
+            workbook = new XSSFWorkbook(inputStream);// 创建个workbook，
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return workbook;
+    }
+
+    /**
+     * 导出前期基本信息
+     * @param response
+     * @param workbook
+     * @param list
+     */
+    public void exportBasic(HttpServletResponse response, XSSFWorkbook workbook, List<ReserveManagement> list){
+        try {
+            int index = 1;//第一列序号
+            int rowNum = 6;//数据起始列
+            Sheet sheet = workbook.getSheetAt(0);
+            for(int i=0;i<list.size();i++){
+                Row row = sheet.createRow(rowNum+i);
+                Cell cell0 = crateCell(workbook,row,0); //序号
+                Cell cell1 = crateCell(workbook,row,1); //项目性质
+                Cell cell2 = crateCell(workbook,row,2); //需求单位
+                Cell cell3 = crateCell(workbook,row,3); //区域
+                Cell cell4 = crateCell(workbook,row,4); //项目分组
+                Cell cell5 = crateCell(workbook,row,5); //储备批次
+                Cell cell6 = crateCell(workbook,row,6); //供电区域
+                Cell cell7 = crateCell(workbook,row,7); //网格编号
+                Cell cell8 = crateCell(workbook,row,8); //单元格编号
+                Cell cell9 = crateCell(workbook,row,9); //项目储备编号
+                Cell cell10 = crateCell(workbook,row,10); //电网项目编号
+                Cell cell11 = crateCell(workbook,row,11); //项目名称
+                Cell cell12 = crateCell(workbook,row,12); //建设必要性及内容
+                Cell cell13 = crateCell(workbook,row,13); //变电站名称
+                Cell cell14 = crateCell(workbook,row,14); //线路名称
+                Cell cell15 = crateCell(workbook,row,15); //网架项目划分
+                Cell cell16 = crateCell(workbook,row,16); //项目类型
+                Cell cell17 = crateCell(workbook,row,17); //费用估算
+                Cell cell18 = crateCell(workbook,row,18); //是否迎峰度夏项目
+                Cell cell19 = crateCell(workbook,row,19); //项目紧急程度
+                Cell cell20 = crateCell(workbook,row,20); //拟实施下达年份
+                Cell cell21 = crateCell(workbook,row,21); //拟实施批次
+                Cell cell22 = crateCell(workbook,row,22); //备注
+                Cell cell23 = crateCell(workbook,row,23); //设计状态
+                Cell cell24 = crateCell(workbook,row,24); //是否通过省公司评审
+                Cell cell25 = crateCell(workbook,row,25); //是否需提交路径图
+                Cell cell26 = crateCell(workbook,row,26); //是否完成物资清册编制
+                Cell cell27 = crateCell(workbook,row,27); //是否完成图纸移交
+                Cell cell28 = crateCell(workbook,row,28); //交底牵头部门
+                Cell cell29 = crateCell(workbook,row,29); //交底参与部门
+                Cell cell30 = crateCell(workbook,row,30); //是否完成交底
+                Cell cell31 = crateCell(workbook,row,31); //项目管理中心人员
+                Cell cell32 = crateCell(workbook,row,32); //设计院人员
+                Cell cell33 = crateCell(workbook,row,33); //经研所人员
+                Cell cell34 = crateCell(workbook,row,34); //区域中心人员
+                Cell cell35 = crateCell(workbook,row,35); //不停电作业中心人员
+                Cell cell36 = crateCell(workbook,row,36); //作业方式
+                Cell cell37 = crateCell(workbook,row,37); //交底完成日期
+                Cell cell38 = crateCell(workbook,row,38); //备注
+                Cell cell39 = crateCell(workbook,row,39); //立项说明
+                Cell cell40 = crateCell(workbook,row,40); //不具备立项条件说明
+                Cell cell41 = crateCell(workbook,row,41); //方案变更说明
+                Cell cell42 = crateCell(workbook,row,42); //政处难度初判
+                Cell cell43 = crateCell(workbook,row,43); //是否有资本设备
+                Cell cell44 = crateCell(workbook,row,44); //是否有变电站新出线
+                Cell cell45 = crateCell(workbook,row,45); //是否已实施
+                Cell cell46 = crateCell(workbook,row,46); //现场情况描述
+                Cell cell47 = crateCell(workbook,row,47); //是否有实施必要性
+                Cell cell48 = crateCell(workbook,row,48); //实施无必要描述
+                Cell cell49 = crateCell(workbook,row,49); //是否存在前置条件
+                Cell cell50 = crateCell(workbook,row,50); //前置条件描述
+                Cell cell51= crateCell(workbook,row,51); //是否存在施工方案问题
+                Cell cell52 = crateCell(workbook,row,52); //施工方案问题描述
+                Cell cell53 = crateCell(workbook,row,53); //现场是否存在安全隐患
+                Cell cell54 = crateCell(workbook,row,54); //安全隐患描述
+                Cell cell55 = crateCell(workbook,row,55); //是否需要定制物资
+                Cell cell56 = crateCell(workbook,row,56); //定制物资描述
+                Cell cell57 = crateCell(workbook,row,57); //是否有拆旧物资
+                Cell cell58 = crateCell(workbook,row,58); //作业方式
+                Cell cell59 = crateCell(workbook,row,59); //停电问题描述
+                Cell cell60 = crateCell(workbook,row,60); //是否有土建工作量
+                Cell cell61 = crateCell(workbook,row,61); //是否有立杆工作量
+                Cell cell62 = crateCell(workbook,row,62); //总工作量描述
+                Cell cell63 = crateCell(workbook,row,63); //区域中心
+                Cell cell64 = crateCell(workbook,row,64); //供电所辖区
+                Cell cell65 = crateCell(workbook,row,65); //政处地点
+                Cell cell66 = crateCell(workbook,row,66); //政处类型
+                Cell cell67 = crateCell(workbook,row,67); //政处对象
+                Cell cell68 = crateCell(workbook,row,68); //政处描述
+                Cell cell69 = crateCell(workbook,row,69); //是否需规划报批
+                Cell cell70 = crateCell(workbook,row,70); //是否需办理安评航评手续
+                Cell cell71 = crateCell(workbook,row,71); //政处难点提醒
+
+                ReserveManagement reserveManagement = list.get(i);
+
+                cell0.setCellValue(String.valueOf(index++));
+                cell1.setCellValue(reserveManagement.getProjectNature());
+                cell2.setCellValue(reserveManagement.getDemandUnit());
+                cell3.setCellValue(reserveManagement.getDistrict());
+                cell4.setCellValue(reserveManagement.getProjectGroup());
+                cell5.setCellValue(reserveManagement.getReserveBatches());
+                cell6.setCellValue(reserveManagement.getBlockSupply());
+                cell7.setCellValue(reserveManagement.getGridNumber());
+                cell8.setCellValue(reserveManagement.getCellNumber());
+                cell9.setCellValue(reserveManagement.getProjectReserveId());
+                cell10.setCellValue(reserveManagement.getPowerGridProjectId());
+                cell11.setCellValue(reserveManagement.getProjectName());
+                cell12.setCellValue(reserveManagement.getConstructionNecessityAndContent());
+                cell13.setCellValue(reserveManagement.getSubstationName());
+                cell14.setCellValue(reserveManagement.getCircuitName());
+                cell15.setCellValue(reserveManagement.getNetRackProjectDivide());
+                cell16.setCellValue(reserveManagement.getProjectType());
+
+                String costEstimateStr= reserveManagement.getCostEstimate().toString();
+                if(StringUtils.isNotBlank(costEstimateStr)){
+                    cell17.setCellValue(Double.parseDouble(costEstimateStr));
+                }else{
+                    cell37.setCellValue("");
+                }
+                cell18.setCellValue(reserveManagement.getWhetherWindwardProject());
+                cell19.setCellValue(reserveManagement.getProjectUrgencyDegree());
+                cell20.setCellValue(reserveManagement.getImplementIssuedYear());
+                cell21.setCellValue(reserveManagement.getImplementBatch());
+                cell22.setCellValue(reserveManagement.getBasicRemarks());
+                cell23.setCellValue(reserveManagement.getDesignCondition());
+                cell24.setCellValue(reserveManagement.getWhetherPassReview());
+                cell25.setCellValue(reserveManagement.getWhetherNeedWiringDiagram());
+                cell26.setCellValue(reserveManagement.getWhetherFinishMaterials());
+                cell27.setCellValue(reserveManagement.getWhetherFinishDrawing());
+                cell28.setCellValue(reserveManagement.getDisclosureToCoordinate());
+                cell29.setCellValue(reserveManagement.getDisclosureParticipate());
+                cell30.setCellValue(reserveManagement.getWhetherFinishDisclosure());
+                cell31.setCellValue(reserveManagement.getProjectManagementPeople());
+                cell32.setCellValue(reserveManagement.getDesigningInstitutePeople());
+                cell33.setCellValue(reserveManagement.getIfoPeople());
+                cell34.setCellValue(reserveManagement.getRegionalCenterPeople());
+                cell35.setCellValue(reserveManagement.getUninterruptedOperationPeople());
+                cell36.setCellValue(reserveManagement.getWorkMode());
+
+                String dateStr = reserveManagement.getDisclosureFinishDateStr();
+                if(StringUtils.isNotBlank(dateStr)){
+                    cell37.setCellValue(dateStr);
+                }else{
+                    cell37.setCellValue("");
+                }
+
+                cell38.setCellValue(reserveManagement.getDisclosureRemarks());
+                cell39.setCellValue(reserveManagement.getProjectDescription());
+                cell40.setCellValue(reserveManagement.getDoNotPossessProjectDescription());
+                cell41.setCellValue(reserveManagement.getChangedProgramsExplain());
+                cell42.setCellValue(reserveManagement.getInitialDifficulty());
+                cell43.setCellValue(reserveManagement.getCapitalEquipment());
+                cell44.setCellValue(reserveManagement.getSubstationNewLine());
+                cell45.setCellValue(reserveManagement.getWhetherImplement());
+                cell46.setCellValue(reserveManagement.getFieldDescription());
+                cell47.setCellValue(reserveManagement.getNecessaryOfImplementation());
+                cell48.setCellValue(reserveManagement.getUnnecessaryDescription());
+                cell49.setCellValue(reserveManagement.getPrecondition());
+                cell50.setCellValue(reserveManagement.getConditionsDescribed());
+                cell51.setCellValue(reserveManagement.getConstructionSchemeProblem());
+                cell52.setCellValue(reserveManagement.getProblemDescriptionOfConstructionScheme());
+                cell53.setCellValue(reserveManagement.getExistingSecurityThreat());
+                cell54.setCellValue(reserveManagement.getSafetyHazardDescription());
+                cell55.setCellValue(reserveManagement.getCustomizedMaterials());
+                cell56.setCellValue(reserveManagement.getMaterialDescription());
+                cell57.setCellValue(reserveManagement.getDismantlingTheOldMaterial());
+                cell58.setCellValue(reserveManagement.getOperatingType());
+                cell59.setCellValue(reserveManagement.getProblemDescription());
+                cell60.setCellValue(reserveManagement.getCivilWork());
+                cell61.setCellValue(reserveManagement.getVerticalRodWorkload());
+                cell62.setCellValue(reserveManagement.getTotalWorkloadDescription());
+                cell63.setCellValue(reserveManagement.getRegionalCenter());
+                cell64.setCellValue(reserveManagement.getPowerSupplyArea());
+                cell65.setCellValue(reserveManagement.getZhengLocation());
+                cell66.setCellValue(reserveManagement.getZhengType());
+                cell67.setCellValue(reserveManagement.getZhengObject());
+                cell68.setCellValue(reserveManagement.getZhengDescribe());
+                cell69.setCellValue(reserveManagement.getProjectApproval());
+                cell70.setCellValue(reserveManagement.getCourseEvaluationProcedures());
+                cell71.setCellValue(reserveManagement.getZhengDifficultyWarn());
+            }
+
+            String str = URLEncoder.encode("镇江本部配网项目储备清单.xlsx", "UTF8");
+            response.setHeader("Content-Disposition", "attachment;filename="+str);
+            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+            OutputStream outputStream = response.getOutputStream();
+            workbook.write(outputStream);
+            outputStream.flush();
+            outputStream.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 创建Cell对象 同时设置style
+     * @param workbook
+     * @param row
+     * @param num
+     * @return
+     */
+    Cell crateCell(XSSFWorkbook workbook,Row row, int num){
+        Cell cell = row.createCell(num);
+        if(style == null){
+            style =workbook.createCellStyle();
+            style.setWrapText(true);
+            style.setVerticalAlignment(XSSFCellStyle.VERTICAL_CENTER);
+        }
+        cell.setCellStyle(style);
+        return cell;
+    }
+}

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/web/ReserveManagementController.java

@@ -4,16 +4,14 @@ import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.core.persistence.Page;
 import com.jeeplus.core.web.BaseController;
-import com.jeeplus.modules.sg.audit.information.utils.FreemarkerUtil;
-import com.jeeplus.modules.sg.audit.information.utils.ResponseUtil;
 import com.jeeplus.modules.sg.managementcenter.materialproject.util.ImportUtil;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.entity.ReserveManagement;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.service.ReserveManagementService;
+import com.jeeplus.modules.sg.managementcenter.reserveManagement.utils.ReserveExportUtil;
 import com.jeeplus.modules.sg.managementcenter.reserveManagement.utils.ReserveManagementProUtil;
 import com.jeeplus.modules.sys.entity.User;
 import com.jeeplus.modules.sys.utils.UserUtils;
-import freemarker.template.Configuration;
-import freemarker.template.Template;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,9 +25,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -242,21 +237,6 @@ public class ReserveManagementController extends BaseController {
     @RequiresPermissions("sg:managementcenter:reserveManagement:export")
     @RequestMapping(value = "export")
     public void exportExcel(ReserveManagement reserveManagement, HttpServletRequest request, HttpServletResponse response) {
-        Template template = null;
-        response.setContentType("text/text;charset=utf-8");
-        response.setCharacterEncoding("UTF-8");
-        File path = new File(this.getClass().getResource("/").getPath() + "/freemarker");
-        Configuration cfg = new Configuration();
-        try {
-            cfg.setDefaultEncoding("UTF-8");
-            //配置cfg对象
-            cfg.setDirectoryForTemplateLoading(path);
-//            根据模板名称获取Template对象
-            template = cfg.getTemplate("reserveManagement.ftl");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        Map<String, Object> data = new HashMap<>();
         List<ReserveManagement> list = service.exportFindList(reserveManagement);
         //生成序列号
         int i = 1;
@@ -264,9 +244,9 @@ public class ReserveManagementController extends BaseController {
             s.setId(String.valueOf(i));
             i++;
         }
-        data.put("list", list);
-        File docFile = new File(path + "\\镇江本部配网项目储备清单.xls");
-        FreemarkerUtil.generateFile(data, template, docFile);
-        ResponseUtil.docResponse("镇江本部配网项目储备清单.xls", docFile, response);
+
+        ReserveExportUtil util = ReserveExportUtil.getOne();
+        XSSFWorkbook workbook = util.getWorkbook("reserveManagement");
+        util.exportBasic(response,workbook,list);
     }
 }

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/reserveManagementInformation.js

@@ -79,7 +79,7 @@ $(document).ready(function () {
         },
         columns:
 
-            [[
+            [/*[
                 {
                     title: "2021年镇江本部配网项目储备表",
                     width:8000,
@@ -103,45 +103,45 @@ $(document).ready(function () {
                     width:3300,
                     colspan:33,
                 }
-            ],[
+            ],*/[
                 {
                     checkbox: true,
-                    width:50,
+                    width:36,
                     rowspan:2,
                 }
                 , {
                     field: 'projectNature',
-                    width:100,
-                    title: '项目性质',
+                    width:65,
+                    title: '项目</br>性质',
                     rowspan:2,
                 },{
                     field: 'demandUnit',
-                    width:100,
-                    title: '需求单位',
+                    width:70,
+                    title: '需求</br>单位',
                     rowspan:2,
                 },{
                     field: 'district',
-                    width:100,
+                    width:60,
                     title: '区域',
                     rowspan:2,
                 },{
                     field: 'projectGroup',
-                    width:100,
-                    title: '项目分组',
+                    width:70,
+                    title: '项目</br>分组',
                     rowspan:2,
                 },{
                     field: 'reserveBatches',
-                    width:100,
-                    title: '储备批次',
+                    width:70,
+                    title: '储备</br>批次',
                     rowspan:2,
                 },{
                     field: 'blockSupply',
-                    width:100,
-                    title: '供电区域',
+                    width:60,
+                    title: '供电</br>区域',
                     rowspan:2,
                 },{
                     field: 'gridNumber',
-                    width:100,
+                    width:90,
                     title: '网格编号',
                     rowspan:2,
                 },{
@@ -171,7 +171,7 @@ $(document).ready(function () {
                 },{
                     field: 'powerGridProjectId',
                     width:100,
-                    title: '电网项目编号',
+                    title: '电网项目</br>编号',
                     rowspan:2,
                 },{
                     field: 'projectName',
@@ -180,13 +180,13 @@ $(document).ready(function () {
                     rowspan:2,
                 },{
                     field: 'constructionNecessityAndContent',
-                    width:200,
-                    title: '建设必要性及</br>内容',
+                    width:400,
+                    title: '建设必要性及内容',
                     rowspan:2,
                 },{
                     field: 'substationName',
-                    width:100,
-                    title: '变电站名称',
+                    width:80,
+                    title: '变电站</br>名称',
                     rowspan:2,
                 },{
                     field: 'circuitName',
@@ -195,8 +195,8 @@ $(document).ready(function () {
                     rowspan:2,
                 },{
                     field: 'netRackProjectDivide',
-                    width:100,
-                    title: '网架项目划分',
+                    width:80,
+                    title: '网架项目</br>划分',
                     rowspan:2,
                 },{
                     field: 'projectType',
@@ -205,18 +205,18 @@ $(document).ready(function () {
                     rowspan:2,
                 },{
                     field: 'costEstimate',
-                    width:100,
-                    title: '费用估算',
+                    width:80,
+                    title: '费用</br>估算',
                     rowspan:2,
                 },{
                     field: 'whetherWindwardProject',
-                    width:100,
-                    title: '是否迎峰度夏</br>项目',
+                    width:80,
+                    title: '是否</br>迎峰度夏</br>项目',
                     rowspan:2,
                 },{
                     field: 'projectUrgencyDegree',
-                    width:100,
-                    title: '项目紧急程度',
+                    width:80,
+                    title: '项目</br>紧急程度',
                     rowspan:2,
                 },{
                     field: 'implementIssuedYear',
@@ -230,77 +230,77 @@ $(document).ready(function () {
                     rowspan:2,
                 },{
                     field: 'basicRemarks',
-                    width:100,
+                    width:200,
                     title: '备注',
                     rowspan:2,
                 },
 /*设计及评审情况*/
                 {
                     field: 'designCondition',
-                    width:100,
-                    title: '设计状态',
+                    width:80,
+                    title: '设计</br>状态',
                     rowspan:2,
                 },{
                     field: 'whetherPassReview',
-                    width:100,
-                    title: '是否通过</br>省公司评审',
+                    width:80,
+                    title: '是否</br>通过</br>省公司</br>评审',
                     rowspan:2,
                 },{
                     field: 'whetherNeedWiringDiagram',
-                    width:100,
-                    title: '是否需提交</br>路径图',
+                    width:60,
+                    title: '是否</br>需提交</br>路径图',
                     rowspan:2,
                 },{
                     field: 'whetherFinishMaterials',
-                    width:100,
-                    title: '是否完成物资</br>清册编制',
+                    width:80,
+                    title: '是否</br>完成物资</br>清册编制',
                     rowspan:2,
                 },{
                     field: 'whetherFinishDrawing',
-                    width:100,
-                    title: '是否完成</br>图纸移交',
+                    width:60,
+                    title: '是否</br>完成</br>图纸</br>移交',
                     rowspan:2,
                 },
 /*方案交底组织*/
                 {
                     field: 'disclosureToCoordinate',
                     width:100,
-                    title: '交底牵头部门',
+                    title: '交底牵头</br>部门',
                     rowspan:2,
                 },{
                     field: 'disclosureParticipate',
                     width:100,
-                    title: '交底参与部门',
+                    title: '交底参与</br>部门',
                     rowspan:2,
                 },{
                     field: 'whetherFinishDisclosure',
-                    width:100,
-                    title: '是否完成交底',
+                    width:60,
+                    title: '是否</br>完成</br>交底',
                     rowspan:2,
                 },{
                     field: 'projectManagementPeople',
-                    width:100,
-                    title: '项目管理中心</br>人员',
+                    width:80,
+                    title: '项目</br>管理中心</br>人员',
                     rowspan:2,
                 },{
                     field: 'designingInstitutePeople',
-                    width:100,
-                    title: '设计院人员',
+                    width:70,
+                    title: '设计院</br>人员',
                     rowspan:2,
                 },{
                     field: 'ifoPeople',
-                    width:100,
-                    title: '经研所人员',
+                    width:70,
+                    title: '经研所</br>人员',
                     rowspan:2,
                 },{
                     field: 'regionalCenterPeople',
-                    width:100,
-                    title: '区域中心人员',
+                    width:70,
+                    title: '区域</br>中心</br>人员',
                     rowspan:2,
                 },{
                     field: 'uninterruptedOperationPeople',
-                    width:100,
-                    title: '不停电作业</br>中心人员',
+                    width:80,
+                    title: '不停电</br>作业</br>中心人员',
                     rowspan:2,
                 },{
                     field: 'workMode',
@@ -310,16 +310,15 @@ $(document).ready(function () {
                 },{
                     field: 'disclosureFinishDate',
                     width:100,
-                    title: '交底完成日期',
+                    title: '交底完成</br>日期',
                     rowspan:2,
-                    sortable: true,
                     //——修改——获取日期列的值进行转换
                     formatter: function (value, row, index) {
                         return changeDateFormat(value)
                     },
                 },{
                     field: 'disclosureRemarks',
-                    width:100,
+                    width:200,
                     title: '备注',
                     rowspan:2,
                 },
@@ -383,37 +382,37 @@ $(document).ready(function () {
                 {
                     field: 'changedProgramsExplain',
                     width:100,
-                    title: '方案变更说明',
+                    title: '方案变更</br>说明',
                 },
                 {
                     field: 'initialDifficulty',
                     width:100,
-                    title: '政处难度初判',
+                    title: '政处</br>难度初判',
                 },
                 {
                     field: 'capitalEquipment',
-                    width:100,
-                    title: '是否有</br>资本设备',
+                    width:770,
+                    title: '是否有</br>资本</br>设备',
                 },
                 {
                     field: 'substationNewLine',
-                    width:100,
-                    title: '是否有</br>变电站新出线',
+                    width:70,
+                    title: '是否有</br>变电站</br>新出线',
                 },
                 {
                     field: 'whetherImplement',
-                    width:100,
-                    title: '是否已实施',
+                    width:70,
+                    title: '是否</br>已实施',
                 },
                 {
                     field: 'fieldDescription',
                     width:100,
-                    title: '现场情况描述',
+                    title: '现场情况</br>描述',
                 },
                 {
                     field: 'necessaryOfImplementation',
-                    width:100,
-                    title: '是否有</br>实施必要性',
+                    width:70,
+                    title: '是否有</br>实施</br>必要性',
                 },
                 {
                     field: 'unnecessaryDescription',
@@ -422,18 +421,18 @@ $(document).ready(function () {
                 },
                 {
                     field: 'precondition',
-                    width:100,
-                    title: '是否存在</br>前置条件',
+                    width:80,
+                    title: '是否</br>存在</br>前置条件',
                 },
                 {
                     field: 'conditionsDescribed',
                     width:100,
-                    title: '前置条件描述',
+                    title: '前置条件</br>描述',
                 },
                 {
                     field: 'constructionSchemeProblem',
-                    width:100,
-                    title: '是否存在</br>施工方案问题',
+                    width:80,
+                    title: '是否</br>存在</br>施工方案</br>问题',
                 },
                 {
                     field: 'problemDescriptionOfConstructionScheme',
@@ -443,26 +442,26 @@ $(document).ready(function () {
                 {
                     field: 'existingSecurityThreat',
                     width:100,
-                    title: '现场是否存在</br>安全隐患',
+                    title: '现场</br>是否存在</br>安全隐患',
                 },
                 {
                     field: 'safetyHazardDescription',
                     width:100,
-                    title: '安全隐患描述',
+                    title: '安全隐患</br>描述',
                 },
                 {
                     field: 'customizedMaterials',
-                    width:100,
-                    title: '是否需要</br>定制物资',
+                    width:80,
+                    title: '是否</br>需要</br>定制物资',
                 },
                 {
                     field: 'materialDescription',
                     width:100,
-                    title: '定制物资描述',
+                    title: '定制物资</br>描述',
                 },
                 {
                     field: 'dismantlingTheOldMaterial',
-                    width:100,
+                    width:80,
                     title: '是否有</br>拆旧物资',
                 },
                 {
@@ -473,47 +472,47 @@ $(document).ready(function () {
                 {
                     field: 'problemDescription',
                     width:100,
-                    title: '停电问题描述',
+                    title: '停电问题</br>描述',
                 },
                 {
                     field: 'civilWork',
-                    width:100,
-                    title: '是否有</br>土建工作量',
+                    width:70,
+                    title: '是否有</br>土建</br>工作量',
                 },
                 {
                     field: 'verticalRodWorkload',
-                    width:100,
-                    title: '是否有</br>立杆工作量',
+                    width:70,
+                    title: '是否有</br>立杆</br>工作量',
                 },
                 {
                     field: 'totalWorkloadDescription',
                     width:100,
-                    title: '总工作量描述',
+                    title: '总工作量</br>描述',
                 },
                 {
                     field: 'regionalCenter',
-                    width:100,
-                    title: '区域中心',
+                    width:80,
+                    title: '区域</br>中心',
                 },
                 {
                     field: 'powerSupplyArea',
-                    width:100,
-                    title: '供电所辖区',
+                    width:80,
+                    title: '供电所</br>辖区',
                 },
                 {
                     field: 'zhengLocation',
-                    width:100,
-                    title: '政处地点',
+                    width:80,
+                    title: '政处</br>地点',
                 },
                 {
                     field: 'zhengType',
-                    width:100,
-                    title: '政处类型',
+                    width:80,
+                    title: '政处</br>类型',
                 },
                 {
                     field: 'zhengObject',
-                    width:100,
-                    title: '政处对象',
+                    width:80,
+                    title: '政处</br>对象',
                 },
                 {
                     field: 'zhengDescribe',
@@ -522,18 +521,18 @@ $(document).ready(function () {
                 },
                 {
                     field: 'projectApproval',
-                    width:100,
+                    width:80,
                     title: '是否需</br>规划报批',
                 },
                 {
                     field: 'courseEvaluationProcedures',
-                    width:100,
-                    title: '是否需</br>办理安评航评</br>手续',
+                    width:80,
+                    title: '是否需</br>办理</br>安评航评</br>手续',
                 },
                 {
                     field: 'zhengDifficultyWarn',
                     width:100,
-                    title: '政处难点提醒',
+                    title: '政处难点</br>提醒',
                 }
             ]
         ]