dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

前端

Browse Source
This commit is contained in:
xvv 2024-07-08 17:51:30 +08:00
parent 11b1bd3580
commit 9df5ee4f7d
6 changed files with 53 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
fuintAdmin_zt/src/assets/images/add.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 400 B

BIN
fuintAdmin_zt/src/assets/images/detele.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 249 B

BIN
fuintAdmin_zt/src/assets/images/qp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 571 B

BIN
fuintAdmin_zt/src/assets/images/tzzx.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 338 B

63
fuintAdmin_zt/src/layout/components/Navbar.vue
View File

@ -1,19 +1,38 @@
<template>
<div class="navbar">
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
<div style="display: flex;align-items: center" >
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
<div class="title-logo">
<div>
百业兴智慧油站欢迎您
</div>
</div>
</div>
<!-- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>-->
<top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
<!-- <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>-->
<div class="right-menu">
<template v-if="device!=='mobile'">
<search id="header-search" class="right-menu-item" />
<screenfull id="screenfull" class="right-menu-item hover-effect" />
<FuintDoc id="fuint-doc" class="right-menu-item hover-effect" />
</template>
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper">
<img :src="avatar" class="user-avatar">
<!-- <template v-if="device!=='mobile'">-->
<!-- <search id="header-search" class="right-menu-item" />-->
<!-- <screenfull id="screenfull" class="right-menu-item hover-effect" />-->
<!-- <FuintDoc id="fuint-doc" class="right-menu-item hover-effect" />-->
<!-- </template>-->
<div class="d-s"style="margin-right: 20px">
<img src="../../assets/images/qp.png" style="width: 28px;height: 28px;margin-right: 5px">
<div>全屏</div>
</div>
<div class="d-s"style="margin-right: 20px">
<img src="../../assets/images/tzzx.png" style="width: 28px;height: 28px;margin-right: 5px">
<div>通知中心</div>
</div>
<el-dropdown class="d-s" trigger="click">
<div class="d-s">
<div class="title_">百业兴总部</div>
<img :src="avatar" style="width: 28px;height: 28px;margin: 0px 10px" />
<span class="user-name">{{ name }}</span>
<i class="el-icon-caret-bottom"/>
</div>
@ -27,13 +46,7 @@
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="title-logo">
<div>
百业兴智慧油站欢迎您
</div>
</div>
</div>
</template>
@ -101,6 +114,16 @@ export default {
</script>
<style lang="scss" scoped>
.d-s{
display: flex;
align-items: center;
}
.title_{
font-weight: bold;
font-size: 18px;
color: #333333;
}
.navbar {
height: 90px;
overflow: hidden;
@ -113,7 +136,9 @@ export default {
box-shadow: 0 1px 4px rgba(0,21,41,.08);
box-sizing: border-box;
padding-top:25px ;
display: flex;
align-items: center;
justify-content: space-between;
.hamburger-container {
line-height: 46px;
height: 100%;
@ -154,9 +179,9 @@ export default {
}
.right-menu {
float: right;
display: flex;
height: 100%;
line-height: 50px;
align-items: center;
&:focus {
outline: none;

35
fuintAdmin_zt/src/views/Site/index.vue
View File

@ -381,24 +381,11 @@
</el-input>
</el-form-item>
</el-col>
</template>
<template v-if="ruleForm.turnoverType === '5'">
<el-col :span="10">
<el-row>
<el-form-item label="时间范围">
<!-- <el-date-picker-->
<!-- :disabled="isTopDept"-->
<!-- v-model="timeFrame"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- type="daterange"-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期">-->
<!-- </el-date-picker>-->
<el-date-picker
:disabled="isTopDept"
v-model="beginTime"
@ -498,10 +485,6 @@
</el-row>
</el-col>
</template>
<template v-if="ruleForm.turnoverType === '5'">
<el-col :span="10">
<el-row>
@ -526,7 +509,6 @@
</el-form-item>
</el-row>
</el-col>
<el-col :span="8">
<el-form-item label="价格">
<el-input :disabled="isTopDept" v-model="ruleForm.prepaidAmount">
@ -535,9 +517,6 @@
</el-form-item>
</el-col>
</template>
<template v-if="ruleForm.turnoverType === '6'">
<el-col :span="10">
@ -1774,19 +1753,22 @@ export default {
console.log("store",store)
let isAdd = data.deptType == '3'
return (
<span class="custom-tree-node">
<div class="custom-tree-node" style="display: flex;align-items: center;">
<span class="custom-tree-box">{node.label}</span>
<span>
<span style="display: flex;align-items: center;">
{!isAdd ?
<el-button size="mini" type="text" on-click={() => this.append(data)}>新增</el-button>
< img alt="" src="http://47.95.206.185:83/add.png" style=" width: 20px;height: 20px; " on-click={() => this.append(data)}/>
: null
}
{node.level !== 1 ?
<el-button size="mini" type="text" on-click={() => this.remove(node, data)}>删除</el-button>
< img alt="" src="http://47.95.206.185:83/del.png" style=" width: 20px;height: 20px; " on-click={() => this.remove(node, data)}/>
: null
}
</span>
</span>);
</div>);
},
@ -2189,6 +2171,7 @@ export default {
}
.custom-tree-box{
margin-right: 10px;
}
</style>