1

src/App.vue

@@ -48,7 +48,7 @@ export default {
 	min-width: 1600px;
     max-width: 2000px;
 	/*min-height: 800px;*/
-   max-height: 1200px;
+    max-height: 1200px;
 	background-color: #060A2D;
 	display: flex;
 	flex-direction: column;

src/views/home/Home.vue

@@ -70,6 +70,14 @@
         </section>
         <footer class="footer">
             <swiperMulti @onOpen="onOpen" @openItem="openItem"></swiperMulti>
+            <div class="control-log">
+                <div class="control-content">
+                    <div class="chart-tab-title">控制日志</div>
+                    <div class="log-data">
+                        <div class="cell"></div>
+                    </div>
+                </div>
+            </div>
         </footer>
         <el-dialog
             :title="item.position + '环境监测曲线'"
@@ -146,8 +154,8 @@ export default {
             echartsList: [],
             isQk: false,
             lists: {},
-            // 无关的数据，不用管
-            test: 0
+            // 控制日志
+            logList: []
         };
     },
     components: {
@@ -516,8 +524,23 @@ export default {
         }
     }
     > .footer {
+        display: flex;
         margin-top: 10px;
         height: 33.3%;
+        justify-content: space-between;
+        > .control-log {
+            width: 20%;
+            height: 100%;
+            margin: 0 10px 0 22px;
+            > .control-content {
+                display: flex;
+                border-radius: 8px;
+                overflow: hidden;
+                flex-direction: column;
+                background-color: #001346;
+                width: 100%;
+            }
+        }
     }
 }
 

src/views/home/swiperMulti.vue

@@ -170,6 +170,7 @@ export default {
             console.log('++++++++++++++++++++++++++++');
             this.$http.get('/environment/getZsda', {mcid: 39})
                     .then(res => {
+                        
                         // loading.close();
                         if(res.code === 10000) {
                             // this.data = res.data;
@@ -234,6 +235,7 @@ export default {
                             });
                             // 数组排序
                             this.data.sort(function(a, b){a.lqid - b.lqid});
+                            console.log(this.data);
                             this.setInterval();
                         }
                     })
@@ -259,10 +261,11 @@ export default {
 <style lang="scss" scope>
 .swiperMulti {
     box-sizing: border-box;
-    width: 100%;
+    width: 79%;
     height: 100%;
     position: relative;
     cursor: pointer;
+    overflow: hidden;
     > .guide{
         position: absolute;
         font-size: 60px;

src/views/robot/robot.vue

@@ -42,6 +42,10 @@
                                 <button class="button button-gray" @click="operation">手动</button>
                                 <button class="button button-blue">拉远</button>
                             </div>
+                            <div>
+                                <button class="button button-gray">降低</button>
+                                <button class="button button-blue">升高</button>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -623,13 +627,14 @@ export default {
                         }
                         .img-right {
                             transform: rotate(180deg);
-                            right: 45px;
+                            right: 41px;
                             top: 50px;
                         }
                         .img-bottom {
                             transform: rotate(-90deg);
                             bottom: 20px;
                             left: 130px;
+                            bottom: 25px
                         }
                         .img-left {
                             top: 50px;
@@ -640,7 +645,7 @@ export default {
                         }
                     }
                     .control-right {
-                        padding: 20px 0;
+                        // padding: 0px 0;
                         .button-blue {
                             background-color: rgb(2, 167, 240);
                         }