uptada style
This commit is contained in:
parent
ef10dfdd69
commit
92a231cacb
@ -26,10 +26,11 @@
|
|||||||
<div @click="open2"
|
<div @click="open2"
|
||||||
|
|
||||||
style="position:absolute;bottom:-40px;display: flex;justify-content: center;align-items: center;cursor: pointer">
|
style="position:absolute;bottom:-40px;display: flex;justify-content: center;align-items: center;cursor: pointer">
|
||||||
<el-tooltip v-if="getHomePath()!=='/ncmatchHome/index'" class="item" effect="light" content="联系销售" placement="left">
|
<!-- 摄像头 -->
|
||||||
|
<!-- <el-tooltip v-if="getHomePath()!=='/ncmatchHome/index'" class="item" effect="light" content="联系销售" placement="left">
|
||||||
<span class="el-icon-video-camera"
|
<span class="el-icon-video-camera"
|
||||||
style="font-weight: 550;font-size: 22px;"></span>
|
style="font-weight: 550;font-size: 22px;"></span>
|
||||||
</el-tooltip>
|
</el-tooltip> -->
|
||||||
|
|
||||||
<!-- </div>-->
|
<!-- </div>-->
|
||||||
<!-- <div class="cart-entry-wrapper" style="visibility: visible;">-->
|
<!-- <div class="cart-entry-wrapper" style="visibility: visible;">-->
|
||||||
|
|||||||
@ -1,33 +1,20 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="sidebar-logo-container" style="pointer-events: none!important;" :class="{ collapse: collapse }">
|
<div class="sidebar-logo-container" :class="{ collapse: collapse }">
|
||||||
<transition name="sidebarLogoFade">
|
<transition name="sidebarLogoFade">
|
||||||
<span style="cursor: default" v-if="collapse" key="collapse" class="sidebar-logo-link"
|
<span style="cursor: default" v-if="collapse" key="collapse" class="sidebar-logo-link">
|
||||||
>
|
|
||||||
<img :src="logoImg" alt="" style="width:55px;height:40px;margin-top: 20px"/>
|
<img :src="logoImg" alt="" style="width:55px;height:40px;margin-top: 20px"/>
|
||||||
</span>
|
</span>
|
||||||
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
|
<div v-else key="expand" class="sidebar-logo-link" @click="goHome">
|
||||||
<!-- <span style="display: flex" class="tip1">(测试中)</span>-->
|
|
||||||
<el-row class="logo" :span="24">
|
<el-row class="logo" :span="24">
|
||||||
<el-row class="logoimg myLogo" :span="24">
|
<el-row class="logoimg myLogo" :span="24">
|
||||||
<!-- <div class="imgGo"></div>-->
|
<img v-if="logoImg" :src="logoImg" alt=""
|
||||||
<img v-if="logoImg" @click="goHome" :src="logoImg" alt=""
|
style="margin-left: 5px;width:50px;height:35px;cursor: pointer;"/>
|
||||||
style="margin-left: 5px;width:50px;height:35px;"/>
|
|
||||||
<!-- <el-col :span="6">-->
|
|
||||||
<!-- <img :src="logoImg" alt="" style="margin-left: 5px;width:50px;height:35px;"/>-->
|
|
||||||
<!-- </el-col>-->
|
|
||||||
<!-- <el-col class="text" :span="18">-->
|
|
||||||
<!-- <div v-if="photosUrl && photosUrl.orgname != '业主机构'">-->
|
|
||||||
<!-- {{ logoText }}-->
|
|
||||||
<!-- </div>-->
|
|
||||||
<!-- <img v-else src="../../../assets/kyy/logo_text.png" alt=""-->
|
|
||||||
<!-- style="width: 100%;height:100%;padding: 5px 7px 0 7px"/>-->
|
|
||||||
<!-- </el-col>-->
|
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row v-if="false" class="logotext" :span="24">
|
<el-row v-if="false" class="logotext" :span="24">
|
||||||
<span class="sidebar-title" style="color: black">{{ title }} </span>
|
<span class="sidebar-title" style="color: black">{{ title }} </span>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-row>
|
</el-row>
|
||||||
</router-link>
|
</div>
|
||||||
</transition>
|
</transition>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@ -49,7 +36,6 @@ export default {
|
|||||||
photosUrl: null,
|
photosUrl: null,
|
||||||
title: "平台测试中",
|
title: "平台测试中",
|
||||||
logoImg: "",
|
logoImg: "",
|
||||||
// logoImg: require("../../../assets/test2.png"),
|
|
||||||
logoText: "",
|
logoText: "",
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@ -62,15 +48,7 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
goHome() {
|
goHome() {
|
||||||
console.log("走了goHome@@")
|
console.log("走了goHome@@")
|
||||||
this.$router.push('/product/productHome')
|
this.$router.push('/homePage/index')
|
||||||
// if (window.location.href.includes('http://localhost/')) {
|
|
||||||
// window.location.href = 'http://localhost:9527/#/homePage/index'
|
|
||||||
// } else if (window.location.href.includes('dev')) {
|
|
||||||
// window.location.href = 'https://www.kaiyuancloud.cn/dev'
|
|
||||||
// } else {
|
|
||||||
// window.location.href = 'https://www.kaiyuancloud.cn'
|
|
||||||
// }
|
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
init() {
|
init() {
|
||||||
@ -100,12 +78,6 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.imgGo {
|
|
||||||
border: 1px solid red;
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidebarLogoFade-enter-active {
|
.sidebarLogoFade-enter-active {
|
||||||
transition: opacity 1.5s;
|
transition: opacity 1.5s;
|
||||||
}
|
}
|
||||||
@ -116,10 +88,6 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.sidebar-logo-container {
|
.sidebar-logo-container {
|
||||||
a {
|
|
||||||
cursor: default !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
position: relative;
|
position: relative;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 60px;
|
height: 60px;
|
||||||
@ -130,6 +98,7 @@ export default {
|
|||||||
& .sidebar-logo-link {
|
& .sidebar-logo-link {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
.logo {
|
.logo {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@ -154,18 +123,11 @@ export default {
|
|||||||
.el-col {
|
.el-col {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
padding: 3px;
|
padding: 3px;
|
||||||
|
|
||||||
img {
|
|
||||||
// width: 100%;
|
|
||||||
// height: 100%;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.logotext {
|
.logotext {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
// color: #fff;
|
|
||||||
// color: rgba(191, 203, 217);
|
|
||||||
color: rgb(223, 226, 229);
|
color: rgb(223, 226, 229);
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
@ -190,7 +152,6 @@ export default {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
position: relative;
|
position: relative;
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
//border: 1px solid red;
|
|
||||||
|
|
||||||
img {
|
img {
|
||||||
width: 75% !important;
|
width: 75% !important;
|
||||||
|
|||||||
@ -1,32 +1,15 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="index">
|
<div class="index">
|
||||||
<!-- <div class="log"> -->
|
|
||||||
<!-- <div style="color:#fff;height:30px;">1232</div> -->
|
|
||||||
<!-- <el-row :gutter="20">
|
|
||||||
<el-col :span="6">
|
|
||||||
<img src="../../../../public/logos/logo_rgba/noWhite/kkyLogoNoWhiteNoText.png" alt="">
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="18">
|
|
||||||
<img src="../../../../public/logos/logo_rgba/noWhite/kkyLogoNoWhiteText.png.png" alt="">
|
|
||||||
</el-col>
|
|
||||||
</el-row> -->
|
|
||||||
<!-- </div> -->
|
|
||||||
<div :class="{ 'has-logo': showLogo }" class="sidebar-container">
|
<div :class="{ 'has-logo': showLogo }" class="sidebar-container">
|
||||||
<logo @click="$router.push('/homePage/index')" v-if="showLogo" :collapse="isCollapse"/>
|
<!-- logo -->
|
||||||
<!-- 将 happy-scroll 移到 el-menu 外层,并移除 el-menu 上的固定高度 -->
|
<Logo v-if="showLogo" :collapse="isCollapse" />
|
||||||
|
<!-- 菜单 -->
|
||||||
<happy-scroll color="rgba(0,0,0,0.5)" size="5" class="menu-scroll-container">
|
<happy-scroll color="rgba(0,0,0,0.5)" size="5" class="menu-scroll-container">
|
||||||
<el-menu
|
<el-menu :collapse="isCollapse" :background-color="variables.menuBg" :text-color="variables.menuText"
|
||||||
:collapse="isCollapse"
|
:unique-opened="true" :active-text-color="variables.menuActiveText" :collapse-transition="false"
|
||||||
:background-color="variables.menuBg"
|
:default-active="$route.path" mode="vertical" class="el-menu-vertical">
|
||||||
:text-color="variables.menuText"
|
<sidebar-item v-for="(route, index) in permission_routes" :key="index" :item="route"
|
||||||
:unique-opened="true"
|
:base-path="route.path" />
|
||||||
:active-text-color="variables.menuActiveText"
|
|
||||||
:collapse-transition="false"
|
|
||||||
:default-active="$route.path"
|
|
||||||
mode="vertical"
|
|
||||||
class="el-menu-vertical"
|
|
||||||
>
|
|
||||||
<sidebar-item v-for="(route, index) in permission_routes" :key="index" :item="route" :base-path="route.path"/>
|
|
||||||
</el-menu>
|
</el-menu>
|
||||||
</happy-scroll>
|
</happy-scroll>
|
||||||
</div>
|
</div>
|
||||||
@ -34,22 +17,23 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import {mapGetters} from "vuex";
|
import { mapGetters } from "vuex";
|
||||||
import Logo from "./Logo";
|
|
||||||
import SidebarItem from "./SidebarItem.vue";
|
import SidebarItem from "./SidebarItem.vue";
|
||||||
import variables from "../../../styles/variables.scss";
|
import variables from "@/styles/variables.scss";
|
||||||
|
import Logo from "./Logo.vue";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
name: "Sidebar",
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
role: ''
|
role: ''
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
components: {SidebarItem, Logo},
|
components: { SidebarItem, Logo },
|
||||||
computed: {
|
computed: {
|
||||||
...mapGetters(["permission_routes", "sidebar"]),
|
...mapGetters(["permission_routes", "sidebar"]),
|
||||||
showLogo() {
|
showLogo() {
|
||||||
return true
|
return true;
|
||||||
},
|
},
|
||||||
variables() {
|
variables() {
|
||||||
return variables;
|
return variables;
|
||||||
@ -58,85 +42,67 @@ export default {
|
|||||||
return !this.sidebar.opened;
|
return !this.sidebar.opened;
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
mounted() {
|
methods: {
|
||||||
|
|
||||||
},
|
}
|
||||||
methods: {}
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style lang="scss" scoped>
|
|
||||||
/* stylelint-disable */
|
|
||||||
.index {
|
|
||||||
//margin-top: 50px;
|
|
||||||
width: 100%; // 确保父容器宽度为100%
|
|
||||||
height: 100%; // 占满父级高度
|
|
||||||
position: relative; // 为内部绝对定位元素提供参考
|
|
||||||
|
|
||||||
.log {
|
<style lang="scss" scoped>
|
||||||
width: 100%;
|
.index {
|
||||||
height: 80px; // Logo区域高度
|
width: 100%;
|
||||||
flex-shrink: 0; // 防止在Flex布局中被压缩
|
height: 100%;
|
||||||
}
|
position: relative;
|
||||||
|
|
||||||
.sidebar-container {
|
.sidebar-container {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
box-sizing: border-box; // 包含padding/border在width内计算
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
.menu-scroll-container {
|
.menu-scroll-container {
|
||||||
flex: 1; // 占据剩余空间
|
flex: 1;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
overflow-x: hidden; // 关键:隐藏水平滚动条
|
overflow-x: hidden;
|
||||||
|
|
||||||
::v-deep .happy-scroll-container {
|
::v-deep .happy-scroll-container {
|
||||||
width: 100% !important; // 强制容器宽度100%
|
width: 100% !important;
|
||||||
// 重要:移除可能由库添加的 min-width
|
|
||||||
min-width: unset !important;
|
min-width: unset !important;
|
||||||
|
|
||||||
.happy-scroll-content {
|
.happy-scroll-content {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
min-width: unset !important; // 确保内容区域也不设置最小宽度
|
min-width: unset !important;
|
||||||
box-sizing: border-box; // 包含padding/border在width内计算
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
::v-deep .el-menu-vertical {
|
::v-deep .el-menu-vertical {
|
||||||
border: none; // 移除默认边框
|
border: none;
|
||||||
height: 100%; // 撑满滚动容器
|
height: 100%;
|
||||||
width: 100% !important; // 关键:强制菜单宽度100%,匹配容器
|
width: 100% !important;
|
||||||
min-width: 100% !important; // 关键:强制最小宽度100%
|
min-width: 100% !important;
|
||||||
box-sizing: border-box; // 包含padding/border在width内计算
|
box-sizing: border-box;
|
||||||
|
|
||||||
// 防止菜单项文字过长导致溢出
|
|
||||||
.el-submenu__title,
|
.el-submenu__title,
|
||||||
.el-menu-item {
|
.el-menu-item {
|
||||||
white-space: nowrap; // 防止文字换行
|
white-space: nowrap;
|
||||||
overflow: hidden; // 隐藏溢出内容
|
overflow: hidden;
|
||||||
text-overflow: ellipsis; // 溢出时显示省略号
|
text-overflow: ellipsis;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 针对折叠状态的特殊处理
|
|
||||||
::v-deep .el-menu--collapse {
|
::v-deep .el-menu--collapse {
|
||||||
// Element UI 默认折叠宽度为 64px
|
width: 64px !important;
|
||||||
width: 64px !important; // 明确折叠宽度
|
|
||||||
min-width: 64px !important;
|
min-width: 64px !important;
|
||||||
|
|
||||||
// 确保折叠时子菜单项不溢出
|
|
||||||
.el-submenu__title,
|
.el-submenu__title,
|
||||||
.el-menu-item {
|
.el-menu-item {
|
||||||
text-overflow: clip; // 折叠时直接裁剪文字
|
text-overflow: clip;
|
||||||
justify-content: center; // 图标居中
|
justify-content: center;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* stylelint-enable */
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -390,14 +390,9 @@ export const asyncRoutes = [
|
|||||||
path: "productHome",
|
path: "productHome",
|
||||||
component: () => import('@/views/product/productHome/productIndex/index.vue'),
|
component: () => import('@/views/product/productHome/productIndex/index.vue'),
|
||||||
name: 'baiduProduct',
|
name: 'baiduProduct',
|
||||||
meta: { title: "概览", fullPath: "/product/productHome", noCache: true }
|
|
||||||
},
|
},
|
||||||
// {
|
// {
|
||||||
// path: '/external-link',
|
// path: '/external-link',
|
||||||
// name: 'External Link',
|
|
||||||
// // 使用 meta 字段来标记这是一个外部链接
|
|
||||||
// meta: {title: "首页", external: true, url: 'https://www.baidu.com'},
|
|
||||||
// },
|
|
||||||
// {
|
// {
|
||||||
//
|
//
|
||||||
// path: "productHome",
|
// path: "productHome",
|
||||||
|
|||||||
@ -9,6 +9,9 @@
|
|||||||
.p10{
|
.p10{
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
}
|
}
|
||||||
|
.p20{
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
.h100{
|
.h100{
|
||||||
height: calc(100vh - 100px);
|
height: calc(100vh - 100px);
|
||||||
}
|
}
|
||||||
@ -20,3 +23,12 @@
|
|||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
.ml10{
|
||||||
|
margin-left: 10px;
|
||||||
|
}
|
||||||
|
.mt10{
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
|
.mt20{
|
||||||
|
margin-top: 20px;
|
||||||
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div class="backgroundColor">
|
||||||
<div style="display:flex;">
|
<div style="display:flex;">
|
||||||
<el-button type="primary" size="small" @click="addDocument" style="margin:10px 0;">新增文档</el-button>
|
<el-button type="primary" size="small" @click="addDocument" style="margin:10px 0;">新增文档</el-button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div >
|
||||||
<div
|
<div style="display: flex;justify-content: flex-start;align-items: center;background: #fff;padding: 15px 20px;border-radius: 8px">
|
||||||
style="display: flex;justify-content: flex-start;align-items: center;background: #fff;padding: 15px 5px;border-radius: 8px">
|
|
||||||
<el-input clearable size="mini" placeholder="请输入查询内容" style="width: 150px;margin-right: 10px"
|
<el-input clearable size="mini" placeholder="请输入查询内容" style="width: 150px;margin-right: 10px"
|
||||||
v-model="searchValue"></el-input>
|
v-model="searchValue"></el-input>
|
||||||
<el-button size="mini" icon="el-icon-search" :loading="loadingBtn" @click="searchProduct">查询</el-button>
|
<el-button size="mini" icon="el-icon-search" :loading="loadingBtn" @click="searchProduct">查询</el-button>
|
||||||
@ -73,7 +72,7 @@
|
|||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-drawer>
|
</el-drawer>
|
||||||
<div class="productList">
|
<div class="productList mt10">
|
||||||
<div style="width: 100%;height: 100%;display: flex;justify-content: center;align-items: center"
|
<div style="width: 100%;height: 100%;display: flex;justify-content: center;align-items: center"
|
||||||
v-if="showLoading">
|
v-if="showLoading">
|
||||||
<BigLoading></BigLoading>
|
<BigLoading></BigLoading>
|
||||||
@ -405,9 +404,11 @@ export default {
|
|||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
.productList {
|
.productList {
|
||||||
|
overflow: hidden;
|
||||||
|
padding-top: 10px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
//border: 1px solid red;
|
//border: 1px solid red;
|
||||||
height: calc(100vh - 130px);
|
height: calc(100vh - 160px);
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user