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
feature/nanjing-wuliu
yiming 3 years ago
parent bc50a5b0a5
commit 961bca47d1
3 changed files with 28 additions and 69 deletions
Show Stats Download Patch File Download Diff File

15
src/views/checkMonitoring/index.vue
Unescape Escape View File

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

25
src/views/roadwayManage/index.vue
Unescape Escape View File

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

57
src/views/roadwayManage/model.vue
Unescape Escape View File

@ -38,18 +38,6 @@
/> />
</a-form-item> </a-form-item>
</div> </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> <a-divider></a-divider>
@ -128,8 +116,8 @@
<a-divider></a-divider> <a-divider></a-divider>
</div> </div>
<div v-if="cameraList.length>0"> <div >
<a-form-item label="左侧球机" :label-col="formItemVerticalLayout.labelCol"> <a-form-item label="球机" :label-col="formItemVerticalLayout.labelCol">
<a-select <a-select
v-decorator="[ v-decorator="[
'camera1Id', 'camera1Id',
@ -142,46 +130,9 @@
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </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> </div>
</a-form> </a-form>
</a-modal> </a-modal>

Write Preview
Loading…
Cancel
Save