From ce8af769bc7415c11fac35ceb34b2f8a78e29ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E9=91=AB?= <zhangxin@zhehekeji.com>
Date: Wed, 6 Jan 2021 18:18:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83=EF=BC=8Cslot=E6=8F=92=E6=A7=BD?=
 =?UTF-8?q?=E4=B8=A4=E7=A7=8D=E7=94=A8=E6=B3=95=E8=AF=A6=E8=A7=81roadwayMa?=
 =?UTF-8?q?nage/index=E5=92=8ChistoryMonitoring/index=E4=B8=AD=E7=9A=84slo?=
 =?UTF-8?q?t?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/importExcel.js                |   2 +
 src/views/checkManage/index.vue       |  26 +++++-
 src/views/historyMonitoring/index.vue | 110 ++++++++++++++++++--------
 src/views/roadwayManage/index.vue     |   4 +-
 4 files changed, 106 insertions(+), 36 deletions(-)

diff --git a/src/api/importExcel.js b/src/api/importExcel.js
index 112bd85..1d4b236 100644
--- a/src/api/importExcel.js
+++ b/src/api/importExcel.js
@@ -1 +1,3 @@
 export const importExcelUrl = process.env.VUE_APP_API_URL + "/camera/config/import";
+export const imgUrl = process.env.VUE_APP_API_URL + "/pic/";
+export const videoUrl = process.env.VUE_APP_API_URL + "/mp4/";
diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue
index 1d17067..32846e4 100644
--- a/src/views/checkManage/index.vue
+++ b/src/views/checkManage/index.vue
@@ -22,7 +22,7 @@
                     <div class="roadway-box">
                         <div class="line" v-for="item in 20" :key="item">
                             <a-tag
-                                :color="[i+'-'+item == '4-14'|| i+'-'+item=='8-18'?'#d81e06':'#bfbfbf']"
+                                :color="i+'-'+item == '4-14'|| i+'-'+item=='8-18'?'#d81e06':'#bfbfbf'"
                                 style="width:46px;height:25px;margin: 1px 2px;" v-for="i in 60"
                                 :key="i">{{i}}-{{item}}
                             </a-tag>
@@ -49,12 +49,12 @@
                     3号巷道
                 </a-select-option>
             </a-select>
-            <div class="roadway-top">
+            <div class="roadway-buttom">
                 <happy-scroll color="rgba(100,100,100,0.5)" size="8" class="scroll-box">
                     <div class="roadway-box">
                         <div class="line" v-for="item in 20" :key="item">
                             <a-tag
-                                :color="[i+'-'+item == '5-16'|| i+'-'+item=='9-17'||i+'-'+item=='11-15'?'#1afa29':'#bfbfbf']"
+                                :color="i+'-'+item == '5-16'|| i+'-'+item=='9-17'||i+'-'+item=='11-15'?'#1afa29':'#bfbfbf'"
                                 style="width:46px;height:25px;margin: 1px 2px;" v-for="i in 60"
                                 :key="i">{{i}}-{{item}}
                             </a-tag>
@@ -133,5 +133,25 @@ export default {
             }
 
         }
+
+        .roadway-buttom {
+            padding: 20px 0;
+            width: 1000px;
+
+            .scroll-box {
+                height: 270px;
+
+                .roadway-box {
+                    transform: rotateX(180deg);
+                    padding: 10px 10px 0 0;
+
+                    .line {
+                        display: flex;
+                        transform: rotateX(180deg); //两次垂直镜像翻转让原本由上到下排列的div 更改为由下到上
+                    }
+                }
+            }
+
+        }
     }
 </style>
diff --git a/src/views/historyMonitoring/index.vue b/src/views/historyMonitoring/index.vue
index b9262cd..6433604 100644
--- a/src/views/historyMonitoring/index.vue
+++ b/src/views/historyMonitoring/index.vue
@@ -5,7 +5,7 @@
                 <a-row :gutter="12">
                     <a-col :span="8" style="text-align: left">
                         <a-form-item label="工单号">
-                            <a-input v-model="queryParam.con_code" placeholder="请输入" />
+                            <a-input v-model="queryParam.orderNum" placeholder="请输入"/>
                         </a-form-item>
                     </a-col>
                     <a-col :span="8">
@@ -29,11 +29,46 @@
             :pagination="pagination"
             @change="handleGetHistoryList"
         >
+            <span slot="pic" slot-scope="text">
+            <template>
+                <span v-if="text.putPath || text.goodsPath ||text.outputPath">
+<!--                    {{text.putPath}} {{text.goodsPath}} {{text.outputPath}}-->
+                    <img class="historyImg" :src="imgUrl+text.putPath" alt="">
+                    <img class="historyImg" :src="imgUrl+text.goodsPath" alt="">
+                    <img class="historyImg" :src="imgUrl+text.outputPath" alt="">
+                </span>
+                <span v-else>
+                    暂无图片
+                </span>
+            </template>
+          </span>
+            <span slot="status" slot-scope="text">
+              <span :style="text.status == 1 ?' color:red': ''">
+                 {{ text.status == null ? '-' : text.status == 0 ? '正常' : '告警' }}
+              </span>
+          </span>
+            <span slot="videoPath1" slot-scope="text">
+              <a-button type="link" v-if="text.videoPath1">
+                  查看视频
+              </a-button>
+              <span v-else>
+
+              </span>
+          </span>
+            <span slot="videoPath2" slot-scope="text">
+              <a-button type="link" v-if="text.videoPath2">
+                  查看视频
+              </a-button>
+              <span v-else>
+
+              </span>
+          </span>
         </a-table>
     </div>
 </template>
 
 <script>
