控制日志修改

src/views/home/Home.vue

@@ -77,12 +77,23 @@
                     </div>
                 </div>
             </div>
-            <div class="swiper"><swiperMulti @onOpen="onOpen" @openItem="openItem"></swiperMulti></div>
+            <div class="swiper">
+                <swiperMulti @onOpen="onOpen" @openItem="openItem"></swiperMulti>
+            </div>
             <div class="control-log">
                 <div class="control-content">
                     <div class="chart-tab-title">控制日志</div>
-                    <div class="log-data">
-                        <div class="cell"></div>
+                    <div class="msg-tab-body">
+                        <div class="cell">
+                            <span class="cell-default">位置</span>
+                            <span style="margin-left: 80px">照明时长</span>
+                            <span style="float: right;">开始时间</span>
+                        </div>
+                        <div class="cell" v-for="(item, i) in controlLog" :key="i">
+                            <span class="cell-default">{{item.zsmc}}</span>
+                            <span style="margin-left: 65px">{{item.durations}}分钟</span>
+                            <span style="float: right;">{{item.xgsj}}</span>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -164,7 +175,8 @@ export default {
             lists: {},
             // 控制日志
             logList: [],
-            setIval: 1
+            setIval: 1,
+            controlLog: []
         };
     },
     components: {
@@ -217,6 +229,17 @@ export default {
                     this.callList = res.data;
                 }
             });
+            this.$http.get('http://122.112.252.100:8085/environment/getZMInfo')
+            .then(res => {
+                if(res.code === 10000) {
+                    res.data.forEach(item => {
+                        let xgsj = utils.resolverTime(item.xgsj);
+                        item.xgsj = xgsj;
+                    });
+                    this.controlLog = res.data;
+                    console.log(res.data);
+                }
+            });
         },
         openVideo(data) {
             if(data.id == null) {
@@ -597,6 +620,52 @@ export default {
                 background-color: #001346;
                 width: 100%;
                 height: 100%;
+                overflow: auto;
+                .msg-tab-body {
+                    overflow-y: scroll;
+                    flex-grow: 1;
+                    padding: 15px 20px;
+                    /*overflow: hidden;*/
+                    background-color: #001346;
+                    > .cell {
+                        background-color: #060a2d;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        white-space: nowrap;
+                        margin: 3px 0;
+                        padding: 5px;
+                        color: #F56C6C;
+                        .cell-default {
+                            color: #81d3f8;
+                        }
+                    }
+                }
+                .msg-tab-body::-webkit-scrollbar {
+                    /*滚动条整体样式*/
+                    width : 5px;  /*高宽分别对应横竖滚动条的尺寸*/
+                    height: 1px;
+                }
+                .msg-tab-body::-webkit-scrollbar-thumb {
+                    /*滚动条里面小方块*/
+                    border-radius   : 8px;
+                    background-color:  #535353;
+                    background-image: -webkit-linear-gradient(
+                                    45deg,
+                                    rgba(255, 255, 255, 0.2) 25%,
+                                    transparent 25%,
+                                    transparent 50%,
+                                    rgba(255, 255, 255, 0.2) 50%,
+                                    rgba(255, 255, 255, 0.2) 75%,
+                                    transparent 75%,
+                                    transparent
+                    );
+                }
+                .msg-tab-body::-webkit-scrollbar-track {
+                    /*滚动条里面轨道*/
+                    box-shadow   : inset 0 0 5px rgba(0, 0, 0, 0.2);
+                    /*background   : #ededed;*/
+                    border-radius: 10px;
+                }
             }
         }
     }