Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

Administrator

2021-04-23 8f3062cd6729850839b02b4dc0a4a76c4322f1c4

 src/views/supervisoryConsole/data.vue

@@ -78,7 +78,7 @@
            class="info-content-table"
            :data="tableData"
            stripe
            style="width: 100%; margin: 10px"
            style="width: 100%; margin: 0 10px"
            max-height="380px"
            :resizable="false"
          >