zhanghengfeng 发布系统代码 [TrainSys，网页端]

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSCHARTS/Chart.json

@@ -18,7 +18,7 @@
   "getPSChartCoordinateSystems" : [ {
     "eChartsType" : "none",
     "index" : 0,
-    "name" : "[pie_0]无坐标系[0]",
+    "name" : "[funnel_0]无坐标系[0]",
     "type" : "NONE",
     "id" : "0"
   } ],
@@ -37,20 +37,16 @@
   } ],
   "getPSChartDataSets" : [ {
     "index" : 0,
-    "name" : "pie_0-DEFAULT",
+    "name" : "funnel_0-DEFAULT",
     "getPSChartDataSetFields" : [ {
       "index" : 0,
-      "name" : "NAME",
-      "getPSCodeList" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
-      },
+      "name" : "AGE",
       "groupField" : true,
       "id" : "0"
     }, {
       "index" : 1,
-      "name" : "AGE",
-      "groupField" : false,
+      "name" : "NAME",
+      "groupField" : true,
       "id" : "1"
     } ],
     "id" : "0"
@@ -72,15 +68,11 @@
     "id" : "0"
   },
   "getPSDEChartSerieses" : [ {
-    "caption" : "访问来源",
-    "catalogField" : "NAME",
-    "getCatalogPSCodeList" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
-    },
-    "eChartsType" : "pie",
+    "caption" : "漏斗图",
+    "catalogField" : "AGE",
+    "eChartsType" : "funnel",
     "index" : 0,
-    "name" : "pie_0",
+    "name" : "funnel_0",
     "getPSChartCoordinateSystem" : {
       "modelref" : true,
       "id" : "0"
@@ -90,16 +82,17 @@
       "id" : "0"
     },
     "getPSChartSeriesEncode" : {
-      "category" : "NAME",
+      "category" : "AGE",
       "index" : 0,
+      "itemId" : "NAME",
+      "itemName" : "NAME",
       "name" : "坐标系编码",
       "type" : "NONE",
-      "value" : "AGE",
       "id" : "0"
     },
+    "seriesField" : "NAME",
     "seriesLayoutBy" : "column",
-    "seriesType" : "pie",
-    "valueField" : "AGE",
+    "seriesType" : "funnel",
     "enableChartDataSet" : true
   } ],
   "getPSDEChartTitle" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoChartView.json

@@ -223,7 +223,7 @@
     "getPSChartCoordinateSystems" : [ {
       "eChartsType" : "none",
       "index" : 0,
-      "name" : "[pie_0]无坐标系[0]",
+      "name" : "[funnel_0]无坐标系[0]",
       "type" : "NONE",
       "id" : "0"
     } ],
@@ -242,20 +242,16 @@
     } ],
     "getPSChartDataSets" : [ {
       "index" : 0,
-      "name" : "pie_0-DEFAULT",
+      "name" : "funnel_0-DEFAULT",
       "getPSChartDataSetFields" : [ {
         "index" : 0,
-        "name" : "NAME",
-        "getPSCodeList" : {
-          "modelref" : true,
-          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
-        },
+        "name" : "AGE",
         "groupField" : true,
         "id" : "0"
       }, {
         "index" : 1,
-        "name" : "AGE",
-        "groupField" : false,
+        "name" : "NAME",
+        "groupField" : true,
         "id" : "1"
       } ],
       "id" : "0"
@@ -351,15 +347,11 @@
       "id" : "0"
     },
     "getPSDEChartSerieses" : [ {
-      "caption" : "访问来源",
-      "catalogField" : "NAME",
-      "getCatalogPSCodeList" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/UsrCodeList0129740128.json"
-      },
-      "eChartsType" : "pie",
+      "caption" : "漏斗图",
+      "catalogField" : "AGE",
+      "eChartsType" : "funnel",
       "index" : 0,
-      "name" : "pie_0",
+      "name" : "funnel_0",
       "getPSChartCoordinateSystem" : {
         "modelref" : true,
         "id" : "0"
@@ -369,16 +361,17 @@
         "id" : "0"
       },
       "getPSChartSeriesEncode" : {
-        "category" : "NAME",
+        "category" : "AGE",
         "index" : 0,
+        "itemId" : "NAME",
+        "itemName" : "NAME",
         "name" : "坐标系编码",
         "type" : "NONE",
-        "value" : "AGE",
         "id" : "0"
       },
+      "seriesField" : "NAME",
       "seriesLayoutBy" : "column",
-      "seriesType" : "pie",
-      "valueField" : "AGE",
+      "seriesType" : "funnel",
       "enableChartDataSet" : true
     } ],
     "getPSDEChartTitle" : {