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

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

@@ -15,7 +15,6 @@ 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;
@@ -119,11 +118,11 @@ public class WorkBenchServiceImpl implements WorkBenchService {
 		Long withinNum = subInfoService.queryExceedWithin();
 		// 红灯超期超过3天
 		Long outsideNum = subInfoService.queryExceedOutside();
-		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()));
+		map.put("warningNum", warningNum.intValue());
+		map.put("exceedNum", exceedNum.intValue());
+		map.put("notExceedNum", notExceedNum.intValue());
+		map.put("withinNum", withinNum.intValue());
+		map.put("outsideNum", outsideNum.intValue());
 		return map;
 	}
 

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

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

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

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

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

@@ -19,7 +19,6 @@ 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;
@@ -922,19 +921,19 @@ public class SubInfoQueryApiController extends BaseController {
                 }
             }
 
-            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.setTotal(subFixGetBeginRateVoList.size());
+            subFixBeginVo.setATotal(aType);
+            subFixBeginVo.setBTotal(bType);
+            subFixBeginVo.setCTotal(cType);
+            subFixBeginVo.setDTotal(dType);
 
-            subFixBeginVo.setBePlanningNum(DataConvertUtil.intToRoman(bePlanningNum));
-            subFixBeginVo.setNegotiationNum(DataConvertUtil.intToRoman(negotiationNum));
-            subFixBeginVo.setSignedNum(DataConvertUtil.intToRoman(signedNum));
-            subFixBeginVo.setRecordAndApproveNum(DataConvertUtil.intToRoman(recordAndApproveNum));
+            subFixBeginVo.setBePlanningNum(bePlanningNum);
+            subFixBeginVo.setNegotiationNum(negotiationNum);
+            subFixBeginVo.setSignedNum(signedNum);
+            subFixBeginVo.setRecordAndApproveNum(recordAndApproveNum);
 
-            subFixBeginVo.setKgTotal(DataConvertUtil.intToRoman(kgTotal));
-            subFixBeginVo.setRgTotal(DataConvertUtil.intToRoman(rgNumber));
+            subFixBeginVo.setKgTotal(kgTotal);
+            subFixBeginVo.setRgTotal(rgNumber);
 
             int number = xjNumber+zjNumber+tcNumber;
             if (number != 0) {
@@ -957,7 +956,7 @@ public class SubInfoQueryApiController extends BaseController {
                 SubFixTotalVo subFixTotalVo = new SubFixTotalVo();
                 subFixTotalVo.setCode(key);
                 subFixTotalVo.setTitle(key);
-                subFixTotalVo.setTotal(DataConvertUtil.intToRoman(value.size()));
+                subFixTotalVo.setTotal(value.size());
                 subjectIdList.add(subFixTotalVo);
             });
 
@@ -981,7 +980,7 @@ public class SubInfoQueryApiController extends BaseController {
                 SubFixTotalVo subFixTotalVo = new SubFixTotalVo();
                 subFixTotalVo.setCode(key);
                 subFixTotalVo.setTitle(key);
-                subFixTotalVo.setTotal(DataConvertUtil.intToRoman(value.size()));
+                subFixTotalVo.setTotal(value.size());
                 indusKindList.add(subFixTotalVo);
             });
 
@@ -1000,12 +999,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/webapp/asset/css/style.css

