From 1b111c0bfaef5d5056d161d16820279424fce94f Mon Sep 17 00:00:00 2001
From: yiming <wang.yiming@hzleaper.com>
Date: Thu, 17 Nov 2022 14:51:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=AE=A1=E7=90=866=E5=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/checkManage/checkOperation.vue | 83 ++++++++++++++----------
 src/views/historyMonitoring/index.vue    | 13 ++--
 vue.config.js                            |  2 +-
 3 files changed, 56 insertions(+), 42 deletions(-)

diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index d5012ec..63c4175 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -30,43 +30,58 @@
                             </li>
                         </ul>
                     </div>
-                    <div class="img-box">
-                            <viewer v-if="checkObj.checkPic" style="height: 300px">
-                                <img :src="imgUrl+checkObj.checkPic"/>
-                            </viewer>
-                        <div
-                            v-else
-                            style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;">
-                            暂无图片
-                        </div>
-                        <p>盘点图</p>
-                    </div>
-                    <div class="img-box">
-                        <viewer v-if="checkObj.preoperationPic" style="height:300px;">
-                            <img  :src="imgUrl+checkObj.preoperationPic"/>
+                    <div >
+                <a-row type="flex" justify="space-around"  style="height:300,margin-left:400">
+                    <a-col :span="4">
+                        <p>顶部图片1</p>
+                        <viewer >
+                            <img class="historyImg" :src="checkObj.topPic1"/>
                         </viewer>
-                        
-                        <div v-else  style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;">
-                            暂无图片
-                        </div>
-                        <p>操作前照片</p>
-                    </div>
-                    <div class="img-box">
-                        <viewer v-if="checkObj.overoperationPic" style="width:100%;height:300px;">
-                            
-                            <img  :src="imgUrl+checkObj.overoperationPic"/>
+                    </a-col>
+                    <a-col :span="4">
+                        <p>顶部图片2</p>
+                        <viewer >
+                            <img class="historyImg" :src="checkObj.topPic2"/>
                         </viewer>
-                        
-                        <div
-                            v-else
-                            style="display: flex;align-items: center;justify-content: center;width:100px;height:300px;">
-                            暂无图片
-                        </div>
-                        <p>操作后照片</p>
-                    </div>
+                    </a-col>
+                </a-row>
+                <a-row type="flex" justify="space-around" align="middle" style="height:300">
+                    
+                    
+                    <a-col :span="4">
+                        <p>侧面图片1</p>
+                        <viewer >
+                            <img class="historyImg" :src="checkObj.sidePic1"/>
+                        </viewer>
+                    </a-col>
+                    <a-col :span="4">
+                        <p>侧面图片2</p>
+                        <viewer >
+                            <img class="historyImg" :src="checkObj.sidePic2"/>
+                        </viewer>
+                    </a-col>
+                </a-row>
+                <a-row type="flex" justify="space-around" align="middle" style="height:300">
+                
+                    <a-col :span="4">
+                        <p>侧面图片3</p>
+                        <viewer >
+                            <img class="historyImg" :src="checkObj.sidePic3"/>
+                        </viewer>
+                    </a-col>
+                    <a-col :span="4">
+                        <p>侧面图片4</p>
+                        <viewer >
+                            <img class="historyImg" :src="checkObj.sidePic4"/>
+                        </viewer>
+                    </a-col>
+                </a-row>
+            </div>
                 </div>
             </div>
-            <div class="bottom-btn" >
+            <!-- 
+
+ <div class="bottom-btn" >
                 <a-button class="btn"
                         type="primary"
                         style="background:#29c12b;border-color:#29c12b;"
@@ -74,6 +89,8 @@
                 >核对
                 </a-button>
             </div>
+            -->
+           
             
         </div>
        
diff --git a/src/views/historyMonitoring/index.vue b/src/views/historyMonitoring/index.vue
index c6bfffa..c6874a3 100644
--- a/src/views/historyMonitoring/index.vue
+++ b/src/views/historyMonitoring/index.vue
@@ -42,7 +42,7 @@
 
             <template>
                 <span style="height:100%;">
-                    <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box" style="width:320px;height:90px;">
+                    <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box" style="height:30px;">
                       
                         <img class="historyImg"  :src="imgUrl+text.intoStockPic"
                                 />
@@ -56,7 +56,7 @@
 
             <template>
                 <span style="height:100%;">
-                    <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box" style="width:320px;height:90px;">
+                    <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box" style="height:30px;">
                       
                         <img class="historyImg"  :src="imgUrl+text.intoStockOverPic"
                                 />
@@ -117,11 +117,10 @@ export default {
                     dataIndex: "goodsLocation",
                 },
                 {
-                    title: "入库照片",
+                    title: "入库顶部照片",
                     
                     scopedSlots: {customRender: 'intoStockPic'},
-                    width:320,
-                    width:320,
+                    width:200
                 },
                 {
                     title: "入库时间",
@@ -131,7 +130,7 @@ export default {
                     title: "入库完成照片",
                     // dataIndex: "pic",
                     scopedSlots: {customRender: 'intoStockOverPic'},
-                    width:320,
+                    width:200,
                 },
                 {
                     title: "入库完成时间",
@@ -140,8 +139,6 @@ export default {
                 
             ],
             visible: false,
-            vid1: '',
-            vid2: ''
         }
     },
     mounted() {
diff --git a/vue.config.js b/vue.config.js
index 3832c02..3928173 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -32,7 +32,7 @@ module.exports = {
                 }
             },
             '/api/pic': {
-                target: 'http://192.168.77.91:9007/api/pic',
+                target: 'http://127.0.0.1:9007/api/pic',
                 logLevel:'debug',
                 pathRewrite:{
                     '/api/pic':''