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

Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-07-29 08:42:37 +08:00
commit 7fe593c9a1
11 changed files with 191 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin_zt/.env.development
View File

@ -13,7 +13,7 @@ VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址 # 后端接口地址
#VUE_APP_SERVER_URL = 'http://192.168.31.72:8081/'
VUE_APP_SERVER_URL = 'http://192.168.31.178:8081/' VUE_APP_SERVER_URL = 'http://192.168.31.178:8081/'

7
fuintAdmin_zt/src/api/indexBanner/index.js
View File

@ -55,3 +55,10 @@ export function getAccountInfo(query) {
params: query params: query
}) })
} }
export function resetPwd(data) {
return request({
url: '/backendApi/account/resetPwd',
method: 'post',
data: data
})
}

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

@ -47,12 +47,33 @@
</el-dropdown> </el-dropdown>
</div> </div>
<el-dialog
title="提示"
:visible.sync="xg"
:modal="false"
width="30%"
:before-close="handleClose">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
<el-form-item label="密码" prop="name">
<el-input v-model="ruleForm.password"></el-input>
</el-form-item>
<el-form-item label="新密码" prop="name">
<el-input v-model="ruleForm.passwords"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="xg = false">取 消</el-button>
<el-button type="primary" @click="postparssword()">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { getAccountInfo ,resetPwd } from '@/api/indexBanner/index'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import Breadcrumb from '@/components/Breadcrumb' import Breadcrumb from '@/components/Breadcrumb'
import TopNav from '@/components/TopNav' import TopNav from '@/components/TopNav'
@ -66,7 +87,21 @@ import confirmLog from "@/views/coupon/confirmLog/index.vue";
export default { export default {
data() { data() {
return { return {
dialogVisible: false ruleForm: {
password:'',
passwords:''
},
rules:{
password: [
{ required: true, message: '请输入密码', trigger: 'blur' },
{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
],
passwords: [
{ required: true, message: '请输入新密码', trigger: 'blur' },
{ min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
],
},
xg: false
} }
}, },
components: { components: {
@ -112,7 +147,26 @@ export default {
}, },
prsswrod(){ prsswrod(){
console.log('方法') console.log('方法')
this.dialogVisible = false this.xg =! this.xg
getAccountInfo().then(res=>{
console.log(res)
this.accountId = res.data.accountId
})
},
postparssword(){
let data = {
acctId : this.accountId,
password: this.ruleForm.password,
}
resetPwd(data).then(res=>{
console.log(res)
if(res.code == 200){
this.xg =false
}
})
}, },
toggleSideBar() { toggleSideBar() {

68
fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
View File

@ -3,36 +3,41 @@
<div style="margin-top: 0px"> <div style="margin-top: 0px">
<el-card class="box-card" style="margin-top: 0px;"> <el-card class="box-card" style="margin-top: 0px;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" > <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
<div class="d-s" style="margin-bottom: 15px"> <div class="d-s" style="margin-bottom: 15px;justify-content: space-between">
<div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList" <div class="d-s">
:key="index" @click="editColor(index)"> <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList"
{{ item }} :key="index" @click="editColor(index)">
</div> {{ item }}
<el-date-picker </div>
v-model="value2" <el-date-picker
type="datetimerange" v-model="value2"
style="height: 32px" type="datetimerange"
range-separator="至" style="height: 32px"
value-format="yyyy-MM-dd HH:mm:ss" range-separator="至"
start-placeholder="开始日期" value-format="yyyy-MM-dd HH:mm:ss"
end-placeholder="结束日期" @click="handleQuery"> start-placeholder="开始日期"
</el-date-picker> end-placeholder="结束日期"
<div style="margin-left: 15px;margin-top: 17px;width: 100%"> :disabled="disabled"
<el-form-item label="" prop="deptId" style="width: 180px"> @click="handleQuery">
<el-select </el-date-picker>
v-model="queryParams.deptId" <div style="margin-left: 15px;margin-top: 17px">
clearable <el-form-item label="" prop="deptId" style="width: 180px">
placeholder="所属机构" <el-select
> v-model="queryParams.deptId"
<el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId"> clearable
</el-option> placeholder="所属机构"
</el-select> >
</el-form-item> <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId">
<el-form-item class="" style="float: right;"> </el-option>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> </el-select>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> </el-form-item>
</el-form-item> </div>
</div> </div>
<el-form-item class="" style="float: right;margin-top: 17px;">
<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>
</div> </div>
</el-form> </el-form>
<div class="wrap-boxs"> <div class="wrap-boxs">
@ -132,8 +137,10 @@ export default {
"近一周", "近一周",
"近一月", "近一月",
"近一年", "近一年",
"自定义",
], ],
timeIndex: 0, timeIndex: 0,
disabled:true,
value2: [], value2: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
@ -181,6 +188,7 @@ export default {
methods: { methods: {
editColor(index) { editColor(index) {
this.timeIndex = index this.timeIndex = index
this.disabled = true
if (this.timeList[index] == '今日') { if (this.timeList[index] == '今日') {
let start = new Date(); let start = new Date();
start.setHours(0) start.setHours(0)
@ -200,6 +208,8 @@ export default {
let nowDate = new Date(); let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate()) let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
this.value2 = [parseTime(oneWeekAgo), parseTime(nowDate)] this.value2 = [parseTime(oneWeekAgo), parseTime(nowDate)]
}else if (this.timeList[index]=='自定义'){
this.disabled = false
} }
this.handleQuery() this.handleQuery()
}, },

25
fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
View File

@ -3,7 +3,8 @@
<div style="margin-top: 0px"> <div style="margin-top: 0px">
<el-card class="box-card"> <el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<div class="d-s"> <div class="d-s" style="justify-content: space-between">
<div class="d-s">
<div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList" <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList"
:key="index" @click="editColor(index)"> :key="index" @click="editColor(index)">
{{ item }} {{ item }}
@ -12,12 +13,14 @@
v-model="value2" v-model="value2"
type="datetimerange" type="datetimerange"
range-separator="至" range-separator="至"
style="height: 32px" style="height: 32px;"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" @click="handleQuery"> end-placeholder="结束日期"
:disabled="disabled"
@click="handleQuery">
</el-date-picker> </el-date-picker>
<div style="margin-left: 15px;margin-top: 17px;width: 100%"> <div style="margin-left: 15px;margin-top: 17px;">
<el-form-item label="" prop="deptId" style="width: 180px"> <el-form-item label="" prop="deptId" style="width: 180px">
<el-select <el-select
v-model="queryParams.deptId" v-model="queryParams.deptId"
@ -28,11 +31,12 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="" style="float: right;">
<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>
</div> </div>
</div>
<el-form-item class="" style="margin-top: 17px;">
<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>
</div> </div>
</el-form> </el-form>
@ -118,8 +122,10 @@ export default {
"近一周", "近一周",
"近一月", "近一月",
"近一年", "近一年",
"自定义",
], ],
timeIndex: 0, timeIndex: 0,
disabled:true,
value2: [], value2: [],
// 日期范围 // 日期范围
dateRange: [], dateRange: [],
@ -180,6 +186,7 @@ export default {
methods: { methods: {
editColor(index) { editColor(index) {
this.timeIndex = index this.timeIndex = index
this.disabled = true
if (this.timeList[index] == '今日') { if (this.timeList[index] == '今日') {
let start = new Date(); let start = new Date();
start.setHours(0) start.setHours(0)
@ -199,6 +206,8 @@ export default {
let nowDate = new Date(); let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate()) let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
this.value2 = [parseTime(oneWeekAgo), parseTime(nowDate)] this.value2 = [parseTime(oneWeekAgo), parseTime(nowDate)]
}else if (this.timeList[index]=='自定义'){
this.disabled = false
} }
this.handleQuery() this.handleQuery()
}, },

19
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
View File

@ -3,7 +3,8 @@
<div style="margin-top: 0px;margin-right: 40px"> <div style="margin-top: 0px;margin-right: 40px">
<el-card class="box-card"> <el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<div class="d-s"> <div class="d-s" style="justify-content: space-between;width: 100%">
<div class="d-s">
<div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList" <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList"
:key="index" @click="editColor(index)"> :key="index" @click="editColor(index)">
{{ item }} {{ item }}
@ -15,9 +16,11 @@
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
style="height:32px" style="height:32px"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" @click="handleQuery"> end-placeholder="结束日期"
:disabled="disabled"
@click="handleQuery">
</el-date-picker> </el-date-picker>
<div style="margin-left: 15px;margin-top: 17px;width: 100%"> <div style="margin-left: 15px;margin-top: 17px;">
<el-form-item label="" prop="deptId" style="width: 180px"> <el-form-item label="" prop="deptId" style="width: 180px">
<el-select <el-select
v-model="queryParams.deptId" v-model="queryParams.deptId"
@ -28,11 +31,12 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="" style="float: right;"> </div>
</div>
<el-form-item class="" style="float: right;margin-top: 17px;">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</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-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</div>
</div> </div>
</el-form> </el-form>
<div class="wrap-box"> <div class="wrap-box">
@ -116,8 +120,10 @@ export default {
"近一周", "近一周",
"近一月", "近一月",
"近一年", "近一年",
"自定义",
], ],
timeIndex: 0, timeIndex: 0,
disabled:true,
value2: [], value2: [],
// 日期范围 // 日期范围
dateRange: [], dateRange: [],
@ -175,6 +181,7 @@ export default {
methods: { methods: {
editColor(index){ editColor(index){
this.timeIndex = index this.timeIndex = index
this.disabled = true
if (this.timeList[index]=='今日'){ if (this.timeList[index]=='今日'){
let start = new Date(); let start = new Date();
start.setHours(0) start.setHours(0)
@ -194,6 +201,8 @@ export default {
let nowDate = new Date(); let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate()) let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)] this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
}else if (this.timeList[index]=='自定义'){
this.disabled = false
} }
this.handleQuery() this.handleQuery()
}, },

19
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
View File

@ -3,7 +3,8 @@
<div style="margin-top: 0px; margin-right: 40px"> <div style="margin-top: 0px; margin-right: 40px">
<el-card class="box-card"> <el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<div class="d-s"> <div class="d-s" style="justify-content: space-between;width: 100%">
<div class="d-s">
<div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList" :key="index" @click="editColor(index)"> <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList" :key="index" @click="editColor(index)">
{{item}} {{item}}
</div> </div>
@ -15,9 +16,11 @@
range-separator="至" range-separator="至"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" @click="handleQuery"> end-placeholder="结束日期"
:disabled="disabled"
@click="handleQuery">
</el-date-picker> </el-date-picker>
<div style="margin-left: 15px;margin-top: 17px;width: 100%"> <div style="margin-left: 15px;margin-top: 17px;">
<el-form-item label="" prop="deptId" style="width: 180px"> <el-form-item label="" prop="deptId" style="width: 180px">
<el-select <el-select
v-model="queryParams.deptId" v-model="queryParams.deptId"
@ -29,11 +32,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="" style="float: right;"> </div>
</div>
<el-form-item class="" style="margin-top: 17px;">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</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-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</div>
</div> </div>
</el-form> </el-form>
@ -152,8 +156,10 @@ import {parseTime} from "@/utils/fuint";
"近一周", "近一周",
"近一月", "近一月",
"近一年", "近一年",
"自定义",
], ],
timeIndex:0, timeIndex:0,
disabled:true,
value2: [], value2: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
@ -203,6 +209,7 @@ import {parseTime} from "@/utils/fuint";
methods:{ methods:{
editColor(index){ editColor(index){
this.timeIndex = index this.timeIndex = index
this.disabled = true
if (this.timeList[index]=='今日'){ if (this.timeList[index]=='今日'){
let start = new Date(); let start = new Date();
start.setHours(0) start.setHours(0)
@ -222,6 +229,8 @@ import {parseTime} from "@/utils/fuint";
let nowDate = new Date(); let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate()) let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)] this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
}else if (this.timeList[index]=='自定义'){
this.disabled = false
} }
this.handleQuery() this.handleQuery()
}, },

19
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
View File

@ -3,7 +3,8 @@
<div style="margin-top: 0px; margin-right: 40px"> <div style="margin-top: 0px; margin-right: 40px">
<el-card class="box-card"> <el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" > <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
<div class="d-s"> <div class="d-s" style="justify-content: space-between;width: 100%">
<div class="d-s">
<div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList" :key="index" @click="editColor(index)"> <div class="anniu-h" :class="{ 'anniu-act': index == timeIndex }" v-for="(item,index) in timeList" :key="index" @click="editColor(index)">
{{item}} {{item}}
</div> </div>
@ -14,9 +15,11 @@
range-separator="至" range-separator="至"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" @click="handleQuery"> end-placeholder="结束日期"
:disabled="disabled"
@click="handleQuery">
</el-date-picker> </el-date-picker>
<div style="margin-left: 15px;margin-top: 17px;width: 100%"> <div style="margin-left: 15px;margin-top: 17px;">
<el-form-item label="" prop="deptId" style="width: 180px;"> <el-form-item label="" prop="deptId" style="width: 180px;">
<el-select <el-select
v-model="queryParams.deptId" v-model="queryParams.deptId"
@ -28,11 +31,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="" style="float: right;"> </div>
</div>
<el-form-item class="" style="float: right;margin-top: 17px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</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-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</div>
</div> </div>
</el-form> </el-form>
@ -128,8 +132,10 @@ import {parseTime} from "@/utils/fuint";
"近一周", "近一周",
"近一月", "近一月",
"近一年", "近一年",
"自定义",
], ],
timeIndex:0, timeIndex:0,
disabled:true,
value2: [], value2: [],
// 日期范围 // 日期范围
dateRange: [], dateRange: [],
@ -187,6 +193,7 @@ import {parseTime} from "@/utils/fuint";
methods:{ methods:{
editColor(index){ editColor(index){
this.timeIndex = index this.timeIndex = index
this.disabled = true
if (this.timeList[index]=='今日'){ if (this.timeList[index]=='今日'){
let start = new Date(); let start = new Date();
start.setHours(0) start.setHours(0)
@ -206,6 +213,8 @@ import {parseTime} from "@/utils/fuint";
let nowDate = new Date(); let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate()) let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)] this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
}else if (this.timeList[index]=='自定义'){
this.disabled = false
} }
this.handleQuery() this.handleQuery()
}, },

21
fuintAdmin_zt/src/views/homeComponents/agent.vue
View File

@ -149,11 +149,13 @@
range-separator="至" range-separator="至"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期"
:disabled="disabled"
@change="getStoreList()">
</el-date-picker> </el-date-picker>
</div> </div>
<div id="ctct" style="width: 100%; height: 315px;background: linear-gradient( 360deg, #F8F0E7 0%, #FFFFFF 100%); "></div> <div id="ctct" style="width: 100%; height: 315px;background: linear-gradient( 360deg, #F8F0E7 0%, #FFFFFF 100%); "></div>
<div id="cccc" style="width: 300px;height: 200px;"></div> <!-- <div id="cccc" style="width: 300px;height: 200px;"></div>-->
</div> </div>
@ -170,7 +172,7 @@ import {getListApi} from "@/api/setting/hardware";
import {getNotificationlogList} from "@/api/sys/sysNotificationlog"; import {getNotificationlogList} from "@/api/sys/sysNotificationlog";
export default { export default {
props:["accountId"], props:["accountId",'deptId'],
data(){ data(){
return{ return{
form: {}, form: {},
@ -179,8 +181,10 @@ export default {
"近一周", "近一周",
"近一月", "近一月",
"近一年", "近一年",
"自定义",
], ],
timeIndex:0, timeIndex:0,
disabled:true,
options: [{ options: [{
value: '选项1', value: '选项1',
label: '黄金糕' label: '黄金糕'
@ -219,7 +223,9 @@ export default {
this.value1 = [parseTime(oneWeekAgo),parseTime(nowDate)] this.value1 = [parseTime(oneWeekAgo),parseTime(nowDate)]
this.getStoreTotal() this.getStoreTotal()
this.selectChildByDeptIdApi() this.selectChildByDeptIdApi()
this.getStoreAmount() // this.getStoreAmount()
this.value = this.deptId
this.chooseDept()
this.selectBannerList() this.selectBannerList()
let start = new Date(); let start = new Date();
start.setHours(0) start.setHours(0)
@ -252,6 +258,7 @@ export default {
}, },
editColor(index){ editColor(index){
this.timeIndex = index this.timeIndex = index
this.disabled = true
if (this.timeList[index]=='今日'){ if (this.timeList[index]=='今日'){
let start = new Date(); let start = new Date();
start.setHours(0) start.setHours(0)
@ -271,6 +278,8 @@ export default {
let nowDate = new Date(); let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate()) let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)] this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
}else if (this.timeList[index]=='自定义'){
this.disabled = false
} }
this.getStoreList() this.getStoreList()
}, },
@ -323,7 +332,7 @@ export default {
}, },
initChart() { initChart() {
const chart = echarts.init(document.getElementById('ccc')) const chart = echarts.init(document.getElementById('ccc'))
const chart1 = echarts.init(document.getElementById('cccc')) // const chart1 = echarts.init(document.getElementById('cccc'))
const chart2= echarts.init(document.getElementById('ccct')) const chart2= echarts.init(document.getElementById('ccct'))
const chart4= echarts.init(document.getElementById('cttt')) const chart4= echarts.init(document.getElementById('cttt'))
const chart3= echarts.init(document.getElementById('ctct')) const chart3= echarts.init(document.getElementById('ctct'))
@ -637,7 +646,7 @@ export default {
] ]
}; };
chart.setOption(option) chart.setOption(option)
chart1.setOption(option1) // chart1.setOption(option1)
chart2.setOption(option2) chart2.setOption(option2)
chart3.setOption(option3) chart3.setOption(option3)
chart4.setOption(option4) chart4.setOption(option4)

12
fuintAdmin_zt/src/views/homeComponents/manage.vue
View File

@ -157,6 +157,7 @@
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
:disabled="disabled"
@change="getStoreList()"> @change="getStoreList()">
</el-date-picker> </el-date-picker>
</div> </div>
@ -177,7 +178,7 @@ import {getListApi} from "@/api/setting/hardware";
import {getNotificationlogList} from "@/api/sys/sysNotificationlog"; import {getNotificationlogList} from "@/api/sys/sysNotificationlog";
export default { export default {
props:["accountId"], props:["accountId",'deptId'],
data(){ data(){
return{ return{
form: {}, form: {},
@ -186,6 +187,7 @@ export default {
"近一周", "近一周",
"近一月", "近一月",
"近一年", "近一年",
"自定义",
], ],
timeIndex:0, timeIndex:0,
options: [{ options: [{
@ -207,6 +209,7 @@ export default {
value: '', value: '',
value1: [], value1: [],
value2: [], value2: [],
disabled:true,
imagePath: process.env.VUE_APP_SERVER_URL, imagePath: process.env.VUE_APP_SERVER_URL,
queryParams:{}, queryParams:{},
// 店铺数量 // 店铺数量
@ -226,7 +229,9 @@ export default {
this.value1 = [parseTime(oneWeekAgo),parseTime(nowDate)] this.value1 = [parseTime(oneWeekAgo),parseTime(nowDate)]
this.getStoreTotal() this.getStoreTotal()
this.selectChildByDeptIdApi() this.selectChildByDeptIdApi()
this.getStoreAmount() // this.getStoreAmount()
this.value = this.deptId
this.chooseDept()
this.selectBannerList() this.selectBannerList()
let start = new Date(); let start = new Date();
start.setHours(0) start.setHours(0)
@ -259,6 +264,7 @@ export default {
}, },
editColor(index){ editColor(index){
this.timeIndex = index this.timeIndex = index
this.disabled = true
if (this.timeList[index]=='今日'){ if (this.timeList[index]=='今日'){
let start = new Date(); let start = new Date();
start.setHours(0) start.setHours(0)
@ -278,6 +284,8 @@ export default {
let nowDate = new Date(); let nowDate = new Date();
let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate()) let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)] this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
}else if (this.timeList[index]=='自定义'){
this.disabled = false
} }
this.getStoreList() this.getStoreList()
}, },

6
fuintAdmin_zt/src/views/index.vue
View File

@ -1,9 +1,9 @@
<template> <template>
<div class=""> <div class="">
<!-- 代理--> <!-- 代理-->
<agent v-if="power == 1" :accountId="accountId"></agent> <agent v-if="power == 1" :accountId="accountId" :deptId="deptId"></agent>
<!-- 连锁--> <!-- 连锁-->
<manage v-if="power == 2" :accountId="accountId"></manage> <manage v-if="power == 2" :accountId="accountId" :deptId="deptId"></manage>
<!-- 油站--> <!-- 油站-->
<shopowner v-if="power == 3" :accountId="accountId"></shopowner> <shopowner v-if="power == 3" :accountId="accountId"></shopowner>
</div> </div>
@ -19,6 +19,7 @@ export default {
return{ return{
power:1, power:1,
accountId:"", accountId:"",
deptId:'',
} }
}, },
created() { created() {
@ -40,6 +41,7 @@ export default {
this.power = 3 this.power = 3
} }
this.accountId = res.data.accountId this.accountId = res.data.accountId
this.deptId = res.data.deptId
}) })
} }
} }