Browse Source

Merge branch 'dev' of http://39.106.8.246:3003/web/ibms into dev

haojianlong 4 years ago
parent
commit
5190f561a6

+ 4 - 1
src/components/globaluploader/index.vue

@@ -304,7 +304,10 @@ export default {
       // })
 
       // file.uniqueIdentifier = this.params.uploadId;
-      file.resume();
+
+      // file.resume();//继续上传文件
+      // 调用依赖中继续上传的方法达到状态刷新的目的(原生点击继续上传按钮)
+      document.querySelector(`.file_${file.id} .uploader-file-resume`).click();
       this.statusRemove(file.id);
     },
 

+ 9 - 7
src/components/ledger/rentList/roomCountDrawer.vue

@@ -109,13 +109,15 @@ export default {
         this.option.GeneralZone = res.Content.map(build => {
           build.value = build.BuildID;
           build.label = build.BuildLocalName;
-          build.Floor = build.Floor.map(floor => {
-            floor.value = floor.FloorID;
-            floor.label = floor.FloorLocalName;
-            floor.Floor = [];
-            return floor;
-          });
-          build.Floor.unshift({ value: 'noknowFloor', label: '未明确楼层', Floor: [] })
+          if (build.Floor) {
+            build.Floor = build.Floor.map(floor => {
+              floor.value = floor.FloorID;
+              floor.label = floor.FloorLocalName;
+              floor.Floor = [];
+              return floor;
+            });
+            build.Floor.unshift({ value: 'noknowFloor', label: '未明确楼层', Floor: [] })
+          }
           return build;
         })
         this.option.GeneralZone.unshift({ value: 'noknowBuild', label: '未明确建筑', Floor: [] });

+ 3 - 3
src/components/model/file/floorTable.vue

@@ -10,14 +10,14 @@
           <span style="margin-left: 10px">{{ scope.row.FloorName }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="Note" label="备注" width="180"></el-table-column>
+      <el-table-column prop="Note" label="备注" width="240"></el-table-column>
       <el-table-column label="版本号">
         <template slot-scope="scope">
           <span style="margin-right: 5px">{{ scope.row.Version }}</span>
-          <i v-show="scope.row.Version && scope.row.Status == 4" class="iconfont icon-warn" style="cursor:pointer;" title="查看版本更新信息" @click="handleClickVersion(scope.row)"></i>
+          <i v-show="scope.row.Version && scope.row.Status == 4" class="iconfont icon-warn" style="cursor:pointer;position:relative;top:1px;" title="查看版本更新信息" @click="handleClickVersion(scope.row)"></i>
         </template>
       </el-table-column>
-      <el-table-column prop="AcceptTime" label="上传时间" width="140"></el-table-column>
+      <el-table-column prop="AcceptTime" label="上传时间" width="200"></el-table-column>
       <el-table-column prop="UserName" label="上传人"></el-table-column>
       <el-table-column prop="address" align="center" label="操作" width="240">
         <template slot-scope="scope">

+ 5 - 2
src/views/model/file/index.vue

@@ -45,7 +45,7 @@
           <el-button @click="queryFloorFile(currentFolderId)">刷新</el-button>
         </div>
         <!-- 列表 -->
-        <floorTable ref="floorTable" :tableData="tableData" :modelFolderName="currentFolderName" @openModelLog="queryModelLog"
+        <floorTable v-loading="tableLoading" ref="floorTable" :tableData="tableData" :modelFolderName="currentFolderName" @openModelLog="queryModelLog"
           @replaceModel="repliaceModel" @percentFinish="queryFloorFile(currentFolderId)"
           :persentList="persentList"></floorTable>
       </el-card>
@@ -113,6 +113,7 @@ export default {
       currentFloorModelId: "", //当前选择的楼层文件id
       tableData: [],
       loading: false, //加载loading
+      tableLoading: false, //表格加载loading
       logData: [], //楼层文件对应的模型日志
       replaceModelItem: null, //替换文件的item
       uploadFloorModelIdList: [], //上传楼层文件得数组,上传完成则为空
@@ -214,6 +215,8 @@ export default {
      */
     queryFloorFile(currentFolderId) {
       if(currentFolderId){
+        this.tableData = [];
+        this.tableLoading = true;
         let data = {
           FolderId: currentFolderId,
           ProjectId: this.projectId
@@ -250,7 +253,7 @@ export default {
               // }
             });
             this.tableData = res.Content;
-            this.loading = false;
+            this.tableLoading = false;
             resolve();
           });
         });