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-08-09 15:26:02 +08:00
parent 927bbf4e07
commit d45fa5c92a
8 changed files with 426 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

6
fuintAdmin/src/components/map/imgUpload.vue
View File

@ -30,7 +30,11 @@
:src="dialogImageUrl"
style="display: block; max-width: 100%; margin: 0 auto;height: 100%"
/>
<i v-else class="el-icon-plus"></i>
<i v-else class="el-icon-upload" style="color:#ff8d4d;font-size: 45px;margin-top: 30px " >
<div style="font-size: 12px;margin-top: 15px;color: #333"> <span style="color:#ff8d4d;" >点击上传</span> 本地文件</div>
</i>
<!-- </div>-->
</el-upload>

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

@ -59,13 +59,11 @@ const user = {
return
}
console.log("user_58",res.data)
// dutyRoleCode
Cookies.remove('DUTY_ROLE_CODE');
Cookies.set("DUTY_ROLE_CODE", res.data.dutyRoleCode);
Cookies.remove('IS_ZT_LOGIN');
Cookies.remove('IS_CA_LOGIN');
if (res.data.ownerId == "3") {
setToken(res.data.token)
commit('SET_TOKEN', res.data.token)

5
fuintAdmin/src/views/fleet/tab/fleetInfo.vue
View File

@ -119,11 +119,6 @@
type="text"
@click="handleRecharge(scope.row)"
>车队充值</el-button>
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- >删除</el-button>-->
</template>
</el-table-column>
</el-table>

88
fuintAdmin/src/views/handover/HandoverDetails.vue
View File

@ -1,10 +1,11 @@
<template>
<div class="app-container">
<el-card >
<div slot="header" class="clearfix">
<!-- <el-link icon="el-icon-edit" :underline="false" @click="goToAbout">编辑</el-link>-->
<span>交班详情</span>
<div class="app-containers">
<div class="tab-box">
<div class="box_" v-for="(item,index) in tablist" :key="index">
{{item}}
</div>
</div>
<el-card >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
<el-form-item label="" prop="status">
<el-select v-model="queryParams.status" style="width: 150px" placeholder="交班方式" clearable>
@ -53,37 +54,37 @@
<el-card style="margin-top: 20px; height: 100vh
" class="box-card">
<el-table
ref="tables"
v-loading="loading"
:data="dataList"
:default-sort="defaultSort">
<el-table-column label="班次员工" align="center" prop="staffName"/>
<el-table-column label="开始时间" align="center" prop="startTime"/>
<el-table-column label="结束时间" align="center" prop="endTime" />
<el-table-column label="交班状态" align="center" prop="status" width="">
<template slot-scope="scope">
<el-tag effect="plain" v-if="scope.row.type =='0'"> 已交班</el-tag>
<el-tag type="success" effect="plain" v-else-if="scope.row.type =='1'">未交班</el-tag>
</template>
</el-table-column>
<!-- <el-table-->
<!-- ref="tables"-->
<!-- v-loading="loading"-->
<!-- :data="dataList"-->
<!-- :default-sort="defaultSort">-->
<!-- <el-table-column label="班次员工" align="center" prop="staffName"/>-->
<!-- <el-table-column label="开始时间" align="center" prop="startTime"/>-->
<!-- <el-table-column label="结束时间" align="center" prop="endTime" />-->
<!-- <el-table-column label="交班状态" align="center" prop="status" width="">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag effect="plain" v-if="scope.row.type =='0'"> 已交班</el-tag>-->
<!-- <el-tag type="success" effect="plain" v-else-if="scope.row.type =='1'">未交班</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="创建时间" align="center" prop="createTime" width=""/>-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleDetail(scope.row)"
>交班数据</el-button>
<!--&lt;!&ndash; <el-table-column label="创建时间" align="center" prop="createTime" width=""/>&ndash;&gt;-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- @click="printLocally(scope.row.recordData)"-->
<!-- >补打交班单</el-button>-->
</template>
</el-table-column>
</el-table>
<!-- @click="handleDetail(scope.row)"-->
<!-- >交班数据</el-button>-->
<!--&lt;!&ndash; <el-button&ndash;&gt;-->
<!--&lt;!&ndash; size="mini"&ndash;&gt;-->
<!--&lt;!&ndash; type="text"&ndash;&gt;-->
<!--&lt;!&ndash; @click="printLocally(scope.row.recordData)"&ndash;&gt;-->
<!--&lt;!&ndash; >补打交班单</el-button>&ndash;&gt;-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
@ -120,6 +121,10 @@ export default {
data() {
return {
tablist:[
"交接班",
"交班记录"
],
openDetail:false,
dataForm:{},
dataList:[],
@ -240,13 +245,22 @@ export default {
</script>
<style scoped lang="scss">
.app-container {
.app-containers {
width: 100%;
height: 100vh
;
background: #f6f8f9;
//padding-top: 0px;
//padding: 0px
}
.tab-box{
width: 100%;
background: #fff;
display: flex;
box-sizing: border-box;
padding: 0px 25px;
margin-bottom: 25px;
}
.box_{
height: 100%;
border-bottom: 2px solid #fe9554;
}
.box {
padding: 10px;

357
fuintAdmin/src/views/member/manage.vue Normal file
View File

@ -0,0 +1,357 @@
<template>
<div class="content">
<div class="tab-box">
<div class="tab_" :class="{active:index== tabindex }" @click="getindex(index)" v-for="(item,index) in tabs" :key="index">
{{item.name}}
</div>
</div>
<div class="cot-box" v-if="tabindex==0" >
<div class="d-s-b">
<div class="d-s">
<el-input v-model="input" placeholder="请输入内容" style="margin-right: 15px;width: 185px"></el-input>
<el-date-picker
v-model="value"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
</div>
<div class="d-s">
<el-button type="primary" icon="el-icon-search">搜索</el-button>
<el-button icon="el-icon-refresh-right" >重置</el-button>
<el-button type="primary" >新增分组</el-button>
</div>
</div>
<!-- -->
<el-table
:data="tableData"
border
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column
prop="date"
label="分组名称"
width="180">
</el-table-column>
<el-table-column
prop="name"
label="备注"
width="180">
</el-table-column>
<el-table-column
prop="address"
label="会员数量">
</el-table-column>
<el-table-column
prop="address"
label="会员占比">
</el-table-column>
<el-table-column align="center" prop="status" label="状态">
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
active-value="qy"
inactive-value="jy"
active-color="#13ce66"
inactive-color="#ff4949">
</el-switch>
</template>
</el-table-column>
<el-table-column
prop="address"
label="创建人">
</el-table-column>
<el-table-column
prop="address"
label="创建时间">
</el-table-column>
<el-table-column
prop="address"
label="更新时间">
</el-table-column>
<el-table-column align="center" label="操作" width="120">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleUpdate(scope.row)"
>修改</el-button>
<el-button
size="mini"
type="text"
@click="handleRecharge(scope.row)"
>删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="cot-box" v-if="tabindex==1" >
<div class="d-s-b">
<div class="d-s">
<el-input v-model="input" placeholder="请输入内容" style="margin-right: 15px;width: 185px"></el-input>
<el-date-picker
v-model="value"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
</div>
<div class="d-s">
<el-button type="primary" icon="el-icon-search">搜索</el-button>
<el-button icon="el-icon-refresh-right" >重置</el-button>
<el-button type="primary" >新增定时群发</el-button>
</div>
</div>
<!-- -->
<el-table
:data="tableData"
border
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column
prop="date"
label="活动名称"
width="180">
</el-table-column>
<el-table-column
prop="name"
label="活动时间"
width="180">
</el-table-column>
<el-table-column
prop="address"
label="发送频次">
</el-table-column>
<el-table-column
prop="address"
label="群发会员">
</el-table-column>
<el-table-column
prop="address"
label="群发礼品">
</el-table-column>
<el-table-column
prop="status"
label="活动状态">
<template slot-scope="scope">
<div v-if="scope.row.status == 0" style="color: #FF7E00">未开始</div>
<div v-if="scope.row.status == 1" style="color: #00CAFF">进行中</div>
<div v-if="scope.row.status == 2" style="color: #0DC291">已结束</div>
</template>
</el-table-column>
<el-table-column
prop="address"
label="创建人">
</el-table-column>
<el-table-column
prop="address"
label="创建时间">
</el-table-column>
<el-table-column align="center" label="操作" width="120">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleUpdate(scope.row)"
>修改</el-button>
<el-button
size="mini"
type="text"
@click="handleRecharge(scope.row)"
>删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="cot-box" v-if="tabindex==2" >
<div class="d-s-b">
<div class="d-s">
<el-input v-model="input" placeholder="请输入内容" style="margin-right: 15px;width: 185px"></el-input>
<el-date-picker
v-model="value"
type="datetime"
placeholder="选择日期时间">
</el-date-picker>
</div>
<div class="d-s">
<el-button type="primary" icon="el-icon-search">搜索</el-button>
<el-button icon="el-icon-refresh-right" >重置</el-button>
</div>
</div>
<!-- -->
<el-table
:data="tableData"
border
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column
prop="date"
label="活动名称"
width="180">
</el-table-column>
<el-table-column
prop="name"
label="群发礼品"
width="180">
</el-table-column>
<el-table-column
prop="address"
label="群发方式">
</el-table-column>
<el-table-column
prop="address"
label="群发内容">
</el-table-column>
<el-table-column
prop="address"
label="群发会员数量">
</el-table-column>
<el-table-column
prop="address"
label="成功数量">
</el-table-column>
<el-table-column
prop="address"
label="失败数量">
</el-table-column>
<el-table-column
prop="address"
label="状态">
</el-table-column>
<el-table-column
prop="address"
label="已领取数量">
</el-table-column>
<el-table-column
prop="address"
label="已核销数量">
</el-table-column>
<el-table-column
prop="address"
label="未核销数量">
</el-table-column>
<el-table-column
prop="address"
label="操作人员">
</el-table-column>
<el-table-column
prop="address"
label="群发时间">
</el-table-column>
<el-table-column align="center" label="操作" width="120">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleRecharge(scope.row)"
>删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
</div>
</template>
<script>
export default {
data() {
return {
tabindex:0,
tableData: [{
status:0,
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}, {
status:0,
date: '2016-05-04',
name: '王小虎',
address: '上海市普陀区金沙江路 1517 弄'
}, {
status:0,
date: '2016-05-01',
name: '王小虎',
address: '上海市普陀区金沙江路 1519 弄'
}, {
status:0,
date: '2016-05-03',
name: '王小虎',
address: '上海市普陀区金沙江路 1516 弄'
}],
input:'',
value: '',
tabs: [
{
name: "分组管理",
},
{
name: "定时群发",
},
{
name: "群发记录",
}
]
};
},
methods: {
getindex(index){
this.tabindex = index
}
}
}
</script>
<style scoped lang="scss">
.content{
background: #f5f7f8;
width: 100%;
height: 100vh;
}
.tab-box{
width: 100%;
height: 40px;
background: #fff;
display: flex;
box-sizing: border-box;
margin-bottom: 25px;
}
.tab_{
width: 75px;
height: 100%;
//border-bottom: 2px solid #FF770F;
display: flex;
font-weight: 500;
font-size: 14px;
color: #999999;
align-items: center;
justify-content: center;
margin-left: 50px;
cursor: pointer;
}
.active{
border-bottom: 2px solid #FF770F !important;
color: #FF770F !important;
}
.cot-box{
width: 98%;
border-radius: 8px;
background: #fff;
box-sizing: border-box;
padding: 20px;
margin: 0 auto;
}
.d-s-b{
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 25px;
}
.d-s{
display: flex;
align-items: center;
}
</style>

6
fuintAdmin_zt/src/store/modules/user.js
View File

@ -52,21 +52,18 @@ const user = {
const password = userInfo.password
const captchaCode = userInfo.captchaCode
const uuid = userInfo.uuid
return new Promise((resolve, reject) => {
return new Promise((resolve, reject) => {
login(username, password, captchaCode, uuid).then(res => {
if(res.data.token == null ){
this.$router.push({ path: '/login' });
return
}
console.log("user_58",res.data)
if (res.data.ownerId !== "3") {
setToken(res.data.token)
commit('SET_TOKEN', res.data.token)
// Cookies.remove('IS_BK_LOGIN');
sessionStorage.removeItem('IS_BK_LOGIN');
}else {
// Cookies.set("IS_BK_LOGIN", JSON.stringify(res.data));
sessionStorage.setItem("IS_BK_LOGIN", JSON.stringify(res.data));
@ -92,6 +89,7 @@ const user = {
commit('SET_ROLES', res.data.roles)
commit('SET_PERMISSIONS', res.data.permissions)
} else {
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
commit('SET_NAME', user.accountName)

11
fuintAdmin_zt/src/views/member/manage.vue Normal file
View File

@ -0,0 +1,11 @@
<template>
<div>
会员管理
</div>
</template>
<script>
</script>
<style scoped lang="scss">
</style>