|
@@ -7,15 +7,13 @@
|
|
<div class="top_hand left_top_hand">
|
|
<div class="top_hand left_top_hand">
|
|
<div class="folder-box">
|
|
<div class="folder-box">
|
|
<el-tooltip class="item" effect="dark" content="新建文件夹" placement="top-start">
|
|
<el-tooltip class="item" effect="dark" content="新建文件夹" placement="top-start">
|
|
- <el-button icon="el-icon-folder-add" @click="addFolder" class="icon_font"></el-button>
|
|
|
|
|
|
+ <el-button icon="el-icon-plus" size="small" @click="addFolder"></el-button>
|
|
</el-tooltip>
|
|
</el-tooltip>
|
|
<el-tooltip class="item" effect="dark" content="删除文件夹" placement="top-start">
|
|
<el-tooltip class="item" effect="dark" content="删除文件夹" placement="top-start">
|
|
- <el-button icon="el-icon-folder-remove" class="icon_font" @click="removeFolder"></el-button>
|
|
|
|
|
|
+ <el-button icon="el-icon-minus" size="small" @click="removeFolder"></el-button>
|
|
</el-tooltip>
|
|
</el-tooltip>
|
|
- </div>
|
|
|
|
- <div class="file-box">
|
|
|
|
<el-tooltip class="item" effect="dark" content="编辑文件夹" placement="top-start">
|
|
<el-tooltip class="item" effect="dark" content="编辑文件夹" placement="top-start">
|
|
- <el-button @click="editFolder" icon="el-icon-edit" class="icon_font"></el-button>
|
|
|
|
|
|
+ <el-button @click="editFolder" icon="el-icon-edit-outline" size="small"></el-button>
|
|
</el-tooltip>
|
|
</el-tooltip>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -41,11 +39,11 @@
|
|
<el-card class="box-card" :body-style="{ padding: '0px', height:'100%' }">
|
|
<el-card class="box-card" :body-style="{ padding: '0px', height:'100%' }">
|
|
<!-- 顶部操作栏 -->
|
|
<!-- 顶部操作栏 -->
|
|
<div class="top_hand right_top_hand">
|
|
<div class="top_hand right_top_hand">
|
|
- <el-button @click="addFloorFile">添加楼层文件</el-button>
|
|
|
|
- <el-button @click="queryFloorFile(currentFolderId)">刷新</el-button>
|
|
|
|
|
|
+ <el-button size="small" @click="addFloorFile">添加楼层文件</el-button>
|
|
|
|
+ <el-button size="small" @click="queryFloorFile(currentFolderId)">刷新</el-button>
|
|
</div>
|
|
</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)"
|
|
@replaceModel="repliaceModel" @percentFinish="queryFloorFile(currentFolderId)"
|
|
:persentList="persentList"></floorTable>
|
|
:persentList="persentList"></floorTable>
|
|
</el-card>
|
|
</el-card>
|
|
@@ -102,17 +100,14 @@ export default {
|
|
modelLogVisible: false, //是否显示模型日志弹窗
|
|
modelLogVisible: false, //是否显示模型日志弹窗
|
|
changeFolderNameVisible: false, //是否显示编辑文件夹弹窗
|
|
changeFolderNameVisible: false, //是否显示编辑文件夹弹窗
|
|
folderName: "", //新建文件夹名称
|
|
folderName: "", //新建文件夹名称
|
|
- navigationModel: [
|
|
|
|
- {
|
|
|
|
- Name: ""
|
|
|
|
- }
|
|
|
|
- ], //文件夹模型list
|
|
|
|
|
|
+ navigationModel: [], //文件夹模型list
|
|
choiceIndex: 0, //当前文件夹index
|
|
choiceIndex: 0, //当前文件夹index
|
|
currentFolderId: "", //当前选择的文件夹id
|
|
currentFolderId: "", //当前选择的文件夹id
|
|
currentFolderName: "", //当前选择文件夹的Name
|
|
currentFolderName: "", //当前选择文件夹的Name
|
|
currentFloorModelId: "", //当前选择的楼层文件id
|
|
currentFloorModelId: "", //当前选择的楼层文件id
|
|
tableData: [],
|
|
tableData: [],
|
|
loading: false, //加载loading
|
|
loading: false, //加载loading
|
|
|
|
+ tableLoading: false, //表格加载loading
|
|
logData: [], //楼层文件对应的模型日志
|
|
logData: [], //楼层文件对应的模型日志
|
|
replaceModelItem: null, //替换文件的item
|
|
replaceModelItem: null, //替换文件的item
|
|
uploadFloorModelIdList: [], //上传楼层文件得数组,上传完成则为空
|
|
uploadFloorModelIdList: [], //上传楼层文件得数组,上传完成则为空
|
|
@@ -190,6 +185,7 @@ export default {
|
|
},
|
|
},
|
|
// 查询所有文件夹模型
|
|
// 查询所有文件夹模型
|
|
queryModel() {
|
|
queryModel() {
|
|
|
|
+ this.navigationModel = [];
|
|
this.loading = true;
|
|
this.loading = true;
|
|
request.queryModel("", res => {
|
|
request.queryModel("", res => {
|
|
this.navigationModel = res.Content;
|
|
this.navigationModel = res.Content;
|
|
@@ -214,6 +210,8 @@ export default {
|
|
*/
|
|
*/
|
|
queryFloorFile(currentFolderId) {
|
|
queryFloorFile(currentFolderId) {
|
|
if(currentFolderId){
|
|
if(currentFolderId){
|
|
|
|
+ this.tableData = [];
|
|
|
|
+ this.tableLoading = true;
|
|
let data = {
|
|
let data = {
|
|
FolderId: currentFolderId,
|
|
FolderId: currentFolderId,
|
|
ProjectId: this.projectId
|
|
ProjectId: this.projectId
|
|
@@ -250,7 +248,7 @@ export default {
|
|
// }
|
|
// }
|
|
});
|
|
});
|
|
this.tableData = res.Content;
|
|
this.tableData = res.Content;
|
|
- this.loading = false;
|
|
|
|
|
|
+ this.tableLoading = false;
|
|
resolve();
|
|
resolve();
|
|
});
|
|
});
|
|
});
|
|
});
|
|
@@ -376,7 +374,7 @@ export default {
|
|
}
|
|
}
|
|
// 顶部
|
|
// 顶部
|
|
.top_hand {
|
|
.top_hand {
|
|
- height: 60px;
|
|
|
|
|
|
+ // height: 60px;
|
|
width: 100%;
|
|
width: 100%;
|
|
padding: 10px;
|
|
padding: 10px;
|
|
box-sizing: border-box;
|
|
box-sizing: border-box;
|
|
@@ -386,18 +384,9 @@ export default {
|
|
align-items: center;
|
|
align-items: center;
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
.folder-box {
|
|
.folder-box {
|
|
- display: flex;
|
|
|
|
- height: 40px;
|
|
|
|
- flex-direction: row;
|
|
|
|
- }
|
|
|
|
- .box-icon {
|
|
|
|
- width: 40px;
|
|
|
|
- height: 40px;
|
|
|
|
- font-size: 30px;
|
|
|
|
- display: flex;
|
|
|
|
- justify-content: center;
|
|
|
|
- align-items: center;
|
|
|
|
- float: left;
|
|
|
|
|
|
+ /deep/ .el-button--small {
|
|
|
|
+ padding: 10px 11px;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// 左侧文件夹列表
|
|
// 左侧文件夹列表
|