Merge branch 'master' of https://git.czcyedu.com/huoran/FE_middlePlatform_server

src/views/data/Framework.vue

@@ -36,7 +36,11 @@
                         <el-table-column type="index" width="100" label="序号" align="center"></el-table-column>
                         <el-table-column prop="showName" label="数据表名称" align="center"></el-table-column>
                         <el-table-column prop="dataTotal" label="数据总量" align="center"></el-table-column>
-                        <el-table-column prop="dataSize" label="数据大小" align="center"></el-table-column>
+                        <el-table-column prop="dataSize" label="数据大小" align="center">
+                            <template slot-scope="scope">
+                                {{scope.row.dataSize}}M
+                            </template>
+                        </el-table-column>
                         <el-table-column prop="updateTime" label="更新时间" align="center"></el-table-column>
                         <el-table-column label="操作" width="220" align="center">
                             <template slot-scope="scope">