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

'121'

Browse Source
This commit is contained in:
user 2023-10-10 17:39:35 +08:00
parent 55ec1ac12c
commit 791feaee5a
22 changed files with 439 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintAdmin/.env.development
View File

@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = fuint会员营销管理系统
VUE_APP_TITLE = 蓝鲸智慧油站系统
# 开发环境配置
ENV = 'development'
@ -11,4 +11,4 @@ VUE_APP_BASE_API = '/dev-api'
VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址
VUE_APP_SERVER_URL = 'http://localhost:8080/'
VUE_APP_SERVER_URL = 'http://192.168.1.4:8080/'

4
fuintAdmin/.env.production
View File

@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = fuint会员营销管理系统
VUE_APP_TITLE = 蓝鲸智慧油站系统
# 生产环境配置
ENV = 'production'
@ -11,4 +11,4 @@ VUE_APP_BASE_API = '/fuint-application/'
VUE_APP_PUBLIC_PATH = '/fuintAdmin/'
# 后端接口地址
VUE_APP_SERVER_URL = 'https://www.fuint.cn/fuint-application/'
VUE_APP_SERVER_URL = 'http://192.168.1.4:8080/'

4
fuintAdmin/.env.staging
View File

@ -1,5 +1,5 @@
# 页面标题
VUE_APP_TITLE = fuint会员营销管理系统
VUE_APP_TITLE = 蓝鲸智慧油站系统
# 测试环境配置
ENV = 'staging'
@ -11,4 +11,4 @@ VUE_APP_BASE_API = '/stage-api'
VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址
VUE_APP_SERVER_URL = 'http://localhost:8082/stage-api/'
VUE_APP_SERVER_URL = 'http://192.168.1.4:8080/'

4
fuintAdmin/src/App.vue
View File

@ -5,7 +5,7 @@
</template>
<script>
export default {
export default {
name: 'App',
metaInfo() {
return {
@ -15,5 +15,5 @@ export default {
}
}
}
}
}
</script>

60
fuintAdmin/src/api/dict/type.js Normal file
View File

@ -0,0 +1,60 @@
import request from '@/utils/request'
// 查询字典类型列表
export function listType(query) {
return request({
url: '/system/dict/type/list',
method: 'get',
params: query
})
}
// 查询字典类型详细
export function getType(dictId) {
return request({
url: '/system/dict/type/' + dictId,
method: 'get'
})
}
// 新增字典类型
export function addType(data) {
return request({
url: '/system/dict/type',
method: 'post',
data: data
})
}
// 修改字典类型
export function updateType(data) {
return request({
url: '/system/dict/type',
method: 'put',
data: data
})
}
// 删除字典类型
export function delType(dictId) {
return request({
url: '/system/dict/type/' + dictId,
method: 'delete'
})
}
// 刷新字典缓存
export function refreshCache() {
return request({
url: '/system/dict/type/refreshCache',
method: 'delete'
})
}
// 获取字典选择框列表
export function optionselect() {
return request({
url: '/system/dict/type/optionselect',
method: 'get'
})
}

BIN
fuintAdmin/src/assets/images/bolang.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
fuintAdmin/src/assets/logo/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

1
fuintAdmin/src/assets/styles/fuint.scss
View File

@ -131,6 +131,7 @@
margin-bottom: 10px;
margin-top: 15px;
padding: 10px 20px !important;
background: transparent;
}
/* tree border */

1
fuintAdmin/src/assets/styles/index.scss
View File

