From fda854db357404bbe17c916a422c8d8ad8ea14ae Mon Sep 17 00:00:00 2001
From: yiming <wang.yiming@hzleaper.com>
Date: Wed, 26 Oct 2022 13:30:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/http/http-api.js              |   1 +
 src/views/checkMonitoring/index.vue   |  75 ++++++++++++---
 src/views/checkSummary/index.vue      |  96 +++++++------------
 src/views/checkSummary/model.vue      | 131 ++++++++++++++++++++++++++
 src/views/historyMonitoring/index.vue |  43 +++++----
 src/views/roadwayManage/index.vue     |   6 +-
 src/views/roadwayManage/model.vue     |   7 +-
 7 files changed, 255 insertions(+), 104 deletions(-)
 create mode 100644 src/views/checkSummary/model.vue

diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js
index b18bc32..0391306 100644
--- a/src/api/http/http-api.js
+++ b/src/api/http/http-api.js
@@ -238,5 +238,6 @@ export default  {
         name: '获取巷道的统计',
         method: 'GET'
     },
+
 }
 
diff --git a/src/views/checkMonitoring/index.vue b/src/views/checkMonitoring/index.vue
index 15c0d11..c51dcf2 100644
--- a/src/views/checkMonitoring/index.vue
+++ b/src/views/checkMonitoring/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="history">
         <div style="margin-top: 10px">
-            <a-select  @change="handleChange" style="width:200px" v-model="street.id">
+            <a-select  @change="handleChange" style="width:200px" v-model="streetId">
                 <a-select-option v-for="i in streets" :key="i.name" :value="i.id">
                     {{i.name}}
                 </a-select-option>
@@ -12,22 +12,22 @@
                 <ul style="width:400,line-height:40">
                     <li>
                         <span class="img-box-title">
-                            {{street.name}}-{{this.direction == 1?"左":"右"}}-{{this.side == 1?"浅":"深"}}-{{row}}层-{{column}}列
+                            {{street.name}}-{{realCheck.direction == ''?'左右':(realCheck.direction == 1?"左":"右")}}-{{realCheck.side == ''?'深浅':(realCheck.side == 1?"浅":"深")}}-{{realCheck.row}}层-{{realCheck.column}}列
                         </span>
                     </li>
                     <li>
                         <span class="img-box-title">
-                            核对状态:
+                            核对状态:{{realCheck.status == 1?"盘点正确":"盘点异常"}}
                         </span>
                     </li>
                     <li>
                         <span class="img-box-title">
-                            系统条码:
+                            系统条码:{{realCheck.WMSCode}}
                         </span>
                     </li>
                     <li>
                         <span class="img-box-title">
-                            盘点结果条码:
+                            盘点结果条码:{{realCheck.checkCode}}
                         </span>
                     </li>
                     <li>
@@ -43,12 +43,17 @@
                     </li>
                     <li>
                         <span class="img-box-title">
-                            系统数量:
+                            系统数量:{{realCheck.WMSCount}}
                         </span>
                     </li>
                     <li>
                         <span class="img-box-title">
-                            盘点结果数量:
+                            盘点结果数量:{{realCheck.checkCode}}
+                        </span>
+                    </li>
+                    <li>
+                        <span class="img-box-title">
+                            盘点时间:{{realCheck.time}}
                         </span>
                     </li>
                 </ul>
@@ -58,7 +63,7 @@
                     <a-col :span="4">
                         <p>顶部图片1</p>
                         <viewer >
-                            <img class="historyImg" src="https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png"/>
+                            <img class="historyImg" :src="realCheck.IP"/>
                         </viewer>
                     </a-col>
                     <a-col :span="4">
@@ -117,11 +122,30 @@ export default {
                 orderNum: ''
             },
             street: '',
-            side:1,
-            direction:1,
-            column:1,
-            row:1,
+            streetId:'',
+            SRMNumber:'',
+            
             streets:[],
+            realCheck:{
+                direction:'',
+                side:'',
+                
+                column:'',
+                row:'',
+                WMSCode:'',
+                WMSCategory:'',
+                WMSCount:'',
+                checkCode:'',
+                checkCategory:'',
+                checkCount:'',
+                topPic1:'',
+                topPic2:'',
+                sidePic1:'',
+                sidePic2:'',
+                sidePic3:'',
+                sidePic4:'',
+                time:'',
+            }
             
         }
     },
