diff --git a/src/components/Charts/Charts_Fake.js b/src/components/Charts/Charts_Fake.js
index 11627fe..c57d453 100755
--- a/src/components/Charts/Charts_Fake.js
+++ b/src/components/Charts/Charts_Fake.js
@@ -2,652 +2,649 @@
 /**
  * 初始化vue
  */
-var vm = new Vue({
-    el: "#container_chart",
-    data: {
-        bread: "正在查看：2017年 全省数据",
-        six: [],   //六大违纪
-        PartyPunish: [],
-        FilingChartData: [],
-        ClueSource: [],
-        ClueData: [],
-        FilingData: [],
-        Month: ['2017-01', '2017-02', '2017-03', '2017-04', '2017-05', '2017-06', '2017-07', '2017-08', '2017-09', '2017-10', '2017-11', '2017-12']
-    },
-    methods: {
-        GetLegand: function (data) {
-            var arr = [];
-            for (var k in data) {
-                var obj = data[k];
-                arr.push(obj.name);
-            }
-            return arr;
-        }
-    }
-});
-
-
-
-var chart1;
-var chart2;
-var chart3;
-var chart4;
-var chart5;
-var chart6;
-
-
-//地图
-function map() {
-     chart1 = echarts.init(document.getElementById('map'), 'wonderland');
-        $.getJSON('/Assets/CaseAnalysis/jiangsu.json', function (data) {
-            echarts.registerMap('jiangsu', data);
-            chart1.setOption({
-                series: [{
-                    type: 'map',
-                    map: 'jiangsu',
-                    data: mapData,
-                    selectedMode: 'single',
-                    zoom:1.2,
-                    label: {
-                        normal: {
-                            show: true
-                        },
-                        emphasis: {
-                            show: true,
-                        }
-                    },
-                    itemStyle: {
-                        normal: {
-                            areaColor: '#323c48',
-                            borderColor: '#111'
-                        },
-                        emphasis: {//鼠标移入高亮显颜色
-                            areaColor: '#f46d43'
-                        }
-                    },
-                
-                }],
-        
-                visualMap: {
-                    show:false,
-                    min: 0,
-                    max: 50000,
-                    realtime: false,
-                    calculable: true,
-                    inRange: {
-                        color: ['lightskyblue', 'yellow', 'orangered']
-                    },
-                    left: "right",
-                    top:"top"
-                },
-            },true);
-        });
-        chart1.on('click', function (params) {
-            RefreshChart(params.data.code);
-        
-        });
-
-    }
-
-//职务违法犯罪
-function ChartFiling() {
-     chart2 = echarts.init(document.getElementById('ChartFiling'), 'wonderland');
-    var option4 = {
-        title: {
-            text: '贪污受贿',
-            subtext:"104人",
-            left:"29%",
-            top: "40%",
-            textAlign: 'center',
-
-            textStyle: {
-                fontSize:14
-            }
-        },
-        tooltip: {
-            trigger: 'item',
-            formatter: "{a} <br/>{b} : {c} ({d}%)"
-        },
-    
-
-        legend: {
-            type: 'scroll',
-            orient: 'vertical',
-            show: true,
-            right: 0,
-            top: 35,
-            bottom: 20,
-            textStyle: {
-                fontSize: 12
-            },
-            formatter: function (name) {
-                console.log(name);
-                var value = "";
-                for (var k in FilingChartData) {
-                    var obj = FilingChartData[k];
-                    if (obj.name == name) {
-                        value = obj.value;
-                        break;
-                    }
-                }
-                if (name == "行使公权力过程中发生的其他犯罪行为") {
-                    name = "行使公权力过程中" + "\n" + "发生的其他犯罪行为" + "\n";
-                }
-                return name + " : " + value + "人";
-            },
-            data: ['贪污贿赂', '滥用职权', '玩忽职守', '徇私舞弊', '重大责任事故', '行使公权力过程中发生的其他犯罪行为'],
-        },
-
-
-
-        series: [
-            {
-                name: '',
-                type: 'pie',
-                radius: ['50%', '80%'],
-                center: ['30%', '50%'],
-                data: FilingChartData,
-                label: {
-                    normal: {
-                        textStyle: {
-                            fontWeight: 'normal',
-                            fontSize: 16
-                        },
-                        show: false
-
-                    }
-                },
-                labelLine: {
-                    normal: {
-                        show: false   // show设置线是否显示，默认为true，可选值：true ¦ false
-                    }
-                },
-
-                itemStyle: {
-                    normal: {
-                        borderWidth: 3,
-                        borderColor: '#fff',
-
-                    },
-
-                }
-            }
-        ]
-    };
-    chart2.setOption(option4,true);
-
-
-}
-
-
-//违反六大纪律
-function ChartSix() {
-     chart3 = echarts.init(document.getElementById('ChartSix'), 'wonderland');
-  var  option4 = {
-      title: {
-          text: '违反政治纪律',
-          subtext: "3人",
-          left: "29%",
-          top: "40%",
-          x: "center",
-          textAlign: 'center',
-
-          textStyle: {
-              align:"center",
-              fontSize: 14
-          }
-      },
-        tooltip: {
-            trigger: 'item',
-            formatter: "{a} <br/>{b} : {c} ({d}%)"
-        },
-        grid: {
-
-            top: "50px",
-
-            left: "5px",
-
-            right: "5px",
-
-            bottom: "50px",
-
-
-            width: "auto", //图例宽度
-
-            height: "100%", //图例高度
-
-        },
-
-        legend: {
-            type: 'scroll',
-            orient: 'vertical',
-            show: true,
-            right: 0,
-            top: 35,
-            bottom: 20,
-            textStyle: {
-                fontSize:12
-            },
-            formatter: function (name) {
-                console.log(name);
-                var value = "";
-                for (var k in six) {
-                    var obj = six[k];
-                    if (obj.name == name)
-                    {
-                        value = obj.value;
-                        break;
-                    }
-                }
-                return name +" : "+ value+"人";
-            },
-            data: ['违反政治纪律', '违反廉洁纪律', '违反群众纪律', '违反工作纪律', '违反组织纪律', '违反生活纪律'],
-        },
-
-
-
-        series: [
-            {
-                name: '',
-                type: 'pie',
-                radius: ['50%', '80%'],
-                center: ['30%', '50%'],
-                data: six,
-                label: {
-                    normal: {
-                        textStyle: {
-                            fontWeight: 'normal',
-                            fontSize: 16
-                        },
-                        show: false   
-
-                    }
-                },
-                labelLine: {
-                    normal: {
-                        show: false   // show设置线是否显示，默认为true，可选值：true ¦ false
-                    }
-                },
-              
-                itemStyle: {
-                    normal: {
-                        borderWidth: 3,
-                        borderColor: '#fff',
-
-                    },
-                 
-                }
-            }
-        ]
-    };
-    chart3.setOption(option4,true);
-
-
-}
-
-//四种形态
-function ChartPartyPunish() {
-    chart4 = echarts.init(document.getElementById('ChartPartyPunish'), 'wonderland');
-    option3 = {
-        title: {
-            text: '警告',
-            subtext: "297人",
-            left: "34%",
-            top: "40%",
-            x: "center",
-            textAlign: 'center',
-
-            textStyle: {
-                fontSize: 14
-            }
-        },
-        tooltip: {
-            trigger: 'item',
-            formatter: "{a} <br/>{b} : {c} ({d}%)"
-        },
-        grid: {
-
-            top: "50px",
-
-            left: "5px",
-
-            right: "5px",
-
-            bottom: "50px",
-
-            backgroundColor: '#fff',
-
-            width: "auto", //图例宽度
-
-            height: "100%", //图例高度
-
-        },
-
-        legend: {
-            type: 'scroll',
-            orient: 'vertical',
-            show: true,
-            width:"auto",
-            right: 0,
-            top: 35,
-            bottom: 20,
-            textStyle: {
-                fontSize: 12
-            },
-            formatter: function (name) {
-                console.log(name);
-                var value = "";
-                for (var k in PartyPunish) {
-                    var obj = PartyPunish[k];
-                    if (obj.name == name) {
-                        value = obj.value;
-                        break;
-                    }
-                }
-                return name + " : " + value + "人";
-            },
-            data: ['警告', '严重警告', '开除党籍'],
-        },
-
-        series: [
-            {
-                name: '',
-                type: 'pie',
-                radius: ['50%', '80%'],
-                center: ['35%', '50%'],
-                data: PartyPunish,
-                label: {
-                    normal: {
-                        textStyle: {
-                            fontWeight: 'normal',
-                            fontSize: 16
-                        },
-                                                show: false   
-
-                    }
-                },
-                labelLine: {
-                    normal: {
-                        show: false 
-                    }
-                },
-                itemStyle: {
-               
-                    normal: {
-                        borderWidth: 3,
-                        borderColor: '#fff',
-                    }
-                }
-            }
-        ]
-    };
-    chart4.setOption(option3,true);
-
-}
-
-//线索案件趋势图
-
-function LineClueFiling() {
-     chart5 = echarts.init(document.getElementById('LineClueFiling'), 'wonderland');
-    var option4 = {
-        color: ["#FF7744","#87CEFA"],
-        tooltip: {
-            trigger: 'axis'
-        },
-        grid: {
-            containLabel: true
-        },
-        legend: {
-            data: ['案件', '线索'],
-        },
-        xAxis: [{
-            type: 'category',
-            boundaryGap: false,
-
-            axisTick: {
-                alignWithLabel: true
-            },
-            axisLabel: { //坐标轴刻度标签的相关设置。
-                interval: 0,//横轴信息全部显示  
-                rotate: -30,//-30度角倾斜显示 
-            },
-            data: vm.Month
-        }],
-        yAxis: [{
-            type: 'value',
-            name: '人数',
-            position: 'left',
-            //axisLabel: {
-            //    formatter: '{value} '
-            //}
-        }],
-        series: [{
-            name: '线索',
-            type: 'line',
-            stack: '线索总量',
-            areaStyle: { normal: {} },
-
-            label: {
-                normal: {
-                    show: true,
-                    position: 'top',
-                }
-            },
-            lineStyle: {
-                normal: {
-                    width: 1,
-                    shadowColor: 'rgba(0,0,0,0.4)',
-                    shadowBlur: 2,
-                    shadowOffsetY: 2
-                }
-            },
-            data: ClueData,
-        }, {
-            name: '案件',
-            type: 'line',
-            stack: '案件总量',
-            label: {
-                normal: {
-                    show: true,
-                    position: 'top',
-                }
-            },
-            areaStyle: { normal: {} },
-
-            lineStyle: {
-                normal: {
-                    width: 1,
-                    shadowColor: 'rgba(0,0,0,0.4)',
-                    shadowBlur: 2,
-                    shadowOffsetY: 2
-                }
-            },
-            data: FilingData,
-        }]
-    };
-    chart5.setOption(option4, true);
-
-}
-
-
-//线索来源
-function ChartClueSource() {
-    chart6 = echarts.init(document.getElementById('ChartClueSource'), 'wonderland');
-    var option4 = {
-        title: {
-            text: '信访举报',
-            subtext: "104人",
-            left: "29%",
-            top: "40%",
-            x: "center",
-            textAlign: 'center',
-
-            textStyle: {
-                align: "center",
-                fontSize: 14
-            },
-              subtextStyle: {
-                align: "center",
-                fontSize: 14
-            }
-        },
-        tooltip: {
-            trigger: 'item',
-            formatter: "{a} <br/>{b} : {c} ({d}%)"
-        },
-
-
-        legend: {
-            type: 'scroll',
-            orient: 'vertical',
-            show: true,
-            right: 0,
-            top: 35,
-            width: "50px",
-
-            bottom: 20,
-            textStyle: {
-                fontSize: 12
-            },
-            formatter: function (name) {
-                console.log(name);
-                var value = "";
-                for (var k in ClueSource) {
-                    var obj = ClueSource[k];
-                    if (obj.name == name) {
-                        value = obj.value;
-                        break;
-                    }
-                }
-                return name + " : " + value + "人";
-            },
-            data: ['信访举报', '上级交办', '监督检查中发现', '审查调查中发现', '审计中发现', '巡视巡察中发现', '公检法机关移送', '其他行政执法机关移送','其他'],
-        },
-
-
-
-        series: [
-            {
-                name: '',
-                type: 'pie',
-                radius: ['50%', '80%'],
-                center: ['30%', '50%'],
-                data: ClueSource,
-                label: {
-                    normal: {
-                        textStyle: {
-                            fontWeight: 'normal',
-                            fontSize: 16
-                        },
-                        show: false
-
-                    }
-                },
-                labelLine: {
-                    normal: {
-                        show: false   // show设置线是否显示，默认为true，可选值：true ¦ false
-                    }
-                },
-         
-                itemStyle: {
- 
-                    borderWidth: 3,
-                    borderColor: '#fff',
-
-              
-                }
-            }
-        ]
-    };
-    chart6.setOption(option4,true);
-
-}
-
-//党政纪处分情况   柱状图 原来的
-function PartyAndGovenPunish() {
-     chart7 = echarts.init(document.getElementById('PartyAndGovenPunish'), 'wonderland');
-    var option4 = {
-        color: ["#33CCFF",
-            "#7744FF	"],
-        tooltip: {
-            trigger: 'axis',
-            axisPointer: {
-                type: 'shadow'
-            }
-        },
-        //legend: {
-        //    data: ['党纪处分']
-        //},
-        grid: {
-            left: '3%',
-            right: '4%',
-            bottom: '3%',
-            containLabel: true
-        },
-        xAxis: {
-            type: 'category',
-            data:vm.Month
-
-        },
-        yAxis: {
-            type: 'value',
-
-        },
-        series: [
-            {
-                name: '党纪处分',
-                type: 'bar',
-                data: PartyPunish,
-                itemStyle: {
-                        shadowColor: 'rgba(0,0,0,0.4)',
-                        shadowBlur: 2,
-                        shadowOffsetY: -2
-                    
-                }
-            },
-            //{
-            //    name: '政纪处分',
-            //    type: 'bar',
-            //    data: GovenPunish,
-            //    itemStyle: {
-            //        shadowColor: 'rgba(0,0,0,0.4)',
-            //        shadowBlur: 2,
-            //        shadowOffsetY: -2
-
-            //    }
-            //},
-        ]
-    };
-    chart7.setOption(option4, true);
-
-}
-
-
-
-//假数据
-var Month = ['2018/01', '2018/02', '2018/03', '2018/04', '2018/05', '2018/06', '2018/07', '2018/08', '2018/09', '2018/10', '2018/11', '2018/12'];
-
-
-var six = JSON.parse("[{ \"name\": \"违反廉洁纪律\", \"value\":\"104\"},{ \"name\": \"违反政治纪律\", \"value\":\"3\"},{ \"name\": \"违反生活纪律\", \"value\":\"7\"},{ \"name\": \"违反工作纪律\", \"value\":\"125\"},{ \"name\": \"违反组织纪律\", \"value\":\"24\"},{ \"name\": \"违反群众纪律\", \"value\":\"6\"}]");
-var PartyPunish = JSON.parse("[{ \"name\": \"警告\", \"value\":\"297\"},{ \"name\": \"严重警告\", \"value\":\"155\"},{ \"name\": \"开除党籍\", \"value\":\"42\"}]");
-var FilingChartData = JSON.parse("[{ \"name\": \"贪污贿赂\", \"value\":\"104\"},{ \"name\": \"滥用职权\", \"value\":\"3\"},{ \"name\": \"玩忽职守\", \"value\":\"7\"},{ \"name\": \"徇私舞弊\", \"value\":\"125\"},{ \"name\": \"重大责任事故\", \"value\":\"24\"},{ \"name\": \"行使公权力过程中发生的其他犯罪行为\", \"value\":\"6\"}]");
-var ClueSource = JSON.parse("[{ \"name\": \"信访举报\", \"value\":\"104\"},{ \"name\": \"上级交办\", \"value\":\"3\"},{ \"name\": \"监督检查中发现\", \"value\":\"7\"},{ \"name\": \"审查调查中发现\", \"value\":\"125\"},{ \"name\": \"审计中发现\", \"value\":\"24\"},{ \"name\": \"巡视巡察中发现\", \"value\":\"6\"},{ \"name\": \"公检法机关移送\", \"value\":\"6\"},{ \"name\": \"其他行政执法机关移送\", \"value\":\"6\"},{ \"name\": \"其他\", \"value\":\"1\"}]");
-var ClueData = RandomData(500,100);
-var FilingData = RandomData(500, 100);
-var mapData = [
-    { name: '南京市', value: 20057.34,code:"001"},
-    { name: '宿迁市', value: 15477.48, code:" 002"},
-    { name: '连云港市', value: 500.1, code:" 013"},
-    { name: '徐州市', value: 6992.6, code:"012"},
-    { name: '苏州市', value: 3333.49, code:" 005"},
-    { name: '盐城市', value: 5000.64, code:" 011"},
-    { name: '无锡市', value: 15477.78, code:" 004"},
-    { name: '常州市', value: 8888.97, code:"003"},
-    { name: '淮安市', value: 6992.26, code:"009 "},
-    { name: '扬州市', value: 10000.9, code:" 007"},
-    { name: '镇江市', value: 20000.26, code:" 002"},
-    { name: '南通市', value: 5881.84, code:" 006"},
-    { name: '泰州市', value: 13000.01, code:" 008"},
+// const vm = new Vue({
+//   el: '#container_chart',
+//   data: {
+//     bread: '正在查看：2017年 全省数据',
+//     six: [], // 六大违纪
+//     PartyPunish: [],
+//     FilingChartData: [],
+//     ClueSource: [],
+//     ClueData: [],
+//     FilingData: [],
+//     Month: ['2017-01', '2017-02', '2017-03', '2017-04', '2017-05', '2017-06', '2017-07', '2017-08', '2017-09', '2017-10', '2017-11', '2017-12'],
+//   },
+//   methods: {
+//     GetLegand(data) {
+//       const arr = [];
+//       for (const k in data) {
+//         const obj = data[k];
+//         arr.push(obj.name);
+//       }
+//       return arr;
+//     },
+//   },
+// });
+
+
+// let chart1;
+// let chart2;
+// let chart3;
+// let chart4;
+// let chart5;
+// let chart6;
+
+
+// // 地图
+// function map() {
+//   chart1 = echarts.init(document.getElementById('map'), 'wonderland');
+//   $.getJSON('/Assets/CaseAnalysis/jiangsu.json', (data) => {
+//     echarts.registerMap('jiangsu', data);
+//     chart1.setOption({
+//       series: [{
+//         type: 'map',
+//         map: 'jiangsu',
+//         data: mapData,
+//         selectedMode: 'single',
+//         zoom: 1.2,
+//         label: {
+//           normal: {
+//             show: true,
+//           },
+//           emphasis: {
+//             show: true,
+//           },
+//         },
+//         itemStyle: {
+//           normal: {
+//             areaColor: '#323c48',
+//             borderColor: '#111',
+//           },
+//           emphasis: {// 鼠标移入高亮显颜色
+//             areaColor: '#f46d43',
+//           },
+//         },
+
+//       }],
+
+//       visualMap: {
+//         show: false,
+//         min: 0,
+//         max: 50000,
+//         realtime: false,
+//         calculable: true,
+//         inRange: {
+//           color: ['lightskyblue', 'yellow', 'orangered'],
+//         },
+//         left: 'right',
+//         top: 'top',
+//       },
+//     }, true);
+//   });
+//   chart1.on('click', (params) => {
+//     RefreshChart(params.data.code);
+
+//   });
+
+// }
+
+// // 职务违法犯罪
+// function ChartFiling() {
+//   chart2 = echarts.init(document.getElementById('ChartFiling'), 'wonderland');
+//   const option4 = {
+//     title: {
+//       text: '贪污受贿',
+//       subtext: '104人',
+//       left: '29%',
+//       top: '40%',
+//       textAlign: 'center',
+
+//       textStyle: {
+//         fontSize: 14,
+//       },
+//     },
+//     tooltip: {
+//       trigger: 'item',
+//       formatter: '{a} <br/>{b} : {c} ({d}%)',
+//     },
+
+
+//     legend: {
+//       type: 'scroll',
+//       orient: 'vertical',
+//       show: true,
+//       right: 0,
+//       top: 35,
+//       bottom: 20,
+//       textStyle: {
+//         fontSize: 12,
+//       },
+//       formatter(name) {
+//         console.log(name);
+//         let value = '';
+//         for (const k in FilingChartData) {
+//           const obj = FilingChartData[k];
+//           if (obj.name == name) {
+//             value = obj.value;
+//             break;
+//           }
+//         }
+//         if (name == '行使公权力过程中发生的其他犯罪行为') {
+//           name = '行使公权力过程中' + '\n' + '发生的其他犯罪行为' + '\n';
+//         }
+//         return `${name} : ${value}人`;
+//       },
+//       data: ['贪污贿赂', '滥用职权', '玩忽职守', '徇私舞弊', '重大责任事故', '行使公权力过程中发生的其他犯罪行为'],
+//     },
+
+
+//     series: [
+//       {
+//         name: '',
+//         type: 'pie',
+//         radius: ['50%', '80%'],
+//         center: ['30%', '50%'],
+//         data: FilingChartData,
+//         label: {
+//           normal: {
+//             textStyle: {
+//               fontWeight: 'normal',
+//               fontSize: 16,
+//             },
+//             show: false,
+
+//           },
+//         },
+//         labelLine: {
+//           normal: {
+//             show: false, // show设置线是否显示，默认为true，可选值：true ¦ false
+//           },
+//         },
+
+//         itemStyle: {
+//           normal: {
+//             borderWidth: 3,
+//             borderColor: '#fff',
+
+//           },
+
+//         },
+//       },
+//     ],
+//   };
+//   chart2.setOption(option4, true);
+
+
+// }
+
+
+// // 违反六大纪律
+// function ChartSix() {
+//   chart3 = echarts.init(document.getElementById('ChartSix'), 'wonderland');
+//   const option4 = {
+//     title: {
+//       text: '违反政治纪律',
+//       subtext: '3人',
+//       left: '29%',
+//       top: '40%',
+//       x: 'center',
+//       textAlign: 'center',
+
+//       textStyle: {
+//         align: 'center',
+//         fontSize: 14,
+//       },
+//     },
+//     tooltip: {
+//       trigger: 'item',
+//       formatter: '{a} <br/>{b} : {c} ({d}%)',
+//     },
+//     grid: {
+
+//       top: '50px',
+
+//       left: '5px',
+
+//       right: '5px',
+
+//       bottom: '50px',
+
+
+//       width: 'auto', // 图例宽度
+
+//       height: '100%', // 图例高度
+
+//     },
+
+//     legend: {
+//       type: 'scroll',
+//       orient: 'vertical',
+//       show: true,
+//       right: 0,
+//       top: 35,
+//       bottom: 20,
+//       textStyle: {
+//         fontSize: 12,
+//       },
+//       formatter(name) {
+//         console.log(name);
+//         let value = '';
+//         for (const k in six) {
+//           const obj = six[k];
+//           if (obj.name == name)
+//           {
+//             value = obj.value;
+//             break;
+//           }
+//         }
+//         return `${name} : ${value}人`;
+//       },
+//       data: ['违反政治纪律', '违反廉洁纪律', '违反群众纪律', '违反工作纪律', '违反组织纪律', '违反生活纪律'],
+//     },
+
+
+//     series: [
+//       {
+//         name: '',
+//         type: 'pie',
+//         radius: ['50%', '80%'],
+//         center: ['30%', '50%'],
+//         data: six,
+//         label: {
+//           normal: {
+//             textStyle: {
+//               fontWeight: 'normal',
+//               fontSize: 16,
+//             },
+//             show: false,
+
+//           },
+//         },
+//         labelLine: {
+//           normal: {
+//             show: false, // show设置线是否显示，默认为true，可选值：true ¦ false
+//           },
+//         },
+
+//         itemStyle: {
+//           normal: {
+//             borderWidth: 3,
+//             borderColor: '#fff',
+
+//           },
+
+//         },
+//       },
+//     ],
+//   };
+//   chart3.setOption(option4, true);
+
+
+// }
+
+// // 四种形态
+// function ChartPartyPunish() {
+//   chart4 = echarts.init(document.getElementById('ChartPartyPunish'), 'wonderland');
+//   option3 = {
+//     title: {
+//       text: '警告',
+//       subtext: '297人',
+//       left: '34%',
+//       top: '40%',
+//       x: 'center',
+//       textAlign: 'center',
+
+//       textStyle: {
+//         fontSize: 14,
+//       },
+//     },
+//     tooltip: {
+//       trigger: 'item',
+//       formatter: '{a} <br/>{b} : {c} ({d}%)',
+//     },
+//     grid: {
+
+//       top: '50px',
+
+//       left: '5px',
+
+//       right: '5px',
+
+//       bottom: '50px',
+
+//       backgroundColor: '#fff',
+
+//       width: 'auto', // 图例宽度
+
+//       height: '100%', // 图例高度
+
+//     },
+
+//     legend: {
+//       type: 'scroll',
+//       orient: 'vertical',
+//       show: true,
+//       width: 'auto',
+//       right: 0,
+//       top: 35,
+//       bottom: 20,
+//       textStyle: {
+//         fontSize: 12,
+//       },
+//       formatter(name) {
+//         console.log(name);
+//         let value = '';
+//         for (const k in PartyPunish) {
+//           const obj = PartyPunish[k];
+//           if (obj.name == name) {
+//             value = obj.value;
+//             break;
+//           }
+//         }
+//         return `${name} : ${value}人`;
+//       },
+//       data: ['警告', '严重警告', '开除党籍'],
+//     },
+
+//     series: [
+//       {
+//         name: '',
+//         type: 'pie',
+//         radius: ['50%', '80%'],
+//         center: ['35%', '50%'],
+//         data: PartyPunish,
+//         label: {
+//           normal: {
+//             textStyle: {
+//               fontWeight: 'normal',
+//               fontSize: 16,
+//             },
+//             show: false,
+
+//           },
+//         },
+//         labelLine: {
+//           normal: {
+//             show: false,
+//           },
+//         },
+//         itemStyle: {
+
+//           normal: {
+//             borderWidth: 3,
+//             borderColor: '#fff',
+//           },
+//         },
+//       },
+//     ],
+//   };
+//   chart4.setOption(option3, true);
+
+// }
+
+// // 线索案件趋势图
+
+// function LineClueFiling() {
+//   chart5 = echarts.init(document.getElementById('LineClueFiling'), 'wonderland');
+//   const option4 = {
+//     color: ['#FF7744', '#87CEFA'],
+//     tooltip: {
+//       trigger: 'axis',
+//     },
+//     grid: {
+//       containLabel: true,
+//     },
+//     legend: {
+//       data: ['案件', '线索'],
+//     },
+//     xAxis: [{
+//       type: 'category',
+//       boundaryGap: false,
+
+//       axisTick: {
+//         alignWithLabel: true,
+//       },
+//       axisLabel: { // 坐标轴刻度标签的相关设置。
+//         interval: 0, // 横轴信息全部显示
+//         rotate: -30, // -30度角倾斜显示
+//       },
+//       data: vm.Month,
+//     }],
+//     yAxis: [{
+//       type: 'value',
+//       name: '人数',
+//       position: 'left',
+//       // axisLabel: {
+//       //    formatter: '{value} '
+//       // }
+//     }],
+//     series: [{
+//       name: '线索',
+//       type: 'line',
+//       stack: '线索总量',
+//       areaStyle: { normal: {} },
+
+//       label: {
+//         normal: {
+//           show: true,
+//           position: 'top',
+//         },
+//       },
+//       lineStyle: {
+//         normal: {
+//           width: 1,
+//           shadowColor: 'rgba(0,0,0,0.4)',
+//           shadowBlur: 2,
+//           shadowOffsetY: 2,
+//         },
+//       },
+//       data: ClueData,
+//     }, {
+//       name: '案件',
+//       type: 'line',
+//       stack: '案件总量',
+//       label: {
+//         normal: {
+//           show: true,
+//           position: 'top',
+//         },
+//       },
+//       areaStyle: { normal: {} },
+
+//       lineStyle: {
+//         normal: {
+//           width: 1,
+//           shadowColor: 'rgba(0,0,0,0.4)',
+//           shadowBlur: 2,
+//           shadowOffsetY: 2,
+//         },
+//       },
+//       data: FilingData,
+//     }],
+//   };
+//   chart5.setOption(option4, true);
+
+// }
+
+
+// // 线索来源
+// function ChartClueSource() {
+//   chart6 = echarts.init(document.getElementById('ChartClueSource'), 'wonderland');
+//   const option4 = {
+//     title: {
+//       text: '信访举报',
+//       subtext: '104人',
+//       left: '29%',
+//       top: '40%',
+//       x: 'center',
+//       textAlign: 'center',
+
+//       textStyle: {
+//         align: 'center',
+//         fontSize: 14,
+//       },
+//       subtextStyle: {
+//         align: 'center',
+//         fontSize: 14,
+//       },
+//     },
+//     tooltip: {
+//       trigger: 'item',
+//       formatter: '{a} <br/>{b} : {c} ({d}%)',
+//     },
+
+
+//     legend: {
+//       type: 'scroll',
+//       orient: 'vertical',
+//       show: true,
+//       right: 0,
+//       top: 35,
+//       width: '50px',
+
+//       bottom: 20,
+//       textStyle: {
+//         fontSize: 12,
+//       },
+//       formatter(name) {
+//         console.log(name);
+//         let value = '';
+//         for (const k in ClueSource) {
+//           const obj = ClueSource[k];
+//           if (obj.name == name) {
+//             value = obj.value;
+//             break;
+//           }
+//         }
+//         return `${name} : ${value}人`;
+//       },
+//       data: ['信访举报', '上级交办', '监督检查中发现', '审查调查中发现', '审计中发现', '巡视巡察中发现', '公检法机关移送', '其他行政执法机关移送', '其他'],
+//     },
+
+
+//     series: [
+//       {
+//         name: '',
+//         type: 'pie',
+//         radius: ['50%', '80%'],
+//         center: ['30%', '50%'],
+//         data: ClueSource,
+//         label: {
+//           normal: {
+//             textStyle: {
+//               fontWeight: 'normal',
+//               fontSize: 16,
+//             },
+//             show: false,
+
+//           },
+//         },
+//         labelLine: {
+//           normal: {
+//             show: false, // show设置线是否显示，默认为true，可选值：true ¦ false
+//           },
+//         },
+
+//         itemStyle: {
+
+//           borderWidth: 3,
+//           borderColor: '#fff',
+
+
+//         },
+//       },
+//     ],
+//   };
+//   chart6.setOption(option4, true);
+
+// }
+
+// // 党政纪处分情况   柱状图 原来的
+// function PartyAndGovenPunish() {
+//   chart7 = echarts.init(document.getElementById('PartyAndGovenPunish'), 'wonderland');
+//   const option4 = {
+//     color: ['#33CCFF',
+//       '#7744FF	'],
+//     tooltip: {
+//       trigger: 'axis',
+//       axisPointer: {
+//         type: 'shadow',
+//       },
+//     },
+//     // legend: {
+//     //    data: ['党纪处分']
+//     // },
+//     grid: {
+//       left: '3%',
+//       right: '4%',
+//       bottom: '3%',
+//       containLabel: true,
+//     },
+//     xAxis: {
+//       type: 'category',
+//       data: vm.Month,
+
+//     },
+//     yAxis: {
+//       type: 'value',
+
+//     },
+//     series: [
+//       {
+//         name: '党纪处分',
+//         type: 'bar',
+//         data: PartyPunish,
+//         itemStyle: {
+//           shadowColor: 'rgba(0,0,0,0.4)',
+//           shadowBlur: 2,
+//           shadowOffsetY: -2,
+
+//         },
+//       },
+//       // {
+//       //    name: '政纪处分',
+//       //    type: 'bar',
+//       //    data: GovenPunish,
+//       //    itemStyle: {
+//       //        shadowColor: 'rgba(0,0,0,0.4)',
+//       //        shadowBlur: 2,
+//       //        shadowOffsetY: -2
+
+//       //    }
+//       // },
+//     ],
+//   };
+//   chart7.setOption(option4, true);
+
+// }
+
+
+
+
+// 假数据
+const Month = ['2018/01', '2018/02', '2018/03', '2018/04', '2018/05', '2018/06', '2018/07', '2018/08', '2018/09', '2018/10', '2018/11', '2018/12'];
+
+
+const six = JSON.parse('[{ "name": "违反廉洁纪律", "value":"104"},{ "name": "违反政治纪律", "value":"3"},{ "name": "违反生活纪律", "value":"7"},{ "name": "违反工作纪律", "value":"125"},{ "name": "违反组织纪律", "value":"24"},{ "name": "违反群众纪律", "value":"6"}]');
+const PartyPunish = JSON.parse('[{ "name": "警告", "value":"297"},{ "name": "严重警告", "value":"155"},{ "name": "开除党籍", "value":"42"}]');
+const FilingChartData = JSON.parse('[{ "name": "贪污贿赂", "value":"104"},{ "name": "滥用职权", "value":"3"},{ "name": "玩忽职守", "value":"7"},{ "name": "徇私舞弊", "value":"125"},{ "name": "重大责任事故", "value":"24"},{ "name": "行使公权力过程发生的其他犯罪行为", "value":"6"}]');
+const ClueSource = JSON.parse('[{ "name": "信访举报", "value":"104"},{ "name": "上级交办", "value":"3"},{ "name": "监督检查中发现", "value":"7"},{ "name": "审查调查中发现", "value":"125"},{ "name": "审计中发现", "value":"24"},{ "name": "巡视巡察中发现", "value":"6"},{ "name": "公检法机关移送", "value":"6"},{ "name": "其他行政执法机关移送", "value":"6"},{ "name": "其他", "value":"1"}]');
+const ClueData = RandomData(500, 100);
+const FilingData = RandomData(500, 100);
+const mapData = [
+  { name: '南京市', value: 20057.34, code: '001' },
+  { name: '宿迁市', value: 15477.48, code: ' 002' },
+  { name: '连云港市', value: 500.1, code: ' 013' },
+  { name: '徐州市', value: 6992.6, code: '012' },
+  { name: '苏州市', value: 3333.49, code: ' 005' },
+  { name: '盐城市', value: 5000.64, code: ' 011' },
+  { name: '无锡市', value: 15477.78, code: ' 004' },
+  { name: '常州市', value: 8888.97, code: '003' },
+  { name: '淮安市', value: 6992.26, code: '009 ' },
+  { name: '扬州市', value: 10000.9, code: ' 007' },
+  { name: '镇江市', value: 20000.26, code: ' 002' },
+  { name: '南通市', value: 5881.84, code: ' 006' },
+  { name: '泰州市', value: 13000.01, code: ' 008' },
 
 ];
 
@@ -655,111 +652,24 @@ var mapData = [
 
 
 function RandomData(start, end) {
-    var arr = [];
-    for (var i = 0; i < 12; i++) {
-        var num = Math.round(Math.random() * start) + end;
+  const arr = [];
+  for (let i = 0; i < 12; i++) {
+    const num = Math.round(Math.random() * start) + end;
 
-        arr.push(num);
-    }
-    return arr;
+    arr.push(num);
+  }
+  return arr;
 }
 
-function RefreshChart(area){
-console.log(area);
-
-    return; 
-
-  $.ajax({
-url:"",
-type:"post",
-data:{
-Area:area
-},
-success:function(data){
-    PartyPunish=data;
-    ChartPartyPunish();
-
-}
-});
-
-  $.ajax({
-url:"",
-type:"post",
-data:{
-Area:area
-},
-success:function(data){
- FilingChartData=data;
-    ChartFiling();
 
+export default {
+  six,
+  PartyPunish,
+  FilingChartData,
+  ClueSource,
+  ClueData,
+  FilingData,
+  Month,
 }
-});
-
-  $.ajax({
-url:"",
-type:"post",
-data:{
-Area:area
-},
-success:function(data){
- ClueSource=data;
-    ChartClueSource();
-
-}
-});
-
-  $.ajax({
-url:"",
-type:"post",
-data:{
-Area:area
-},
-success:function(data){
- PartyPunish=data[0];
- GovenPunish=data[1];
-
-    PartyAndGovenPunish();
-
-}
-});
-
-  $.ajax({
-url:"",
-type:"post",
-data:{
-Area:area
-},
-success:function(data){
- ClueData=data[0];
- FilingData=data[1];
-
-    LineClueFiling();
-
-}
-});
-
-
-
-}
-
-$(function () {
-
-    map();
-    LineClueFiling();
-    ChartPartyPunish();
-    ChartSix();
-    ChartFiling();
-    ChartClueSource();
-    //PartyAndGovenPunish();
-
- window.onresize = function () {
-                        chart1.resize();
-                        chart2.resize();
-                        chart3.resize();
-                        chart4.resize();
-                        chart5.resize();
-                        chart6.resize();
-                    }
-})
 
 
diff --git a/src/components/Charts/lineChart.vue b/src/components/Charts/lineChart.vue
new file mode 100644
index 0000000..e188e92
--- /dev/null
+++ b/src/components/Charts/lineChart.vue
@@ -0,0 +1,168 @@
+<!--
+ * @Author: BoBo
+ * @Date: 2019-01-06 23:08:21
+ * @Description: 封装的一个基于echarts的柱状图组件
+
+  porps{
+   className : 自定义容器css
+   id : 容器id(必填)
+   height : 容器高度
+   width : 容器宽度
+   data : 图表数据源 ，需要符合官方饼图的数据格式
+   title : 图表标题
+   subtitle : 子标题
+  }
+
+
+ -->
+<template>
+  <div
+    :class="className"
+    :id="id"
+    :style="{height:height,width:width}"/>
+</template>
+
+<script>
+import echarts from 'echarts'
+import 'echarts/theme/macarons'
+
+export default {
+  props: {
+    className: {
+      type: String,
+    },
+    id: {
+      type: String,
+      default: 'chart',
+    },
+    width: {
+      type: String,
+      default: '500px',
+    },
+    height: {
+      type: String,
+      default: '300px',
+    },
+    data: {
+      type: Array,
+      default: () => ([]),
+    },
+    date: {
+      type: Array,
+      default: () => ([]),
+    },
+    title: {
+      type: String,
+      default: '大标题',
+    },
+    subtitle: {
+      type: String,
+      default: '小标题',
+    },
+  },
+  data() {
+    return {
+      chart: null,
+    }
+  },
+
+  mounted() {
+    this.initChart()
+    this.chart = null
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(document.getElementById(this.id), 'macarons')
+
+
+      this.chart.setOption({
+        color: ['#FF7744', '#87CEFA'],
+        tooltip: {
+          trigger: 'axis',
+        },
+        grid: {
+          containLabel: true,
+        },
+        legend: {
+          data: ['案件', '线索'],
+        },
+        xAxis: [{
+          type: 'category',
+          boundaryGap: false,
+
+          axisTick: {
+            alignWithLabel: true,
+          },
+          axisLabel: { // 坐标轴刻度标签的相关设置。
+            interval: 0, // 横轴信息全部显示
+            rotate: -30, // -30度角倾斜显示
+          },
+          data: this.date,
+        }],
+        yAxis: [{
+          type: 'value',
+          name: '人数',
+          position: 'left',
+          // axisLabel: {
+          //    formatter: '{value} '
+          // }
+        }],
+        series: [{
+          name: '线索',
+          type: 'line',
+          stack: '线索总量',
+          areaStyle: { normal: {} },
+
+          label: {
+            normal: {
+              show: true,
+              position: 'top',
+            },
+          },
+          lineStyle: {
+            normal: {
+              width: 1,
+              shadowColor: 'rgba(0,0,0,0.4)',
+              shadowBlur: 2,
+              shadowOffsetY: 2,
+            },
+          },
+          data: this.data[0],
+        }, {
+          name: '案件',
+          type: 'line',
+          stack: '案件总量',
+          label: {
+            normal: {
+              show: true,
+              position: 'top',
+            },
+          },
+          areaStyle: { normal: {} },
+
+          lineStyle: {
+            normal: {
+              width: 1,
+              shadowColor: 'rgba(0,0,0,0.4)',
+              shadowBlur: 2,
+              shadowOffsetY: 2,
+            },
+          },
+          data: this.data[1],
+        }],
+      })
+
+      window.onresize = function () {
+        this.chart.resize()
+      }
+    },
+  },
+}
+</script>
diff --git a/src/components/Charts/pieChart.vue b/src/components/Charts/pieChart.vue
index 795d459..61222df 100644
--- a/src/components/Charts/pieChart.vue
+++ b/src/components/Charts/pieChart.vue
@@ -1,3 +1,20 @@
+<!--
+ * @Author: BoBo
+ * @Date: 2019-01-04 17:53:03
+ * @Description: 封装的一个基于echarts的饼图组件
+
+  porps{
+   className : 自定义容器css
+   id : 容器id(必填)
+   height : 容器高度
+   width : 容器宽度
+   data : 图表数据源 ，需要符合官方饼图的数据格式
+   title : 图表标题
+   subtitle : 子标题
+  }
+
+
+ -->
 <template>
   <div
     :class="className"
@@ -7,13 +24,12 @@
 
 <script>
 import echarts from 'echarts'
-import './wonderland.js'
+import 'echarts/theme/macarons'
 
 export default {
   props: {
     className: {
       type: String,
-      default: 'chart',
     },
     id: {
       type: String,
@@ -27,12 +43,33 @@ export default {
       type: String,
       default: '300px',
     },
+    data: {
+      type: Array,
+      default: () => ([]),
+    },
+    title: {
+      type: String,
+      default: '大标题',
+    },
+    subtitle: {
+      type: String,
+      default: '',
+    },
   },
   data() {
     return {
       chart: null,
     }
   },
+  computed: {
+    legand() {
+      const arr = []
+      this.data.forEach((item) => {
+        arr.push(item.name)
+      })
+      return arr
+    },
+  },
   mounted() {
     this.initChart()
     this.chart = null
@@ -48,11 +85,13 @@ export default {
     initChart() {
       this.chart = echarts.init(document.getElementById(this.id), 'macarons')
 
+
       this.chart.setOption({
         title: {
-          text: '测试',
+          text: this.title,
+          subtext: this.subtitle,
           left: '29%',
-          top: '40%',
+          top: '43%',
           textAlign: 'center',
           textStyle: {
             fontSize: 14,
@@ -74,22 +113,8 @@ export default {
           textStyle: {
             fontSize: 12,
           },
-          // formatter: function (name) {
-          //     let value = "";
-          //     for (let k in this.FilingChartData) {
-          //         let obj = this.FilingChartData[k];
-          //         if (obj.name == name) {
-          //             value = obj.value;
-          //             break;
-          //         }
-          //     }
-          //     if (name.length > 8) {
-
-          //         name = name.substring(0, 8) + "\n" + name.substring(8, name.length);
-          //     }
-          //     return name + " : " + value + "人";
-          // },
-          data: ['信访举报', '上级交办', '监督检查中发现', '审查调查中发现', '审计中发现', '巡视巡察中发现', '公检法机关移送', '其他行政执法机关移送', '其他'],
+
+          data: this.legand,
         },
 
 
@@ -99,7 +124,7 @@ export default {
             type: 'pie',
             radius: ['50%', '80%'],
             center: ['30%', '50%'],
-            data: JSON.parse('[{ "name": "信访举报", "value":"104"},{ "name": "上级交办", "value":"3"},{ "name": "监督检查中发现", "value":"7"},{ "name": "审查调查中发现", "value":"125"},{ "name": "审计中发现", "value":"24"},{ "name": "巡视巡察中发现", "value":"6"},{ "name": "公检法机关移送", "value":"6"},{ "name": "其他行政执法机关移送", "value":"6"},{ "name": "其他", "value":"1"}]'),
+            data: this.data,
             label: {
               normal: {
                 textStyle: {
@@ -127,6 +152,10 @@ export default {
           },
         ],
       })
+
+      window.onresize = function () {
+        this.chart.resize()
+      }
     },
   },
 }
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 1db8634..52d09a8 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -168,7 +168,7 @@ code {
 
 
 .widget-box{
-  background: #fff;
+  background: #fff!important;
   margin-bottom: 1.875rem;
   padding:1.875rem;
   box-shadow: 0 4px 70px -18px #707070;
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index db56d85..24c5614 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,9 +1,40 @@
 <template>
   <div style="overflow:hidden">
 
-    <el-row >
+
+<el-row  :gutter="32">
+        <el-col :xs="24" :sm="24" :lg="24">
+          <lineChart  :data="lineChartData" :date="chartData.Month" class="widget-box" width="100%" id="chart0"
+       />
+      </el-col>
+
+
+    </el-row>
+
+
+    <el-row  :gutter="32">
+        <el-col :xs="24" :sm="24" :lg="12">
+          <pieChart title="线索来源"  :data="chartData.ClueSource" class="widget-box" width="100%" id="chart1"
+       />
+      </el-col>
+
+ <el-col :xs="24" :sm="24" :lg="12">
+          <pieChart class="widget-box" title="职务违法犯罪"   :data="chartData.FilingChartData" width="100%" id="chart2"
+       />
+      </el-col>
+
+
+    </el-row>
+
+
+     <el-row  :gutter="32">
         <el-col :xs="24" :sm="24" :lg="12">
-          <pieChart class="widget-box" width="100%" id="chart1"
+          <pieChart title="违反六大纪律"  :data="chartData.six" class="widget-box" width="100%" id="chart3"
+       />
+      </el-col>
+
+ <el-col :xs="24" :sm="24" :lg="12">
+          <pieChart class="widget-box" title="党纪处分"   :data="chartData.PartyPunish" width="100%" id="chart4"
        />
       </el-col>
 
@@ -15,14 +46,19 @@
 </template>
 
 <script>
-
+import chartData from '@/components/Charts/Charts_Fake'
 import pieChart from '@/components/Charts/pieChart'
+import lineChart from '@/components/Charts/lineChart'
 
 export default {
   name: 'dashboard',
 
   data() {
+    const lineChartData = [chartData.ClueData, chartData.FilingData]
+
     return {
+      chartData,
+      lineChartData,
     }
   },
   methods: {
@@ -30,6 +66,7 @@ export default {
   },
   components: {
     pieChart,
+    lineChart,
   },
 }
 </script>