Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/resources/static/natj/dataCenter/js/socialAssistance.js

@@ -47,15 +47,15 @@ option = {
         orient: 'vertical',
         data: ['最低生活保障人数(人)', '发放低保金(万元)']
     },
-    {
-        left: '40%',
-        orient: 'vertical',
-        data: ['城市居民最低生活保障人数(人)', '城市居民发放低保金(万元)']
-    }, {
-        left: '60%',
-        orient: 'vertical',
-        data: ['农村居民最低生活保障（人)', '农村居民最发放低保金(万元)']
-    }
+        {
+            left: '40%',
+            orient: 'vertical',
+            data: ['城市居民最低生活保障人数(人)', '城市居民发放低保金(万元)']
+        }, {
+            left: '60%',
+            orient: 'vertical',
+            data: ['农村居民最低生活保障（人)', '农村居民最发放低保金(万元)']
+        }
     ],
     tooltip: {
         trigger: 'axis',
@@ -109,54 +109,54 @@ option = {
             show: true
         }
     },
-    {
-        type: 'value',
-        min: 0,
-        max: 10000,
-        interval: 2000,
-        axisLabel: {
-            formatter: '{value}(万元)'
-        }
-    }],
+        {
+            type: 'value',
+            min: 0,
+            max: 10000,
+            interval: 2000,
+            axisLabel: {
+                formatter: '{value}(万元)'
+            }
+        }],
     series: [{
         type: 'bar',
         itemStyle: {
             color: '#3C8DE6'
         }
     },
-    {
-        yAxisIndex: 1,
-        type: 'bar',
-        itemStyle: {
-            color: '#FAA639'
-        }
-    },
-    {
-        type: 'bar',
-        itemStyle: {
-            color: '#8EC051'
-        }
-    },
-    {
-        type: 'bar',
-        yAxisIndex: 1,
-        itemStyle: {
-            color: '#27C2C1'
-        }
-    },
-    {
-        type: 'bar',
-        itemStyle: {
-            color: '#4DC4E7'
-        }
-    },
-    {
-        type: 'bar',
-        yAxisIndex: 1,
-        itemStyle: {
-            color: '#FA8A46'
-        }
-    },
+        {
+            yAxisIndex: 1,
+            type: 'bar',
+            itemStyle: {
+                color: '#FAA639'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#8EC051'
+            }
+        },
+        {
+            type: 'bar',
+            yAxisIndex: 1,
+            itemStyle: {
+                color: '#27C2C1'
+            }
+        },
+        {
+            type: 'bar',
+            itemStyle: {
+                color: '#4DC4E7'
+            }
+        },
+        {
+            type: 'bar',
+            yAxisIndex: 1,
+            itemStyle: {
+                color: '#FA8A46'
+            }
+        },
     ]
 };
 option && myChart.setOption(option);
@@ -177,15 +177,15 @@ $('.div-shjz .title').on('click', 'li', function () {
                 orient: 'vertical',
                 data: ['最低生活保障人数(人)', '发放低保金(万元)']
             },
-            {
-                left: '40%',
-                orient: 'vertical',
-                data: ['城市居民最低生活保障人数(人)', '城市居民发放低保金(万元)']
-            }, {
-                left: '60%',
-                orient: 'vertical',
-                data: ['农村居民最低生活保障（人)', '农村居民最发放低保金(万元)']
-            }
+                {
+                    left: '40%',
+                    orient: 'vertical',
+                    data: ['城市居民最低生活保障人数(人)', '城市居民发放低保金(万元)']
+                }, {
+                    left: '60%',
+                    orient: 'vertical',
+                    data: ['农村居民最低生活保障（人)', '农村居民最发放低保金(万元)']
+                }
             ],
             tooltip: {
                 trigger: 'axis',
@@ -239,56 +239,57 @@ $('.div-shjz .title').on('click', 'li', function () {
                     show: true
                 }
             },
-            {
-                type: 'value',
-                min: 0,
-                max: 10000,
-                interval: 2000,
-                axisLabel: {
-                    formatter: '{value}(万元)'
-                }
-            }],
+                {
+                    type: 'value',
+                    min: 0,
+                    max: 10000,
+                    interval: 2000,
+                    axisLabel: {
+                        formatter: '{value}(万元)'
+                    }
+                }],
             series: [{
                 type: 'bar',
                 itemStyle: {
                     color: '#3C8DE6'
                 }
             },
-            {
-                yAxisIndex: 1,
-                type: 'bar',
-                itemStyle: {
-                    color: '#FAA639'
-                }
-            },
-            {
-                type: 'bar',
-                itemStyle: {
-                    color: '#8EC051'
-                }
-            },
-            {
-                type: 'bar',
-                yAxisIndex: 1,
-                itemStyle: {
-                    color: '#27C2C1'
-                }
-            },
-            {
-                type: 'bar',
-                itemStyle: {
-                    color: '#4DC4E7'
-                }
-            },
-            {
-                type: 'bar',
-                yAxisIndex: 1,
-                itemStyle: {
-                    color: '#FA8A46'
-                }
-            },
+                {
+                    yAxisIndex: 1,
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#FAA639'
+                    }
+                },
+                {
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#8EC051'
+                    }
+                },
+                {
+                    type: 'bar',
+                    yAxisIndex: 1,
+                    itemStyle: {
+                        color: '#27C2C1'
+                    }
+                },
+                {
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#4DC4E7'
+                    }
+                },
+                {
+                    type: 'bar',
+                    yAxisIndex: 1,
+                    itemStyle: {
+                        color: '#FA8A46'
+                    }
+                },
             ]
         };
