图片修改，上位信息增加

public/antd_color.less

@@ -1381,7 +1381,7 @@ tr.ant-table-expanded-row:hover {background: #fbfbfb;}
 .ant-tag-red-inverse {color: #fff;background: #f5222d;border-color: #f5222d;}
 .ant-tag-volcano {color: #fa541c;background: #fff2e8;border-color: #ffbb96;}
 .ant-tag-volcano-inverse {color: #fff;background: #fa541c;border-color: #fa541c;}
-.ant-tag-orange {color: #fa8c16;background: color(~`colorPalette("@{heading-color}", 1)`);border-color: #ffd591;}
+.ant-tag-orange {color: #fa8c16;background: #fff7e6;border-color: #ffd591;}
 .ant-tag-orange-inverse {color: #fff;background: #fa8c16;border-color: #fa8c16;}
 .ant-tag-yellow {color: #fadb14;background: #feffe6;border-color: #fffb8f;}
 .ant-tag-yellow-inverse {color: #fff;background: #fadb14;border-color: #fadb14;}

src/views/platformCheck/index.vue

@@ -12,7 +12,12 @@
                     </li>
                     <li>
                         <span class="img-box-title">
-                            系统条码:{{realCheck.code}}
+                            系统条码:{{realCheck.wmsCode}}
+                        </span>
+                    </li>
+                    <li>
+                        <span class="img-box-title">
+                            扫描条码:{{realCheck.code}}
                         </span>
                     </li>
                     <li>
@@ -23,7 +28,14 @@
                     
                     <li>
                         <span class="img-box-title">
-                            盘点结果数量:{{realCheck.count}}
+                            盘点数量:{{realCheck.count}}
+                            
+                        </span>
+                    </li>
+                    
+                    <li>
+                        <span class="img-box-title">
+                            系统数量:{{realCheck.wmsCount}}
                         </span>
                     </li>
                     <li>
@@ -31,22 +43,20 @@
                             盘点时间:{{realCheck.createTime}}
                         </span>
                     </li>
+                    
                 </ul>
             </div>
             <div style="width: 70%;">
-                <a-row type="flex" justify="space-around"  style="height:300,margin-left:400">
+                
-                    <a-col :span="4">
                         <viewer >
-                            <img class="historyImg" :src="realCheck.path"/>
+                            <img style="width: 900px;height: 600px;" class="historyImg" :src="'http://'+realCheck.path"/>
                         </viewer>
-                    </a-col>
-                    
-                </a-row>
             </div>
 
         </div>
-        
+        <div style="display: flex; justify-content: center;">
-        
+    <a-button v-if="realCheck.flag != 1" type="primary">人工核对正确</a-button>
+</div>
     </div>
 </template>
 <script>

src/views/platformCheck/old/index.vue

@@ -10,17 +10,18 @@
             @change="handleGetHistoryList"
         >
           
-          <span slot="status" slot-scope="text">
+        <span slot="status" slot-scope="text">
-            {{realCheck.flag == 1?"盘点正确":"盘点异常"}}
+               {{text.flag}}
           </span>
           <span slot="pic" slot-scope="text" style="width:auto">
 
             <template>
                 <span style="height:100%;">
                     <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box" style="width:320px;height:90px;">
-                        <viewer :images="text.pics">
+                        
-                            <img class="historyImg" v-for="(src,index) in text.pics" :src="imgUrl+src"
+                        <viewer >
-                                :key="index"/>
+                            <img class="historyImg"  :src="'http://'+text.path"
+                                :key="'http://'+text.path"/>
                         </viewer>
                     </happy-scroll>
                 </span>
@@ -28,6 +29,17 @@
             </template>
 
           </span> 
+          
+          <span slot="operate" slot-scope="text" style="width:auto">
+
+<template>
+    <span style="height:100%;">
+        
+    </span>
+    
+</template>
+
+</span> 
         </a-table>
         
     </div>
@@ -75,6 +87,18 @@ export default {
                     title: "数量",
                     dataIndex: "count",
                 },
+                {
+                    title: "上位条码",
+                    dataIndex: "wmsCode",
+                },
+                {
+                    title: "上位数量",
+                    dataIndex: "wmsCount",
+                },
+                {
+                    title: "状态",
+                    dataIndex:  "flagString",
+                },
                 {
                     title: "照片",
                     scopedSlots: {customRender: 'pic'},
@@ -84,6 +108,10 @@ export default {
                     title: "时间",
                     dataIndex: "createTime",
                 },
+                {
+                    title: "操作",
+                    scopedSlots: {customRender: 'operate'},
+                },
                 
             ],
         }

src/views/roadwayManage/model.vue

@@ -279,6 +279,10 @@ export default {
                         rightSensorGunIp:newVal.rightSensorGunIp,
                         leftSensorGunPort:newVal.leftSensorGunPort,
                         rightSensorGunPort:newVal.rightSensorGunPort,
+                        leftDeepSensorGunIp:newVal.leftDeepSensorGunIp,
+                        rightDeepSensorGunIp:newVal.rightDeepSensorGunIp,
+                        leftDeepSensorGunPort:newVal.leftDeepSensorGunPort,
+                        rightDeepSensorGunPort:newVal.rightDeepSensorGunPort,
                         camera1Id:newVal.camera1Id,
                         camera2Id:newVal.camera2Id,
                         camera1Name:newVal.camera1Name,