From 9f2fca9c23a631d057848efac343cb52ee501a9b Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Tue, 1 Mar 2022 17:26:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5-=E7=B4=A0=E6=9D=90=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
src/assets/icons/iconfont.js | 1 +
src/assets/images/n-zs.png | Bin 0 -> 2280 bytes
src/assets/styles/iconfont.css | 6 ++
src/assets/styles/index.scss | 3 +-
src/assets/styles/sidebar.scss | 1 +
src/layout/components/AppMain.vue | 12 ++-
src/layout/components/Navbar.vue | 2 +-
src/layout/components/TagsView/index.vue | 38 ++++---
src/layout/index.vue | 11 ++-
src/main.js | 2 +
src/router/routers.js | 18 +++-
src/settings.js | 2 +-
src/views/dashboard/AgencyData.vue | 8 +-
src/views/dashboard/DeviceData.vue | 9 +-
src/views/dashboard/PublishProcess.vue | 8 +-
src/views/login.vue | 20 ++--
src/views/materialContent/index.vue | 72 ++++++++++++++
.../materialContent/materialList/index.vue | 93 ++++++++++++++++++
src/views/system/user/index.vue | 2 +-
20 files changed, 271 insertions(+), 39 deletions(-)
create mode 100644 src/assets/icons/iconfont.js
create mode 100644 src/assets/images/n-zs.png
create mode 100644 src/views/materialContent/index.vue
create mode 100644 src/views/materialContent/materialList/index.vue
diff --git a/package.json b/package.json
index 2f1504c..721fd53 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "canvasScreen-admin",
+ "name": "admin",
"version": "2.6.0",
"description": "canvasScreenAdmin",
"author": "Liu Li",
diff --git a/src/assets/icons/iconfont.js b/src/assets/icons/iconfont.js
new file mode 100644
index 0000000..82f8380
--- /dev/null
+++ b/src/assets/icons/iconfont.js
@@ -0,0 +1 @@
+!function(a){var i,l,t,o,e,n='',h=(h=document.getElementsByTagName("script"))[h.length-1].getAttribute("data-injectcss"),d=function(a,i){i.parentNode.insertBefore(a,i)};if(h&&!a.__iconfont__svg__cssinject__){a.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}function m(){e||(e=!0,t())}function s(){try{o.documentElement.doScroll("left")}catch(a){return void setTimeout(s,50)}m()}i=function(){var a,i=document.createElement("div");i.innerHTML=n,n=null,(i=i.getElementsByTagName("svg")[0])&&(i.setAttribute("aria-hidden","true"),i.style.position="absolute",i.style.width=0,i.style.height=0,i.style.overflow="hidden",i=i,(a=document.body).firstChild?d(i,a.firstChild):a.appendChild(i))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(i,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),i()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(t=i,o=a.document,e=!1,s(),o.onreadystatechange=function(){"complete"==o.readyState&&(o.onreadystatechange=null,m())})}(window);
\ No newline at end of file
diff --git a/src/assets/images/n-zs.png b/src/assets/images/n-zs.png
new file mode 100644
index 0000000000000000000000000000000000000000..b455ac9a350f74824d597981a43ac0846cd232e1
GIT binary patch
literal 2280
zcmaJ@dpuNmAD$ACl1mq}78FEj?%weW+=1emO6Pwp1N=jLi
zOQ|*qQQ2zKTZu+=RicoD4Y@?R*eKT>ZQA#bxA%NL=lm|8=Xt)j=Z}--#dKY^#9#>u
zg<9rD1K7$HP`>)=YRWHVYmkF-S%bLvBi?X062p;zC?_5q2BO^{P6WsXIlLX)?}BzH
zl*)R6k3Ztipp&^Ugyqa(urf%jWTQ}ajxsTaD+CdA7#JZC*<;>ZtHz)OJbR3v6$8%@
zQ$W6e7Apb0W0^kOSRt3h!#Fyi?PO%700bf&vzsicFU)rQ>7*56!;|N&%TuJjl2IK!jA?Pbw
zim<_d^8KH}QlA}S5XT0kaFm3r99+2ZTqrS_A^|xFEb)Qi$oVdM@nHm(@?kNWLYeED
z4SIv0K*WP%q$Zy^3W0Wdbfq+M*xL8^{Q>ZQ^DrQivf$gfP`;`6
zh0FVPF2FarIAt=px#9lTu;;Io4w~D3wXX8;)%>7H>3E6K+E17{4^Svoe>cF%NA|4J
zUnuDVmdY;}d6X<<*4(vSZ1ZyAlW|4xtn#EO5kG-o5JewW<=XAN_thUac
zl6uYQH7EJ<4>8qVBNwV(Lr908z59_TtCs;|r2b#**mlL-5_Jm^Pe^{xi`z|G}LjO$P|A}_V=&VLd
zao?4F-EUr(_4uB#TkLeP!u{B~R(Mw?DWGFj)yPz^qSt}7rf&M?k%*!}jnVh|J;ld6=VuZNbw5H%1IR{>?P+{mpp3hha9chdVm7M2xI5IMvM9nP0U_
zuVOIpe(Bnc9;rflly5gyZn0VTAEraOZWYw(gWyRtxYwq{rXug;@M#EK6#s_m2faK1^3BFooYK;??T+U
zI#e}1cjD<9e&g-_;xbZl_^1O-9@jQL7Pow=ZwihqPBBRSIWqHBonALO!0fy9k%Vnc
zI$N9*PpKMk3I;Bw_#L#QANFidC`h&wv?466
zwCuXKb-|tm#Qsww)kPmoo?P9$o^QA}rH-ynRM~QL=AN@bL4H$;U3TKV5xL%-TG`IX
zt}3tJ3qzA%T5L$u>DPTFD=*jf#i!DtN4=99^cuF~W;~xSXTh$6lqDizaG7
z3r3|prDbIOnJb4?vZ7g=3sM8r&(upYs@#3!(;YShm_99#pD5jHR)?rW?RVbm{?_7{
z>RPS6_`^x`rlG634tHpk?%C|DppC5N-(9^zkX1KI&9^HWU4XT%vBt
zsyy33iivUgq;}`-Qkg0K!$>aHq4RkAWAE;$X9a>buBnjLmR5w%AKSDeIrGLJE~nz1
zV{Gpf-O$`?s+-;rRIGOb7-nHEIZ{or@3VJ#3&WOwpL~@7|F|*(U@~=2m_y-IuXxny
z$x%qt09*UQFVm*>p0nXnh6Y-H>YSdZU^F%T^uXPU$SZVpw(r332d#rG+@<*&pPe&y
zJ+x3`&$3MRZnJ<6v5JdUgS>2$L->VeEACI@gN>R?@MXi%dFG-B4N3G{y?-rgTc?#L
z2^?%dHL_HGQytKLXF7cSK>yfOrP1n0MOE#yz_c5
zfNgCZCG?9Peas{LZql`fheGb$&C_No1{0<_;;SnzbhS5C<>xp2@q@UJ>jIvpbhe{k
zVu)~9NPMx6=7z!<{e3rV>z(e&hxGf4BaXMG5rEzxv&k0Ik@is-dK8C2>^(Xf{71uH
zsX?CC&woc+!7)1Xk`R&|S_J`_o-63Ws_$11XD(9T`q-#gbK2tHvB!CUFM}d^cn>VKw*f;pV~w&N+uB{RP>r#&rMy
literal 0
HcmV?d00001
diff --git a/src/assets/styles/iconfont.css b/src/assets/styles/iconfont.css
index 84b5774..9b01f8c 100644
--- a/src/assets/styles/iconfont.css
+++ b/src/assets/styles/iconfont.css
@@ -12,4 +12,10 @@
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
+}
+.font-icon {
+ width: 2em;
+ height: 2em;
+ fill: currentColor;
+ overflow: hidden;
}
\ No newline at end of file
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 70951e2..edc2aad 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -133,7 +133,8 @@ aside {
padding: 20px 24px;
background-color: #fff;
border-radius: 4px;
- min-height: calc(100vh - 152px);
+ // min-height: calc(100vh - 152px);
+ min-height: calc(100vh - 116px);
}
.components-container {
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index edb7e17..97c0612 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -4,6 +4,7 @@
min-height: 100%;
transition: margin-left .28s;
margin-left: $sideBarWidth;
+ // padding-top: 64px;
position: relative;
background-color: #f5f5f5;
.el-button--primary {
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 5d47ee3..441fb33 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -6,7 +6,7 @@