diff --git a/BookDouban250.csv b/BookDouban250.csv
index 991f0c8..07997eb 100644
--- a/BookDouban250.csv
+++ b/BookDouban250.csv
@@ -1,76 +1,76 @@
 书名,豆瓣链接,作者,译者,出版社,出版日期,价格,评分,评分人数,一句话评价
 红楼梦,https://book.douban.com/subject/1007305/,[清] 曹雪芹 著 ,, 人民文学出版社 , 1996-12 , 59.70元,9.6,"(
-                    424885人评价
+                    424932人评价
                 )",都云作者痴，谁解其中味？
 活着,https://book.douban.com/subject/4913064/,余华 ,, 作家出版社 , 2012-8 , 20.00元,9.4,"(
-                    835583人评价
+                    835699人评价
                 )",生的苦难与伟大
 1984,https://book.douban.com/subject/4820710/,[英] 乔治·奥威尔 , 刘绍铭 , 北京十月文艺出版社 , 2010-4-1 , 28.00,9.4,"(
-                    285215人评价
+                    285264人评价
                 )",栗树荫下，我出卖你，你出卖我
 哈利·波特,https://book.douban.com/subject/24531956/,J.K.罗琳 (J.K.Rowling) , 苏农 , 人民文学出版社 , 2008-12-1 , 498.00元,9.7,"(
-                    107799人评价
+                    107828人评价
                 )",从9¾站台开始的旅程
 三体全集,https://book.douban.com/subject/6518605/,刘慈欣 ,, 重庆出版社 , 2012-1 , 168.00元,9.5,"(
-                    188276人评价
+                    188309人评价
                 )",地球往事三部曲
 百年孤独,https://book.douban.com/subject/6082808/,[哥伦比亚] 加西亚·马尔克斯 , 范晔 , 南海出版公司 , 2011-6 , 39.50元,9.3,"(
-                    426649人评价
+                    426699人评价
                 )",魔幻现实主义文学代表作
 飘,https://book.douban.com/subject/1068920/,[美国] 玛格丽特·米切尔 , 李美华 , 译林出版社 , 2000-9 , 40.00元,9.3,"(
-                    212846人评价
+                    212872人评价
                 )",革命时期的爱情，随风而逝
 动物农场,https://book.douban.com/subject/2035179/,[英] 乔治·奥威尔 , 荣如德 , 上海译文出版社 , 2007-3 , 10.00元,9.3,"(
-                    160464人评价
+                    160481人评价
                 )",太阳底下并无新事
 房思琪的初恋乐园,https://book.douban.com/subject/27614904/,林奕含 ,, 北京联合出版公司 , 2018-2 , 45.00元,9.2,"(
-                    380660人评价
+                    380731人评价
                 )",向死而生的文学绝唱
 三国演义（全二册）,https://book.douban.com/subject/1019568/,[明] 罗贯中 ,, 人民文学出版社 , 1998-05 , 39.50元,9.3,"(
-                    168830人评价
+                    168841人评价
                 )",是非成败转头空
 福尔摩斯探案全集（上中下）,https://book.douban.com/subject/1040211/,[英] 阿·柯南道尔 , 丁钟华 等 , 群众出版社 , 1981-8 , 53.00元/68.00元,9.3,"(
-                    133835人评价
+                    133838人评价
                 )",名侦探的代名词
 白夜行,https://book.douban.com/subject/10554308/,[日] 东野圭吾 , 刘姿君 , 南海出版公司 , 2013-1-1 , 39.50元,9.2,"(
-                    476436人评价
+                    476505人评价
                 )",一宗离奇命案牵出跨度近20年步步惊心的故事
 小王子,https://book.douban.com/subject/1084336/,[法] 圣埃克苏佩里 , 马振骋 , 人民文学出版社 , 2003-8 , 22.00元,9.1,"(
-                    757268人评价
+                    757307人评价
                 )",献给长成了大人的孩子们
 安徒生童话故事集,https://book.douban.com/subject/1046209/,（丹麦）安徒生 , 叶君健 , 人民文学出版社 , 1997-08 , 25.00元,9.3,"(
-                    132974人评价
+                    132988人评价
                 )",为了争取未来的一代
 天龙八部,https://book.douban.com/subject/1255625/,金庸 ,, 生活·读书·新知三联书店 , 1994-5 , 96.00元,9.2,"(
-                    133154人评价
+                    133163人评价
                 )",有情皆孽，无人不冤
 呐喊,https://book.douban.com/subject/1449351/,鲁迅 ,, 人民文学出版社 , 1973-3 , 0.36元,9.2,"(
-                    160853人评价
+                    160877人评价
                 )",新文学的第一声呐喊
 撒哈拉的故事,https://book.douban.com/subject/1060068/,三毛 ,, 哈尔滨出版社 , 2003-8 , 15.80元,9.2,"(
-                    175479人评价
+                    175517人评价
                 )",游荡的自由灵魂
 悉达多,https://book.douban.com/subject/26980487/,[德] 赫尔曼·黑塞 , 姜乙 , 天津人民出版社 , 2017-1 , 32.00元,9.3,"(
-                    106788人评价
+                    106870人评价
                 )",
 邓小平时代,https://book.douban.com/subject/20424526/,【美】傅高义 (Ezra.F.Vogel) , 冯克利 , 生活·读书·新知三联书店 , 2013-1-18 , 88.00元,9.3,"(
-                    71146人评价
+                    71166人评价
                 )",个人命运背后的历史变局
 杀死一只知更鸟,https://book.douban.com/subject/6781808/,[美] 哈珀·李 , 高红梅 , 译林出版社 , 2012-9 , 32.00元,9.2,"(
-                    147208人评价
+                    147222人评价
                 )",有一种东西不能遵循从众原则，那就是——人的良心
 明朝那些事儿（1-9）,https://book.douban.com/subject/3674537/,当年明月 ,, 中国海关出版社 , 2009-4 , 358.20元,9.2,"(
-                    175540人评价
+                    175585人评价
                 )",不拘一格的历史书写
 失踪的孩子,https://book.douban.com/subject/30172069/,[意] 埃莱娜·费兰特 , 陈英 , 人民文学出版社 , 2018-7 , 62.00元,9.2,"(
-                    81932人评价
+                    81962人评价
                 )",我的整个生命，只是一场为了提升社会地位的低俗斗争。
 新名字的故事,https://book.douban.com/subject/26986954/,[意] 埃莱娜·费兰特 , 陈英 , 人民文学出版社 , 2017-4 , 59.00元,9.2,"(
-                    92504人评价
+                    92527人评价
                 )",探索青年时代的激情、困惑、挣扎、背叛和失去
 野草,https://book.douban.com/subject/1915958/,鲁迅 ,, 人民文学出版社 , 1973-3 , 0.20元,9.5,"(
-                    47629人评价
+                    47638人评价
                 )",我以这一丛野草，在明与暗，生与死，过去与未来之际，献于友与仇，人与兽，爱者与不爱者之前作证。
 沉默的大多数,https://book.douban.com/subject/1054685/,王小波 ,, 中国青年出版社 , 1997-10 , 27.00元,9.1,"(
-                    151766人评价
+                    151786人评价
                 )",沉默是沉默者的通行证
diff --git a/GUI.py b/GUI.py
index 5573431..fe15124 100644
--- a/GUI.py
+++ b/GUI.py
@@ -3,154 +3,143 @@ from pyecharts.charts import Bar,Page,Line,Timeline
 from pyecharts.commons.utils import JsCode
 from pyecharts.globals import ThemeType
 from pyecharts.charts import Pie
+import sql
 from pyecharts.faker import Faker
-from main import book_list_data
+# from main import book_list_data
 from collections import Counter
