Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

shuishen

2021-04-23 e2ed7cb4ef578d970beca80aea4903e9b13cd1f8

 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"
          >