Merge branch 'develop'

talkincode · Feb 26, 2023 · 1b04988 · 1b04988
2 parents 9a2940c + 81aedc8
commit 1b04988
Show file tree

Hide file tree

Showing 16 changed files with 113 additions and 559 deletions.
diff --git a/assets/buildinfo.txt b/assets/buildinfo.txt
@@ -1,8 +1,8 @@
-BuildVersion=latest v8.0.1 2023-02-21 00:49:13
+BuildVersion=latest v8.0.1 2023-02-26 23:20:00
 ReleaseVersion=v8.0.1
-BuildTime=2023-02-21 00:49:13
+BuildTime=2023-02-26 23:20:00
 BuildName=toughradius
-CommitID=fbe5b570896d41f4fe72fa0ae60a9cc5774aa1bd
-CommitDate=Mon, 20 Feb 2023 22:53:50 +0800
+CommitID=d0e2e9eafddf5590ccf7508a3a21f7e9feab2d79
+CommitDate=Tue, 21 Feb 2023 00:49:26 +0800
 [email protected]
-CommitSubject=2023-02-20 22:53:17 : radsec secret cwmpconfig query
+CommitSubject=2023-02-21 00:49:13 : ui update
diff --git a/assets/static/myskin/webix_light_ext.css b/assets/static/myskin/webix_light_ext.css
@@ -192,6 +192,6 @@
     padding-left: 13px!important;
 }
 
-.webix_sidebar .webix_tree_branch_1 .webix_tree_item {
+.webix_sidebar .webix_tree_branch_2 .webix_tree_item {
     padding-left: 26px!important;
 }
diff --git a/assets/static/myskin/webix_light_ext.min.css b/assets/static/myskin/webix_light_ext.min.css
diff --git a/assets/static/views/settings.js b/assets/static/views/settings.js
@@ -20,7 +20,7 @@ settingsUi.getSystemConfigView = function (citem) {
         id: "settings_form_view",
         rows: [
             {
-                padding: 7,
+                padding: 2,
                 cols: [
                     {
                         view: "label", label: " <i class='" + citem.icon + "'></i> " + citem.title,
@@ -70,7 +70,7 @@ settingsUi.getRadiusConfigView = function (citem) {
         id: "settings_form_view",
         rows: [
             {
-                padding: 7,
+                padding: 2,
                 cols: [
                     {
                         view: "label", label: " <i class='" + citem.icon + "'></i> " + citem.title,
@@ -126,7 +126,7 @@ settingsUi.getTr069ConfigView = function (citem) {
         id: "settings_form_view",
         rows: [
             {
-                padding: 7,
+                padding: 2,
                 cols: [
                     {
                         view: "label", label: " <i class='" + citem.icon + "'></i> " + citem.title,

diff --git a/assets/static/views/settings.min.js b/assets/static/views/settings.min.js
diff --git a/assets/templates/cwmp_quickset.html b/assets/templates/cwmp_quickset.html
@@ -1,3 +1,5 @@
+
+<h3>Mikrotik</h3>
 <div><a href="/admin/settings/tr069/quickset/mikrotik_cpe_setup_tr069.rsc" target="_blank">mikrotik_cpe_setup_tr069.rsc</a></div>
 <div>
     <p>

diff --git a/controllers/crontoller.go b/controllers/crontoller.go
@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"github.com/talkincode/toughradius/controllers/apitoken"
-	"github.com/talkincode/toughradius/controllers/charts"
 	"github.com/talkincode/toughradius/controllers/cpe"
 	"github.com/talkincode/toughradius/controllers/cwmpconfig"
 	"github.com/talkincode/toughradius/controllers/cwmppreset"
@@ -27,7 +26,7 @@ func Init() {
 	opr.InitRouter()
 	settings.InitRouter()
 	dashboard.InitRouter()
-	charts.InitRouter()
+	// charts.InitRouter()
 	vpe.InitRouter()
 	cpe.InitRouter()
 	logs.InitRouter()

diff --git a/controllers/dashboard/charts.go b/controllers/dashboard/charts.go
diff --git a/controllers/dashboard/dashboard.go b/controllers/dashboard/dashboard.go
@@ -23,9 +23,7 @@ func InitRouter() {
 		stype := c.Param("type")
 		var cpes []models.NetCpe
 		common.Must(app.GDB().Find(&cpes).Error)
-		var statdata = map[string]*echarts.NameValuePair{
-			"unknow": {Value: 0, Name: "unknow"},
-		}
+		var statdata = map[string]*echarts.NameValuePair{}
 		for _, dev := range cpes {
 			var name string
 			switch stype {