Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

@@ -132,7 +132,13 @@
 	  			<p>共有{{total}}条</p>
 	  			<p>
 	  				<img src="@/assets/images/EXCEL.png" alt="">
-	  				<span>导出EXCEL</span>
+	  				<el-popover
+	  				    placement="top-end"
+	  				    width="200"
+	  				    trigger="hover"
+	  				    content="功能正在开发中">
+	  						<span class="excel" slot="reference">导出EXCEL</span>
+	  				  </el-popover>
 	  			</p>
 	  		</div>
 	  		  
@@ -1101,6 +1107,9 @@ export default {
 					width: 18px;
 					height: 18px;
 				}
+				.excel{
+					cursor: pointer;
+				}
 			}
 			
 		}

dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue

@@ -449,7 +449,13 @@
         			<p>共有{{total}}条</p>
         			<p>
         				<img src="@/assets/images/EXCEL.png" alt="">
-        				<span>导出EXCEL</span>
+        				<el-popover
+        				    placement="top-end"
+        				    width="200"
+        				    trigger="hover"
+        				    content="功能正在开发中">
+        						<span class="excel" slot="reference">导出EXCEL</span>
+        				  </el-popover>
         			</p>
         		</div>
         		  
@@ -2992,6 +2998,9 @@
 					width: 18px;
 					height: 18px;
 				}
+				.excel{
+					cursor: pointer;
+				}
 			}
 			
 		}

dsk-operate-ui/src/views/radar/components/debtProject/index.vue

@@ -111,10 +111,7 @@
 			<ul class="bottomlist-content"  v-if="tableData.length>0">
 				<li class="bottomlist-list" v-for="item in tableData">
 					<p class="list-titel">
-						<span  v-html="item.projectName" @click="getUipIdByCid(item.id)">
-							
-						</span>
-						
+						<router-link  :to="'/radar/debtProject/details/'+ item.uuid" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link>
 					</p>
 					
 					<div class="content-label" v-if="item.domicile">

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseBussinessService.java

@@ -68,18 +68,25 @@ public class EnterpriseBussinessService {
         contentParam.put("data_type", "kaibiao");
         contentParam.put("filter_type", 2);
         contentParam.put("strategy_id", mongoContentId);
-        Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
+        Map<String, Object> contentMap = null;
+        try {
+           contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
+            log.info("contentData:{}", JSONUtil.toJsonStr(contentMap));
+        } catch (Exception e) {
+            data.put("content", e.getMessage());
+            map.put("data", data);
+            return BeanUtil.toBean(map, R.class);
+        }
 
-        log.info("contentData:{}", JSONUtil.toJsonStr(contentMap));
         Map contentData = MapUtils.getMap(contentMap, "data", null);
 
         if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
+            data.put("content", JSONUtil.toJsonStr(contentMap));
+            map.put("data", data);
             return BeanUtil.toBean(map, R.class);
         }
 
-        String htmlContent = MapUtils.getString(contentData, "htmlContent");
-
-        data.put("content", htmlContent);
+        data.put("content", MapUtils.getString(contentData, "htmlContent"));
         map.put("data", data);
 
         return BeanUtil.toBean(map, R.class);

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseProjectService.java

@@ -131,21 +131,27 @@ public class EnterpriseProjectService {
         }
 
         HashMap<String, Object> contentParam = new HashMap<>();
-        contentParam.put("data_type", "bid_plan");
+        contentParam.put("data_type", "zhaobiao_new");
         contentParam.put("filter_type", 2);
         contentParam.put("strategy_id", contentId);
-        Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
-
-        log.info("contentData:{}", JSONUtil.toJsonStr(contentMap));
+        Map<String, Object> contentMap = null;
+        try {
+            contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
+            log.info("contentData:{}", JSONUtil.toJsonStr(contentMap));
+        } catch (Exception e) {
+            data.put("content", e.getMessage());
+            map.put("data", data);
+            return BeanUtil.toBean(map, R.class);
+        }
         Map contentData = MapUtils.getMap(contentMap, "data", null);
 
         if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
+            data.put("content", JSONUtil.toJsonStr(contentMap));
+            map.put("data", data);
             return BeanUtil.toBean(map, R.class);
         }
 
-        String htmlContent = MapUtils.getString(contentData, "htmlContent");
-
-        data.put("content", htmlContent);
+        data.put("content", MapUtils.getString(contentData, "htmlContent"));
         map.put("data", data);
 
         return BeanUtil.toBean(map, R.class);