update

4 files changed, 14 insertions, 31 deletions

diff --git a/nezha-admin/src/main/java/com/nis/modules/dashboard/entity/ChartTableEntity.java b/nezha-admin/src/main/java/com/nis/modules/dashboard/entity/ChartTableEntity.java
index 6f9741a4..8cc764a5 100644
--- a/nezha-admin/src/main/java/com/nis/modules/dashboard/entity/ChartTableEntity.java
+++ b/nezha-admin/src/main/java/com/nis/modules/dashboard/entity/ChartTableEntity.java
@@ -11,8 +11,8 @@ public class ChartTableEntity implements Serializable{
 	private Integer fontSize;    	//表格字体大小

     private String title;        	//标题

     private String descr;        	//描述

-    private String valueName;    	//值列展示名

-    private String timeName;     	//时间列展示名

+    private String vName;    	//值列展示名

+    private String tName;     	//时间列展示名

     private Integer decimal;	 	//小数位格式化

     private String timeFormat;   	//时间格式化

     private Integer pageSize;    	//表格分页数量

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 79f48612..4946c82f 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
@@ -472,30 +472,6 @@
 	        	vm.chartSingle.isScale=0;

 	        }

 	    })

-	    

-	    //初始化单值表颜色选择

-		$('.singleColor').each(function() {

-            $(this).minicolors({

-                control: $(this).attr('data-control') || 'hue',

-                defaultValue: $(this).attr('data-defaultValue') || '',

-                inline: $(this).attr('data-inline') === 'true',

-                letterCase: $(this).attr('data-letterCase') || 'lowercase',

-                opacity: $(this).attr('data-opacity'),

-                position: $(this).attr('data-position') || 'bottom left',

-                change: function(hex, opacity) {

-                    if (!hex)

-                        return;

-                    if (opacity)

-                        hex += ', ' + opacity;

-                    try {

-                        console.log(hex);

-                    } catch (e) {

-                    }

-                },

-                theme: 'bootstrap'

-            });

-

-        });

 	});

 

 	//注册select组件

@@ -710,7 +686,7 @@
 			},

 			//设置单值图小数点保留位数

 			setSingleDecimal:function(){

-				singleOption.series[0].data=[{"value":Number(10).toFixed(vm.chartSingle.decimal)}];

+				singleOption.series[0].data=[{"value":Number(singleValue).toFixed(vm.chartSingle.decimal)}];

 				singleChart.setOption(singleOption);

 			},

 			//设置阈值颜色

@@ -977,6 +953,11 @@
         			        }

 				    	}else if(vm.dashboard.chartType.code==3){

 				    		vm.tableDatas=JSON.parse(obj.series);

+				    	}else if(vm.dashboard.chartType.code==2){

+				    		var decimal = vm.chartSingle.decimal;

+	            			singleValue=a[0].value;

+	            			singleOption.series[0].data=[{"value":(singleValue).toFixed(decimal)}];

+	            			singleChart.setOption(singleOption);

 				    	}	

 				    	vm.dashboardSetting=true;

 				    }

@@ -1360,6 +1341,8 @@
 				                opacity: $(this).attr('data-opacity'),

 				                position: $(this).attr('data-position') || 'bottom left',

 				                change: function(hex, opacity) {

+				                	console.log(hex)

+				                	console.log(opacity)

 				                    if (!hex)

 				                        return;

 				                    if (opacity)

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 3c2fb4ac..606ebac6 100644
--- a/nezha-admin/src/main/resources/templates/modules/dashboard/index.html
+++ b/nezha-admin/src/main/resources/templates/modules/dashboard/index.html
@@ -45,8 +45,8 @@
 								<template v-if="dashboard.chartType === 3">

 									<table  :style="{fontSize: (JSON.parse(dashboard.data)).fontSize + 'px' }" class='table table-striped table-bordered table-condensed'>

 										<thead>

-											<tr><th class='' id='tableColumnTime'>time</th>

-											<th class='' id='tableColumnValue'>value</th></tr>

+											<tr><th class='' id='tableColumnTime'>{{(JSON.parse(dashboard.data)).tName}}</th>

+											<th class='' id='tableColumnValue'>{{(JSON.parse(dashboard.data)).vName}}</th></tr>

 										</thead>

 										<tbody>

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

diff --git a/nezha-admin/src/main/resources/templates/modules/dashboard/setting.html b/nezha-admin/src/main/resources/templates/modules/dashboard/setting.html
index 2c9f377e..b2007ae3 100644
--- a/nezha-admin/src/main/resources/templates/modules/dashboard/setting.html
+++ b/nezha-admin/src/main/resources/templates/modules/dashboard/setting.html
@@ -36,7 +36,7 @@
     	<table id='tablePanel' :style="{fontSize: chartTable.fontSize + 'px' }" class='table table-striped table-bordered table-condensed'>

     		<thead>

 	    		<tr>

-	    			<th class='' id='tableColumnTime'>{{chartTable.vName}}</th><th class='' id='tableColumnValue'>{{chartTable.tName}}</th>

+	    			<th class='' id='tableColumnTime'>{{chartTable.tName}}</th><th class='' id='tableColumnValue'>{{chartTable.vName}}</th>

 	    		</tr>

 	    	</thead>

 	    	<tbody>

@@ -240,7 +240,7 @@
 	                                <li class="list">

 	                                    <div class="li-left"><@spring.message 'dashboard.time'/></div>

 								        <span class='chooseOption'>

-								        	<input  class="input-normal required"  placeholder=""  disabled/>

+								        	<input  class="input-normal required"  placeholder="Time"  disabled/>

 								        </span>

 	                                </li>

 	                                <li class="list">