projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.java

@@ -106,4 +106,5 @@ public interface SubInfoMapper {
     @Update("update sub_info set amt_comp = #{sub.amtComp}, yb_content = #{sub.ybContent} where id = #{sub.id}")
     void update(@Param("sub") SubInfo subInfo);
 
+    List<SmzkDetailVo> exportSmzkDetailExcel(@Param("subName") String subName,@Param("subjectId") String subjectId,@Param("indusKinds") List<String> indusKinds,@Param("startAmt") String startAmt,@Param("endAmt") String endAmt, @Param("sbdw") String sbdw, @Param("subjectIds") List<String> subjectIds);
 }

projects-service/src/main/java/com/rtrh/projects/modules/projects/mapper/SubInfoMapper.xml

@@ -8,6 +8,46 @@
             (#{item.id}, #{item.subId}, #{item.year}, #{item.cat}, #{item.createTime}, #{item.createUserId})
         </foreach>
     </insert>
+    <select id="exportSmzkDetailExcel" resultType="com.rtrh.projects.modules.projects.vo.export.SmzkDetailVo">
+        SELECT sub_info.id as id,
+        sub_info.status as status,
+        sub_info.sub_code as subCode,
+        sub_info.sub_name as subName,
+        sub_info.amt_total as amtTotal,
+        sub_info.begin_date as beginDate,
+        sub_info.end_date as endDate,
+        sub_info.indus_kind as indusKind,
+        sub_info.cb_status as cbStatus
+        FROM sub_info
+        WHERE sub_info.logic_delete_flag = 0
+        <if test="subName != null and subName != ''">
+            AND sub_info.sub_name LIKE CONCAT('%', #{subName}, '%')
+        </if>
+        <if test="subjectId != null and subjectId != ''">
+            AND sub_info.subject_id = #{subjectId}
+        </if>
+        <if test="subjectIds != null and subjectIds.size() &gt; 0">
+            AND sub_info.subject_id IN
+            <foreach collection="subjectIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="indusKinds != null and indusKinds.size() &gt; 0">
+            AND sub_info.indus_kind IN
+            <foreach collection="indusKinds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="sbdw != null and sbdw != ''">
+            AND sub_info.unit_desc LIKE CONCAT('%', #{sbdw}, '%')
+        </if>
+        <if test="startAmt != null and startAmt !=''">
+            AND sub_info.amt_total &gt;= #{startAmt}
+        </if>
+        <if test="endAmt != null and endAmt != ''">
+            AND sub_info.amt_total &lt;= #{endAmt}
+        </if>
+    </select>
 
 
     <select id="smartSiteQuery" resultType="com.rtrh.projects.modules.projects.vo.SubSmartVO"  >

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/SubInfoService.java

@@ -449,4 +449,6 @@ public interface SubInfoService {
 	Long queryExceedWithin();
 
 	Long queryExceedOutside();
+
+	List<SmzkDetailVo> exportSmzkDetailExcel(SubInfoQueryTzVO vo, List<String> subjectIds);
 }

projects-service/src/main/java/com/rtrh/projects/modules/projects/service/impl/SubInfoServiceImpl.java

@@ -5382,6 +5382,79 @@ public class SubInfoServiceImpl implements SubInfoService {
         return subInfoMapper.queryExceedOutside();
     }
 
+    @Override
+    public List<SmzkDetailVo> exportSmzkDetailExcel(SubInfoQueryTzVO vo, List<String> subjectIds) {
+
+        // 获取行业
+        List<SubIndu> subInduList = Optional.ofNullable(
+                subInduService.selectAllSubIndu()
+        ).orElse(Collections.emptyList());
+
+        //保存行业code
+        List<String> indusKinds = new ArrayList<>();
+        //判断搜索条件中是否有行业分类条件
+        if (StringUtils.isNotBlank(vo.getIndusKind())) {
+            //在subInduList中找到code=queryVO.getIndusKinds()的数据
+            SubIndu subIndu = subInduList.stream().filter(item -> item.getCode().equals(vo.getIndusKind())).findFirst().orElse(null);
+
+            if (subIndu != null){
+                //判断这个行业是不是上级行业
+                if (StringUtils.isBlank(subIndu.getLastId())){
+                    // 这个行业是上级行业，需要找到所有下级行业的code
+                    indusKinds = subInduList.stream().filter(item -> item.getLastId() != null && item.getLastId().equals(subIndu.getId())).map(SubIndu::getCode).collect(Collectors.toList());
+                }else {
+                    indusKinds.add(subIndu.getCode());
+                }
+            }
+        }
+
+
+        // 查询所有的重点项目信息，若结果为空则初始化为一个空列表
+        List<SmzkDetailVo> dataList = Optional.ofNullable(
+                subInfoMapper.exportSmzkDetailExcel(vo.getSubName(),vo.getSubjectId(),indusKinds,vo.getStartAmt(),vo.getEndAmt(),vo.getSbdw(),subjectIds)
+        ).orElse(Collections.emptyList());
+
+        Map<String, String> statusMap = new HashMap<>();
+        statusMap.put("1", "储备");
+        statusMap.put("2", "新建");
+        statusMap.put("3", "在建");
+        statusMap.put("9", "投产");
+
+
+        // 遍历重点项目信息，找到对应的前期手续信息，然后拼接手续完成情况为字符串，拼接到对应的重点项目信息中
+        dataList.forEach(e->{
+
+            e.setStatus(statusMap.get(e.getStatus()));
+
+            e.setCbStatus(SubInfoCbStatusEnum.getMessage(e.getCbStatus()));
+
+            //设置行业
+            if (StringUtil.isNotEmpty(e.getIndusKind())) {
+                String induskind = e.getIndusKind();
+                //这是新的行业列表subInduList，subInduList中有children里面装的子行业，我需要将induskind替换为subInduList中的一级行业title
+                Optional<SubIndu> first = subInduList.stream().filter(item -> item.getCode().equals(induskind)).findFirst();
+                if (first.isPresent()) {
+                    //判断上级名称是否存在，如果存在将induskind替换为上级名称，否则将induskind替换为名称
+                    if (StringUtil.isNotEmpty(first.get().getParentTitle())) {
+                        e.setIndusKind(first.get().getParentTitle());
+                    } else {
+                        e.setIndusKind(first.get().getTitle());
+                    }
+                }else {
+                    e.setIndusKind("");
+                }
+            }else {
+                e.setIndusKind("");
+            }
+
+            //将万元转换为亿元
+            e.setAmtTotal(e.getAmtTotal().divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP));
+        });
+
+        return dataList;
+
+    }
+
     private Map<String, Object> getStringObjectMap(List<WorkBenchVO> list) {
         Map<String, Object> resultMap = new HashMap<>();
         if (CollectionUtil.isNotEmpty(list)){

projects-service/src/main/java/com/rtrh/projects/modules/projects/vo/export/SmzkDetailVo.java

@@ -0,0 +1,31 @@
+package com.rtrh.projects.modules.projects.vo.export;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class SmzkDetailVo {
+
+    private Integer number;
+
+    private String id;
+
+    private String status;
+
+    private String subCode;
+
+    private String subName;
+
+    private BigDecimal amtTotal;
+
+    private Date beginDate;
+
+    private Date endDate;
+
+    private String indusKind;
+
+    private String cbStatus;
+
+}

projects/src/main/java/com/rtrh/projects/web/controller/projects/SubPreNewController.java

@@ -135,7 +135,7 @@ public class SubPreNewController extends BaseController {
 	 * @param subId
 	 * @return
 	 */
-	@Log("用户点击项目前期管理-项目信息申报-办理情况按钮")
+	@Log("页面：【项目前期管理-项目信息申报】，执行操作：查看办理情况")
 	@GetMapping("sbTodo")
 	public ModelAndView sbTodo(ModelMap model, String subId) {
 		model.put("subId", subId);

projects/src/main/java/com/rtrh/projects/web/controller/projects/api/TzfxApiController.java

@@ -91,7 +91,7 @@ public class TzfxApiController extends BaseController {
 	 * 获取统计分析页面数据
 	 * @return
 	 */
-	@Log("用户查询统计分析数据")
+	@Log("页面：【统计分析】，执行操作：查询")
 	@PostMapping("getTjfxData")
 	public Message getTjfxData(@RequestBody TzfxDataQueryVO queryVO) {
 		Message message = new Message();
@@ -108,7 +108,7 @@ public class TzfxApiController extends BaseController {
 	/**
 	 * 项目转换统计列表数据
 	 */
-	@Log("用户查询项目转换统计数据")
+	@Log("页面：【系统管理-项目转换情况】，执行操作：查询")
 	@PostMapping("/getXmzhtjData")
 	public ListMessage getXmzhtjData(@RequestBody Page page, @RequestBody RegisterListVO vo) {
 		ListMessage message = new ListMessage();
@@ -126,7 +126,7 @@ public class TzfxApiController extends BaseController {
 	/**
 	 * 项目转换统计详情数据
 	 */
-	@Log("用户查询项目转换统计详情数据")
+	@Log("页面：【系统管理-项目转换情况】，执行操作：查询明细")
 	@PostMapping("getXmzhtjDetailData")
 	public ListMessage getXmzhtjDetailData(@RequestBody Page page, @RequestBody XmzhtjDetailVo queryVO) {
 		ListMessage message = new ListMessage();

projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoController.java

@@ -142,7 +142,7 @@ public class SubInfoController extends BaseController {
      * @param model
      * @return
      */
-    @Log("用户查看项目前期管理-前期手续办理情况-按部门统计")
+    @Log("页面：【项目前期管理-前期手续办理情况】，执行操作：查看部门统计情况")
     @GetMapping("reportDepartment")
     public ModelAndView reportDepartment(ModelMap model) {
         List<Map<String, Object>> unit = jUnitService.getCheckUnit();
@@ -157,7 +157,7 @@ public class SubInfoController extends BaseController {
      * @param model
      * @return
      */
-    @Log("用户查看项目前期管理-前期手续办理情况-按办理手续统计")
+    @Log("页面：【项目前期管理-前期手续办理情况】，执行操作：查看办理手续统计情况")
     @GetMapping("reportFile")
     public ModelAndView reportFile(ModelMap model) {
         List<JUnit> unit = jUnitService.getUnitByKind(JUnitKind.ZFDW);
@@ -171,7 +171,7 @@ public class SubInfoController extends BaseController {
      * @param model
      * @return
      */
-    @Log("用户查看项目前期管理-前期手续办理情况-按项目统计")
+    @Log("页面：【项目前期管理-前期手续办理情况】，执行操作：查看项目统计情况")
     @GetMapping("reportProject")
     public ModelAndView reportProject(ModelMap model) {
         List<JUnit> unit = jUnitService.getUnitByKind(JUnitKind.ZFDW);
@@ -327,7 +327,7 @@ public class SubInfoController extends BaseController {
                 //重点项目对外展示页面
                 return new ModelAndView("/vmodules/subject/subInfo/tz/major_out.jsp");
             case "yearSum":
-                //年度固定资产项目库 - 新建项目
+                //重点项目调度  -  投产项目
                 return new ModelAndView("/vmodules/subject/subInfo/tz/year_sum.jsp");
             case "yearNew":
                 //年度固定资产项目库 - 新建项目

projects/src/main/java/com/rtrh/projects/web/controller/subject/SubInfoExportController.java

@@ -643,7 +643,7 @@ public class SubInfoExportController extends BaseController {
      * @param response
      * @param vo
      */
-    @Log("用户点击项目汇总导出按钮，导出重点库项目汇总信息")
+    @Log("页面：【重点项目调度】，执行操作：导出汇总")
     @PostMapping("/exportFixTotalExcel")
     public void exportFixTotalExcel(@RequestBody SubInfoQueryTzVO vo) {
 
@@ -875,7 +875,6 @@ public class SubInfoExportController extends BaseController {
     /**
      * 4库/总库 导出明细
      *
-     * @param response
      */
     @PostMapping("/exportDetailExcel")
     public void exportDetailExcel(@RequestBody SubInfoQueryTzVO queryVO) {
@@ -1003,6 +1002,71 @@ public class SubInfoExportController extends BaseController {
         }
     }
 
+    /**
+     * 导出重点项目储备明细表
+     *
+     * @param vo
+     */
+    @Log("页面：【项目四库管理-项目总库】，执行操作：导出明细")
+    @PostMapping("/exportXmzkDetailExcel")
+    public void exportXmzkDetailExcel(@RequestBody SubInfoQueryTzVO vo) throws IOException {
+
+        // 设置响应头
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode("项目总库-明细数据.xlsx", "UTF-8"));
+
+        try (cn.hutool.poi.excel.ExcelWriter writer = ExcelUtil.getBigWriter();
+             ServletOutputStream out = response.getOutputStream()) {
+
+            // 获取数据
+            List<String> subjectIds = getSubjectIds();
+            List<SmzkDetailVo> subInfoTotalExcel = subInfoService.exportSmzkDetailExcel(vo,subjectIds);
+
+            // 写入标题行
+            writer.writeHeadRow(CollUtil.newArrayList("“四个一批”工业项目表(项目总库)"));
+            writer.merge(0, 0, 0, 9, "“四个一批”工业项目表(项目总库)", true);
+
+            // 写入子标题行
+//            writer.writeHeadRow(CollUtil.newArrayList("序号", "项目id", "项目库", "项目代码", "项目名称", "总金额(亿元)", "计划开始日期", "计划投产日期", "行业名称", "状态"));
+
+            writer.addHeaderAlias("number", "序号");
+            writer.addHeaderAlias("id", "项目id");
+            writer.addHeaderAlias("status", "项目库");
+            writer.addHeaderAlias("subCode", "项目代码");
+            writer.addHeaderAlias("subName", "项目名称");
+            writer.addHeaderAlias("amtTotal", "总金额(亿元)");
+            writer.addHeaderAlias("beginDate", "计划开始日期");
+            writer.addHeaderAlias("endDate", "计划投产日期");
+            writer.addHeaderAlias("indusKind", "行业名称");
+            writer.addHeaderAlias("cbStatus", "状态");
+
+
+            // 设置每列的默认宽度
+            SXSSFSheet sheet = ((SXSSFWorkbook) writer.getWorkbook()).getSheetAt(0);
+            int defaultColumnWidth = 40; // 默认宽度为20个字符
+            for (int i = 0; i < 9; i++) {
+                sheet.setColumnWidth(i, defaultColumnWidth * 256); // 其他列保持默认宽度
+            }
+
+            //根据合并行进行合并
+            for (int i = 0; i < subInfoTotalExcel.size(); i++) {
+                subInfoTotalExcel.get(i).setNumber(i);
+            }
+
+            //写入行业明细行
+            writer.write(subInfoTotalExcel, true);
+            // 输出到客户端
+            writer.flush(out, true);
+
+        } catch (IOException e) {
+            // 处理 IO 异常
+            handleErrorResponse(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "导出 Excel 文件时出现错误：" + e.getMessage());
+        } catch (Exception e) {
+            // 处理其他异常
+            handleErrorResponse(response, HttpServletResponse.SC_BAD_REQUEST, "请求参数错误或发生其他错误：" + e.getMessage());
+        }
+    }
+
     private <K extends SubInfoBaseDetailVo> void exportDetail(HttpServletResponse response,ExportParams exportParams,Class<K> clazz, List<SubInfoGxj> list, Map<String, String> hyDictMap, Map<String, List<SubInfoGxj>> groupMap) {
         List<K> exportList = new ArrayList<>();
         // 合计行
@@ -1333,7 +1397,7 @@ public class SubInfoExportController extends BaseController {
      * @param response
      * @param vo
      */
-    @Log("用户点击重点项目-新建项目明细表导出按钮，导出重点新建项目明细表信息")
+    @Log("页面：【重点项目调度-新建项目】，执行操作：导出明细")
     @PostMapping("/exportFixXjDetailExcel")
     public void exportFixXjDetailExcel(@RequestBody SubInfoQueryTzVO vo) throws IOException {
         try (cn.hutool.poi.excel.ExcelWriter writer = ExcelUtil.getBigWriter();
@@ -1448,7 +1512,7 @@ public class SubInfoExportController extends BaseController {
      * @param response
      * @param vo
      */
-    @Log("用户点击重点项目-储备项目明细导出按钮，导出重点储备项目明细信息")
+    @Log("页面：【重点项目调度-储备项目】，执行操作：导出明细")
     @PostMapping("/exportFixCbDetailExcel")
     public void exportFixCbDetailExcel(@RequestBody SubInfoQueryTzVO vo) throws IOException {
 
@@ -1548,7 +1612,7 @@ public class SubInfoExportController extends BaseController {
      * @param response
      * @param vo
      */
-    @Log("用户点击重点项目-在建项目明细导出按钮，导出重点在建项目明细信息")
+    @Log("页面：【重点项目调度-在建项目】，执行操作：导出明细")
     @PostMapping("/exportFixZjDetailExcel")
     public void exportFixZjDetailExcel(@RequestBody SubInfoQueryTzVO vo) throws IOException {
 
@@ -1664,7 +1728,7 @@ public class SubInfoExportController extends BaseController {
      * @param response
      * @param vo
      */
-    @Log("用户点击重点项目-投产项目明细表导出按钮，导出重点投产项目明细表信息")
+    @Log("页面：【重点项目调度-投产项目】，执行操作：导出明细")
     @PostMapping("/exportFixTcDetailExcel")
     public void exportFixTcDetailExcel(@RequestBody SubInfoQueryTzVO vo) throws IOException {
 

projects/src/main/java/com/rtrh/projects/web/controller/subject/WorkBenchTwoController.java

@@ -82,59 +82,7 @@ public class WorkBenchTwoController extends BaseController {
 	@GetMapping(value = "/zrWorkBench")
 	public ModelAndView zrWorkBench(ModelMap model) {
 		Map<String, Object> map = workBenchService.statisticData();
-
-		// // 	 进度红灯-前期手续红灯
-		// int preNum = subInfoService.preProcedureExceedSize().size();
-		// String lastMonth = cn.hutool.core.date.DateUtil.format(cn.hutool.core.date.DateUtil.offsetMonth(cn.hutool.core.date.DateUtil.date(), -1), "yyyyMM");
-		// int dayOfMonth = cn.hutool.core.date.DateUtil.dayOfMonth(cn.hutool.core.date.DateUtil.date());
-		// // 	 进度红灯-月报超期红灯
-		// int monthlyNum = dayOfMonth <= 5 ? 0 : subInfoService.queryExceedMonthlySize(lastMonth).size();
-		// // 超期 进度红灯
-		// map.put("exceedNum", Integer.parseInt(map.get("exceedNum").toString()) + preNum + monthlyNum);
-
 		model.putAll(map);
-		// Map<String, Object> numData = workBenchService.getDaiBanData(getCurUser().getKind(), getCurUser().getLoginName());
-		// PreWarnDataQueryVO queryVO=new PreWarnDataQueryVO();
-		// Page preData = subPreNewService.pageDueTime(new Page(), getCurUser().getLoginUser(), queryVO);
-		// Page monthData = subRptContService.pageMonthWarnData(new Page(), getCurUser().getLoginUser(), queryVO);
-		// queryVO.setOpenAndEndStatus("1");
-		// Page openData = subInfoService.pageWarnData(new Page(), getCurUser().getLoginUser(), queryVO);
-		// queryVO.setOpenAndEndStatus("2");
-		// Page endData = subInfoService.pageWarnData(new Page(), getCurUser().getLoginUser(), queryVO);
-		// SubInfoQueryTzVO queryTzVO=new SubInfoQueryTzVO();
-		// queryTzVO.setQueryType("3");
-		// queryTzVO.setOffsetMax(new BigDecimal(-10));
-		// Page pldData = subInfoQueryService.pageCb(new Page(), getCurUser().getLoginUser(), queryTzVO);
-		// Page problemData = subquestioninfoservice.pageQueryQuestionList(new Page(), getCurUser().getLoginUser(), new QuestionQueryVO());
-
-
-/*		map.put("preWarnNum",preData.getTotalCount());
-		map.put("monthWarnNum",monthData.getTotalCount());
-		map.put("openWarnNum",openData.getTotalCount());
-		map.put("endWarnNum",endData.getTotalCount());
-		map.put("pldWarnNum",pldData.getTotalCount());
-		map.put("problemWarnNum",problemData.getTotalCount());*/
-
-		//增加红黄灯穿透数， 项目偏离度
-		// SubInfoQueryTzVO subInfoQueryTzVO=new SubInfoQueryTzVO();
-		// subInfoQueryTzVO.setOpenDate(true);
-		// //20240301  获取 开工红黄灯，	偏离度红黄灯  计划开工前7天黄灯，计划开工前3天红灯；
-		// Page openPage=    subInfoQueryService.pageCb(new Page(),getCurUser().getLoginUser(),subInfoQueryTzVO);
-		// model.put("openNum",openPage.getTotalCount());
-		//
-		// subInfoQueryTzVO.setOpenDate(null);
-		// // 偏离度在-10%到-30%为黄灯，偏离度在-30%以上为红灯。
-		// subInfoQueryTzVO.setOffsetMax(new BigDecimal(-10));
-		// Page offsetPage=    subInfoQueryService.pageCb(new Page(),getCurUser().getLoginUser(),subInfoQueryTzVO);
-		// model.put("offsetNum",offsetPage.getTotalCount());
-		// numData.put("num_2",preData.getTotalCount()+monthData.getTotalCount()+openData.getTotalCount()+endData.getTotalCount()+pldData.getTotalCount());
-		// model.put("numData", numData);
-		// model.put("currKind", getCurUser().getKind());
-		// model.put("overAmount", subInfoDao.getSubAmountForWorkBentch(getCurUser().getLoginUser()));
-		// SecRole role=secRoleDao.findById(getCurUser().getKind());
-		// if(role!=null&&role.getCode().equals("001")){
-		// 	getCurUser().setKindUnit("2");
-		// }
 		model.put("kingUnit",getCurUser().getKindUnit());
 		return new ModelAndView("/vmodules/workBench/zr_gzt.jsp");
 	}

projects/src/main/java/com/rtrh/projects/web/controller/subject/api/SubInfoApiController.java

@@ -151,7 +151,7 @@ public class SubInfoApiController extends BaseController {
      * 抓取四库代码到重点项目库中
      *
      */
-    @Log("用户点击自动抓取按钮，抓取数据到重点项目库中")
+    @Log("页面：【重点项目调度】，执行操作：点击自动抓取按钮")
     @PostMapping(value = "/subInfoToSubFix")
     public ListMessage subInfoToSubFix(@RequestBody SubInfoToSubFixVo subInfoToSubFixVo) {
         ListMessage message = new ListMessage();
@@ -168,7 +168,7 @@ public class SubInfoApiController extends BaseController {
     /**
      * 重点项目状态改变
      */
-    @Log("用户更改重点项目状态")
+    @Log("页面：【重点项目调度】，执行操作：更改项目状态")
     @PostMapping(value = "/updateFixeCat/{subInfoId}/{cat}")
     public Message updateFixeCat(@PathVariable String subInfoId,@PathVariable String cat) {
         Message message = new Message();
@@ -195,7 +195,7 @@ public class SubInfoApiController extends BaseController {
      * @param beginDateEnd
      * @return
      */
-    @Log("用户查询项目前期管理-项目申报信息数据")
+    @Log("页面：【项目前期管理-项目信息申报】，执行操作：查询")
     @PostMapping(value = "/pageQueryNDataPlus")
     public ListMessage pageQueryNDataPlus(@RequestBody Page page, @RequestBody SubInfoNDataQueryVO queryVO) {
         ListMessage message = new ListMessage();
@@ -1116,7 +1116,7 @@ public class SubInfoApiController extends BaseController {
      * 设置项目取消纳入年度固定资产项目库
      */
     @PostMapping("setIsFix")
-    @Log("重点项目移除重点项目库")
+    @Log("页面：【重点项目调度】，执行操作：取消纳入")
     public Message setBackIsFix(@RequestBody SubIdVO vo) {
         Message message = new Message();
         try {
@@ -1151,7 +1151,7 @@ public class SubInfoApiController extends BaseController {
      * 设置项目取消纳入年度固定资产项目库
      */
     @PostMapping("setIsFixAdd")
-    @Log("用户纳入数据到重点项目库中")
+    @Log("页面：【重点项目调度】，执行操作：纳入数据")
     public Message setIsFixAdd(@RequestBody SubIdVO vo) {
         Message message = new Message();
         try {
@@ -1186,7 +1186,7 @@ public class SubInfoApiController extends BaseController {
      * 设置项目取消纳入年度固定资产项目库
      */
     @PostMapping("setIsFixRemove")
-    @Log("用户移除重点项目库中数据")
+    @Log("页面：【重点项目调度】，执行操作：取消纳入")
     public Message setIsFixRemove(@RequestBody SubIdVO vo) {
         Message message = new Message();
         try {

projects/src/main/java/com/rtrh/projects/web/controller/subject/api/SubInfoQueryApiController.java

@@ -94,7 +94,7 @@ public class SubInfoQueryApiController extends BaseController {
      * @param queryVO
      * @return
      */
-    @Log("用户查询重点项目-储备项目数据")
+    @Log("页面：【重点项目调度-储备项目】，执行操作：查询")
     @PostMapping("subFixGetAllCb")
     public ListMessage subFixGetAllCb(@RequestBody Page page, @RequestBody SubInfoQueryTzVO queryVO) {
         ListMessage message = new ListMessage();
@@ -139,7 +139,7 @@ public class SubInfoQueryApiController extends BaseController {
      * @param queryVO
      * @return
      */
-    @Log("用户查询重点项目-新建项目数据")
+    @Log("页面：【重点项目调度-新建项目】，执行操作：查询")
     @PostMapping("subFixGetAllXj")
     public ListMessage subFixGetAllXj(@RequestBody Page page, @RequestBody SubInfoQueryTzVO queryVO) {
         ListMessage message = new ListMessage();
@@ -184,7 +184,7 @@ public class SubInfoQueryApiController extends BaseController {
      * @param queryVO
      * @return
      */
-    @Log("用户查询重点项目-在建项目数据")
+    @Log("页面：【重点项目调度-在建项目】，执行操作：查询")
     @PostMapping("subFixGetAllZj")
     public ListMessage subFixGetAllZj(@RequestBody Page page, @RequestBody SubInfoQueryTzVO queryVO) {
         ListMessage message = new ListMessage();
@@ -229,7 +229,7 @@ public class SubInfoQueryApiController extends BaseController {
      * @param queryVO
      * @return
      */
-    @Log("用户查询重点项目-投产项目数据")
+    @Log("页面：【重点项目调度-投产项目】，执行操作：查询")
     @PostMapping("subFixGetAllTc")
     public ListMessage subFixGetAllTc(@RequestBody Page page, @RequestBody SubInfoQueryTzVO queryVO) {
         ListMessage message = new ListMessage();

projects/src/main/webapp/vmodules/subject/subInfo/tz/xmzk.jsp

@@ -219,8 +219,9 @@
                         <img src="${WebSite.asset}/css/images/left/export.svg"/>
                         <span>导出</span>
                     </div>
-                    <div class="export-item" v-if="showExport" :style="{ top: '-62px' }">
+                    <div class="export-item" v-if="showExport" :style="{ top: '-93px' }">
                         <button type="button" class="" @click="exportTotalExcel">汇总导出</button>
+                        <button type="button" class="" @click="exportFixDetailExcel">项目明细导出</button>
                         <button type="button" class="" @click="exportMoreExcel">自定义导出</button>
                     </div>
                 </div>
@@ -1100,6 +1101,10 @@
                 var param = this.getSearchParams();
                 App.common.utils.downFile(App.getUrl("subInfoExport/exportTotalExcelByStatus"), "POST", param, "项目情况表(总库).xlsx", "导出失败");
             },
+            exportFixDetailExcel: function () {
+                var param = this.getSearchParams();
+                App.common.utils.downFile(App.getUrl("/subInfoExport/exportXmzkDetailExcel"), "POST", param, "项目明细表(总库).xlsx", "导出失败");
+            },
             exportDetailExcel: function () {
                 var param = this.getSearchParams();
                 App.common.utils.downFile(App.getUrl("subInfoExport/exportDetailExcel"), "POST", param, "项目明细表(总库).xlsx", "导出失败");

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_extend_sum.jsp

@@ -345,7 +345,7 @@
                 <div class="layui-form-item">
                     <div style="display: flex">
                         <label class="juli">
-                            续建项目总数<span class="lanse-first">{{beginRate.total}}</span>
+                            在建项目总数<span class="lanse-first">{{beginRate.total}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar"></div>
@@ -353,7 +353,7 @@
                             </div>
                         </label>
                         <label class="juli">
-                            未开工项目数<span class="lanse-first">{{beginRate.noNum}}</span>
+                            已开工<span class="lanse-first">{{beginRate.kgTotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
@@ -361,15 +361,7 @@
                             </div>
                         </label>
                         <label class="juli">
-                            已开工项目数<span class="lanse-first">{{beginRate.beginNum}}</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <label class="juli">
-                            开工率<span class="lanse-first">{{beginRate.beginRate}}</span>
+                            开(复)工率<span class="lanse-first">{{beginRate.kfgl}}%</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
@@ -377,17 +369,18 @@
                             </div>
                         </label>
                     </div>
+
                     <div style="display: flex;margin-bottom: 3px" class="second_line">
-                        <label class="juli" @click="levelList('subjects',item.split(',')[1],item.split(',')[0])"
-                               v-for="(item, index) in beginRate.jsddList" :key="index">
-                            {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
+                        <label class="juli" @click="levelList('subjects',item.title,item.code)"
+                               v-for="(item, index) in beginRate.subjectIdList" :key="index">
+                            {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
                     <div style="margin-bottom: 3px" class="second_line">
                         <label class="juli"
-                               @click="levelList('indusKinds',item.split(',')[1]?item.split(',')[1]:item.split(',')[0],item.split(',')[3])"
-                               v-for="(item, index) in beginRate.hyflList" :key="index">
-                            {{item.split(",")[1]?item.split(",")[1]:item.split(",")[0]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
+                               @click="levelList('indusKinds',item.title,item.code)"
+                               v-for="(item, index) in beginRate.indusKindList" :key="index">
+                            {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
                 </div>
@@ -772,77 +765,6 @@
             methods: {
                 init: function () {
                     this.winH = document.body.clientHeight;
-                  /*  layui.laydate.render({
-                        elem: '#startTime',
-                        theme: layDateTheme,
-                        range: '~'
-                    });
-                    var nowdate = new Date();
-                    nowdate.setMonth(nowdate.getMonth() + 1);
-                    var y = nowdate.getFullYear();
-                    var m = nowdate.getMonth() + 1;
-                    var d = nowdate.getDate();
-                    var formatwdate = y + '-' + m + '-' + d;
-                    layui.laydate.render({
-                        elem: '#dateConfirm',
-                        theme: layDateTheme,
-                        value: formatwdate
-                    });
-                    layui.laydate.render({
-                        elem: '#openDate',
-                        theme: layDateTheme,
-                        value: formatwdate
-                    });
-                    /!*   $("#month").val(new Date().getMonth() + 1);*!/
-                    var xmlx = [];
-                    <c:forEach items="${XMLX}" var="xm">
-                    xmlx.push({value: "${xm.code}", name: "${xm.title}"});
-                    </c:forEach>
-                    this.kind = layui.xmSelect.render({
-                        el: "#kind",
-                        language: 'zn',
-                        data: xmlx
-                    });
-                    var indusKindData = [];
-                    <c:forEach items="${HYFL}" var="xm">
-                    indusKindData.push({value: "${xm.id}", name: "${xm.title}"});
-                    </c:forEach>
-                    this.indusKind = layui.xmSelect.render({
-                        el: "#indusKind",
-                        language: 'zn',
-                        data: indusKindData
-                    });
-                    layui.laydate.render({
-                        elem: '#year',
-                        type: 'year',
-                        theme: layDateTheme,
-                        btns: ['now', 'confirm'],
-                        value: ${curYear}
-                    });
-                    var params = window.localStorage.getItem(this.cacheName);
-                    if (params) {
-                        layui.form.val("searchForm", JSON.parse(params));
-                    }
-                    if (${ isHydw }) {
-                        this.light = layui.xmSelect.render({
-                            el: "#light",
-                            language: 'zn',
-                            data: [
-                                /!*       {value: '0', name: '绿灯'},*!/
-                                {value: '1', name: '黄灯'},
-                                {value: '2', name: '红灯'}
-                            ]
-                        })
-                    }
-                    ;
-                    document.getElementById("exportId", function () {
-                        self.showExport = true;
-                        console.log('移入了')
-                    })
-                    document.getElementById("exportId", function () {
-                        self.showExport = false;
-                        console.log('移出了')
-                    })*/
                     var self = this;
                     layui.upload.render({
                         elem: '#importExc'
@@ -982,25 +904,6 @@
                     var   param =${params};
                     param = Object.assign(param, ${sumParams});
                     return param;
-                  /*  var param = layui.form.getValue("searchForm");
-                    if (param.rangeDate) {
-                        param.beginDate = param.rangeDate.split(" ~ ")[0];
-                        param.endDate = param.rangeDate.split(" ~ ")[1];
-                        param.rangeDate = null;
-                    } else if (param.year) {
-                        param.beginDate = param.year + "-01-01";
-                        param.endDate = param.year + "-12-31";
-                    }
-                    if (this.light) {
-                        param.light = this.light.getValue("valueStr");
-                    }
-                    if (this.indusKind) {
-                        param.indusKind = this.indusKind.getValue("valueStr");
-                    }
-                    delete (param.select)
-                    param.queryTimeType = "0"
-                    param.kind = this.kind.getValue("value").sort().join(",");
-                    return param;*/
                 },
                 getData: function () {
                     var self = this;
@@ -1012,55 +915,16 @@
                     param.orderType = this.sort.type || null;
                     param.queryType = null;
                     console.log(param);
-                    App.postJson("/api/subInfo/query/all", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetAllZj", param, function (res) {
                         self.dataList = res.rows;
                         self.loadPage(res.total);
                         self.loadTable(param);
                     });
 
-                    App.postJson("/api/subInfo/query/beginRate", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetBeginRate", param, function (res) {
                         if (res.success) {
+                            console.log("获取到的数据:",res.data)
                             self.beginRate = res.data;
-                            self.beginRate.hyflList = self.beginRate.hyflData.split(";");
-                            self.beginRate.tzlxList = self.beginRate.tzlxData.split(";");
-                            self.beginRate.jsddList = self.beginRate.jsddData.split(";");
-                            res.data.yearAmtSj = (res.data.yearAmtSj ? res.data.yearAmtSj : 0);
-                            res.data.yearAmtAssign = (res.data.yearAmtAssign ? res.data.yearAmtAssign : 0);
-                            res.data.yearAmt = (res.data.yearAmt ? res.data.yearAmt : 0);
-
-                            self.beginRate.yearAmtSj = res.data.monthAmtSj
-                            self.beginRate.yearAmtAssign = res.data.monthAmtAssign
-                            self.beginRate.yearAmt = res.data.monthAmt
-                            if (res.data.total != 0) {
-                                self.beginRate.beginRate = (res.data.beginNum * 100 / res.data.total).toFixed(2);
-                                self.beginRate.endRate = (res.data.endNum * 100 / res.data.total).toFixed(2);
-                            } else {
-                                self.beginRate.beginRate = 0;
-                                self.beginRate.endRate = 0;
-                            }
-                            if (res.data.yearAmt != 0) {
-                                self.beginRate.amtRate = (res.data.yearAmtSj * 100 / res.data.yearAmt).toFixed(2);
-                            } else if (res.data.yearAmtSj != 0) {
-                                self.beginRate.amtRate = 100;
-                            } else {
-                                self.beginRate.amtRate = 0;
-                            }
-                            if (res.data.total != 0) {
-                                self.beginRate.noRate = (res.data.noNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.beginRate = (res.data.beginNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.endRate = (res.data.endNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.stopRate = (res.data.stopNum * 100 / res.data.total).toFixed(2) + '%';
-                            } else {
-                                self.beginRate.noRate = "0%";
-                                self.beginRate.beginRate = "0%";
-                                self.beginRate.endRate = "0%";
-                                self.beginRate.stopRate = "0%";
-                            }
-
-                        } else {
-                            self.beginRate.beginRate = 0;
-                            self.beginRate.amtRate = 0;
-                            self.beginRate.endRate = 0;
                         }
                     });
                 },

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_new_sum.jsp

@@ -353,66 +353,33 @@
                             </div>
                         </label>
                         <label class="juli">
-                            未开工项目数<span class="lanse-first">{{beginRate.noNum}}</span>
+                            开工数<span class="lanse-first" style="color: #FFAD0D">{{beginRate.kgTotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <label class="juli">
-                            已开工项目数<span class="lanse-first">{{beginRate.beginNum}}</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
+                                    <div class="layui-progress-bar"></div>
                                 </div>
                             </div>
                         </label>
-                        <%--  <label class="juli">
-                              已竣工项目数<span class="lanse-first">{{beginRate.endNum}}</span>
-                              <div class="progress-div">
-                                  <div class="layui-progress">
-                                      <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>
-                                  </div>
-                              </div>
-                          </label>
-                          <label class="juli">
-                              停工项目数<span class="lanse-first">{{beginRate.stopNum}}</span>
-                              <div class="progress-div">
-                                  <div class="layui-progress" lay-filter="layui-progress-bar">
-                                      <div class="layui-progress-bar" :style="'width:'+beginRate.stopRate"></div>
-                                  </div>
-                              </div>
-                          </label>
-  --%>
                         <label class="juli">
-                            开工率<span class="lanse-first">{{beginRate.beginRate}}</span>
+                            转换率<span class="lanse-first">{{beginRate.zhl}}%</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
+                                    <div class="layui-progress-bar"></div>
                                 </div>
                             </div>
                         </label>
-                        <%-- <label class="juli">
-                             竣工率<span class="lanse-first">{{beginRate.endRate}}</span>
-                             <div class="progress-div">
-                                 <div class="layui-progress">
-                                     <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>
-                                 </div>
-                             </div>
-                         </label>--%>
                     </div>
                     <div style="display: flex;margin-bottom: 3px" class="second_line">
-                        <label class="juli" @click="levelList('subjects',item.split(',')[1],item.split(',')[0])"
-                               v-for="(item, index) in beginRate.jsddList" :key="index">
-                            {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
+                        <label class="juli" @click="levelList('subjects',item.title,item.code)"
+                               v-for="(item, index) in beginRate.subjectIdList" :key="index">
+                            {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
                     <div style="margin-bottom: 3px" class="second_line">
                         <label class="juli"
-                               @click="levelList('indusKinds',item.split(',')[1]?item.split(',')[1]:item.split(',')[0],item.split(',')[3])"
-                               v-for="(item, index) in beginRate.hyflList" :key="index">
-                            {{item.split(",")[1]?item.split(",")[1]:item.split(",")[0]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
+                               @click="levelList('indusKinds',item.title,item.code)"
+                               v-for="(item, index) in beginRate.indusKindList" :key="index">
+                            {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
                 </div>
@@ -619,22 +586,6 @@
         <span style="font-size:16px;font-weigh:500 !important;color: #FF9600">{{d.abc||''}}</span>
         {{#} }}
     </script>
-    <script type="text/html" id="amt">
-
-        {{# var computedPer = function(total, now){
-        return (total == 0) ? 0 : parseInt(now * 100 / total +0.5);
-        };
-        }}
-        <span title="">
-        <span class="qianse">总投资：</span><strong class="lanse">{{d.amtTotal}}</strong> 万元 <br/>
-		 <span class="qianse">已完成投资：</span><strong class="lanse">{{d.allAmt}}</strong>			万元(<i
-                class="lanse">{{computedPer(d.amtTotal, d.allAmt)}} %</i> )<br/>
-		<span class="qianse">年度计划投资：</span><strong class="lanse">{{d.yearPlanAmt}}</strong> 万元 <br/>
-		<span class="qianse">年度完成投资：</span><strong class="lanse">{{d.yearEndAmt}}</strong>			万元(<i
-                class="lanse">{{computedPer(d.yearPlanAmt, d.yearEndAmt)}} %</i> )
-
-    </span>
-    </script>
 
     <script type="text/html" id="leaderInfo">
         <span title="">
@@ -797,77 +748,6 @@
             methods: {
                 init: function () {
                     this.winH = document.body.clientHeight;
-                  /*  layui.laydate.render({
-                        elem: '#startTime',
-                        theme: layDateTheme,
-                        range: '~'
-                    });
-                    var nowdate = new Date();
-                    nowdate.setMonth(nowdate.getMonth() + 1);
-                    var y = nowdate.getFullYear();
-                    var m = nowdate.getMonth() + 1;
-                    var d = nowdate.getDate();
-                    var formatwdate = y + '-' + m + '-' + d;
-                    layui.laydate.render({
-                        elem: '#dateConfirm',
-                        theme: layDateTheme,
-                        value: formatwdate
-                    });
-                    layui.laydate.render({
-                        elem: '#openDate',
-                        theme: layDateTheme,
-                        value: formatwdate
-                    });
-                    /!*   $("#month").val(new Date().getMonth() + 1);*!/
-                    var xmlx = [];
-                    <c:forEach items="${XMLX}" var="xm">
-                    xmlx.push({value: "${xm.code}", name: "${xm.title}"});
-                    </c:forEach>
-                    this.kind = layui.xmSelect.render({
-                        el: "#kind",
-                        language: 'zn',
-                        data: xmlx
-                    });
-                    var indusKindData = [];
-                    <c:forEach items="${HYFL}" var="xm">
-                    indusKindData.push({value: "${xm.id}", name: "${xm.title}"});
-                    </c:forEach>
-                    this.indusKind = layui.xmSelect.render({
-                        el: "#indusKind",
-                        language: 'zn',
-                        data: indusKindData
-                    });
-                    layui.laydate.render({
-                        elem: '#year',
-                        type: 'year',
-                        theme: layDateTheme,
-                        btns: ['now', 'confirm'],
-                        value: ${curYear}
-                    });
-                    var params = window.localStorage.getItem(this.cacheName);
-                    if (params) {
-                        layui.form.val("searchForm", JSON.parse(params));
-                    }
-                    if (${ isHydw }) {
-                        this.light = layui.xmSelect.render({
-                            el: "#light",
-                            language: 'zn',
-                            data: [
-                                /!*       {value: '0', name: '绿灯'},*!/
-                                {value: '1', name: '黄灯'},
-                                {value: '2', name: '红灯'}
-                            ]
-                        })
-                    }
-                    ;
-                    document.getElementById("exportId", function () {
-                        self.showExport = true;
-                        console.log('移入了')
-                    })
-                    document.getElementById("exportId", function () {
-                        self.showExport = false;
-                        console.log('移出了')
-                    })*/
                     var self = this;
                     layui.upload.render({
                         elem: '#importExc'
@@ -1037,55 +917,16 @@
                     param.orderType = this.sort.type || null;
                     param.queryType = null;
                     console.log(param);
-                    App.postJson("/api/subInfo/query/all", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetAllXj", param, function (res) {
                         self.dataList = res.rows;
                         self.loadPage(res.total);
                         self.loadTable(param);
                     });
 
-                    App.postJson("/api/subInfo/query/beginRate", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetBeginRate", param, function (res) {
                         if (res.success) {
+                            console.log("获取到的数据:",res.data)
                             self.beginRate = res.data;
-                            self.beginRate.hyflList = self.beginRate.hyflData.split(";");
-                            self.beginRate.tzlxList = self.beginRate.tzlxData.split(";");
-                            self.beginRate.jsddList = self.beginRate.jsddData.split(";");
-                            res.data.yearAmtSj = (res.data.yearAmtSj ? res.data.yearAmtSj : 0);
-                            res.data.yearAmtAssign = (res.data.yearAmtAssign ? res.data.yearAmtAssign : 0);
-                            res.data.yearAmt = (res.data.yearAmt ? res.data.yearAmt : 0);
-
-                            self.beginRate.yearAmtSj = res.data.monthAmtSj
-                            self.beginRate.yearAmtAssign = res.data.monthAmtAssign
-                            self.beginRate.yearAmt = res.data.monthAmt
-                            if (res.data.total != 0) {
-                                self.beginRate.beginRate = (res.data.beginNum * 100 / res.data.total).toFixed(2);
-                                self.beginRate.endRate = (res.data.endNum * 100 / res.data.total).toFixed(2);
-                            } else {
-                                self.beginRate.beginRate = 0;
-                                self.beginRate.endRate = 0;
-                            }
-                            if (res.data.yearAmt != 0) {
-                                self.beginRate.amtRate = (res.data.yearAmtSj * 100 / res.data.yearAmt).toFixed(2);
-                            } else if (res.data.yearAmtSj != 0) {
-                                self.beginRate.amtRate = 100;
-                            } else {
-                                self.beginRate.amtRate = 0;
-                            }
-                            if (res.data.total != 0) {
-                                self.beginRate.noRate = (res.data.noNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.beginRate = (res.data.beginNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.endRate = (res.data.endNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.stopRate = (res.data.stopNum * 100 / res.data.total).toFixed(2) + '%';
-                            } else {
-                                self.beginRate.noRate = "0%";
-                                self.beginRate.beginRate = "0%";
-                                self.beginRate.endRate = "0%";
-                                self.beginRate.stopRate = "0%";
-                            }
-
-                        } else {
-                            self.beginRate.beginRate = 0;
-                            self.beginRate.amtRate = 0;
-                            self.beginRate.endRate = 0;
                         }
                     });
                 },
@@ -1142,7 +983,7 @@
                             {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 200, templet: '#subName'},
                             {field: 'subjectId', fixed: 'left', title: '项目所在地', minWidth: 200, templet: '#subjectId'},
                             {field: 'content', fixed: 'left', title: '项目建设内容', minWidth: 200, templet: '#content'},
-                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 250, templet: '#amt', sort: true},
+                            {field: 'amtTotal', title: '投资金额(亿元)', minWidth: 250},
                             {field: 'beginDate', title: '预计开工时间', minWidth: 200},
                             {field: 'qqsxblqk', title: '前期手续办理情况', minWidth: 200},
                             {field: 'remark', title: '备注', minWidth: 200},

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_reserve_sum.jsp

@@ -93,7 +93,7 @@
                             </div>
                         </label>
                         <label class="juli">
-                            未开工项目数<span class="lanse-first">{{beginRate.noNum}}</span>
+                            A类项目数<span class="lanse-first" style="color: #FFAD0D">{{beginRate.atotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
@@ -101,32 +101,31 @@
                             </div>
                         </label>
                         <label class="juli">
-                            已开工项目数<span class="lanse-first">{{beginRate.beginNum}}</span>
+                            B类项目数<span class="lanse-first" style="color: #E0534E">{{beginRate.btotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
                                 </div>
                             </div>
                         </label>
-                        <%--  <label class="juli">
-                              已竣工项目数<span class="lanse-first">{{beginRate.endNum}}</span>
-                              <div class="progress-div">
-                                  <div class="layui-progress">
-                                      <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>
-                                  </div>
-                              </div>
-                          </label>
-                          <label class="juli">
-                              停工项目数<span class="lanse-first">{{beginRate.stopNum}}</span>
-                              <div class="progress-div">
-                                  <div class="layui-progress" lay-filter="layui-progress-bar">
-                                      <div class="layui-progress-bar" :style="'width:'+beginRate.stopRate"></div>
-                                  </div>
-                              </div>
-                          </label>
-  --%>
                         <label class="juli">
-                            开工率<span class="lanse-first">{{beginRate.beginRate}}</span>
+                            C类项目数<span class="lanse-first" style="color: #ff0d56">{{beginRate.ctotal}}</span>
+                            <div class="progress-div">
+                                <div class="layui-progress">
+                                    <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
+                                </div>
+                            </div>
+                        </label>
+                        <label class="juli">
+                            D类项目数<span class="lanse-first">{{beginRate.dtotal}}</span>
+                            <div class="progress-div">
+                                <div class="layui-progress">
+                                    <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
+                                </div>
+                            </div>
+                        </label>
+                        <label class="juli">
+                            其它项目数<span class="lanse-first">{{beginRate.total - beginRate.atotal - beginRate.btotal - beginRate.ctotal - beginRate.dtotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
@@ -134,17 +133,19 @@
                             </div>
                         </label>
                     </div>
+
                     <div style="display: flex;margin-bottom: 3px" class="second_line">
-                        <label class="juli" @click="levelList('subjects',item.split(',')[1],item.split(',')[0])"
-                               v-for="(item, index) in beginRate.jsddList" :key="index">
-                            {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
+                        <label class="juli" @click="levelList('subjects',item.title,item.code)"
+                               v-for="(item, index) in beginRate.subjectIdList" :key="index">
+                            {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
+
                     <div style="margin-bottom: 3px" class="second_line">
                         <label class="juli"
-                               @click="levelList('indusKinds',item.split(',')[1]?item.split(',')[1]:item.split(',')[0],item.split(',')[3])"
-                               v-for="(item, index) in beginRate.hyflList" :key="index">
-                            {{item.split(",")[1]?item.split(",")[1]:item.split(",")[0]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
+                               @click="levelList('indusKinds',item.title,item.code)"
+                               v-for="(item, index) in beginRate.indusKindList" :key="index">
+                            {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
                 </div>
@@ -492,77 +493,6 @@
             methods: {
                 init: function () {
                     this.winH = document.body.clientHeight;
-                  /*  layui.laydate.render({
-                        elem: '#startTime',
-                        theme: layDateTheme,
-                        range: '~'
-                    });
-                    var nowdate = new Date();
-                    nowdate.setMonth(nowdate.getMonth() + 1);
-                    var y = nowdate.getFullYear();
-                    var m = nowdate.getMonth() + 1;
-                    var d = nowdate.getDate();
-                    var formatwdate = y + '-' + m + '-' + d;
-                    layui.laydate.render({
-                        elem: '#dateConfirm',
-                        theme: layDateTheme,
-                        value: formatwdate
-                    });
-                    layui.laydate.render({
-                        elem: '#openDate',
-                        theme: layDateTheme,
-                        value: formatwdate
-                    });
-                    /!*   $("#month").val(new Date().getMonth() + 1);*!/
-                    var xmlx = [];
-                    <c:forEach items="${XMLX}" var="xm">
-                    xmlx.push({value: "${xm.code}", name: "${xm.title}"});
-                    </c:forEach>
-                    this.kind = layui.xmSelect.render({
-                        el: "#kind",
-                        language: 'zn',
-                        data: xmlx
-                    });
-                    var indusKindData = [];
-                    <c:forEach items="${HYFL}" var="xm">
-                    indusKindData.push({value: "${xm.id}", name: "${xm.title}"});
-                    </c:forEach>
-                    this.indusKind = layui.xmSelect.render({
-                        el: "#indusKind",
-                        language: 'zn',
-                        data: indusKindData
-                    });
-                    layui.laydate.render({
-                        elem: '#year',
-                        type: 'year',
-                        theme: layDateTheme,
-                        btns: ['now', 'confirm'],
-                        value: ${curYear}
-                    });
-                    var params = window.localStorage.getItem(this.cacheName);
-                    if (params) {
-                        layui.form.val("searchForm", JSON.parse(params));
-                    }
-                    if (${ isHydw }) {
-                        this.light = layui.xmSelect.render({
-                            el: "#light",
-                            language: 'zn',
-                            data: [
-                                /!*       {value: '0', name: '绿灯'},*!/
-                                {value: '1', name: '黄灯'},
-                                {value: '2', name: '红灯'}
-                            ]
-                        })
-                    }
-                    ;
-                    document.getElementById("exportId", function () {
-                        self.showExport = true;
-                        console.log('移入了')
-                    })
-                    document.getElementById("exportId", function () {
-                        self.showExport = false;
-                        console.log('移出了')
-                    })*/
                     var self = this;
                     layui.upload.render({
                         elem: '#importExc'
@@ -700,55 +630,16 @@
                     param.orderType = this.sort.type || null;
                     param.queryType = null;
                     console.log(param);
-                    App.postJson("/api/subInfo/query/all", param, function (res) {
+
+                    App.postJson("/api/subInfo/query/subFixGetAllCb", param, function (res) {
                         self.dataList = res.rows;
                         self.loadPage(res.total);
                         self.loadTable(param);
                     });
 
-                    App.postJson("/api/subInfo/query/beginRate", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetBeginRate", param, function (res) {
                         if (res.success) {
                             self.beginRate = res.data;
-                            self.beginRate.hyflList = self.beginRate.hyflData.split(";");
-                            self.beginRate.tzlxList = self.beginRate.tzlxData.split(";");
-                            self.beginRate.jsddList = self.beginRate.jsddData.split(";");
-                            res.data.yearAmtSj = (res.data.yearAmtSj ? res.data.yearAmtSj : 0);
-                            res.data.yearAmtAssign = (res.data.yearAmtAssign ? res.data.yearAmtAssign : 0);
-                            res.data.yearAmt = (res.data.yearAmt ? res.data.yearAmt : 0);
-
-                            self.beginRate.yearAmtSj = res.data.monthAmtSj
-                            self.beginRate.yearAmtAssign = res.data.monthAmtAssign
-                            self.beginRate.yearAmt = res.data.monthAmt
-                            if (res.data.total != 0) {
-                                self.beginRate.beginRate = (res.data.beginNum * 100 / res.data.total).toFixed(2);
-                                self.beginRate.endRate = (res.data.endNum * 100 / res.data.total).toFixed(2);
-                            } else {
-                                self.beginRate.beginRate = 0;
-                                self.beginRate.endRate = 0;
-                            }
-                            if (res.data.yearAmt != 0) {
-                                self.beginRate.amtRate = (res.data.yearAmtSj * 100 / res.data.yearAmt).toFixed(2);
-                            } else if (res.data.yearAmtSj != 0) {
-                                self.beginRate.amtRate = 100;
-                            } else {
-                                self.beginRate.amtRate = 0;
-                            }
-                            if (res.data.total != 0) {
-                                self.beginRate.noRate = (res.data.noNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.beginRate = (res.data.beginNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.endRate = (res.data.endNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.stopRate = (res.data.stopNum * 100 / res.data.total).toFixed(2) + '%';
-                            } else {
-                                self.beginRate.noRate = "0%";
-                                self.beginRate.beginRate = "0%";
-                                self.beginRate.endRate = "0%";
-                                self.beginRate.stopRate = "0%";
-                            }
-
-                        } else {
-                            self.beginRate.beginRate = 0;
-                            self.beginRate.amtRate = 0;
-                            self.beginRate.endRate = 0;
                         }
                     });
                 },

projects/src/main/webapp/vmodules/subject/subInfo/tz/year_sum_sum.jsp

@@ -345,7 +345,7 @@
                 <div class="layui-form-item">
                     <div style="display: flex">
                         <label class="juli">
-                            新建项目总数<span class="lanse-first">{{beginRate.total}}</span>
+                            投产项目总数<span class="lanse-first">{{beginRate.total}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar"></div>
@@ -353,66 +353,15 @@
                             </div>
                         </label>
                         <label class="juli">
-                            未开工项目数<span class="lanse-first">{{beginRate.noNum}}</span>
+                            已入规<span class="lanse-first">{{beginRate.rgTotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <label class="juli">
-                            已开工项目数<span class="lanse-first">{{beginRate.beginNum}}</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <%--  <label class="juli">
-                              已竣工项目数<span class="lanse-first">{{beginRate.endNum}}</span>
-                              <div class="progress-div">
-                                  <div class="layui-progress">
-                                      <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>
-                                  </div>
-                              </div>
-                          </label>
-                          <label class="juli">
-                              停工项目数<span class="lanse-first">{{beginRate.stopNum}}</span>
-                              <div class="progress-div">
-                                  <div class="layui-progress" lay-filter="layui-progress-bar">
-                                      <div class="layui-progress-bar" :style="'width:'+beginRate.stopRate"></div>
-                                  </div>
-                              </div>
-                          </label>
-  --%>
-                        <label class="juli">
-                            开工率<span class="lanse-first">{{beginRate.beginRate}}</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
-                                </div>
-                            </div>
-                        </label>
-                        <%-- <label class="juli">
-                             竣工率<span class="lanse-first">{{beginRate.endRate}}</span>
-                             <div class="progress-div">
-                                 <div class="layui-progress">
-                                     <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>
-                                 </div>
-                             </div>
-                         </label>--%>
-                    </div>
-                    <div style="display: flex">
-                        <label class="juli">
-                            投资进度<span class="lanse-first">{{beginRate.amtRate}}%</span>
-                            <div class="progress-div">
-                                <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.amtRate+'%'"></div>
+                                    <div class="layui-progress-bar"></div>
                                 </div>
                             </div>
                         </label>
                         <label class="juli">
-                            年初计划<span class="lanse-first">{{beginRate.yearAmt}}亿元</span>
+                            未入规<span class="lanse-first">{{beginRate.total - beginRate.rgTotal}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar"></div>
@@ -420,7 +369,7 @@
                             </div>
                         </label>
                         <label class="juli">
-                            月实际<span class="lanse-first">{{beginRate.yearAmtSj}}亿元</span>
+                            入规率<span class="lanse-first">{{beginRate.rgl}}%</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar"></div>
@@ -428,7 +377,7 @@
                             </div>
                         </label>
                         <label class="juli">
-                            月任务<span class="lanse-first">{{beginRate.yearAmtAssign}}亿元</span>
+                            投产率<span class="lanse-first">{{beginRate.tcl}}%</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar"></div>
@@ -437,21 +386,16 @@
                         </label>
                     </div>
                     <div style="display: flex;margin-bottom: 3px" class="second_line">
-
-                        <label @click="levelList('kindNatures',item.split(',')[1],item.split(',')[0])" class="juli"
-                               v-for="(item, index) in beginRate.tzlxList" :key="index">
-                            {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
-                        </label>
-                        <label class="juli" @click="levelList('subjects',item.split(',')[1],item.split(',')[0])"
-                               v-for="(item, index) in beginRate.jsddList" :key="index">
-                            {{item.split(",")[1]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
+                        <label class="juli" @click="levelList('subjects',item.title,item.code)"
+                               v-for="(item, index) in beginRate.subjectIdList" :key="index">
+                            {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
                     <div style="margin-bottom: 3px" class="second_line">
                         <label class="juli"
-                               @click="levelList('indusKinds',item.split(',')[1]?item.split(',')[1]:item.split(',')[0],item.split(',')[3])"
-                               v-for="(item, index) in beginRate.hyflList" :key="index">
-                            {{item.split(",")[1]?item.split(",")[1]:item.split(",")[0]}}<span class="lanse-first">{{item.split(",")[2]}}</span>
+                               @click="levelList('indusKinds',item.title,item.code)"
+                               v-for="(item, index) in beginRate.indusKindList" :key="index">
+                            {{item.title}}<span class="lanse-first">{{item.total}}</span>
                         </label>
                     </div>
                 </div>
@@ -466,19 +410,6 @@
                     </div>
                     <div class="sanjiao"></div>
                     <div class="export-item" v-if="showExport" style="right: 5px;top:-30px">
-                        <%--                        <button type="button" class="" @click="exportExcel">--%>
-                        <%--                            项目汇总--%>
-                        <%--                        </button>--%>
-                        <%--                        <button type="button" class=""--%>
-                        <%--                                @click="exportExcelByIndusKind">按所属行业--%>
-                        <%--                        </button>--%>
-                        <%--                        <button type="button" class=""--%>
-                        <%--                                @click="exportSchedulingExcel">项目调度表--%>
-                        <%--                        </button>--%>
-                        <%--                        <!-- <button type="button" class="" @click="exportExcel2">项目明细导出</button> -->--%>
-                        <%--                        <button type="button" class=""--%>
-                        <%--                                @click="exportMoreExcel">自定义--%>
-                        <%--                        </button>--%>
                         <button type="button" class=""
                                 @click="exportProject">项目汇总
                         </button>
@@ -658,22 +589,6 @@
         <span style="font-size:16px;font-weigh:500 !important;color: #FF9600">{{d.abc||''}}</span>
         {{#} }}
     </script>
-    <script type="text/html" id="amt">
-
-        {{# var computedPer = function(total, now){
-        return (total == 0) ? 0 : parseInt(now * 100 / total +0.5);
-        };
-        }}
-        <span title="">
-        <span class="qianse">总投资：</span><strong class="lanse">{{d.amtTotal}}</strong> 万元 <br/>
-		 <span class="qianse">已完成投资：</span><strong class="lanse">{{d.allAmt}}</strong>			万元(<i
-                class="lanse">{{computedPer(d.amtTotal, d.allAmt)}} %</i> )<br/>
-		<span class="qianse">年度计划投资：</span><strong class="lanse">{{d.yearPlanAmt}}</strong> 万元 <br/>
-		<span class="qianse">年度完成投资：</span><strong class="lanse">{{d.yearEndAmt}}</strong>			万元(<i
-                class="lanse">{{computedPer(d.yearPlanAmt, d.yearEndAmt)}} %</i> )
-
-    </span>
-    </script>
 
     <script type="text/html" id="leaderInfo">
         <span title="">
@@ -1078,55 +993,16 @@
                     param.subCat = '2';
                     param.subYear = this.getSearchParams().year;
                     console.log(param);
-                    App.postJson("/api/subInfo/query/all", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetAllTc", param, function (res) {
                         self.dataList = res.rows;
                         self.loadPage(res.total);
                         self.loadTable(param);
                     });
 
-                    App.postJson("/api/subInfo/query/beginRate", param, function (res) {
+                    App.postJson("/api/subInfo/query/subFixGetBeginRate", param, function (res) {
                         if (res.success) {
+                            console.log("获取到的数据:",res.data)
                             self.beginRate = res.data;
-                            self.beginRate.hyflList = self.beginRate.hyflData.split(";");
-                            self.beginRate.tzlxList = self.beginRate.tzlxData.split(";");
-                            self.beginRate.jsddList = self.beginRate.jsddData.split(";");
-                            res.data.yearAmtSj = (res.data.yearAmtSj ? res.data.yearAmtSj : 0);
-                            res.data.yearAmtAssign = (res.data.yearAmtAssign ? res.data.yearAmtAssign : 0);
-                            res.data.yearAmt = (res.data.yearAmt ? res.data.yearAmt : 0);
-
-                            self.beginRate.yearAmtSj = res.data.monthAmtSj
-                            self.beginRate.yearAmtAssign = res.data.monthAmtAssign
-                            self.beginRate.yearAmt = res.data.monthAmt
-                            if (res.data.total != 0) {
-                                self.beginRate.beginRate = (res.data.beginNum * 100 / res.data.total).toFixed(2);
-                                self.beginRate.endRate = (res.data.endNum * 100 / res.data.total).toFixed(2);
-                            } else {
-                                self.beginRate.beginRate = 0;
-                                self.beginRate.endRate = 0;
-                            }
-                            if (res.data.yearAmt != 0) {
-                                self.beginRate.amtRate = (res.data.yearAmtSj * 100 / res.data.yearAmt).toFixed(2);
-                            } else if (res.data.yearAmtSj != 0) {
-                                self.beginRate.amtRate = 100;
-                            } else {
-                                self.beginRate.amtRate = 0;
-                            }
-                            if (res.data.total != 0) {
-                                self.beginRate.noRate = (res.data.noNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.beginRate = (res.data.beginNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.endRate = (res.data.endNum * 100 / res.data.total).toFixed(2) + '%';
-                                self.beginRate.stopRate = (res.data.stopNum * 100 / res.data.total).toFixed(2) + '%';
-                            } else {
-                                self.beginRate.noRate = "0%";
-                                self.beginRate.beginRate = "0%";
-                                self.beginRate.endRate = "0%";
-                                self.beginRate.stopRate = "0%";
-                            }
-
-                        } else {
-                            self.beginRate.beginRate = 0;
-                            self.beginRate.amtRate = 0;
-                            self.beginRate.endRate = 0;
                         }
                     });
                 },
@@ -1192,14 +1068,12 @@
                                 width: 100,
                                 templet: '#offsetLight'
                             },
-                            {field: 'amtTotal', title: '投资金额', minWidth: 250, templet: '#amt', sort: true},
+                            {field: 'amtTotal', title: '投资金额', minWidth: 250},
                             {field: 'fileId', title: '现场影像', width: 90, templet: '#imageDiv'},
                             {field: 'state', title: '计划时间', width: 140, templet: '#date'},
-                            // {field: 'leaderName', title: '分管领导', minWidth: 180, templet: '#leaderInfo'},
                             {field: 'statusName', title: '项目进度', width: 60},
                             {field: 'mainName', title: '日常责任监管单位', minWidth: 100},
                             {field: 'unitName', title: '项目单位', minWidth: 110},
-                            // { field: 'openLight', title: '开工红黄灯', minWidth: 150, templet: '#openLight' },
                             {title: '操作', width: 180, toolbar: '#toolBar', fixed: 'right',},
                         ]],
                         fixed: true,

projects/src/main/webapp/vmodules/workBench/zr_gzt.jsp

@@ -47,58 +47,18 @@
         <%--政府端--%>
         <div class="top_bar" v-if="kingUnit=='1'">
             <div class="left">
-                <%--				<div class="layui-card active" @click="initChart(this)">--%>
-                <%--					<div class="layui-card-header"></div>--%>
-                <%--					<div class="layui-card-body" style="padding-top: 15px;">--%>
-                <%--						<img src="${WebSite.asset }/css/images/u394.svg" /> 工作台账--%>
-                <%--					</div>--%>
-                <%--				</div>--%>
-<%--                <div class="layui-card" @click="getTotalTodo(this)">--%>
-<%--                    <div class="layui-card-body">--%>
-<%--                        <div class="img_num">--%>
-<%--                            <img src="${WebSite.asset }/css/images/workPlat/backlog.png"/>--%>
-<%--                            <span class="num">${numData.num_1}</span>--%>
-<%--                        </div>--%>
-<%--                        <div class="word">--%>
-<%--                            待办事项--%>
-<%--                        </div>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--                <div class="line"></div>--%>
-                <%-- <div class="layui-card" @click="getTotalDo(this)">
-                    <div class="layui-card-header"></div>
-                    <div class="layui-card-body" style="padding-top: 15px;">
-                        <img src="${WebSite.asset }/css/images/u138.svg" /> 已办事项
-                    </div>
-                </div> --%>
-<%--                <div class="layui-card" @click="toYQ()">--%>
                 <div class="layui-card">
                     <div class="layui-card-body">
                         <div class="img_num">
                             <img src="${WebSite.asset }/css/images/workPlat/remind.png"/>
-<%--                            <span class="num">${numData.num_2}</span>--%>
                             <span class="num">${warningNum}</span>
                         </div>
                         <div class="word">
-<%--                            项目逾期竣工--%>
                                 预警提醒
                         </div>
                     </div>
                 </div>
-<%--                <div class="line"></div>--%>
-<%--                <div class="layui-card" @click="openCt()">--%>
-<%--                    <div class="layui-card-body">--%>
-<%--                        <div class="img_num">--%>
-<%--                            <img src="${WebSite.asset }/css/images/workPlat/remind.png"/>--%>
-<%--                            <span class="num">${openNum}</span>--%>
-<%--                        </div>--%>
-<%--                        <div class="word">--%>
-<%--                            开工红黄灯预警--%>
-<%--                        </div>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
                 <div class="line"></div>
-<%--                <div class="layui-card" @click="offsetCt()">--%>
                 <div class="layui-card" @click="toYQ">
                     <div class="layui-card-body">
                         <div class="img_num">
@@ -106,63 +66,11 @@
                             <span class="num">${exceedNum}</span>
                         </div>
                         <div class="word">
-<%--                            偏离度红黄灯--%>
                             进度红灯
                         </div>
                     </div>
                 </div>
-<%--                <div class="line" style="display: none"></div>--%>
-<%--                <div class="layui-card" @click="toItems(7)" style="display: none">--%>
-<%--                    <div class="layui-card-body">--%>
-<%--                        <div class="img_num">--%>
-<%--                            <img src="${WebSite.asset }/css/images/workPlat/rgb.png"/>--%>
-<%--                        </div>--%>
-<%--                        <div class="word">--%>
-<%--                            红黄绿灯--%>
-<%--                        </div>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-<%--                <div class="line"></div>--%>
-<%--                <div class="layui-card">--%>
-<%--                    <div class="layui-card-body" @click="toItems(6)">--%>
-<%--                        <div class="img_num">--%>
-<%--                            <img src="${WebSite.asset }/css/images/workPlat/wisdom.png"/>--%>
-<%--                        </div>--%>
-<%--                        <div class="word">--%>
-<%--                            智慧工地--%>
-<%--                        </div>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
-                <%--                <div class="layui-card">--%>
-                <%--                    <div class="layui-card-body" @click="toItems(5)">--%>
-                <%--                        <div class="img_num">--%>
-                <%--                            <img src="${WebSite.asset }/css/images/workPlat/flow.png"/>--%>
-                <%--                        </div>--%>
-                <%--                        <div class="word">--%>
-                <%--                            办事流程--%>
-                <%--                        </div>--%>
-                <%--                    </div>--%>
-                <%--                </div>--%>
-<%--                <div class="line" style="display: none"></div>--%>
-<%--                <div class="layui-card" style="margin-bottom: 17px;display: none" >--%>
-<%--                    <div class="layui-card-body" @click="toItems(4)">--%>
-<%--                        <div class="img_num">--%>
-<%--                            <img src="${WebSite.asset }/css/images/workPlat/project.png"/>--%>
-<%--                        </div>--%>
-<%--                        <div class="word">--%>
-<%--                            包联项目--%>
-<%--                        </div>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
             </div>
-            <%--			<div class="tips">--%>
-            <%--				<span>提示：</span>--%>
-            <%--				<ul>--%>
-            <%--					<li>1.如果是新项目申报，请在&lt;<a href="${domain }/subject/subInfo/report">项目信息</a>&gt;里，点击新增进行项目申报</li>--%>
-            <%--					<li>2.如果需要查询项目基本信息和进度等，请到&lt;<a href="${domain }/subject/subInfo/projTz">项目信息台帐</a>&gt;页面查询</li>--%>
-            <%--					<li>3.进入施工阶段后，需要编制计划，项目开工申报，竣工申报，项目变更，请到&lt;<a href="${domain }/subject/process/manage">项目施工阶段管理</a>&gt;页面</li>--%>
-            <%--				</ul>--%>
-            <%--			</div>--%>
             <div class="right">
                 <div class="layui-card bgc">
                     <div class="layui-card-body" @click="toItems(1)" style="padding-top: 0;">
@@ -195,21 +103,10 @@
                     </div>
                 </div>
             </div>
-            <%--			<div class="right" @click="reportEdit()">--%>
-            <%--				<span class="layui-badge">${numData.num_3}</span>--%>
-            <%--				<img src="${WebSite.asset }/css/images/u397.svg" /> --%>
-            <%--				<span class="txt">写周报</span>--%>
-            <%--			</div>--%>
         </div>
         <%--企业端--%>
         <div class="top_bar" v-if="kingUnit=='2'">
             <div class="left" style="width: 52%">
-                <%--				<div class="layui-card active" @click="initChart(this)">--%>
-                <%--					<div class="layui-card-header"></div>--%>
-                <%--					<div class="layui-card-body" style="padding-top: 15px;">--%>
-                <%--						<img src="${WebSite.asset }/css/images/u394.svg" /> 工作台账--%>
-                <%--					</div>--%>
-                <%--				</div>--%>
                 <div class="layui-card" @click="getTotalTodo(this)">
                     <div class="layui-card-body">
                         <div class="img_num">
@@ -222,12 +119,6 @@
                     </div>
                 </div>
                 <div class="line"></div>
-                <%-- <div class="layui-card" @click="getTotalDo(this)">
-                    <div class="layui-card-header"></div>
-                    <div class="layui-card-body" style="padding-top: 15px;">
-                        <img src="${WebSite.asset }/css/images/u138.svg" /> 已办事项
-                    </div>
-                </div> --%>
                 <div class="layui-card" @click="toYQ()">
                     <div class="layui-card-body">
                         <div class="img_num">
@@ -235,24 +126,10 @@
                             <span class="num">${numData.num_2}</span>
                         </div>
                         <div class="word">
-<%--                            预警提醒--%>
-<%--                                 项目逾期竣工--%>
                                 预警提醒
                         </div>
                     </div>
                 </div>
-<%--                <div class="line"></div>--%>
-<%--                <div class="layui-card" @click="openCt()">--%>
-<%--                    <div class="layui-card-body">--%>
-<%--                        <div class="img_num">--%>
-<%--                            <img src="${WebSite.asset }/css/images/workPlat/remind.png"/>--%>
-<%--                            <span class="num">${openNum}</span>--%>
-<%--                        </div>--%>
-<%--                        <div class="word">--%>
-<%--                            开工红黄灯预警--%>
-<%--                        </div>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
                 <div class="line"></div>
                 <div class="layui-card" @click="offsetCt()">
                     <div class="layui-card-body">
@@ -288,22 +165,10 @@
                     </div>
                 </div>
             </div>
-<%--            <div class="tips">--%>
-<%--                <span>快捷提示</span>--%>
-<%--                <ul>--%>
-<%--                    <li>新项目申报，点击<a href="${domain }/subject/subInfo/report">项目信息</a>申报，点击新增进行项目申报；查询项目基本信息和进度等，点击<a--%>
-<%--                            href="${domain }/subject/subInfo/projTz">项目信息台帐</a>；施工阶段，编制计划，开工申报，竣工申报，项目变更，点击<a--%>
-<%--                            href="${domain }/subject/process/manage">项目施工阶段管理</a>--%>
-<%--                    </li>--%>
-<%--                </ul>--%>
-<%--            </div>--%>
             <div class="tips">
                 <span>快捷提示</span>
                 <ul>
                     <li>新项目申报，1.点击<a href="${domain }/subject/subInfo/report">【项目信息申报】</a>，然后点击新增进行项目申报；2.点击<a @click="add()">【新增项目】</a>直接进行申报；
-<%--                        查询项目基本信息和进度等，点击<a--%>
-<%--                            href="${domain }/subject/subInfo/projTz">项目信息台帐</a>；施工阶段，编制计划，开工申报，竣工申报，项目变更，点击<a--%>
-<%--                            href="${domain }/subject/process/manage">项目施工阶段管理</a>--%>
                     </li>
                 </ul>
             </div>
@@ -313,9 +178,6 @@
             <section class="section1">
                 <div class="box1">
                     <div class="build-rate-charts" id="charts-year-start"></div>
-                    <%--                    <div class="num_box">--%>
-                    <%--                        <span class="num" id="year"></span>--%>
-                    <%--                    </div>--%>
                     <div class="plan_number">
                         <div class="nummber_top" style="border-bottom: 1px solid #EDEDED;display: flex;flex-direction:column;align-items:flex-start;">
                             <div>
@@ -341,42 +203,7 @@
                                 <span class="title">投产项目数</span>
                                 <span class="num" id="tcNum"></span>
                             </div>
-<%--                            <div class="num_box" style="border-right: 1px solid #EDEDED;">--%>
-<%--                                <span class="num_unit">--%>
-<%--                                    <span class="num" id="proTotalNum"></span>--%>
-<%--                                    <span style="font-size: 16px;color: #111111">个</span>--%>
-<%--                                </span>--%>
-<%--                                <span class="title">项目总数</span>--%>
-<%--                            </div>--%>
-<%--                            <div class="num_box">--%>
-<%--                                <span class="num_unit">--%>
-<%--                                    <span class="num" id="proDoingNum"></span>--%>
-<%--                                    <span style="font-size: 16px;color: #111111">个</span>--%>
-<%--                                </span>--%>
-<%--                                <span class="title">已开工</span>--%>
-<%--                            </div>--%>
                         </div>
-<%--                        <div class="nummber_top">--%>
-<%--                            <div class="num_box" style="border-right: 1px solid #EDEDED;">--%>
-<%--                                <span class="num_unit">--%>
-<%--                                    <span class="num" id="proNoStartNum"></span>--%>
-<%--                                    <span style="font-size: 16px;color: #111111">个</span>--%>
-<%--                                </span>--%>
-<%--                                <span class="title">未开工</span>--%>
-
-<%--                            </div>--%>
-<%--                            <!-- <div class="num_box">--%>
-<%--                                <span class="num" style="color: #fc1cf4;" id="yearPlanNum"></span>--%>
-<%--                                年度计划完成--%>
-<%--                            </div> -->--%>
-<%--                            <div class="num_box">--%>
-<%--                                <span class="num_unit">--%>
-<%--                                    <span class="num" id="proEndNum"></span>--%>
-<%--                                    <span style="font-size: 16px;color: #111111">个</span>--%>
-<%--                                </span>--%>
-<%--                                <span class="title">已竣工</span>--%>
-<%--                            </div>--%>
-<%--                        </div>--%>
                     </div>
 
                 </div>
@@ -395,91 +222,20 @@
                             <span class="num" id="redNum">${outsideNum}</span>
                         </div>
                     </div>
-<%--                    <div class="monthly-charts" id="charts-year-done"></div>--%>
-<%--                    <div class="plan_number">--%>
-<%--                        <div class="nummber_top" style="border-bottom: 1px solid #EDEDED;">--%>
-<%--                            <div class="num_box" style="width: 100%">--%>
-<%--                                <span class="num_unit">--%>
-<%--                                    <span class="num" id="proPlanAmt"></span>--%>
-<%--                                    <span style="font-size: 16px;color: #111111">亿</span>--%>
-<%--                                </span>--%>
-<%--                                <span class="title">年度目标总投资</span>--%>
-<%--                            </div>--%>
-<%--                        </div>--%>
-<%--                        <div class="nummber_top">--%>
-<%--                            <div class="num_box" style="border-right: 1px solid #EDEDED;width: 50%;">--%>
-<%--                                <span class="num_unit">--%>
-<%--                                    <span class="num" id="proActualTotal"></span>--%>
-<%--                                    <span style="font-size: 16px;color: #111111">亿</span>--%>
-<%--                                </span>--%>
-<%--                                <span class="title">年度计划投资</span>--%>
-<%--                            </div>--%>
-<%--                            <div class="num_box" style="border-right: 1px solid #EDEDED;width: 50%;">--%>
-<%--                                <span class="num_unit">--%>
-<%--                                    <span class="num" id="proActualTotalGt"></span>--%>
-<%--                                    <span style="font-size: 16px;color: #111111">亿</span>--%>
-<%--                                </span>--%>
-<%--                                <span class="title">年度固投金额</span>--%>
-<%--                            </div>--%>
-<%--                            <!-- <div class="num_box">--%>
-<%--                                <span class="num" style="color: #fc1cf4;" id="yearPlanNum"></span>--%>
-<%--                                年度计划完成--%>
-<%--                            </div> -->--%>
-<%--                            <div class="num_box" style="width: 50%;">--%>
-<%--                                <span class="num_unit">--%>
-<%--                                    <span class="num" id="proActualAmt"></span>--%>
-<%--                                    <span style="font-size: 16px;color: #111111">亿</span>--%>
-<%--                                </span>--%>
-<%--                                <span class="title">年度实际投资</span>--%>
-<%--                            </div>--%>
-<%--                        </div>--%>
-<%--                    </div>--%>
                 </div>
-                <%--                <div class="box3">--%>
-                <%--                    <div class="txt">整体进度</div>--%>
-                <%--                    <div class="layui-progress" lay-showPercent="true" lay-filter="demo">--%>
-                <%--                        <div class="layui-progress-bar" id="propercent"></div>--%>
-                <%--                    </div>--%>
-                <%--                </div>--%>
             </section>
             <section class="section2">
                 <div class="layui-card" style="box-shadow: 0px 0px 0px 0px transparent;">
-<%--                    <div class="layui-card-header" style="border:none;display: flex;">--%>
-<%--                        <span :class="{activeSpan:checkChart==1}" @click="checkChartFun(1)">项目数量占比</span>--%>
-<%--                        <span :class="{activeSpan:checkChart==2}" @click="checkChartFun(2)" style="margin-left: 20px;">项目投资占比</span>--%>
-<%--                    </div>--%>
                     <div class="layui-card-body" style="border:none">
                         <div class="chart" id="charts1" v-if="checkChart==1"></div>
-<%--                        <div class="chart" id="charts2" v-if="checkChart==2"></div>--%>
                     </div>
                 </div>
-<%--                <div class="layui-card" style="box-shadow: 0px 0px 0px 0px transparent;">--%>
-<%--                    <div class="layui-card-header" style="border:none">--%>
-<%--                        <span class="activeSpan">投资情况月度分析</span>--%>
-<%--                    </div>--%>
-<%--                    <div class="layui-card-body" style="border:none">--%>
-<%--                        <div class="chart" id="charts3"></div>--%>
-<%--                    </div>--%>
-<%--                </div>--%>
             </section>
         </div>
 
     </div>
     <div id="toDo">
     </div>
-    <%--	<c:if test="${overAmount.isOver != '0' || overAmount.willOver != '0'}">--%>
-    <%--		<ul class="layui-fixbar" id="fixedBlock" style="right: 10px; bottom: 0px;width:200px;height:90px;display:none;">--%>
-    <%--		  <li class="" style="width:200px;height:26px;line-height:26px;font-size:14px;background-color:#3362c9;color:#fafafa;border-radius: 7px 7px 0px 0px;">--%>
-    <%--		  	<span style="position: relative;left: -50px;bottom:0;">逾期提醒</span>--%>
-    <%--		  </li>--%>
-    <%--		  <li class="" style="width:200px;height:32px;line-height:32px;background-color:#fff;color:#f69401;font-size:14px;" @click="loadOverDue(0)">--%>
-    <%--		  	<i class="layui-icon layui-icon-radio" style="position: relative;left: -25px;"></i><span style="position: relative;left: -15px;">即将逾期:</span><i style="position:relative;left:20px;"><span>${overAmount.willOver}</span><a href="javascript:void(0);" style="color:#5b64d7;">></a></i>--%>
-    <%--		  </li>--%>
-    <%--		  <li class="" style="width:200px;height:32px;line-height:32px;background-color:#fff;color:#ff2222;border-radius: 0px 0px 7px 7px;font-size:14px;" @click="loadOverDue(1)">--%>
-    <%--		  	<i class="layui-icon icon-diy" style="position: relative;left: -28px;"></i><span style="position: relative;left: -18px;">已逾期:</span><i style="position:relative;left:28px;"><span>${overAmount.isOver}</span><a href="javascript:void(0);" style="color:#5b64d7;">></a></i>--%>
-    <%--		  </li>--%>
-    <%--		</ul>--%>
-    <%--	</c:if>--%>
 </div>
 </body>
 <script type="text/javascript">
@@ -495,7 +251,6 @@
         methods: {
             init: function () {
                 this.initChartsYearStart();
-                // this.initChartsYearDone();
                 this.initChart();
             },
 
@@ -524,12 +279,6 @@
                             xjNum: res.data.xjNum,
                             zjNum: res.data.zjNum,
                             tcNum: res.data.tcNum
-                            // nProNum: res.data.zhData.num_X1_total,
-                            // nProNumRate: res.data.zhData.num_X1_zb,
-                            // xProNum: res.data.zhData.num_X2_total,
-                            // xProNumRate: res.data.zhData.num_X2_zb,
-                            // cProNum: res.data.zhData.num_X3_total,
-                            // cProNumRate: res.data.zhData.num_X3_zb,
                         };
                         data.chart2Data = {
                             nProMon: res.data.zhData.amt_X1_total,
@@ -566,17 +315,10 @@
                         if (res.data.yearKgl){
                             self.beginBl = res.data.yearKgl;
                         }
-                        // if(res.data.zhData.num_total!=0){
-                        //     self.beginBl = ((res.data.zhData.num_2 + res.data.zhData.num_3) * 100 / res.data.zhData.num_total).toFixed(2);
-                        // }else{
-                        //     self.beginBl=0;
-                        // }
-
                         self.initChart1(data.chart1Data);
                         self.initChart2(data.chart2Data);
                         self.initChart3(data.chart3Data);
                         self.initChartsYearStart();
-                        // self.initChartsYearDone();
                         setTimeout(() => {
                             layui.element.progress('demo', res.data.zhData.num_bl || '0%');
                         }, 100);
@@ -585,19 +327,13 @@
             },
 
             getTotalTodo: function (target) {
-                //this.changeTab(target);
                 $("#chart").hide();
-                // $("#fixedBlock").hide();
                 $("#toDo").show();
                 $("#toDo").load(App.getUrl("workBench/toDoView"));
-
-                // window.location.href = App.getUrl("/workBench/toDoView");
             },
 
             getTotalDo: function (target) {
-                // this.changeTab(target);
                 $("#chart").hide();
-                // $("#toDo").show();
                 $("#fixedBlock").hide();
                 $("#toDo").load(App.getUrl("workBench/doView"));
             },
@@ -610,7 +346,6 @@
             },
 
             toYQ: function () {
-                //window.location.href = App.getUrl("/overdue/view?overStatus=2");
                 window.location.href = App.getUrl("/problem/info/index");
 
             },
@@ -1066,6 +801,5 @@
             }
         }
     })
-
 </script>
 </html>