|
@@ -24,9 +24,10 @@
|
|
|
<ul class="lists">
|
|
|
<el-scrollbar style="height:100%;">
|
|
|
<li @click="openFolder(index,item)" v-for="(item,index) in navigationModel" :key="index"
|
|
|
- :class="[choiceIndex == index + 1 ? 'li-active' : '']">
|
|
|
- <i :class="[choiceIndex == index + 1 ? 'el-icon-folder-opened':'el-icon-folder','icon_font']" width="40" height="40"></i>
|
|
|
- <span :title="item.Name">{{item.Name}}</span>
|
|
|
+ :class="[choiceIndex == index + 1 ? 'li-active' : '']">
|
|
|
+ <i :class="[choiceIndex == index + 1 ? 'el-icon-folder-opened':'el-icon-folder','icon_font']"
|
|
|
+ width="40" height="40"></i>
|
|
|
+ <span :title="item.Name">{{ item.Name }}</span>
|
|
|
</li>
|
|
|
</el-scrollbar>
|
|
|
</ul>
|
|
@@ -43,33 +44,40 @@
|
|
|
<el-button size="small" @click="queryFloorFile(currentFolderId)">刷新</el-button>
|
|
|
</div>
|
|
|
<!-- 列表 -->
|
|
|
- <floorTable v-loading="tableLoading" ref="floorTable" :tableData="tableData" :modelFolderName="currentFolderName" @openModelLog="queryModelLog"
|
|
|
- @replaceModel="repliaceModel" @percentFinish="queryFloorFile(currentFolderId)"
|
|
|
- :persentList="persentList"></floorTable>
|
|
|
+ <floorTable v-loading="tableLoading" ref="floorTable" :tableData="tableData"
|
|
|
+ :modelFolderName="currentFolderName" @openModelLog="queryModelLog"
|
|
|
+ @replaceModel="repliaceModel" @percentFinish="queryFloorFile(currentFolderId)"
|
|
|
+ :persentList="persentList"></floorTable>
|
|
|
</el-card>
|
|
|
</div>
|
|
|
<!-- 弹窗 开始-->
|
|
|
|
|
|
<!-- 模型日志弹窗 -->
|
|
|
- <modelLog :modelLogVisible="modelLogVisible" :modelFolderName="currentFolderName" @deleteFinish="updataLog"
|
|
|
- @CloseModelLogDia="modelLogVisible=false" :logData="logData"></modelLog>
|
|
|
+ <modelLog :modelLogVisible="modelLogVisible" :modelFolderName="currentFolderName"
|
|
|
+ :modelLogFloorName="modelLogFloorName" @deleteFinish="updataLog"
|
|
|
+ @CloseModelLogDia="modelLogVisible=false" :logData="logData"></modelLog>
|
|
|
<!-- 替换模型弹窗 -->
|
|
|
- <repliceModel :repliceModelVisible="repliceModelVisible" @closeReplaceModelDia="repliceModelVisible=false" :replaceModelItem="replaceModelItem"
|
|
|
- @updataModel="updateModelFile"></repliceModel>
|
|
|
+ <repliceModel :repliceModelVisible="repliceModelVisible" @closeReplaceModelDia="repliceModelVisible=false"
|
|
|
+ :replaceModelItem="replaceModelItem"
|
|
|
+ @updataModel="updateModelFile"></repliceModel>
|
|
|
<!-- 新增楼层 -->
|
|
|
- <addFloorDialog :addFloorFileVisible="addFloorFileVisible" :floorList="tableData" :FolderName="currentFolderName" :FolderId="currentFolderId"
|
|
|
- @closeAddFloorDia="addFloorFileVisible=false" @finishCreateFloor="uploadModelFIle"></addFloorDialog>
|
|
|
+ <addFloorDialog :addFloorFileVisible="addFloorFileVisible" :floorList="tableData" :FolderName="currentFolderName"
|
|
|
+ :FolderId="currentFolderId"
|
|
|
+ @closeAddFloorDia="addFloorFileVisible=false" @finishCreateFloor="uploadModelFIle"></addFloorDialog>
|
|
|
<!-- 新增文件夹名称 -->
|
|
|
- <addFolder :addFolderVisible="addFolderVisible" @closeAddFolderVisible="addFolderVisible=false;folderName=''" :folderName="folderName"
|
|
|
- @getfolderModel="queryModel"></addFolder>
|
|
|
+ <addFolder :addFolderVisible="addFolderVisible" @closeAddFolderVisible="addFolderVisible=false;folderName=''"
|
|
|
+ :folderName="folderName"
|
|
|
+ @getfolderModel="queryModel"></addFolder>
|
|
|
<!-- 编辑文件夹名字 -->
|
|
|
- <changeFolderName :currentFolderId="currentFolderId" :changeFolderNameVisible="changeFolderNameVisible" :folderName="folderName"
|
|
|
- @finishChangeFolderName="queryModel" @closeChangeFolderVisible="changeFolderNameVisible=false;folderName=''"></changeFolderName>
|
|
|
+ <changeFolderName :currentFolderId="currentFolderId" :changeFolderNameVisible="changeFolderNameVisible"
|
|
|
+ :folderName="folderName"
|
|
|
+ @finishChangeFolderName="queryModel"
|
|
|
+ @closeChangeFolderVisible="changeFolderNameVisible=false;folderName=''"></changeFolderName>
|
|
|
<!-- 弹窗 结束-->
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
-import { mapGetters } from "vuex";
|
|
|
+import {mapGetters} from "vuex";
|
|
|
import request from "@/api/model/file.js";
|
|
|
import Bus from '@/utils/bus.js'
|
|
|
import dasBoard from "@/views/dasboard/index";
|
|
@@ -94,6 +102,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ modelLogFloorName: '',// 楼层名称
|
|
|
addFolderVisible: false, //是否显示新增文件夹弹窗
|
|
|
addFloorFileVisible: false, //是否显示增加楼层文件弹窗
|
|
|
repliceModelVisible: false, //是否显示替换楼层模型弹窗
|
|
@@ -209,7 +218,7 @@ export default {
|
|
|
* @param currentFolderId 当前选择的文件夹id
|
|
|
*/
|
|
|
queryFloorFile(currentFolderId) {
|
|
|
- if(currentFolderId){
|
|
|
+ if (currentFolderId) {
|
|
|
this.tableData = [];
|
|
|
this.tableLoading = true;
|
|
|
let data = {
|
|
@@ -229,13 +238,13 @@ export default {
|
|
|
* 4: 正常(所有用户可操作:下载、替换、查看历史)
|
|
|
*/
|
|
|
if (item.Status == 2 || item.Status == 20 || item.Status == 21 || item.Status == 3 || item.Status == 31 || item.Status == 4) {
|
|
|
- Object.assign(item, { precent: 0 });
|
|
|
+ Object.assign(item, {precent: 0});
|
|
|
} else {
|
|
|
- Object.assign(item, { precent: 100 });
|
|
|
+ Object.assign(item, {precent: 100});
|
|
|
if (this.persentList.length != 0) {
|
|
|
this.persentList.forEach(pItem => {
|
|
|
if (item.Id == pItem.Id) {
|
|
|
- Object.assign(item, { precent: pItem.precent ? pItem.precent : 0 });
|
|
|
+ Object.assign(item, {precent: pItem.precent ? pItem.precent : 0});
|
|
|
}
|
|
|
});
|
|
|
}
|
|
@@ -268,8 +277,8 @@ export default {
|
|
|
},
|
|
|
// 上传模型文件
|
|
|
uploadModelFIle(data) {
|
|
|
- Bus.$emit('openUploader', {
|
|
|
- uploadId: data.uploadId,
|
|
|
+ Bus.$emit('openUploader', {
|
|
|
+ uploadId: data.uploadId,
|
|
|
modelId: data.modelId,
|
|
|
systemId: 'revit', //系统名称
|
|
|
secret: '63afbef6906c342b', //系统密码
|
|
@@ -309,8 +318,8 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
this.queryFloorFile(this.currentFolderId);
|
|
|
- Bus.$emit('openUploader', {
|
|
|
- uploadId: res.UploadId,
|
|
|
+ Bus.$emit('openUploader', {
|
|
|
+ uploadId: res.UploadId,
|
|
|
modelId: res.ModelId,
|
|
|
systemId: 'revit', //系统名称
|
|
|
secret: '63afbef6906c342b', //系统密码
|
|
@@ -320,6 +329,7 @@ export default {
|
|
|
//查看模型日志
|
|
|
queryModelLog(item) {
|
|
|
this.FloorModelId = item.Id; //楼层模型文件
|
|
|
+ this.modelLogFloorName = item.FloorName
|
|
|
request.queryModelFile(this.FloorModelId, res => {
|
|
|
this.logData = res.Content;
|
|
|
this.modelLogVisible = true;
|
|
@@ -355,24 +365,30 @@ export default {
|
|
|
height: 100%;
|
|
|
display: flex;
|
|
|
overflow: hidden !important;
|
|
|
+
|
|
|
.col_left {
|
|
|
width: 280px;
|
|
|
height: 100%;
|
|
|
}
|
|
|
+
|
|
|
.col_right {
|
|
|
width: calc(100% - 280px);
|
|
|
height: 100%;
|
|
|
}
|
|
|
+
|
|
|
.grid-content {
|
|
|
height: 100%;
|
|
|
}
|
|
|
+
|
|
|
.box-card {
|
|
|
height: 100%;
|
|
|
}
|
|
|
+
|
|
|
.grid-left {
|
|
|
padding-right: 10px;
|
|
|
box-sizing: border-box;
|
|
|
}
|
|
|
+
|
|
|
// 顶部
|
|
|
.top_hand {
|
|
|
// height: 60px;
|
|
@@ -381,19 +397,23 @@ export default {
|
|
|
box-sizing: border-box;
|
|
|
display: flex;
|
|
|
}
|
|
|
+
|
|
|
.left_top_hand {
|
|
|
align-items: center;
|
|
|
justify-content: space-between;
|
|
|
+
|
|
|
.folder-box {
|
|
|
/deep/ .el-button--small {
|
|
|
padding: 10px 11px;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
// 左侧文件夹列表
|
|
|
.folder-list {
|
|
|
width: 100%;
|
|
|
height: calc(100% - 60px);
|
|
|
+
|
|
|
.head {
|
|
|
height: 42px;
|
|
|
width: 100%;
|
|
@@ -405,17 +425,20 @@ export default {
|
|
|
justify-content: left;
|
|
|
align-items: center;
|
|
|
font-weight: bold;
|
|
|
- span{
|
|
|
+
|
|
|
+ span {
|
|
|
font-weight: normal;
|
|
|
font-size: 12px;
|
|
|
color: #606266;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.lists {
|
|
|
width: 100%;
|
|
|
margin-top: 10px;
|
|
|
height: calc(100% - 52px);
|
|
|
overflow-y: auto;
|
|
|
+
|
|
|
li {
|
|
|
height: 42px;
|
|
|
display: flex;
|
|
@@ -425,6 +448,7 @@ export default {
|
|
|
box-sizing: border-box;
|
|
|
color: #555;
|
|
|
cursor: pointer;
|
|
|
+
|
|
|
span {
|
|
|
padding-left: 6px;
|
|
|
overflow: hidden;
|
|
@@ -432,20 +456,24 @@ export default {
|
|
|
white-space: nowrap;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
li:hover {
|
|
|
background-color: #f5f7fa;
|
|
|
color: #000;
|
|
|
}
|
|
|
+
|
|
|
.li-active {
|
|
|
background-color: #f5f7fa;
|
|
|
color: #000;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.icon_font {
|
|
|
font-size: 18px;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
/deep/ .el-scrollbar__wrap {
|
|
|
overflow-x: hidden;
|
|
|
}
|