From 1a80dfc9d281d7bdd2016bfaf5d6806ae5076d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E9=91=AB?= <zhangxin@zhehekeji.com>
Date: Mon, 29 Mar 2021 19:02:52 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"Revert=20"=E7=9B=98=E7=82=B9=E5=89=A9?=
 =?UTF-8?q?=E4=BD=99=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84""?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 284d4ac594ca149f22d3147306b95a53d9e5c84b.
---
 src/views/alarmVideos/alarmLog.vue       | 27 +++++++++++--
 src/views/alarmVideos/index.vue          | 27 ++++++++++---
 src/views/checkManage/checkOperation.vue | 18 +++++----
 src/views/checkManage/index.vue          | 12 +++---
 src/views/checkManage/model.vue          | 50 +++++++++++++-----------
 src/views/historyMonitoring/index.vue    | 33 +++++++++++++---
 vue.config.js                            |  2 +-
 7 files changed, 118 insertions(+), 51 deletions(-)

diff --git a/src/views/alarmVideos/alarmLog.vue b/src/views/alarmVideos/alarmLog.vue
index b52d541..b3e12e9 100644
--- a/src/views/alarmVideos/alarmLog.vue
+++ b/src/views/alarmVideos/alarmLog.vue
@@ -15,7 +15,14 @@
                     </a-col>
                     <a-col :span="10">
                         <a-form-item class="ageInput" label="告警时间">
-                            <a-range-picker @change="onTimeChange" v-model="time">
+                            <a-range-picker
+                                @change="onTimeChange"
+                                v-model="time"
+                                format="YYYY-MM-DD HH:mm:ss"
+                                :show-time="{
+                                  defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+                                }"
+                            >
                                 <a-icon slot="suffixIcon" type="calendar"/>
                             </a-range-picker>
                         </a-form-item>
@@ -87,11 +94,15 @@
 <script>
 import {imgUrl, videoUrl} from "@/api/importExcel";
 import Model from "./model.vue"
