|
@@ -5,8 +5,8 @@
|
|
|
*/
|
|
|
import httputils from '@/api/scan/httpUtil'
|
|
|
import { Message } from 'element-ui';
|
|
|
-const baseUrl = '/modelapi'
|
|
|
-
|
|
|
+const baseUrl = '/modelapi';
|
|
|
+import axios from 'axios'
|
|
|
let api = {
|
|
|
// 新建模型文件夹
|
|
|
/**
|
|
@@ -15,16 +15,16 @@ let api = {
|
|
|
*/
|
|
|
createModel(params, success) {
|
|
|
let Name = params.Name;
|
|
|
- this.queryModel(Name,(res)=>{
|
|
|
- if(res.Total == 0){
|
|
|
+ this.queryModel(Name, (res) => {
|
|
|
+ if (res.Total == 0) {
|
|
|
let data = {
|
|
|
Content: [params]
|
|
|
};
|
|
|
// 查询是否有该模型文件夹
|
|
|
// 创建
|
|
|
httputils.postJson(`${baseUrl}/model-folder/create`, data, success)
|
|
|
- }else{
|
|
|
- Message.error({message:'该文件夹已经存在!'});
|
|
|
+ } else {
|
|
|
+ Message.error({ message: '该文件夹已经存在!' });
|
|
|
}
|
|
|
})
|
|
|
},
|
|
@@ -44,15 +44,15 @@ let api = {
|
|
|
*/
|
|
|
updateModelName(params, success) {
|
|
|
let Name = params.Name;
|
|
|
- this.queryModel(Name,(res)=>{
|
|
|
- if(res.Total == 0){
|
|
|
+ this.queryModel(Name, (res) => {
|
|
|
+ if (res.Total == 0) {
|
|
|
let data = {
|
|
|
Content: [params]
|
|
|
};
|
|
|
// 更改文件夹名称
|
|
|
httputils.postJson(`${baseUrl}/model-folder/update`, data, success)
|
|
|
- }else{
|
|
|
- Message.error({message:'该文件夹已经存在!'});
|
|
|
+ } else {
|
|
|
+ Message.error({ message: '该文件夹已经存在!' });
|
|
|
}
|
|
|
})
|
|
|
},
|
|
@@ -79,10 +79,22 @@ let api = {
|
|
|
//以下是楼层文件接口
|
|
|
|
|
|
// 查询模型文件夹下的所有模型文件
|
|
|
- queryFloor(data, success) {
|
|
|
- let Filters = `FolderId='${data.folderId}'`;
|
|
|
- if(data.FloorName){
|
|
|
- Filters = `FolderId='${data.folderId}';FloorName='${data.FloorName}';ProjectId='${data.ProjectId}'`;
|
|
|
+ queryFloorList(data, success) {
|
|
|
+
|
|
|
+ let Filters = `FolderId='${data.FolderId}'`;
|
|
|
+ if (data.FloorName) {
|
|
|
+ Filters = `FolderId='${data.FolderId}';FloorName='${data.FloorName}';ProjectId='${data.ProjectId}'`;
|
|
|
+ }
|
|
|
+ let params = {
|
|
|
+ Filters: Filters
|
|
|
+ }
|
|
|
+ return httputils.postJson(`${baseUrl}/model-floor/query-list`, params, success)
|
|
|
+ },
|
|
|
+ queryFloorItem(data, success) {
|
|
|
+
|
|
|
+ let Filters = `FolderId='${data.FolderId}'`;
|
|
|
+ if (data.FloorName) {
|
|
|
+ Filters = `FolderId='${data.FolderId}';FloorName='${data.FloorName}';ProjectId='${data.ProjectId}'`;
|
|
|
}
|
|
|
let params = {
|
|
|
Filters: Filters
|
|
@@ -90,34 +102,57 @@ let api = {
|
|
|
return httputils.postJson(`${baseUrl}/model-floor/query`, params, success)
|
|
|
},
|
|
|
// 创建楼层文件
|
|
|
- createFloor(params, success) {
|
|
|
+ createFloor(params) {
|
|
|
// 判断该楼层文件是否存在
|
|
|
- // let Name = params.Name;
|
|
|
- let data = {
|
|
|
- Content: [params]
|
|
|
- };
|
|
|
- this.queryFloor(params,(res)=>{
|
|
|
- if(res.Total == 0){
|
|
|
- // let data = {
|
|
|
- // Content: [params]
|
|
|
- // };
|
|
|
- let modelFile = {
|
|
|
- Content:{
|
|
|
- ProjectId:params.ProjectId,
|
|
|
- FolderId:params.folderId,
|
|
|
- FloorName:params.FloorName
|
|
|
- }
|
|
|
+
|
|
|
+ let data = {
|
|
|
+ Content: [{
|
|
|
+ FolderId: params.FolderId,
|
|
|
+ FloorName: params.FloorName,
|
|
|
+ ProjectId: params.ProjectId, //项目id
|
|
|
+ }]
|
|
|
+ };
|
|
|
+ return new Promise((resolve, preject) => {
|
|
|
+ this.queryFloorItem(params, (res) => {
|
|
|
+ if (res.Total == 0) {
|
|
|
+ // 创建楼层文件
|
|
|
+ httputils.postJson(`${baseUrl}/model-floor/create`, data, (res) => {
|
|
|
+ let modelFile = {
|
|
|
+ Content: [{
|
|
|
+ // ProjectId: params.ProjectId, //项目id
|
|
|
+ FloorModelId: res.EntityList[0].Id, //模型id
|
|
|
+ ModelName: params.Form.file.name, //模型名字
|
|
|
+ UserName: '123',
|
|
|
+ Note: params.Form.desc,
|
|
|
+ ReplaceReason: 0
|
|
|
+ }]
|
|
|
+ }
|
|
|
+ //创建模型文件
|
|
|
+ this.createModelFile(modelFile, (createModelRes) => {
|
|
|
+ // 与此楼文件进行绑定
|
|
|
+ let upDateModelData = {
|
|
|
+ Content: [{
|
|
|
+ Id: res.EntityList[0].Id, //楼层
|
|
|
+ CurrentModelId: createModelRes.EntityList[0].Id
|
|
|
+ }]
|
|
|
+ }
|
|
|
+ this.upDateModelFile(upDateModelData, (upDateModelSucess) => {
|
|
|
+ if (upDateModelSucess.Result == "success") {
|
|
|
+ resolve({
|
|
|
+ Result: 'success',
|
|
|
+ FloorModelId: res.EntityList[0].Id, //楼层模型文件
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
+
|
|
|
+ })
|
|
|
+
|
|
|
+
|
|
|
+ } else {
|
|
|
+ Message.error({ message: '该楼层文件已经存在,请选择其他楼层!' });
|
|
|
}
|
|
|
- // 创建模型文件
|
|
|
- this.createModelFile(modelFile,(res)=>{
|
|
|
- // 创建楼层文件(传入模型文件id)
|
|
|
- console.log('/创建楼层文件(传入模型文件id)',res)
|
|
|
- // httputils.postJson(`${baseUrl}/model-floor/create`, data, success)
|
|
|
- })
|
|
|
-
|
|
|
- }else{
|
|
|
- Message.error({message:'该楼层文件已经存在,请选择其他楼层!'});
|
|
|
- }
|
|
|
+ })
|
|
|
})
|
|
|
},
|
|
|
// 删除楼层文件
|
|
@@ -133,28 +168,66 @@ let api = {
|
|
|
//一下是楼层文件接口
|
|
|
|
|
|
// 创建楼层文件
|
|
|
- createModelFile(data,success) {
|
|
|
- return httputils.postJson(`${baseUrl}/model-floor/create`, data,success)
|
|
|
+ createModelFile(data, success) {
|
|
|
+ return httputils.postJson(`${baseUrl}/model-file/create`, data, success)
|
|
|
},
|
|
|
//删除模型文件
|
|
|
- deleteModelFile(data) {
|
|
|
- return httputils.postJson(`${baseUrl}/model-file/delete`, data)
|
|
|
- },
|
|
|
- // 上传模型文件
|
|
|
- uploadModelFile(data) {
|
|
|
- return httputils.postJson(`${baseUrl}/model-file/upload`, data)
|
|
|
- },
|
|
|
- //更新楼层文件
|
|
|
- upDateModelFile() {
|
|
|
- return httputils.postJson(`${baseUrl}/model-floor/update`, data)
|
|
|
+ deleteModelFile(data, success) {
|
|
|
+ return httputils.postJson(`${baseUrl}/model-file/delete`, data, success)
|
|
|
},
|
|
|
//查询模型文件
|
|
|
- queryModelFile(FloorModelId,success) {
|
|
|
+ queryModelFile(FloorModelId, success) {
|
|
|
let params = {
|
|
|
- Distince:true,
|
|
|
- Filters : `FloorModelId='${FloorModelId}'`
|
|
|
+ Distince: true,
|
|
|
+ Filters: `FloorModelId='${FloorModelId}'`
|
|
|
}
|
|
|
- return httputils.postJson(`${baseUrl}/model-floor/query`, params,success)
|
|
|
+ return httputils.postJson(`${baseUrl}/model-file/query`, params, success)
|
|
|
+ },
|
|
|
+ // 上传模型文件
|
|
|
+ uploadModelFile(payload, ProjectId, callback1, callback2) {
|
|
|
+ axios({
|
|
|
+ url: baseUrl + '/model-file/upload',
|
|
|
+ method: 'post',
|
|
|
+ headers: {
|
|
|
+ ProjectId: ProjectId
|
|
|
+ },
|
|
|
+ onUploadProgress: function (progressEvent) { //原生获取上传进度的事件
|
|
|
+ if (progressEvent.lengthComputable) {
|
|
|
+ //属性lengthComputable主要表明总共需要完成的工作量和已经完成的工作是否可以被测量
|
|
|
+ //如果lengthComputable为false,就获取不到progressEvent.total和progressEvent.loaded
|
|
|
+ callback1(progressEvent);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ data: payload
|
|
|
+ }).then(res => {
|
|
|
+ callback2(res);
|
|
|
+ }).then(error => {
|
|
|
+ console.log('this is a catch')
|
|
|
+ console.log(error)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 更新模型文件
|
|
|
+ upDateModelFile(payload, ProjectId, callback1, callback2) {
|
|
|
+ axios({
|
|
|
+ url: baseUrl + '/model-floor/update',
|
|
|
+ method: 'post',
|
|
|
+ headers: {
|
|
|
+ ProjectId: ProjectId
|
|
|
+ },
|
|
|
+ onUploadProgress: function (progressEvent) { //原生获取上传进度的事件
|
|
|
+ if (progressEvent.lengthComputable) {
|
|
|
+ //属性lengthComputable主要表明总共需要完成的工作量和已经完成的工作是否可以被测量
|
|
|
+ //如果lengthComputable为false,就获取不到progressEvent.total和progressEvent.loaded
|
|
|
+ callback1(progressEvent);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ data: payload
|
|
|
+ }).then(res => {
|
|
|
+ callback2(res);
|
|
|
+ }).then(error => {
|
|
|
+ console.log('this is a catch')
|
|
|
+ console.log(error)
|
|
|
+ })
|
|
|
}
|
|
|
|
|
|
}
|