Skip to content

P
police-bigdata-vue-all
Commit 3437c56d by T
Options

1.库存列表新增单警柜装备、仓库装备筛选查询 

2.首页统计调整
3.登录失效bug修复
parent eaaea74a
正在显示 包含 122 行增加 和 31 行删除
src/App.vue
......@@ -5,7 +5,90 @@
</template>
<script>
import { MessageBox } from 'element-ui'
import store from './store'
export default {
name: 'App'
name: 'App',
data() {
return {
//设置超时时间： 30分种
timeOut : 30 * 60 * 1000,
//timeOut : 10 * 1000,
lastTimeStoreId: 'lastTime_jc'
}
},
methods: {
// 存储当前时间
setLastTime() {
localStorage.setItem(this.lastTimeStoreId,new Date().getTime());
// console.log('当前时间')
},
// 获取时间
getLastTime() {
//console.log('获取时间')
return localStorage.getItem(this.lastTimeStoreId);
},
// 删除
removeLastTime() {
localStorage.removeItem(this.lastTimeStoreId)
//console.log('操作了删除时间')
},
checkTimeout() {
// 登录页面不监听
if(this.timeOut && this.$router.currentRoute.path === '/login') {
console.log(this.$router.currentRoute.path)
this.setLastTime();
// console.log('不监听')
}
else {
//更新当前时间
let currentTime = new Date().getTime();
let lastTime = this.getLastTime();
// console.log(currentTime, lastTime, (currentTime - lastTime), this.timeOut);
//判断是否超时
if (currentTime - lastTime > this.timeOut) {
this.$message({ type: 'warning', message: '登录状态已过期或超过30分钟未操作，需重新登录' })
console.log('登录状态已过期或超过30分钟未操作，需重新登录')
store.dispatch('LogOut').then(() => {
location.reload() // 为了重新实例化vue-router对象 避免bug
})
// MessageBox.confirm(
// '登录状态已过期，您可以继续留在该页面，或者重新登录',
// '系统提示',
// {
// confirmButtonText: '重新登录',
// cancelButtonText: '取消',
// type: 'warning'
// }
// ).then(() => {
// store.dispatch('LogOut').then(() => {
// location.reload() // 为了重新实例化vue-router对象 避免bug
// })
// })
}
}
},
},
mounted() {
let that = this;
// 每15分钟 调用检查时间的方法
this.$nextTick(function () {
//setInterval(this.checkTimeout, 30000);
setInterval(this.checkTimeout, 15 * 60 * 1000);
console.log('调用检查时间')
})
// 页面监听 按下鼠标更新操作时间
window.onload = function () {
window.document.onmousedown = function () {
that.setLastTime();
//console.log('按下鼠标更新操作时间')
}
window.document.onkeydown = function () {
that.setLastTime();
//console.log('按下鼠标更新操作时间')
}
};
}
}
</script>
src/utils/request.js
......@@ -63,21 +63,22 @@ service.interceptors.response.use(
return Promise.reject(error)
}
}
if (code === 401) {
MessageBox.confirm(
'登录状态已过期，您可以继续留在该页面，或者重新登录',
'系统提示',
{
confirmButtonText: '重新登录',
cancelButtonText: '取消',
type: 'warning'
}
).then(() => {
store.dispatch('LogOut').then(() => {
location.reload() // 为了重新实例化vue-router对象 避免bug
})
})
} else if (code === 403) {
// if (code === 401) {
// MessageBox.confirm(
// '登录状态已过期，您可以继续留在该页面，或者重新登录',
// '系统提示',
// {
// confirmButtonText: '重新登录',
// cancelButtonText: '取消',
// type: 'warning'
// }
// ).then(() => {
// store.dispatch('LogOut').then(() => {
// location.reload() // 为了重新实例化vue-router对象 避免bug
// })
// })
// } else
if (code === 403) {
router.push({ path: '/401' })
} else {
const errorMsg = error.response.data.message
......
src/views/dashboard/PanelGroup.vue
<template>
<el-row :gutter="15" class="panel-group">
<el-row :gutter="20" class="panel-group">
<!-- 总平台 -->
<div class="all" v-if="orgCode !== '330200000000'">
<el-col :xs="12" :sm="12" :lg="{span: '3-4'}" class="card-panel-col">
......@@ -9,7 +9,7 @@
</div>
<div class="card-panel-description">
<div class="card-panel-text">装备总数</div>
<count-to :start-val="0" :end-val="count.zkTopCount" :duration="2600" class="card-panel-num"/>
<count-to :start-val="0" :end-val="count.zkTopCount-count.bfCount" :duration="2600" class="card-panel-num"/>
</div>
</div>
</el-col>
......@@ -68,7 +68,7 @@
</div>
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="{span: '3-4'}" class="card-panel-col" >
<!-- <el-col :xs="12" :sm="12" :lg="{span: '3-4'}" class="card-panel-col" >
<div class="card-panel" @click="nextpage('报废数量')">
<div class="card-panel-icon-wrapper icon-people">
<svg-icon icon-class="garbage" class-name="card-panel-icon" />
......@@ -78,23 +78,23 @@
<count-to :start-val="0" :end-val="count.bfCount" :duration="2600" class="card-panel-num"/>
</div>
</div>
</el-col>
</el-col> -->
</div>
<!-- 宁波市局 -->
<div class="nb" v-if="orgCode === '330200000000'">
<el-col :xs="12" :sm="12" :lg="{span: '3-4'}" class="card-panel-col">
<el-col :xs="12" :sm="12" :lg="{span: '3-5'}" class="card-panel-col">
<div class="card-panel" @click="nextpageNb('装备总数')">
<div class="card-panel-icon-wrapper icon-people">
<svg-icon icon-class="total" class-name="card-panel-icon" />
</div>
<div class="card-panel-description">
<div class="card-panel-text">装备总数</div>
<count-to :start-val="0" :end-val="count.zkTopCount" :duration="2600" class="card-panel-num"/>
<count-to :start-val="0" :end-val="count.zkTopCount-count.bfCount" :duration="2600" class="card-panel-num"/>
</div>
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="{span: '3-4'}" class="card-panel-col">
<el-col :xs="12" :sm="12" :lg="{span: '3-5'}" class="card-panel-col">
<div class="card-panel" @click="nextpageNb('在库数量')">
<div class="card-panel-icon-wrapper icon-money">
<svg-icon icon-class="zaiku" class-name="card-panel-icon" />
......@@ -105,7 +105,7 @@
</div>
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="{span: '3-4'}" class="card-panel-col">
<el-col :xs="12" :sm="12" :lg="{span: '3-5'}" class="card-panel-col">
<div class="card-panel" @click="nextpageNb('调拨数量')">
<div class="card-panel-icon-wrapper icon-message">
<svg-icon icon-class="available" class-name="card-panel-icon" />
......@@ -116,7 +116,7 @@
</div>
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="{span: '3-4'}" class="card-panel-col">
<el-col :xs="12" :sm="12" :lg="{span: '3-5'}" class="card-panel-col">
<div class="card-panel" @click="nextpageNb('领用数量')">
<div class="card-panel-icon-wrapper icon-shopping">
<svg-icon icon-class="collecting" class-name="card-panel-icon" />
......@@ -127,7 +127,7 @@
</div>
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="{span: '3-4'}" class="card-panel-col">
<!-- <el-col :xs="12" :sm="12" :lg="{span: '3-5'}" class="card-panel-col">
<div class="card-panel" @click="nextpageNb('即将报废数量')">
<div class="card-panel-icon-wrapper icon-people">
<svg-icon icon-class="30天" class-name="card-panel-icon1"/>
......@@ -137,10 +137,10 @@
<count-to :start-val="0" :end-val="count.jjbfCount" :duration="2600" class="card-panel-num"/>
</div>
</div>
</el-col>
</el-col> -->
<el-col :xs="12" :sm="12" :lg="{span: '3-4'}" class="card-panel-col" >
<el-col :xs="12" :sm="12" :lg="{span: '3-5'}" class="card-panel-col" >
<div class="card-panel" @click="nextpageNb('报废区数量')">
<div class="card-panel-icon-wrapper icon-people">
<svg-icon icon-class="garbage" class-name="card-panel-icon1"/>
......@@ -153,7 +153,7 @@
</el-col>
<el-col :xs="12" :sm="12" :lg="{span: '3-4'}" class="card-panel-col" >
<!-- <el-col :xs="12" :sm="12" :lg="{span: '3-5'}" class="card-panel-col" >
<div class="card-panel" @click="nextpageNb('销毁数量')">
<div class="card-panel-icon-wrapper icon-xh">
<svg-icon icon-class="系统" class-name="card-panel-icon" />
......@@ -163,7 +163,7 @@
<count-to :start-val="0" :end-val="count.bfCount" :duration="2600" class="card-panel-num"/>
</div>
</div>
</el-col>
</el-col> -->
</div>
</el-row>
</template>
......@@ -274,7 +274,10 @@ export default {
.panel-group {
margin-top: -10px;
.el-col-lg-3-4 {
width: 14.28%;
width: 16.65%;
}
.el-col-lg-3-5 {
width: 19.98%;
}
.card-panel-col{
margin-bottom: 15px;
......
src/views/warehouse/inventoryList/index.vue
......@@ -160,19 +160,23 @@ export default {
typeList: [
{name:"全部装备",value:"装备总数"},
{name:"在库装备",value:"在库数量"},
{name:"仓库装备",value:"仓库装备"},
{name:"调拨中",value:"调拨数量"},
{name:"使用中",value:"领用数量"},
{name:"维修装备",value:"维修数量"},
{name:"报废装备",value:"报废数量"},
{name:"单警柜装备",value:"单警柜装备"},
],
typeListNb: [
{name:"全部装备",value:"装备总数"},
{name:"在库装备",value:"在库数量"},
{name:"仓库装备",value:"仓库装备"},
{name:"调拨中",value:"调拨数量"},
{name:"使用中",value:"领用数量"},
{name:"维修装备",value:"维修数量"},
{name:"报废装备",value:"报废区数量"},
{name:"销毁装备",value:"销毁数量"},
{name:"单警柜装备",value:"单警柜装备"},
],
orgCode: this.$store.state.user.user.baseJpOrganization.code,
tData: [],
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论