diff --git a/src/element/element-ui-theme/element-#0BB2D4/fonts/element-icons.ttf b/src/element-ui-theme/element-#0BB2D4/fonts/element-icons.ttf similarity index 100% rename from src/element/element-ui-theme/element-#0BB2D4/fonts/element-icons.ttf rename to src/element-ui-theme/element-#0BB2D4/fonts/element-icons.ttf diff --git a/src/element/element-ui-theme/element-#0BB2D4/fonts/element-icons.woff b/src/element-ui-theme/element-#0BB2D4/fonts/element-icons.woff similarity index 100% rename from src/element/element-ui-theme/element-#0BB2D4/fonts/element-icons.woff rename to src/element-ui-theme/element-#0BB2D4/fonts/element-icons.woff diff --git a/src/element/element-ui-theme/element-#0BB2D4/index.css b/src/element-ui-theme/element-#0BB2D4/index.css similarity index 100% rename from src/element/element-ui-theme/element-#0BB2D4/index.css rename to src/element-ui-theme/element-#0BB2D4/index.css diff --git a/src/element/element-ui-theme/element-#11C26D/fonts/element-icons.ttf b/src/element-ui-theme/element-#11C26D/fonts/element-icons.ttf similarity index 100% rename from src/element/element-ui-theme/element-#11C26D/fonts/element-icons.ttf rename to src/element-ui-theme/element-#11C26D/fonts/element-icons.ttf diff --git a/src/element/element-ui-theme/element-#11C26D/fonts/element-icons.woff b/src/element-ui-theme/element-#11C26D/fonts/element-icons.woff similarity index 100% rename from src/element/element-ui-theme/element-#11C26D/fonts/element-icons.woff rename to src/element-ui-theme/element-#11C26D/fonts/element-icons.woff diff --git a/src/element/element-ui-theme/element-#11C26D/index.css b/src/element-ui-theme/element-#11C26D/index.css similarity index 100% rename from src/element/element-ui-theme/element-#11C26D/index.css rename to src/element-ui-theme/element-#11C26D/index.css diff --git a/src/element/element-ui-theme/element-#17B3A3/fonts/element-icons.ttf b/src/element-ui-theme/element-#17B3A3/fonts/element-icons.ttf similarity index 100% rename from src/element/element-ui-theme/element-#17B3A3/fonts/element-icons.ttf rename to src/element-ui-theme/element-#17B3A3/fonts/element-icons.ttf diff --git a/src/element/element-ui-theme/element-#17B3A3/fonts/element-icons.woff b/src/element-ui-theme/element-#17B3A3/fonts/element-icons.woff similarity index 100% rename from src/element/element-ui-theme/element-#17B3A3/fonts/element-icons.woff rename to src/element-ui-theme/element-#17B3A3/fonts/element-icons.woff diff --git a/src/element/element-ui-theme/element-#17B3A3/index.css b/src/element-ui-theme/element-#17B3A3/index.css similarity index 100% rename from src/element/element-ui-theme/element-#17B3A3/index.css rename to src/element-ui-theme/element-#17B3A3/index.css diff --git a/src/element/element-ui-theme/element-#3E8EF7/fonts/element-icons.ttf b/src/element-ui-theme/element-#3E8EF7/fonts/element-icons.ttf similarity index 100% rename from src/element/element-ui-theme/element-#3E8EF7/fonts/element-icons.ttf rename to src/element-ui-theme/element-#3E8EF7/fonts/element-icons.ttf diff --git a/src/element/element-ui-theme/element-#3E8EF7/fonts/element-icons.woff b/src/element-ui-theme/element-#3E8EF7/fonts/element-icons.woff similarity index 100% rename from src/element/element-ui-theme/element-#3E8EF7/fonts/element-icons.woff rename to src/element-ui-theme/element-#3E8EF7/fonts/element-icons.woff diff --git a/src/element/element-ui-theme/element-#3E8EF7/index.css b/src/element-ui-theme/element-#3E8EF7/index.css similarity index 100% rename from src/element/element-ui-theme/element-#3E8EF7/index.css rename to src/element-ui-theme/element-#3E8EF7/index.css diff --git a/src/element/element-ui-theme/element-#667AFA/fonts/element-icons.ttf b/src/element-ui-theme/element-#667AFA/fonts/element-icons.ttf similarity index 100% rename from src/element/element-ui-theme/element-#667AFA/fonts/element-icons.ttf rename to src/element-ui-theme/element-#667AFA/fonts/element-icons.ttf diff --git a/src/element/element-ui-theme/element-#667AFA/fonts/element-icons.woff b/src/element-ui-theme/element-#667AFA/fonts/element-icons.woff similarity index 100% rename from src/element/element-ui-theme/element-#667AFA/fonts/element-icons.woff rename to src/element-ui-theme/element-#667AFA/fonts/element-icons.woff diff --git a/src/element/element-ui-theme/element-#667AFA/index.css b/src/element-ui-theme/element-#667AFA/index.css similarity index 100% rename from src/element/element-ui-theme/element-#667AFA/index.css rename to src/element-ui-theme/element-#667AFA/index.css diff --git a/src/element/element-ui-theme/element-#757575/fonts/element-icons.ttf b/src/element-ui-theme/element-#757575/fonts/element-icons.ttf similarity index 100% rename from src/element/element-ui-theme/element-#757575/fonts/element-icons.ttf rename to src/element-ui-theme/element-#757575/fonts/element-icons.ttf diff --git a/src/element/element-ui-theme/element-#757575/fonts/element-icons.woff b/src/element-ui-theme/element-#757575/fonts/element-icons.woff similarity index 100% rename from src/element/element-ui-theme/element-#757575/fonts/element-icons.woff rename to src/element-ui-theme/element-#757575/fonts/element-icons.woff diff --git a/src/element/element-ui-theme/element-#757575/index.css b/src/element-ui-theme/element-#757575/index.css similarity index 100% rename from src/element/element-ui-theme/element-#757575/index.css rename to src/element-ui-theme/element-#757575/index.css diff --git a/src/element/element-ui-theme/element-#9463F7/fonts/element-icons.ttf b/src/element-ui-theme/element-#9463F7/fonts/element-icons.ttf similarity index 100% rename from src/element/element-ui-theme/element-#9463F7/fonts/element-icons.ttf rename to src/element-ui-theme/element-#9463F7/fonts/element-icons.ttf diff --git a/src/element/element-ui-theme/element-#9463F7/fonts/element-icons.woff b/src/element-ui-theme/element-#9463F7/fonts/element-icons.woff similarity index 100% rename from src/element/element-ui-theme/element-#9463F7/fonts/element-icons.woff rename to src/element-ui-theme/element-#9463F7/fonts/element-icons.woff diff --git a/src/element/element-ui-theme/element-#9463F7/index.css b/src/element-ui-theme/element-#9463F7/index.css similarity index 100% rename from src/element/element-ui-theme/element-#9463F7/index.css rename to src/element-ui-theme/element-#9463F7/index.css diff --git a/src/element/element-ui-theme/element-#997B71/fonts/element-icons.ttf b/src/element-ui-theme/element-#997B71/fonts/element-icons.ttf similarity index 100% rename from src/element/element-ui-theme/element-#997B71/fonts/element-icons.ttf rename to src/element-ui-theme/element-#997B71/fonts/element-icons.ttf diff --git a/src/element/element-ui-theme/element-#997B71/fonts/element-icons.woff b/src/element-ui-theme/element-#997B71/fonts/element-icons.woff similarity index 100% rename from src/element/element-ui-theme/element-#997B71/fonts/element-icons.woff rename to src/element-ui-theme/element-#997B71/fonts/element-icons.woff diff --git a/src/element/element-ui-theme/element-#997B71/index.css b/src/element-ui-theme/element-#997B71/index.css similarity index 100% rename from src/element/element-ui-theme/element-#997B71/index.css rename to src/element-ui-theme/element-#997B71/index.css diff --git a/src/element/element-ui-theme/element-#EB6709/fonts/element-icons.ttf b/src/element-ui-theme/element-#EB6709/fonts/element-icons.ttf similarity index 100% rename from src/element/element-ui-theme/element-#EB6709/fonts/element-icons.ttf rename to src/element-ui-theme/element-#EB6709/fonts/element-icons.ttf diff --git a/src/element/element-ui-theme/element-#EB6709/fonts/element-icons.woff b/src/element-ui-theme/element-#EB6709/fonts/element-icons.woff similarity index 100% rename from src/element/element-ui-theme/element-#EB6709/fonts/element-icons.woff rename to src/element-ui-theme/element-#EB6709/fonts/element-icons.woff diff --git a/src/element/element-ui-theme/element-#EB6709/index.css b/src/element-ui-theme/element-#EB6709/index.css similarity index 100% rename from src/element/element-ui-theme/element-#EB6709/index.css rename to src/element-ui-theme/element-#EB6709/index.css diff --git a/src/element/element-ui-theme/element-#F74584/fonts/element-icons.ttf b/src/element-ui-theme/element-#F74584/fonts/element-icons.ttf similarity index 100% rename from src/element/element-ui-theme/element-#F74584/fonts/element-icons.ttf rename to src/element-ui-theme/element-#F74584/fonts/element-icons.ttf diff --git a/src/element/element-ui-theme/element-#F74584/fonts/element-icons.woff b/src/element-ui-theme/element-#F74584/fonts/element-icons.woff similarity index 100% rename from src/element/element-ui-theme/element-#F74584/fonts/element-icons.woff rename to src/element-ui-theme/element-#F74584/fonts/element-icons.woff diff --git a/src/element/element-ui-theme/element-#F74584/index.css b/src/element-ui-theme/element-#F74584/index.css similarity index 100% rename from src/element/element-ui-theme/element-#F74584/index.css rename to src/element-ui-theme/element-#F74584/index.css diff --git a/src/element/element-ui-theme/element-#FCB900/fonts/element-icons.ttf b/src/element-ui-theme/element-#FCB900/fonts/element-icons.ttf similarity index 100% rename from src/element/element-ui-theme/element-#FCB900/fonts/element-icons.ttf rename to src/element-ui-theme/element-#FCB900/fonts/element-icons.ttf diff --git a/src/element/element-ui-theme/element-#FCB900/fonts/element-icons.woff b/src/element-ui-theme/element-#FCB900/fonts/element-icons.woff similarity index 100% rename from src/element/element-ui-theme/element-#FCB900/fonts/element-icons.woff rename to src/element-ui-theme/element-#FCB900/fonts/element-icons.woff diff --git a/src/element/element-ui-theme/element-#FCB900/index.css b/src/element-ui-theme/element-#FCB900/index.css similarity index 100% rename from src/element/element-ui-theme/element-#FCB900/index.css rename to src/element-ui-theme/element-#FCB900/index.css diff --git a/src/element/element-ui-theme/element-#FF4C52/fonts/element-icons.ttf b/src/element-ui-theme/element-#FF4C52/fonts/element-icons.ttf similarity index 100% rename from src/element/element-ui-theme/element-#FF4C52/fonts/element-icons.ttf rename to src/element-ui-theme/element-#FF4C52/fonts/element-icons.ttf diff --git a/src/element/element-ui-theme/element-#FF4C52/fonts/element-icons.woff b/src/element-ui-theme/element-#FF4C52/fonts/element-icons.woff similarity index 100% rename from src/element/element-ui-theme/element-#FF4C52/fonts/element-icons.woff rename to src/element-ui-theme/element-#FF4C52/fonts/element-icons.woff diff --git a/src/element/element-ui-theme/element-#FF4C52/index.css b/src/element-ui-theme/element-#FF4C52/index.css similarity index 100% rename from src/element/element-ui-theme/element-#FF4C52/index.css rename to src/element-ui-theme/element-#FF4C52/index.css diff --git a/src/element/element-ui-theme/index.js b/src/element-ui-theme/index.js similarity index 100% rename from src/element/element-ui-theme/index.js rename to src/element-ui-theme/index.js diff --git a/src/element/element-ui/index.js b/src/element/element-ui/index.js deleted file mode 100644 index 7540878..0000000 --- a/src/element/element-ui/index.js +++ /dev/null @@ -1,155 +0,0 @@ -/** - * UI组件, 统一使用饿了么桌面端组件库(https://github.com/ElemeFE/element) - * - * 使用: - * 1. 项目中需要的组件进行释放(解开注释) - * - * 注意: - * 1. 打包只会包含释放(解开注释)的组件, 减少打包文件大小 - */ -import Vue from 'vue' -import { - Pagination, - Dialog, - Autocomplete, - Dropdown, - DropdownMenu, - DropdownItem, - Menu, - Submenu, - MenuItem, - MenuItemGroup, - Input, - InputNumber, - Radio, - RadioGroup, - RadioButton, - Checkbox, - CheckboxButton, - CheckboxGroup, - Switch, - Select, - Option, - OptionGroup, - Button, - ButtonGroup, - Table, - TableColumn, - DatePicker, - TimeSelect, - TimePicker, - Popover, - Tooltip, - Breadcrumb, - BreadcrumbItem, - Form, - FormItem, - Tabs, - TabPane, - Tag, - Tree, - Alert, - Slider, - Icon, - Row, - Col, - Upload, - Progress, - Badge, - Card, - Rate, - Steps, - Step, - Carousel, - CarouselItem, - Collapse, - CollapseItem, - Cascader, - ColorPicker, - Transfer, - Container, - Header, - Aside, - Main, - Footer, - Loading, - MessageBox, - Message, - Notification -} from 'element-ui' - -Vue.use(Pagination) -Vue.use(Dialog) -Vue.use(Autocomplete) -Vue.use(Dropdown) -Vue.use(DropdownMenu) -Vue.use(DropdownItem) -Vue.use(Menu) -Vue.use(Submenu) -Vue.use(MenuItem) -Vue.use(MenuItemGroup) -Vue.use(Input) -Vue.use(InputNumber) -Vue.use(Radio) -Vue.use(RadioGroup) -Vue.use(RadioButton) -Vue.use(Checkbox) -Vue.use(CheckboxButton) -Vue.use(CheckboxGroup) -Vue.use(Switch) -Vue.use(Select) -Vue.use(Option) -Vue.use(OptionGroup) -Vue.use(Button) -Vue.use(ButtonGroup) -Vue.use(Table) -Vue.use(TableColumn) -Vue.use(DatePicker) -Vue.use(TimeSelect) -Vue.use(TimePicker) -Vue.use(Popover) -Vue.use(Tooltip) -Vue.use(Breadcrumb) -Vue.use(BreadcrumbItem) -Vue.use(Form) -Vue.use(FormItem) -Vue.use(Tabs) -Vue.use(TabPane) -Vue.use(Tag) -Vue.use(Tree) -Vue.use(Alert) -Vue.use(Slider) -Vue.use(Icon) -Vue.use(Row) -Vue.use(Col) -Vue.use(Upload) -Vue.use(Progress) -Vue.use(Badge) -Vue.use(Card) -Vue.use(Rate) -Vue.use(Steps) -Vue.use(Step) -Vue.use(Carousel) -Vue.use(CarouselItem) -Vue.use(Collapse) -Vue.use(CollapseItem) -Vue.use(Cascader) -Vue.use(ColorPicker) -Vue.use(Transfer) -Vue.use(Container) -Vue.use(Header) -Vue.use(Aside) -Vue.use(Main) -Vue.use(Footer) - -Vue.use(Loading.directive) - -Vue.prototype.$loading = Loading.service -Vue.prototype.$msgbox = MessageBox -Vue.prototype.$alert = MessageBox.alert -Vue.prototype.$confirm = MessageBox.confirm -Vue.prototype.$prompt = MessageBox.prompt -Vue.prototype.$notify = Notification -Vue.prototype.$message = Message - -Vue.prototype.$ELEMENT = { size: 'medium' } diff --git a/src/element/index.js b/src/element/index.js deleted file mode 100644 index 9a2b4f2..0000000 --- a/src/element/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import '../element/element-ui' -import '../element/element-ui-theme' diff --git a/src/main.js b/src/main.js index 5daa22a..717f1ab 100644 --- a/src/main.js +++ b/src/main.js @@ -3,32 +3,25 @@ import App from '@/App' import router from '@/router' import store from '@/store' import VueCookie from 'vue-cookie' -import '@/element/index' -import '@/assets/scss/index.scss' +import ElementUI from 'element-ui' +import 'element-ui/lib/theme-chalk/index.css' import httpRequest from '@/utils/httpRequest' import { isAuth } from '@/utils' -// import cloneDeep from 'lodash/cloneDeep' import echarts from 'echarts' +import '@/assets/scss/index.scss' +import '@/element-ui-theme' import VCharts from 'v-charts' Vue.use(VCharts) - +Vue.use(ElementUI) Vue.use(VueCookie) Vue.config.productionTip = false -// 非生产环境, 适配mockjs模拟数据 // api: https://github.com/nuysoft/Mock -// if (process.env.NODE_ENV !== 'production') { -// require('@/mock') -// } - // 挂载全局 Vue.prototype.$echarts = echarts // echarts画图 Vue.prototype.$http = httpRequest // ajax请求方法 Vue.prototype.isAuth = isAuth // 权限方法 -// 保存整站vuex本地储存初始状态 -// window.SITE_CONFIG['storeState'] = cloneDeep(store.state) - /* eslint-disable no-new */ new Vue({ el: '#app',