Browse Source

Merge branch 'dev'

zhangyu 5 years ago
parent
commit
d3c7b6b453

+ 1 - 1
src/components/data_admin/buildTask/table/assetsTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="table-container">
     <div class="table-list" :style="tableData && tableData.length?'height:calc(100% - 50px);':'height:100%;'">
-      <el-table :data="tableData" style="width: 100%" height="100%" v-loading="loading" :header-cell-style="headerStyle">
+      <el-table :data="tableData" style="width: 100%;" height="100%" v-loading="loading" :header-cell-style="headerStyle">
         <el-table-column label="所属建筑楼层" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>

+ 1 - 1
src/components/data_admin/buildTask/table/deviceTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="table-container">
     <div class="table-list" :style="tableData && tableData.length?'height:calc(100% - 50px);':'height:100%;'">
-      <el-table :data="tableData" style="width: 100%;height:100%;" v-loading="loading" :header-cell-style="headerStyle" >
+      <el-table :data="tableData" style="width: 100%;" height="100%" v-loading="loading" :header-cell-style="headerStyle" >
         <el-table-column label="所属建筑楼层" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>

+ 1 - 1
src/components/data_admin/buildTask/table/modelTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="table-container">
     <div class="table-list" :style="tableData && tableData.length?'height:calc(100% - 50px);':'height:100%;'">
-      <el-table :data="tableData" style="width: 100%" height="100%" v-loading="loading" :header-cell-style="headerStyle">
+      <el-table :data="tableData" style="width: 100%;" height="100%" v-loading="loading" :header-cell-style="headerStyle">
         <el-table-column prop="FolderName" label="所属模型文件夹" show-overflow-tooltip min-width="80"></el-table-column>
         <el-table-column prop="FileName" label="模型文件名" show-overflow-tooltip min-width="80"></el-table-column>
         <el-table-column :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">

+ 1 - 1
src/components/data_admin/buildTask/table/replaceTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="table-container">
     <div class="table-list" :style="tableData && tableData.length?'height:calc(100% - 50px);':'height:100%;'">
-      <el-table :data="tableData" style="width: 100%" height="100%" v-loading="loading" :header-cell-style="headerStyle">
+      <el-table :data="tableData" style="width: 100%;" height="100%" v-loading="loading" :header-cell-style="headerStyle">
         <el-table-column label="所属建筑楼层" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>

+ 1 - 1
src/components/data_admin/buildTask/table/tearTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="table-container">
     <div class="table-list" :style="tableData && tableData.length?'height:calc(100% - 50px);':'height:100%;'">
-      <el-table :data="tableData" style="width: 100%" height="100%" v-loading="loading" :header-cell-style="headerStyle">
+      <el-table :data="tableData" style="width: 100%;" height="100%" v-loading="loading" :header-cell-style="headerStyle">
         <el-table-column label="所属建筑楼层" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>

+ 4 - 4
src/views/model/file/pathcontrol/index.vue

@@ -1,6 +1,10 @@
 <template>
   <div id="path-control" v-loading="loading">
     <el-row class="title-time">
+      <div style="width:200px">
+        <span>模型文件大小:</span>
+        <span>{{(Size/1000/1024).toFixed(1)}}M</span>
+      </div>
       <div style="width:220px">
         <span>模型总耗时:</span>
         <span>{{allTakeTime}}</span>
@@ -13,10 +17,6 @@
         <span>模型处理完成时间:</span>
         <span>{{SaveLog.EndTime}}</span>
       </div>
-      <div style="width:200px">
-        <span>模型文件大小:</span>
-        <span>{{(Size/1000/1024).toFixed(1)}}M</span>
-      </div>
     </el-row>
     <el-row class="path-pic">
       <div id="path-container">