@@ -135,7 +159,9 @@ export default {
                 console.log("update data")
                 this.streets = res.data
                 this.street = res.data[0]
-                
+                this.streetId = this.street.id
+                this.SRMNumber = this.street.plcId
+                this.getRealTimeCheck();
             }).catch(err => {
 
             });
@@ -143,9 +169,30 @@ export default {
         handleChange(value) {
             
             this.street = value
-            
+            console.log("street:"+this.street);
+            this.getRealTimeCheck();
             
         },
+        getRealTimeCheck(){
+           
+            console.log("SRMNUmber:"+this.SRMNumber);
+            this.$axios.get('/clientTest/realtimeCheck', {
+                params: {SRMNumber:this.SRMNumber}
+            }).then(res => {
+                if (res.code == 200) {
+                    if(res.data != null){
+                        this.realCheck = res.data
+                    }
+                    
+                    
+                } else {
+                    this.$message.error('获取失败');
+                }
+            }).catch(err => {
+
+            })
+           
+        }
     },
     components: {
         Model
diff --git a/src/views/checkSummary/index.vue b/src/views/checkSummary/index.vue
index 9fb15c2..389bd59 100644
--- a/src/views/checkSummary/index.vue
+++ b/src/views/checkSummary/index.vue
@@ -40,18 +40,19 @@
             :customRow="clickRow"
         >
         </a-table>
-        <a-table
-            :columns="streetSummaryColumns"
-            :data-source="streetSummarys"
-            :pagination="false"
-        >
-        </a-table>
-        
+        <Model
+            :visible.sync="visible"
+            
+            :modelData.sync="modelData"
+            @sure="submit"
+            @close="closeModel"
+        />
     </div>
 </template>
 
 <script>
 import moment from 'moment';
+import Model from "./model.vue"
 export default {
     name: "checkSummary",
     
@@ -60,14 +61,14 @@ export default {
             labelCol: { span: 6 },
             wrapperCol: { span: 18 },
             queryParam: {
-                startTime: moment().subtract(1, "days").format('YYYY-MM-DD HH:mm:ss'), //当前时间的前一个天时间
-                endTime: moment().format('YYYY-MM-DD HH:mm:ss')
+                startTime: "", //当前时间的前一个天时间
+                endTime: ""
             },
             time:[],
             pageNum:1,
             pageSize:3,
             data: [],
-            streetSummarys:[],
+            
             pagination:{
                 total:0,
                 defaultPageSize:3, // 默认每页显示数量
@@ -92,36 +93,10 @@ export default {
                 }
                 
             ],
-            streetSummaryColumns:[
-                {
-                    title: "巷道",
-                    dataIndex: "streetName",
-                },
-                {
-                    title: "盘点任务号",
-                    dataIndex: "taskId",
-                },
-                {
-                    title: "空托盘数量",
-                    dataIndex: "emptyCount",
-                },
-                {
-                    title: "空货位数",
-                    dataIndex: "emptyGoodsCount",
-                },
-                {
-                    title: "卷烟货位数",
-                    dataIndex: "goodsCount",
-                },
-                {
-                    title: "开始时间 ",
-                    dataIndex: "startTime",
-                },
-                {
-                    title: "结束时间",
-                    dataIndex: "endTime",
-                }
-            ]
+            
+            visible : false,
+
+            modelData :''
             
         };
     },
@@ -135,7 +110,8 @@ export default {
                 on:{
                     click:(event)=>{
                         console.log(record.endTime)
-                        this.getStreetSummarys(record.taskId)
+                        this.visible = true
+                        this.modelData = record
                     },
                 }
             }
@@ -169,32 +145,13 @@ export default {
                 pagination.total = res.data.total;
                 this.pagination = pagination;
                 this.data = res.data.list
-                if(res.data.list.length > 0){
-                    this.getStreetSummarys(res.data.list[0].taskId);
-                }else{
-                    this.streetSummarys = []
-                }
+                
                 
             }).catch(err => {
 
             });
         },