+import moment from 'moment';
 export default {
     name: "alarmLog",
     data() {
         return {
-            queryParam: {},
+            queryParam: {
+                startTime: moment().subtract(1, "weeks").format('YYYY-MM-DD HH:mm:ss'), //当前时间的前一个星期时间
+                endTime: moment().format('YYYY-MM-DD HH:mm:ss')
+            },
             time:[],
             pageNum: 1,
             pageSize: 10,
@@ -149,6 +160,14 @@ export default {
         console.log(this.imgUrl)
     },
     methods: {
+        moment,
+        range(start, end) {
+            const result = [];
+            for (let i = start; i < end; i++) {
+                result.push(i);
+            }
+            return result;
+        },
         getStreetList(){
             this.$api.httpApi.getStreetList({
                 data: {
@@ -211,8 +230,8 @@ export default {
             this.queryParam.endTime = ""
         },
         reset() {
-            this.queryParam.startTime = ""
-            this.queryParam.endTime = ""
+            this.queryParam.startTime = moment().subtract(1, "weeks").format('YYYY-MM-DD HH:mm:ss'), //当前时间的前一个星期时间
+                this.queryParam.endTime = moment().format('YYYY-MM-DD HH:mm:ss')
             this.queryParam.streetId = 0
             this.time = []
             this.handleGetalarmLog()
diff --git a/src/views/alarmVideos/index.vue b/src/views/alarmVideos/index.vue
index 9ab78bd..a0975b5 100644
--- a/src/views/alarmVideos/index.vue
+++ b/src/views/alarmVideos/index.vue
@@ -5,8 +5,13 @@
                 <a-row :gutter="24">
                     <a-col :span="5" style="text-align: left">
                         <a-form-item  label="时间">
-                            <a-range-picker @change="onTimeChange" v-model="time"
-                                            format="YYYY-MM-DD HH:mm">
+                            <a-range-picker @change="onTimeChange"
+                                            v-model="time"
+                                            format="YYYY-MM-DD HH:mm"
+                                            :show-time="{
+                                              defaultValue: [moment('00:00', 'HH:mm'), moment('23:59', 'HH:mm')],
+                                            }"
+                            >
                                 <a-icon slot="suffixIcon" type="calendar"/>
                             </a-range-picker>
                         </a-form-item>
@@ -53,6 +58,7 @@
 <script>
 import Model from "./model.vue"
 import {videoUrl} from "@/api/importExcel";
+import moment from 'moment';
 export default {
     name: "historyMonitoring",
     components: {
@@ -63,7 +69,10 @@ export default {
         return {
             labelCol: { span: 6 },
             wrapperCol: { span: 18 },
-            queryParam: {},
+            queryParam: {
+                startTime: moment().subtract(1, "days").format('YYYY-MM-DD HH:mm:ss'), //当前时间的前一个天时间
+                endTime: moment().format('YYYY-MM-DD HH:mm:ss')
+            },
             time:[],
             pageNum:1,
             pageSize:10,
@@ -109,6 +118,14 @@ export default {
         this.handleGetalarmList()
     },
     methods: {
+        moment,
+        range(start, end) {
+            const result = [];
+            for (let i = start; i < end; i++) {
+                result.push(i);
+            }
+            return result;
+        },
         handleSearch(){
             console.log(this.queryParam)
             this.handleGetalarmList()
@@ -159,8 +176,8 @@ export default {
             this.vid = data
         },
         reset() {
-            this.queryParam.startTime = ""
-            this.queryParam.endTime = ""
+            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.time = []
             this.handleGetalarmList()
         },
diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index e0619fc..a0a0a02 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -37,7 +37,7 @@
             </a-select>
         </div>
 
-        <div v-if="JSON.stringify(checkObj) !== '{}'">
+        <div v-if="checkObj.id">
             <div v-for="(key,value) in checkList" :key="value">
                 <div v-if="checkObj.shelveId == value">
                     <!--{{value}}{{key}}-->
@@ -160,7 +160,7 @@
                             <div class="status-btn">
                                 <a-button class="btn"
                                           type="danger"
-                                          @click="showModel(index)"
+                                          @click="showModel({},index)"
                                 >人工复核
                                 </a-button>
                                 <a-button class="btn"
@@ -318,6 +318,7 @@ export default {
             console.log(value)
             this.select = value
             this.id = value
+            console.log(JSON.stringify(this.checkObj))
             this.getStreetList()
             for (var i = 0; i < this.listData.length; i++) {
                 console.log(this.listData[i])
@@ -325,18 +326,18 @@ export default {
                     if (this.listData[i].leftShelveId) {
                         this.shelveId = this.listData[i].leftShelveId
                         this.selectType = 'left'
-                        this.selectType2 = 'out'
-                        this.getStockInfo(1, 1, this.listData[i].leftShelveId)
+                        this.selectType2 = 'none'
+                        this.getStockInfo(1, 1, this.shelveId)
                     } else if (this.listData[i].leftInsideShelveId) {
                         this.shelveId = this.listData[i].leftInsideShelveId
                         this.selectType = 'left'
-                        this.selectType2 = 'none'
-                        this.getStockInfo(1, 1, this.listData[i].leftInsideShelveId)
+                        this.selectType2 = 'inside'
+                        this.getStockInfo(1, 1, this.shelveId)
                     } else if (this.listData[i].leftOutsideShelveId) {
                         this.shelveId = this.listData[i].leftOutsideShelveId
                         this.selectType = 'left'
-                        this.selectType2 = 'none'
-                        this.getStockInfo(1, 1, this.listData[i].leftOutsideShelveId)
+                        this.selectType2 = 'out'
+                        this.getStockInfo(1, 1, this.shelveId)
                     }
 
 
@@ -517,6 +518,7 @@ export default {
                         flex-direction: column;
                         font-size: 17px;
                         height: 400px;
+                        margin-right: 10px;
                         img {
                             height: 100%
                         }
diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue
index 45c37b3..2f22f81 100644
--- a/src/views/checkManage/index.vue
+++ b/src/views/checkManage/index.vue
@@ -1,5 +1,10 @@
 <template>
     <div class="check-page">
+        <div style="width:100%;text-align:right;margin-bottom:5px">
+            <a-button type="primary" @click="exportStock" style="text-align:right">
+                导出全部巷道
+            </a-button>
+        </div>
         <div class="title-info">
             <span class="explain">颜色说明：</span>
             <span class="info-text">
@@ -85,9 +90,6 @@
                     {{i.name}}
                 </a-select-option>
             </a-select>
-            <a-button type="primary" @click="exportStock">
-                导出全部巷道
-            </a-button>
         </div>
         <div class="check-content" v-for="item in data" :key="item.name">
             <div class="roadway-buttom" v-if="item.id == select">
@@ -270,12 +272,12 @@ export default {
 
         .roadway-top {
             padding: 20px 0;
-            width: 1000px;
+            width: 90%;
         }
 
         .roadway-buttom {
             padding: 20px 0 20px 0;
-            width: 1000px;
+            width: 90%;
         }
 
         .scroll-box {
diff --git a/src/views/checkManage/model.vue b/src/views/checkManage/model.vue
index daf5593..7bf4d5f 100644
--- a/src/views/checkManage/model.vue
+++ b/src/views/checkManage/model.vue
@@ -94,30 +94,34 @@ export default {
     },
     methods: {
         handleOk() {
-            this.confirmLoading = true;
-            setTimeout(() => {
-                this.form.validateFields((err, values) => {
-                    console.log(values)
-                    if (!err) {
-                        this.$api.httpApi.stockCheckByMan({
-                            data: {
-                                ...values,
-                                column: this.mData.column,
-                                row: this.mData.row,
-                                shelveId: this.mData.shelveId,
-                            }
-                        }).then(res => {
-                            if (res.code == 200) {
-                                this.$emit('sure', false, this.i)
-                                this.$message.success('复核成功');
-                            }
-                        }).catch(err => {
+            if (JSON.stringify(this.mData) !== '{}') {
+                this.confirmLoading = true;
+                setTimeout(() => {
+                    this.form.validateFields((err, values) => {
+                        console.log(values)
+                        if (!err) {
+                            this.$api.httpApi.stockCheckByMan({
+                                data: {
+                                    ...values,
+                                    column: this.mData.column,
+                                    row: this.mData.row,
+                                    shelveId: this.mData.shelveId,
+                                }
+                            }).then(res => {
+                                if (res.code == 200) {
+                                    this.$emit('sure', false, this.i)
+                                    this.$message.success('复核成功');
+                                }
+                            }).catch(err => {
 
-                        });
-                    }
-                });
-                this.confirmLoading = false;
-            }, 500);
+                            });
+                        }
+                    });
+                    this.confirmLoading = false;
+                }, 500);
+            } else {
+                this.$message.error('该货位暂时没有记录');
+            }
         },
         handleCancel() {
             console.log('Clicked cancel button');
diff --git a/src/views/historyMonitoring/index.vue b/src/views/historyMonitoring/index.vue
index 63de1a5..e53b3a0 100644
--- a/src/views/historyMonitoring/index.vue
+++ b/src/views/historyMonitoring/index.vue
@@ -10,7 +10,14 @@
                     </a-col>
                     <a-col :span="8">
                         <a-form-item class="ageInput" label="时间">
-                            <a-range-picker @change="onTimeChange" v-model="time">
+                            <a-range-picker
+                                @change="onTimeChange"
+                                v-model="time"
+                                format="YYYY-MM-DD HH:mm"
+                                :show-time="{
+                                  defaultValue: [moment('00:00', 'HH:mm'), moment('23:59', 'HH:mm')],
+                                }"
+                            >
                                 <a-icon slot="suffixIcon" type="calendar"/>
                             </a-range-picker>
                         </a-form-item>
@@ -82,11 +89,14 @@
 <script>
 import {imgUrl, videoUrl} from "@/api/importExcel";
 import Model from "./model.vue"
+import moment from 'moment';
 export default {
     name: "historyMonitoring",
     data() {
         return {
-            queryParam: {},
+            queryParam: {
+                orderNum: ''
+            },
             time:[],
             pageNum: 1,
             pageSize: 10,
@@ -158,8 +168,20 @@ export default {
     mounted() {
         this.handleGetHistoryList()
         console.log(this.imgUrl)
+        if (this.$route.query.orderNum) {
+            console.log(this.$route.query.orderNum)
+            this.queryParam.orderNum = this.$route.query.orderNum
+        }
     },
     methods: {
+        moment,
+        range(start, end) {
+            const result = [];
+            for (let i = start; i < end; i++) {
+                result.push(i);
+            }
+            return result;
+        },
         handleSearch() {
             console.log(this.queryParam)
             this.handleGetHistoryList()
@@ -195,7 +217,8 @@ export default {
         onTimeChange(date, dateString) {
             this.handleReset()
             console.log(date)
-            console.log(date[0].format('YYYY-MM-DD HH:mm:ss'))
+            console.log(dateString)
+            console.log(date[0].format('YYYY-MM-DD HH:mm'))
             this.queryParam.startTimestamp = date[0].format('YYYY-MM-DD HH:mm:ss')
             this.queryParam.endTimestamp = date[1].format('YYYY-MM-DD HH:mm:ss')
         },
@@ -212,8 +235,8 @@ export default {
             this.vid = data
         },
         reset() {
-            this.queryParam.startTime = ""
-            this.queryParam.endTime = ""
+            this.queryParam.startTimestamp = ""
+            this.queryParam.endTimestamp = ""
             this.queryParam.orderNum = ""
             this.time = []
             this.handleGetHistoryList()
diff --git a/vue.config.js b/vue.config.js
index 2c1d4b3..c48a43a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -10,7 +10,7 @@ module.exports = {
     devServer: {
         proxy: {
             '/api': {
-                target: 'http://192.168.66.56:9007',
+                target: 'http://192.168.66.27:8099',
                 logLevel:'debug',   //控制台终端打印代理前的真实地址
             },
         },