@@ -2280,6 +2280,10 @@ table,th,td{
     color: #1C56A3;
     font-size: 14px;
     font-weight: bold;
+    font-family: "Times New Roman", Times, serif;
+}
+.new-roman{
+    font-family: "Times New Roman", Times, serif;
 }
 
 .laytable-cell-checkbox{

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

@@ -163,8 +163,9 @@
 
 .class_ls { padding: 10px 20px; background: #fff; }
 .class_ls .juli { display: inline-block; margin-bottom: 5px; padding: 5px 10px; color: #314b69; background: #f1fbf8; border-radius: 5px; }
-.class_ls .lanse-first { color: #02b77e; }
-.class_ls .second_line .lanse-first { color: #E156A2; }
+.class_ls .lanse-first { color: #02b77e;font-family: "Times New Roman", Times, serif; }
+.class_ls .second_line .lanse-first { color: #E156A2;font-family: "Times New Roman", Times, serif; }
+.new-roman{font-family: "Times New Roman", Times, serif;}
 
 .export { display: block; position: relative; top: 0; right: auto; margin: 0 0 10px; padding: 0px 7px 0px 15px; height: 32px; line-height: 32px; overflow: hidden; border-radius: 4px; background-color: #007EFF; }
 .export img { margin-right: 3px; filter: drop-shadow(#fff 100px 0); transform: translateX(-100px); }

projects/src/main/webapp/asset/sass/style_new.scss

@@ -716,12 +716,17 @@
   }
   .lanse-first {
     color: #02b77e;
+    font-family: "Times New Roman", Times, serif;
   }
   .second_line {
     .lanse-first {
       color: #E156A2;
+      font-family: "Times New Roman", Times, serif;
     }
   }
+  .new-roman{
+    font-family: "Times New Roman", Times, serif;
+  }
 }
 .export {
   display: block;

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

@@ -31,17 +31,17 @@
         <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','')">{{toRoman(cbToXjNum)}}</span></button>
+                    <span class="button-card new-roman" @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','')">{{toRoman(xjToZjNum)}}</span></button>
+                    <span class="button-card new-roman" @click="ct('','','','','3','')">{{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>
+                    <span class="button-card new-roman" @click="ct('','','','','4','')">{{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>
+                    <span class="button-card new-roman" @click="ct('','','','','5','')">{{tcToRgNum}}</span></button>
                 <button class="btn btn2" :class="{active: tabActive === 6}" @click="onChangeActive(6)">项目月报超期
-                    <span class="button-card" @click="ct('','','','','6','')">{{toRoman(monthlyNum)}}</span></button>
+                    <span class="button-card new-roman" @click="ct('','','','','6','')">{{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">{{toRoman(itemFund.number)}}</span>
+                                    <span class="font-weight new-roman">{{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">{{toRoman(itemFund.number)}}</span>
+                                    <span class="font-weight new-roman">{{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">{{toRoman(itemFund.number)}}</span>
+                                    <span class="font-weight new-roman">{{itemFund.number}}</span>
                                     <span class="danwei">个</span>
                                 </div>
                                 <div class="row-item-title">{{itemFund.title}}</div>
@@ -342,9 +342,6 @@
             window.showImage = this.showImage;
         },
         methods: {
-            toRoman(num){
-                return intToRoman(num)
-            },
             init: function () {
                 this.winH = document.body.clientHeight;
 

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

@@ -832,6 +832,16 @@
             if (res.success) {
                 qtData = res.data[0];
                 console.log(qtData)
+                //开工率、投产率、入规率
+
+                openRate = Number((qtData.num_year_kgl / 100).toFixed(4));
+                workRate = Number((qtData.num_year_tcl / 100).toFixed(4));
+                stockRate = Number((qtData.num_year_rgl / 100).toFixed(4));
+                // openRate = qtData.num_year_kgl;
+                // workRate = qtData.num_year_tcl;
+                // stockRate = qtData.num_year_rgl;
+                console.log(openRate,workRate,stockRate)
+
                 document.querySelector('#main-top-data1').textContent = qtData.num_total;
                 document.querySelector('#left-data1').textContent = qtData.num_cb;
                 document.querySelector('#left-data2').textContent = qtData.amt_cb;

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

@@ -633,9 +633,9 @@
                     self.subInfo.subjectId = data.value;
                     self.subInfo.mainId = ztdw;
                 });
-                layui.form.on("select(abc)", function (data) {
-                    self.subInfo.abc = data.value;
-                });
+                // layui.form.on("select(abc)", function (data) {
+                //     self.subInfo.abc = data.value;
+                // });
                 layui.form.on("select(cbStatus)", function (data) {
                     self.subInfo.cbStatus = data.value;
                 });
@@ -857,11 +857,6 @@
                     layer.msg("开始时间必须小于结束时间");
                     return;
                 }
-                const abc = self.subInfo.abc;
-                if (!abc){
-                    layer.msg("请选择ABC类");
-                    return;
-                }
                 const indusKind = self.subInfo.indusKind;
                 if (!indusKind){
                     layer.msg("请选择行业类型");

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">{{toRoman(beginRate.doNum)||"--"}}</span>
+                        已办理件数<span class="lanse-first">{{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?toRoman(beginRate.doingNum):"--"}}</span>
+                        正办理件数<span class="lanse-first">{{beginRate.doingNum!==undefined?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?toRoman(beginRate.doingCqjNum):"--"}}</span>
+                        即将逾期件数<span class="lanse-first" onclick="toDetailSum('2')">{{beginRate.doingCqjNum!==undefined?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?toRoman(beginRate.doingCqNum):"--"}}</span>
+                        已逾期未办理件数<span class="lanse-first" onclick="toDetailSum('1')">{{beginRate.doingCqNum!==undefined?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">{{toRoman(beginRate.cqNum)||"--"}}</span>
+                        超期件数<span class="lanse-first">{{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">{{toRoman(beginRate.num)||"--"}}</span>
+                        节约时间(天)<span style="color:green" class="lanse-first">{{beginRate.num||"--"}}</span>
                     </label>
                     <label v-if="beginRate.num<=0" class="juli">
-                        节约时间(天)<span style="color: red" class="lanse-first">{{toRoman(beginRate.num)||"--"}}</span>
+                        节约时间(天)<span style="color: red" class="lanse-first">{{beginRate.num||"--"}}</span>
                     </label>
                     <label v-if="!beginRate.num" class="juli">
-                        节约时间(天)<span class="lanse-first">{{toRoman(beginRate.num)||"--"}}</span>
+                        节约时间(天)<span class="lanse-first">{{beginRate.num||"--"}}</span>
                     </label>
                 </div>
             </div>
@@ -469,9 +469,6 @@
             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">{{toRoman(beginRate.doNum)||"--"}}</span>
+						已办理件数<span class="lanse-first">{{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?toRoman(beginRate.doingNum):"--"}}</span>
+						正办理件数<span class="lanse-first">{{beginRate.doingNum!==undefined?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?toRoman(beginRate.doingCqjNum):"--"}}</span>
+						即将逾期件数<span class="lanse-first" onclick="toDetailSum('2')">{{beginRate.doingCqjNum!==undefined?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?toRoman(beginRate.doingCqNum):"--"}}</span>
+						已逾期未办理件数<span class="lanse-first" onclick="toDetailSum('1')">{{beginRate.doingCqNum!==undefined?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">{{toRoman(beginRate.cqNum)||"--"}}</span>
+						超期件数<span class="lanse-first">{{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">{{toRoman(beginRate.num)||"--"}}</span>
+						节约时间(天)<span style="color: green" class="lanse-first">{{beginRate.num||"--"}}</span>
 					</label>
 					<label v-if="beginRate.num<=0" class="juli">
-						节约时间(天)<span style="color: red" class="lanse-first">{{toRoman(beginRate.num)||"--"}}</span>
+						节约时间(天)<span style="color: red" class="lanse-first">{{beginRate.num||"--"}}</span>
 					</label>
 					<label v-if="!beginRate.num" class="juli">
-						节约时间(天)<span class="lanse-first">{{toRoman(beginRate.num)||"--"}}</span>
+						节约时间(天)<span class="lanse-first">{{beginRate.num||"--"}}</span>
 					</label>
 				</div>
 			</div>
@@ -487,9 +487,6 @@
 			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?toRoman(beginRate.finshNum):"--"}}</span>
+                        已办理件数<span class="lanse-first">{{beginRate.needNum!==undefined?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?toRoman(beginRate.doNum):"--"}}</span>
+                        正办理件数<span class="lanse-first">{{beginRate.doNum!==undefined?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?toRoman(beginRate.doingCqjNum):"--"}}</span>
+                        即将逾期件数<span class="lanse-first" onclick="toDetailSum('2')">{{beginRate.doingCqjNum!==undefined?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?toRoman(beginRate.doingCqNum):"--"}}</span>
+                        已逾期未办理件数<span class="lanse-first" onclick="toDetailSum('1')">{{beginRate.doingCqNum!==undefined?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?toRoman(beginRate.cqNum):"--"}}</span>
+                        超期件数<span class="lanse-first">{{beginRate.cqNum!==undefined?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?toRoman(beginRate.num):"--"}}</span>
+                        节约时间(天)<span style="color:green" class="lanse-first">{{beginRate.num!==undefined?beginRate.num:"--"}}</span>
                     </label>
                     <label v-if="beginRate.num<=0" class="juli">
-                        节约时间(天)<span style="color: red" class="lanse-first">{{beginRate.num!==undefined?toRoman(beginRate.num):"--"}}</span>
+                        节约时间(天)<span style="color: red" class="lanse-first">{{beginRate.num!==undefined?beginRate.num:"--"}}</span>
                     </label>
                     <label v-if="!beginRate.num" class="juli">
-                        节约时间(天)<span class="lanse-first">{{beginRate.num!==undefined?toRoman(beginRate.num):"--"}}</span>
+                        节约时间(天)<span class="lanse-first">{{beginRate.num!==undefined?beginRate.num:"--"}}</span>
                     </label>
                     <label class="juli">
                         平均办理件数<span class="lanse-first">{{beginRate.avgDo!==undefined?beginRate.avgDo:"--"}}</span>
@@ -473,9 +473,6 @@
             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

@@ -43,6 +43,7 @@
         .lanse-first {
             color: #1C56A3;
             font-size: 12px;
+            font-family: "Times New Roman", Times, serif;
         }
 
         .layui-table-col-special .layui-table-cell {
@@ -241,29 +242,29 @@
                     <label class="juli" onclick="levelList('cbStatus','正在谋划','1')">
                         正在谋划
                         <span class="info-icon" title="正在谋划"></span>
-                        <span class="lanse-first">{{ toRoman(beginRate.bePlanningNum) }}</span>
+                        <span class="lanse-first">{{beginRate.bePlanningNum}}</span>
                     </label>
                     <label class="juli" onclick="levelList('cbStatus','正在洽谈','2')">
                         正在洽谈
                         <span class="info-icon" title="正在洽谈"></span>
-                        <span class="lanse-first">{{ toRoman(beginRate.negotiationNum)}}</span>
+                        <span class="lanse-first">{{beginRate.negotiationNum}}</span>
                     </label>
                     <label class="juli" onclick="levelList('cbStatus','已签约','3')">
                         已签约
                         <span class="info-icon" title="已签约"></span>
-                        <span class="lanse-first" style="color: #FFAD0D">{{toRoman(beginRate.signedNum)}}</span>
+                        <span class="lanse-first" style="color: #FFAD0D">{{beginRate.signedNum}}</span>
                     </label>
                     <label class="juli" onclick="levelList('cbStatus','已备案/已核准','4')">
                         已备案/已核准
                         <span class="info-icon" title="已备案/已核准"></span>
-                        <span class="lanse-first" style="color: #E0534E">{{toRoman(beginRate.recordAndApproveNum)}}</span>
+                        <span class="lanse-first" style="color: #E0534E">{{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">{{toRoman(item.num)}}</span>
+                        {{item.name}} <span class="lanse-first">{{item.num}}</span>
                     </label>
                 </div>
                 <div class="second_line" style="margin-bottom: 3px">
@@ -271,7 +272,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">{{toRoman(item.num)}}</span>
+                        <span class="lanse-first">{{item.num}}</span>
                     </label>
                 </div>
             </div>
@@ -400,9 +401,6 @@
             this.init()
         },
         methods: {
-            toRoman(num){
-              return intToRoman(num)
-            },
             closeAllLayers() {
                 layui.layer.closeAll(); // 关闭所有弹框
             },
@@ -591,6 +589,7 @@
                         {field: 'subjectName', title: '项目所在地', width: 100},
                         {field: 'content', title: '项目建设内容', minWidth: 300,
                             templet: function (row) {
+                                // row.content = row.content.replace(/(\d+)/g, '<span class="new-roman">$1</span>');
                                 return row.content ? '<span class="cut" title="' + row.content + '">' + row.content + '</span>' : '';
                             }},
                         {

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

@@ -43,6 +43,7 @@
         .lanse-first {
             color: #1C56A3;
             font-size: 12px;
+            font-family: "Times New Roman", Times, serif;
         }
 
         .layui-table-col-special .layui-table-cell {
@@ -391,35 +392,35 @@
                     <label class="juli">
                         正在谋划
                         <span class="info-icon" title="正在谋划"></span>
-                        <span class="lanse-first">{{toRoman(beginRate.bePlanningNum)}}</span>
+                        <span class="lanse-first">{{beginRate.bePlanningNum}}</span>
                     </label>
                     <label class="juli" onclick="levelList('abcs','A类','A')">
                         正在洽谈
                         <span class="info-icon" title="正在洽谈"></span>
-                        <span class="lanse-first">{{toRoman(beginRate.negotiationNum)}}</span>
+                        <span class="lanse-first">{{beginRate.negotiationNum}}</span>
                     </label>
                     <label class="juli">
                         已签约
                         <span class="info-icon" title="已签约"></span>
-                        <span class="lanse-first" onclick="levelList('abcs','B类','B')" style="color: #FFAD0D">{{toRoman(beginRate.signedNum)}}</span>
+                        <span class="lanse-first" onclick="levelList('abcs','B类','B')" style="color: #FFAD0D">{{beginRate.signedNum}}</span>
                     </label>
                     <label class="juli" onclick="levelList('abcs','C类','C')">
                         已备案/已核准
                         <span class="info-icon" title="已备案/已核准"></span>
-                        <span class="lanse-first" style="color: #E0534E">{{toRoman(beginRate.recordAndApproveNum)}}</span>
+                        <span class="lanse-first" style="color: #E0534E">{{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">{{toRoman(item.num)}}</span>
+                        {{item.name}}<span class="lanse-first">{{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">{{toRoman(item.num)}}</span>
+                        {{item.name?item.name:item.code}}<span class="lanse-first">{{item.num}}</span>
                     </label>
                 </div>
             </div>
@@ -759,9 +760,6 @@
             this.init()
         },
         methods: {
-            toRoman(num){
-                return intToRoman(num)
-            },
             closeAllLayers() {
                 layui.layer.closeAll(); // 关闭所有弹框
             },

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">{{toRoman(beginRate.num)}}</span>
+                        投产项目总数<span class="lanse-first">{{beginRate.num}}</span>
                     </label>
                         <label class="juli">
-                            已入规<span class="lanse-first">{{toRoman(beginRate.yrgNum)}}</span>
+                            已入规<span class="lanse-first">{{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">{{toRoman(beginRate.wrgNum)}}</span>
+                            未入规<span class="lanse-first">{{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">{{toRoman(item.num)}}</span>
+                        {{item.name}}<span class="lanse-first">{{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">{{toRoman(item.num)}}</span>
+                        {{item.name}}<span class="lanse-first">{{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">{{toRoman(item.num)}}</span>
+                        {{item.name?item.name:item.code}}<span class="lanse-first">{{item.num}}</span>
                     </label>
                 </div>
             </div>
@@ -573,9 +573,6 @@
             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">{{toRoman(beginRate.num)}}</span>
+                        投产项目总数<span class="lanse-first">{{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">{{toRoman(item.num)}}</span>
+                        {{item.name}}<span class="lanse-first">{{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">{{toRoman(item.num)}}</span>
+                        {{item.name}}<span class="lanse-first">{{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">{{toRoman(item.num)}}</span>
+                        {{item.name?item.name:item.code}}<span class="lanse-first">{{item.num}}</span>
                     </label>
                 </div>
             </div>
@@ -635,9 +635,6 @@
             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">{{toRoman(beginRate.num)}}</span>
+                                        在建项目总数<span class="lanse-first">{{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">{{toRoman(beginRate.ykgNum)}}</span>
+                                        已开工<span class="lanse-first">{{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">{{toRoman(item.num)}}</span>
+                        {{item.name}}<span class="lanse-first">{{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">{{toRoman(item.num)}}</span>
+                        {{item.name}}<span class="lanse-first">{{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">{{toRoman(item.num)}}</span>
+                        {{item.name?item.name:item.code}}<span class="lanse-first">{{item.num}}</span>
                     </label>
                 </div>
             </div>
@@ -759,9 +759,6 @@
             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">{{toRoman(beginRate.num)}}</span>
+                        在建项目总数<span class="lanse-first">{{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">{{toRoman(item.num)}}</span>
+                        {{item.name}}<span class="lanse-first">{{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">{{toRoman(item.num)}}</span>
+                        {{item.name}}<span class="lanse-first">{{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">{{toRoman(item.num)}}</span>
+                        {{item.name?item.name:item.code}}<span class="lanse-first">{{item.num}}</span>
                     </label>
                 </div>
             </div>
@@ -751,9 +751,6 @@
             this.init()
         },
         methods: {
-            toRoman(num){
-                return intToRoman(num)
-            },
             closeAllLayers() {
                 layui.layer.closeAll(); // 关闭所有弹框
             },

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

@@ -35,6 +35,9 @@
         .shense {
             color: #111111;
         }
+        .new-roman{
+            font-family: "Times New Roman", Times, serif;
+        }
 
         .no-wrap {
             white-space: nowrap;
@@ -43,6 +46,7 @@
         .lanse-first {
             color: #1C56A3;
             font-size: 12px;
+            font-family: "Times New Roman", Times, serif;
         }
 
         .layui-table-col-special .layui-table-cell {
@@ -224,7 +228,7 @@
             <div class="layui-row class_ls">
                 <div style="display: flex">
                     <label class="juli">
-                        新建项目总数<span class="lanse-first">{{toRoman(beginRate.num)}}</span>
+                        新建项目总数<span class="lanse-first">{{beginRate.num}}</span>
                         <div class="progress-div">
                             <div class="layui-progress">
                                 <div class="layui-progress-bar"></div>
@@ -232,7 +236,7 @@
                         </div>
                     </label>
                     <label class="juli">
-                        已开工<span class="lanse-first">{{toRoman(beginRate.ykgNum)}}</span>
+                        已开工<span class="lanse-first">{{beginRate.ykgNum}}</span>
                         <div class="progress-div">
                             <div class="layui-progress">
                                 <div class="layui-progress-bar" :style="'width:'+beginRate.noRate"></div>
@@ -252,18 +256,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">{{toRoman(item.num)}}</span>
+                        {{item.name}}<span class="lanse-first">{{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">{{toRoman(item.num)}}</span>
+                        {{item.name}}<span class="lanse-first">{{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">{{toRoman(item.num)}}</span>
+                        {{item.name?item.name:item.code}}<span class="lanse-first">{{item.num}}</span>
                     </label>
                 </div>
             </div>
@@ -419,7 +423,7 @@
 <script type="text/html" id="date">
 
     <div title="">
-        <div class="line"><span class="qianse">计划开工：</span> <span class="shense">{{ d.beginDate ? d.beginDate : '未指定' }}</span>
+        <div class="line"><span class="shense new-roman">{{ d.beginDate ? d.beginDate : '未指定' }}</span>
 
         </div>
 <%--        <div class="line"><span class="qianse">计划竣工：</span> <span class="shense">{{d.endDate}}</span>--%>
@@ -485,10 +489,10 @@
 <%--        <div class="line"><span class="qianse">无需办理的手续：</span> <span class="shense">{{d.preNoNum}}</span>个--%>
 
 <%--        </div>--%>
-        <div class="line"><span class="qianse">办理中的手续：</span> <span class="shense">{{d.preProceNum}}</span>个
+        <div class="line"><span class="qianse">办理中的手续：</span> <span class="shense new-roman">{{d.preProceNum}}</span>个
 
         </div>
-        <div class="line"><span class="qianse">已办理完成手续：</span> <span class="shense">{{d.preEndNum}}</span>个
+        <div class="line"><span class="qianse">已办理完成手续：</span> <span class="shense new-roman">{{d.preEndNum}}</span>个
 
         </div>
     </div>
@@ -615,9 +619,6 @@
             this.init()
         },
         methods: {
-            toRoman(num){
-                return intToRoman(num)
-            },
             closeAllLayers() {
                 layui.layer.closeAll();
             },
@@ -997,10 +998,10 @@
                             }},
                         {
                             field: 'amtTotal', title: '计划总投资（亿元）', width: 80, templet: function (d) {
-                                return (d.amtTotal / 10000).toFixed(2) + "亿元";
+                                return `<span class="new-roman">` + (d.amtTotal / 10000).toFixed(2) + `</span>` + "亿元";
                             }
                         },
-                        // {field: 'preProceNum', title: '预计开工时间', width: 160, templet: '#date'},
+                        {field: 'preProceNum', title: '预计开工时间', width: 100, templet: '#date'},
                           {field: 'xmbaStatus', title: '前期手续办理情况', width: 160, templet: '#preInfo'},
                         {field: 'remark', title: '备注', width: 245, templet: '#remark'},
                         {title: '操作', width: 150, toolbar: '#toolBar', fixed: 'right'},

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

@@ -43,6 +43,7 @@
         .lanse-first {
             color: #1C56A3;
             font-size: 12px;
+            font-family: "Times New Roman", Times, serif;
         }
 
         .layui-table-col-special .layui-table-cell {
@@ -389,7 +390,7 @@
             <div class="layui-row class_ls">
                 <div style="display: flex">
                     <label class="juli">
-                        新建项目总数<span class="lanse-first">{{toRoman(beginRate.num)}}</span>
+                        新建项目总数<span class="lanse-first">{{beginRate.num}}</span>
                         <div class="progress-div">
                             <div class="layui-progress">
                                 <div class="layui-progress-bar"></div>
@@ -401,18 +402,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">{{toRoman(item.num)}}</span>
+                        {{item.name}}<span class="lanse-first">{{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">{{toRoman(item.num)}}</span>
+                        {{item.name}}<span class="lanse-first">{{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">{{toRoman(item.num)}}</span>
+                        {{item.name?item.name:item.code}}<span class="lanse-first">{{item.num}}</span>
                     </label>
                 </div>
             </div>
@@ -557,13 +558,12 @@
 <script type="text/html" id="date">
 
     <div title="">
-        <div class="line"><span class="qianse">计划开工：</span> <span class="shense">{{d.beginDate}}</span>
-
-        </div>
-        <div class="line"><span class="qianse">计划竣工：</span> <span class="shense">{{d.endDate}}</span>
+        <div class="line"><span class="shense">{{d.beginDate}}</span>
 
         </div>
+<%--        <div class="line"><span class="qianse">计划竣工：</span> <span class="shense">{{d.endDate}}</span>--%>
 
+<%--        </div>--%>
     </div>
 </script>
 
@@ -752,9 +752,6 @@
             this.init()
         },
         methods: {
-            toRoman(num){
-                return intToRoman(num)
-            },
             closeAllLayers() {
                 layui.layer.closeAll();
             },
@@ -1140,7 +1137,7 @@
                                 return (d.amtTotal / 10000).toFixed(2) + "亿元";
                             }
                         },
-                        {field: 'preProceNum', title: '预计开工时间', width: 160, templet: '#date'},
+                        {field: 'preProceNum', title: '预计开工时间', width: 100, templet: '#date'},
                         {field: 'xmbaStatus', title: '前期手续办理情况', width: 160, templet: '#preInfo'},
                         {field: 'remark', title: '备注', width: 245, templet: '#remark'},
                         {title: '操作', width: 150, toolbar: '#toolBar', fixed: 'right'},

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

@@ -43,6 +43,7 @@
         .lanse-first {
             color: #1C56A3;
             font-size: 12px;
+            font-family: "Times New Roman", Times, serif;
         }
 
         .layui-table-col-special .layui-table-cell {

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">{{toRoman(otherData.totalNumber)|| 0}}</div>
+                            <div class="status-text-num">{{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">{{toRoman(otherData.cbNumber || 0)}}</div>
+                            <div class="status-text-num">{{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">{{toRoman(otherData.xjNumber||0)}}</div>
+                            <div class="status-text-num">{{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">{{toRoman(otherData.zjNumber||0)}}</div>
+                            <div class="status-text-num">{{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">{{toRoman(otherData.tcNumber)||0}}</div>
+                            <div class="status-text-num">{{otherData.tcNumber||0}}</div>
                             <div class="status-text-unit">个</div>
                         </div>
                         <div class="status-label">投产总量</div>
@@ -118,13 +118,13 @@
         </div>
     </div>
     <script type="text/html" id="bZb">
-		{{d.numBZb||0}}%
+        <span class="new-roman">{{d.numBZb||0}}%</span>
 	</script>
 	<script type="text/html" id="numBl">
 		{{#if (d.numBl >= 0) { }}
-			<span style="color:green;">{{d.numBl||0}}%</span>
+			<span class="new-roman" style="color:green;">{{d.numBl||0}}%</span>
 		{{# } else { }}
-			<span style="color:red;">{{d.numBl||0}}%</span>
+			<span class="new-roman" style="color:red;">{{d.numBl||0}}%</span>
 		{{#} }}
 	</script>
     <script type="text/javascript">
@@ -268,9 +268,6 @@
 			this.init();
 		},
     	methods: {
-            toRoman(num){
-                return intToRoman(num)
-            },
     		formatMonth: function(month) {
     			if(month < 10) {
     				return "0"+month;
@@ -491,8 +488,8 @@
                     cols: [[ // 设置表头
                       { type: 'numbers', title: '序号', width: 44, align: 'center' },
                       { field: 'kindDesc', title: kindName, align: 'center'},
-                      { field: 'amtJh', title: year+'年计划投资额(万元)', align: 'center' },
-                      { field: 'numBZb', title: '进度占比', align: 'center',templet: "#bZb" },
+                      { field: 'amtJh', title: year+'年计划投资额(万元)', align: 'center', templet: d => '<span class="new-roman">' + d.amtJh + '</span>'},
+                      { field: 'numBZb', title: '进度占比', align: 'center',templet: "#bZb"},
                       { field: 'numBl', title: '同比增长', align: 'center',templet: "#numBl" },
                     ]],
                     limit: data.length,
@@ -772,9 +769,9 @@
     }
 
     .status-text-num {
-        /*font-size: 24px;*/
-        font-size: 16px;
+        font-size: 24px;
         color: #1C56A3;
+        font-family: "Times New Roman", Times, serif;
     }
 
     .status-text-unit {
@@ -930,6 +927,9 @@
     .layui-table-cell{
         padding: 0 !important;
     }
+    .new-roman{
+        font-family: "Times New Roman", Times, serif;
+    }
 </style>
 </body>
 </html>

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

@@ -51,7 +51,7 @@
                     <div class="layui-card-body">
                         <div class="img_num">
                             <img src="${WebSite.asset }/css/images/workPlat/remind.png"/>
-                            <span class="num">${warningNum}</span>
+                            <span class="num new-roman">${warningNum}</span>
                         </div>
                         <div class="word">
                                 预警提醒
@@ -63,7 +63,7 @@
                     <div class="layui-card-body">
                         <div class="img_num">
                             <img src="${WebSite.asset }/css/images/workPlat/remind.png"/>
-                            <span class="num">${exceedNum}</span>
+                            <span class="num new-roman">${exceedNum}</span>
                         </div>
                         <div class="word">
                             进度红灯
@@ -123,7 +123,7 @@
                     <div class="layui-card-body">
                         <div class="img_num">
                             <img src="${WebSite.asset }/css/images/workPlat/remind.png"/>
-                            <span class="num">${numData.num_2}</span>
+                            <span class="num new-roman">${numData.num_2}</span>
                         </div>
                         <div class="word">
                                 预警提醒
@@ -135,7 +135,7 @@
                     <div class="layui-card-body">
                         <div class="img_num">
                             <img src="${WebSite.asset }/css/images/workPlat/remind.png"/>
-                            <span class="num">${offsetNum}</span>
+                            <span class="num new-roman">${offsetNum}</span>
                         </div>
                         <div class="word">
                             偏离度红黄灯
@@ -182,26 +182,26 @@
                         <div class="nummber_top" style="border-bottom: 1px solid #EDEDED;display: flex;flex-direction:column;align-items:flex-start;">
                             <div>
                                 <span class="title">项目总数</span>
-                                <span class="num" id="totalNum"></span>
+                                <span class="num new-roman" id="totalNum"></span>
                             </div>
                             <div>
                                 <span class="title">储备项目数</span>
-                                <span class="num" id="cbNum"></span>
+                                <span class="num new-roman" id="cbNum"></span>
                             </div>
                             <div>
 
                                 <span class="title">新建项目数</span>
-                                <span class="num" id="xjNum"></span>
+                                <span class="num new-roman" id="xjNum"></span>
                             </div>
                             <div>
 
                                 <span class="title">在建项目数</span>
-                                <span class="num" id="zjNum"></span>
+                                <span class="num new-roman" id="zjNum"></span>
                             </div>
                             <div>
 
                                 <span class="title">投产项目数</span>
-                                <span class="num" id="tcNum"></span>
+                                <span class="num new-roman" id="tcNum"></span>
                             </div>
                         </div>
                     </div>
@@ -211,15 +211,15 @@
                     <div class="nummber_top" style="border-bottom: 1px solid #EDEDED;display: flex;flex-direction:column;align-items:flex-start;justify-content: space-evenly;">
                         <div>
                             <span class="title">绿灯项目数</span>
-                            <span class="num" id="greenNum">${notExceedNum}</span>
+                            <span class="num new-roman" id="greenNum">${notExceedNum}</span>
                         </div>
                         <div>
                             <span class="title">黄灯项目数</span>
-                            <span class="num" id="yellowNum">${withinNum}</span>
+                            <span class="num new-roman" id="yellowNum">${withinNum}</span>
                         </div>
                         <div>
                             <span class="title">红灯项目数</span>
-                            <span class="num" id="redNum">${outsideNum}</span>
+                            <span class="num new-roman" id="redNum">${outsideNum}</span>
                         </div>
                     </div>
                 </div>
@@ -249,9 +249,6 @@
             this.init();
         },
         methods: {
-            toRoman(num){
-                return intToRoman(num)
-            },
             init: function () {
                 this.initChartsYearStart();
                 this.initChart();
@@ -308,11 +305,11 @@
                         $("#yearPlanNum").text(res.data.zhData.num_4 || 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);
+                        $("#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);
 
 
                         if (res.data.yearKgl){
@@ -425,7 +422,7 @@
                         radius: ['35%', '50%'],
                         label: {
                             formatter: function(params) {
-                                return self.toRoman(params.value) + '个 ' + params.percent + '%';
+                                return params.value + '个 ' + params.percent + '%';
                             }
                             // formatter: '{c}个 {d}%'
                         },