+        myChart.clear();
         option && myChart.setOption(option);
     } else if ($(this).data('type') == 2) {
         option = {
@@ -306,15 +307,15 @@ $('.div-shjz .title').on('click', 'li', function () {
                 orient: 'vertical',
                 data: ['特困人员救助供养人数（人）', '发放救助金供养金（万元）']
             },
-            {
-                left: '40%',
-                orient: 'vertical',
-                data: ['城市特困人员救助供养人数（人）', '城市发放救助供养金（万元）']
-            }, {
-                left: '60%',
-                orient: 'vertical',
-                data: ['农村特困人员救助供养人数（人）', '农村发放救助供养金（万元）']
-            }
+                {
+                    left: '40%',
+                    orient: 'vertical',
+                    data: ['城市特困人员救助供养人数（人）', '城市发放救助供养金（万元）']
+                }, {
+                    left: '60%',
+                    orient: 'vertical',
+                    data: ['农村特困人员救助供养人数（人）', '农村发放救助供养金（万元）']
+                }
             ],
             tooltip: {
                 trigger: 'axis',
@@ -368,56 +369,57 @@ $('.div-shjz .title').on('click', 'li', function () {
                     show: true
                 }
             },
-            {
-                type: 'value',
-                min: 0,
-                max: 10000,
-                interval: 2000,
-                axisLabel: {
-                    formatter: '{value}(万元)'
-                }
-            }],
+                {
+                    type: 'value',
+                    min: 0,
+                    max: 10000,
+                    interval: 2000,
+                    axisLabel: {
+                        formatter: '{value}(万元)'
+                    }
+                }],
             series: [{
                 type: 'bar',
                 itemStyle: {
                     color: '#3C8DE6'
                 }
             },
-            {
-                yAxisIndex: 1,
-                type: 'bar',
-                itemStyle: {
-                    color: '#FAA639'
-                }
-            },
-            {
-                type: 'bar',
-                itemStyle: {
-                    color: '#8EC051'
-                }
-            },
-            {
-                type: 'bar',
-                yAxisIndex: 1,
-                itemStyle: {
-                    color: '#27C2C1'
-                }
-            },
-            {
-                type: 'bar',
-                itemStyle: {
-                    color: '#4DC4E7'
-                }
-            },
-            {
-                type: 'bar',
-                yAxisIndex: 1,
-                itemStyle: {
-                    color: '#FA8A46'
-                }
-            },
+                {
+                    yAxisIndex: 1,
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#FAA639'
+                    }
+                },
+                {
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#8EC051'
+                    }
+                },
+                {
+                    type: 'bar',
+                    yAxisIndex: 1,
+                    itemStyle: {
+                        color: '#27C2C1'
+                    }
+                },
+                {
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#4DC4E7'
+                    }
+                },
+                {
+                    type: 'bar',
+                    yAxisIndex: 1,
+                    itemStyle: {
+                        color: '#FA8A46'
+                    }
+                },
             ]
         };
+        myChart.clear();
         option && myChart.setOption(option);
     } else if ($(this).data('type') == 3) {
         option = {
@@ -488,56 +490,31 @@ $('.div-shjz .title').on('click', 'li', function () {
                     show: true
                 }
             },
-            {
-                type: 'value',
-                min: 0,
-                max: 10000,
-                interval: 2000,
-                axisLabel: {
-                    formatter: '{value}(万元)'
-                }
-            }],
+                {
+                    type: 'value',
+                    min: 0,
+                    max: 10000,
+                    interval: 2000,
+                    axisLabel: {
+                        formatter: '{value}(万元)'
+                    }
+                }],
             series: [{
                 type: 'bar',
                 itemStyle: {
                     color: '#3C8DE6'
                 }
             },
-            {
-                yAxisIndex: 1,
-                type: 'bar',
-                itemStyle: {
-                    color: '#FAA639'
-                }
-            },
-            {
-                type: 'bar',
-                itemStyle: {
-                    color: '#8EC051'
-                }
-            },
-            {
-                type: 'bar',
-                yAxisIndex: 1,
-                itemStyle: {
-                    color: '#27C2C1'
-                }
-            },
-            {
-                type: 'bar',
-                itemStyle: {
-                    color: '#4DC4E7'
-                }
-            },
-            {
-                type: 'bar',
-                yAxisIndex: 1,
-                itemStyle: {
-                    color: '#FA8A46'
+                {
+                    yAxisIndex: 1,
+                    type: 'bar',
+                    itemStyle: {
+                        color: '#FAA639'
+                    }
                 }
-            },
             ]
         };
+        myChart.clear();
         option && myChart.setOption(option);
     }
 })