去除无用功能,增加对比结果

滁州-烟草
LAPTOP-S9HJSOEB\昊天 2 years ago
parent 25e7a6353d
commit 2bec0ab66e

@ -34,19 +34,10 @@ const routes = [{
name: 'videoWall1`', name: 'videoWall1`',
meta: { meta: {
icon: 'desktop', icon: 'desktop',
name: '视频墙1' name: '视频墙'
}, },
component: () => import('@/views/videoWall/index'), component: () => import('@/views/videoWall/index'),
}, },
{
path: 'videoWall2',
name: 'videoWall2',
meta: {
icon: 'desktop',
name: '视频墙2'
},
component: () => import('@/views/videoWall2/index'),
},
{ {
path: 'realTimeMonitoring', path: 'realTimeMonitoring',
name: 'realTimeMonitoring', name: 'realTimeMonitoring',

@ -1,7 +1,7 @@
<template> <template>
<div class="subsection"> <div class="subsection">
<a-layout style="width: 1500px"> <a-layout style="width: 1500px">
<a-layout style="width: 100%;height: 310px"> <a-layout style="width: 100%;height: 380px">
<a-layout-sider width="110px"> <a-layout-sider width="110px">
<a-tabs default-active-key="1" tab-position="left" @change="changeTabLeft" v-if="total.row > nums.row"> <a-tabs default-active-key="1" tab-position="left" @change="changeTabLeft" v-if="total.row > nums.row">
<a-tab-pane <a-tab-pane
@ -16,7 +16,7 @@
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
</a-layout-sider> </a-layout-sider>
<a-layout-content> <a-layout-content style="height: 100%">
<!-- <slot :data="{select, nums, random}"></slot> --> <!-- <slot :data="{select, nums, random}"></slot> -->
<div class="roadway-buttom"> <div class="roadway-buttom">
<div class="roadway-box"> <div class="roadway-box">
@ -84,7 +84,7 @@ export default {
type: Object, type: Object,
default: () => { default: () => {
return { return {
row: 10, row: 15,
column: 30 column: 30
} }
} }
@ -297,7 +297,6 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.subsection /deep/{ .subsection /deep/{
width: 100%; width: 100%;
height: 360px;
overflow: hidden; overflow: hidden;
.ant-tabs-nav .ant-tabs-tab { .ant-tabs-nav .ant-tabs-tab {
// padding: 0; // padding: 0;

@ -4,7 +4,7 @@
<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" style="width: 15%;">
<ul> <ul>
<li> <li>
<span class="img-box-title"> <span class="img-box-title">
@ -22,7 +22,7 @@
{{ 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" v-if="checkObj[item.key]!=null" :key="item.label">
<span class="img-box-title"> <span class="img-box-title">
{{ item.label }}: {{ item.label }}:
@ -33,7 +33,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="img-box"> <div class="img-box" style="width: 70%;">
<viewer v-if="checkObj.checkPic" style="height: 300px"> <viewer v-if="checkObj.checkPic" style="height: 300px">
<img :src="imgUrl+checkObj.checkPic"/> <img :src="imgUrl+checkObj.checkPic"/>
</viewer> </viewer>
@ -42,18 +42,7 @@
style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;"> style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;">
暂无图片 暂无图片
</div> </div>
<p>盘点图1</p> <p>盘点图</p>
</div>
<div class="img-box">
<viewer v-if="checkObj.checkPic" style="height: 300px">
<img :src="imgUrl+checkObj.checkPic2"/>
</viewer>
<div
v-else
style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;">
暂无图片
</div>
<p>盘点图2</p>
</div> </div>
<!-- <div class="img-box"> <!-- <div class="img-box">
<viewer v-if="checkObj.preoperationPic" style="height:300px;"> <viewer v-if="checkObj.preoperationPic" style="height:300px;">
@ -146,7 +135,20 @@ export default {
key: 'wmsCode' key: 'wmsCode'
}, },
{ {
label:'托盘码描述', label:'盘点结果',
key: 'trayCode'
},
{
label:'烟牌',
key: 'wmsCategory'
},
{
label:'数量',
key: 'wmsCount'
},
{
label:'视觉分辨结果',
key: 'wmsCategory' key: 'wmsCategory'
}, },
{ {

@ -85,6 +85,7 @@
<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 <subsection
style="height: 35vh;"
v-if="item.id == select" v-if="item.id == select"
:total="{ row: item.leftRow, column: item.leftColumn }" :total="{ row: item.leftRow, column: item.leftColumn }"
:side="leftSide" :side="leftSide"

@ -98,9 +98,13 @@
<span slot="goodsLocation" slot-scope="text"> <span slot="goodsLocation" slot-scope="text">
{{ text.direction }}-{{ text.row}}-{{ text.column}} {{ text.direction }}-{{ text.row}}-{{ text.column}}
</span> </span>
<span slot="status" slot-scope="text"> <span slot="trayCode" slot-scope="text">
{{ text.trayCode}} {{ text.trayCode}}
</span> </span>
<span slot="status" slot-scope="text">
{{ statusMap[text.status]}}
</span>
<span slot="pic" slot-scope="text" style="width:auto"> <span slot="pic" slot-scope="text" style="width:auto">
<template> <template>
@ -164,13 +168,21 @@ export default {
}, },
{ {
title: "盘点状态", title:'托盘码',
dataIndex: 'wmsCode'
},
{
title: "扫码情况",
scopedSlots: {customRender: 'trayCode'},
},
{
title: "对比结果",
scopedSlots: {customRender: 'status'}, scopedSlots: {customRender: 'status'},
}, },
{ {
title: "照片", title: "照片",
scopedSlots: {customRender: 'pic'}, scopedSlots: {customRender: 'pic'},
width:320, width:150,
}, },
{ {
title: "更新时间", title: "更新时间",

Loading…
Cancel
Save