-
-
-book_list_data_sortBystart = sorted(book_list_data, key=lambda x: (x.star, x.star_people), reverse=True)
-book_list_data_sortBystart=book_list_data_sortBystart[:10]
-book_list_data_sortBystart=book_list_data_sortBystart[::-1]
-# 从book_list_data中提取书籍名称和评分数据
-book_names = [book.name for book in book_list_data_sortBystart]
-book_stars = [book.star for book in book_list_data_sortBystart]
-x_data = list(range(1, len(book_names) + 1))
-# 创建柱状图
-bar = (
-Bar(init_opts=opts.InitOpts(theme="shine",width="850px",height='400px'))
-    .add_xaxis(book_names)
-    .add_yaxis("评分", book_stars,color="red")
-    .reversal_axis()  # 实现旋转
-    .set_global_opts(
-        title_opts=opts.TitleOpts(title="评分前10榜", pos_bottom="bottom", pos_left="center"),
-        xaxis_opts=opts.AxisOpts(axislabel_opts=opts.LabelOpts(rotate=0)),
-        yaxis_opts=opts.AxisOpts(axislabel_opts=opts.LabelOpts(rotate=-45))
+class Book:
+    def __init__(self, name, url, star, star_people, author, translater, publisher, pub_year, price, comment):
+        self.name = name
+        self.url = url
+        self.star = star
+        self.star_people = star_people
+        self.author = author
+        self.translater = translater
+        self.publisher = publisher
+        self.pub_year = pub_year
+        self.price = price
+        self.comment = comment
+db = sql.BookDatabase(host='localhost', user='root', password='123456', database='xiaosuo', table_name='books')
+db.initialize_table()
+def show():
+    data = db.get_book_list()
+    book_list_data = []
+    for book in data:
+        book_list_data.append(
+            Book(book["name"], book["url"], book["star"], book["star_people"], book["author"], book["translater"],
+                 book["publisher"], book["pub_year"], book["price"], book["comment"]))
+
+    book_list_data_sortBystart = sorted(book_list_data, key=lambda x: (x.star, x.star_people), reverse=True)
+    book_list_data_sortBystart = book_list_data_sortBystart[:10]
+    book_list_data_sortBystart = book_list_data_sortBystart[::-1]
+    # 从book_list_data中提取书籍名称和评分数据
+    book_names = [book.name for book in book_list_data_sortBystart]
+    book_stars = [book.star for book in book_list_data_sortBystart]
+    x_data = list(range(1, len(book_names) + 1))
+    # 创建柱状图
+    bar = (
+        Bar(init_opts=opts.InitOpts(theme="shine", width="850px", height='400px'))
+        .add_xaxis(book_names)
+        .add_yaxis("评分", book_stars, color="red")
+        .reversal_axis()  # 实现旋转
+        .set_global_opts(
+            title_opts=opts.TitleOpts(title="评分前10榜", pos_bottom="bottom", pos_left="center"),
+            xaxis_opts=opts.AxisOpts(axislabel_opts=opts.LabelOpts(rotate=0)),
+            yaxis_opts=opts.AxisOpts(axislabel_opts=opts.LabelOpts(rotate=-45))
+        )
+        # .render("bar_datazoom_slider.html")
     )
-# .render("bar_datazoom_slider.html")
-)
-
-
-publisher_list = [book.publisher for book in book_list_data]
-# 使用Counter来计算每个出版商的数量
-publisher_counter = Counter(publisher_list)
-publisher_names = list(publisher_counter.keys())
-publisher_counts = list(publisher_counter.values())
-colors = [
-    "#5470c6", "#91cc75", "#fac858", "#ee6666", "#73c0de",
-    "#3ba272", "#fc8452", "#9a60b4", "#ea7ccc", "#bb60b4",
-    "#8B008B", "#FF1493", "#1E90FF", "#20B2AA", "#2E8B57",
-    "#B22222", "#FF4500", "#4682B4", "#DAA520", "#32CD32"
-]
-
-# 使用Pyecharts创建饼图
-pie = (
-    Pie()
-    .add("", [list(z) for z in zip(publisher_names, publisher_counts)])
-    .set_colors(colors)  # 设置颜色
-    .set_global_opts(title_opts=opts.TitleOpts(title="出版商分布饼图", pos_left="center",pos_bottom="bottom"))
-    .set_series_opts(label_opts=opts.LabelOpts(formatter="{b}: {c}"))
-)
-
-prices = [float(book.price) for book in book_list_data ]
-print(prices)
-# 将价格分组到不同的区间
-price_intervals = [0, 50, 100, 150, 200, 250, 300, 350, 400, 450, 500, float('inf')]  # 设置价格区间
-price_counts = [0] * (len(price_intervals) - 1)  # 初始化每个区间的计数为0
-prices_intervalsStr=["0-50","50-100","100-150","150-200","200-250","250-300","300-350","350-400","400-450","450-500","500以上"]
-# 统计每个价格区间的数量
-for price in prices:
-    for i in range(len(price_intervals) - 1):
-        if price>=500:
-            price_counts[len(price_intervals) - 1] += 1
-            break
-        if price_intervals[i] <= price and price < price_intervals[i + 1]:
-            price_counts[i] += 1
-            break
-# print(price_counts)
-# 生成价格区间与书籍数量折线图
-line = (
-    Line()
-    .add_xaxis([str(interval) for interval in prices_intervalsStr[:-1]])  # X轴标签为价格区间
-    .add_yaxis("书籍数量", price_counts, symbol="circle", is_smooth=True, markpoint_opts=opts.MarkPointOpts(data=[opts.MarkPointItem(type_="max")]))
-    .set_global_opts(title_opts=opts.TitleOpts(title="价格区间与书籍数量折线图", pos_left="center",pos_bottom="bottom"),
-                     xaxis_opts=opts.AxisOpts(name="价格区间"),
-                     yaxis_opts=opts.AxisOpts(name="书籍数量"),
-                     datazoom_opts=opts.DataZoomOpts(range_start=0, range_end=100),)
-)
-
-# 生成时间与书籍数量折线图# 假设您的书籍数据保存在book_list_data中
-# 提取每本书的出版年份
-publish_dates = [int(book.pub_year.replace('-', '.').split('.')[0]) for book in book_list_data]
-print(publish_dates)
-# 使用Counter来计算每年出版的书的数量
-publish_year_counter = Counter(publish_dates)
-print(publish_year_counter)
-# 确保结果包含连续的年份范围，并且将缺失的年份对应的数量设为 0
-full_year_range = range(min(publish_dates), max(publish_dates) + 1)
-print(full_year_range)
-pub_year_counts = [(year, publish_year_counter[year]) for year in full_year_range]
 
-# 提取年份和对应的书籍数量
-years = [str(year) for year, count in pub_year_counts]
-counts = [count for year, count in pub_year_counts]
-print(pub_year_counts)
-#
-# # 创建动态的时间曲线图
-# line_year_count = (
-#     Line()
-#     .add_xaxis(xaxis_data=years)
-#     .add_yaxis(
-#         series_name="出版数量",
-#         y_axis=counts,
-#     )
-#     .set_global_opts(
-#         title_opts=opts.TitleOpts(title="每年出版书籍数量变化"),
-#         xaxis_opts=opts.AxisOpts(name="年份"),
-#         yaxis_opts=opts.AxisOpts(name="书籍数量"),
-#         datazoom_opts=opts.DataZoomOpts(type_="inside"),
-#         tooltip_opts=opts.TooltipOpts(trigger="axis", axis_pointer_type="cross"),
-#     )
-# )
-
-# timeline = Timeline()
-# for i, year in enumerate(years):
-line_year_count = (
-Line()
-    .add_xaxis(years)
-    .add_yaxis(
-        series_name="出版书籍数量",
-        y_axis=counts,
-        markpoint_opts=opts.MarkPointOpts(data=[opts.MarkPointItem(type_="max", name="最大值"),
-                                               opts.MarkPointItem(type_="min", name="最小值")]),
-        markline_opts=opts.MarkLineOpts(data=[opts.MarkLineItem(type_="average", name="平均值")]),
-    )
-    .set_global_opts(title_opts=opts.TitleOpts(title="年份与出版书籍数量变化"),
-                     xaxis_opts=opts.AxisOpts(name="年份"),
-                     yaxis_opts=opts.AxisOpts(name="书籍数量"),
+    publisher_list = [book.publisher for book in book_list_data]
+    # 使用Counter来计算每个出版商的数量
+    publisher_counter = Counter(publisher_list)
+    publisher_names = list(publisher_counter.keys())
+    publisher_counts = list(publisher_counter.values())
+    colors = [
+        "#5470c6", "#91cc75", "#fac858", "#ee6666", "#73c0de",
+        "#3ba272", "#fc8452", "#9a60b4", "#ea7ccc", "#bb60b4",
+        "#8B008B", "#FF1493", "#1E90FF", "#20B2AA", "#2E8B57",
+        "#B22222", "#FF4500", "#4682B4", "#DAA520", "#32CD32"
+    ]
+
+    # 使用Pyecharts创建饼图
+    pie = (
+        Pie()
+        .add("", [list(z) for z in zip(publisher_names, publisher_counts)])
+        .set_colors(colors)  # 设置颜色
+        .set_global_opts(title_opts=opts.TitleOpts(title="出版商分布饼图", pos_left="center", pos_bottom="bottom"))
+        .set_series_opts(label_opts=opts.LabelOpts(formatter="{b}: {c}"))
     )
 
-
+    prices = [float(book.price) for book in book_list_data]
+    print(prices)
+    # 将价格分组到不同的区间
+    price_intervals = [0, 50, 100, 150, 200, 250, 300, 350, 400, 450, 500, float('inf')]  # 设置价格区间
+    price_counts = [0] * (len(price_intervals) - 1)  # 初始化每个区间的计数为0
+    prices_intervalsStr = ["0-50", "50-100", "100-150", "150-200", "200-250", "250-300", "300-350", "350-400",
+                           "400-450", "450-500", "500以上"]
+    # 统计每个价格区间的数量
+    for price in prices:
+        for i in range(len(price_intervals) - 1):
+            if price >= 500:
+                price_counts[len(price_intervals) - 1] += 1
+                break
+            if price_intervals[i] <= price and price < price_intervals[i + 1]:
+                price_counts[i] += 1
+                break
+    # print(price_counts)
+    # 生成价格区间与书籍数量折线图
+    line = (
+        Line()
+        .add_xaxis([str(interval) for interval in prices_intervalsStr[:-1]])  # X轴标签为价格区间
+        .add_yaxis("书籍数量", price_counts, symbol="circle", is_smooth=True,
+                   markpoint_opts=opts.MarkPointOpts(data=[opts.MarkPointItem(type_="max")]))
+        .set_global_opts(
+            title_opts=opts.TitleOpts(title="价格区间与书籍数量折线图", pos_left="center", pos_bottom="bottom"),
+            xaxis_opts=opts.AxisOpts(name="价格区间"),
+            yaxis_opts=opts.AxisOpts(name="书籍数量"),
+            datazoom_opts=opts.DataZoomOpts(range_start=0, range_end=100), )
     )
-#     timeline.add(line_year_count, time_point=str(year))
-# timeline.add_schema(
-#         play_interval=1000,  # 播放的时间间隔
-#         is_auto_play=False,  # 是否自动播放
-#         pos_left="center",  # 时间轴组件的位置
-#         pos_bottom="bottom",
-#     )
-
-
-
-# 生成html文件（可选）
-# pie.render("publisher_pie_chart.html")
-# 创建一个页面
-page = Page()
-# 将柱状图和饼图添加到页面中
-page.add(line_year_count)
-page.add(bar)
-page.add(pie)
-page.add(line)
-# 生成HTML文件
-page.render("book_analysis.html")
 
+    # 生成时间与书籍数量折线图# 假设您的书籍数据保存在book_list_data中
+    # 提取每本书的出版年份
+    publish_dates = [int(book.pub_year.replace('-', '.').split('.')[0]) for book in book_list_data]
+    print(publish_dates)
+    # 使用Counter来计算每年出版的书的数量
+    publish_year_counter = Counter(publish_dates)
+    print(publish_year_counter)
+    # 确保结果包含连续的年份范围，并且将缺失的年份对应的数量设为 0
+    full_year_range = range(min(publish_dates), max(publish_dates) + 1)
+    print(full_year_range)
+    pub_year_counts = [(year, publish_year_counter[year]) for year in full_year_range]
+
+    # 提取年份和对应的书籍数量
+    years = [str(year) for year, count in pub_year_counts]
+    counts = [count for year, count in pub_year_counts]
+    print(pub_year_counts)
+
+    line_year_count = (
+        Line()
+        .add_xaxis(years)
+        .add_yaxis(
+            series_name="出版书籍数量",
+            y_axis=counts,
+            markpoint_opts=opts.MarkPointOpts(data=[opts.MarkPointItem(type_="max", name="最大值"),
+                                                    opts.MarkPointItem(type_="min", name="最小值")]),
+            markline_opts=opts.MarkLineOpts(data=[opts.MarkLineItem(type_="average", name="平均值")]),
+        )
+        .set_global_opts(title_opts=opts.TitleOpts(title="年份与出版书籍数量变化"),
+                         xaxis_opts=opts.AxisOpts(name="年份"),
+                         yaxis_opts=opts.AxisOpts(name="书籍数量"),
+                         )
+    )
 
+    # 创建一个页面
+    page = Page()
+    # 将柱状图和饼图添加到页面中
+    page.add(line_year_count)
+    page.add(bar)
+    page.add(pie)
+    page.add(line)
+    # 生成HTML文件
+    page.render("book_analysis.html")
\ No newline at end of file
diff --git a/Python程序设计课程设计报告模板 2024年.doc b/Python程序设计课程设计报告模板 2024年.doc
index 5b1f3c0..77fa5b0 100644
Binary files a/Python程序设计课程设计报告模板 2024年.doc and b/Python程序设计课程设计报告模板 2024年.doc differ
diff --git a/book_analysis.html b/book_analysis.html
deleted file mode 100644
index 3d28b63..0000000
--- a/book_analysis.html
+++ /dev/null
@@ -1,1130 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Awesome-pyecharts</title>
-                <script type="text/javascript" src="https://assets.pyecharts.org/assets/v5/echarts.min.js"></script>
-            <script type="text/javascript" src="https://assets.pyecharts.org/assets/v5/themes/shine.js"></script>
-
-    
-</head>
-<body >
-    <style>.box {  } </style>
-    <div class="box">
-                <div id="3109246a1bc341f4b2044026d5491933" class="chart-container" style="width:900px; height:500px; "></div>
-    <script>
-        var chart_3109246a1bc341f4b2044026d5491933 = echarts.init(
-            document.getElementById('3109246a1bc341f4b2044026d5491933'), 'white', {renderer: 'canvas'});
-        var option_3109246a1bc341f4b2044026d5491933 = {
-    "animation": true,
-    "animationThreshold": 2000,
-    "animationDuration": 1000,
-    "animationEasing": "cubicOut",
-    "animationDelay": 0,
-    "animationDurationUpdate": 300,
-    "animationEasingUpdate": "cubicOut",
-    "animationDelayUpdate": 0,
-    "aria": {
-        "enabled": false
-    },
-    "color": [
-        "#5470c6",
-        "#91cc75",
-        "#fac858",
-        "#ee6666",
-        "#73c0de",
-        "#3ba272",
-        "#fc8452",
-        "#9a60b4",
-        "#ea7ccc"
-    ],
-    "series": [
-        {
-            "type": "line",
-            "name": "\u51fa\u7248\u4e66\u7c4d\u6570\u91cf",
-            "connectNulls": false,
-            "xAxisIndex": 0,
-            "symbolSize": 4,
-            "showSymbol": true,
-            "smooth": false,
-            "clip": true,
-            "step": false,
-            "data": [
-                [
-                    "1973",
-                    2
-                ],
-                [
-                    "1974",
-                    0
-                ],
-                [
-                    "1975",
-                    0
-                ],
-                [
-                    "1976",
-                    0
-                ],
-                [
-                    "1977",
-                    0
-                ],
-                [
-                    "1978",
-                    0
-                ],
-                [
-                    "1979",
-                    0
-                ],
-                [
-                    "1980",
-                    0
-                ],
-                [
-                    "1981",
-                    2
-                ],
-                [
-                    "1982",
-                    0
-                ],
-                [
-                    "1983",
-                    0
-                ],
-                [
-                    "1984",
-                    0
-                ],
-                [
-                    "1985",
-                    0
-                ],
-                [
-                    "1986",
-                    0
-                ],
-                [
-                    "1987",
-                    0
-                ],
-                [
-                    "1988",
-                    0
-                ],
-                [
-                    "1989",
-                    0
-                ],
-                [
-                    "1990",
-                    0
-                ],
-                [
-                    "1991",
-                    0
-                ],
-                [
-                    "1992",
-                    0
-                ],
-                [
-                    "1993",
-                    0
-                ],
-                [
-                    "1994",
-                    1
-                ],
-                [
-                    "1995",
-                    0
-                ],
-                [
-                    "1996",
-                    1
-                ],
-                [
-                    "1997",
-                    2
-                ],
-                [
-                    "1998",
-                    1
-                ],
-                [
-                    "1999",
-                    0
-                ],
-                [
-                    "2000",
-                    1
-                ],
-                [
-                    "2001",
-                    0
-                ],
-                [
-                    "2002",
-                    0
-                ],
-                [
-                    "2003",
-                    2
-                ],
-                [
-                    "2004",
-                    0
-                ],
-                [
-                    "2005",
-                    0
-                ],
-                [
-                    "2006",
-                    0
-                ],
-                [
-                    "2007",
-                    1
-                ],
-                [
-                    "2008",
-                    1
-                ],
-                [
-                    "2009",
-                    1
-                ],
-                [
-                    "2010",
-                    1
-                ],
-                [
-                    "2011",
-                    1
-                ],
-                [
-                    "2012",
-                    3
-                ],
-                [
-                    "2013",
-                    2
-                ],
-                [
-                    "2014",
-                    0
-                ],
-                [
-                    "2015",
-                    0
-                ],
-                [
-                    "2016",
-                    0
-                ],
-                [
-                    "2017",
-                    2
-                ],
-                [
-                    "2018",
-                    2
-                ]
-            ],
-            "hoverAnimation": true,
-            "label": {
-                "show": true,
-                "margin": 8
-            },
-            "logBase": 10,
-            "seriesLayoutBy": "column",
-            "lineStyle": {
-                "show": true,
-                "width": 1,
-                "opacity": 1,
-                "curveness": 0,
-                "type": "solid"
-            },
-            "areaStyle": {
-                "opacity": 0
-            },
-            "markPoint": {
-                "label": {
-                    "show": true,
-                    "position": "inside",
-                    "color": "#fff",
-                    "margin": 8
-                },
-                "data": [
-                    {
-                        "name": "\u6700\u5927\u503c",
-                        "type": "max"
-                    },
-                    {
-                        "name": "\u6700\u5c0f\u503c",
-                        "type": "min"
-                    }
-                ]
-            },
-            "markLine": {
-                "silent": false,
-                "precision": 2,
-                "label": {
-                    "show": true,
-                    "margin": 8
-                },
-                "data": [
-                    {
-                        "name": "\u5e73\u5747\u503c",
-                        "type": "average"
-                    }
-                ]
-            },
-            "zlevel": 0,
-            "z": 0
-        }
-    ],
-    "legend": [
-        {
-            "data": [
-                "\u51fa\u7248\u4e66\u7c4d\u6570\u91cf"
-            ],
-            "selected": {},
-            "show": true,
-            "padding": 5,
-            "itemGap": 10,
-            "itemWidth": 25,
-            "itemHeight": 14,
-            "backgroundColor": "transparent",
-            "borderColor": "#ccc",
-            "borderRadius": 0,
-            "pageButtonItemGap": 5,
-            "pageButtonPosition": "end",
-            "pageFormatter": "{current}/{total}",
-            "pageIconColor": "#2f4554",
-            "pageIconInactiveColor": "#aaa",
-            "pageIconSize": 15,
-            "animationDurationUpdate": 800,
-            "selector": false,
-            "selectorPosition": "auto",
-            "selectorItemGap": 7,
-            "selectorButtonGap": 10
-        }
-    ],
-    "tooltip": {
-        "show": true,
-        "trigger": "item",
-        "triggerOn": "mousemove|click",
-        "axisPointer": {
-            "type": "line"
-        },
-        "showContent": true,
-        "alwaysShowContent": false,
-        "showDelay": 0,
-        "hideDelay": 100,
-        "enterable": false,
-        "confine": false,
-        "appendToBody": false,
-        "transitionDuration": 0.4,
-        "textStyle": {
-            "fontSize": 14
-        },
-        "borderWidth": 0,
-        "padding": 5,
-        "order": "seriesAsc"
-    },
-    "xAxis": [
-        {
-            "name": "\u5e74\u4efd",
-            "show": true,
-            "scale": false,
-            "nameLocation": "end",
-            "nameGap": 15,
-            "gridIndex": 0,
-            "inverse": false,
-            "offset": 0,
-            "splitNumber": 5,
-            "minInterval": 0,
-            "splitLine": {
-                "show": true,
-                "lineStyle": {
-                    "show": true,
-                    "width": 1,
-                    "opacity": 1,
-                    "curveness": 0,
-                    "type": "solid"
-                }
-            },
-            "data": [
-                "1973",
-                "1974",
-                "1975",
-                "1976",
-                "1977",
-                "1978",
-                "1979",
-                "1980",
-                "1981",
-                "1982",
-                "1983",
-                "1984",
-                "1985",
-                "1986",
-                "1987",
-                "1988",
-                "1989",
-                "1990",
-                "1991",
-                "1992",
-                "1993",
-                "1994",
-                "1995",
-                "1996",
-                "1997",
-                "1998",
-                "1999",
-                "2000",
-                "2001",
-                "2002",
-                "2003",
-                "2004",
-                "2005",
-                "2006",
-                "2007",
-                "2008",
-                "2009",
-                "2010",
-                "2011",
-                "2012",
-                "2013",
-                "2014",
-                "2015",
-                "2016",
-                "2017",
-                "2018"
-            ]
-        }
-    ],
-    "yAxis": [
-        {
-            "name": "\u4e66\u7c4d\u6570\u91cf",
-            "show": true,
-            "scale": false,
-            "nameLocation": "end",
-            "nameGap": 15,
-            "gridIndex": 0,
-            "inverse": false,
-            "offset": 0,
-            "splitNumber": 5,
-            "minInterval": 0,
-            "splitLine": {
-                "show": true,
-                "lineStyle": {
-                    "show": true,
-                    "width": 1,
-                    "opacity": 1,
-                    "curveness": 0,
-                    "type": "solid"
-                }
-            }
-        }
-    ],
-    "title": [
-        {
-            "show": true,
-            "text": "\u5e74\u4efd\u4e0e\u51fa\u7248\u4e66\u7c4d\u6570\u91cf\u53d8\u5316",
-            "target": "blank",
-            "subtarget": "blank",
-            "padding": 5,
-            "itemGap": 10,
-            "textAlign": "auto",
-            "textVerticalAlign": "auto",
-            "triggerEvent": false
-        }
-    ]
-};
-        chart_3109246a1bc341f4b2044026d5491933.setOption(option_3109246a1bc341f4b2044026d5491933);
-    </script>
-<br/>                <div id="b6e5cee4deeb42c68975d761047f56a4" class="chart-container" style="width:850px; height:400px; "></div>
-    <script>
-        var chart_b6e5cee4deeb42c68975d761047f56a4 = echarts.init(
-            document.getElementById('b6e5cee4deeb42c68975d761047f56a4'), 'shine', {renderer: 'canvas'});
-        var option_b6e5cee4deeb42c68975d761047f56a4 = {
-    "animation": true,
-    "animationThreshold": 2000,
-    "animationDuration": 1000,
-    "animationEasing": "cubicOut",
-    "animationDelay": 0,
-    "animationDurationUpdate": 300,
-    "animationEasingUpdate": "cubicOut",
-    "animationDelayUpdate": 0,
-    "aria": {
-        "enabled": false
-    },
-    "series": [
-        {
-            "type": "bar",
-            "name": "\u8bc4\u5206",
-            "legendHoverLink": true,
-            "data": [
-                "9.3",
-                "9.3",
-                "9.3",
-                "9.3",
-                "9.4",
-                "9.4",
-                "9.5",
-                "9.5",
-                "9.6",
-                "9.7"
-            ],
-            "realtimeSort": false,
-            "showBackground": false,
-            "stackStrategy": "samesign",
-            "cursor": "pointer",
-            "barMinHeight": 0,
-            "barCategoryGap": "20%",
-            "barGap": "30%",
-            "large": false,
-            "largeThreshold": 400,
-            "seriesLayoutBy": "column",
-            "datasetIndex": 0,
-            "clip": true,
-            "zlevel": 0,
-            "z": 2,
-            "label": {
-                "show": true,
-                "margin": 8
-            }
-        }
-    ],
-    "legend": [
-        {
-            "data": [
-                "\u8bc4\u5206"
-            ],
-            "selected": {},
-            "show": true,
-            "padding": 5,
-            "itemGap": 10,
-            "itemWidth": 25,
-            "itemHeight": 14,
-            "backgroundColor": "transparent",
-            "borderColor": "#ccc",
-            "borderRadius": 0,
-            "pageButtonItemGap": 5,
-            "pageButtonPosition": "end",
-            "pageFormatter": "{current}/{total}",
-            "pageIconColor": "#2f4554",
-            "pageIconInactiveColor": "#aaa",
-            "pageIconSize": 15,
-            "animationDurationUpdate": 800,
-            "selector": false,
-            "selectorPosition": "auto",
-            "selectorItemGap": 7,
-            "selectorButtonGap": 10
-        }
-    ],
-    "tooltip": {
-        "show": true,
-        "trigger": "item",
-        "triggerOn": "mousemove|click",
-        "axisPointer": {
-            "type": "line"
-        },
-        "showContent": true,
-        "alwaysShowContent": false,
-        "showDelay": 0,
-        "hideDelay": 100,
-        "enterable": false,
-        "confine": false,
-        "appendToBody": false,
-        "transitionDuration": 0.4,
-        "textStyle": {
-            "fontSize": 14
-        },
-        "borderWidth": 0,
-        "padding": 5,
-        "order": "seriesAsc"
-    },
-    "xAxis": [
-        {
-            "show": true,
-            "scale": false,
-            "nameLocation": "end",
-            "nameGap": 15,
-            "gridIndex": 0,
-            "axisLabel": {
-                "show": true,
-                "rotate": 0,
-                "margin": 8
-            },
-            "inverse": false,
-            "offset": 0,
-            "splitNumber": 5,
-            "minInterval": 0,
-            "splitLine": {
-                "show": true,
-                "lineStyle": {
-                    "show": true,
-                    "width": 1,
-                    "opacity": 1,
-                    "curveness": 0,
-                    "type": "solid"
-                }
-            }
-        }
-    ],
-    "yAxis": [
-        {
-            "show": true,
-            "scale": false,
-            "nameLocation": "end",
-            "nameGap": 15,
-            "gridIndex": 0,
-            "axisLabel": {
-                "show": true,
-                "rotate": -45,
-                "margin": 8
-            },
-            "inverse": false,
-            "offset": 0,
-            "splitNumber": 5,
-            "minInterval": 0,
-            "splitLine": {
-                "show": true,
-                "lineStyle": {
-                    "show": true,
-                    "width": 1,
-                    "opacity": 1,
-                    "curveness": 0,
-                    "type": "solid"
-                }
-            },
-            "data": [
-                "\u4e09\u56fd\u6f14\u4e49\uff08\u5168\u4e8c\u518c\uff09",
-                "\u98d8",
-                "\u767e\u5e74\u5b64\u72ec",
-                "\u9093\u5c0f\u5e73\u65f6\u4ee3",
-                "1984",
-                "\u6d3b\u7740",
-                "\u4e09\u4f53\u5168\u96c6",
-                "\u91ce\u8349",
-                "\u7ea2\u697c\u68a6",
-                "\u54c8\u5229\u00b7\u6ce2\u7279"
-            ]
-        }
-    ],
-    "title": [
-        {
-            "show": true,
-            "text": "\u8bc4\u5206\u524d10\u699c",
-            "target": "blank",
-            "subtarget": "blank",
-            "left": "center",
-            "bottom": "bottom",
-            "padding": 5,
-            "itemGap": 10,
-            "textAlign": "auto",
-            "textVerticalAlign": "auto",
-            "triggerEvent": false
-        }
-    ]
-};
-        chart_b6e5cee4deeb42c68975d761047f56a4.setOption(option_b6e5cee4deeb42c68975d761047f56a4);
-    </script>
-<br/>                <div id="4b3b56f100ab40efb04554a9bcc059a0" class="chart-container" style="width:900px; height:500px; "></div>
-    <script>
-        var chart_4b3b56f100ab40efb04554a9bcc059a0 = echarts.init(
-            document.getElementById('4b3b56f100ab40efb04554a9bcc059a0'), 'white', {renderer: 'canvas'});
-        var option_4b3b56f100ab40efb04554a9bcc059a0 = {
-    "animation": true,
-    "animationThreshold": 2000,
-    "animationDuration": 1000,
-    "animationEasing": "cubicOut",
-    "animationDelay": 0,
-    "animationDurationUpdate": 300,
-    "animationEasingUpdate": "cubicOut",
-    "animationDelayUpdate": 0,
-    "aria": {
-        "enabled": false
-    },
-    "color": [
-        "#5470c6",
-        "#91cc75",
-        "#fac858",
-        "#ee6666",
-        "#73c0de",
-        "#3ba272",
-        "#fc8452",
-        "#9a60b4",
-        "#ea7ccc",
-        "#bb60b4",
-        "#8B008B",
-        "#FF1493",
-        "#1E90FF",
-        "#20B2AA",
-        "#2E8B57",
-        "#B22222",
-        "#FF4500",
-        "#4682B4",
-        "#DAA520",
-        "#32CD32"
-    ],
-    "series": [
-        {
-            "type": "pie",
-            "colorBy": "data",
-            "legendHoverLink": true,
-            "selectedMode": false,
-            "selectedOffset": 10,
-            "clockwise": true,
-            "startAngle": 90,
-            "minAngle": 0,
-            "minShowLabelAngle": 0,
-            "avoidLabelOverlap": true,
-            "stillShowZeroSum": true,
-            "percentPrecision": 2,
-            "showEmptyCircle": true,
-            "emptyCircleStyle": {
-                "color": "lightgray",
-                "borderColor": "#000",
-                "borderWidth": 0,
-                "borderType": "solid",
-                "borderDashOffset": 0,
-                "borderCap": "butt",
-                "borderJoin": "bevel",
-                "borderMiterLimit": 10,
-                "opacity": 1
-            },
-            "data": [
-                {
-                    "name": " \u4eba\u6c11\u6587\u5b66\u51fa\u7248\u793e ",
-                    "value": 9
-                },
-                {
-                    "name": " \u4f5c\u5bb6\u51fa\u7248\u793e ",
-                    "value": 1
-                },
-                {
-                    "name": " \u5317\u4eac\u5341\u6708\u6587\u827a\u51fa\u7248\u793e ",
-                    "value": 1
-                },
-                {
-                    "name": " \u91cd\u5e86\u51fa\u7248\u793e ",
-                    "value": 1
-                },
-                {
-                    "name": " \u5357\u6d77\u51fa\u7248\u516c\u53f8 ",
-                    "value": 2
-                },
-                {
-                    "name": " \u8bd1\u6797\u51fa\u7248\u793e ",
-                    "value": 2
-                },
-                {
-                    "name": " \u4e0a\u6d77\u8bd1\u6587\u51fa\u7248\u793e ",
-                    "value": 1
-                },
-                {
-                    "name": " \u5317\u4eac\u8054\u5408\u51fa\u7248\u516c\u53f8 ",
-                    "value": 1
-                },
-                {
-                    "name": " \u7fa4\u4f17\u51fa\u7248\u793e ",
-                    "value": 2
-                },
-                {
-                    "name": " \u751f\u6d3b\u00b7\u8bfb\u4e66\u00b7\u65b0\u77e5\u4e09\u8054\u4e66\u5e97 ",
-                    "value": 2
-                },
-                {
-                    "name": " \u54c8\u5c14\u6ee8\u51fa\u7248\u793e ",
-                    "value": 1
-                },
-                {
-                    "name": " \u5929\u6d25\u4eba\u6c11\u51fa\u7248\u793e ",
-                    "value": 1
-                },
-                {
-                    "name": " \u4e2d\u56fd\u6d77\u5173\u51fa\u7248\u793e ",
-                    "value": 1
-                },
-                {
-                    "name": " \u4e2d\u56fd\u9752\u5e74\u51fa\u7248\u793e ",
-                    "value": 1
-                }
-            ],
-            "radius": [
-                "0%",
-                "75%"
-            ],
-            "center": [
-                "50%",
-                "50%"
-            ],
-            "label": {
-                "show": true,
-                "margin": 8,
-                "formatter": "{b}: {c}"
-            },
-            "labelLine": {
-                "show": true,
-                "showAbove": false,
-                "length": 15,
-                "length2": 15,
-                "smooth": false,
-                "minTurnAngle": 90,
-                "maxSurfaceAngle": 90
-            },
-            "rippleEffect": {
-                "show": true,
-                "brushType": "stroke",
-                "scale": 2.5,
-                "period": 4
-            }
-        }
-    ],
-    "legend": [
-        {
-            "data": [
-                " \u4eba\u6c11\u6587\u5b66\u51fa\u7248\u793e ",
-                " \u4f5c\u5bb6\u51fa\u7248\u793e ",
-                " \u5317\u4eac\u5341\u6708\u6587\u827a\u51fa\u7248\u793e ",
-                " \u91cd\u5e86\u51fa\u7248\u793e ",
-                " \u5357\u6d77\u51fa\u7248\u516c\u53f8 ",
-                " \u8bd1\u6797\u51fa\u7248\u793e ",
-                " \u4e0a\u6d77\u8bd1\u6587\u51fa\u7248\u793e ",
-                " \u5317\u4eac\u8054\u5408\u51fa\u7248\u516c\u53f8 ",
-                " \u7fa4\u4f17\u51fa\u7248\u793e ",
-                " \u751f\u6d3b\u00b7\u8bfb\u4e66\u00b7\u65b0\u77e5\u4e09\u8054\u4e66\u5e97 ",
-                " \u54c8\u5c14\u6ee8\u51fa\u7248\u793e ",
-                " \u5929\u6d25\u4eba\u6c11\u51fa\u7248\u793e ",
-                " \u4e2d\u56fd\u6d77\u5173\u51fa\u7248\u793e ",
-                " \u4e2d\u56fd\u9752\u5e74\u51fa\u7248\u793e "
-            ],
-            "selected": {},
-            "show": true,
-            "padding": 5,
-            "itemGap": 10,
-            "itemWidth": 25,
-            "itemHeight": 14,
-            "backgroundColor": "transparent",
-            "borderColor": "#ccc",
-            "borderRadius": 0,
-            "pageButtonItemGap": 5,
-            "pageButtonPosition": "end",
-            "pageFormatter": "{current}/{total}",
-            "pageIconColor": "#2f4554",
-            "pageIconInactiveColor": "#aaa",
-            "pageIconSize": 15,
-            "animationDurationUpdate": 800,
-            "selector": false,
-            "selectorPosition": "auto",
-            "selectorItemGap": 7,
-            "selectorButtonGap": 10
-        }
-    ],
-    "tooltip": {
-        "show": true,
-        "trigger": "item",
-        "triggerOn": "mousemove|click",
-        "axisPointer": {
-            "type": "line"
-        },
-        "showContent": true,
-        "alwaysShowContent": false,
-        "showDelay": 0,
-        "hideDelay": 100,
-        "enterable": false,
-        "confine": false,
-        "appendToBody": false,
-        "transitionDuration": 0.4,
-        "textStyle": {
-            "fontSize": 14
-        },
-        "borderWidth": 0,
-        "padding": 5,
-        "order": "seriesAsc"
-    },
-    "title": [
-        {
-            "show": true,
-            "text": "\u51fa\u7248\u5546\u5206\u5e03\u997c\u56fe",
-            "target": "blank",
-            "subtarget": "blank",
-            "left": "center",
-            "bottom": "bottom",
-            "padding": 5,
-            "itemGap": 10,
-            "textAlign": "auto",
-            "textVerticalAlign": "auto",
-            "triggerEvent": false
-        }
-    ]
-};
-        chart_4b3b56f100ab40efb04554a9bcc059a0.setOption(option_4b3b56f100ab40efb04554a9bcc059a0);
-    </script>
-<br/>                <div id="d816dcd9408a4503b6c4cd1cec4b31c0" class="chart-container" style="width:900px; height:500px; "></div>
-    <script>
-        var chart_d816dcd9408a4503b6c4cd1cec4b31c0 = echarts.init(
-            document.getElementById('d816dcd9408a4503b6c4cd1cec4b31c0'), 'white', {renderer: 'canvas'});
-        var option_d816dcd9408a4503b6c4cd1cec4b31c0 = {
-    "animation": true,
-    "animationThreshold": 2000,
-    "animationDuration": 1000,
-    "animationEasing": "cubicOut",
-    "animationDelay": 0,
-    "animationDurationUpdate": 300,
-    "animationEasingUpdate": "cubicOut",
-    "animationDelayUpdate": 0,
-    "aria": {
-        "enabled": false
-    },
-    "color": [
-        "#5470c6",
-        "#91cc75",
-        "#fac858",
-        "#ee6666",
-        "#73c0de",
-        "#3ba272",
-        "#fc8452",
-        "#9a60b4",
-        "#ea7ccc"
-    ],
-    "series": [
-        {
-            "type": "line",
-            "name": "\u4e66\u7c4d\u6570\u91cf",
-            "connectNulls": false,
-            "xAxisIndex": 0,
-            "symbol": "circle",
-            "symbolSize": 4,
-            "showSymbol": true,
-            "smooth": true,
-            "clip": true,
-            "step": false,
-            "data": [
-                [
-                    "0-50",
-                    16
-                ],
-                [
-                    "50-100",
-                    7
-                ],
-                [
-                    "100-150",
-                    0
-                ],
-                [
-                    "150-200",
-                    1
-                ],
-                [
-                    "200-250",
-                    0
-                ],
-                [
-                    "250-300",
-                    0
-                ],
-                [
-                    "300-350",
-                    0
-                ],
-                [
-                    "350-400",
-                    1
-                ],
-                [
-                    "400-450",
-                    0
-                ],
-                [
-                    "450-500",
-                    1
-                ]
-            ],
-            "hoverAnimation": true,
-            "label": {
-                "show": true,
-                "margin": 8
-            },
-            "logBase": 10,
-            "seriesLayoutBy": "column",
-            "lineStyle": {
-                "show": true,
-                "width": 1,
-                "opacity": 1,
-                "curveness": 0,
-                "type": "solid"
-            },
-            "areaStyle": {
-                "opacity": 0
-            },
-            "markPoint": {
-                "label": {
-                    "show": true,
-                    "position": "inside",
-                    "color": "#fff",
-                    "margin": 8
-                },
-                "data": [
-                    {
-                        "type": "max"
-                    }
-                ]
-            },
-            "zlevel": 0,
-            "z": 0
-        }
-    ],
-    "legend": [
-        {
-            "data": [
-                "\u4e66\u7c4d\u6570\u91cf"
-            ],
-            "selected": {},
-            "show": true,
-            "padding": 5,
-            "itemGap": 10,
-            "itemWidth": 25,
-            "itemHeight": 14,
-            "backgroundColor": "transparent",
-            "borderColor": "#ccc",
-            "borderRadius": 0,
-            "pageButtonItemGap": 5,
-            "pageButtonPosition": "end",
-            "pageFormatter": "{current}/{total}",
-            "pageIconColor": "#2f4554",
-            "pageIconInactiveColor": "#aaa",
-            "pageIconSize": 15,
-            "animationDurationUpdate": 800,
-            "selector": false,
-            "selectorPosition": "auto",
-            "selectorItemGap": 7,
-            "selectorButtonGap": 10
-        }
-    ],
-    "tooltip": {
-        "show": true,
-        "trigger": "item",
-        "triggerOn": "mousemove|click",
-        "axisPointer": {
-            "type": "line"
-        },
-        "showContent": true,
-        "alwaysShowContent": false,
-        "showDelay": 0,
-        "hideDelay": 100,
-        "enterable": false,
-        "confine": false,
-        "appendToBody": false,
-        "transitionDuration": 0.4,
-        "textStyle": {
-            "fontSize": 14
-        },
-        "borderWidth": 0,
-        "padding": 5,
-        "order": "seriesAsc"
-    },
-    "xAxis": [
-        {
-            "name": "\u4ef7\u683c\u533a\u95f4",
-            "show": true,
-            "scale": false,
-            "nameLocation": "end",
-            "nameGap": 15,
-            "gridIndex": 0,
-            "inverse": false,
-            "offset": 0,
-            "splitNumber": 5,
-            "minInterval": 0,
-            "splitLine": {
-                "show": true,
-                "lineStyle": {
-                    "show": true,
-                    "width": 1,
-                    "opacity": 1,
-                    "curveness": 0,
-                    "type": "solid"
-                }
-            },
-            "data": [
-                "0-50",
-                "50-100",
-                "100-150",
-                "150-200",
-                "200-250",
-                "250-300",
-                "300-350",
-                "350-400",
-                "400-450",
-                "450-500"
-            ]
-        }
-    ],
-    "yAxis": [
-        {
-            "name": "\u4e66\u7c4d\u6570\u91cf",
-            "show": true,
-            "scale": false,
-            "nameLocation": "end",
-            "nameGap": 15,
-            "gridIndex": 0,
-            "inverse": false,
-            "offset": 0,
-            "splitNumber": 5,
-            "minInterval": 0,
-            "splitLine": {
-                "show": true,
-                "lineStyle": {
-                    "show": true,
-                    "width": 1,
-                    "opacity": 1,
-                    "curveness": 0,
-                    "type": "solid"
-                }
-            }
-        }
-    ],
-    "title": [
-        {
-            "show": true,
-            "text": "\u4ef7\u683c\u533a\u95f4\u4e0e\u4e66\u7c4d\u6570\u91cf\u6298\u7ebf\u56fe",
-            "target": "blank",
-            "subtarget": "blank",
-            "left": "center",
-            "bottom": "bottom",
-            "padding": 5,
-            "itemGap": 10,
-            "textAlign": "auto",
-            "textVerticalAlign": "auto",
-            "triggerEvent": false
-        }
-    ],
-    "dataZoom": {
-        "show": true,
-        "type": "slider",
-        "showDetail": true,
-        "showDataShadow": true,
-        "realtime": true,
-        "start": 0,
-        "end": 100,
-        "orient": "horizontal",
-        "zoomLock": false,
-        "filterMode": "filter"
-    }
-};
-        chart_d816dcd9408a4503b6c4cd1cec4b31c0.setOption(option_d816dcd9408a4503b6c4cd1cec4b31c0);
-    </script>
-<br/>    </div>
-    <script>
-    </script>
-</body>
-</html>
diff --git a/book_data.xlsx b/book_data.xlsx
index d16019b..3a6e0cf 100644
Binary files a/book_data.xlsx and b/book_data.xlsx differ
diff --git a/main.py b/main.py
index ae37bf5..6ea0278 100644
--- a/main.py
+++ b/main.py
@@ -93,10 +93,10 @@ class DoubanBookTop250Crawler:
         df = pd.DataFrame(self.book_list)
         df.to_csv(csv_name, encoding='utf_8_sig', index=False)
 
-    def crawl_douban_top250(self):
+    def crawl_douban_top250(self,page):
         headers = {
             'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.106 Safari/537.36'}
-        for i in range(1):
+        for i in range(page):
             page_url = 'https://book.douban.com/top250?start={}'.format(str(i * 25))
             print('开始爬取第{}页，地址是:{}'.format(str(i + 1), page_url))
             self.get_book_info(page_url, headers)
@@ -104,57 +104,59 @@ class DoubanBookTop250Crawler:
         self.save_to_csv(csv_name="BookDouban250.csv")
 
 # 实例化爬虫对象，并调用方法执行爬取和保存数据
-crawler = DoubanBookTop250Crawler()
-crawler.crawl_douban_top250()
-book_list = crawler.book_list
-book_list_data = crawler.book_list_data
-dataexcel={"书名":[],"豆瓣链接":[],"作者":[],"译者":[],"出版社":[],"出版日期":[],"价格":[],"评分":[],"评分人数":[],"一句话评价":[]}
-for book in book_list:
-    book['评分人数']= book['评分人数'].replace('\n', '').strip()
-    book['评分人数'] = book['评分人数'].replace(' ', '').replace("(","").replace(")","").strip()
-    dataexcel['书名'].append(book['书名'])
-    dataexcel['豆瓣链接'].append(book['豆瓣链接'])
-    dataexcel['作者'].append(book['作者'])
-    dataexcel['译者'].append(book['译者'])
-    dataexcel['出版社'].append(book['出版社'])
-    dataexcel['出版日期'].append(book['出版日期'])
-    dataexcel['价格'].append(book['价格'])
-    dataexcel['评分'].append(book['评分'])
-    dataexcel['评分人数'].append(book['评分人数'])
-    dataexcel['一句话评价'].append(book['一句话评价'])
-book_list_data_two_price=[]
-for book in book_list_data:
-    book.star_people=book.star_people.replace('\n','').strip()
-    book.star_people=book.star_people.replace(' ','').replace("(","").replace(")","").strip()
-    book.star_people=''.join(filter(str.isdigit, book.star_people))
-    book.price=book.price.replace('元','').strip()
-    if book.price.find('/')!=-1:
-        copy_price=book.price.split('/')[1]
-        book.price=book.price.split('/')[0]
-        match = re.search(r'\d+\.\d{2}', copy_price)
+def main(page):
+    crawler = DoubanBookTop250Crawler()
+    crawler.crawl_douban_top250(page)
+    book_list = crawler.book_list
+    book_list_data = crawler.book_list_data
+    dataexcel = {"书名": [], "豆瓣链接": [], "作者": [], "译者": [], "出版社": [], "出版日期": [], "价格": [],
+                 "评分": [], "评分人数": [], "一句话评价": []}
+    for book in book_list:
+        book['评分人数'] = book['评分人数'].replace('\n', '').strip()
+        book['评分人数'] = book['评分人数'].replace(' ', '').replace("(", "").replace(")", "").strip()
+        dataexcel['书名'].append(book['书名'])
+        dataexcel['豆瓣链接'].append(book['豆瓣链接'])
+        dataexcel['作者'].append(book['作者'])
+        dataexcel['译者'].append(book['译者'])
+        dataexcel['出版社'].append(book['出版社'])
+        dataexcel['出版日期'].append(book['出版日期'])
+        dataexcel['价格'].append(book['价格'])
+        dataexcel['评分'].append(book['评分'])
+        dataexcel['评分人数'].append(book['评分人数'])
+        dataexcel['一句话评价'].append(book['一句话评价'])
+    book_list_data_two_price = []
+    for book in book_list_data:
+        book.star_people = book.star_people.replace('\n', '').strip()
+        book.star_people = book.star_people.replace(' ', '').replace("(", "").replace(")", "").strip()
+        book.star_people = ''.join(filter(str.isdigit, book.star_people))
+        book.price = book.price.replace('元', '').strip()
+        if book.price.find('/') != -1:
+            copy_price = book.price.split('/')[1]
+            book.price = book.price.split('/')[0]
+            match = re.search(r'\d+\.\d{2}', copy_price)
+            if match:
+                copy_price = match.group()
+            copy_book = copy.deepcopy(book)
+            copy_book.price = copy_price
+            book_list_data_two_price.append(copy_book)
+        match = re.search(r'\d+\.\d{2}', book.price)
         if match:
-            copy_price = match.group()
-        copy_book = copy.deepcopy(book)
-        copy_book.price = copy_price
-        book_list_data_two_price.append(copy_book)
-    match=re.search(r'\d+\.\d{2}',book.price)
-    if match:
-        book.price = match.group()
-book_list_data=book_list_data+book_list_data_two_price
-
-
-print(crawler.book_list)
-# 将 book_list 转换为 DataFrame
-df = pd.DataFrame(dataexcel)
-# 将 DataFrame 写入到 Excel 文件
-file_name = 'book_data.xlsx'
-df.to_excel(file_name, index=False)
-print(f"书籍数据已写入到 {file_name}")
-
-# 使用BookDatabase类
-db = sql.BookDatabase(host='localhost', user='root', password='123456', database='xiaosuo', table_name='books')
-db.initialize_table()
-db.insert_books(book_list_data)
+            book.price = match.group()
+    book_list_data = book_list_data + book_list_data_two_price
+
+    print(crawler.book_list)
+    # 将 book_list 转换为 DataFrame
+    df = pd.DataFrame(dataexcel)
+    # 将 DataFrame 写入到 Excel 文件
+    file_name = 'book_data.xlsx'
+    df.to_excel(file_name, index=False)
+    print(f"书籍数据已写入到 {file_name}")
+
+    # 使用BookDatabase类
+    db = sql.BookDatabase(host='localhost', user='root', password='123456', database='xiaosuo', table_name='books')
+    db.initialize_table()
+    db.insert_books(book_list_data)
+
 
 
 
diff --git a/sql.py b/sql.py
index 41b4a7d..d3dc198 100644
--- a/sql.py
+++ b/sql.py
@@ -69,12 +69,13 @@ class BookDatabase:
 
         self.connection.commit()
         self.close()
-    def login(self,username,password):
+    def login(self,username):
         with self.connection.cursor() as cursor:
-            user_list = cursor.execute(f"SELECT * FROM {self.table_name} WHERE username='{username}' AND password='{password}'")
+            cursor.execute(f"SELECT * FROM {self.table_name} WHERE username='{username}'")
+            user_list=cursor.fetchall()
             print(user_list)
-            if user_list >0:
-                return True
+            if len(user_list) >0:
+                return user_list[0]
             else:
                 return False
         self.connection.commit()
diff --git a/visualization.py b/visualization.py
index 2b7988b..ffede94 100644
--- a/visualization.py
+++ b/visualization.py
@@ -3,6 +3,8 @@ import sql
 from tkinter import messagebox
 from tkinter import ttk
 import webbrowser
+import main
+import GUI
 db = sql.BookDatabase(host='localhost', user='root', password='123456', database='xiaosuo', table_name='user')
 db.initialize_table()
 
@@ -11,88 +13,110 @@ db_data.initialize_table()
 
 book_collection=[]
 search=""
-
+Crawling=""
 
 def on_login_button_click():
     username = username_entry.get()
     password = password_entry.get()
-    if db.login(username, password):
-        print("登录成功！")
-        app.destroy()
-        # # 运行新窗口
-        show = tk.Tk()
-        show.title("数据显示页面")
-        show.geometry("600x400+200+100")
-
-        # 创建搜索框
-        # search_label = tk.Label(show, text="搜索：", pady=10)
-        # search_label.pack()
-        def serch_book():
-            search = search_entry.get()
-            book_collection = db_data.get_book_list(search)
-            # 清空当前 Treeview
-            tree.delete(*tree.get_children())
+    if username.strip() =="" or password.strip() == "":
+        messagebox.showinfo("登录失败", "用户名或密码不能为空")
+        return
+    user=db.login(username)
+    if user:
+        if password == user["password"]:
+            app.destroy()
+            # # 运行新窗口
+            show = tk.Tk()
+            show.title("数据显示页面")
+            show.geometry("600x400+200+100")
+            def serch_book(n):
+                print("我是一个测试")
+                if n == "搜索":
+                    search = search_entry.get()
+                else:
+                    search = ""
+                book_collection = db_data.get_book_list(search)
+                print(book_collection)
+                # 清空当前 Treeview
+                tree.delete(*tree.get_children())
+                book_id = 1
+                for book in book_collection:
+                    tree.insert("", "end", text=book_id, values=(
+                        book["name"], book["url"], book["star"], book["star_people"], book["author"],
+                        book["translater"],
+                        book["publisher"], book["pub_year"], book["price"], book["comment"]))
+                    book_id = book_id + 1
+                tree.update()
+
+            def Crawling_book():
+                Crawling = Crawling_entry.get()
+                main.main(int(Crawling))
+
+            def analysis_book():
+                GUI.show()
+            def on_tree_double_click(event):
+                item = tree.selection()[0]  # 获取双击的行
+                url = tree.item(item, "values")[1]  # 假设 URL 地址在第二列，根据实际需要调整
+                webbrowser.open(url)  # 打开 URL 地址
+            # 创建一个Frame来放置顶部的按钮和输入框
+            top_frame = tk.Frame(show)
+            top_frame.pack(side=tk.TOP)
+            search_button = tk.Button(top_frame, text="搜索", command=lambda: serch_book("搜索"), width=8, font=15)
+            search_button.pack(side=tk.LEFT)
+            search_entry = tk.Entry(top_frame, width=15)
+            search_entry.pack(side=tk.LEFT)
+            Crawling_button = tk.Button(top_frame, text="爬取", command=Crawling_book, width=8, font=15)
+            Crawling_button.pack(side=tk.LEFT)
+            Crawling_entry = tk.Entry(top_frame, width=15)
+            Crawling_entry.pack(side=tk.LEFT)
+            Refresh_button = tk.Button(top_frame, text="刷新", command=lambda: serch_book("刷新"), width=8, font=15)
+            Refresh_button.pack(side=tk.RIGHT)
+            analysis_button = tk.Button(top_frame, text="分析", command=analysis_book, width=8, font=15)
+            analysis_button.pack(side=tk.RIGHT)
+            # 显示书籍集合数据
+            book_collection = db_data.get_book_list()
+            tree = ttk.Treeview(show, columns=(
+            "name", "url", "star", "star_people", "author", "translater", "publisher", "pub_year", "price", "comment"))
+            tree.heading("#0", text="序号")
+            tree.heading("name", text="书名")
+            tree.heading("url", text="链接地址")
+            tree.heading("star", text="评分")
+            tree.heading("star_people", text="评分人数")
+            tree.heading("author", text="作者")
+            tree.heading("translater", text="译者")
+            tree.heading("publisher", text="出版社")
+            tree.heading("pub_year", text="出版年份")
+            tree.heading("price", text="价格")
+            tree.heading("comment", text="评论")
+            tree.column("#0", width=10)  # 序号列
+            tree.column("name", width=30)  # 书名列
+            tree.column("url", width=30)  # 链接地址列
+            tree.column("author", width=20)  # 作者列
+            tree.column("publisher", width=30)  # 出版社列
+            tree.column("pub_year", width=30)
+            tree.column("price", width=5)  # 价格列
+            tree.column("comment", width=30)
+            tree.column("star", width=30)  # 评分列
+            tree.column("star_people", width=30)  # 评分人数列
+            tree.column("translater", width=20)
             book_id = 1
             for book in book_collection:
                 tree.insert("", "end", text=book_id, values=(
                 book["name"], book["url"], book["star"], book["star_people"], book["author"], book["translater"],
                 book["publisher"], book["pub_year"], book["price"], book["comment"]))
                 book_id = book_id + 1
-
-        def on_tree_double_click(event):
-            item = tree.selection()[0]  # 获取双击的行
-            url = tree.item(item, "values")[1]  # 假设 URL 地址在第二列，根据实际需要调整
-            webbrowser.open(url)  # 打开 URL 地址
-
-        search_button = tk.Button(show, text="搜索", command=serch_book, width=30, font=15)
-        search_button.pack()
-        search_entry = tk.Entry(show, width=30)
-        search_entry.pack()
-
-        # 显示书籍集合数据
-        book_collection = db_data.get_book_list()
-        tree = ttk.Treeview(show, columns=("name", "url", "star", "star_people","author", "translater","publisher","pub_year","price","comment"))
-        tree.heading("#0", text="序号")
-        tree.heading("name", text="书名")
-        tree.heading("url", text="链接地址")
-        tree.heading("star", text="评分")
-        tree.heading("star_people", text="评分人数")
-        tree.heading("author", text="作者")
-        tree.heading("translater", text="译者")
-        tree.heading("publisher", text="出版社")
-        tree.heading("pub_year", text="出版年份")
-        tree.heading("price", text="价格")
-        tree.heading("comment", text="评论")
-
-        tree.column("#0", width=10)  # 序号列
-        tree.column("name", width=30)  # 书名列
-        tree.column("url", width=30)  # 链接地址列
-        tree.column("author", width=20)  # 作者列
-        tree.column("publisher", width=30)  # 出版社列
-        tree.column("pub_year", width=30)
-        tree.column("price", width=5)  # 价格列
-        tree.column("comment", width=30)
-        tree.column("star", width=30)  # 评分列
-        tree.column("star_people", width=30)  # 评分人数列
-        tree.column("translater", width=20)
-
-        book_id=1
-        for book in book_collection:
-            tree.insert("", "end", text=book_id, values=(book["name"], book["url"], book["star"], book["star_people"], book["author"], book["translater"], book["publisher"], book["pub_year"], book["price"], book["comment"]))
-            book_id=book_id+1
-
-        # 绑定双击事件
-        tree.bind("<Double-1>", on_tree_double_click)
-
-        # #布局管理器
-        #tree.grid(row=1, column=0, columnspan=2)
-        # 使用水平滚动条
-        tree.pack(fill="x")
-
-        # 运行应用程序
-        show.mainloop()
+            # 绑定双击事件
+            tree.bind("<Double-1>", on_tree_double_click)
+            # #布局管理器
+            # tree.grid(row=1, column=0, columnspan=2)
+            # 使用水平滚动条
+            tree.pack(fill="x")
+            # 运行应用程序
+            show.mainloop()
+        else:
+            messagebox.showinfo("登录失败", "密码错误")
     else:
-        messagebox.showinfo("登录失败", "用户名或密码错误")
+        messagebox.showinfo("登录失败", "{}用户不存在".format(username))
 
 # 创建 Tkinter 应用程序
 app = tk.Tk()