diff --git a/package.json b/package.json index 492709f524e75238156415aafcfdf3bd7ec0399c..d5fe3773e1bc216361fa3ccd740df3f74b6a789d 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "codemirror": "5.31.0", "dropzone": "5.2.0", "echarts": "3.7.2", - "element-ui": "1.4.8", + "element-ui": "2.0.1", "file-saver": "1.3.3", "font-awesome": "4.7.0", "js-cookie": "2.2.0", diff --git a/src/main.js b/src/main.js index 52e9336ca19410c714724e98aa7bd8898160963f..94a5a99b015f31ea13f16dcb7fc47305bbe2e001 100644 --- a/src/main.js +++ b/src/main.js @@ -1,6 +1,6 @@ import Vue from 'vue' -import ElementUI from 'element-ui' -import 'element-ui/lib/theme-default/index.css' +import Element from 'element-ui' +import 'element-ui/lib/theme-chalk/index.css' import App from './App' import router from './router' import store from './store' @@ -10,7 +10,7 @@ import './errorLog'// error log import './permission' // æƒé™ import './mock' // 该项目所有请求使用mockjs模拟 -Vue.use(ElementUI) +Vue.use(Element) // register global utility filters. Object.keys(filters).forEach(key => { diff --git a/src/views/layout/components/Sidebar.vue b/src/views/layout/components/Sidebar.vue index 3c72ebeee8f057e5eae2bdecd6ca509e87976011..56abd7c1734cbe72938a2be9d4b599bdbe7ee902 100644 --- a/src/views/layout/components/Sidebar.vue +++ b/src/views/layout/components/Sidebar.vue @@ -1,10 +1,11 @@ <template> - <el-menu mode="vertical" theme="dark" unique-opened :default-active="$route.path" :collapse="isCollapse"> - <sidebar-item :routes='permission_routers'></sidebar-item> - </el-menu> + <el-menu mode="vertical" unique-opened :default-active="$route.path" :collapse="isCollapse" background-color="#545c64" text-color="#fff" active-text-color="#ffd04b"> + <sidebar-item :routes='permission_routers'></sidebar-item> + </el-menu> </template> + <script> import { mapGetters } from 'vuex' import SidebarItem from './SidebarItem' diff --git a/src/views/theme/index.vue b/src/views/theme/index.vue index 5e37fb07894fad36f1d0e40bbcfc9a23f7c2501d..abbfee7601745399673db8d2c13c13e8bb1cc345 100644 --- a/src/views/theme/index.vue +++ b/src/views/theme/index.vue @@ -45,7 +45,7 @@ <script> import { toggleClass } from '@/utils' -import '@/assets/custom-theme/index.css' // æ¢è‚¤ç‰ˆæœ¬element-ui css +// import '@/assets/custom-theme/index.css' // æ¢è‚¤ç‰ˆæœ¬element-ui css export default { name: 'theme',