diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index ab036f15..e8d4cfc5 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -204,7 +204,7 @@ img { &.z-iframe { padding-top: 0; .aui-content--tabs { - padding-top: 10px; + padding-top: 0; } } } diff --git a/src/main.js b/src/main.js index ca2d3996..4da8f1c8 100644 --- a/src/main.js +++ b/src/main.js @@ -1,69 +1,76 @@ -import Vue from 'vue' -import Element from 'element-ui' +import Vue from "vue"; +import Element from "element-ui"; -import App from '@/App' -import i18n from '@/i18n' -import router from '@/router' +import App from "@/App"; +import i18n from "@/i18n"; +import router from "@/router"; // import store1 from '@/store' -import '@/icons' -import '@/element-ui/theme/index.css' -import '@/assets/scss/aui.scss' -import http from '@/utils/request' -import renRadioGroup from '@/components/ren-radio-group' -import renSelect from '@/components/ren-select' -import renProcessMultiple from '@/components/ren-process-multiple' -import renProcessStart from '@/components/ren-process-start' -import renProcessRunning from '@/components/ren-process-running' -import renProcessDetail from '@/components/ren-process-detail' -import renDeptTree from '@/components/ren-dept-tree' -import renRegionTree from '@/components/ren-region-tree' -import cloneDeep from 'lodash/cloneDeep' +import "@/icons"; +import "@/element-ui/theme/index.css"; +import "@/assets/scss/aui.scss"; +import http from "@/utils/request"; +import renRadioGroup from "@/components/ren-radio-group"; +import renSelect from "@/components/ren-select"; +import renProcessMultiple from "@/components/ren-process-multiple"; +import renProcessStart from "@/components/ren-process-start"; +import renProcessRunning from "@/components/ren-process-running"; +import renProcessDetail from "@/components/ren-process-detail"; +import renDeptTree from "@/components/ren-dept-tree"; +import renRegionTree from "@/components/ren-region-tree"; +import cloneDeep from "lodash/cloneDeep"; // axios封装 -import ajax from '@/js/ajax' +import ajax from "@/js/ajax"; // service -import service from '@/js/service' +import service from "@/js/service"; // vuex处理多个组件共享状态 -import store from '@/js/store' +import store from "@/js/store"; //系统工具 -import util from '@js/util' +import util from "@js/util"; +import Cookies from "js-cookie"; +import getQueryPara from "dai-js/modules/getQueryPara"; + +// 兼容token传参登录 +if (getQueryPara("token")) { + Cookies.set("token", getQueryPara("token")); +} window.app = Object.assign( {}, { util, ajax, - service + service, } -) +); -Vue.config.productionTip = false +Vue.config.productionTip = false; -Vue.use(renRadioGroup) -Vue.use(renSelect) -Vue.use(renDeptTree) -Vue.use(renRegionTree) -Vue.use(renProcessMultiple) -Vue.use(renProcessStart) -Vue.use(renProcessRunning) -Vue.use(renProcessDetail) -Vue.use(Element) +Vue.use(renRadioGroup); +Vue.use(renSelect); +Vue.use(renDeptTree); +Vue.use(renRegionTree); +Vue.use(renProcessMultiple); +Vue.use(renProcessStart); +Vue.use(renProcessRunning); +Vue.use(renProcessDetail); +Vue.use(Element); Vue.use(Element, { - size: 'default', - i18n: (key, value) => i18n.t(key, value) -}) + size: "default", + i18n: (key, value) => i18n.t(key, value), +}); // 挂载全局 -Vue.prototype.$http = http +Vue.prototype.$http = http; // Vue.prototype.$getDictLabel = getDictLabel // 保存整站vuex本地储存初始状态 -window.SITE_CONFIG['storeState'] = cloneDeep(store.state) +window.SITE_CONFIG["storeState"] = cloneDeep(store.state); new Vue({ i18n, router, store, - render: (h) => h(App) -}).$mount('#app') + render: (h) => h(App), +}).$mount("#app");