页面转罗马数字以及1.18提出的bug

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;
@@ -107,6 +108,11 @@ public class WebBootModeServlet extends HttpServlet {
 		
 		try {
 			context.setAttribute("version", DateUtil.getDate(new Date(),"yyyyMMddHHmm"));
+
+			// 设置application 域属性：fgwUrl 用于调取显示发改委附件
+			ResourceBundle resourceBundle = ResourceBundle.getBundle("config");
+			String url = resourceBundle.getString("app.fgw.in.url");
+			context.setAttribute("fgwUrl", url);
 		} catch (ParseException e) {
 		}
 		

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/webapp/vmodules/aerial/list.jsp

@@ -58,7 +58,7 @@
 	        				<span class="editButton" title="编辑" @click="edit(item)">编辑</span>
 	        				<span class="delButton" title="删除" @click="del(item)">X</span>
         				</span>
-        				<img @dblclick="showAerial(item)" :src="`${domain }/static/file/`+item.imgId+`/showfile`">
+        				<img @dblclick="showAerial(item)" :src="`${fgwUrl }/static/file/`+item.imgId+`/showfile`">
         				<span class="detailbar">
 	        				<span class="time">{{item.aerialDate}}</span>
 	        				<span class="remark" :title="item.remark">{{item.remark}}</span>
@@ -77,7 +77,7 @@
 					  <span class="toolbar">
 	        				<span class="delButton" title="删除" @click="del(item)">X</span>
         				</span>
-					  <img @click="showImagePlus(item.imgId)" :src="`${domain }/static/file/`+item.imgId+`/showfile`">
+					  <img @click="showImagePlus(item.imgId)" :src="`${fgwUrl }/static/file/`+item.imgId+`/showfile`">
 				  </div>
 				  <div class="img" v-show="subId != null"  >
 					  <img id="addPicPlus" @click="testUpload" src="${WebSite.asset }/css/images/jiahao.png" title="新增"  style="width: 120px;height: 120px;">
@@ -262,7 +262,7 @@
 			showImagePlus: function (fileId) {
 				var imageUrl = "";
 
-				imageUrl = "${domain}/static/file/" + fileId + "/showfile";
+				imageUrl = "${fgwUrl}/static/file/" + fileId + "/showfile";
 				var  type="101";
 				var createTime="";
 				if (imageUrl) {

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="'${fgwUrl}/static/file/'+item.fileAddre+'/showfile'" :src="'${fgwUrl}/static/file/'+item.fileAddre+'/showfile'">
 			                    		<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="'${fgwUrl}/static/file/'+item.fileAddre+'/watch'">
 		                    			</video>
 			                    		<span>{{item.time}}</span>
 		                    		</div>

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

@@ -98,15 +98,15 @@
                 <table id="areaTable"></table>
             </div>
         </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>--%>
-<%--            <div class="tabel-box">--%>
-<%--                <table id="hyTable"></table>--%>
-<%--            </div>--%>
-<%--        </div>--%>
+        <div class="main-layer-next">
+            <div class="pieEcarts">
+                <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>
+            </div>
+        </div>
         <div class="main-layer-next">
             <div class="pieEcarts">
                 <div class="pieEcarts-title">{{drawData.year}}年按建设性质占比情况</div>
@@ -454,7 +454,7 @@
 
                     self.showNoData();
                     self.initArea();
-                    // self.initHy();
+                    self.initHy();
                     self.initJs();
     			});
     		},
@@ -472,7 +472,8 @@
         		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() {