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 dc50c3e97c
commit 5c1c27a2ae
5 changed files with 166 additions and 78 deletions
Show Stats Download Patch File Download Diff File

3
src/views/alarmVideos/alarmLog.vue
Unescape Escape View File

@ -22,7 +22,7 @@
</a-col>
<a-col :span="10" style="text-align: right">
<a-button type="primary" @click="handleSearch">搜索</a-button>
<a-button style="margin-left: 8px" @click="reset">重置</a-button>
<a-button style="margin-left: 15px" @click="reset">重置</a-button>
</a-col>
</a-row>
</a-form>
@ -213,6 +213,7 @@ export default {
reset() {
this.queryParam.startTime = ""
this.queryParam.endTime = ""
this.queryParam.streetId = 0
this.time = []
this.handleGetalarmLog()
},

8
src/views/alarmVideos/index.vue
Unescape Escape View File

@ -13,7 +13,7 @@
</a-col>
<a-col :span="19" style="text-align: right">
<a-button type="primary" @click="handleSearch">搜索</a-button>
<!-- <a-button style="margin-left: 8px" @click="reset">重置</a-button>-->
<a-button style="margin-left: 15px" @click="reset">重置</a-button>
</a-col>
</a-row>
</a-form>
@ -158,6 +158,12 @@ export default {
this.visible = visible
this.vid = data
},
reset() {
this.queryParam.startTime = ""
this.queryParam.endTime = ""
this.time = []
this.handleGetalarmList()
},
},
};
</script>

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

