diff --git a/src/assets/iconfonts/light/iconfont.css b/src/assets/iconfonts/light/iconfont.css index 7b755ef..604d46e 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=1685929738396') format('woff2'), - url('iconfont.woff?t=1685929738396') format('woff'), - url('iconfont.ttf?t=1685929738396') format('truetype'); + src: url('iconfont.woff2?t=1686819523337') format('woff2'), + url('iconfont.woff?t=1686819523337') format('woff'), + url('iconfont.ttf?t=1686819523337') format('truetype'); } .iconfont { diff --git a/src/assets/iconfonts/light/iconfont.ttf b/src/assets/iconfonts/light/iconfont.ttf index de4efc4..ee4bc20 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 34f2312..766b50c 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 4db54d4..c5c0cd9 100644 Binary files a/src/assets/iconfonts/light/iconfont.woff2 and b/src/assets/iconfonts/light/iconfont.woff2 differ diff --git a/src/assets/images/collect/aj.png b/src/assets/images/collect/aj.png new file mode 100644 index 0000000..3d6cd54 Binary files /dev/null and b/src/assets/images/collect/aj.png differ diff --git a/src/assets/images/collect/daml.png b/src/assets/images/collect/daml.png new file mode 100644 index 0000000..5f56ab2 Binary files /dev/null and b/src/assets/images/collect/daml.png differ diff --git a/src/assets/images/collect/jn.png b/src/assets/images/collect/jn.png new file mode 100644 index 0000000..2b16119 Binary files /dev/null and b/src/assets/images/collect/jn.png differ diff --git a/src/assets/images/collect/kssx.png b/src/assets/images/collect/kssx.png new file mode 100644 index 0000000..7472ea0 Binary files /dev/null and b/src/assets/images/collect/kssx.png differ diff --git a/src/assets/images/collect/one.png b/src/assets/images/collect/one.png new file mode 100644 index 0000000..ef8bbd5 Binary files /dev/null and b/src/assets/images/collect/one.png differ diff --git a/src/assets/images/collect/three.png b/src/assets/images/collect/three.png new file mode 100644 index 0000000..921630a Binary files /dev/null and b/src/assets/images/collect/three.png differ diff --git a/src/assets/images/collect/three2.png b/src/assets/images/collect/three2.png new file mode 100644 index 0000000..07cdef6 Binary files /dev/null and b/src/assets/images/collect/three2.png differ diff --git a/src/assets/images/collect/two.png b/src/assets/images/collect/two.png new file mode 100644 index 0000000..6261061 Binary files /dev/null and b/src/assets/images/collect/two.png differ diff --git a/src/assets/images/collect/two2.png b/src/assets/images/collect/two2.png new file mode 100644 index 0000000..12ab71c Binary files /dev/null and b/src/assets/images/collect/two2.png differ diff --git a/src/assets/images/collect/yw.png b/src/assets/images/collect/yw.png new file mode 100644 index 0000000..267c6fa Binary files /dev/null and b/src/assets/images/collect/yw.png differ diff --git a/src/assets/styles/mixin.scss b/src/assets/styles/mixin.scss index 0341cc7..8167777 100644 --- a/src/assets/styles/mixin.scss +++ b/src/assets/styles/mixin.scss @@ -408,6 +408,12 @@ } } +@mixin tree_classfiy_icon_font{ + [data-theme="light"] & { + color: #3ACFB1; + } +} + @mixin tree_children_padding{ [data-theme="light"] & { padding: 0 !important; diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index 212368e..086132f 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -1719,6 +1719,28 @@ input[type ='number'] { @include tree_children_icon_font; } } +.iconClassify{ + font-family: "iconfont" !important; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + &::before{ + content: "\e648"; + font-size: 14px; + @include tree_classfiy_icon_font; + } +} +.iconClassify-child{ + font-family: "iconfont" !important; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + &::before{ + content: "\e64a"; + font-size: 14px; + @include tree_classfiy_icon_font; + } +} // 档案门类-基本信息 .system-base-info { @include category-padding; diff --git a/src/router/index.js b/src/router/index.js index 47be649..f56d97d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,7 +9,7 @@ import { filterAsyncRouter } from '@/store/modules/permission' NProgress.configure({ showSpinner: false })// NProgress Configuration -const whiteList = ['/login']// no redirect whitelist +const whiteList = ['/login', '/collectionLibrary']// no redirect whitelist router.beforeEach((to, from, next) => { if (to.meta.title) { diff --git a/src/router/routers.js b/src/router/routers.js index 850bb84..38ffa5b 100644 --- a/src/router/routers.js +++ b/src/router/routers.js @@ -62,6 +62,20 @@ export const constantRouterMap = [ path: '/environmentalScreen', component: (resolve) => require(['@/views/environmentalScreen/index'], resolve), hidden: true + }, + { + path: '/collectReorganizi', + component: Layout, + hidden: true, + redirect: 'noredirect', + children: [ + { + path: '/collectionLibrary', + component: (resolve) => require(['@/views/collectReorganizi/collectionLibrary/index'], resolve), + name: '收集库', + meta: { title: '收集库' } + } + ] } ] diff --git a/src/views/collectReorganizi/collectionLibrary/index.vue b/src/views/collectReorganizi/collectionLibrary/index.vue new file mode 100644 index 0000000..953ec67 --- /dev/null +++ b/src/views/collectReorganizi/collectionLibrary/index.vue @@ -0,0 +1,188 @@ + + + + +