diff --git a/src/components/custom-echart-line/index.vue b/src/components/custom-echart-line/index.vue index d2a04ae..946d7f8 100644 --- a/src/components/custom-echart-line/index.vue +++ b/src/components/custom-echart-line/index.vue @@ -2,7 +2,7 @@
diff --git a/src/layouts/index.vue b/src/layouts/index.vue index 1c35e7b..9ad1828 100644 --- a/src/layouts/index.vue +++ b/src/layouts/index.vue @@ -57,12 +57,13 @@ onMounted(() => { url('@/assets/images/basic/containerBotBG.png') no-repeat bottom center; &-header { width: 100%; - height: 60px; - // margin-bottom: 60px; + margin-bottom: 16px; } &-main { flex: 1; - min-height: calc(100vh - 60px); + min-height: calc(100vh - 90px - 16px); + padding: 0 40px; + box-sizing: border-box; } .base-laytout-header { height: 90px; diff --git a/src/router/modules/demo.js b/src/router/modules/demo.js index 6dfba05..21efc26 100644 --- a/src/router/modules/demo.js +++ b/src/router/modules/demo.js @@ -20,12 +20,6 @@ export default [ component: () => import('@/views/demo/rank.vue'), meta: { title: '滚动排名列表', icon: 'document' }, }, - // { - // path: '/page', - // component: () => import('@/views/demo/test.vue'), - // name: 'page', - // meta: { title: '测试', icon: 'document' }, - // }, ], }, ]; diff --git a/src/router/modules/v2.js b/src/router/modules/v2.js index aa33c41..dbc3920 100644 --- a/src/router/modules/v2.js +++ b/src/router/modules/v2.js @@ -5,55 +5,55 @@ export default { name: 'v2', component: Layout, redirect: '/v2/home', - meta: { title: '首页', icon: 'House' }, + meta: { title: '首页', icon: '' }, children: [ // { // path: '/v2/home', // component: () => import('@/views/home/index.vue'), // name: 'home', - // meta: { title: '首页', icon: 'House' }, + // meta: { title: '首页', icon: '' }, // }, { path: '/v2/land', component: () => import('@/views/land/index.vue'), name: 'land', - meta: { title: '土地资源', icon: 'House' }, + meta: { title: '土地资源', icon: '' }, + }, + { + path: 'inputs', + name: 'inputs', + component: () => import('@/views/inputs/index.vue'), + meta: { title: '投入品监管', icon: '' }, }, - // { - // path: 'inputs', - // name: 'inputs', - // component: () => import('@/views/inputs/index.vue'), - // hidden: true, - // }, // { // path: 'entities', // name: 'entities', // component: () => import('@/views/entities/index.vue'), - // hidden: true, + // meta: { title: '', icon: '' }, // }, // { // path: 'breed', // name: 'breed', // component: () => import('@/views/breed/index.vue'), - // hidden: true, + // meta: { title: '', icon: '' }, // }, // { // path: 'plant', // name: 'plant', // component: () => import('@/views/plant/index.vue'), - // hidden: true, + // meta: { title: '', icon: '' }, // }, // { // path: 'trace', // name: 'trace', // component: () => import('@/views/trace/index.vue'), - // hidden: true, + // meta: { title: '', icon: '' }, // }, // { // path: 'early', // name: 'early', // component: () => import('@/views/early/index.vue'), - // hidden: true, + // meta: { title: '', icon: '' }, // }, ], }; diff --git a/src/styles/global.scss b/src/styles/global.scss index 3533878..397fb53 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -1,6 +1,6 @@ // color $legacy-ie: 10; -$color-primary: #20a0ff; +$color-primary: #35D0C0; $color-success: #13ce66; $color-warning: #f7ba2a; $color-danger: #ff4949; @@ -58,4 +58,6 @@ $color-types: ( ), ); +$color-custom-main: #35D0C0; + @import 'utils/utils'; diff --git a/src/styles/style.scss b/src/styles/style.scss index 015508b..69ee739 100644 --- a/src/styles/style.scss +++ b/src/styles/style.scss @@ -5,7 +5,7 @@ position: relative; width: 100%; height: 100%; - font-family: Avenir, sans-serif; + font-family: JinBuTi, Sans, Avenir, sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; background-color: #000; diff --git a/src/views/inputs/index.vue b/src/views/inputs/index.vue index 255d418..7ded830 100644 --- a/src/views/inputs/index.vue +++ b/src/views/inputs/index.vue @@ -1,57 +1,55 @@