diff --git a/src/api/statistics/statistics.js b/src/api/statistics/statistics.js
index 6257ac2..1c16fe6 100644
--- a/src/api/statistics/statistics.js
+++ b/src/api/statistics/statistics.js
@@ -76,11 +76,59 @@ export function SaveStatisticsTemplate(data) {
})
}
+// 分页查询年度报表
+export function FetchPageReports(params) {
+ return request({
+ url: 'api/archives-report/pageReports' + '?' + qs.stringify(params, { indices: false }),
+ method: 'get'
+ })
+}
+
+// 编辑年度报表
+export function FetchSaveArchivesReport(data) {
+ return request({
+ url: 'api/archives-report/saveArchivesReport',
+ method: 'post',
+ data
+ })
+}
+
+// 查询年度报表详情
+export function FetchFindArchivesReportById(params) {
+ return request({
+ url: 'api/archives-report/findArchivesReportById',
+ method: 'post',
+ params
+ })
+}
+
+// 年度统计模板
+export function FetchAnnualStatisticalTemplateAll(params) {
+ return request({
+ url: 'api/archives-report/getAnnualStatisticalTemplateAll' + '?' + qs.stringify(params, { indices: false }),
+ method: 'get'
+ })
+}
+
+// 删除年度报表
+export function FetchDeleteArchivesReport(data) {
+ return request({
+ url: 'api/archives-report/deleteArchivesReport',
+ method: 'post',
+ data
+ })
+}
+
export default {
FetchTotalStatistics,
FetchArchivedAllYear,
FetchRoomCollectionStatistics,
FetchBorrowdStatistics,
FetchBorrowdCountStatisticsList,
- FetchBorrowdRegisterStatisticsList
+ FetchBorrowdRegisterStatisticsList,
+ FetchPageReports,
+ FetchSaveArchivesReport,
+ FetchFindArchivesReportById,
+ FetchAnnualStatisticalTemplateAll,
+ FetchDeleteArchivesReport
}
diff --git a/src/assets/iconfonts/light/iconfont.css b/src/assets/iconfonts/light/iconfont.css
index 340ba4b..a41a328 100644
--- a/src/assets/iconfonts/light/iconfont.css
+++ b/src/assets/iconfonts/light/iconfont.css
@@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 3966148 */
- src: url('iconfont.woff2?t=1763358168922') format('woff2'),
- url('iconfont.woff?t=1763358168922') format('woff'),
- url('iconfont.ttf?t=1763358168922') format('truetype');
+ src: url('iconfont.woff2?t=1791438838309') format('woff2'),
+ url('iconfont.woff?t=1791438838309') format('woff'),
+ url('iconfont.ttf?t=1791438838309') format('truetype');
}
.iconfont {
@@ -13,6 +13,78 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-shanchu-:before {
+ content: "\e6aa";
+}
+
+.icon-huifu1:before {
+ content: "\e6ab";
+}
+
+.icon-tjg:before {
+ content: "\e6ac";
+}
+
+.icon-gb:before {
+ content: "\e6ad";
+}
+
+.icon-Group:before {
+ content: "\e6ae";
+}
+
+.icon-xiajia:before {
+ content: "\e7aa";
+}
+
+.icon-cangku:before {
+ content: "\e927";
+}
+
+.icon-baojingjilu:before {
+ content: "\e6a8";
+}
+
+.icon-yitiji:before {
+ content: "\e6a2";
+}
+
+.icon-kufangguanli:before {
+ content: "\e6a3";
+}
+
+.icon-renlianshibiejiqi:before {
+ content: "\e759";
+}
+
+.icon-wangluoshexiangtou:before {
+ content: "\e754";
+}
+
+.icon-Dkufang:before {
+ content: "\e6a4";
+}
+
+.icon-rfidduxieqi:before {
+ content: "\e879";
+}
+
+.icon-shouchipandianyi:before {
+ content: "\e6a5";
+}
+
+.icon-zhinengyitiji:before {
+ content: "\e6a6";
+}
+
+.icon-a-3D-xidingtanceqi:before {
+ content: "\e6b7";
+}
+
+.icon-saomiao:before {
+ content: "\e6a7";
+}
+
.icon-mimachakan:before {
content: "\e6a1";
}
diff --git a/src/assets/iconfonts/light/iconfont.js b/src/assets/iconfonts/light/iconfont.js
index 02e0d03..048339c 100644
--- a/src/assets/iconfonts/light/iconfont.js
+++ b/src/assets/iconfonts/light/iconfont.js
@@ -1 +1 @@
-window._iconfont_svg_string_3966148='',(l=>{var c=(a=(a=document.getElementsByTagName("script"))[a.length-1]).getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,i,o,t,z,s=function(c,a){a.parentNode.insertBefore(c,a)};if(c&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}h=function(){var c,a=document.createElement("div");a.innerHTML=l._iconfont_svg_string_3966148,(a=a.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",a=a,(c=document.body).firstChild?s(a,c.firstChild):c.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,t=l.document,z=!1,p(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,v())})}function v(){z||(z=!0,o())}function p(){try{t.documentElement.doScroll("left")}catch(c){return void setTimeout(p,50)}v()}})(window);
\ No newline at end of file
+window._iconfont_svg_string_3966148='',(l=>{var c=(a=(a=document.getElementsByTagName("script"))[a.length-1]).getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,i,o,t,z,v=function(c,a){a.parentNode.insertBefore(c,a)};if(c&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}h=function(){var c,a=document.createElement("div");a.innerHTML=l._iconfont_svg_string_3966148,(a=a.getElementsByTagName("svg")[0])&&(a.setAttribute("aria-hidden","true"),a.style.position="absolute",a.style.width=0,a.style.height=0,a.style.overflow="hidden",a=a,(c=document.body).firstChild?v(a,c.firstChild):c.appendChild(a))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(i=function(){document.removeEventListener("DOMContentLoaded",i,!1),h()},document.addEventListener("DOMContentLoaded",i,!1)):document.attachEvent&&(o=h,t=l.document,z=!1,p(),t.onreadystatechange=function(){"complete"==t.readyState&&(t.onreadystatechange=null,s())})}function s(){z||(z=!0,o())}function p(){try{t.documentElement.doScroll("left")}catch(c){return void setTimeout(p,50)}s()}})(window);
\ No newline at end of file
diff --git a/src/assets/iconfonts/light/iconfont.json b/src/assets/iconfonts/light/iconfont.json
index eb1efc7..1c5910b 100644
--- a/src/assets/iconfonts/light/iconfont.json
+++ b/src/assets/iconfonts/light/iconfont.json
@@ -5,6 +5,132 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
+ {
+ "icon_id": "1817720",
+ "name": "删除-3",
+ "font_class": "shanchu-",
+ "unicode": "e6aa",
+ "unicode_decimal": 59050
+ },
+ {
+ "icon_id": "1817721",
+ "name": "恢复",
+ "font_class": "huifu1",
+ "unicode": "e6ab",
+ "unicode_decimal": 59051
+ },
+ {
+ "icon_id": "1817730",
+ "name": "tjg",
+ "font_class": "tjg",
+ "unicode": "e6ac",
+ "unicode_decimal": 59052
+ },
+ {
+ "icon_id": "1817776",
+ "name": "gb",
+ "font_class": "gb",
+ "unicode": "e6ad",
+ "unicode_decimal": 59053
+ },
+ {
+ "icon_id": "1817794",
+ "name": "Group 2",
+ "font_class": "Group",
+ "unicode": "e6ae",
+ "unicode_decimal": 59054
+ },
+ {
+ "icon_id": "10599880",
+ "name": "icon-xiajiashenhe",
+ "font_class": "xiajia",
+ "unicode": "e7aa",
+ "unicode_decimal": 59306
+ },
+ {
+ "icon_id": "44433330",
+ "name": "仓库",
+ "font_class": "cangku",
+ "unicode": "e927",
+ "unicode_decimal": 59687
+ },
+ {
+ "icon_id": "30256923",
+ "name": "报警记录",
+ "font_class": "baojingjilu",
+ "unicode": "e6a8",
+ "unicode_decimal": 59048
+ },
+ {
+ "icon_id": "79099",
+ "name": "一体机",
+ "font_class": "yitiji",
+ "unicode": "e6a2",
+ "unicode_decimal": 59042
+ },
+ {
+ "icon_id": "6296998",
+ "name": "库房管理",
+ "font_class": "kufangguanli",
+ "unicode": "e6a3",
+ "unicode_decimal": 59043
+ },
+ {
+ "icon_id": "8434614",
+ "name": "人脸识别机器",
+ "font_class": "renlianshibiejiqi",
+ "unicode": "e759",
+ "unicode_decimal": 59225
+ },
+ {
+ "icon_id": "9437011",
+ "name": "网络摄像头",
+ "font_class": "wangluoshexiangtou",
+ "unicode": "e754",
+ "unicode_decimal": 59220
+ },
+ {
+ "icon_id": "11661938",
+ "name": "3D库房",
+ "font_class": "Dkufang",
+ "unicode": "e6a4",
+ "unicode_decimal": 59044
+ },
+ {
+ "icon_id": "19373677",
+ "name": "rfid读写器",
+ "font_class": "rfidduxieqi",
+ "unicode": "e879",
+ "unicode_decimal": 59513
+ },
+ {
+ "icon_id": "31422233",
+ "name": "手持盘点仪",
+ "font_class": "shouchipandianyi",
+ "unicode": "e6a5",
+ "unicode_decimal": 59045
+ },
+ {
+ "icon_id": "36973886",
+ "name": "智能一体机",
+ "font_class": "zhinengyitiji",
+ "unicode": "e6a6",
+ "unicode_decimal": 59046
+ },
+ {
+ "icon_id": "40950858",
+ "name": "3D-吸顶探测器",
+ "font_class": "a-3D-xidingtanceqi",
+ "unicode": "e6b7",
+ "unicode_decimal": 59063
+ },
+ {
+ "icon_id": "43488473",
+ "name": "吸顶式盘点设备",
+ "font_class": "saomiao",
+ "unicode": "e6a7",
+ "unicode_decimal": 59047
+ },
{
"icon_id": "26584955",
"name": "密码查看",
diff --git a/src/assets/iconfonts/light/iconfont.ttf b/src/assets/iconfonts/light/iconfont.ttf
index eaa7992..a5a5961 100644
Binary files a/src/assets/iconfonts/light/iconfont.ttf and b/src/assets/iconfonts/light/iconfont.ttf differ
diff --git a/src/assets/iconfonts/light/iconfont.woff b/src/assets/iconfonts/light/iconfont.woff
index 3036399..95b96c3 100644
Binary files a/src/assets/iconfonts/light/iconfont.woff and b/src/assets/iconfonts/light/iconfont.woff differ
diff --git a/src/assets/iconfonts/light/iconfont.woff2 b/src/assets/iconfonts/light/iconfont.woff2
index 9f3b753..fce5a82 100644
Binary files a/src/assets/iconfonts/light/iconfont.woff2 and b/src/assets/iconfonts/light/iconfont.woff2 differ
diff --git a/src/views/archivesStatistics/Da3Report.vue b/src/views/archivesStatistics/Da3Report.vue
index 2b87516..39b187f 100644
--- a/src/views/archivesStatistics/Da3Report.vue
+++ b/src/views/archivesStatistics/Da3Report.vue
@@ -1,5 +1,4 @@