upright
/
duoji-frontend
mirror of https://gitlab.hzleaper.com:81/duoji/duoji-frontend.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

历史数据分页失效问题

Browse Source
merge-requests/1/head
张鑫 5 years ago
parent 5a7f2bf83f
commit d52f56865b
10 changed files with 295 additions and 96 deletions
Show Stats Download Patch File Download Diff File

2
auth.json
Unescape Escape View File

@ -1,5 +1,5 @@
{ {
"description": "德马泰克垛机视觉系统", "description": "垛机视觉系统",
"type": -1, "type": -1,
"rights": "duojiSystem", "rights": "duojiSystem",
"children": [{ "children": [{

4
public/index.html
Unescape Escape View File

@ -6,12 +6,12 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>德马泰克垛机视觉系统</title> <title>垛机视觉系统</title>
</head> </head>
<body> <body>
<noscript> <noscript>
<strong>We're sorry but 德马泰克垛机视觉系统 doesn't work properly without JavaScript enabled. Please enable it to <strong>We're sorry but 垛机视觉系统 doesn't work properly without JavaScript enabled. Please enable it to
continue.</strong> continue.</strong>
</noscript> </noscript>
<div id="app"></div> <div id="app"></div>

2
src/assets/user.json
Unescape Escape View File

@ -820,7 +820,7 @@
"parentId": 0, "parentId": 0,
"grade": 1, "grade": 1,
"rights": "duojiSystem", "rights": "duojiSystem",
"description": "德马泰克垛机视觉系统", "description": "垛机视觉系统",
"reserved": "", "reserved": "",
"state": 0, "state": 0,
"createTime": "2020-08-24T14:04:10", "createTime": "2020-08-24T14:04:10",

2
src/layouts/AsideMenu.vue
Unescape Escape View File

@ -2,7 +2,7 @@
<a-layout-sider :class="['aside', collapsed ? 'merge' :'']" v-model="collapsed" theme="dark" :trigger="null" collapsible> <a-layout-sider :class="['aside', collapsed ? 'merge' :'']" v-model="collapsed" theme="dark" :trigger="null" collapsible>
<div class="logo"> <div class="logo">
<!-- <img src="@/assets/logo1.png" alt />--> <!-- <img src="@/assets/logo1.png" alt />-->
<span class="logo-title">德马泰克垛机视觉系统</span> <span class="logo-title">垛机视觉系统</span>
</div> </div>
<a-menu :selectedKeys="selectedKeys" <a-menu :selectedKeys="selectedKeys"
:openKeys.sync="openKeys" :openKeys.sync="openKeys"

9
src/router/index.js
Unescape Escape View File

@ -66,6 +66,15 @@ const routes = [{
}, },
component: () => import('@/views/alarmVideos/index') component: () => import('@/views/alarmVideos/index')
}, },
{
path: 'alarmLog',
name: 'alarmLog',
meta: {
icon: 'alert',
name: '告警日志'
},
component: () => import('@/views/alarmVideos/alarmLog')
},
{ {
path: 'checkManage', path: 'checkManage',
name: 'checkManage', name: 'checkManage',

303
src/views/checkManage/checkOperation.vue
Unescape Escape View File

@ -22,90 +22,165 @@
右货架 右货架
</a-select-option> </a-select-option>
</a-select> </a-select>
<a-select default-value="c" style="width: 160px" v-if="!checkObj.shelveId"> <a-select
<a-select-option value="c"> @change="handleTypeChange2"
style="width: 160px"
:value="selectType2"
v-if="selectType2 !== 'none'"
>
<a-select-option value="out">
外 外
</a-select-option> </a-select-option>
<a-select-option value="d"> <a-select-option value="inside">
内 内
</a-select-option> </a-select-option>
</a-select> </a-select>
</div> </div>
<div v-for="(key,value) in checkList" :key="value">
<div v-if="checkObj.shelveId == value"> <div v-if="JSON.stringify(checkObj) !== '{}'">
<!--{{value}}{{key}}--> <div v-for="(key,value) in checkList" :key="value">
<div v-for="(columnItem,index) in key" :key="index"> <div v-if="checkObj.shelveId == value">
<div class="carousel-page" <!--{{value}}{{key}}-->
v-if="columnItem.row == checkObj.row && columnItem.column == checkObj.column"> <div v-for="(columnItem,index) in key" :key="index">
<p class="carousel-page-title">工单号：{{checkObj.orderNum}}</p> <div class="carousel-page"
<div class="carousel-page-content"> v-if="columnItem.row == checkObj.row && columnItem.column == checkObj.column">
<div class="img-box"> <p class="carousel-page-title">工单号：{{checkObj.orderNum}}</p>
<img <div class="carousel-page-content">
src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1931813381,2486401072&fm=26&gp=0.jpg" <div class="img-box">
alt=""> <img
<p>操作前照片</p> v-if="checkObj.preoperationPic"
:src="imgUrl+checkObj.preoperationPic"
alt="">
<div v-else
style="display: flex;align-items: center;justify-content: center;width:400px;height:400px;background:#bfbfbf">
暂无图片
</div>
<p>操作前照片</p>
</div>
<div class="img-box">
<img
v-if="checkObj.overoperationPic"
:src="imgUrl+checkObj.overoperationPic"
alt="">
<div v-else
style="display: flex;align-items: center;justify-content: center;width:400px;height:400px;background:#bfbfbf">
暂无图片
</div>
<p>操作后照片</p>
</div>
</div> </div>
<div class="img-box"> <div class="carousel-page-footer">
<img <div class="info-box">
src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=3139679339,2066283298&fm=26&gp=0.jpg" <p>系统登记品规：{{checkObj.category}}</p>
alt=""> <p>系统登记数量：{{checkObj.count}}</p>
<p>操作后照片</p> </div>
<div class="status" v-if="checkObj.status == 0">
未核对
</div>
<div class="status" v-if="checkObj.status == 1">
已核对：<span style="color: #d81e06;">核对错误</span>
</div>
<div class="status" v-if="checkObj.status == 2">
已核对：<span style="color: #1afa29;">核对正确</span>
</div>
<div class="status-btn" v-if="checkObj.status == 0">
<a-button class="btn"
type="danger"
@click="showModel(checkObj,index)"
>人工复核
</a-button>
<a-button class="btn"
type="primary"
style="background:#29c12b;border-color:#29c12b;"
@click="checkSure(checkObj.row,checkObj.column,checkObj.shelveId,index)"
>核对正确
</a-button>
</div>
<div class="status-btn" v-if="checkObj.status == 1 ||checkObj.status == 2">
<a-button class="btn"
type="danger"
@click="showModel(checkObj,index)"
>核对错误
</a-button>
<a-button class="btn"
type="primary"
style="background:#29c12b;border-color:#29c12b;"
@click="checkSure(checkObj.row,checkObj.column,checkObj.shelveId,index)"
>核对正确
</a-button>
</div>
</div> </div>
</div> </div>
<div class="carousel-page-footer">
<div class="info-box">
<p>系统登记品规：{{checkObj.category}}</p>
<p>系统登记数量：{{checkObj.count}}</p>
</div>
<div class="status" v-if="checkObj.status == 0">
未核对
</div>
<div class="status" v-if="checkObj.status == 1">
已核对：<span style="color: #d81e06;">核对错误</span>
</div>
<div class="status" v-if="checkObj.status == 2">
已核对：<span style="color: #1afa29;">核对正确</span>
</div>
<div class="status-btn" v-if="checkObj.status == 0">
<a-button class="btn"
type="danger"
@click="showModel(checkObj,index)"
>人工复核
</a-button>
<a-button class="btn"
type="primary"
style="background:#29c12b;border-color:#29c12b;"
@click="checkSure(checkObj.row,checkObj.column,checkObj.shelveId,index)"
>核对正确
</a-button>
</div>
<div class="status-btn" v-if="checkObj.status == 1 ||checkObj.status == 2">
<a-button class="btn"
type="danger"
@click="showModel(checkObj,index)"
>核对错误
</a-button>
<a-button class="btn"
type="primary"
style="background:#29c12b;border-color:#29c12b;"
@click="checkSure(checkObj.row,checkObj.column,checkObj.shelveId,index)"
>核对正确
</a-button>
</div>
</div>
</div>
<div class="bottom-btn" <div class="bottom-btn"
v-if="columnItem.row == checkObj.row && columnItem.column == checkObj.column"> v-if="columnItem.row == checkObj.row && columnItem.column == checkObj.column">
<a-button class="btn" @click="prev(index > 0 ? index : 0)">＜上一个</a-button> <a-button class="btn" @click="prev(index > 0 ? index : 0)">＜上一个</a-button>
<p>{{checkObj.row}}行{{checkObj.column}}列</p> <p>{{checkObj.row}}行{{checkObj.column}}列</p>
<a-button class="btn" @click="next(index<=key.length ? index :index=key.length-1)">下一个＞ <a-button class="btn" @click="next(index<=key.length ? index :index=key.length-1)">下一个＞
</a-button> </a-button>
</div>
</div> </div>
</div> </div>
<!--<div v-if="shelveId == value && JSON.stringify(checkObj) == '{}'">-->
<!---->
<!--<div v-for="(columnItem,index) in key" :key="index">-->
<!--<div class="carousel-page"-->
<!--v-if="columnItem.row == row">-->
<!--<p class="carousel-page-title">工单号：</p>-->
<!--<div class="carousel-page-content">-->
<!--<div class="img-box">-->
<!--<img-->
<!--src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1931813381,2486401072&fm=26&gp=0.jpg"-->
<!--alt="">-->
<!--<p>操作前照片</p>-->
<!--</div>-->
<!--<div class="img-box">-->
<!--<img-->
<!--src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=3139679339,2066283298&fm=26&gp=0.jpg"-->
<!--alt="">-->
<!--<p>操作后照片</p>-->
<!--</div>-->
<!--</div>-->
<!--<div class="carousel-page-footer">-->
<!--<div class="info-box">-->
<!--<p>系统登记品规：</p>-->
<!--<p>系统登记数量：</p>-->
<!--</div>-->
<!--<div class="status">-->
<!--未核对-->
<!--</div>-->
<!--<div class="status-btn" >-->
<!--<a-button class="btn"-->
<!--type="danger"-->
<!--@click="showModel(row,index)"-->
<!--&gt;人工复核-->
<!--</a-button>-->
<!--<a-button class="btn"-->
<!--type="primary"-->
<!--style="background:#29c12b;border-color:#29c12b;"-->
<!--@click="checkSure(row,column,shelveId,index)"-->
<!--&gt;核对正确-->
<!--</a-button>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="bottom-btn"-->
<!--v-if="columnItem.row == row">-->
<!--<a-button class="btn" @click="prev1(index&#45;&#45; > 0 ? index&#45;&#45; : 0)">＜上一个</a-button>-->
<!--<p>{{row}}行{{column}}列</p>-->
<!--<a-button class="btn" @click="next1(index ++ <= key.length ? index++ :index =key.length-1)">下一个＞-->
<!--</a-button>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
</div> </div>
</div> </div>
<div v-else>
<p style="padding:25px;">该货位暂无相关记录</p>
</div>
<Model <Model
:visible.sync="visible" :visible.sync="visible"
:modelData.sync="modelData" :modelData.sync="modelData"
@ -117,45 +192,67 @@
</template> </template>
<script> <script>
import Model from "./model.vue" import Model from "./model.vue"
import {imgUrl} from "@/api/importExcel";
export default { export default {
data() { data() {
return { return {
listData: [], listData: [],
checkObj: {}, checkObj: {},
streetDetail: {}, streetDetail: {},
checkList: [], checkList: {},
id: 0, id: 0,
row: 1,
column: 1,
selectName: '', selectName: '',
shelveId: '', shelveId: '',
selectType: '', selectType: '',
selectType2: '',
visible: false, visible: false,
category: '', category: '',
count: 0, count: 0,
modelData: {}, modelData: {},
index: 0 index: 0,
imgUrl: ''
} }
}, },
created() { created() {
this.checkObj = this.$route.query.checkObj this.imgUrl = imgUrl
this.streetDetail = this.$route.query.item console.log(this.$route.query.id)
this.id = this.$route.query.item.id if (this.$route.query.row && this.$route.query.column && this.$route.query.shelveId && this.$route.query.id && this.$route.query.name) {
this.selectName = this.$route.query.item.name this.id = this.$route.query.id
console.log(this.checkObj) this.row = this.$route.query.row
if (this.checkObj.shelveId == this.streetDetail.leftShelveId) { this.column = this.$route.query.column
this.selectType = 'left' this.shelveId = this.$route.query.shelveId
} else { this.selectName = this.$route.query.name
this.selectType = 'right' this.selectType = this.$route.query.type
this.selectType2 = this.$route.query.type2
console.log(this.shelveId)
console.log(this.row)
console.log(this.column)
this.getStockInfo(this.row, this.column, this.shelveId)
} else if (this.$route.query.checkObj && this.$route.query.item && this.$route.query.item.id && this.$route.query.item.name) {
this.checkObj = this.$route.query.checkObj
this.streetDetail = this.$route.query.item
this.id = this.$route.query.item.id
this.selectName = this.$route.query.item.name
} }
}, },
mounted() { mounted() {
this.getStreetList() this.getStreetList()
if (JSON.stringify(this.checkObj) !== '{}') {
if (this.checkObj.shelveId == this.streetDetail.leftShelveId) {
this.selectType = 'left'
} else {
this.selectType = 'right'
}
}
}, },
components: { components: {
Model Model
}, },
methods: { methods: {
//获取巷道列表 //获取巷道列表
getStreetList(id) { getStreetList() {
this.$api.httpApi.getStreetList({ this.$api.httpApi.getStreetList({
data: { data: {
pageNum: 1, pageNum: 1,
@ -191,6 +288,7 @@ export default {
} }
}).then(res => { }).then(res => {
this.checkList = res.data this.checkList = res.data
console.log(this.checkList)
}).catch(err => { }).catch(err => {
}); });
@ -204,8 +302,10 @@ export default {
shelveId: shelveId, shelveId: shelveId,
} }
}).then(res => { }).then(res => {
this.checkObj = res.data if (res.data) {
this.shelveId = res.data.shelveId this.checkObj = res.data
this.shelveId = res.data.shelveId
}
}).catch(err => { }).catch(err => {
}); });
@ -234,6 +334,21 @@ export default {
this.getStockInfo(1, 1, this.streetDetail.rightShelveId) this.getStockInfo(1, 1, this.streetDetail.rightShelveId)
} }
},
handleTypeChange2(value) {
console.log(this.streetDetail.leftShelveId)
console.log(value)
this.selectType2 = value
if (this.selectType == 'left' && value == 'inside') {
this.getStockInfo(1, 1, this.streetDetail.leftInsideShelveId)
} else if (this.selectType == 'left' && value == 'out') {
this.getStockInfo(1, 1, this.streetDetail.leftOutsideShelveId)
} else if (this.selectType == 'right' && value == 'inside') {
this.getStockInfo(1, 1, this.streetDetail.rightInsideShelveId)
} else if (this.selectType == 'right' && value == 'out') {
this.getStockInfo(1, 1, this.streetDetail.rightOutsideShelveId)
}
}, },
prev(index) { prev(index) {
index-- index--
@ -259,6 +374,28 @@ export default {
} }
} }
}, },
prev1(index) {
console.log(index)
for (let x in this.checkList) {
if (this.shelveId == this.checkList[x][index].shelveId) {
console.log(this.checkList[x][index].row)
console.log(this.checkList[x][index].column)
console.log(this.checkList[x][index].shelveId)
this.getStockInfo(this.checkList[x][index].row, this.checkList[x][index].column, this.checkList[x][index].shelveId)
}
}
},
next1(index) {
console.log(index)
for (let x in this.checkList) {
if (this.shelveId == this.checkList[x][index].shelveId) {
console.log(this.checkList[x][index].row)
console.log(this.checkList[x][index].column)
console.log(this.checkList[x][index].shelveId)
this.getStockInfo(this.checkList[x][index].row, this.checkList[x][index].column, this.checkList[x][index].shelveId)
}
}
},
checkSure(row, column, shelveId, index) { checkSure(row, column, shelveId, index) {
this.$api.httpApi.stockCheckCorrect({ this.$api.httpApi.stockCheckCorrect({
data: { data: {

62
src/views/checkManage/index.vue
Unescape Escape View File

@ -16,6 +16,7 @@
</span> </span>
</div> </div>
<!--左货架DOM-->
<div class="check-content" v-for="item in data" :key="item.id"> <div class="check-content" v-for="item in data" :key="item.id">
<div class="roadway-top" v-if="item.id == select "> <div class="roadway-top" v-if="item.id == select ">
<happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box"> <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box">
@ -23,9 +24,30 @@
<div class="line" v-for="(column,index) in item.leftColumn" :key="index"> <div class="line" v-for="(column,index) in item.leftColumn" :key="index">
<div v-for="(row,i) in item.leftRow" :key="i" class="el"> <div v-for="(row,i) in item.leftRow" :key="i" class="el">
<!--渲染默认巷道框架规格 定位浮在 已有巷道上做对应--> <!--渲染默认巷道框架规格 定位浮在 已有巷道上做对应-->
<span class="default"> <span
v-if="item.leftShelveId"
class="default"
style="background:#bfbfbf;border-radius:4px"
@click="tocheck(row,column,item.leftShelveId,item.id,item.name,'left','none')"
>
{{row}}-{{column}} {{row}}-{{column}}
</span> </span>
<span
v-if="item.leftInsideShelveId && size =='leftInsideShelveId'"
class="default"
style="background:#bfbfbf;border-radius:4px"
@click="tocheck(row,column,item.leftInsideShelveId,item.id,item.name,'left','inside')"
>
{{row}}-{{column}}
</span>
<span
v-if="item.leftOutsideShelveId && size== 'leftOutsideShelveId'"
class="default"
style="background:#bfbfbf;border-radius:4px"
@click="tocheck(row,column,item.leftOutsideShelveId,item.id,item.name,'left','out')"
>
{{row}}-{{column}}
</span>
<div v-for="(key,value) in checkList" :key="value"> <div v-for="(key,value) in checkList" :key="value">
<div v-for="(columnItem,val) in key" :key="val"> <div v-for="(columnItem,val) in key" :key="val">
<div <div
@ -55,6 +77,7 @@
</div> </div>
</div> </div>
<!--单伸类型右货架DOM-->
<div class="center-box"> <div class="center-box">
<a-select v-if="data[0]" :default-value="data[0].name" style="width: 180px" <a-select v-if="data[0]" :default-value="data[0].name" style="width: 180px"
@change="handleChange" class="select-roadway"> @change="handleChange" class="select-roadway">
@ -66,7 +89,7 @@
导出全部巷道 导出全部巷道
</a-button> </a-button>
</div> </div>
<div class="check-content" v-for="item in data" :key="item.id"> <div class="check-content" v-for="item in data" :key="item.name">
<div class="roadway-buttom" v-if="item.id == select"> <div class="roadway-buttom" v-if="item.id == select">
<happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box"> <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box">
<div class="roadway-box"> <div class="roadway-box">
@ -74,9 +97,28 @@
<div v-for="(row,index) in item.rightRow" :key="index" class="el"> <div v-for="(row,index) in item.rightRow" :key="index" class="el">
<!--渲染默认巷道框架规格 定位浮在 已有巷道上做对应--> <!--渲染默认巷道框架规格 定位浮在 已有巷道上做对应-->
<span class="default"> <span
v-if="item.rightShelveId"
class="default"
style="background:#bfbfbf;border-radius:4px"
@click="tocheck(row,column,item.rightShelveId,item.id,item.name,'right','none')">
{{row}}-{{column}}
</span>
<span
v-if="item.rightInsideShelveId&& size2 == 'rightInsideShelveId'"
class="default"
style="background:#bfbfbf;border-radius:4px"
@click="tocheck(row,column,item.rightShelveId,item.id,item.name,'right','inside')">
{{row}}-{{column}} {{row}}-{{column}}
</span> </span>
<span
v-if="item.rightOutsideShelveId && size2 == 'rightOutsideShelveId'"
class="default"
style="background:#bfbfbf;border-radius:4px"
@click="tocheck(row,column,item.rightOutsideShelveId,item.id,item.name,'right','out')">
{{row}}-{{column}}
</span>
<div v-for="(key,value) in checkList" :key="value"> <div v-for="(key,value) in checkList" :key="value">
<div v-for="(columnItem,val) in key" :key="val"> <div v-for="(columnItem,val) in key" :key="val">
<div <div
@ -110,8 +152,8 @@
export default { export default {
data() { data() {
return { return {
size: 'small', size: 'leftOutsideShelveId',
size2: 'small', size2: 'rightOutsideShelveId',
data: [], data: [],
select: '', select: '',
streetId: 0, streetId: 0,
@ -173,6 +215,14 @@ export default {
console.log(item) console.log(item)
this.$router.push({name: 'checkOperation', query: {checkObj: checkObj, item: item}}) this.$router.push({name: 'checkOperation', query: {checkObj: checkObj, item: item}})
}, },
tocheck(row, column, shelveId, id, name, type, type2) {
console.log(type)
console.log(type2)
this.$router.push({
name: 'checkOperation',
query: {row: row, column: column, shelveId: shelveId, id: id, name, type: type, type2: type2}
})
},
exportStock() { exportStock() {
this.$api.httpApi.exportStock({ this.$api.httpApi.exportStock({
params: { params: {

3
src/views/historyMonitoring/index.vue
Unescape Escape View File

@ -187,6 +187,9 @@ export default {
// item.pics = pic // item.pics = pic
// }) // })
console.log(res.data) console.log(res.data)
const pagination = {...this.pagination};
pagination.total = res.data.total;
this.pagination = pagination;
this.data = res.data.list this.data = res.data.list
}).catch(err => { }).catch(err => {

2
src/views/login.vue
Unescape Escape View File

@ -19,7 +19,7 @@
<div class="login-cover-logo"> <div class="login-cover-logo">
<img src="@/assets/logo.png" alt="logo" /> <img src="@/assets/logo.png" alt="logo" />
</div> </div>
<div class="login-cover-title">德马泰克垛机视觉系统</div> <div class="login-cover-title">垛机视觉系统</div>
</div> </div>
<!-- <div class="login-footer">Copyright © 2020 ZheHe technology CO., LTD.</div> --> <!-- <div class="login-footer">Copyright © 2020 ZheHe technology CO., LTD.</div> -->
</div> </div>

2
src/views/repertoryManage/index.vue
Unescape Escape View File

@ -117,7 +117,7 @@ export default {
}).then(res => { }).then(res => {
const pagination = {...this.pagination}; const pagination = {...this.pagination};
pagination.total = res.data.total; pagination.total = res.data.total;
this.data = res.data; this.data = res.data.list;
this.pagination = pagination; this.pagination = pagination;
res.data.list.forEach((value, index) => { res.data.list.forEach((value, index) => {
value.pageNumber = this.pagination.current value.pageNumber = this.pagination.current

Write Preview
Loading…
Cancel
Save