Selaa lähdekoodia

机器人监视页面样式微调

fbw 1 vuosi sitten
vanhempi
commit
126da0d49e

+ 9 - 2
src/layout/index.vue

@@ -38,7 +38,9 @@ export default {
   },
   mixins: [ResizeMixin],
   data() {
-    return {}
+    return {
+      path:'',
+    }
   },
   computed: {
     ...mapState({
@@ -62,8 +64,13 @@ export default {
       }
     },
   },
+  created() {
+    this.path = this.$route.path
+    // this.refreshCheckPath(this.path)
+    console.log("路由地址",this.$route)
+  },
   mounted() {
-    //console.log(this.$route)
+    console.log("路由地址",this.$route)
   },
   methods: {
     handleClickOutside() {

+ 2 - 1
src/views/robotSLG/robot/components/map/index.vue

@@ -1599,7 +1599,8 @@ export default {
 <style lang="scss" scoped>
 .map-container {
   width: 100%;
-  height: calc(64vh - 98px);
+  height: 524px;
+  // height: calc(64vh - 98px);
 }
 .taskInfo {
   position: absolute;

+ 30 - 21
src/views/robotSLG/robot/index.vue

@@ -182,8 +182,8 @@
               }"
             >
               <el-table-column label="导航点编号" prop="naviSequence" width="100" align="center" />
-              <el-table-column label="指标名称" prop="indicatorName" width="370" align="center" />
-              <el-table-column label="巡检结果" prop="value" width="90" align="center" />
+              <el-table-column label="指标名称" prop="indicatorName" align="center" />
+              <el-table-column label="巡检结果" prop="value" width="100" align="center" />
               <el-table-column label="巡检时间" prop="patrolTime" width="180" align="center" />
               <el-table-column label="告警等级" prop="defectGrade" width="100" align="center">
                 <template slot-scope="scope">
@@ -206,7 +206,7 @@
             >
               <el-table-column label="编号" prop="id" width="130" align="center" />
               <!-- <el-table-column label="类型" prop="type" align="center" /> -->
-              <el-table-column label="开始时间" prop="beginTime" width="190" align="center" />
+              <el-table-column label="开始时间" prop="beginTime"  align="center" />
               <el-table-column label="检测总数" prop="totalNumber" width="130" align="center" />
               <el-table-column label="正常数量" prop="finishedNumber" width="130" align="center" />
               <el-table-column label="缺陷数量" prop="defectNumber" width="130" align="center" />
@@ -428,8 +428,8 @@ export default {
         Methane: 0,
         HydrogenSulfide: 0,
         LaserCh4: 0,
-        Temperature:20.40,
-        Humidity:0
+        Temperature: 20.4,
+        Humidity: 0,
       },
       weatherInfo: {
         rainfall: '59.75mm',
@@ -853,19 +853,21 @@ export default {
     //background-color: aqua;
   }
   .top {
-    height: calc(54vh);
+    // height: calc(54vh);
+    height: 524px;
     display: flex;
     gap: 20px;
     .top-left {
       width: 250px;
       min-width: 364px;
-      height: inherit;
-      min-height: calc(20vh);
+      height: 524px;
+      // min-height: 524px;
+      // min-height: calc(20vh);
       display: flex;
       flex-direction: column;
       gap: 20px;
       .top-left-top {
-        height: 360px;
+        height: 256px;
         background-color: rgb(24, 120, 204);
         .device-container {
           padding: 15px;
@@ -877,9 +879,9 @@ export default {
           background-color: rgb(24, 120, 204);
           position: absolute;
           width: 250px;
-          height: 25%;
+          height: 210px;
           min-width: 363px;
-          min-height: calc(20vh);
+          // min-height: calc(20vh);
           top: 6;
           left: 10;
           text-align: right;
@@ -890,14 +892,16 @@ export default {
       }
       .top-left-bottom {
         background-color: rgb(24, 120, 204);
-        min-height: calc(25.5vh);
+        height: 256px;
+        // min-height: calc(25.5vh);
         .video-hw {
           background-color: rgb(24, 120, 204);
           position: absolute;
           width: 250px;
-          height: 24.5%;
+          height: 210px;
+          // height: 24.5%;
           min-width: 363px;
-          min-height: calc(20vh);
+          // min-height: calc(20vh);
           top: 99;
           left: 10;
           text-align: right;
@@ -910,6 +914,8 @@ export default {
     .top-center {
       width: 100%;
       min-width: 50%;
+      height: 524px;
+      max-height: 524px;
       background-color: rgb(24, 120, 204);
       position: relative;
       .map {
@@ -993,12 +999,14 @@ export default {
     }
   }
   .bottom {
-    height: calc(36vh);
+    height: 290px;
+    // height: calc(36vh);
     display: flex;
     gap: 20px;
     .bottom-left {
       width: calc(26vw);
       min-width: 364px;
+      height: 290px;
       // min-width: 15%;
       background-color: rgb(24, 120, 204);
       .robot-info {
@@ -1022,23 +1030,23 @@ export default {
     .bottom-center {
       // width: calc(48vw);
       // min-width: 35%;
-      height: calc(30vh);
-      min-height: calc(30vh);
+      // height: calc(30vh);
+      // min-height: calc(30vh);
       width: 100%;
       min-width: 53%;
       background-color: rgb(24, 120, 204);
       // .parameter {
-      //   padding: 24px 31px;
+        //   padding: 24px 31px;
       //   display: flex;
       //   flex-wrap: wrap;
       //   gap: 23px;
       //   .parameter-item {
-      //     height: 32px;
+        //     height: 32px;
       //   }
       // }
       .record-list {
         margin-bottom: 10px;
-        min-height: calc(30vh);
+        // min-height: calc(30vh);
       }
     }
     .bottom-right {
@@ -1047,7 +1055,8 @@ export default {
       // min-width: 25%;
       background-color: rgb(24, 120, 204);
       .alarm {
-        height: calc(30vh);
+        height: 290px;
+        // height: calc(30vh);
         overflow-y: scroll;
         .alarm-item-container {
           margin: 6px;

+ 2 - 2
vue.config.js

@@ -49,12 +49,12 @@ module.exports = {
         // target: 'http://localhost:18908', // 宝莫穿透
         // target: 'http://192.168.18.221:8080/prod-api/', // 巡检模块Demo
         // target: 'http://192.168.18.200:18082/prod-api/', // 巡检模块Demo
-        target: 'http://192.168.18.200:8080/prod-api/', // 巡检模块Demo
+        // target: 'http://192.168.18.200:8080/prod-api/', // 巡检模块Demo
         // target: "http://172.16.214.237:8080/prod-api/", // 远程服务器-赵哥
         // target: "http://39.101.177.49:5012", // 远程服务器-皞哥
         // target: 'http://10.168.239.129:6002', // 118现场服务器
         // target: 'http://192.168.70.11:8080/prod-api/', //静海现场
-        // target: 'http://192.168.195.129:8080/prod-api/', //静海现场
+        target: 'http://192.168.195.129:8080/prod-api/', //本地虚拟
         changeOrigin: true,
         pathRewrite: {
           '^/dev-api': '',