update

5 files changed, 21 insertions, 4 deletions

diff --git a/nezha-admin/src/main/java/com/nis/modules/dashboard/controller/DashboardController.java b/nezha-admin/src/main/java/com/nis/modules/dashboard/controller/DashboardController.java
index c7143e0a..d614ff7e 100644
--- a/nezha-admin/src/main/java/com/nis/modules/dashboard/controller/DashboardController.java
+++ b/nezha-admin/src/main/java/com/nis/modules/dashboard/controller/DashboardController.java
@@ -69,6 +69,7 @@ public class DashboardController extends AbstractController {
 	@ResponseBody

 	public R save(@RequestBody DashboardEntity dashboard) {

 		// 验证用户传参数 是否能生成有效图形

+		ValidateUtils.is(dashboard.getName()).notNull(RCode.DASHBOARD_NAME_NULL);

 		dashboardService.validateDashboardData(dashboard);

 		dashboardService.addDashboard(dashboard);

 		return R.ok();

diff --git a/nezha-admin/src/main/java/com/nis/modules/dashboard/service/impl/DashboardServiceImpl.java b/nezha-admin/src/main/java/com/nis/modules/dashboard/service/impl/DashboardServiceImpl.java
index 00ad3be6..04f8ecbe 100644
--- a/nezha-admin/src/main/java/com/nis/modules/dashboard/service/impl/DashboardServiceImpl.java
+++ b/nezha-admin/src/main/java/com/nis/modules/dashboard/service/impl/DashboardServiceImpl.java
@@ -75,6 +75,11 @@ public class DashboardServiceImpl extends ServiceImpl<DashboardDao, DashboardEnt
 				ChartTableEntity chartTableEntity = JSON.parseObject(dashboardEntity.getData(), ChartTableEntity.class);

 				userSqls = chartTableEntity.getUserSqls();

 				List<ChartSeriesEntity> chartTableSeries = baseMapper.selectResultData(userSqls.get(0).getSql());

+				if(chartTableEntity.getTimeFormat() != null && !chartTableEntity.getTimeFormat() .isEmpty()) {

+					for(ChartSeriesEntity resultData : chartTableSeries) {

+						resultData.setFormatTime(DateUtils.formatDate(resultData.getTime(),chartTableEntity.getTimeFormat()));

+					}

+				}

 				String tableResult = JSON.toJSONString(chartTableSeries);

 				chartTableEntity.setSeries(tableResult);

 				String chartTableEntityData = JSON.toJSONString(chartTableEntity);

@@ -121,6 +126,11 @@ public class DashboardServiceImpl extends ServiceImpl<DashboardDao, DashboardEnt
 			ChartTableEntity chartTableEntity = JSON.parseObject(dashboardEntity.getData(), ChartTableEntity.class);

 			userSqls = chartTableEntity.getUserSqls();

 			List<ChartSeriesEntity> chartTableSeries = baseMapper.selectResultData(userSqls.get(0).getSql());

+			if(chartTableEntity.getTimeFormat() != null && !chartTableEntity.getTimeFormat() .isEmpty()) {

+				for(ChartSeriesEntity resultData : chartTableSeries) {

+					resultData.setFormatTime(DateUtils.formatDate(resultData.getTime(),chartTableEntity.getTimeFormat()));

+				}

+			}

 			String tableResult = JSON.toJSONString(chartTableSeries);

 			chartTableEntity.setSeries(tableResult);

 			String chartTableEntityData = JSON.toJSONString(chartTableEntity);

diff --git a/nezha-admin/src/main/resources/templates/js/modules/dashboard/dashboard.js b/nezha-admin/src/main/resources/templates/js/modules/dashboard/dashboard.js
index b67a3671..86d93c11 100644
--- a/nezha-admin/src/main/resources/templates/js/modules/dashboard/dashboard.js
+++ b/nezha-admin/src/main/resources/templates/js/modules/dashboard/dashboard.js
@@ -813,7 +813,7 @@
 			            				var data={

 			    	            				id:index,

 			    	    			            name:'',

-			    	    			            type:showType,

+			    	    			            type:vm.showType,

 			    	    			            yAxisIndex: 0,

 			    	    			            showSymbol: false,

 			    	    	                    lineStyle:{

@@ -954,6 +954,7 @@
 				}

 				data.userSqls=vm.userSqls;

 				data.describe=vm.dashboard.describe;

+				delete data.series;

 				formdata.data=JSON.stringify(data);

 				if(vm.dashboard.id!=null&&vm.dashboard.id!=undefined&&vm.dashboard.id!=''){

 					formdata.id=vm.dashboard.id;

@@ -964,8 +965,12 @@
 				    url: vm.dashboard.id == null?baseURL + "dashboard/save":baseURL + "dashboard/update",

 				    data:JSON.stringify(formdata),

 				    success: function(r){

-				    	vm.$refs.returnMenu.click();

-				    	vm.queryDashboards();

+				    	if(r.msg=='success'){

+				    		vm.$refs.returnMenu.click();

+					    	vm.queryDashboards();

+				    	}else{

+				    		layer.msg(r.msg)

+				    	}

 				    }

 				})

 			},

diff --git a/nezha-admin/src/main/resources/templates/modules/dashboard/index.html b/nezha-admin/src/main/resources/templates/modules/dashboard/index.html
index 3767865f..f890ded4 100644
--- a/nezha-admin/src/main/resources/templates/modules/dashboard/index.html
+++ b/nezha-admin/src/main/resources/templates/modules/dashboard/index.html
@@ -51,7 +51,7 @@
 										<tbody>

 											<template v-for="data,index in JSON.parse((JSON.parse(dashboard.data)).series)">

 											<tr>

-												<td style='width:50%'>{{data.time}}</td>

+												<td style='width:50%'>{{data.formatTime}}</td>

 												<!-- <td>{{(data.value).toFixed((JSON.parse(dashboard.data)).decimal)}}</td> -->

 												<td>{{data.value}}</td>

 											</tr>

diff --git a/nezha-common/src/main/java/com/nis/common/utils/RCode.java b/nezha-common/src/main/java/com/nis/common/utils/RCode.java
index 112a916c..70bc069d 100644
--- a/nezha-common/src/main/java/com/nis/common/utils/RCode.java
+++ b/nezha-common/src/main/java/com/nis/common/utils/RCode.java
@@ -233,6 +233,7 @@ public enum RCode {
 	DASHBOARD_TYPE_NULL(500006,"dashboard_type_null"),  //仪表盘类型为空
 	DASHBOARD_USERSQL_NULL(500007,"dashboard_user_sql_null"),  //仪表盘查询语句为空
 	DASHBOARD_USERSQL_ERROR(500008,"dashboard_user_sql_error"),  //仪表盘查询语句错误
+	DASHBOARD_NAME_NULL(500009,"dashboard_name_null"),  //名称为空
 	
 	GRAPH_ERROR(600000, "graph_error"), //60xxxx，图形类通用错误