Browse Source

大数据

pengjing 7 months ago
parent
commit
c6ecc8ff90

+ 16 - 9
src/main/resources/static/app/main/bigdata/showDjdsj/dwgzz.js

@@ -58,8 +58,8 @@
             $scope.dyxb_pieOption = {
                 tooltip: {
                     trigger: 'item',
-                    formatter:function (data) {
-                        return data.seriesName + "<br/>"+ data.name+ " : " + data.value + " ("+data.percent.toFixed(0)+"%)";
+                    formatter: function (data) {
+                        return data.seriesName + "<br/>" + data.name + " : " + data.value + " (" + data.percent.toFixed(0) + "%)";
                     }
                 },
                 legend: {
@@ -124,6 +124,7 @@
                         dwgzzlb: $scope.selectparams.navSelected
                     }
                 }).then(function (result) {
+                    $scope.dyxb_dataList.length = 0;
                     if (result.data != null && result.data.length > 0) {
                         angular.forEach(result.data, function (val, index) {
                             $scope.dyxb_dataList.push($scope.getPieData(val.NUM, val.SEXNAME, $scope.selectparams.colors[index]));
@@ -137,8 +138,8 @@
             $scope.dynl_pieOption = {
                 tooltip: {
                     trigger: 'item',
-                    formatter:function (data) {
-                        return data.seriesName + "<br/>"+ data.name+ " : " + data.value + " ("+data.percent.toFixed(0)+"%)";
+                    formatter: function (data) {
+                        return data.seriesName + "<br/>" + data.name + " : " + data.value + " (" + data.percent.toFixed(0) + "%)";
                     }
                 },
                 legend: {
@@ -203,6 +204,7 @@
                         dwgzzlb: $scope.selectparams.navSelected
                     }
                 }).then(function (result) {
+                    $scope.dynl_dataList.length = 0;
                     if (result.data != null && result.data.length > 0) {
                         angular.forEach(result.data, function (val, index) {
                             $scope.dynl_dataList.push($scope.getPieData(val.NUM, val.AGENAME, $scope.selectparams.colors[index]));
@@ -216,11 +218,11 @@
             $scope.dydl_pieOption = {
                 tooltip: {
                     trigger: 'item',
-                    formatter:function (data) {
-                        return data.seriesName + "<br/>"+ data.name+ " : " + data.value + " ("+data.percent.toFixed(0)+"%)";
+                    formatter: function (data) {
+                        return data.seriesName + "<br/>" + data.name + " : " + data.value + " (" + data.percent.toFixed(0) + "%)";
                     }
                 }
-                ,legend: {
+                , legend: {
                     type: 'scroll',
                     orient: 'vertical',
                     right: 0,
@@ -282,6 +284,7 @@
                         dwgzzlb: $scope.selectparams.navSelected
                     }
                 }).then(function (result) {
+                    $scope.dydl_dataList.length = 0;
                     if (result.data != null && result.data.length > 0) {
                         angular.forEach(result.data, function (val, index) {
                             $scope.dydl_dataList.push($scope.getPieData(val.NUM, val.AGENAME, $scope.selectparams.colors[index]));
@@ -314,8 +317,8 @@
                     axisLabel: {
                         color: '#fff'
                     },
-                    axisTick:{       //y轴刻度线
-                        show:false
+                    axisTick: {       //y轴刻度线
+                        show: false
                     },
                     splitLine: {     //网格线
                         show: false
@@ -346,6 +349,8 @@
                         dzzdm: $scope.selectparams.selectdzzdm
                     }
                 }).then(function (result) {
+                    $scope.zgzw_nameList.length = 0;
+                    $scope.zgzw_dataList.length = 0;
                     if (result.data != null) {
                         angular.forEach(result.data, function (val, index) {
                             $scope.zgzw_nameList.push(val.name);
@@ -421,6 +426,8 @@
                         dwgzzlb: $scope.selectparams.navSelected
                     }
                 }).then(function (result) {
+                    $scope.xueli_legend_data.length = 0;
+                    $scope.xueli_data.length = 0;
                     if (result.data.item != null) {
                         angular.forEach(result.data.item, function (val, index) {
                             $scope.xueli_legend_data.push(val.EDUCATIONNAME);

+ 7 - 0
src/main/resources/static/app/main/bigdata/showDjdsj/teams.js

@@ -119,6 +119,7 @@
                         isOnduty: $scope.selectparams.navSelected
                     }
                 }).then(function (result) {
+                    $scope.dyxb_dataList.length = 0;
                     if (result.data != null && result.data.length > 0) {
                         var colors = ['#F8B551', '#918879'];
                         angular.forEach(result.data, function (val, index) {
@@ -198,6 +199,7 @@
                         isOnduty: $scope.selectparams.navSelected
                     }
                 }).then(function (result) {
+                    $scope.dynl_dataList.length = 0;
                     if (result.data != null && result.data.length > 0) {
                         angular.forEach(result.data, function (val, index) {
                             $scope.dynl_dataList.push($scope.getPieData(val.NUM, val.AGENAME, $scope.selectparams.colors[index]));
@@ -278,6 +280,7 @@
                         isOnduty: $scope.selectparams.navSelected
                     }
                 }).then(function (result) {
+                    $scope.dydl_dataList.length = 0;
                     if (result.data != null && result.data.length > 0) {
                         angular.forEach(result.data, function (val, index) {
                             $scope.dydl_dataList.push($scope.getPieData(val.NUM, val.AGENAME, $scope.selectparams.colors[index]));
@@ -433,6 +436,8 @@
                         isOnduty: $scope.selectparams.navSelected
                     }
                 }).then(function (result) {
+                    $scope.xueli_legend_data.length = 0;
+                    $scope.xueli_data.length = 0;
                     if (result.data.item != null) {
                         angular.forEach(result.data.item, function (val, index) {
                             $scope.xueli_legend_data.push(val.EDUCATIONNAME);
@@ -517,6 +522,8 @@
                     if (result.data.item.list.length > 0) {
                         var data = result.data.item.list[0];
                         $scope.fzdyqk_dataList.length = 0;
+                        $scope.dyzsrate_dataList.length = 0;
+
                         $scope.fzdyqk_dataList.push(data.YBDY);
                         $scope.fzdyqk_dataList.push(data.SQRD);
                         $scope.fzdyqk_dataList.push(data.JJFZ);