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
qiushui 4 years ago
parent 234986ab97
commit 3729c61ce6
7 changed files with 115 additions and 205 deletions
Show Stats Download Patch File Download Diff File

BIN
dist.zip
View File

Binary file not shown.

4
public/antd_color.less
Unescape Escape View File

@ -42,7 +42,7 @@ html {--antd-wave-shadow-color: @primary-color;}
.ant-alert-info .ant-alert-icon {color: #1890ff;} .ant-alert-info .ant-alert-icon {color: #1890ff;}
.ant-alert-warning {background-color: #fffbe6;border: 1px solid #ffe58f;} .ant-alert-warning {background-color: #fffbe6;border: 1px solid #ffe58f;}
.ant-alert-warning .ant-alert-icon {color: #faad14;} .ant-alert-warning .ant-alert-icon {color: #faad14;}
.ant-alert-error {background-color: #fff1f0;border: 1px solid #ffa39e;} .ant-alert-error {background-color: color(~`colorPalette("@{heading-color}", 1)`);border: 1px solid #ffa39e;}
.ant-alert-error .ant-alert-icon {color: #f5222d;} .ant-alert-error .ant-alert-icon {color: #f5222d;}
.ant-alert-close-icon {background-color: transparent;border: none;} .ant-alert-close-icon {background-color: transparent;border: none;}
.ant-alert-close-icon .anticon-close {color: @text-color-secondary;} .ant-alert-close-icon .anticon-close {color: @text-color-secondary;}
@ -1377,7 +1377,7 @@ tr.ant-table-expanded-row:hover {background: #fbfbfb;}
.ant-tag-pink-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;} .ant-tag-pink-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
.ant-tag-magenta {color: #eb2f96;background: #fff0f6;border-color: #ffadd2;} .ant-tag-magenta {color: #eb2f96;background: #fff0f6;border-color: #ffadd2;}
.ant-tag-magenta-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;} .ant-tag-magenta-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
.ant-tag-red {color: #f5222d;background: #fff1f0;border-color: #ffa39e;} .ant-tag-red {color: #f5222d;background: color(~`colorPalette("@{heading-color}", 1)`);border-color: #ffa39e;}
.ant-tag-red-inverse {color: #fff;background: #f5222d;border-color: #f5222d;} .ant-tag-red-inverse {color: #fff;background: #f5222d;border-color: #f5222d;}
.ant-tag-volcano {color: #fa541c;background: #fff2e8;border-color: #ffbb96;} .ant-tag-volcano {color: #fa541c;background: #fff2e8;border-color: #ffbb96;}
.ant-tag-volcano-inverse {color: #fff;background: #fa541c;border-color: #fa541c;} .ant-tag-volcano-inverse {color: #fff;background: #fa541c;border-color: #fa541c;}

5
src/views/cameraManage/model.vue
Unescape Escape View File

@ -351,9 +351,10 @@ export default {
autoPlay(id){ autoPlay(id){
let video = document.getElementById('camera'+id); let video = document.getElementById('camera'+id);
this.player = new WebRtcPlayer(video,'camera'+id); let player = new WebRtcPlayer(video,'camera'+id);
this.player.load('camera'+id); player.load('camera'+id);
this.player = player
}, },
setVideoServer(){ setVideoServer(){

27
src/views/checkManage/Subsection.vue
Unescape Escape View File

@ -140,14 +140,14 @@ export default {
}, },
watchShelveIdInfo(){ watchShelveIdInfo(){
return this.shelveId; return this.shelveId;
} },
}, },
watch: { watch: {
watchShelveIdInfo() { watchShelveIdInfo() {
this.getStatus(); this.getStatus();
} },
immediate: true
}, },
data() { data() {
return { return {
@ -163,27 +163,29 @@ export default {
//this.changeTab('1-1') //this.changeTab('1-1')
this.$nextTick(() => { this.$nextTick(() => {
this.getStatus(); this.getStatus();
}) })
}, },
created() { created() {
//this.getStatus();
//this.changeTab('1-1')
}, },
destroyed() { destroyed() {
}, },
methods: { methods: {
changeTab(value){ changeTab(value){
console.log(value) //console.log(value)
this.select.row = value this.select.row = value
console.log("latticeRow"+this.latticeRow+"select"+this.select.row+","+this.select.column+"random"+this.random.row+","+this.random.column) //console.log("latticeRow"+this.latticeRow+"select"+this.select.row+","+this.select.column+"random"+this.random.row+","+this.random.column)
this.getStatus() this.getStatus()
}, },
changeTabLeft(value){ changeTabLeft(value){
console.log(value) //console.log(value)
this.select.column = value this.select.column = value
this.getStatus() this.getStatus()
console.log("latticeRow"+this.latticeRow+"select"+this.select.row+","+this.select.column+"random"+this.random.row+","+this.random.column) //console.log("latticeRow"+this.latticeRow+"select"+this.select.row+","+this.select.column+"random"+this.random.row+","+this.random.column)
}, },
// 获取行或列的范围字符串 // 获取行或列的范围字符串
@ -263,6 +265,7 @@ export default {
} }
console.log(this.status) console.log(this.status)
} }
}).catch(err => { }).catch(err => {
@ -334,11 +337,11 @@ export default {
} }
.roadway-box { .roadway-box {
transform: rotateX(180deg); //transform: rotateX(180deg);
padding: 10px 10px 0 0; padding: 10px 10px 0 0;
.line { .line {
display: flex; display: flex;
transform: rotateX(180deg); //两次垂直镜像翻转让原本由上到下排列的div 更改为由下到上 //transform: rotateX(180deg); //两次垂直镜像翻转让原本由上到下排列的div 更改为由下到上
.el { .el {
width: 46px; width: 46px;

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

@ -39,116 +39,93 @@
</span> </span>
</div> </div>
<div> <div>
<div class="carousel-page" <div class="carousel-page"
> >
<div class="carousel-page-content"> <div class="carousel-page-content">
<div class="img-box"> <div class="img-box">
<ul> <ul>
<li> <li>
<span class="img-box-title"> <span class="img-box-title">
核对状态: 核对状态:
</span> </span>
<span class="img-box-value"> <span class="img-box-value">
{{ statusMap[checkObj.status] }} {{ statusMap[checkObj.status] }}
</span> </span>
</li> </li>
<li v-for="item in params" :key="item.label"> <li v-for="item in params" :key="item.label">
<span class="img-box-title"> <span class="img-box-title">
{{ item.label }}: {{ item.label }}:
</span> </span>
<span class="img-box-value"> <span class="img-box-value">
{{ checkObj[item.key] }} {{ checkObj[item.key] }}
</span> </span>
</li> </li>
<li> <li>
<span class="img-box-title"> <span class="img-box-title">
盘点图: 盘点图:
</span> </span>
</li>
<template>
<span v-if="checkObj.checkPic">
<happy-scroll color="rgba(100,100,100,0.5)" size="1" class="scroll-box" style="width:50;height:90px;">
<viewer>
<img class="historyImg" :src="imgUrl+checkObj.checkPic"/>
</viewer>
</happy-scroll>
</span>
<span v-else>
暂无盘点图
</span>
</template>
</ul>
</div>
<div class="img-box">
<img
v-if="checkObj.preoperationPic"
:src="imgUrl+checkObj.preoperationPic"
style="width: 100%;height: 358px"
alt=""/>
<div
v-else
style="display: flex;align-items: center;justify-content: center;width:600px;height:400px;background:#eaeaea">
暂无图片
</div>
<p>操作前照片</p>
</div>
<div class="img-box">
<img
v-if="checkObj.overoperationPic"
:src="imgUrl+checkObj.overoperationPic"
style="width: 100%;height: 358px"
alt=""/>
<div
v-else
style="display: flex;align-items: center;justify-content: center;width:600px;height:400px;background:#eaeaea">
暂无图片
</div>
<p>操作后照片</p>
</div>
</div>
</div> </li>
<div class="carousel-page-footer"> <template>
<div class="status-btn" v-if="checkObj.status == 0"> <span v-if="checkObj.checkPic">
<!-- <a-button class="btn" <happy-scroll color="rgba(100,100,100,0.5)" size="1" class="scroll-box" style="width:50;height:90px;">
type="danger" <viewer>
@click="showModel(checkObj,index)" <img class="historyImg" :src="imgUrl+checkObj.checkPic"/>
>人工复核 </viewer>
</a-button> --> </happy-scroll>
<a-button class="btn" </span>
type="primary" <span v-else>
style="background:#29c12b;border-color:#29c12b;" 暂无盘点图
@click="checkSure(checkObj.row,checkObj.column,checkObj.shelveId,index)" </span>
>核对正确 </template>
</a-button> </ul>
</div>
<div class="status-btn" v-if="checkObj.status == 1 ||checkObj.status == 2"> </div>
<a-button class="btn" <div class="img-box">
type="danger" <img
@click="showModel(checkObj,index)" v-if="checkObj.preoperationPic"
>核对错误 :src="imgUrl+checkObj.preoperationPic"
</a-button> style="width: 100%;height: 358px"
<a-button class="btn" alt=""/>
type="primary" <div
style="background:#29c12b;border-color:#29c12b;" v-else
@click="checkSure(checkObj.row,checkObj.column,checkObj.shelveId,index)" style="display: flex;align-items: center;justify-content: center;width:600px;height:400px;background:#eaeaea">
>核对正确 暂无图片
</a-button> </div>
</div> <p>操作前照片</p>
</div> </div>
<div class="bottom-btn" <div class="img-box">
> <img
<a-button class="btn" @click="prev()">＜上一个</a-button> v-if="checkObj.overoperationPic"
<p>{{checkObj.row}}行{{checkObj.column}}列</p> :src="imgUrl+checkObj.overoperationPic"
<a-button class="btn" @click="next()">下一个＞ style="width: 100%;height: 358px"
</a-button> alt=""/>
</div> <div
v-else
style="display: flex;align-items: center;justify-content: center;width:600px;height:400px;background:#eaeaea">
暂无图片
</div>
<p>操作后照片</p>
</div>
</div>
</div>
<div class="bottom-btn" >
<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="bottom-btn"
>
<a-button class="btn" @click="prev()">＜上一个</a-button>
<p>{{checkObj.row}}行{{checkObj.column}}列</p>
<a-button class="btn" @click="next()">下一个＞
</a-button>
</div>
</div> </div>
@ -555,8 +532,8 @@ export default {
justify-content: flex-start; justify-content: flex-start;
.btn { .btn {
padding: 25px; padding: 50px;
font-size: 17px; font-size: 20px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;

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

@ -48,25 +48,7 @@
</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.id">
<subsection v-if="item.id == select" :total="{row: item.leftRow, column: item.leftColumn}" :shelveId="leftShelveId.shelveId" :streetId="item.id" :streetName="item.name" type="left" :inOut="leftShelveId.shelveType" > <subsection v-if="item.id == select" :total="{row: item.leftColumn, column: item.leftRow}" :shelveId="leftShelveId.shelveId" :streetId="item.id" :streetName="item.name" type="left" :inOut="leftShelveId.shelveType" >
<!-- <template v-slot="scope">
<div class="roadway-top">
<div class="roadway-box">
<div class="line" v-for="(column,index) in item.leftColumn" :key="index" v-if="column >= scope.data.random.column[0] && column <= scope.data.random.column[1]">
<div v-for="(row,i) in item.leftRow" :key="i" class="el" v-if="row >= scope.data.random.row[0] && row <= scope.data.random.row[1]">
渲染默认巷道框架规格 定位浮在 已有巷道上做对应
<span
class="default"
:style="{background:getStatusBg(stockInfo.left, `${row}-${column}`)}"
@click="tocheck(row,column,leftShelveId.shelveId,item.id,item.name,'left',leftShelveId.shelveType)"
>
{{row}}-{{column}}
</span>
</div>
</div>
</div>
</div>
</template> -->
</subsection> </subsection>
</div> </div>
@ -91,25 +73,7 @@
</div> </div>
<div class="check-content" v-for="item in data" :key="item.name"> <div class="check-content" v-for="item in data" :key="item.name">
<subsection v-if="item.id == select" :total="{row:item.leftRow, column: item.leftColumn}" :shelveId="rightShelveId.shelveId" :streetId="item.id" :streetName="item.name" type="right" :inOut="rightShelveId.shelveType"> <subsection v-if="item.id == select" :total="{row:item.rightColumn, column: item.rightRow}" :shelveId="rightShelveId.shelveId" :streetId="item.id" :streetName="item.name" type="right" :inOut="rightShelveId.shelveType">
<!-- <template v-slot="scope">
<div class="roadway-buttom">
<div class="roadway-box">
<div class="line" v-for="(column,index) in item.rightColumn" :key="index" v-if="column >= scope.data.random.column[0] && column <= scope.data.random.column[1]">
<div v-for="(row,index) in item.rightRow" :key="index" class="el" v-if="row >= scope.data.random.row[0] && row <= scope.data.random.row[1]">
渲染默认巷道框架规格 定位浮在 已有巷道上做对应
<span
class="default"
:style="{background:getStatusBg(stockInfo.right, `${row}-${column}`)}"
@click="tocheck(row,column,rightShelveId.shelveId,item.id,item.name,'right',rightShelveId.shelveType)">
{{row}}-{{column}}
</span>
</div>
</div>
</div>
</div>
</template> -->
</subsection> </subsection>
</div> </div>
</div> </div>
@ -132,48 +96,13 @@ export default {
right: {} right: {}
}, },
timer: null, timer: null,
shelveId: '',
leftShelveId:{}, leftShelveId:{},
rightShelveId:{} rightShelveId:{}
} }
}, },
computed: { computed: {
// 获取左侧货架号
// leftShelveId() {
// let shelveId;
// let shelveType = 'none';
// if(this.streetDetail.leftShelveId) {
// shelveId = this.streetDetail.leftShelveId;
// }else if(this.streetDetail.leftInsideShelveId && this.size =='leftInsideShelveId'){
// shelveId = this.streetDetail.leftInsideShelveId;
// shelveType = 'inside';
// }else if(this.streetDetail.leftOutsideShelveId && this.size== 'leftOutsideShelveId'){
// shelveId = this.streetDetail.leftOutsideShelveId;
// shelveType = 'out';
// };
// return {
// shelveId,
// shelveType
// };
// },
// 获取右侧货架号
// rightShelveId() {
// let shelveId;
// let shelveType = 'none';
// if(this.streetDetail.rightShelveId) {
// shelveId = this.streetDetail.rightShelveId;
// }else if(this.streetDetail.rightInsideShelveId && this.size2 =='rightInsideShelveId'){
// shelveId = this.streetDetail.rightInsideShelveId;
// shelveType = 'inside';
// }else if(this.streetDetail.rightOutsideShelveId && this.size2 == 'rightOutsideShelveId'){
// shelveId = this.streetDetail.rightOutsideShelveId;
// shelveType = 'out';
// };
// return {
// shelveId,
// shelveType
// };
// }
}, },
mounted() { mounted() {
this.request(); this.request();
@ -197,6 +126,7 @@ export default {
this.data = res.data.list; this.data = res.data.list;
this.select = res.data.list[0].id this.select = res.data.list[0].id
this.getStreetDetail(res.data.list[0].id); this.getStreetDetail(res.data.list[0].id);
}).catch(err => { }).catch(err => {
}); });
@ -252,8 +182,7 @@ export default {
data: {} data: {}
}).then(res => { }).then(res => {
this.streetDetail = res.data this.streetDetail = res.data
this.leftShelveChange(); this.getStockRowColumn()
this.rightShelveChange();
}).catch(err => { }).catch(err => {
}) })

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

@ -111,7 +111,7 @@ export default {
}).then(res => { }).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.$message.success('连接成功'); this.$message.success('连接成功');
this.handleGetStreetList() this.request()
} else { } else {
this.$message.error('连接失败'); this.$message.error('连接失败');
} }

Write Preview
Loading…
Cancel
Save