-        //获取盘点任务下所有巷道的统计
-        getStreetSummarys(taskId) {
-            
-            this.$api.httpApi.getStreetSummary({
-                params: {
-                    taskId: taskId,
-                }
-            }).then(res => {
-                if (res.code == 200) {
-                    this.streetSummarys = res.data
-                    
-                }
-            }).catch(err => {
-
-            });
-        },
+        
         onTimeChange(date, dateString) {
             this.handleReset()
             console.log(date)
@@ -202,18 +159,29 @@ export default {
             this.queryParam.startTime = date[0].format('YYYY-MM-DD HH:mm:ss')
             this.queryParam.endTime = date[1].format('YYYY-MM-DD HH:mm:ss')
         },
+        submit(visible){
+            this.visible = visible
+            this.request();
+        },
+        closeModel(visible,data){
+            this.visible = false
+            this.modelData=data
+        },
         handleReset() {
             this.queryParam.startTime = ""
             this.queryParam.endTime = ""
         },
         
         reset() {
-            this.queryParam.startTime = moment().subtract(1, "days").format('YYYY-MM-DD HH:mm:ss')
-            this.queryParam.endTime = moment().format('YYYY-MM-DD HH:mm:ss')
+            this.queryParam.startTime = ""
+            this.queryParam.endTime = ""
             this.time = []
             this.handleGetalarmList()
         },
     },
+    components:{
+        Model
+    }
 };
 </script>
 
diff --git a/src/views/checkSummary/model.vue b/src/views/checkSummary/model.vue
new file mode 100644
index 0000000..6ddccbc
--- /dev/null
+++ b/src/views/checkSummary/model.vue
@@ -0,0 +1,131 @@
+<template>
+     <div v-if="isShow">
+         <template >
+             <a-modal
+                 v-model="isShow"
+                 width="900px"
+                :closable="false"
+                 :maskClosable="false"
+                 ok-text="确认"
+                 
+                 class="add-edit-model"
+             >
+             <template #footer>
+                 <a-button key="submit" type="primary"  @click="handleOk">确认</a-button>
+             </template>
+                 <a-table
+                    :columns="streetSummaryColumns"
+                    :data-source="streetSummarys"
+                    :pagination="false"
+                    @change="getStreetSummarys"
+                >
+        </a-table>
+             </a-modal>
+         </template>
+         
+         
+
+     </div>
+</template>
+<script>
+
+export default {
+    props:[ 'visible', 'modelData'],
+    watch: {
+        //监听并接收父组件的visible并赋值给isShow（子组件接收父组件props传过来的值时不能起一样的类名，会报重复定义的错）
+        visible: function(newVal){
+            this.isShow = newVal;  //newVal即是visible
+            // newVal && this.showConfirm(); //newVal存在的话执行showConfirm函数
+        },
+        
+        modelData: function(newVal){
+            console.log(newVal)
+            this.mdata=newVal
+            this.$nextTick(()=>{
+                this.getStreetSummarys();
+            })
+            
+        },
+    },
+    data() {
+        return {
+            isShow:false,
+            
+            closable:true,//取消model模态框右上角的X号
+            mdata:[],
+            streetSummarys:[],
+            streetSummaryColumns:[
+                {
+                    title: "巷道",
+                    dataIndex: "streetName",
+                },
+                {
+                    title: "盘点任务号",
+                    dataIndex: "taskId",
+                },
+                {
+                    title: "空托盘数量",
+                    dataIndex: "emptyCount",
+                },
+                {
+                    title: "空货位数",
+                    dataIndex: "emptyGoodsCount",
+                },
+                {
+                    title: "卷烟货位数",
+                    dataIndex: "goodsCount",
+                },
+                {
+                    title: "开始时间 ",
+                    dataIndex: "startTime",
+                },
+                {
+                    title: "结束时间",
+                    dataIndex: "endTime",
+                }
+            ],
+        };
+    },
+    mounted() {
+        //todo 查询列表
+        this.getStreetSummarys();
+    },
+    destroy(){
+        
+        
+    },
+    methods: {
+        
+        //获取盘点任务下所有巷道的统计
+        
+        getStreetSummarys() {
+            console.log(this.modelData);
+            this.$api.httpApi.getStreetSummary({
+                params: {
+                    taskId: this.modelData.taskId,
+                }
+            }).then(res => {
+                if (res.code == 200) {
+                    this.streetSummarys = res.data
+                    console.log("getStreetSummarys");
+                    console.log(this.streetSummarys);
+                }
+            }).catch(err => {
+                console.log(err);
+            });
+        },
+        handleOk() {
+            this.$emit('close', false, {})
+        },
+       
+        
+        
+      
+       
+        
+    },
+};
+</script>
+<style lang="scss" scoped>
+    
+</style>
diff --git a/src/views/historyMonitoring/index.vue b/src/views/historyMonitoring/index.vue
index fa8eae9..c6bfffa 100644
--- a/src/views/historyMonitoring/index.vue
+++ b/src/views/historyMonitoring/index.vue
@@ -38,23 +38,31 @@
             :pagination="pagination"
             @change="handleGetHistoryList"
         >
