From 43819d68c42866e12e2df8dd6d4e3cf624604bea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E9=91=AB?= <zhangxin@zhehekeji.com>
Date: Wed, 17 Mar 2021 09:45:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=AE=A1=E7=90=86=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                         |   3 +-
 src/api/http/http-api.js          |  10 +++
 src/views/checkManage/index.vue   | 143 +++++++++++++++++++-----------
 src/views/roadwayManage/model.vue |   5 +-
 4 files changed, 105 insertions(+), 56 deletions(-)

diff --git a/README.md b/README.md
index 7a7a2b8..912a488 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,8 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
 
 #### 1、项目git地址：https://gitlab.hzleaper.com:81/duoji/duoji-frontend.git
 
-#### 2、简介：垛机监控系统是一款TOB的项目，由哲合科技有限公司承担研发，主要为甲方在仓储方面的出入库过程中，提供拍照取证，实时录像，盘点管理等功能。项目主要涵盖实时视频流、历史数据、盘点管理、巷道管理、球机管理、个人中心等。基于vue-cli3.x + Ant Design Vue搭建,rtsp视频流采用VLC插件结合Firefox火狐浏览器运行的方式播放，因VLC支持性问题需回退Firefox火狐浏览器版本至51版之前，详情请见 [VLC开发文档](https://wiki.videolan.org/Documentation:WebPlugin/#Introduction:_Building_Web_pages_with_Video)
+#### 2、简介：
+垛机监控系统是一款TOB的项目，由哲合科技有限公司承担研发，主要为甲方在仓储方面的出入库过程中，提供拍照取证，实时录像，盘点管理等功能。项目主要涵盖实时视频流、历史数据、盘点管理、巷道管理、球机管理、个人中心等。基于vue-cli3.x + Ant Design Vue搭建,rtsp视频流采用VLC插件结合Firefox火狐浏览器运行的方式播放，因VLC支持性问题需回退Firefox火狐浏览器版本至51版之前，详情请见 [VLC开发文档](https://wiki.videolan.org/Documentation:WebPlugin/#Introduction:_Building_Web_pages_with_Video)
 
 #### 3、测试环境地址：暂无(详情请看下面注释)   测试环境账号：暂无(详情请看下面注释)
 
diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js
index 59be3f4..48568b7 100644
--- a/src/api/http/http-api.js
+++ b/src/api/http/http-api.js
@@ -116,5 +116,15 @@ export default  {
         name: '编辑分类',
         method: 'PUT'
     },
+    getStockList: {
+        url: '/stock/list',
+        name: '获取盘点列表',
+        method: 'GET'
+    },
+    getStreetDetail: {
+        url: '/street',
+        name: '获取巷道详情',
+        method: 'GET'
+    },
 }
 
diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue
index 8def223..c6993a7 100644
--- a/src/views/checkManage/index.vue
+++ b/src/views/checkManage/index.vue
@@ -15,60 +15,71 @@
                未盘点
            </span>
         </div>
-
+        <!--<div v-for="item in checkList" :key="item.id">-->
+        <!--{{item}}-->
+        <!--</div>-->
         <div class="check-content" v-for="item in data" :key="item.id">
-            <div class="roadway-top" v-if="item.name == select">
-                <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box">
-                    <div class="roadway-box">
-                        <div class="line" v-for="(f,index) in Number(item.leftColumn)" :key="index">
-                            <div
-                                class="ele"
-                                @click="tocheckOperation"
-                                :style="{background:i+'-'+f == '4-14'|| i+'-'+f=='8-18'?'#bfbfbf':'#bfbfbf'}"
-                                v-for="(i,index) in Number(item.leftRow)"
-                                :key="index">{{i}}-{{f}}
-                            </div>
-                        </div>
-                    </div>
-                </happy-scroll>
-                <!--               <a-radio-group v-model="size" style="margin:10px 0">-->
-                <!--                   <a-radio-button value="small">-->
-                <!--                       外-->
-                <!--                   </a-radio-button>-->
-                <!--                   <a-radio-button value="default">-->
-                <!--                       内-->
-                <!--                   </a-radio-button>-->
-                <!--               </a-radio-group>-->
-            </div>
-            <div class="roadway-buttom" v-if="item.name == select">
-                <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box">
-                    <div class="roadway-box">
-                        <div class="line" v-for="f in Number(item.rightColumn)"
-                             :key="f.rightColumn">
-                            <div class="ele"
-                                 :style="{background:i+'-'+f == '5-16'|| i+'-'+f=='9-17'||i+'-'+f=='11-15'?'#bfbfbf':'#bfbfbf'}"
-                                 v-for="i in Number(item.rightRow)"
-                                 :key="i.rightRow">{{i}}-{{f}}
+            <div v-for="(key,value) in checkList" :key="value">
+                <div class="roadway-top" v-if="item.name == select && value == streetDetail.leftShelveId">
+                    <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box">
+                        <div class="roadway-box">
+                            <div class="line" v-for="(columnItem,column) in key" :key="columnItem">
+                                <div v-for="(rowItem,row) in columnItem" :key="row"
+                                     class="ele"
+                                     @click="tocheckOperation"
+                                     :style="{background:rowItem.status ==0?'#bfbfbf':rowItem.status == 1?'#1afa29':'#d81e06'}"
+                                >{{rowItem.row}}-{{column}}
+                                </div>
                             </div>
                         </div>
