1.旭日图无数据时显示字体恢复为白色

2.国家代理》拦截策略 导出没有丢包率
3.国家代理》拦截策略 导出阻断类型内容不正确
4.国家代理》缓存策略 导出无法过滤阻断类型问题

src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java

@@ -329,6 +329,18 @@ public class InterceptController extends CommonController {
 				httpUrlList.addAll(maps.get("NTC_HTTP_URL"));
 				ipList.addAll(maps.get("PXY_INTERCEPT_IP"));
 				pktBinList.addAll(maps.get("PXY_INTERCEPT_PKT_BIN"));
+				if (entity.getFunctionId() == 200){
+					Properties msgProp = getMsgProp();
+					if(cfg.getAction().equals(1)) {
+						cfg.setUserRegion5(msgProp.getProperty("intercept"));
+					}else if(cfg.getAction().equals(48)) {
+						cfg.setUserRegion5(msgProp.getProperty("action_spoofing"));
+					}else if(cfg.getAction().equals(128)) {
+						cfg.setUserRegion5(msgProp.getProperty("bypass"));
+					}else {
+						cfg.setUserRegion5(msgProp.getProperty(DictUtils.getDictLabels("SERVICE_ACTION", cfg.getAction().toString(), cfg.getAction().toString())));
+					}
+				}
 			}
 			pktBinList = BaseStringCfg.replaceBaseKeyList(pktBinList);
 			httpUrlList = BaseStringCfg.baseHexList(httpUrlList);
@@ -344,7 +356,7 @@ public class InterceptController extends CommonController {
 				dataMap.put("PXY_INTERCEPT_IP", ipList);
 				dataMap.put("PXY_INTERCEPT_PKT_BIN", pktBinList);
 			} else if (entity.getFunctionId() == 200) {// IP拦截
-				cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,userregion5,userregion2,&userregion1:intercept_file_strategy-";
+				cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,block_type,&userregion1:intercept_file_strategy-userregion2:ratelimit-userregion5:block_type";
 				titleList.add("PXY_INTERCEPT_IP");
 				classMap.put("PXY_INTERCEPT_IP", IpPortCfg.class);
 				noExportMap.put("PXY_INTERCEPT_IP", ipPortInfoNoExport);

src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp

@@ -355,7 +355,7 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th column="cfg_id"  class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
 								    <th column="config_describe"  class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
-									<th column="block_type"  class="sort-column a.action"><spring:message code="block_type"/></th>
+									<th column="action"  class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th column="ignore_query_string" ><spring:message code="ignore_query_string"/></th>
 									<th column="include_cookie" ><spring:message code="include_cookie"/></th>
 									<th column="no_revalidate" ><spring:message code="no_revalidate"/></th>

src/main/webapp/static/pages/scripts/echart.js

@@ -1377,6 +1377,11 @@ function echart_topic_domain(rs){
 			marginTop:50,
 			marginBottom:10
 	    },
+	    noData:{
+			style: {//设置字体颜色
+				color: '#fff',
+			},
+		},
 	    exporting: {
 			allowHTML:true,
 			filename:'Service'+addDateName(),