巷道列表删除不需要的东西

feature/nanjing-wuliu
yiming 3 years ago
parent bc50a5b0a5
commit 961bca47d1

@ -8,7 +8,7 @@
</a-select>
</div>
<div style="display:flex">
<div style="margin-left: 10px,width:100/4,height:200,float:left">
<div style="margin-left: 10px,width:100,height:200,float:left">
<ul style="width:400,line-height:40">
<li>
<span class="img-box-title">
@ -30,6 +30,17 @@
盘点结果条码:
</span>
</li>
<li>
<span class="img-box-title">
系统品规:
</span>
</li>
<li>
<span class="img-box-title">
盘点结果品规:
</span>
</li>
<li>
<span class="img-box-title">
系统数量:
@ -181,7 +192,7 @@ ul {
color: #494e52;
.img-box-title {
width: 130px;
width: 230px;
display: inline-block;
}

@ -27,15 +27,13 @@
<span slot="rightType" slot-scope="text">
{{ text === null ? '-' : text === 0 ? '单伸' : '双伸' }}
</span>
<span slot="connectStatus" slot-scope="text">
{{ text === 1 ? '已连接' : "未连接" }}
</span>
<span slot="plc" slot-scope="text" v-if="text.plcIp">
{{ text.plcIp }}:{{text.plcPort}}
</span>
<span slot="lightSourceIp" slot-scope="text" v-if="text.lightSourceIp">
{{ text.lightSourceIp }}:{{text.lightSourcePort}}
</span>
<span slot="RFID" slot-scope="text" v-if="text.RFIDIp">
{{ text.RFIDIp }}:{{text.RFIDPort}}
</span>
<span slot="sensorGun" slot-scope="text">
<template>
<span v-if="text.rightSensorGunIp && text.leftSensorGunIp">{{text.leftSensorGunIp}}:{{text.leftSensorGunPort}} {{text.rightSensorGunIp}}:{{text.rightSensorGunPort}}</span>
@ -47,10 +45,10 @@
</span>
<span slot="actions" slot-scope="text">
<template>
<span v-if="text.camera1Name && text.camera2Name">{{text.camera1Name}} {{text.camera2Name}}</span>
<span v-else>
<span v-if="text.camera1Name ">{{text.camera1Name}} </span>
<span v-if="text.camera2Name">{{text.camera2Name}}</span>
<span v-else>
<span >{{text.camera1Name}}</span>
</span>
</template>
</span>
@ -99,14 +97,13 @@ const columns = [
dataIndex: 'plcId',
},
{
title: '光源IP',
scopedSlots: { customRender: 'lightSourceIp' }
title: '客户端IP',
scopedSlots: { customRender: 'plcIp' }
},
{
title: '客户端',
scopedSlots: { customRender: 'plc' }
title: '客户端连接状态',
scopedSlots: { customRender: 'connectStatus' }
},
{
title: '左货架类型',
dataIndex: 'leftType',

@ -38,18 +38,6 @@
/>
</a-form-item>
</div>
<div class="across-layout">
<a-form-item label="光源IP" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['lightSourceIp']"
/>
</a-form-item>
<a-form-item label="光源 PORT" :label-col="formItemAcrossLayout.labelCol">
<a-input
v-decorator="['lightSourcePort']"
/>
</a-form-item>
</div>
<a-divider></a-divider>
@ -128,8 +116,8 @@
<a-divider></a-divider>
</div>
<div v-if="cameraList.length>0">
<a-form-item label="左侧球机" :label-col="formItemVerticalLayout.labelCol">
<div >
<a-form-item label="球机" :label-col="formItemVerticalLayout.labelCol">
<a-select
v-decorator="[
'camera1Id',
@ -142,47 +130,10 @@
</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="右侧球机" :label-col="formItemVerticalLayout.labelCol">
<a-select
v-decorator="[
'camera2Id',
]"
placeholder="选择球机"
>
<a-select-option v-for="item in cameraList" :key="item.id" :value="item.id">
{{item.name}}
</a-select-option>
</a-select>
</a-form-item>
</div>
<div v-else>
<a-form-item label="左侧球机" :label-col="formItemVerticalLayout.labelCol">
<a-select
v-decorator="[
'camera1Name',
]"
placeholder="选择球机"
@dropdownVisibleChange="handleSelectCamera"
>
<a-select-option v-for="item in cameraList" :key="item.id" :value="item.id">
{{item.name}}
</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="右侧球机" :label-col="formItemVerticalLayout.labelCol">
<a-select
v-decorator="[
'camera2Name',
]"
placeholder="选择球机"
>
<a-select-option v-for="item in cameraList" :key="item.id" :value="item.id">
{{item.name}}
</a-select-option>
</a-select>
</a-form-item>
</div>
</a-form>
</a-modal>
</div>

Loading…
Cancel
Save