diff --git a/src/assets/iconfonts/iconfont.css b/src/assets/iconfonts/iconfont.css index 5a0b2ca..4f2d2bf 100644 --- a/src/assets/iconfonts/iconfont.css +++ b/src/assets/iconfonts/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 3409379 */ - src: url('iconfont.woff2?t=1658129042026') format('woff2'), - url('iconfont.woff?t=1658129042026') format('woff'), - url('iconfont.ttf?t=1658129042026') format('truetype'); + src: url('iconfont.woff2?t=1658455952870') format('woff2'), + url('iconfont.woff?t=1658455952870') format('woff'), + url('iconfont.ttf?t=1658455952870') format('truetype'); } .iconfont { @@ -13,6 +13,18 @@ -moz-osx-font-smoothing: grayscale; } +.icon-fabu-fanbai:before { + content: "\e644"; +} + +.icon-biaojiyidu-fanbai:before { + content: "\e645"; +} + +.icon-shoudongchuli-fanbai:before { + content: "\e646"; +} + .icon-zhenglishi:before { content: "\e63c"; } diff --git a/src/assets/iconfonts/iconfont.js b/src/assets/iconfonts/iconfont.js index 053bc0d..512278c 100644 --- a/src/assets/iconfonts/iconfont.js +++ b/src/assets/iconfonts/iconfont.js @@ -1 +1 @@ -!function(c){var l,h,a,i,z,m='',t=(t=document.getElementsByTagName("script"))[t.length-1].getAttribute("data-injectcss"),F=function(c,l){l.parentNode.insertBefore(c,l)};if(t&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function o(){z||(z=!0,a())}function v(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(v,50)}o()}l=function(){var c,l=document.createElement("div");l.innerHTML=m,m=null,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(c=document.body).firstChild?F(l,c.firstChild):c.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(h=function(){document.removeEventListener("DOMContentLoaded",h,!1),l()},document.addEventListener("DOMContentLoaded",h,!1)):document.attachEvent&&(a=l,i=c.document,z=!1,v(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,o())})}(window); \ No newline at end of file +!function(c){var l,h,a,i,z,m='',F=(F=document.getElementsByTagName("script"))[F.length-1].getAttribute("data-injectcss"),t=function(c,l){l.parentNode.insertBefore(c,l)};if(F&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}function o(){z||(z=!0,a())}function v(){try{i.documentElement.doScroll("left")}catch(c){return void setTimeout(v,50)}o()}l=function(){var c,l=document.createElement("div");l.innerHTML=m,m=null,(l=l.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",l=l,(c=document.body).firstChild?t(l,c.firstChild):c.appendChild(l))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(l,0):(h=function(){document.removeEventListener("DOMContentLoaded",h,!1),l()},document.addEventListener("DOMContentLoaded",h,!1)):document.attachEvent&&(a=l,i=c.document,z=!1,v(),i.onreadystatechange=function(){"complete"==i.readyState&&(i.onreadystatechange=null,o())})}(window); \ No newline at end of file diff --git a/src/assets/iconfonts/iconfont.json b/src/assets/iconfonts/iconfont.json index dc34c33..d928c98 100644 --- a/src/assets/iconfonts/iconfont.json +++ b/src/assets/iconfonts/iconfont.json @@ -5,6 +5,27 @@ "css_prefix_text": "icon-", "description": "", "glyphs": [ + { + "icon_id": "30765497", + "name": "发布-反白", + "font_class": "fabu-fanbai", + "unicode": "e644", + "unicode_decimal": 58948 + }, + { + "icon_id": "30765498", + "name": "标记已读-反白", + "font_class": "biaojiyidu-fanbai", + "unicode": "e645", + "unicode_decimal": 58949 + }, + { + "icon_id": "30765499", + "name": "手动处理-反白", + "font_class": "shoudongchuli-fanbai", + "unicode": "e646", + "unicode_decimal": 58950 + }, { "icon_id": "30660167", "name": "整理室", diff --git a/src/assets/iconfonts/iconfont.ttf b/src/assets/iconfonts/iconfont.ttf index 0432d41..04cc679 100644 Binary files a/src/assets/iconfonts/iconfont.ttf and b/src/assets/iconfonts/iconfont.ttf differ diff --git a/src/assets/iconfonts/iconfont.woff b/src/assets/iconfonts/iconfont.woff index 026836b..da71de8 100644 Binary files a/src/assets/iconfonts/iconfont.woff and b/src/assets/iconfonts/iconfont.woff differ diff --git a/src/assets/iconfonts/iconfont.woff2 b/src/assets/iconfonts/iconfont.woff2 index 30e48b3..c34bac7 100644 Binary files a/src/assets/iconfonts/iconfont.woff2 and b/src/assets/iconfonts/iconfont.woff2 differ diff --git a/src/views/system/archiveStatistics/index.vue b/src/views/system/archiveStatistics/index.vue new file mode 100644 index 0000000..db92888 --- /dev/null +++ b/src/views/system/archiveStatistics/index.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/src/views/system/archiveStatistics/module/barEcharts.vue b/src/views/system/archiveStatistics/module/barEcharts.vue new file mode 100644 index 0000000..76d8a69 --- /dev/null +++ b/src/views/system/archiveStatistics/module/barEcharts.vue @@ -0,0 +1,231 @@ + + + + + diff --git a/src/views/system/logManage/warnLog/index.vue b/src/views/system/logManage/warnLog/index.vue index ff1ebe4..11daf77 100644 --- a/src/views/system/logManage/warnLog/index.vue +++ b/src/views/system/logManage/warnLog/index.vue @@ -135,20 +135,15 @@ export default { this.handleVisible = true }, handleConfirm() { - // this.$refs.formDom.validate((valid) => { - // if (valid) { - // this.$message({ - // message: '保存成功！', - // type: 'success' - // }) - // this.handleVisible = false - // // this.$refs.recordFormDom.resetFields() - // // this.$refs.recordFormDom.clearValidate() - // } else { - // this.$message.error('登记失败！') - // return false - // } - // }) + this.$refs.formDom.validate((valid) => { + if (valid) { + this.handleVisible = false + this.$refs.formDom.resetFields() + this.$refs.formDom.clearValidate() + } else { + return false + } + }) } } } diff --git a/src/views/system/messageCenter/data1.json b/src/views/system/messageCenter/data1.json new file mode 100644 index 0000000..15ce564 --- /dev/null +++ b/src/views/system/messageCenter/data1.json @@ -0,0 +1,28 @@ +{ + "rows":[ + { + "notification":"内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容", + "msgType":"系统通知", + "pushObj":"全部用户", + "sendRole":"管理员", + "sendTime":"", + "readType":"未读" + }, + { + "notification":"内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容", + "msgType":"系统通知", + "pushObj":"全部用户", + "sendRole":"管理员", + "sendTime":"", + "readType":"已读" + }, + { + "notification":"内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容内容", + "msgType":"系统通知", + "pushObj":"全部用户", + "sendRole":"管理员", + "sendTime":"", + "readType":"已读" + } + ] +} \ No newline at end of file diff --git a/src/views/system/messageCenter/index.vue b/src/views/system/messageCenter/index.vue index d5d66ab..a4b3886 100644 --- a/src/views/system/messageCenter/index.vue +++ b/src/views/system/messageCenter/index.vue @@ -1,9 +1,9 @@