Merge branch 'master' of http://8.137.121.180:10880/longping/subject_gxj

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

@@ -196,6 +196,9 @@
             <if test="vo.subName!=null and vo.subName!=''">
                 and s.sub_name like CONCAT('%', #{vo.subName}, '%')
             </if>
+            <if test="vo.cbStatus!=null and vo.cbStatus!=''">
+                and s.cb_status = #{vo.cbStatus}
+            </if>
             <if test="vo.kindNature!=null and vo.kindNature!=''">
                 and s.kind_nature = #{vo.kindNature}
             </if>
@@ -282,6 +285,9 @@
             <if test="vo.subName!=null and vo.subName!=''">
                 and sub_name like CONCAT('%', #{vo.subName}, '%')
             </if>
+            <if test="vo.cbStatus!=null and vo.cbStatus!=''">
+                and cb_status = #{vo.cbStatus}
+            </if>
             <if test="vo.subjectId!=null and vo.subjectId!=''">
                 and subject_id = #{vo.subjectId}
             </if>
@@ -394,6 +400,7 @@
             cb_num AS cbNum,
             xj_num AS xjNum,
             zj_num AS zjNum,
+            indus_name AS indusName,
             remark,
             name_zrr AS nameZrr,
             tel AS tel,
@@ -771,6 +778,7 @@
         sub_info.subject_id AS subjectId,
         sub_info.indus_kind AS indusKind,
         sub_info.is_rg AS isRg,
+        sub_info.cb_status AS cbStatus,
         sub_info.abc AS abc
         FROM sub_fix
         LEFT JOIN sub_info ON sub_fix.sub_id = sub_info.id

projects-service/src/main/java/com/rtrh/projects/modules/projects/po/SubInfoGxj.java

@@ -161,7 +161,7 @@ public class SubInfoGxj extends TableBaseColomn implements Serializable {
     private Long preProceNum;
     private Long preEndNum;
     private String yearAmtSj;
-    private String yearPlanAmt;
+    private BigDecimal yearPlanAmt;
 
     private String preContent;
 }

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

@@ -211,6 +211,7 @@ public class SubInfoQueryServiceImpl implements SubInfoQueryService {
 
         if (CollectionUtil.isNotEmpty(data)) {
             for (SubInfoGxj e : data) {
+                e.setStatusName(SubInfoStatusEnum.getDesc(e.getStatus()));
                 e.setSubjectName(kindMap.get(e.getSubjectId()));
                 // [在建、投产] 项目进度为月报内容
                 if (Arrays.asList(SubInfoStatusEnum.ZJ.getCode(), SubInfoStatusEnum.TC.getCode()).contains(e.getStatus())) {

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

@@ -15,6 +15,7 @@ import com.rtrh.projects.modules.projects.mapper.SubInfoMapper;
 import com.rtrh.projects.modules.projects.po.SubInfoGxj;
 import com.rtrh.projects.modules.projects.service.SubInfoService;
 import com.rtrh.projects.modules.projects.vo.SubInfoQueryTzVO;
+import com.rtrh.projects.util.DataConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -118,11 +119,11 @@ public class WorkBenchServiceImpl implements WorkBenchService {
 		Long withinNum = subInfoService.queryExceedWithin();
 		// 红灯超期超过3天
 		Long outsideNum = subInfoService.queryExceedOutside();
-		map.put("warningNum", warningNum);
-		map.put("exceedNum", exceedNum);
-		map.put("notExceedNum", notExceedNum);
-		map.put("withinNum", withinNum);
-		map.put("outsideNum", outsideNum);
+		map.put("warningNum", DataConvertUtil.intToRoman(warningNum.intValue()));
+		map.put("exceedNum", DataConvertUtil.intToRoman(exceedNum.intValue()));
+		map.put("notExceedNum", DataConvertUtil.intToRoman(notExceedNum.intValue()));
+		map.put("withinNum", DataConvertUtil.intToRoman(withinNum.intValue()));
+		map.put("outsideNum", DataConvertUtil.intToRoman(outsideNum.intValue()));
 		return map;
 	}
 

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

@@ -350,6 +350,8 @@ public class SubInfoQueryTzVO {
 
     //投资类型
     private String kindNatures;
+    // 储备项目状态
+    private String cbStatus;
 
 
     //所属行业

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

@@ -4,6 +4,8 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Date;
 
 @Data
@@ -13,12 +15,16 @@ public class SubInfoZjVO extends SubInfoBaseDetailVo {
     @Excel(name = "建成投产时间", format = "yyyy年MM月", width = 15.0, orderNum = "5")
     private Date endDate;
 
-    @Excel(name = "年度投资", orderNum = "6")
-    private String yearPlanAmt;
+    @Excel(name = "年度投资(亿元)", orderNum = "6")
+    private BigDecimal yearPlanAmt;
 
     @Excel(name = "进展情况", width = 30.0, orderNum = "7")
     private String progress;
 
     @Excel(name = "备注", width = 30.0, orderNum = "8")
     private String remark;
+
+    public BigDecimal getYearPlanAmt() {
+        return this.yearPlanAmt != null ? this.yearPlanAmt.divide(new BigDecimal(10000), 2, RoundingMode.HALF_UP) : null;
+    }
 }

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

@@ -1,16 +1,13 @@
 package com.rtrh.projects.modules.projects.vo.export;
 
 import cn.afterturn.easypoi.excel.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
-@EqualsAndHashCode(callSuper = true)
-public class SubInfoZkVO extends SubInfoBaseDetailVo {
+public class SubInfoZkVO {
     @Excel(name = "序号")
     private String index;
 

projects-service/src/main/java/com/rtrh/projects/util/DataConvertUtil.java

@@ -0,0 +1,26 @@
+package com.rtrh.projects.util;
+
+public class DataConvertUtil {
+    public static String intToRoman(int num) {
+        if (num < 1) {
+            return String.valueOf(num);
+        }
+
+        int[] values = {
+                1000000, 900000, 500000, 400000, 100000, 90000, 50000, 40000, 10000, 9000,
+                5000, 4000, 1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1};
+        String[] romanNumerals = {
+                "M̄", "C̄M̄", "D̄", "C̄D̄", "C̄", "X̄C̄", "L̄", "X̄L̄", "X̄", "ĪX̄",
+                "V̄", "ĪV̄", "M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX", "V", "IV", "I"};
+
+        StringBuilder roman = new StringBuilder();
+        // 遍历罗马数字数组，将其值减去相应的阿拉伯数字
+        for (int i = 0; i < values.length && num >= 0; i++) {
+            while (values[i] <= num) {
+                roman.append(romanNumerals[i]);
+                num -= values[i];
+            }
+        }
+        return roman.toString();
+    }
+}

projects-service/src/main/java/com/rtrh/projects/vo/projects/SubFixBeginVo.java

@@ -9,19 +9,19 @@ import java.util.Map;
 @Data
 public class SubFixBeginVo {
 
-    private Integer total;  //项目总数
+    private String total;  //项目总数
 
-    private Integer aTotal; //a类项目总数
+    private String aTotal; //a类项目总数
 
-    private Integer bTotal; //b类项目总数
+    private String bTotal; //b类项目总数
 
-    private Integer cTotal; //c类项目总数
+    private String cTotal; //c类项目总数
 
-    private Integer dTotal; //d类项目总数
+    private String dTotal; //d类项目总数
 
-    private Integer kgTotal;    //开工数量
+    private String kgTotal;    //开工数量
 
-    private Integer rgTotal;    //入轨数量
+    private String rgTotal;    //入轨数量
 
     private BigDecimal zhl;   //转换率 = 在建+投产/新建+在建+投产
 
@@ -35,4 +35,9 @@ public class SubFixBeginVo {
 
     private List<SubFixTotalVo> indusKindList;        //行业数量
 
+    private String bePlanningNum;  // 正在谋划
+    private String negotiationNum;  // 正在洽谈
+    private String signedNum;   // 已签约
+    private String recordAndApproveNum; // 已备案、已核准
+
 }

projects-service/src/main/java/com/rtrh/projects/vo/projects/SubFixGetBeginRateVo.java

@@ -16,6 +16,8 @@ public class SubFixGetBeginRateVo {
     private Integer isRg;
     //abcd类项目
     private String abc;
+    // 储备项目状态
+    private String cbStatus;
 
 
 }

projects-service/src/main/java/com/rtrh/projects/vo/projects/SubFixTotalVo.java

@@ -9,6 +9,6 @@ public class SubFixTotalVo {
 
     private String title;
 
-    private Integer total;
+    private String total;
 
 }

projects/src/main/java/com/rtrh/projects/outapi/controller/AuthApiController.java

@@ -6,6 +6,7 @@ import java.util.Objects;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.rtrh.projects.modules.account.service.CommLoginService;
 import com.rtrh.projects.modules.rolemeun.dao.SecRoleMeunDao;
 import com.rtrh.projects.modules.rolemeun.po.SecRole;
 import com.rtrh.projects.modules.rolemeun.po.SecRoleMeun;
@@ -49,7 +50,8 @@ public class AuthApiController extends BaseOutApiController {
 	private VCodeManager vCodeManager;
 	@Autowired
 	private SecRoleservice secRoleservice;
-
+	@Autowired
+	private CommLoginService commLoginService;
 	/**
 	 * 登录
 	 * @param loginName
@@ -128,6 +130,13 @@ public class AuthApiController extends BaseOutApiController {
 			String tokenApp = jwtUtils.createToken(user);
 			result.setData("token",tokenApp);
 
+			// 记录登录日志
+			// String ip = RemoteUtil.getIpAddress(request);
+			// String city = RemoteUtil.getCity(ip);
+			// String ua = request.getHeader("User-Agent");
+			// commLoginService.logRecord(ip, user.getLogin(), city, ua, null, true);
+
+
 			Boolean isLead=user.getIsLead()==null?false:user.getIsLead();
 
 			String roleCode="";

projects/src/main/java/com/rtrh/projects/web/base/WebBootModeServlet.java

@@ -8,6 +8,7 @@ import java.io.UnsupportedEncodingException;
 import java.text.ParseException;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.ResourceBundle;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;

projects/src/main/java/com/rtrh/projects/web/controller/fileSystem/FileGetController.java

@@ -162,7 +162,7 @@ public class FileGetController {
 					// 创建一个HttpGet请求
 					ResourceBundle resourceBundle = ResourceBundle.getBundle("config");
 					// 拼接 B 系统的 URL
-					String url = resourceBundle.getString("app.fgw.url");
+					String url = resourceBundle.getString("app.fgw.in.url");
 					url = url + "/static/file/"+fileId;
 					// 创建一个HttpGet请求
 					HttpGet request = new HttpGet(url);

projects/src/main/java/com/rtrh/projects/web/controller/fileSystem/FilePostController.java

@@ -188,7 +188,7 @@ public class FilePostController {
 						// 创建一个HttpGet请求
 						ResourceBundle resourceBundle = ResourceBundle.getBundle("config");
 						// 拼接 B 系统的 URL
-						String url = resourceBundle.getString("app.fgw.url");
+						String url = resourceBundle.getString("app.fgw.in.url");
 						url = url + "/static/file/saveOfficialDocument";
 						HttpPost request = new HttpPost(url);
 						// 设置请求头，指明内容类型为JSON

projects/src/main/java/com/rtrh/projects/web/controller/passport/api/RegisterApiController.java

@@ -147,7 +147,7 @@ public class RegisterApiController extends BaseController{
 //			message.add(pageData.getList(), pageData.getTotalCount());
 		} catch (Exception e) {
 			logger.error("",e);
-			message.add("获取失败");
+			message.add(e.getMessage());
 		}
 		return message;
 	}

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

@@ -943,6 +943,7 @@ public class SubInfoExportController extends BaseController {
             workbook = ExcelExportUtil.exportExcel(exportParams, SubInfoTcVO.class, exportList);
             extracted(response, list, workbook, allSize);
         } else {
+            // 项目总库
             List<SubInfoZkVO> exportList = new ArrayList<>();
             // 合计行
             SubInfoZkVO hjCount = new SubInfoZkVO();
@@ -977,28 +978,6 @@ public class SubInfoExportController extends BaseController {
             exportParams.setStyle(ExcelStyleUtil.class);
             // exportParams.setHeight((short) -1);
             workbook = ExcelExportUtil.exportExcel(exportParams, SubInfoZkVO.class, exportList);
-            // workbook = ExcelExportUtil.exportBigExcel(exportParams, SubInfoZkVO.class, new IExcelExportServer() {
-            //     /**
-            //      * obj 就是下面的限制条件
-            //      * page 是页数，他是在分页进行文件转换，page每次+1
-            //      */
-            //     @Override
-            //     public List<Object> selectListForExcelExport(Object obj, int page) {
-            //         int pageSize = 100;
-            //         int fromIndex = (page - 1) * pageSize;
-            //         int toIndex = Math.min(fromIndex + pageSize, exportList.size());
-            //
-            //         // 如果 fromIndex 超过了列表大小，返回空列表
-            //         if (fromIndex >= exportList.size()) {
-            //             return null;
-            //         }
-            //         // 使用 subList 方法获取分页后的子列表
-            //         List<Object> list1 = new ArrayList<>();
-            //         List<SubInfoZkVO> zkVOList = exportList.subList(fromIndex, toIndex);
-            //         list1.addAll(zkVOList);
-            //         return list1;
-            //     }
-            // }, (exportList.size() / 10000) + 1);
             extracted(response, list, workbook, allSize);
         }
     }

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

@@ -5,22 +5,21 @@ import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import com.github.pagehelper.PageInfo;
 import com.rtrh.common.util.StringUtil;
 import com.rtrh.projects.modules.projects.dao.SubCompletedPicDao;
 import com.rtrh.projects.modules.projects.dao.SubSourceDao;
 import com.rtrh.projects.modules.projects.dto.SubFixCbSearch;
+import com.rtrh.projects.modules.projects.enums.SubInfoCbStatusEnum;
 import com.rtrh.projects.modules.projects.enums.SubInfoStatusEnum;
 import com.rtrh.projects.modules.projects.po.SubCompletedPic;
 import com.rtrh.projects.modules.projects.po.SubIndu;
-import com.rtrh.projects.modules.projects.po.SubSource;
 import com.rtrh.projects.modules.projects.vo.StatisticsVO;
-import com.rtrh.projects.modules.projects.vo.SubFixCbVo;
 import com.rtrh.projects.modules.projects.vo.SubSourceVO;
 import com.rtrh.projects.modules.system.enums.SysTableKind;
 import com.rtrh.projects.modules.system.po.TSystable;
 import com.rtrh.projects.modules.system.service.ISubInduService;
 import com.rtrh.projects.modules.system.service.TSysTableService;
+import com.rtrh.projects.util.DataConvertUtil;
 import com.rtrh.projects.vo.projects.SubFixBeginVo;
 import com.rtrh.projects.vo.projects.SubFixGetBeginRateVo;
 import com.rtrh.projects.vo.projects.SubFixTotalVo;
@@ -834,6 +833,13 @@ public class SubInfoQueryApiController extends BaseController {
             int bType = 0;  //b类项目
             int cType = 0;  //c类项目
             int dType = 0;  //d类项目
+
+
+            int bePlanningNum = 0;  // 正在谋划
+            int negotiationNum = 0;  // 正在洽谈
+            int signedNum = 0;   // 已签约
+            int recordAndApproveNum = 0; // 已备案、已核准
+
             int kgTotal = 0;    //开工数量
             int xjNumber = 0;   //新建数量
             int zjNumber = 0;   //在建数量
@@ -852,6 +858,17 @@ public class SubInfoQueryApiController extends BaseController {
                         dType++;
                     }
                 }
+                if (StringUtils.isNotBlank(subFixGetBeginRateVo.getCbStatus())){
+                    if (SubInfoCbStatusEnum.ZZMH.getCode().equals(subFixGetBeginRateVo.getCbStatus())){
+                        bePlanningNum++;
+                    }else if (SubInfoCbStatusEnum.ZZQT.getCode().equals(subFixGetBeginRateVo.getCbStatus())){
+                        negotiationNum++;
+                    }else if (SubInfoCbStatusEnum.YQY.getCode().equals(subFixGetBeginRateVo.getCbStatus())){
+                        signedNum++;
+                    }else if (SubInfoCbStatusEnum.YBA_YHZ.getCode().equals(subFixGetBeginRateVo.getCbStatus())){
+                        recordAndApproveNum++;
+                    }
+                }
 
                 if (StringUtils.isNotBlank(subFixGetBeginRateVo.getStatus())){
                     if (subFixGetBeginRateVo.getStatus().equals("3") || subFixGetBeginRateVo.getStatus().equals("9")){
@@ -905,13 +922,19 @@ public class SubInfoQueryApiController extends BaseController {
                 }
             }
 
-            subFixBeginVo.setTotal(subFixGetBeginRateVoList.size());
-            subFixBeginVo.setATotal(aType);
-            subFixBeginVo.setBTotal(bType);
-            subFixBeginVo.setCTotal(cType);
-            subFixBeginVo.setDTotal(dType);
-            subFixBeginVo.setKgTotal(kgTotal);
-            subFixBeginVo.setRgTotal(rgNumber);
+            subFixBeginVo.setTotal(DataConvertUtil.intToRoman(subFixGetBeginRateVoList.size()));
+            subFixBeginVo.setATotal(DataConvertUtil.intToRoman(aType));
+            subFixBeginVo.setBTotal(DataConvertUtil.intToRoman(bType));
+            subFixBeginVo.setCTotal(DataConvertUtil.intToRoman(cType));
+            subFixBeginVo.setDTotal(DataConvertUtil.intToRoman(dType));
+
+            subFixBeginVo.setBePlanningNum(DataConvertUtil.intToRoman(bePlanningNum));
+            subFixBeginVo.setNegotiationNum(DataConvertUtil.intToRoman(negotiationNum));
+            subFixBeginVo.setSignedNum(DataConvertUtil.intToRoman(signedNum));
+            subFixBeginVo.setRecordAndApproveNum(DataConvertUtil.intToRoman(recordAndApproveNum));
+
+            subFixBeginVo.setKgTotal(DataConvertUtil.intToRoman(kgTotal));
+            subFixBeginVo.setRgTotal(DataConvertUtil.intToRoman(rgNumber));
 
             int number = xjNumber+zjNumber+tcNumber;
             if (number != 0) {
@@ -934,7 +957,7 @@ public class SubInfoQueryApiController extends BaseController {
                 SubFixTotalVo subFixTotalVo = new SubFixTotalVo();
                 subFixTotalVo.setCode(key);
                 subFixTotalVo.setTitle(key);
-                subFixTotalVo.setTotal(value.size());
+                subFixTotalVo.setTotal(DataConvertUtil.intToRoman(value.size()));
                 subjectIdList.add(subFixTotalVo);
             });
 
@@ -958,7 +981,7 @@ public class SubInfoQueryApiController extends BaseController {
                 SubFixTotalVo subFixTotalVo = new SubFixTotalVo();
                 subFixTotalVo.setCode(key);
                 subFixTotalVo.setTitle(key);
-                subFixTotalVo.setTotal(value.size());
+                subFixTotalVo.setTotal(DataConvertUtil.intToRoman(value.size()));
                 indusKindList.add(subFixTotalVo);
             });
 
@@ -977,12 +1000,12 @@ public class SubInfoQueryApiController extends BaseController {
             subFixBeginVo.setIndusKindList(indusKindList);
 
         }else {
-            subFixBeginVo.setTotal(0);
-            subFixBeginVo.setATotal(0);
-            subFixBeginVo.setBTotal(0);
-            subFixBeginVo.setCTotal(0);
-            subFixBeginVo.setDTotal(0);
-            subFixBeginVo.setKgTotal(0);
+            subFixBeginVo.setTotal("0");
+            subFixBeginVo.setATotal("0");
+            subFixBeginVo.setBTotal("0");
+            subFixBeginVo.setCTotal("0");
+            subFixBeginVo.setDTotal("0");
+            subFixBeginVo.setKgTotal("0");
             subFixBeginVo.setZhl(new BigDecimal(0));
             subFixBeginVo.setKfgl(new BigDecimal(0));
             subFixBeginVo.setRgl(new BigDecimal(0));

projects/src/main/java/com/rtrh/projects/web/util/DataSourceAspect.java

@@ -18,7 +18,7 @@ public class DataSourceAspect {
         try {
             return point.proceed();
         } finally {
-            DataSourceContextHolder.clearDataSourceType();  // 执行完毕后清除数据源
+            DataSourceContextHolder.setDataSourceType("primary");
         }
     }
 }

projects/src/main/webapp/asset/css/indexScreen.css

@@ -31,12 +31,12 @@ body {
   align-items: baseline;
 }
 .header .left .left-time {
-  margin-left: calc(144 / 1920 * calc(100vw));
+  margin-left: calc(10 / 1920 * calc(100vw));
   margin-top: calc(16 / 1080 * calc(100vh));
   font-size: calc(30 / 1920 * calc(100vw));
 }
 .header .left .left-date {
-  margin-left: calc(10 / 1920 * calc(100vw));
+  margin-left: calc(144 / 1920 * calc(100vw));
   margin-top: calc(28 / 1080 * calc(100vh));
   font-size: calc(14 / 1920 * calc(100vw));
 }
@@ -152,9 +152,9 @@ body {
   color: white;
   font-size: calc(16 / 1920 * calc(100vw));
   font-family: PingFangSC, PingFang SC;
-  background-image: linear-gradient(to bottom, #fff 50%, #05f5eb);
+  /*background-image: linear-gradient(to bottom, #fff 50%, #05f5eb);*/
   -webkit-background-clip: text;
-  color: transparent;
+  /*color: transparent;*/
   font-weight: bold;
 }
 .main
@@ -168,9 +168,9 @@ body {
   font-size: calc(16 / 1920 * calc(100vw));
   margin-left: calc(20 / 1920 * calc(100vw));
   font-family: PingFangSC, PingFang SC;
-  background-image: linear-gradient(to bottom, #fff 50%, #05f5eb);
+  /*background-image: linear-gradient(to bottom, #fff 50%, #05f5eb);*/
   -webkit-background-clip: text;
-  color: transparent;
+  /*color: transparent;*/
   font-weight: bold;
 }
 .main
@@ -184,9 +184,9 @@ body {
   font-size: calc(16 / 1920 * calc(100vw));
   margin-left: calc(20 / 1920 * calc(100vw));
   font-family: PingFangSC, PingFang SC;
-  background-image: linear-gradient(to bottom, #fff 50%, #05f5eb);
+  /*background-image: linear-gradient(to bottom, #fff 50%, #05f5eb);*/
   -webkit-background-clip: text;
-  color: transparent;
+  /*color: transparent;*/
   font-weight: bold;
 }
 .main
@@ -200,9 +200,9 @@ body {
   font-size: calc(16 / 1920 * calc(100vw));
   margin-left: calc(22 / 1920 * calc(100vw));
   font-family: PingFangSC, PingFang SC;
-  background-image: linear-gradient(to bottom, #fff 50%, #05f5eb);
+  /*background-image: linear-gradient(to bottom, #fff 50%, #05f5eb);*/
   -webkit-background-clip: text;
-  color: transparent;
+  /*color: transparent;*/
   font-weight: bold;
 }
 .main .main-left .left-content .left-content-center .img {
@@ -251,9 +251,9 @@ body {
   margin-top: calc(28 / 1080 * calc(100vh));
   margin-left: calc(23 / 1080 * calc(100vh));
   font-family: PingFangSC, PingFang SC;
-  background-image: linear-gradient(to bottom, #fff 40%, #05f5eb);
+  /*background-image: linear-gradient(to bottom, #fff 40%, #05f5eb);*/
   -webkit-background-clip: text;
-  color: transparent;
+  /*color: transparent;*/
   font-weight: bold;
 }
 .main
@@ -463,9 +463,10 @@ body {
   margin-top: calc(7 / 1080 * calc(100vh));
   position: relative;
   z-index: 2;
-  background-image: linear-gradient(to bottom, #d0fffe 40%, #05f5eb);
+  /*background-image: linear-gradient(to bottom, #d0fffe 40%, #05f5eb);*/
   -webkit-background-clip: text;
-  color: transparent;
+  /*color: transparent;*/
+  color: white;
   font-weight: bold;
 }
 .main
@@ -529,9 +530,10 @@ body {
   .main-detail-bottom-bottom
   .left
   span:first-child {
-  background-image: linear-gradient(to bottom, #fff 40%, #fe8e8e);
+  /*background-image: linear-gradient(to bottom, #fff 40%, #fe8e8e);*/
   -webkit-background-clip: text;
-  color: transparent;
+  /*color: transparent;*/
+  color: white;
   font-size: calc(20 / 1920 * calc(100vw));
   display: inline-block;
   margin-left: calc(29 / 1920 * calc(100vw));
@@ -808,9 +810,10 @@ body {
   .main-detail-bottom-bottom
   .left
   span:first-child {
-  background-image: linear-gradient(to bottom, #fff 40%, #fe8e8e);
+  /*background-image: linear-gradient(to bottom, #fff 40%, #fe8e8e);*/
   -webkit-background-clip: text;
-  color: transparent;
+  /*color: transparent;*/
+  color: white;
   font-size: calc(20 / 1920 * calc(100vw));
   display: inline-block;
   margin-left: calc(29 / 1920 * calc(100vw));

projects/src/main/webapp/asset/js/util.js

@@ -0,0 +1,42 @@
+// 将阿拉伯数字转换为罗马数字
+function intToRoman(num) {
+    if (num < 1) {
+        return num;
+    }
+    const romanNumerals = [
+        {limit: 1000000, roman: "M̄"}, // 使用 M̄ 表示 1000000
+        {limit: 900000, roman: "C̄M̄"},
+        {limit: 500000, roman: "D̄"},
+        {limit: 400000, roman: "C̄D̄"},
+        {limit: 100000, roman: "C̄"},
+        {limit: 90000, roman: "X̄C̄"},
+        {limit: 50000, roman: "L̄"},
+        {limit: 40000, roman: "X̄L̄"},
+        {limit: 10000, roman: "X̄"},
+        {limit: 9000, roman: "ĪX̄"},
+        {limit: 5000, roman: "V̄"},
+        {limit: 4000, roman: "ĪV̄"}, // 使用 ĪV̄ 表示 4000
+        {limit: 1000, roman: "M"},
+        {limit: 900, roman: "CM"},
+        {limit: 500, roman: "D"},
+        {limit: 400, roman: "CD"},
+        {limit: 100, roman: "C"},
+        {limit: 90, roman: "XC"},
+        {limit: 50, roman: "L"},
+        {limit: 40, roman: "XL"},
+        {limit: 10, roman: "X"},
+        {limit: 9, roman: "IX"},
+        {limit: 5, roman: "V"},
+        {limit: 4, roman: "IV"},
+        {limit: 1, roman: "I"}
+    ];
+    let roman = '';
+    // 遍历罗马数字数组，将其值减去相应的阿拉伯数字
+    for (let i = 0; i < romanNumerals.length; i++) {
+        while (num >= romanNumerals[i].limit) {
+            roman += romanNumerals[i].roman;
+            num -= romanNumerals[i].limit;
+        }
+    }
+    return roman;
+}

projects/src/main/webapp/vmodules/annualPlan/list.jsp

@@ -379,7 +379,7 @@
                     type: 2,
                     title: "",
                     area: ['1000px', '800px'],
-                    content: App.getUrl("//subject/subInfo/detailView?layer=true&subId="+ obj.data.sub_id),
+                    content: App.getUrl("/subject/subInfo/detailView2?layer=true&subId="+ obj.data.sub_id),
                 });
                 layui.layer.full(index);
             },

projects/src/main/webapp/vmodules/common/common-js-include.jsp

@@ -20,6 +20,8 @@
 <script src="${WebSite.asset}/modules/common.js?version=${version}" charset="utf-8"></script>
 <script src="${WebSite.asset}/modules/common-utils.js?version=${version}" charset="utf-8"></script>
 <script src="${WebSite.asset}/lib/echarts/min/echarts.min.js?version=${version}"></script>
+
+<script src="${WebSite.asset}/js/util.js?version=${version}"></script>
 <!--[if IE 6]>
 <script type="text/javascript" src="${WebSite.asset}/lib/DD_belatedPNG_0.0.8a-min.js" ></script>
 <script>DD_belatedPNG.fix('*');</script>

projects/src/main/webapp/vmodules/graphic/detail.jsp

@@ -91,7 +91,8 @@
 	                    	<div class="imgUl">
 		                    	<div v-for="(item, index) in imageList"  class="media-box" @click="showImg(index)" >
 		                    		<div class="imgTab">
-		                    			<img  :id="idTemp(index)"     :alt="item.time" :lay-src="'${domain}/static/file/'+item.fileAddre+'/showfile'" :src="'${domain}/static/file/'+item.fileAddre+'/showfile'">
+<%--		                    			<img  :id="idTemp(index)"     :alt="item.time" :lay-src="'${domain}/static/file/'+item.fileAddre+'/showfile'" :src="'${domain}/static/file/'+item.fileAddre+'/showfile'">--%>
+		                    			<img  :id="idTemp(index)"     :alt="item.time" :lay-src="'${domain}/static/file/'+item.fileAddre+'/showfile'" :src="picShow(item.fileAddre,item.fileType)">
 			                    		<span>{{item.time}}</span>
 		                    		</div>
 		                    	</div>
@@ -107,7 +108,8 @@
 		                    	<div v-for="(item, index) in vedioList" class="media-box" @click="showVideo">
 		                    		<div class="imgTab">
 		                    			<video controls="controls" loop="loop" preload="auto">
-		                    				<source :src="'${domain}/static/file/'+item.fileAddre+'/watch'">
+<%--		                    				<source :src="'${domain}/static/file/'+item.fileAddre+'/watch'">--%>
+		                    				<source :src="picShow(item.fileAddre,item.fileType)">
 		                    			</video>
 			                    		<span>{{item.time}}</span>
 		                    		</div>
@@ -139,6 +141,21 @@
             this.init();
         },
         methods : {
+			picShow(fileId, type) {
+				var tempId = "#" + fileId;
+				if (type == 8) {
+					return "${WebSite.asset}/css/images/pdf.png";
+				} else if (type == null || type == "") {
+				} else if (type == 101 || type == 102 || type == 103 || type == 104 || type == 105) {
+					return "${domain}/static/file/" + fileId + "/showfileFgw";
+				} else if (type == 4 || type == 5) {
+					return "${WebSite.asset}/css/images/excel.png";
+				} else if (type == 2 || type == 3) {
+					return "${WebSite.asset}/css/images/word.png";
+				} else if (type == 203) {
+					return "${WebSite.asset}/css/images/video.png";
+				}
+			},
             init : function() {
                 var self = this;
                 this.getImgForm();

projects/src/main/webapp/vmodules/leftMenu.jsp

@@ -8,7 +8,7 @@
     <!-- <div class="top_menu" @click="changeSide" v-if="collapse"></div> -->
     <div class="header_content_left">
         <div class="header_code"></div>
-        <div class="header_text">哈密市投资项目智慧平台</div>
+        <div class="header_text">哈密市工业项目智慧平台</div>
     </div>
     <div class="expand_collapse_btn" @click="changeSide"></div>
     <div class="layui-side-scroll">
@@ -277,11 +277,11 @@
                             code: '911',
                             url: 'sysTable/index'
                         },
-                        {
-                            txt: '操作日志查询',
-                            code: '913',
-                            url: 'subDataLog/index'
-                        },
+                        // {
+                        //     txt: '操作日志查询',
+                        //     code: '913',
+                        //     url: 'subDataLog/index'
+                        // },
                         {
                             txt: '登录日志',
                             code: '920',

projects/src/main/webapp/vmodules/passport/registerList.jsp

@@ -276,11 +276,14 @@
         param.pageNo = this.pageNo;
         param.pageSize = this.pageSize;
         App.postJson("/api/register/list", param, function (res) {
-          self.dataList = res.rows;
-          self.loadPage(res.total);
-
+          if(res.success){
+            self.dataList = res.rows;
+            self.loadPage(res.total);
+            self.loadTable();
+          }else {
+            App.msg.error(res.message);
+          }
 
-          self.loadTable();
 
           // if(res.data=="1"){
           //   if (self.dataList[0].status=="待审核"||self.dataList[0].status=="已审核"||self.dataList[0].status=="不通过"){

projects/src/main/webapp/vmodules/problem/info/preInfo.jsp

@@ -30,18 +30,18 @@
         <!-- 内容区域 -->
         <div class="right_title">
             <div class="tab-group">
-                <button class="btn btn1" :class="{active: tabActive === 1}" @click="onChangeActive(1)">储备转新建超期
-                    <span class="button-card" @click="ct('','','','','1','')">{{cbToXjNum}}</span></button>
-                <button class="btn btn1" :class="{active: tabActive === 2}" @click="onChangeActive(2)">前期手续办理超期
-                    <span class="button-card" @click="ct('','','','','2','')">{{preNum}}</span></button>
-                <button class="btn btn1" :class="{active: tabActive === 3}" @click="onChangeActive(3)">新建转在建超期
-                    <span class="button-card" @click="ct('','','','','3','')">{{xjToZjNum}}</span></button>
-                <button class="btn btn1" :class="{active: tabActive === 4}" @click="onChangeActive(4)">在建转投产超期
-                    <span class="button-card" @click="ct('','','','','4','')">{{zjToTcNum}}</span></button>
-                <button class="btn btn1" :class="{active: tabActive === 5}" @click="onChangeActive(5)">投产转入规超期
-                    <span class="button-card" @click="ct('','','','','5','')">{{tcToRgNum}}</span></button>
+                <button class="btn btn1" :class="{active: tabActive === 1}" @click="onChangeActive(1)">储备库超期
+                    <span class="button-card" @click="ct('','','','','1','')">{{toRoman(cbToXjNum)}}</span></button>
+<%--                <button class="btn btn1" :class="{active: tabActive === 2}" @click="onChangeActive(2)">前期手续办理超期--%>
+<%--                    <span class="button-card" @click="ct('','','','','2','')">{{preNum}}</span></button>--%>
+                <button class="btn btn1" :class="{active: tabActive === 3}" @click="onChangeActive(3)">新建库超期
+                    <span class="button-card" @click="ct('','','','','3','')">{{toRoman(xjToZjNum)}}</span></button>
+                <button class="btn btn1" :class="{active: tabActive === 4}" @click="onChangeActive(4)">在建库超期
+                    <span class="button-card" @click="ct('','','','','4','')">{{toRoman(zjToTcNum)}}</span></button>
+                <button class="btn btn1" :class="{active: tabActive === 5}" @click="onChangeActive(5)">投产库超期
+                    <span class="button-card" @click="ct('','','','','5','')">{{toRoman(tcToRgNum)}}</span></button>
                 <button class="btn btn2" :class="{active: tabActive === 6}" @click="onChangeActive(6)">项目月报超期
-                    <span class="button-card" @click="ct('','','','','6','')">{{monthlyNum}}</span></button>
+                    <span class="button-card" @click="ct('','','','','6','')">{{toRoman(monthlyNum)}}</span></button>
                 <%--                <button class="btn btn2" :class="{active: tabActive === 3}" @click="onChangeActive(3)">项目开工超期--%>
                 <%--                    <span class="button-card" @click="ct('','','','','3')">{{openWarnNum}}</span></button>--%>
                 <%--                <button class="btn btn2" :class="{active: tabActive === 5}" @click="onChangeActive(5)">投资偏离度超限--%>
@@ -106,7 +106,7 @@
                             <div class="row-item" v-for="(itemFund,index) in quyuList" :key="index"
                                  @dblclick="ct(itemFund.code,'','','','','')">
                                 <div class="row-item-static">
-                                    <span class="font-weight">{{itemFund.number}}</span>
+                                    <span class="font-weight">{{toRoman(itemFund.number)}}</span>
                                     <span class="danwei">个</span>
                                 </div>
                                 <div class="row-item-title">{{itemFund.title}}</div>
@@ -161,7 +161,7 @@
                             <div class="row-item" v-for="(itemFund,indexFund) in item" :key="indexFund"
                                  @dblclick="ct('','','',itemFund.code,'','')">
                                 <div class="row-item-static">
-                                    <span class="font-weight">{{itemFund.number}}</span>
+                                    <span class="font-weight">{{toRoman(itemFund.number)}}</span>
                                     <span class="danwei">个</span>
                                 </div>
                                 <div class="row-item-title">{{itemFund.title}}</div>
@@ -191,7 +191,7 @@
                             <div class="row-item" v-for="(itemFund,indexFund) in item" :key="indexFund"
                                  @dblclick="ct('','','','','',itemFund.code)">
                                 <div class="row-item-static">
-                                    <span class="font-weight">{{itemFund.number}}</span>
+                                    <span class="font-weight">{{toRoman(itemFund.number)}}</span>
                                     <span class="danwei">个</span>
                                 </div>
                                 <div class="row-item-title">{{itemFund.title}}</div>
@@ -342,6 +342,9 @@
             window.showImage = this.showImage;
         },
         methods: {
+            toRoman(num){
+                return intToRoman(num)
+            },
             init: function () {
                 this.winH = document.body.clientHeight;
 

projects/src/main/webapp/vmodules/project/rptFile.jsp

@@ -91,7 +91,8 @@
 	                    	<div class="imgUl">
 		                    	<div v-for="(item, index) in imageList" class="media-box" @click="showImg">
 		                    		<div class="imgTab">
-		                    			<img :alt="item.time" :lay-src="'${domain}/static/file/'+item.fileAddre+'/showfile'" :src="'${domain}/static/file/'+item.fileAddre+'/showfile'">
+<%--		                    			<img :alt="item.time" :lay-src="'${domain}/static/file/'+item.fileAddre+'/showfile'" :src="'${domain}/static/file/'+item.fileAddre+'/showfile'">--%>
+		                    			<img :alt="item.time" :lay-src="'${domain}/static/file/'+item.fileAddre+'/showfile'" :src="picShow(item.fileAddre,item.fileType)">
 			                    		<span>{{item.time}}</span>
 		                    		</div>
 		                    	</div>
@@ -107,7 +108,8 @@
 		                    	<div v-for="(item, index) in vedioList" class="media-box" @click="showImg">
 		                    		<div class="imgTab">
 		                    			<video controls="controls" loop="loop" preload="auto">
-		                    				<source :src="'${domain}/static/file/'+item.fileAddre+'/watch'">
+<%--		                    				<source :src="'${domain}/static/file/'+item.fileAddre+'/watch'">--%>
+		                    				<source :src="picShow(item.fileAddre,item.fileType)">
 		                    			</video>
 			                    		<span>{{item.time}}</span>
 		                    		</div>
@@ -139,6 +141,21 @@
             this.init();
         },
         methods : {
+			picShow(fileId, type) {
+				var tempId = "#" + fileId;
+				if (type == 8) {
+					return "${WebSite.asset}/css/images/pdf.png";
+				} else if (type == null || type == "") {
+				} else if (type == 101 || type == 102 || type == 103 || type == 104 || type == 105) {
+					return "${domain}/static/file/" + fileId + "/showfileFgw";
+				} else if (type == 4 || type == 5) {
+					return "${WebSite.asset}/css/images/excel.png";
+				} else if (type == 2 || type == 3) {
+					return "${WebSite.asset}/css/images/word.png";
+				} else if (type == 203) {
+					return "${WebSite.asset}/css/images/video.png";
+				}
+			},
             init : function() {
                 var self = this;
                 this.getImgForm();

projects/src/main/webapp/vmodules/statics/analysisScreen_four.jsp

@@ -48,8 +48,8 @@
     <div id="fullscreenElement" class="hami-container">
         <header class="header">
             <div class="left">
-                <p class="left-time" id="left-time">11:15</p>
                 <p class="left-date" id="left-date">2021-09-01</p>
+                <p class="left-time" id="left-time">11:15</p>
             </div>
             <div class="center">
                 <p>哈密市工业项目智慧平台</p>
@@ -448,7 +448,7 @@
             </div>
 
         </main>
-        <flooter class="flooter">
+        <footer class="flooter">
             <div class="flooter-bottom">
                 <div class="flooter-bottom-item">
                     <div class="title">储备项目库</div>
@@ -667,7 +667,6 @@
 
                 document.querySelector('#right-data7').textContent =  gmData[3].num
                 document.querySelector('#right-data8').textContent =  gmData[3].amt
-s
             }
         });
     }

projects/src/main/webapp/vmodules/statics/layer/projInfo_new.jsp

@@ -246,6 +246,16 @@
         <span style="color:#FFDD00;" lay-event="toDetail">项目信息</span>
     </div>
 </script>
+<script type="text/html" id="preInfo">
+    <div title="" lay-event="preNew" style="cursor: pointer">
+        <div class="line">办理中的手续：{{d.preProceNum}}个
+
+        </div>
+        <div class="line">已办理完成手续：{{d.preEndNum}}个
+
+        </div>
+    </div>
+</script>
 <script>
     new Vue({
         el: "#app",
@@ -386,7 +396,7 @@
                             {field: 'mock2', title: '操作&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;', width: 140, align: 'center', toolbar: '#toolBar', fixed: 'right'}
                         ]]
                         break;
-                    case '4':
+                    case '9':
                         columns = [[ // 设置表头
                             {type: 'numbers', fixed: 'left', align: 'center', title: '序号', width: 44},
                             {field: 'subName', fixed: 'left', title: '项目名称', minWidth: 200, templet: '#subName'},

projects/src/main/webapp/vmodules/statics/layer/subInfo/projectInfo.jsp

@@ -85,6 +85,8 @@ body::-webkit-scrollbar{
                     <td style="display: none">${sunInfo.kindName }</td>--%>
 					<td class="label">项目所在地</td>
 					<td>${sunInfo.subjectName }</td>
+					<td class="label">项目地址</td>
+					<td>${sunInfo.addre }</td>
 				</tr>
 				<tr>
 					<td class="label">建设内容及规模</td>

projects/src/main/webapp/vmodules/subject/subInfo/detailView.jsp

@@ -187,7 +187,7 @@
 				</c:if>
 					<button class="layui-btn layui-btn-normal" style="position:relative;z-index:9;float: right" @click="backHis()">返回</button>
 			</div>
-			<iframe :src="iframeUrl" style="min-height:430px;border:none;margin-top: 30px"></iframe>
+			<iframe :src="iframeUrl" style="min-height:500px;border:none;margin-top: 30px"></iframe>
 </div>
 </template>
 <script>

projects/src/main/webapp/vmodules/subject/subInfo/editSubInfo.jsp

@@ -420,22 +420,22 @@
 <%--                            </div>--%>
 <%--                        </div>--%>
 <%--                    </div>--%>
-                    <div class="layui-row">
-                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
-                            <div class="layui-form-item">
-                                <label class="layui-form-label required">ABC类</label>
-                                <div class="layui-input-block">
-                                    <select v-model="subInfo.abc" lay-filter="abc" lay-verify="required">
-                                        <option value="">请选择</option>
-                                        <option value="A">A类</option>
-                                        <option value="B">B类</option>
-                                        <option value="C">C类</option>
-                                        <option value="D">D类</option>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
+<%--                    <div class="layui-row">--%>
+<%--                        <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">--%>
+<%--                            <div class="layui-form-item">--%>
+<%--                                <label class="layui-form-label required">ABC类</label>--%>
+<%--                                <div class="layui-input-block">--%>
+<%--                                    <select v-model="subInfo.abc" lay-filter="abc" lay-verify="required">--%>
+<%--                                        <option value="">请选择</option>--%>
+<%--                                        <option value="A">A类</option>--%>
+<%--                                        <option value="B">B类</option>--%>
+<%--                                        <option value="C">C类</option>--%>
+<%--                                        <option value="D">D类</option>--%>
+<%--                                    </select>--%>
+<%--                                </div>--%>
+<%--                            </div>--%>
+<%--                        </div>--%>
+<%--                    </div>--%>
                     <div class="layui-row">
                         <div class="layui-col-xs6 layui-col-sm6 layui-col-md4">
                             <div class="layui-form-item">

projects/src/main/webapp/vmodules/subject/subInfo/report_department.jsp

@@ -149,7 +149,7 @@
             <div class="layui-row class_ls">
                 <div class="layui-form-item" style="display: flex">
                     <label class="juli">
-                        已办理件数<span class="lanse-first">{{beginRate.doNum||"--"}}</span>
+                        已办理件数<span class="lanse-first">{{toRoman(beginRate.doNum)||"--"}}</span>
                         <div class="progress-div">
                             <div class="layui-progress">
                                 <div class="layui-progress-bar"></div>
@@ -157,7 +157,7 @@
                         </div>
                     </label>
                     <label class="juli">
-                        正办理件数<span class="lanse-first">{{beginRate.doingNum!==undefined?beginRate.doingNum:"--"}}</span>
+                        正办理件数<span class="lanse-first">{{beginRate.doingNum!==undefined?toRoman(beginRate.doingNum):"--"}}</span>
                         <div class="progress-div">
                             <div class="layui-progress">
                                 <div class="layui-progress-bar"></div>
@@ -165,7 +165,7 @@
                         </div>
                     </label>
                     <label class="juli">
-                        即将逾期件数<span class="lanse-first" onclick="toDetailSum('2')">{{beginRate.doingCqjNum!==undefined?beginRate.doingCqjNum:"--"}}</span>
+                        即将逾期件数<span class="lanse-first" onclick="toDetailSum('2')">{{beginRate.doingCqjNum!==undefined?toRoman(beginRate.doingCqjNum):"--"}}</span>
                         <div class="progress-div">
                             <div class="layui-progress">
                                 <div class="layui-progress-bar"></div>
@@ -173,7 +173,7 @@
                         </div>
                     </label>
                     <label class="juli">
-                        已逾期未办理件数<span class="lanse-first" onclick="toDetailSum('1')">{{beginRate.doingCqNum!==undefined?beginRate.doingCqNum:"--"}}</span>
+                        已逾期未办理件数<span class="lanse-first" onclick="toDetailSum('1')">{{beginRate.doingCqNum!==undefined?toRoman(beginRate.doingCqNum):"--"}}</span>
                         <div class="progress-div">
                             <div class="layui-progress">
                                 <div class="layui-progress-bar"></div>
@@ -197,7 +197,7 @@
                         </div>
                     </label>
                     <label class="juli">
-                        超期件数<span class="lanse-first">{{beginRate.cqNum||"--"}}</span>
+                        超期件数<span class="lanse-first">{{toRoman(beginRate.cqNum)||"--"}}</span>
                     </label>
                     <label class="juli">
                         同比<span class="lanse-first">{{beginRate.tcqRate||"--"}}%</span>
@@ -216,13 +216,13 @@
                         </div>
                     </label>
                     <label v-if="beginRate.num>0" class="juli">
-                        节约时间(天)<span style="color:green" class="lanse-first">{{beginRate.num||"--"}}</span>
+                        节约时间(天)<span style="color:green" class="lanse-first">{{toRoman(beginRate.num)||"--"}}</span>
                     </label>
                     <label v-if="beginRate.num<=0" class="juli">
-                        节约时间(天)<span style="color: red" class="lanse-first">{{beginRate.num||"--"}}</span>
+                        节约时间(天)<span style="color: red" class="lanse-first">{{toRoman(beginRate.num)||"--"}}</span>
                     </label>
                     <label v-if="!beginRate.num" class="juli">
-                        节约时间(天)<span class="lanse-first">{{beginRate.num||"--"}}</span>
+                        节约时间(天)<span class="lanse-first">{{toRoman(beginRate.num)||"--"}}</span>
                     </label>
                 </div>
             </div>
@@ -469,6 +469,9 @@
             this.init();
         },
         methods: {
+            toRoman(num){
+                return intToRoman(num)
+            },
             init: function () {
 
                 this.winH = document.body.clientHeight;

projects/src/main/webapp/vmodules/subject/subInfo/report_file.jsp

@@ -166,7 +166,7 @@
 			<div class="layui-row class_ls">
 				<div class="layui-form-item" style="display: flex">
 					<label class="juli">
-						已办理件数<span class="lanse-first">{{beginRate.doNum||"--"}}</span>
+						已办理件数<span class="lanse-first">{{toRoman(beginRate.doNum)||"--"}}</span>
 						<div class="progress-div">
 							<div class="layui-progress">
 								<div class="layui-progress-bar"></div>
@@ -174,7 +174,7 @@
 						</div>
 					</label>
 					<label class="juli">
-						正办理件数<span class="lanse-first">{{beginRate.doingNum!==undefined?beginRate.doingNum:"--"}}</span>
+						正办理件数<span class="lanse-first">{{beginRate.doingNum!==undefined?toRoman(beginRate.doingNum):"--"}}</span>
 						<div class="progress-div">
 							<div class="layui-progress">
 								<div class="layui-progress-bar"></div>
@@ -182,7 +182,7 @@
 						</div>
 					</label>
 					<label class="juli">
-						即将逾期件数<span class="lanse-first" onclick="toDetailSum('2')">{{beginRate.doingCqjNum!==undefined?beginRate.doingCqjNum:"--"}}</span>
+						即将逾期件数<span class="lanse-first" onclick="toDetailSum('2')">{{beginRate.doingCqjNum!==undefined?toRoman(beginRate.doingCqjNum):"--"}}</span>
 						<div class="progress-div">
 							<div class="layui-progress">
 								<div class="layui-progress-bar"></div>
@@ -190,7 +190,7 @@
 						</div>
 					</label>
 					<label class="juli">
-						已逾期未办理件数<span class="lanse-first" onclick="toDetailSum('1')">{{beginRate.doingCqNum!==undefined?beginRate.doingCqNum:"--"}}</span>
+						已逾期未办理件数<span class="lanse-first" onclick="toDetailSum('1')">{{beginRate.doingCqNum!==undefined?toRoman(beginRate.doingCqNum):"--"}}</span>
 						<div class="progress-div">
 							<div class="layui-progress">
 								<div class="layui-progress-bar"></div>
@@ -214,7 +214,7 @@
 						</div>
 					</label>
 					<label class="juli">
-						超期件数<span class="lanse-first">{{beginRate.cqNum||"--"}}</span>
+						超期件数<span class="lanse-first">{{toRoman(beginRate.cqNum)||"--"}}</span>
 						<div class="progress-div">
 							<div class="layui-progress">
 								<div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>
@@ -238,13 +238,13 @@
 						</div>
 					</label>
 					<label v-if="beginRate.num>0" class="juli">
-						节约时间(天)<span style="color: green" class="lanse-first">{{beginRate.num||"--"}}</span>
+						节约时间(天)<span style="color: green" class="lanse-first">{{toRoman(beginRate.num)||"--"}}</span>
 					</label>
 					<label v-if="beginRate.num<=0" class="juli">
-						节约时间(天)<span style="color: red" class="lanse-first">{{beginRate.num||"--"}}</span>
+						节约时间(天)<span style="color: red" class="lanse-first">{{toRoman(beginRate.num)||"--"}}</span>
 					</label>
 					<label v-if="!beginRate.num" class="juli">
-						节约时间(天)<span class="lanse-first">{{beginRate.num||"--"}}</span>
+						节约时间(天)<span class="lanse-first">{{toRoman(beginRate.num)||"--"}}</span>
 					</label>
 				</div>
 			</div>
@@ -487,6 +487,9 @@
 			this.init();
 		},
 		methods: {
+			toRoman(num){
+				return intToRoman(num)
+			},
 			init: function () {
 				this.winH = document.body.clientHeight;
 				var curYear = new Date().getFullYear();

projects/src/main/webapp/vmodules/subject/subInfo/report_project.jsp

@@ -166,7 +166,7 @@
             <div class="layui-row class_ls">
                 <div class="layui-form-item" style="display: flex">
                     <label class="juli">
-                        已办理件数<span class="lanse-first">{{beginRate.needNum!==undefined?beginRate.finshNum:"--"}}</span>
+                        已办理件数<span class="lanse-first">{{beginRate.needNum!==undefined?toRoman(beginRate.finshNum):"--"}}</span>
                         <div class="progress-div">
                             <div class="layui-progress">
                                 <div class="layui-progress-bar"></div>
@@ -174,7 +174,7 @@
                         </div>
                     </label>
                     <label class="juli">
-                        正办理件数<span class="lanse-first">{{beginRate.doNum!==undefined?beginRate.doNum:"--"}}</span>
+                        正办理件数<span class="lanse-first">{{beginRate.doNum!==undefined?toRoman(beginRate.doNum):"--"}}</span>
                         <div class="progress-div">
                             <div class="layui-progress">
                                 <div class="layui-progress-bar"></div>
@@ -182,7 +182,7 @@
                         </div>
                     </label>
                     <label class="juli">
-                        即将逾期件数<span class="lanse-first" onclick="toDetailSum('2')">{{beginRate.doingCqjNum!==undefined?beginRate.doingCqjNum:"--"}}</span>
+                        即将逾期件数<span class="lanse-first" onclick="toDetailSum('2')">{{beginRate.doingCqjNum!==undefined?toRoman(beginRate.doingCqjNum):"--"}}</span>
                         <div class="progress-div">
                             <div class="layui-progress">
                                 <div class="layui-progress-bar"></div>
@@ -190,7 +190,7 @@
                         </div>
                     </label>
                     <label class="juli">
-                        已逾期未办理件数<span class="lanse-first" onclick="toDetailSum('1')">{{beginRate.doingCqNum!==undefined?beginRate.doingCqNum:"--"}}</span>
+                        已逾期未办理件数<span class="lanse-first" onclick="toDetailSum('1')">{{beginRate.doingCqNum!==undefined?toRoman(beginRate.doingCqNum):"--"}}</span>
                         <div class="progress-div">
                             <div class="layui-progress">
                                 <div class="layui-progress-bar"></div>
@@ -198,7 +198,7 @@
                         </div>
                     </label>
                     <label class="juli">
-                        超期件数<span class="lanse-first">{{beginRate.cqNum!==undefined?beginRate.cqNum:"--"}}</span>
+                        超期件数<span class="lanse-first">{{beginRate.cqNum!==undefined?toRoman(beginRate.cqNum):"--"}}</span>
                         <div class="progress-div">
                             <div class="layui-progress">
                                 <div class="layui-progress-bar" :style="'width:'+beginRate.endRate"></div>
@@ -206,13 +206,13 @@
                         </div>
                     </label>
                     <label v-if="beginRate.num>0" class="juli">
-                        节约时间(天)<span style="color:green" class="lanse-first">{{beginRate.num!==undefined?beginRate.num:"--"}}</span>
+                        节约时间(天)<span style="color:green" class="lanse-first">{{beginRate.num!==undefined?toRoman(beginRate.num):"--"}}</span>
                     </label>
                     <label v-if="beginRate.num<=0" class="juli">
-                        节约时间(天)<span style="color: red" class="lanse-first">{{beginRate.num!==undefined?beginRate.num:"--"}}</span>
+                        节约时间(天)<span style="color: red" class="lanse-first">{{beginRate.num!==undefined?toRoman(beginRate.num):"--"}}</span>
                     </label>
                     <label v-if="!beginRate.num" class="juli">
-                        节约时间(天)<span class="lanse-first">{{beginRate.num!==undefined?beginRate.num:"--"}}</span>
+                        节约时间(天)<span class="lanse-first">{{beginRate.num!==undefined?toRoman(beginRate.num):"--"}}</span>
                     </label>
                     <label class="juli">
                         平均办理件数<span class="lanse-first">{{beginRate.avgDo!==undefined?beginRate.avgDo:"--"}}</span>
@@ -473,6 +473,9 @@
             this.init();
         },
         methods: {
+            toRoman(num){
+                return intToRoman(num)
+            },
             init: function () {
                 this.winH = document.body.clientHeight;
                 var curYear = new Date().getFullYear();

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

@@ -234,31 +234,36 @@
 <%--                </div>--%>
                 <div style="display: flex;margin-bottom: 3px">
                     <label class="juli">
+                        储备项目总数
+                        <span class="info-icon" title="储备项目总数"></span>
+                        <span class="lanse-first">{{beginRate.num}}</span>
+                    </label>
+                    <label class="juli" onclick="levelList('cbStatus','正在谋划','1')">
                         正在谋划
                         <span class="info-icon" title="正在谋划"></span>
-                        <span class="lanse-first">{{beginRate.bePlanningNum}}</span>
+                        <span class="lanse-first">{{ toRoman(beginRate.bePlanningNum) }}</span>
                     </label>
-                    <label class="juli" onclick="levelList('abcs','A类','A')">
+                    <label class="juli" onclick="levelList('cbStatus','正在洽谈','2')">
                         正在洽谈
                         <span class="info-icon" title="正在洽谈"></span>
-                        <span class="lanse-first">{{beginRate.negotiationNum}}</span>
+                        <span class="lanse-first">{{ toRoman(beginRate.negotiationNum)}}</span>
                     </label>
-                    <label class="juli">
+                    <label class="juli" onclick="levelList('cbStatus','已签约','3')">
                         已签约
                         <span class="info-icon" title="已签约"></span>
-                        <span class="lanse-first" onclick="levelList('abcs','B类','B')" style="color: #FFAD0D">{{beginRate.signedNum}}</span>
+                        <span class="lanse-first" style="color: #FFAD0D">{{toRoman(beginRate.signedNum)}}</span>
                     </label>
-                    <label class="juli" onclick="levelList('abcs','C类','C')">
+                    <label class="juli" onclick="levelList('cbStatus','已备案/已核准','4')">
                         已备案/已核准
                         <span class="info-icon" title="已备案/已核准"></span>
-                        <span class="lanse-first" style="color: #E0534E">{{beginRate.recordAndApproveNum}}</span>
+                        <span class="lanse-first" style="color: #E0534E">{{toRoman(beginRate.recordAndApproveNum)}}</span>
                     </label>
                 </div>
                 <div style="display: flex;margin-bottom: 3px">
                     <label class="juli"
                            @click="levelList('subjects',item.name,item.code)"
                            v-for="(item, index) in beginRate.jsddList" :key="index">
-                        {{item.name}} <span class="lanse-first">{{item.num}}</span>
+                        {{item.name}} <span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                 </div>
                 <div class="second_line" style="margin-bottom: 3px">
@@ -266,7 +271,7 @@
                            @click="levelList('indusKinds',item.name?item.name:item.code,item.code)"
                            v-for="(item, index) in beginRate.hyflList" :key="index">
                         {{item.name?item.name:item.code}}
-                        <span class="lanse-first">{{item.num}}</span>
+                        <span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                 </div>
             </div>
@@ -395,6 +400,9 @@
             this.init()
         },
         methods: {
+            toRoman(num){
+              return intToRoman(num)
+            },
             closeAllLayers() {
                 layui.layer.closeAll(); // 关闭所有弹框
             },
@@ -567,9 +575,9 @@
             },
             loadTable: function () {
                 // 状态名称映射
-                this.dataList.forEach(item => {
-                    item.statusName = this.getStatusName(item.status);
-                });
+                // this.dataList.forEach(item => {
+                //     item.statusName = this.getStatusName(item.status);
+                // });
 
                 const self = this;
                 layui.table.render({
@@ -726,7 +734,7 @@
                 if (e.data.topBreadcrumb) {
                     $(".top-breadcrumb").html(e.data.topBreadcrumb)
                 }
-            }
+            },
         }
     });
 </script>

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

@@ -387,65 +387,39 @@
         </div>
         <div>
             <div class="layui-row class_ls">
-                <div style="display: flex">
+                <div style="display: flex;margin-bottom: 3px">
                     <label class="juli">
-                        储备项目总数<span class="lanse-first">{{beginRate.num}}</span>
-                        <div class="progress-div">
-                            <div class="layui-progress">
-                                <div class="layui-progress-bar"></div>
-                            </div>
-                        </div>
+                        正在谋划
+                        <span class="info-icon" title="正在谋划"></span>
+                        <span class="lanse-first">{{toRoman(beginRate.bePlanningNum)}}</span>
                     </label>
-
                     <label class="juli" onclick="levelList('abcs','A类','A')">
-                        A类项目数
-                        <span class="lanse-first">{{beginRate.anum}}</span>
-                        <div class="progress-div">
-                            <div class="layui-progress">
-                                <div class="layui-progress-bar" :style="'width:'+beginRate.aRate"></div>
-                            </div>
-                        </div>
+                        正在洽谈
+                        <span class="info-icon" title="正在洽谈"></span>
+                        <span class="lanse-first">{{toRoman(beginRate.negotiationNum)}}</span>
                     </label>
                     <label class="juli">
-                        B类项目数
-                        <span class="lanse-first" onclick="levelList('abcs','B类','B')">{{beginRate.bnum}}</span>
-                        <div class="progress-div">
-                            <div class="layui-progress">
-                                <div class="layui-progress-bar" :style="'width:'+beginRate.bRate"></div>
-                            </div>
-                        </div>
+                        已签约
+                        <span class="info-icon" title="已签约"></span>
+                        <span class="lanse-first" onclick="levelList('abcs','B类','B')" style="color: #FFAD0D">{{toRoman(beginRate.signedNum)}}</span>
                     </label>
                     <label class="juli" onclick="levelList('abcs','C类','C')">
-                        C类项目数
-                        <span class="lanse-first">{{beginRate.cnum}}</span>
-                        <div class="progress-div">
-                            <div class="layui-progress">
-                                <div class="layui-progress-bar" :style="'width:'+beginRate.cRate"></div>
-                            </div>
-                        </div>
-                    </label>
-                    <label class="juli" onclick="levelList('abcs','D类','D')">
-                        D类项目数
-                        <span class="info-icon" title="D类项目">?</span>
-                        <span class="lanse-first">{{beginRate.dnum}}</span>
-                    </label>
-                    <label class="juli" onclick="levelList('abcs','其它类','UNKNOWN_CATEGORY')">
-                        其它项目数
-                        <span class="info-icon" title="ABC类未设置">?</span>
-                        <span class="lanse-first">{{beginRate.nnum}}</span>
+                        已备案/已核准
+                        <span class="info-icon" title="已备案/已核准"></span>
+                        <span class="lanse-first" style="color: #E0534E">{{toRoman(beginRate.recordAndApproveNum)}}</span>
                     </label>
                 </div>
                 <div style="display: flex;margin-bottom: 3px">
                     <label class="juli" @click="levelList('subjects',item.name,item.code)"
                            v-for="(item, index) in beginRate.jsddList" :key="index">
-                        {{item.name}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                 </div>
                 <div class="second line" style="margin-bottom: 3px">
                     <label class="juli"
                            @click="levelList('indusKinds',item.name?item.name:item.code,item.code)"
                            v-for="(item, index) in beginRate.hyflList" :key="index">
-                        {{item.name?item.name:item.code}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name?item.name:item.code}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                 </div>
             </div>
@@ -785,6 +759,9 @@
             this.init()
         },
         methods: {
+            toRoman(num){
+                return intToRoman(num)
+            },
             closeAllLayers() {
                 layui.layer.closeAll(); // 关闭所有弹框
             },
@@ -1057,7 +1034,6 @@
                 param.orderType = this.sort.type || "asc";
                 param.status = 1;
                 param = Object.assign(param, ${sumParams});
-                console.log(param,"===]]]===");
                 App.postJson("/api/subInfo/query/queryPage", param, function (res) {
                     self.dataList = res.rows;
                     self.loadPage(res.total);

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

@@ -242,10 +242,10 @@
             <div class="layui-row class_ls">
                 <div style="display: flex">
                     <label class="juli">
-                        投产项目总数<span class="lanse-first">{{beginRate.num}}</span>
+                        投产项目总数<span class="lanse-first">{{toRoman(beginRate.num)}}</span>
                     </label>
                         <label class="juli">
-                            已入规<span class="lanse-first">{{beginRate.yrgNum}}</span>
+                            已入规<span class="lanse-first">{{toRoman(beginRate.yrgNum)}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
@@ -253,7 +253,7 @@
                             </div>
                         </label>
                         <label class="juli">
-                            未入规<span class="lanse-first">{{beginRate.wrgNum}}</span>
+                            未入规<span class="lanse-first">{{toRoman(beginRate.wrgNum)}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
@@ -289,18 +289,18 @@
 
                     <label @click="levelList('kindNatures',item.name,item.code)" class="juli"
                            v-for="(item, index) in beginRate.tzlxList" :key="index">
-                        {{item.name}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                     <label class="juli" @click="levelList('subjects',item.name,item.code)"
                            v-for="(item, index) in beginRate.jsddList" :key="index">
-                        {{item.name}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                 </div>
                 <div class="second_line" style="margin-bottom: 3px">
                     <label class="juli"
                            @click="levelList('indusKinds',item.name?item.name:item.code,item.code)"
                            v-for="(item, index) in beginRate.hyflList" :key="index">
-                        {{item.name?item.name:item.code}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name?item.name:item.code}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                 </div>
             </div>
@@ -573,6 +573,9 @@
             this.init()
         },
         methods: {
+            toRoman(num){
+                return intToRoman(num)
+            },
             closeAllLayers() {
                 layui.layer.closeAll();
             },

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

@@ -342,7 +342,7 @@
                     <%--							</div>--%>
                     <%--						</label>--%>
                     <label class="juli">
-                        投产项目总数<span class="lanse-first">{{beginRate.num}}</span>
+                        投产项目总数<span class="lanse-first">{{toRoman(beginRate.num)}}</span>
                         <%--                        <div class="progress-div">
                                                     <div class="layui-progress">
                                                         <div class="layui-progress-bar" style=""></div>
@@ -364,18 +364,18 @@
 
                     <label @click="levelList('kindNatures',item.name,item.code)" class="juli"
                            v-for="(item, index) in beginRate.tzlxList" :key="index">
-                        {{item.name}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                     <label class="juli" @click="levelList('subjects',item.name,item.code)"
                            v-for="(item, index) in beginRate.jsddList" :key="index">
-                        {{item.name}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                 </div>
                 <div class="second line" style="margin-bottom: 3px">
                     <label class="juli"
                            @click="levelList('indusKinds',item.name?item.name:item.code,item.code)"
                            v-for="(item, index) in beginRate.hyflList" :key="index">
-                        {{item.name?item.name:item.code}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name?item.name:item.code}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                 </div>
             </div>
@@ -635,6 +635,9 @@
             this.init()
         },
         methods: {
+            toRoman(num){
+                return intToRoman(num)
+            },
             closeAllLayers() {
                 layui.layer.closeAll();
             },

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

@@ -222,7 +222,7 @@
             <div class="layui-row class_ls">
                                 <div style="display: flex;margin-bottom: 3px">
                                     <label class="juli">
-                                        在建项目总数<span class="lanse-first">{{beginRate.num}}</span>
+                                        在建项目总数<span class="lanse-first">{{toRoman(beginRate.num)}}</span>
                                         <div class="progress-div">
                                             <div class="layui-progress">
                                                 <div class="layui-progress-bar"></div>
@@ -230,7 +230,7 @@
                                         </div>
                                     </label>
                                     <label class="juli">
-                                        已开工<span class="lanse-first">{{beginRate.ykgNum}}</span>
+                                        已开工<span class="lanse-first">{{toRoman(beginRate.ykgNum)}}</span>
                                         <div class="progress-div">
                                             <div class="layui-progress">
                                                 <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
@@ -351,18 +351,18 @@
 
                     <label @click="levelList('kindNatures',item.name,item.code)" class="juli"
                            v-for="(item, index) in beginRate.tzlxList" :key="index">
-                        {{item.name}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                     <label class="juli" @click="levelList('subjects',item.name,item.code)"
                            v-for="(item, index) in beginRate.jsddList" :key="index">
-                        {{item.name}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                 </div>
                 <div class="second_line" style="margin-bottom: 3px">
                     <label class="juli"
                            @click="levelList('indusKinds',item.name?item.name:item.code,item.code)"
                            v-for="(item, index) in beginRate.hyflList" :key="index">
-                        {{item.name?item.name:item.code}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name?item.name:item.code}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                 </div>
             </div>
@@ -759,6 +759,9 @@
             this.init()
         },
         methods: {
+            toRoman(num){
+                return intToRoman(num)
+            },
             closeAllLayers() {
                 layui.layer.closeAll(); // 关闭所有弹框
             },

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

@@ -361,7 +361,7 @@
             <div class="layui-row class_ls">
                 <div style="display: flex;margin-bottom: 3px">
                     <label class="juli">
-                        在建项目总数<span class="lanse-first">{{beginRate.num}}</span>
+                        在建项目总数<span class="lanse-first">{{toRoman(beginRate.num)}}</span>
                         <div class="progress-div">
                             <div class="layui-progress">
                                 <div class="layui-progress-bar"></div>
@@ -374,18 +374,18 @@
 
                     <label @click="levelList('kindNatures',item.name,item.code)" class="juli"
                            v-for="(item, index) in beginRate.tzlxList" :key="index">
-                        {{item.name}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                     <label class="juli" @click="levelList('subjects',item.name,item.code)"
                            v-for="(item, index) in beginRate.jsddList" :key="index">
-                        {{item.name}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                 </div>
                 <div class="second line" style="margin-bottom: 3px">
                     <label class="juli"
                            @click="levelList('indusKinds',item.name?item.name:item.code,item.code)"
                            v-for="(item, index) in beginRate.hyflList" :key="index">
-                        {{item.name?item.name:item.code}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name?item.name:item.code}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                 </div>
             </div>
@@ -751,6 +751,9 @@
             this.init()
         },
         methods: {
+            toRoman(num){
+                return intToRoman(num)
+            },
             closeAllLayers() {
                 layui.layer.closeAll(); // 关闭所有弹框
             },

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

@@ -224,7 +224,7 @@
             <div class="layui-row class_ls">
                 <div style="display: flex">
                     <label class="juli">
-                        新建项目总数<span class="lanse-first">{{beginRate.num}}</span>
+                        新建项目总数<span class="lanse-first">{{toRoman(beginRate.num)}}</span>
                         <div class="progress-div">
                             <div class="layui-progress">
                                 <div class="layui-progress-bar"></div>
@@ -232,7 +232,7 @@
                         </div>
                     </label>
                     <label class="juli">
-                        已开工<span class="lanse-first">{{beginRate.ykgNum}}</span>
+                        已开工<span class="lanse-first">{{toRoman(beginRate.ykgNum)}}</span>
                         <div class="progress-div">
                             <div class="layui-progress">
                                 <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
@@ -252,18 +252,18 @@
 
                     <label @click="levelList('kindNatures',item.split(',')[1],item.split(',')[0])" class="juli"
                            v-for="(item, index) in beginRate.tzlxList" :key="index">
-                        {{item.name}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                     <label class="juli" @click="levelList('subjects',item.name,item.code)"
                            v-for="(item, index) in beginRate.jsddList" :key="index">
-                        {{item.name}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                 </div>
                 <div class="second_line" style="margin-bottom: 3px">
                     <label class="juli"
                            @click="levelList('indusKinds',item.name?item.name:item.code,item.code)"
                            v-for="(item, index) in beginRate.hyflList" :key="index">
-                        {{item.name?item.name:item.code}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name?item.name:item.code}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                 </div>
             </div>
@@ -615,6 +615,9 @@
             this.init()
         },
         methods: {
+            toRoman(num){
+                return intToRoman(num)
+            },
             closeAllLayers() {
                 layui.layer.closeAll();
             },

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

@@ -389,7 +389,7 @@
             <div class="layui-row class_ls">
                 <div style="display: flex">
                     <label class="juli">
-                        新建项目总数<span class="lanse-first">{{beginRate.num}}</span>
+                        新建项目总数<span class="lanse-first">{{toRoman(beginRate.num)}}</span>
                         <div class="progress-div">
                             <div class="layui-progress">
                                 <div class="layui-progress-bar"></div>
@@ -401,18 +401,18 @@
 
                     <label @click="levelList('kindNatures',item.name,item.code)" class="juli"
                            v-for="(item, index) in beginRate.tzlxList" :key="index">
-                        {{item.name}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                     <label class="juli" @click="levelList('subjects',item.name,item.code)"
                            v-for="(item, index) in beginRate.jsddList" :key="index">
-                        {{item.name}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                 </div>
                 <div class="second line" style="margin-bottom: 3px">
                     <label class="juli"
                            @click="levelList('indusKinds',item.name?item.name:item.split(',')[0],item.code)"
                            v-for="(item, index) in beginRate.hyflList" :key="index">
-                        {{item.name?item.name:item.code}}<span class="lanse-first">{{item.num}}</span>
+                        {{item.name?item.name:item.code}}<span class="lanse-first">{{toRoman(item.num)}}</span>
                     </label>
                 </div>
             </div>
@@ -752,6 +752,9 @@
             this.init()
         },
         methods: {
+            toRoman(num){
+                return intToRoman(num)
+            },
             closeAllLayers() {
                 layui.layer.closeAll();
             },

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

@@ -248,7 +248,7 @@
                             </div>
                         </label>
                         <label class="juli">
-                            A类项目数<span class="lanse-first" style="color: #FFAD0D">{{beginRate.atotal}}</span>
+                            正在谋划<span class="lanse-first" style="color: #FFAD0D">{{beginRate.bePlanningNum}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
@@ -256,37 +256,69 @@
                             </div>
                         </label>
                         <label class="juli">
-                            B类项目数<span class="lanse-first" style="color: #E0534E">{{beginRate.btotal}}</span>
+                            正在洽谈<span class="lanse-first" style="color: #FFAD0D">{{beginRate.negotiationNum}}</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">
-                            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 class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
                                 </div>
                             </div>
                         </label>
                         <label class="juli">
-                            D类项目数<span class="lanse-first">{{beginRate.dtotal}}</span>
+                            已签约<span class="lanse-first" style="color: #FFAD0D">{{beginRate.signedNum}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
+                                    <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
                                 </div>
                             </div>
                         </label>
                         <label class="juli">
-                            其它项目数<span class="lanse-first">{{beginRate.total - beginRate.atotal - beginRate.btotal - beginRate.ctotal - beginRate.dtotal}}</span>
+                            已备案/已核准<span class="lanse-first" style="color: #FFAD0D">{{beginRate.recordAndApproveNum}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
+                                    <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
                                 </div>
                             </div>
                         </label>
+<%--                        <label class="juli">--%>
+<%--                            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>--%>
+<%--                                </div>--%>
+<%--                            </div>--%>
+<%--                        </label>--%>
+<%--                        <label class="juli">--%>
+<%--                            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">--%>
+<%--                            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>--%>
+<%--                                </div>--%>
+<%--                            </div>--%>
+<%--                        </label>--%>
                     </div>
                     <div style="display: flex;margin-bottom: 3px" class="second_line">
                         <label class="juli" @click="levelList('subjects',item.title,item.code)"

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

@@ -93,7 +93,7 @@
                             </div>
                         </label>
                         <label class="juli">
-                            A类项目数<span class="lanse-first" style="color: #FFAD0D">{{beginRate.atotal}}</span>
+                            正在谋划<span class="lanse-first" style="color: #FFAD0D">{{beginRate.bePlanningNum}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
                                     <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
@@ -101,37 +101,69 @@
                             </div>
                         </label>
                         <label class="juli">
-                            B类项目数<span class="lanse-first" style="color: #E0534E">{{beginRate.btotal}}</span>
+                            正在洽谈<span class="lanse-first" style="color: #FFAD0D">{{beginRate.negotiationNum}}</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">
-                            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 class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
                                 </div>
                             </div>
                         </label>
                         <label class="juli">
-                            D类项目数<span class="lanse-first">{{beginRate.dtotal}}</span>
+                            已签约<span class="lanse-first" style="color: #FFAD0D">{{beginRate.signedNum}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
+                                    <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
                                 </div>
                             </div>
                         </label>
                         <label class="juli">
-                            其它项目数<span class="lanse-first">{{beginRate.total - beginRate.atotal - beginRate.btotal - beginRate.ctotal - beginRate.dtotal}}</span>
+                            已备案/已核准<span class="lanse-first" style="color: #FFAD0D">{{beginRate.recordAndApproveNum}}</span>
                             <div class="progress-div">
                                 <div class="layui-progress">
-                                    <div class="layui-progress-bar" :style="'width:'+beginRate.beginRate"></div>
+                                    <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
                                 </div>
                             </div>
                         </label>
+<%--                        <label class="juli">--%>
+<%--                            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>--%>
+<%--                                </div>--%>
+<%--                            </div>--%>
+<%--                        </label>--%>
+<%--                        <label class="juli">--%>
+<%--                            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">--%>
+<%--                            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>--%>
+<%--                                </div>--%>
+<%--                            </div>--%>
+<%--                        </label>--%>
                     </div>
 
                     <div style="display: flex;margin-bottom: 3px" class="second_line">

projects/src/main/webapp/vmodules/tjfx/index2.jsp

@@ -36,35 +36,35 @@
                 <div class="status-layer-right-box">
                     <div class="status-item">
                         <div class="status-text">
-                            <div class="status-text-num">{{otherData.totalNumber|| 0}}</div>
+                            <div class="status-text-num">{{toRoman(otherData.totalNumber)|| 0}}</div>
                             <div class="status-text-unit">个</div>
                         </div>
                         <div class="status-label">项目总量</div>
                     </div>
                     <div class="status-item">
                         <div class="status-text">
-                            <div class="status-text-num">{{otherData.cbNumber || 0}}</div>
+                            <div class="status-text-num">{{toRoman(otherData.cbNumber || 0)}}</div>
                             <div class="status-text-unit">个</div>
                         </div>
                         <div class="status-label">储备总量</div>
                     </div>
                     <div class="status-item">
                         <div class="status-text">
-                            <div class="status-text-num">{{otherData.xjNumber||0}}</div>
+                            <div class="status-text-num">{{toRoman(otherData.xjNumber||0)}}</div>
                             <div class="status-text-unit">个</div>
                         </div>
                         <div class="status-label">新建总量</div>
                     </div>
                      <div class="status-item">
                         <div class="status-text">
-                            <div class="status-text-num">{{otherData.zjNumber||0}}</div>
+                            <div class="status-text-num">{{toRoman(otherData.zjNumber||0)}}</div>
                             <div class="status-text-unit">个</div>
                         </div>
                         <div class="status-label">在建总量</div>
                     </div>
                     <div class="status-item">
                         <div class="status-text">
-                            <div class="status-text-num">{{otherData.tcNumber||0}}</div>
+                            <div class="status-text-num">{{toRoman(otherData.tcNumber)||0}}</div>
                             <div class="status-text-unit">个</div>
                         </div>
                         <div class="status-label">投产总量</div>
@@ -92,7 +92,7 @@
         <div class="main-layer-next">
             <div class="pieEcarts">
                 <div class="pieEcarts-title">{{drawData.year}}年各区域占比情况</div>
-                <div id="areaPieEcarts" style="height: 140px;"></div>
+                <div id="areaPieEcarts" style="height: 180px;margin-top: 30px"></div>
             </div>
             <div class="tabel-box">
                 <table id="areaTable"></table>
@@ -100,8 +100,8 @@
         </div>
         <div class="main-layer-next">
             <div class="pieEcarts">
-                <div class="pieEcarts-title">{{drawData.year}}年行业前8占比情况</div>
-                <div id="hyPieEcarts"  style="height: 215px;"></div>
+                <div class="pieEcarts-title">{{drawData.year}}年行业占比情况</div>
+                <div id="hyPieEcarts"  style="height: 180px;margin-top: 30px"></div>
             </div>
             <div class="tabel-box">
                 <table id="hyTable"></table>
@@ -110,7 +110,7 @@
         <div class="main-layer-next">
             <div class="pieEcarts">
                 <div class="pieEcarts-title">{{drawData.year}}年按建设性质占比情况</div>
-                <div id="jsPieEcarts"  style="height: 140px;"></div>
+                <div id="jsPieEcarts"  style="height: 180px;margin-top: 30px"></div>
             </div>
             <div class="tabel-box">
                 <table id="jsTable"></table>
@@ -268,6 +268,9 @@
 			this.init();
 		},
     	methods: {
+            toRoman(num){
+                return intToRoman(num)
+            },
     		formatMonth: function(month) {
     			if(month < 10) {
     				return "0"+month;
@@ -464,15 +467,18 @@
     			$(".status-layer").hide();
     		},
         	initArea: function() {
-        		this.drawPieEcharts(this.areaChart, "#areaPieEcarts", "区域投资占比", this.areaData);
+        		// this.drawPieEcharts(this.areaChart, "#areaPieEcarts", "区域投资占比", this.areaData);
+        		this.drawPieEcharts(this.areaChart, "#areaPieEcarts", "", this.areaData);
         		this.drawTable("区域", "#areaTable", this.areaData);
         	},
         	initHy: function() {
-        		this.drawPieEcharts(this.hyChart, "#hyPieEcarts", "前8大行业投资占比", this.hyData);
+        		// this.drawPieEcharts(this.hyChart, "#hyPieEcarts", "前8大行业投资占比", this.hyData);
+        		this.drawPieEcharts(this.hyChart, "#hyPieEcarts", "", this.hyData);
         		this.drawTable("所属行业", "#hyTable", this.hyData);
         	},
         	initJs: function() {
-        		this.drawPieEcharts(this.jsChart, "#jsPieEcarts", "按建设性质", this.jsData);
+        		// this.drawPieEcharts(this.jsChart, "#jsPieEcarts", "按建设性质", this.jsData);
+        		this.drawPieEcharts(this.jsChart, "#jsPieEcarts", "", this.jsData);
         		this.drawTable("建设性质", "#jsTable", this.jsData);
         	},
             exportExcel:function (){
@@ -766,7 +772,8 @@
     }
 
     .status-text-num {
-        font-size: 24px;
+        /*font-size: 24px;*/
+        font-size: 16px;
         color: #1C56A3;
     }
 
@@ -822,7 +829,8 @@
     .pieEcarts {
         display: flex;
         flex-direction: column;
-        width: 240px;
+        /*width: 240px;*/
+        width: 360px;
         height: 100%;
     }
 

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

@@ -249,6 +249,9 @@
             this.init();
         },
         methods: {
+            toRoman(num){
+                return intToRoman(num)
+            },
             init: function () {
                 this.initChartsYearStart();
                 this.initChart();
@@ -305,11 +308,11 @@
                         $("#yearPlanNum").text(res.data.zhData.num_4 || 0);
 
                         // 统计数据
-                        $("#totalNum").text(res.data.totalNum || 0);
-                        $("#cbNum").text(res.data.cbNum || 0);
-                        $("#xjNum").text(res.data.xjNum || 0);
-                        $("#zjNum").text(res.data.zjNum || 0);
-                        $("#tcNum").text(res.data.tcNum || 0);
+                        $("#totalNum").text(self.toRoman(res.data.totalNum) || 0);
+                        $("#cbNum").text(self.toRoman(res.data.cbNum) || 0);
+                        $("#xjNum").text(self.toRoman(res.data.xjNum) || 0);
+                        $("#zjNum").text(self.toRoman(res.data.zjNum) || 0);
+                        $("#tcNum").text(self.toRoman(res.data.tcNum) || 0);
 
 
                         if (res.data.yearKgl){
@@ -378,6 +381,7 @@
             },
 
             initChart1: function (datas) {
+                let self = this;
                 const option = {
                     grid: {
                         left: 10,
@@ -420,7 +424,10 @@
                         type: 'pie',
                         radius: ['35%', '50%'],
                         label: {
-                            formatter: '{c}个 {d}%'
+                            formatter: function(params) {
+                                return self.toRoman(params.value) + '个 ' + params.percent + '%';
+                            }
+                            // formatter: '{c}个 {d}%'
                         },
                         emphasis: {
                             label: {