xs 5 роки тому
батько
коміт
61004bf2a4

+ 15 - 0
src/main/java/com/jeeplus/modules/sg/managementcenter/moduleacquisition/web/ModuleBlockWeb.java

@@ -4,6 +4,7 @@
 package com.jeeplus.modules.sg.managementcenter.moduleacquisition.web;
 
 
+import com.jeeplus.common.config.Global;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.utils.excel.ImportExcel;
@@ -73,6 +74,13 @@ public class ModuleBlockWeb extends BaseController {
 	@RequestMapping(value = "data")
 	public Map<String, Object> data(ModuleBlock moduleBlock, HttpServletRequest request, HttpServletResponse response, Model model) {
 		Page<ModuleBlock> page = moduleBlockService.findPage(new Page<ModuleBlock>(request, response), moduleBlock);
+		//当判定系统为linux的时候
+		if (Global.SYS_TYPE.equals("2")) {
+			List<ModuleBlock> list = page.getList();
+			for (ModuleBlock moduleBlock1: list) {
+				moduleBlock1.setMdImg("http://" + request.getServerName()  +moduleBlock1.getMdImg());
+			}
+		}
 		return getBootstrapData(page);
 	}
 	/**
@@ -86,6 +94,13 @@ public class ModuleBlockWeb extends BaseController {
 		Integer version = new Integer(md_version) + 1;
 		moduleBlock.setMdVersion(String.valueOf(version));
 		Page<ModuleBlock> page = moduleBlockService.findPage(new Page<ModuleBlock>(request, response), moduleBlock);
+		//当判定系统为linux的时候
+		if (Global.SYS_TYPE.equals("2")) {
+			List<ModuleBlock> list = page.getList();
+			for (ModuleBlock moduleBlock1: list) {
+				moduleBlock1.setMdImg("http://" + request.getServerName()  +moduleBlock1.getMdImg());
+			}
+		}
 		return getBootstrapData(page);
 	}
 

+ 2 - 0
src/main/webapp/webpage/modules/sg/managementcenter/moduleacquisition/moduleBlockList.js

@@ -114,8 +114,10 @@ $(document).ready(function() {
                        formatter:function(value, row , index){
                        		if (value!=null&&value!=""){
                                 var valueArray = value.split("|");
+                                console.log(valueArray)
                                 var labelArray = [];
                                 for(var i =0 ; i<valueArray.length; i++){
+                                    console.log(valueArray[i])
                                     if(!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(valueArray[i]))
                                     {
                                         labelArray[i] = "<a href=\""+valueArray[i]+"\" url=\""+valueArray[i]+"\" target=\"_blank\">"+decodeURIComponent(valueArray[i].substring(valueArray[i].lastIndexOf("/")+1))+"</a>"