diff --git a/package.json b/package.json index 1d65f3d..69dfcf4 100644 --- a/package.json +++ b/package.json @@ -11,17 +11,21 @@ "analyz": "npm_config_report=true npm run build" }, "dependencies": { + "@antv/g2": "^3.5.11", + "@antv/l7": "latest", + "@antv/l7-maps": "latest", "axios": "^0.19.1", "core-js": "^3.6.2", "echarts": "^4.6.0", "element-ui": "^2.13.0", + "insert-css": "^2.0.0", + "js-base64": "latest", + "js-cookie": "latest", + "nprogress": "latest", "vue": "^2.6.11", "vue-axios": "^2.1.5", "vue-router": "^3.1.3", - "vuex": "^3.1.2", - "nprogress": "latest", - "js-base64": "latest", - "js-cookie": "latest" + "vuex": "^3.1.2" }, "devDependencies": { "@vue/cli-plugin-babel": "^4.1.2", diff --git a/src/assets/styles/login.scss b/src/assets/styles/login.scss index afa13fa..0f6a2a2 100644 --- a/src/assets/styles/login.scss +++ b/src/assets/styles/login.scss @@ -35,7 +35,7 @@ border-bottom-left-radius: 5px; justify-content: center; flex-direction: column; - background-color: #1296DB; + background-color: #55b5e5; color: #fff; float: left; width: 50%; diff --git a/src/components/card/base-card.vue b/src/components/card/base-card.vue index eecf859..7b2a89c 100644 --- a/src/components/card/base-card.vue +++ b/src/components/card/base-card.vue @@ -14,16 +14,21 @@ diff --git a/src/components/card/title-card.vue b/src/components/card/title-card.vue new file mode 100644 index 0000000..0de333f --- /dev/null +++ b/src/components/card/title-card.vue @@ -0,0 +1,49 @@ + + + + + diff --git a/src/plugins/element/element.js b/src/plugins/element/element.js index b09723a..8cf3c3d 100644 --- a/src/plugins/element/element.js +++ b/src/plugins/element/element.js @@ -6,6 +6,8 @@ import 'element-ui/lib/theme-chalk/index.css'; import './element-variables.scss' import baseCard from '@/components/card/base-card' +import titleCard from '@/components/card/title-card' Vue.use(Element, {locale}); -Vue.component('base-card', baseCard); \ No newline at end of file +Vue.component('base-card', baseCard); +Vue.component('title-card', titleCard); \ No newline at end of file diff --git a/src/router/views/index.js b/src/router/views/index.js index 4e6033d..b2a9184 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -1,4 +1,4 @@ -import Index from '@/views/index/index' +import Index from '@/views/layout/index' export default [ { @@ -15,7 +15,7 @@ export default [ meta: { isAuth: true }, - component: () => import('@/views/Home') + component: () => import('@/views/home/Home') }, { name: 'things', diff --git a/src/views/Home.vue b/src/views/Home.vue deleted file mode 100644 index 59f6ba9..0000000 --- a/src/views/Home.vue +++ /dev/null @@ -1,89 +0,0 @@ - diff --git a/src/views/home/Home.vue b/src/views/home/Home.vue new file mode 100644 index 0000000..e3c2e3d --- /dev/null +++ b/src/views/home/Home.vue @@ -0,0 +1,203 @@ + + + + diff --git a/src/views/index/index.vue b/src/views/layout/index.vue similarity index 98% rename from src/views/index/index.vue rename to src/views/layout/index.vue index 0365b54..060cf87 100644 --- a/src/views/index/index.vue +++ b/src/views/layout/index.vue @@ -86,7 +86,7 @@ } .header { - top: 0px; + top: 0; width: 100%; height: 60px; border-bottom: 1px solid #dcdfe6; @@ -144,14 +144,14 @@ .view { top: 1px; - bottom: 0px; + bottom: 0; width: 100%; position: absolute; } .operator { text-align: center; - margin: 5px 0px; + margin: 5px 0; } .page { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 85cabae..1b72e40 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -46,7 +46,7 @@ - +