+    import {imgUrl, videoUrl} from "@/api/importExcel";
 export default {
     name: "historyMonitoring",
     components: {
@@ -41,21 +76,22 @@ export default {
     },
     data() {
         return {
-            labelCol: { span: 6 },
-            wrapperCol: { span: 18 },
+            labelCol: {span: 6},
+            wrapperCol: {span: 18},
             queryParam: {},
-            pageNum:1,
-            pageSize:10,
+            pageNum: 1,
+            pageSize: 10,
             data: [],
-            pagination:{
-                total:0,
-                defaultPageSize:10, // 默认每页显示数量
+            pagination: {
+                total: 0,
+                defaultPageSize: 10, // 默认每页显示数量
                 showTotal: total => `共 ${total} 条数据`, // 显示总数
-                showSizeChanger:true, // 显示可改变每页数量
+                showSizeChanger: true, // 显示可改变每页数量
                 pageSizeOptions: ['10', '20', '30'],
-                onShowSizeChange:(current, pageSize)=>this.pageSize = pageSize // 改变每页数量时更新显示
+                onShowSizeChange: (current, pageSize) => this.pageSize = pageSize // 改变每页数量时更新显示
             },
             loading: false,
+            imgUrl: imgUrl,
             columns: [
                 {
                     title: "工单号",
@@ -76,15 +112,17 @@ export default {
                 },
                 {
                     title: "时间",
-                    dataIndex: "time",
+                    dataIndex: "startTime",
                 },
                 {
                     title: "照片（入库 货位 出库）",
-                    dataIndex: "pic",
+                    // dataIndex: "pic",
+                    scopedSlots: {customRender: 'pic'}
                 },
                 {
                     title: "视频状态",
-                    dataIndex: "status",
+                    // dataIndex: "status",
+                    scopedSlots: {customRender: 'status'}
                 },
                 {
                     title: "视频时长",
@@ -92,11 +130,13 @@ export default {
                 },
                 {
                     title: "球机1",
-                    dataIndex: "camera1",
+                    // dataIndex: "videoPath1",
+                    scopedSlots: {customRender: 'videoPath1'}
                 },
                 {
                     title: "球机2",
-                    dataIndex: "camera2",
+                    // dataIndex: "videoPath2",
+                    scopedSlots: {customRender: 'videoPath2'}
                 },
             ],
         };
@@ -125,28 +165,29 @@ export default {
             this.request();
         },
         request() {
-            // this.$api.httpApi.queryList({
-            //     data: {
-            //         pageNum:this.pageNum,
-            //         pageSize:this.pageSize,
-            //         ...this.queryParam
-            //     }
-            // }).then(res => {
-            //     console.log(res)
-            // }).catch(err => {
-            //
-            // });
+            this.$api.httpApi.queryList({
+                data: {
+                    pageNum: this.pageNum,
+                    pageSize: this.pageSize,
+                    ...this.queryParam
+                }
+            }).then(res => {
+                console.log(res)
+                this.data = res.data
+            }).catch(err => {
+
+            });
         },
         onTimeChange(date, dateString) {
             console.log(date)
             console.log(date[0].format('X'))
-            this.queryParam.start_time = date[0].format('X')
-            this.queryParam.end_time = date[1].format('X')
+            this.queryParam.startTimestamp = date[0].format('X')
+            this.queryParam.endTimestamp = date[1].format('X')
         },
         handleReset() {
-            this.queryParam.start_time=""
-            this.queryParam.end_time=""
-            this.time=""
+            this.queryParam.startTimestamp = ""
+            this.queryParam.endTimestamp = ""
+            this.time = ""
         },
     },
 };
@@ -159,11 +200,18 @@ export default {
 .ant-drawer-content-wrapper {
     height: auto !important;
 }
+
 .ant-drawer-body {
     text-align: center;
 }
+
 .ant-advanced-search-form .ant-form-item {
     display: flex;
     width: 100%;
 }
+
+.historyImg {
+    width: 80px;
+    margin: 5px;
+}
 </style>
diff --git a/src/views/roadwayManage/index.vue b/src/views/roadwayManage/index.vue
index 231ec25..c4e380e 100644
--- a/src/views/roadwayManage/index.vue
+++ b/src/views/roadwayManage/index.vue
@@ -67,8 +67,8 @@ const columns = [
     },
     {
         title: '右货架类型',
-        dataIndex: 'rightType',
-        scopedSlots: { customRender: 'rightType' }
+        dataIndex: 'rightType',//若这里保留，slot插槽的text即代表rightType，否则text.rightType才代表rightType本身
+        scopedSlots: {customRender: 'rightType'}
     },
     {
         title: '对应球机',