-                    </div>
-                </happy-scroll>
-                <!--               <a-radio-group v-model="size2" style="margin:10px 0">-->
-                <!--                   <a-radio-button value="small">-->
-                <!--                       外-->
-                <!--                   </a-radio-button>-->
-                <!--                   <a-radio-button value="default">-->
-                <!--                       内-->
-                <!--                   </a-radio-button>-->
-                <!--               </a-radio-group>-->
+                    </happy-scroll>
+                    <a-radio-group v-model="size" style="margin:10px 0"
+                                   v-if="streetDetail.leftInsideShelveId && streetDetail.leftOutsideShelveId">
+                        <a-radio-button value="leftOutsideShelveId">
+                            >
+                            外
+                        </a-radio-button>
+                        <a-radio-button value="leftInsideShelveId">
+                            内
+                        </a-radio-button>
+                    </a-radio-group>
+                </div>
             </div>
         </div>
+
         <a-select v-if="data[0]" :default-value="data[0].name" style="width: 180px"
                   @change="handleChange" class="select-roadway">
-            <a-select-option v-for="i in data" :key="i.name" :value="i.name">
+            <a-select-option v-for="i in data" :key="i.name" :value="i.id">
                 {{i.name}}
             </a-select-option>
         </a-select>
+        <div class="check-content" v-for="item in data" :key="item.id">
+            <div v-for="(key,value) in checkList" :key="value">
+                <div class="roadway-buttom" v-if="item.name == select && value == streetDetail.rightShelveId">
+                    <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box">
+                        <div class="roadway-box">
+                            <div class="line" v-for="(columnItem,column) in key" :key="column">
+                                <div v-for="(rowItem,row) in columnItem" :key="row"
+                                     class="ele"
+                                     @click="tocheckOperation"
+                                     :style="{background:rowItem.status ==0?'#bfbfbf':rowItem.status == 1?'#1afa29':'#d81e06'}"
+                                >{{rowItem.row}}-{{column}}
+                                </div>
+                            </div>
+                        </div>
+                    </happy-scroll>
+                    <a-radio-group v-model="size2" style="margin:10px 0"
+                                   v-if="streetDetail.rightInsideShelveId && streetDetail.rightOutsideShelveId">
+                        <a-radio-button value="rightOutsideShelveId">
+                            外
+                        </a-radio-button>
+                        <a-radio-button value="rightInsideShelveId">
+                            内
+                        </a-radio-button>
+                    </a-radio-group>
+                </div>
+            </div>
+        </div>
     </div>
 </template>
 <script>
@@ -78,13 +89,17 @@ export default {
             size: 'small',
             size2: 'small',
             data: [],
-            select: ''
+            select: '',
+            streetId: 0,
+            streetDetail: {},
+            checkList: {}
         };
     },
     mounted() {
         this.request()
     },
     methods: {
+        //获取巷道列表
         request() {
             this.$api.httpApi.getStreetList({
                 data: {
@@ -94,13 +109,42 @@ export default {
             }).then(res => {
                 this.data = res.data.list;
                 this.select = res.data.list[0].name
+                this.getStockList(res.data.list[0].id)
+                this.getStreetDetail(res.data.list[0].id)
+            }).catch(err => {
+
+            });
+        },
+        //获取巷道详情
+        getStreetDetail(id) {
+            this.$axios.get('/street/' + id, {
+                data: {}
+            }).then(res => {
+                this.streetDetail = res.data
+
+            }).catch(err => {
+
+            })
+        },
+        //获取盘点列表
+        getStockList(streetId) {
+            this.$api.httpApi.getStockList({
+                params: {
+                    streetId: streetId,
+                }
+            }).then(res => {
+                console.log(88888888888888999999999999999)
+                console.log(res.data)
+                this.checkList = res.data
             }).catch(err => {
 
             });
         },
         handleChange(value) {
             console.log(value)
-            this.select = value
+
+            this.getStreetDetail(value)
+            this.getStockList(value)
         },
         tocheckOperation() {
             this.$router.push({name: 'checkOperation'})
@@ -144,7 +188,7 @@ export default {
         }
 
         .roadway-buttom {
-            padding: 50px 0 20px 0;
+            padding: 20px 0 20px 0;
             width: 1000px;
         }
 
@@ -169,10 +213,5 @@ export default {
                 }
             }
         }
-
-        .select-roadway {
-            position: absolute;
-            top: 350px;
-        }
     }
 </style>
diff --git a/src/views/roadwayManage/model.vue b/src/views/roadwayManage/model.vue
index 91ffbfa..60e2dd4 100644
--- a/src/views/roadwayManage/model.vue
+++ b/src/views/roadwayManage/model.vue
@@ -22,7 +22,7 @@
                     </a-form-item>
                     <a-form-item label="PLC-ID" :label-col="formItemAcrossLayout.labelCol">
                         <a-input
-                            v-decorator="['plcPort', { rules: [{ required: true, message: '请输入PLC-ID!' }] }]"
+                            v-decorator="['plcId', { rules: [{ required: true, message: '请输入PLC-ID!' }] }]"
                         />
                     </a-form-item>
                 </div>
@@ -34,7 +34,7 @@
                     </a-form-item>
                     <a-form-item label="端口" :label-col="formItemAcrossLayout.labelCol">
                         <a-input
-                            v-decorator="['plcId', { rules: [{ required: true, message: '请输入端口!' }] }]"
+                            v-decorator="['plcPort', { rules: [{ required: true, message: '请输入端口!' }] }]"
                         />
                     </a-form-item>
                 </div>
@@ -293,7 +293,6 @@ export default {
                     values.leftRow = Number(values.leftRow)
                     values.leftType = Number(values.leftType)
                     values.plcPort = Number(values.plcPort)
-                    values.plcId = Number(values.plcId)
                     values.rightColumn = Number(values.rightColumn)
                     values.rightRow = Number(values.rightRow)
                     values.rightType = Number(values.rightType)