From 961bca47d1bf1a88cd5a0e72dad563924bb11b79 Mon Sep 17 00:00:00 2001
From: yiming <wang.yiming@hzleaper.com>
Date: Fri, 14 Oct 2022 10:02:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B7=E9=81=93=E5=88=97=E8=A1=A8=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84=E4=B8=9C=E8=A5=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/checkMonitoring/index.vue | 15 +++++++-
 src/views/roadwayManage/index.vue   | 25 ++++++-------
 src/views/roadwayManage/model.vue   | 57 ++---------------------------
 3 files changed, 28 insertions(+), 69 deletions(-)

diff --git a/src/views/checkMonitoring/index.vue b/src/views/checkMonitoring/index.vue
index 39ba351..15c0d11 100644
--- a/src/views/checkMonitoring/index.vue
+++ b/src/views/checkMonitoring/index.vue
@@ -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;
         }
         
diff --git a/src/views/roadwayManage/index.vue b/src/views/roadwayManage/index.vue
index c37d0d6..c62af33 100644
--- a/src/views/roadwayManage/index.vue
+++ b/src/views/roadwayManage/index.vue
@@ -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-if="text.camera1Name ">{{text.camera1Name}} </span>
                 <span v-else>
-                    <span v-if="text.camera1Name">{{text.camera1Name}}</span>
-                    <span v-if="text.camera2Name">{{text.camera2Name}}</span>
+                    <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',
diff --git a/src/views/roadwayManage/model.vue b/src/views/roadwayManage/model.vue
index a78e07e..a4c6e3a 100644
--- a/src/views/roadwayManage/model.vue
+++ b/src/views/roadwayManage/model.vue
@@ -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,46 +130,9 @@
                             </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>