@ -131,6 +131,7 @@ aside {
.pagination-container {
margin-top: 30px;
}
.text-center {

12
fuintAdmin/src/assets/styles/variables.scss
View File

@ -9,16 +9,16 @@ $yellow:#FEC171;
$panGreen: #30B08F;
// 默认菜单主题风格
$base-menu-color:#bfcbd9;
$base-menu-color-active:#f4f4f5;
$base-menu-background:#304156;
$base-menu-color:#ffffff;// 菜单全部字体颜色
$base-menu-color-active:#ffffff;// 父级菜单激活的字体颜色
$base-menu-background:#1a5982;
$base-logo-title-color: #ffffff;
$base-menu-light-color:rgba(0,0,0,.70);
$base-menu-light-color:#ffffff;
$base-menu-light-background:#ffffff;
$base-logo-light-title-color: #001529;
$base-logo-light-title-color: #1a5982;
$base-sub-menu-background:#1f2d3d;
$base-sub-menu-background:#18547a;//展开的背景色
$base-sub-menu-hover:#001528;
$base-sidebar-width: 200px;

2
fuintAdmin/src/components/Pagination/index.vue
View File

@ -105,7 +105,7 @@ export default {
<style scoped>
.pagination-container {
background: #fff;
background: transparent;
padding: 32px 16px;
}
.pagination-container.hidden {

6
fuintAdmin/src/components/RightToolbar/index.vue
View File

@ -1,9 +1,9 @@
<template>
<div class="top-right-btn">
<el-row>
<el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
<el-button size="mini" circle icon="el-icon-search" @click="toggleSearch()" />
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">-->
<!-- <el-button size="mini" circle icon="el-icon-search" @click="toggleSearch()" />-->
<!-- </el-tooltip>-->
<el-tooltip class="item" effect="dark" content="刷新" placement="top">
<el-button size="mini" circle icon="el-icon-refresh" @click="refresh()" />
</el-tooltip>

9
fuintAdmin/src/layout/components/AppMain.vue
View File

@ -25,24 +25,25 @@ export default {
<style lang="scss" scoped>
.app-main {
/* 50= navbar 50 */
min-height: calc(100vh - 50px);
min-height: calc(100vh - 110px);
width: 100%;
position: relative;
overflow: hidden;
}
.fixed-header+.app-main {
padding-top: 50px;
padding-top: 110px;
}
.hasTagsView {
.app-main {
/* 84 = navbar + tags-view = 50 + 34 */
min-height: calc(100vh - 84px);
min-height: calc(100vh - 110px);
}
.fixed-header+.app-main {
padding-top: 84px;
padding-top: 130px;
}
}
</style>

41
fuintAdmin/src/layout/components/Navbar.vue
View File

@ -1,8 +1,10 @@
<template>
<div class="navbar">
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
<!-- <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />-->
<!-- <breadcrumb id="breadcrumb-container" class="breadcrumb-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" />
@ -25,6 +27,15 @@
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="title-logo">
<div >
<img src="../../assets/logo/logo.png" alt="" style="width: 60px;height: 50px; margin-right: 10px">
</div>
<div>
蓝鲸智慧油站欢迎您
</div>
</div>
</div>
</template>
@ -93,12 +104,19 @@ export default {
<style lang="scss" scoped>
.navbar {
height: 50px;
height: 90px;
overflow: hidden;
position: relative;
background: #fff;
box-shadow: 0 1px 4px rgba(0,21,41,.08);
background: #144a6e;
background-image: url("../../assets/images/bolang.png") ;
background-size: 100% 100%;
background-size: cover;
background-repeat: no-repeat;
box-shadow: 0 1px 4px rgba(0,21,41,.08);
box-sizing: border-box;
padding-top:25px ;
position: relative;
.hamburger-container {
line-height: 46px;
height: 100%;
@ -111,6 +129,17 @@ export default {
background: rgba(0, 0, 0, .025)
}
}
.title-logo{
position: absolute;
top: 50%; /* 将元素垂直向上移动容器高度的50% */
left: 50%; /* 将元素水平向左移动容器宽度的50% */
transform: translate(-50%, -50%); /* 通过移动元素的左上角使其居中 */
color: #ffffff;
font-size: 24px;
font-weight: bold;
display: flex;
align-items: center;
}
.breadcrumb-container {
float: left;
@ -140,7 +169,7 @@ export default {
padding: 0 8px;
height: 100%;
font-size: 18px;
color: #5a5e66;
color: #ffffff;
vertical-align: text-bottom;
&.hover-effect {

18
fuintAdmin/src/layout/components/TagsView/index.vue
View File

@ -50,9 +50,9 @@ export default {
routes() {
return this.$store.state.permission.routes
},
theme() {
return this.$store.state.settings.theme;
}
// theme() {
// return this.$store.state.settings.theme;
// }
},
watch: {
$route() {
@ -68,8 +68,8 @@ export default {
}
},
mounted() {
this.initTags()
this.addTags()
// this.initTags()
// this.addTags()
},
methods: {
isActive(route) {
@ -78,8 +78,8 @@ export default {
activeStyle(tag) {
if (!this.isActive(tag)) return {};
return {
"background-color": this.theme,
"border-color": this.theme
"background-color": '#409EFF',
"border-color": '#409EFF',
};
},
isAffix(tag) {
@ -233,11 +233,13 @@ export default {
<style lang="scss" scoped>
.tags-view-container {
height: 34px;
height: 45px;
width: 100%;
background: #fff;
border-bottom: 1px solid #d8dce5;
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
box-sizing: border-box;
padding-top: 5px;
.tags-view-wrapper {
.tags-view-item {
display: inline-block;

1
fuintAdmin/src/store/index.js
View File

@ -17,6 +17,7 @@ const store = new Vuex.Store({
permission,
settings
},
getters
})

2
fuintAdmin/src/store/modules/settings.js
View File

@ -5,7 +5,7 @@ const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dyn
const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
const state = {
title: '',
theme: storageSetting.theme || '#00acac',
theme: '#409EFF',
sideTheme: storageSetting.sideTheme || sideTheme,
showSettings: showSettings,
topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,

47
fuintAdmin/src/views/components/charts/chartstwo.vue Normal file
View File

@ -0,0 +1,47 @@
<template>
<div id="chart" style="width: 600px; height: 400px;"></div>
</template>
<script>
import echarts from 'echarts'
export default {
name: 'Chart',
mounted() {
this.initChart()
},
methods: {
initChart() {
const chart = echarts.init(document.getElementById('chart'))
const option = {
title: {
text: 'ECharts 示例'
},
tooltip: {
trigger: 'axis'
},
legend: {
data: ['销量']
},
xAxis: {
type: 'category',
data: ['衬衫', '羊毛衫', '雪纺衫', '裤子', '高跟鞋', '袜子']
},
yAxis: {
type: 'value'
},
series: [
{
name: '销量',
type: 'bar',
data: [5, 20, 36, 10, 10, 20]
}
]
}
chart.setOption(option)
}
}
}
</script>

9
fuintAdmin/src/views/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div class="overview">
<div class="title">运营概况</div>
<div class="title">运营概况 </div>
<div class="content" v-loading="loading">
<el-row class="line">
<el-col class="item" :span="6">
@ -93,16 +93,21 @@
</el-row>
</div>
</div>
<div class="overview">
<commonChartwo></commonChartwo>
</div>
</div>
</template>
<script>
import { getHomeData, getStatisticData } from "@/api/home";
import commonChart from './components/charts/index'
import commonChartwo from './components/charts/chartstwo'
export default {
name: "HomePage",
components: {
commonChart
commonChart,
commonChartwo
},
data() {
return {

80
fuintAdmin/src/views/system/dict/data.vue
View File

@ -1,5 +1,6 @@
<template>
<div class="app-container">
<el-card >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="字典名称" prop="dictType">
<el-select v-model="queryParams.dictType">
@ -34,7 +35,10 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card style="margin-top: 20px">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
@ -43,53 +47,13 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:dict:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:dict:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:dict:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:dict:export']"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-close"
size="mini"
@click="handleClose"
>关闭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="字典编码" align="center" prop="dictCode" />
@ -119,14 +83,14 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dict:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:dict:remove']"
>删除</el-button>
</template>
</el-table-column>
@ -139,6 +103,7 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-card>
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@ -196,6 +161,13 @@ import { listType, getType } from "@/api/system/dict/type";
export default {
name: "Data",
dicts: ['sys_normal_disable'],
props:{
id:{
type:String,
default:""
}
},
data() {
return {
// 遮罩层
@ -272,10 +244,14 @@ export default {
};
},
created() {
const dictId = this.$route.params && this.$route.params.dictId;
const dictId = this.$route.query && this.$route.query.dictId;
this.getType(dictId);
this.getTypeList();
},
mounted() {
console.log(this.$route.query)
},
methods: {
/** 查询字典类型详细 */
getType(dictId) {
@ -295,8 +271,8 @@ export default {
getList() {
this.loading = true;
listData(this.queryParams).then(response => {
this.dataList = response.rows;
this.total = response.total;
this.dataList = response.data.records;
this.total = response.data.total;
this.loading = false;
});
},
@ -397,3 +373,11 @@ export default {
}
};
</script>
<style scoped>
.app-container{
width: 100%;
height: 100vh;
background: #f6f8f9;
}
</style>

135
fuintAdmin/src/views/system/dict/index.vue
View File

@ -1,8 +1,10 @@
<template>
<div class="app-container">
<el-card >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="字典名称" prop="dictName">
<el-form-item label="" prop="dictName">
<el-input
size="medium"
v-model="queryParams.dictName"
placeholder="请输入字典名称"
clearable
@ -10,17 +12,19 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="字典类型" prop="dictType">
<el-form-item label="" prop="dictType">
<el-input
v-model="queryParams.dictType"
size="medium"
placeholder="请输入字典类型"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-form-item label="" prop="status">
<el-select
size="medium"
v-model="queryParams.status"
placeholder="字典状态"
clearable
@ -34,10 +38,11 @@
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间">
<el-form-item label="">
<el-date-picker
v-model="dateRange"
style="width: 240px"
size="medium"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
@ -46,63 +51,21 @@
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card style="margin-top: 20px" >
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:dict:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:dict:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:dict:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:dict:export']"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-refresh"
size="mini"
@click="handleRefreshCache"
v-hasPermi="['system:dict:remove']"
>刷新缓存</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -113,9 +76,12 @@
<el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
<el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
<router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
<span>{{ scope.row.dictType }}</span>
</router-link>
<!-- <router-link :to="'/system/dict/data/' + scope.row.dictId" class="link-type">-->
<!-- <span>{{ scope.row.dictType }}</span>-->
<!-- </router-link>-->
<span style="color: #409EFF;cursor: pointer " @click="goDedi(scope.row.dictId)">{{ scope.row.dictType }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
@ -132,33 +98,36 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:dict:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:dict:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.page"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</el-card>
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog :title="title" top="50vh" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="字典名称" prop="dictName">
<el-input v-model="form.dictName" placeholder="请输入字典名称" />
@ -188,9 +157,9 @@
</template>
<script>
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/dict/type";
export default {
export default {
name: "Dict",
dicts: ['sys_normal_disable'],
data() {
@ -217,7 +186,7 @@ export default {
dateRange: [],
// 查询参数
queryParams: {
page: 1,
pageNum: 1,
pageSize: 10,
dictName: undefined,
dictType: undefined,
@ -244,12 +213,21 @@ export default {
getList() {
this.loading = true;
listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.typeList = response.rows;
this.total = response.total;
this.typeList = response.data.records;
this.total = response.data.total;
this.loading = false;
}
);
},
goDedi(id){
console.log('id:',id)
this.$router.push({
path:"/system/dict/data",
query:{
dictId:id
}
})
},
// 取消按钮
cancel() {
this.open = false;
@ -268,7 +246,7 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.page = 1;
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
@ -339,8 +317,31 @@ export default {
handleRefreshCache() {
refreshCache().then(() => {
this.$modal.msgSuccess("刷新成功");
this.$store.dispatch('dict/cleanDict');
});
}
}
};
};
</script>
<style scoped>
.app-container{
width: 100%;
height: 100vh;
background: #f6f8f9;
}
.pagin-box{
background: white;
box-sizing: border-box;
padding: 20px;
}
.baoguo{
background: white;
box-sizing: border-box;
padding: 20px;
margin-bottom: 20px;
}
</style>

2
fuintAdmin/vue.config.js
View File

@ -7,7 +7,7 @@ function resolve(dir) {
const CompressionPlugin = require('compression-webpack-plugin')
const name = process.env.VUE_APP_TITLE || 'fuint会员营销管理系统' // 网页标题
const name = process.env.VUE_APP_TITLE || '蓝鲸智慧油站系统' // 网页标题
const port = process.env.port || process.env.npm_config_port || 81 // 端口