master
xy 1 year ago
parent ffe46dfc00
commit 7e432fee6b

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 33 KiB

@ -3,32 +3,32 @@
<transition name="sidebarLogoFade"> <transition name="sidebarLogoFade">
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/"> <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
<img src="../../../assets/logo-mini.png?v=1" class="sidebar-logo"> <img src="../../../assets/logo-mini.png?v=1" class="sidebar-logo">
</router-link> </router-link>
<router-link v-else key="expand" class="sidebar-logo-link" to="/"> <router-link v-else key="expand" class="sidebar-logo-link" to="/">
<!-- <img src="../../../assets/logo-mini.png?v=1" class="sidebar-logo">--> <!-- <img src="../../../assets/logo-mini.png?v=1" class="sidebar-logo">-->
<img src="../../../assets/logo.png?v=2" class="sidebar-name-logo" /> <img src="../../../assets/logo.png?v=2" class="sidebar-name-logo">
</router-link> </router-link>
</transition> </transition>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'SidebarLogo', name: 'SidebarLogo',
props: { props: {
collapse: { collapse: {
type: Boolean, type: Boolean,
required: true required: true
} }
}, },
data() { data() {
return { return {
title: '', title: '',
logo: false logo: false
}
} }
} }
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -36,7 +36,8 @@
transition: opacity 1.5s; transition: opacity 1.5s;
} }
.sidebar-name-logo { .sidebar-name-logo {
height: 76%; width: 90%;
margin: auto;
object-fit: contain; object-fit: contain;
} }
@ -50,7 +51,6 @@
width: 100%; width: 100%;
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
background: $primaryColor;
text-align: center; text-align: center;
overflow: hidden; overflow: hidden;

@ -13,13 +13,13 @@ import App from './App'
import store from './store' import store from './store'
import router from './router' import router from './router'
import ViewUI from 'view-design'; import ViewUI from 'view-design'
import './styles/viewui-mine.less'; import './styles/viewui-mine.less'
import base from "./utils/common" import base from './utils/common'
Vue.use(ViewUI); Vue.use(ViewUI)
import moment from "moment" import moment from 'moment'
Vue.prototype.$moment = moment; Vue.prototype.$moment = moment
Vue.prototype.base = base; Vue.prototype.base = base
import '@/icons' // icon import '@/icons' // icon
import '@/permission' // permission control import '@/permission' // permission control
@ -38,19 +38,18 @@ if (process.env.NODE_ENV === 'production') {
import VueParticles from 'vue-particles' import VueParticles from 'vue-particles'
Vue.use(VueParticles) Vue.use(VueParticles)
// set ElementUI lang to EN // set ElementUI lang to EN
//Vue.use(ElementUI, { locale }) // Vue.use(ElementUI, { locale })
// 如果想要中文版 element-ui按如下方式声明 // 如果想要中文版 element-ui按如下方式声明
Vue.use(ElementUI) Vue.use(ElementUI)
import Message from 'element-ui/lib/message'; import Message from 'element-ui/lib/message'
Vue.config.productionTip = false Vue.config.productionTip = false
import avue from '@smallwei/avue'; import avue from '@smallwei/avue'
import '@smallwei/avue/lib/index.css'; import '@smallwei/avue/lib/index.css'
Vue.use(avue) Vue.use(avue)
import AvueMap from 'avue-plugin-map' import AvueMap from 'avue-plugin-map'
Vue.use(AvueMap); Vue.use(AvueMap)
import VxeUI from 'vxe-pc-ui' import VxeUI from 'vxe-pc-ui'
import 'vxe-pc-ui/lib/style.css' import 'vxe-pc-ui/lib/style.css'
@ -70,8 +69,8 @@ Vue.use(VxeUITable)
Vue.directive('loadMore', { Vue.directive('loadMore', {
bind(el, binding) { bind(el, binding) {
const selectWrap = el.querySelector('.el-scrollbar__wrap') const selectWrap = el.querySelector('.el-scrollbar__wrap')
selectWrap.addEventListener('scroll', function () { selectWrap.addEventListener('scroll', function() {
let sign = 0 const sign = 0
const scrollDistance = this.scrollHeight - this.scrollTop - this.clientHeight const scrollDistance = this.scrollHeight - this.scrollTop - this.clientHeight
if (scrollDistance <= sign) { if (scrollDistance <= sign) {
binding.value() binding.value()
@ -80,26 +79,26 @@ Vue.directive('loadMore', {
} }
}) })
import LxHeader from "@/components/LxHeader" import LxHeader from '@/components/LxHeader'
Vue.component('lx-header',LxHeader) Vue.component('lx-header', LxHeader)
import XyTable from '@/components/XyTable' import XyTable from '@/components/XyTable'
Vue.component('xy-table',XyTable) Vue.component('xy-table', XyTable)
import XyDialog from '@/components/XyDialog' import XyDialog from '@/components/XyDialog'
Vue.component('xy-dialog',XyDialog) Vue.component('xy-dialog', XyDialog)
import XySelectors from '@/components/XySelectors' import XySelectors from '@/components/XySelectors'
Vue.component('xy-selectors',XySelectors) Vue.component('xy-selectors', XySelectors)
import draggable from 'vuedraggable'; import draggable from 'vuedraggable'
Vue.component('draggable',draggable) Vue.component('draggable', draggable)
import tinymce from '@/components/XyTinymce' import tinymce from '@/components/XyTinymce'
Vue.component('my-tinymce',tinymce) Vue.component('my-tinymce', tinymce)
import myMap from "@/components/XyMap" import myMap from '@/components/XyMap'
Vue.component('my-map',myMap) Vue.component('my-map', myMap)
import afTableColumn from 'af-table-column' import afTableColumn from 'af-table-column'
Vue.component('af-table-column',afTableColumn) Vue.component('af-table-column', afTableColumn)
Vue.prototype.$integrateData = (target,value) => { Vue.prototype.$integrateData = (target, value) => {
for(let i in target){ for (const i in target) {
if(target.hasOwnProperty(i) && value.hasOwnProperty(i)){ if (target.hasOwnProperty(i) && value.hasOwnProperty(i)) {
target[i] = value[i] target[i] = value[i]
} }
} }

Loading…
Cancel
Save