-          <span slot="streetType" slot-scope="text">
-               {{ text === null ? '-' : text === 0 ? '单伸' : '双伸' }}
-          </span>
-          <span slot="pics" slot-scope="text" style="width:auto">
+        <span slot="intoStockPic" slot-scope="text"  style="width:auto">
 
             <template>
-                <span v-if="text.pics" style="height:100%;">
+                <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"
-                                :key="index"/>
-                        </viewer>
+                      
+                        <img class="historyImg"  :src="imgUrl+text.intoStockPic"
+                                />
                     </happy-scroll>
                 </span>
-                <span v-else>
-                    暂无图片
+                
+            </template>
+
+          </span>
+          <span slot="intoStockOverPic" 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;">
+                      
+                        <img class="historyImg"  :src="imgUrl+text.intoStockOverPic"
+                                />
+                    </happy-scroll>
                 </span>
+                
             </template>
 
           </span>
@@ -103,19 +111,16 @@ export default {
                     dataIndex: "streetName",
                     width: 90
                 },
-                {
-                    title: "货架类型",
-                    dataIndex: "streetType",
-                    scopedSlots: {customRender: 'streetType'}
-                },
+              
                 {
                     title: "货位",
                     dataIndex: "goodsLocation",
                 },
                 {
                     title: "入库照片",
-                    dataIndex: "pic",
-                   
+                    
+                    scopedSlots: {customRender: 'intoStockPic'},
+                    width:320,
                     width:320,
                 },
                 {
@@ -125,7 +130,7 @@ export default {
                 {
                     title: "入库完成照片",
                     // dataIndex: "pic",
-                    scopedSlots: {customRender: 'pics'},
+                    scopedSlots: {customRender: 'intoStockOverPic'},
                     width:320,
                 },
                 {
diff --git a/src/views/roadwayManage/index.vue b/src/views/roadwayManage/index.vue
index c62af33..711d6a0 100644
--- a/src/views/roadwayManage/index.vue
+++ b/src/views/roadwayManage/index.vue
@@ -28,7 +28,7 @@
                {{ text === null ? '-' : text === 0 ? '单伸' : '双伸' }}
           </span>
           <span slot="connectStatus" slot-scope="text">
-               {{ text === 1 ? '已连接' : "未连接" }}
+               {{ text.connectStatus === 1 ? '已连接' : "未连接" }}
           </span>
           <span slot="plc" slot-scope="text" v-if="text.plcIp">
                {{ text.plcIp }}:{{text.plcPort}}
@@ -98,10 +98,12 @@ const columns = [
     },
     {
         title: '客户端IP',
-        scopedSlots: { customRender: 'plcIp' }
+        dataIndex: 'plcIp',
+     
     },
     {
         title: '客户端连接状态',
+       
         scopedSlots: { customRender: 'connectStatus' }
     },
     {
diff --git a/src/views/roadwayManage/model.vue b/src/views/roadwayManage/model.vue
index a4c6e3a..f02546d 100644
--- a/src/views/roadwayManage/model.vue
+++ b/src/views/roadwayManage/model.vue
@@ -32,11 +32,7 @@
                             v-decorator="['plcIp']"
                         />
                     </a-form-item>
-                    <a-form-item label="客户端 PORT" :label-col="formItemAcrossLayout.labelCol">
-                        <a-input
-                            v-decorator="['plcPort']"
-                        />
-                    </a-form-item>
+                    
                 </div>
                
                 <a-divider></a-divider>
@@ -314,6 +310,7 @@ export default {
                 data: {
                     pageNum:0,
                     pageSize:0,
+                    searchType:1,
                 }
             }).then(res => {
                 this.cameraList = res.data.list;