@ -41,7 +41,8 @@
<div v-for="(key,value) in checkList" :key="value">
<div v-if="checkObj.shelveId == value">
<!--{{value}}{{key}}-->
<div v-for="(columnItem,index) in key" :key="index">
<div v-for="(columnItem,index) in key" :key="index"
style="width:100%;display:flex;align-items:center;justify-content:space-between;flex-direction: column">
<div class="carousel-page"
v-if="columnItem.row == checkObj.row && columnItem.column == checkObj.column">
<p class="carousel-page-title" @click="goHistory">工单号：{{checkObj.orderNum}}</p>
@ -50,9 +51,10 @@
<img
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">
alt=""/>
<div
v-else
style="display: flex;align-items: center;justify-content: center;width:600px;height:400px;background:#eaeaea">
暂无图片
</div>
<p>操作前照片</p>
@ -61,9 +63,10 @@
<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">
alt=""/>
<div
v-else
style="display: flex;align-items: center;justify-content: center;width:600px;height:400px;background:#eaeaea">
暂无图片
</div>
<p>操作后照片</p>
@ -121,64 +124,64 @@
</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 v-else>
<p style="padding:25px;">该货位暂无相关记录</p>
<div class="line" v-for="(listcolumn,index) in streetDetail.leftColumn" :key="index">
<div v-for="(listrow,i) in streetDetail.leftRow" :key="i" class="el"
style="width:100%;display:flex;align-items:center;justify-content:space-between;flex-direction: column">
<div class="carousel-page"
v-if="listrow == row && listcolumn == column">
<p class="carousel-page-title" @click="goHistory">工单号：暂无</p>
<div class="carousel-page-content">
<div class="img-box">
<div
style="display: flex;align-items: center;justify-content: center;width:600px;height:400px;background:#eaeaea">
暂无图片
</div>
<p>操作前照片</p>
</div>
<div class="img-box">
<div
style="display: flex;align-items: center;justify-content: center;width:600px;height:400px;background:#eaeaea">
暂无图片
</div>
<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(index)"
>人工复核
</a-button>
<a-button class="btn"
type="primary"
style="background:#29c12b;border-color:#29c12b;"
@click="checkSure(row,column,shelveId,index)"
>核对正确
</a-button>
</div>
</div>
</div>
<div class="bottom-btn"
v-if="listrow == row && listcolumn == column">
<a-button class="btn" @click="defaultPrev(listrow,listcolumn)">＜上一个</a-button>
<p>{{listrow}}行{{listcolumn}}列</p>
<a-button class="btn" @click="defaultNext(listrow,listcolumn)">下一个＞
</a-button>
</div>
</div>
</div>
</div>
<Model
@ -319,20 +322,47 @@ export default {
for (var i = 0; i < this.listData.length; i++) {
console.log(this.listData[i])
if (this.listData[i].id == value) {
if (this.listData[i].leftShelveId) {
this.shelveId = this.listData[i].leftShelveId
this.selectType = 'left'
this.selectType2 = 'out'
this.getStockInfo(1, 1, this.listData[i].leftShelveId)
} else if (this.listData[i].leftInsideShelveId) {
this.shelveId = this.listData[i].leftInsideShelveId
this.selectType = 'left'
this.selectType2 = 'none'
this.getStockInfo(1, 1, this.listData[i].leftInsideShelveId)
} else if (this.listData[i].leftOutsideShelveId) {
this.shelveId = this.listData[i].leftOutsideShelveId
this.selectType = 'left'
this.selectType2 = 'none'
this.getStockInfo(1, 1, this.listData[i].leftOutsideShelveId)
}
}
}
this.selectType = 'left'
this.getStockInfo(1, 1, this.shelveId)
},
handleTypeChange(value) {
console.log(this.streetDetail.leftShelveId)
console.log(value)
this.selectType = value
if (value == 'left') {
if (this.streetDetail.leftShelveId) {
this.getStockInfo(1, 1, this.streetDetail.leftShelveId)
} else if (this.streetDetail.leftInsideShelveId) {
this.getStockInfo(1, 1, this.streetDetail.leftInsideShelveId)
} else if (this.streetDetail.leftOutsideShelveId) {
this.getStockInfo(1, 1, this.streetDetail.leftOutsideShelveId)
}
} else if (value == 'right') {
if (this.streetDetail.rightShelveId) {
this.getStockInfo(1, 1, this.streetDetail.rightShelveId)
} else if (this.streetDetail.rightInsideShelveId) {
this.getStockInfo(1, 1, this.streetDetail.rightInsideShelveId)
} else if (this.streetDetail.rightOutsideShelveId) {
this.getStockInfo(1, 1, this.streetDetail.rightOutsideShelveId)
}
}
},
@ -340,7 +370,11 @@ export default {
console.log(this.streetDetail.leftShelveId)
console.log(value)
this.selectType2 = value
if (this.selectType == 'left' && value == 'inside') {
if (this.selectType == 'left' && value == 'none') {
this.getStockInfo(1, 1, this.streetDetail.leftShelveId)
} else if (this.selectType == 'right' && value == 'none') {
this.getStockInfo(1, 1, this.streetDetail.rightShelveId)
} else 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)
@ -375,6 +409,45 @@ export default {
}
}
},
defaultPrev(row, column) {
for (var i = 1; i < this.streetDetail.leftColumn + 1; i++) {
for (var j = 1; j < this.streetDetail.leftRow + 1; j++) {
console.log(i)
console.log(j)
if (i == row && j == column) {
this.column = j - 1
if (this.column < 1) {
this.row = i - 1
this.column = this.streetDetail.leftColumn
}
if (i == 1 && j == 1) {
this.row = 1
this.column = 1
}
}
}
}
},
defaultNext(row, column) {
for (var i = 1; i < this.streetDetail.leftColumn + 1; i++) {
for (var j = 1; j < this.streetDetail.leftRow + 1; j++) {
console.log(i)
console.log(j)
if (i == row && j == column) {
this.column = j + 1
if (this.column == this.streetDetail.leftColumn + 1) {
this.row = i + 1
this.column = 1
}
if (i == this.streetDetail.leftColumn && j == this.streetDetail.leftRow) {
this.row = this.streetDetail.leftRow
this.column = this.streetDetail.leftColumn
}
}
}
}
},
checkSure(row, column, shelveId, index) {
this.$api.httpApi.stockCheckCorrect({
data: {
@ -383,7 +456,11 @@ export default {
shelveId: shelveId,
}
}).then(res => {
if (res.code == 200) {
this.next(index)
this.$message.success('操作成功');
}
}).catch(err => {
});
@ -418,7 +495,7 @@ export default {
.checkOperation {
.carousel-page {
width: 900px;
width: 90%;
/*border: solid 1px blue;*/
&-title {
color: #009FE3;
@ -440,11 +517,8 @@ export default {
flex-direction: column;
font-size: 17px;
height: 400px;
width: 400px;
img {
width: 100%;
height: calc(100% - 25px)
height: 100%
}
p {

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

@ -17,7 +17,7 @@
</a-col>
<a-col :span="10" style="text-align: right">
<a-button type="primary" @click="handleSearch">搜索</a-button>
<!-- <a-button style="margin-left: 8px" @click="reset">重置</a-button>-->
<a-button style="margin-left: 15px" @click="reset">重置</a-button>
</a-col>
</a-row>
</a-form>
@ -211,6 +211,13 @@ export default {
this.visible = visible
this.vid = data
},
reset() {
this.queryParam.startTime = ""
this.queryParam.endTime = ""
this.queryParam.orderNum = ""
this.time = []
this.handleGetHistoryList()
},
},
components: {
Model

Write Preview
Loading…
Cancel
Save