年度计划-周调度图片

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

@@ -108,11 +108,6 @@ 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/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/util/DataSourceAspect.java

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

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="`${fgwUrl }/static/file/`+item.imgId+`/showfile`">
+        				<img @dblclick="showAerial(item)" :src="`${domain }/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="`${fgwUrl }/static/file/`+item.imgId+`/showfile`">
+					  <img @click="showImagePlus(item.imgId)" :src="`${domain }/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 = "${fgwUrl}/static/file/" + fileId + "/showfile";
+				imageUrl = "${domain}/static/file/" + fileId + "/showfile";
 				var  type="101";
 				var createTime="";
 				if (imageUrl) {

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/graphic/detail.jsp

@@ -92,7 +92,7 @@
 		                    	<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="'${fgwUrl}/static/file/'+item.fileAddre+'/showfile'" :src="'${fgwUrl}/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>
@@ -109,7 +109,7 @@
 		                    		<div class="imgTab">
 		                    			<video controls="controls" loop="loop" preload="auto">
 <%--		                    				<source :src="'${domain}/static/file/'+item.fileAddre+'/watch'">--%>
-		                    				<source :src="'${fgwUrl}/static/file/'+item.fileAddre+'/watch'">
+		                    				<source :src="picShow(item.fileAddre,item.fileType)">
 		                    			</video>
 			                    		<span>{{item.time}}</span>
 		                    		</div>
@@ -141,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/project/projectInfo.jsp

@@ -128,15 +128,15 @@
             <table class="table1 page-table">
                 <tr>
                     <td class="label" style="width: 10%">项目代码</td>
-                    <td style="width: 40%">${sunInfo.sub_code }</td>
+                    <td style="width: 40%">${sunInfo.subCode }</td>
                     <td class="label" style="width: 10%">项目名称</td>
-                    <td style="width: 40%">${sunInfo.sub_name }</td>
+                    <td style="width: 40%">${sunInfo.subName }</td>
                 </tr>
                 <tr>
                     <td class="label" style="width: 10%">建设性质</td>
                     <td style="width: 40%">${sunInfo.statusName }</td>
                     <td class="label" style="width: 10%">所属行业</td>
-                    <td style="width: 40%">${sunInfo.indus_name }</td>
+                    <td style="width: 40%">${sunInfo.indusName }</td>
                 </tr>
                 <tr>
                     <%--<td class="label" style="display: none">项目类型</td>
@@ -154,26 +154,21 @@
                 </tr>
                 <tr>
                     <td class="label">项目单位</td>
-<%--                    <td>${sunInfo.unitDesc }</td>--%>
-                    <td>
-                        <a href="https://www.qcc.com/search?key=${sunInfo.unitName}" target="_blank" title="点击查看企业信息">
-                            ${sunInfo.unitName }
-                        </a>
-                    </td>
+                    <td>${sunInfo.unitDesc }</td>
                 </tr>
                 <tr>
                     <td class="label">创建用户</td>
                     <td>${sunInfo.createUserName }</td>
                     <td class="label">创建时间</td>
-                    <td colspan="3"><fmt:formatDate value="${sunInfo.create_time }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+                    <td><fmt:formatDate value="${sunInfo.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
                 </tr>
             </table>
 
             <div class="table-title">资金信息</div>
             <table class="table1 page-table">
                 <tr>
-                    <td class="label" style="width: 10%">总投资金额</td>
-                    <td style="width: 40%">${sunInfo.amt_total }万元</td>
+                    <td class="label" style="width:20%">总投资金额</td>
+                    <td style="width: 40%">${sunInfo.amtTotal }万元</td>
                 </tr>
                 <%--					<tr>
                                         <td class="label" rowspan="${rowNum }">资金来源</td>
@@ -206,22 +201,22 @@
             <table class="table1 page-table">
                 <tr>
                     <td class="label">计划开工时间</td>
-                    <td><fmt:formatDate value="${sunInfo.begin_date }" pattern="yyyy-MM-dd"/></td>
+                    <td><fmt:formatDate value="${sunInfo.beginDate }" pattern="yyyy-MM-dd"/></td>
                     <td class="label">计划竣工时间</td>
-                    <td><fmt:formatDate value="${sunInfo.end_date }" pattern="yyyy-MM-dd"/></td>
+                    <td><fmt:formatDate value="${sunInfo.endDate }" pattern="yyyy-MM-dd"/></td>
                 </tr>
                 <tr>
                     <td class="label">平台联系人</td>
-                    <td>${sunInfo.name_zrr }</td>
+                    <td>${sunInfo.nameZrr }</td>
                     <td class="label">平台联系人电话</td>
                     <td>${sunInfo.tel }</td>
                 </tr>
 
                 <tr>
                     <td class="label">项目总负责人</td>
-                    <td>${sunInfo.name_lead }</td>
+                    <td>${sunInfo.nameLead }</td>
                     <td class="label">项目总负责人电话</td>
-                    <td>${sunInfo.tel_lead }</td>
+                    <td>${sunInfo.telLead }</td>
                 </tr>
             </table>
         </div>

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();