conflict

7f063300 · yanpeng · 74dcf96d · d39785ae · 7f063300 · 7f063300
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
--- a/public/testData/news-1.png
+++ b/public/testData/news-1.png
--- a/public/testData/organizationNews-image1.png
+++ b/public/testData/organizationNews-image1.png
--- a/public/testData/united_states 1.png
+++ b/public/testData/united_states 1.png
--- a/public/testData/united_states 2.png
+++ b/public/testData/united_states 2.png
--- a/public/testData/united_states 3.png
+++ b/public/testData/united_states 3.png
--- a/src/App.vue
+++ b/src/App.vue
--- a/src/api/bill.js
+++ b/src/api/bill.js
--- a/src/api/chat.js
+++ b/src/api/chat.js
--- a/src/api/chatRequest.js
+++ b/src/api/chatRequest.js
--- a/src/api/deepdig.js
+++ b/src/api/deepdig.js
--- a/src/api/home.js
+++ b/src/api/home.js
--- a/src/api/influence.js
+++ b/src/api/influence.js
--- a/src/api/request.js
+++ b/src/api/request.js
--- a/src/assets/icons/ai-icon.png
+++ b/src/assets/icons/ai-icon.png
--- a/src/assets/icons/aiBox/ai-bg.png
+++ b/src/assets/icons/aiBox/ai-bg.png
--- a/src/assets/icons/aiBox/ai-logo.png
+++ b/src/assets/icons/aiBox/ai-logo.png
--- a/src/assets/icons/aiBox/close.png
+++ b/src/assets/icons/aiBox/close.png
--- a/src/assets/icons/aiBox/copy.png
+++ b/src/assets/icons/aiBox/copy.png
--- a/src/assets/icons/aiBox/idea.png
+++ b/src/assets/icons/aiBox/idea.png
--- a/src/assets/icons/aiBox/point.png
+++ b/src/assets/icons/aiBox/point.png
--- a/src/assets/icons/aiBox/reanswer.png
+++ b/src/assets/icons/aiBox/reanswer.png
--- a/src/assets/icons/aiBox/star.png
+++ b/src/assets/icons/aiBox/star.png
--- a/src/assets/icons/aiBox/submit.png
+++ b/src/assets/icons/aiBox/submit.png
--- a/src/assets/icons/box-footer-left-icon.png
+++ b/src/assets/icons/box-footer-left-icon.png
--- a/src/assets/icons/box-footer-right-icon.png
+++ b/src/assets/icons/box-footer-right-icon.png
--- a/src/assets/icons/box-header-icon1.png
+++ b/src/assets/icons/box-header-icon1.png
--- a/src/assets/icons/box-header-icon2.png
+++ b/src/assets/icons/box-header-icon2.png
--- a/src/assets/icons/box-header-icon3.png
+++ b/src/assets/icons/box-header-icon3.png
--- a/src/assets/icons/header-avator.png
+++ b/src/assets/icons/header-avator.png
--- a/src/assets/icons/header-icon.png
+++ b/src/assets/icons/header-icon.png
--- a/src/assets/icons/header-logo.png
+++ b/src/assets/icons/header-logo.png
--- a/src/assets/images/bg/characterDynamics-bg.png
+++ b/src/assets/images/bg/characterDynamics-bg.png
--- a/src/assets/images/bg/header-bg.png
+++ b/src/assets/images/bg/header-bg.png
--- a/src/assets/images/bg/time-line.png
+++ b/src/assets/images/bg/time-line.png
--- a/src/assets/images/bg/概览页模块标题.png
+++ b/src/assets/images/bg/概览页模块标题.png
--- a/src/assets/images/bg/概览页模块标题2.png
+++ b/src/assets/images/bg/概览页模块标题2.png
--- a/src/assets/images/bg/概览页模块标题3.png
+++ b/src/assets/images/bg/概览页模块标题3.png
--- a/src/assets/images/icon/card-btn-left.png
+++ b/src/assets/images/icon/card-btn-left.png
--- a/src/assets/images/icon/card-btn-right.png
+++ b/src/assets/images/icon/card-btn-right.png
--- a/src/assets/images/icon/news-card-header-icon.png
+++ b/src/assets/images/icon/news-card-header-icon.png
--- a/src/assets/images/icon/overview-card-header-icon.png
+++ b/src/assets/images/icon/overview-card-header-icon.png
--- a/src/assets/images/icon/people-card-header-icon.png
+++ b/src/assets/images/icon/people-card-header-icon.png
--- a/src/assets/images/icon/thematic-card-header-time.png
+++ b/src/assets/images/icon/thematic-card-header-time.png
--- a/src/assets/images/icon/tips.png
+++ b/src/assets/images/icon/tips.png
--- a/src/assets/images/icon/waring-card-header-icon.png
+++ b/src/assets/images/icon/waring-card-header-icon.png
--- a/src/assets/images/testData/organizationNews-image1.png
+++ b/src/assets/images/testData/organizationNews-image1.png
--- a/src/components/AiBox.vue
+++ b/src/components/AiBox.vue
--- a/src/components/boxHeader.vue
+++ b/src/components/boxHeader.vue
--- a/src/hooks/useMarkdownStream.js
+++ b/src/hooks/useMarkdownStream.js
--- a/src/hooks/useScrollShow.js
+++ b/src/hooks/useScrollShow.js
--- a/src/router/index.js
+++ b/src/router/index.js
--- a/src/utils/setChart.js
+++ b/src/utils/setChart.js
--- a/src/views/bill/billHome/assets/images/box7-header-icon.png
+++ b/src/views/bill/billHome/assets/images/box7-header-icon.png
--- a/src/views/bill/billHome/assets/images/box8-icon1.png
+++ b/src/views/bill/billHome/assets/images/box8-icon1.png
--- a/src/views/bill/billHome/assets/images/box8-icon2.png
+++ b/src/views/bill/billHome/assets/images/box8-icon2.png
--- a/src/views/bill/billHome/assets/images/box8-icon3.png
+++ b/src/views/bill/billHome/assets/images/box8-icon3.png
--- a/src/views/bill/billHome/assets/images/box8-icon4.png
+++ b/src/views/bill/billHome/assets/images/box8-icon4.png
--- a/src/views/bill/billHome/assets/images/box8-icon5.png
+++ b/src/views/bill/billHome/assets/images/box8-icon5.png
--- a/src/views/bill/billHome/assets/images/tips-icon.png
+++ b/src/views/bill/billHome/assets/images/tips-icon.png
--- a/src/views/bill/billHome/index.vue
+++ b/src/views/bill/billHome/index.vue
--- a/src/views/bill/billHome/utils/doublePieChart.js
+++ b/src/views/bill/billHome/utils/doublePieChart.js
--- a/src/views/bill/billHome/utils/multiLineChart.js
+++ b/src/views/bill/billHome/utils/multiLineChart.js
--- a/src/views/bill/billHome/utils/piechart.js
+++ b/src/views/bill/billHome/utils/piechart.js
--- a/src/views/bill/deepDig/index.vue
+++ b/src/views/bill/deepDig/index.vue
--- a/src/views/bill/deepDig/poliContribution/assets/images/1.png
+++ b/src/views/bill/deepDig/poliContribution/assets/images/1.png
--- a/src/views/bill/deepDig/poliContribution/assets/images/10.png
+++ b/src/views/bill/deepDig/poliContribution/assets/images/10.png
--- a/src/views/bill/deepDig/poliContribution/assets/images/2.png
+++ b/src/views/bill/deepDig/poliContribution/assets/images/2.png
--- a/src/views/bill/deepDig/poliContribution/assets/images/3.png
+++ b/src/views/bill/deepDig/poliContribution/assets/images/3.png
--- a/src/views/bill/deepDig/poliContribution/assets/images/4.png
+++ b/src/views/bill/deepDig/poliContribution/assets/images/4.png
--- a/src/views/bill/deepDig/poliContribution/assets/images/5.png
+++ b/src/views/bill/deepDig/poliContribution/assets/images/5.png
--- a/src/views/bill/deepDig/poliContribution/assets/images/6.png
+++ b/src/views/bill/deepDig/poliContribution/assets/images/6.png
--- a/src/views/bill/deepDig/poliContribution/assets/images/7.png
+++ b/src/views/bill/deepDig/poliContribution/assets/images/7.png
--- a/src/views/bill/deepDig/poliContribution/assets/images/8.png
+++ b/src/views/bill/deepDig/poliContribution/assets/images/8.png
--- a/src/views/bill/deepDig/poliContribution/assets/images/9.png
+++ b/src/views/bill/deepDig/poliContribution/assets/images/9.png
--- a/src/views/bill/deepDig/poliContribution/index.vue
+++ b/src/views/bill/deepDig/poliContribution/index.vue
--- a/src/views/bill/deepDig/poliContribution/utils/piechart.js
+++ b/src/views/bill/deepDig/poliContribution/utils/piechart.js
--- a/src/views/bill/deepDig/poliContribution/utils/sankey.js
+++ b/src/views/bill/deepDig/poliContribution/utils/sankey.js
--- a/src/views/bill/deepDig/progressAnalysis/index.vue
+++ b/src/views/bill/deepDig/progressAnalysis/index.vue
--- a/src/views/decree/decreeHome/assets/images/message-icon1.png
+++ b/src/views/decree/decreeHome/assets/images/message-icon1.png
--- a/src/views/decree/decreeHome/assets/images/message-icon2.png
+++ b/src/views/decree/decreeHome/assets/images/message-icon2.png
--- a/src/views/decree/decreeHome/assets/images/message-icon3.png
+++ b/src/views/decree/decreeHome/assets/images/message-icon3.png
--- a/src/views/decree/decreeHome/assets/images/news1.png
+++ b/src/views/decree/decreeHome/assets/images/news1.png
--- a/src/views/decree/decreeHome/assets/images/news2.png
+++ b/src/views/decree/decreeHome/assets/images/news2.png
--- a/src/views/decree/decreeHome/assets/images/news3.png
+++ b/src/views/decree/decreeHome/assets/images/news3.png
--- a/src/views/decree/decreeHome/assets/images/news4.png
+++ b/src/views/decree/decreeHome/assets/images/news4.png
--- a/src/views/decree/decreeHome/assets/images/news5.png
+++ b/src/views/decree/decreeHome/assets/images/news5.png
--- a/src/views/decree/decreeHome/index.vue
+++ b/src/views/decree/decreeHome/index.vue
--- a/src/views/decree/decreeLayout/assets/icons/header-right-icon1.png
+++ b/src/views/decree/decreeLayout/assets/icons/header-right-icon1.png
--- a/src/views/decree/decreeLayout/assets/icons/header-right-icon2.png
+++ b/src/views/decree/decreeLayout/assets/icons/header-right-icon2.png
--- a/src/views/decree/decreeLayout/deepdig/index.vue
+++ b/src/views/decree/decreeLayout/deepdig/index.vue
--- a/src/views/decree/decreeLayout/overview/assets/icons/header-right-icon1.png
+++ b/src/views/decree/decreeLayout/overview/assets/icons/header-right-icon1.png
--- a/src/views/decree/decreeLayout/overview/assets/icons/header-right-icon2.png
+++ b/src/views/decree/decreeLayout/overview/assets/icons/header-right-icon2.png
--- a/src/views/decree/decreeLayout/overview/background/index.vue
+++ b/src/views/decree/decreeLayout/overview/background/index.vue
--- a/src/views/decree/decreeLayout/overview/introduction/assets/images/box3-img.png
+++ b/src/views/decree/decreeLayout/overview/introduction/assets/images/box3-img.png
--- a/src/views/decree/decreeLayout/overview/introduction/index.vue
+++ b/src/views/decree/decreeLayout/overview/introduction/index.vue
--- a/src/views/marketAccessRestrictions/marketAccessHome/index.vue
+++ b/src/views/marketAccessRestrictions/marketAccessHome/index.vue
--- a/src/views/overView/component/ResourceSupport.vue
+++ b/src/views/overView/component/ResourceSupport.vue
--- a/src/views/overView/component/Thematicanalysis.vue
+++ b/src/views/overView/component/Thematicanalysis.vue
--- a/src/views/overView/component/strengthComparison.vue
+++ b/src/views/overView/component/strengthComparison.vue
--- a/src/views/overView/index.vue
+++ b/src/views/overView/index.vue
--- a/src/views/overView/js/barChart.js
+++ b/src/views/overView/js/barChart.js
--- a/src/views/overView/js/barChart2.js
+++ b/src/views/overView/js/barChart2.js
--- a/src/views/overView/js/multiLineChart1.js
+++ b/src/views/overView/js/multiLineChart1.js
--- a/src/views/overView/js/radarChart.js
+++ b/src/views/overView/js/radarChart.js
--- a/src/views/overView/js/radarChart2.js
+++ b/src/views/overView/js/radarChart2.js
--- a/src/views/overView/js/radarChart3.js
+++ b/src/views/overView/js/radarChart3.js
--- a/src/views/portals/assets/img/book.png
+++ b/src/views/portals/assets/img/book.png
--- a/src/views/portals/assets/img/cardBg.png
+++ b/src/views/portals/assets/img/cardBg.png
--- a/src/views/portals/assets/img/cardIcon1.png
+++ b/src/views/portals/assets/img/cardIcon1.png
--- a/src/views/portals/assets/img/cardIcon2.png
+++ b/src/views/portals/assets/img/cardIcon2.png
--- a/src/views/portals/assets/img/cardIcon3.png
+++ b/src/views/portals/assets/img/cardIcon3.png
--- a/src/views/portals/assets/img/cardIcon4.png
+++ b/src/views/portals/assets/img/cardIcon4.png
--- a/src/views/portals/assets/img/flag1.png
+++ b/src/views/portals/assets/img/flag1.png
--- a/src/views/portals/assets/img/flag2.png
+++ b/src/views/portals/assets/img/flag2.png
--- a/src/views/portals/assets/img/flag3.png
+++ b/src/views/portals/assets/img/flag3.png
--- a/src/views/portals/assets/img/icon1.png
+++ b/src/views/portals/assets/img/icon1.png
--- a/src/views/portals/assets/img/icon2.png
+++ b/src/views/portals/assets/img/icon2.png
--- a/src/views/portals/assets/img/icon3.png
+++ b/src/views/portals/assets/img/icon3.png
--- a/src/views/portals/assets/img/icon4.png
+++ b/src/views/portals/assets/img/icon4.png
--- a/src/views/portals/assets/img/icon5.png
+++ b/src/views/portals/assets/img/icon5.png
--- a/src/views/portals/assets/img/shuaxin.png
+++ b/src/views/portals/assets/img/shuaxin.png
--- a/src/views/portals/components/CardCustom.vue
+++ b/src/views/portals/components/CardCustom.vue
--- a/src/views/portals/components/PieProgress.vue
+++ b/src/views/portals/components/PieProgress.vue
--- a/src/views/portals/portal1/index.vue
+++ b/src/views/portals/portal1/index.vue
--- a/src/views/portals/portal2/index.vue
+++ b/src/views/portals/portal2/index.vue
--- a/src/views/portals/utils/charts.js
+++ b/src/views/portals/utils/charts.js
--- a/src/views/writtingAsstaint/assets/images/active-icon.png
+++ b/src/views/writtingAsstaint/assets/images/active-icon.png
--- a/src/views/writtingAsstaint/assets/images/ai.png
+++ b/src/views/writtingAsstaint/assets/images/ai.png
--- a/src/views/writtingAsstaint/assets/images/export-icon.png
+++ b/src/views/writtingAsstaint/assets/images/export-icon.png
--- a/src/views/writtingAsstaint/assets/images/preview-icon.png
+++ b/src/views/writtingAsstaint/assets/images/preview-icon.png
--- a/src/views/writtingAsstaint/assets/images/save-icon.png
+++ b/src/views/writtingAsstaint/assets/images/save-icon.png
--- a/src/views/writtingAsstaint/assets/images/selected-icon.png
+++ b/src/views/writtingAsstaint/assets/images/selected-icon.png
--- a/src/views/writtingAsstaint/assets/images/template-icon.png
+++ b/src/views/writtingAsstaint/assets/images/template-icon.png
--- a/src/views/writtingAsstaint/assets/images/tips-icon.png
+++ b/src/views/writtingAsstaint/assets/images/tips-icon.png
--- a/src/views/writtingAsstaint/index.vue
+++ b/src/views/writtingAsstaint/index.vue
--- a/vite.config.js
+++ b/vite.config.js