Browse Source

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

haojianlong 4 years ago
parent
commit
e8e4008429

+ 299 - 297
src/api/model/file.js

@@ -1,345 +1,347 @@
 import httputils from '@/api/scan/httpUtil'
 import httputils from '@/api/scan/httpUtil'
 import { Message } from 'element-ui';
 import { Message } from 'element-ui';
 import axios from 'axios'
 import axios from 'axios'
-
 const baseUrl = '/modelapi';
 const baseUrl = '/modelapi';
 const revitUrl = '/schedulerapi';
 const revitUrl = '/schedulerapi';
 
 
 let api = {
 let api = {
-  // 新建模型文件夹
-  /**
-   *
-   * @param {Name:string,ProjectId:string} params
-   */
-  createModel(params, success) {
-    let name = params.name;
-    this.queryModel(name, (res) => {
-      if (res.total == 0) {
-        let data = {
-          content: [params]
-        };
-        // 查询是否有该模型文件夹
-        // 创建
-        httputils.postJson(`${baseUrl}/model-folder/create`, data, success)
-      } else {
-        Message.error({ message: '该文件夹已经存在!' });
-      }
-    })
-  },
-  //删除模型文件夹
-  /**
-   *
-   * @param {Id:string} params
-   */
-  deleteModel(params, success) {
-    let content = [params];
-    httputils.postJson(`${baseUrl}/model-folder/delete`, content, success)
-  },
-  //修改模型文件夹名称
-  /**
-   *
-   * @param {Name:string,ProjectId:string} params
-   */
-  updateModelName(params, success) {
-    let name = params.name;
-    this.queryModel(name, (res) => {
-      if (res.total == 0) {
-        let data = {
-          content: [params]
-        };
-        // 更改文件夹名称
-        httputils.postJson(`${baseUrl}/model-folder/update`, data, success)
-      } else {
-        Message.error({ message: '该文件夹已经存在!' });
-      }
-    })
-  },
-  //查询模型文件夹
-  /**
-   * @param Name string  注:查询多个 Name = ''
-   */
-  queryModel(Name, success) {
-    let data = null;
-    if (Name) {
-      // 单个查询
-      data = {
-        filters: `name='${Name}'`,
-        orders: "name asc"
-      }
-    } else {
-      // 多个查询
-      data = {
-        orders: "name asc"
-      }
-    }
-    return httputils.postJson(`${baseUrl}/model-folder/query`, data, success)
-  },
+    // 新建模型文件夹
+    /**
+     *
+     * @param {Name:string,ProjectId:string} params
+     */
+    createModel(params, success) {
+        let Name = params.Name;
+        this.queryModel(Name, (res) => {
+            if (res.Total == 0) {
+                let data = {
+                    Content: [params]
+                };
+                // 查询是否有该模型文件夹
+                // 创建
+                httputils.postJson(`${baseUrl}/model-folder/create`, data, success)
+            } else {
+                Message.error({ message: '该文件夹已经存在!' });
+            }
+        })
+    },
+    //删除模型文件夹
+    /**
+     *
+     * @param {Id:string} params
+     */
+    deleteModel(params, success) {
+        let Content = [params];
+        httputils.postJson(`${baseUrl}/model-folder/delete`, Content, success)
+    },
+    //修改模型文件夹名称
+    /**
+    *
+    * @param {Name:string,ProjectId:string} params
+    */
+    updateModelName(params, success) {
+        let Name = params.Name;
+        this.queryModel(Name, (res) => {
+            if (res.Total == 0) {
+                let data = {
+                    Content: [params]
+                };
+                // 更改文件夹名称
+                httputils.postJson(`${baseUrl}/model-folder/update`, data, success)
+            } else {
+                Message.error({ message: '该文件夹已经存在!' });
+            }
+        })
+    },
+    //查询模型文件夹
+    /**
+     * @param Name string  注:查询多个 Name = ''
+    */
+    queryModel(Name, success) {
+        let data = null;
+        if (Name) {
+            // 单个查询
+            data = {
+                Filters: `Name='${Name}'`,
+                Orders: "Name asc"
+            }
+        } else {
+            // 多个查询
+            data = {
+                Orders: "Name asc"
+            }
+        }
+        return httputils.postJson(`${baseUrl}/model-folder/query`, data, success)
+    },
 
 
 
 
-  //以下是楼层文件接口
 
 
-  // 查询模型文件夹下的所有模型文件
-  queryFloorList(data, success) {
-    let filters = `folderId='${data.folderId}'`;
-    if (data.floorName) {
-      filters = `folderId='${data.folderId}';floorName='${data.floorName}';projectId='${data.projectId}'`;
-    }
-    if (data.status) {
-      filters += `;status in [${data.status}]`
-    }
-    let params = {
-      filters: filters,
-      pageNumber: 1,
-      pageSize: 500
-    }
-    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
-    }
-    return httputils.postJson(`${baseUrl}/model-floor/query`, params, success)
-  },
-  // 创建楼层
-  // createFloor(params) {
-  //     // 判断该楼层是否存在
+    //以下是楼层文件接口
 
 
-  //     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, //模型所属楼层(FloorModel外键)
-  //                             ModelName: params.Form.file.name,        //模型文件名
-  //                             UserName: params.userName,
-  //                             UserId: params.userId,
-  //                             Note: params.Form.desc
-  //                             // ReplaceReason: 0
-  //                         }]
-  //                     }
-  //                     //创建模型文件
-  //                     this.createModelFile(modelFile, (createModelRes) => {
-  //                         // 与此楼文件进行绑定
-  //                         let upDateModelData = {
-  //                             Content: [{
-  //                                 Id: res.EntityList[0].Id, //id
-  //                                 CurrentModelId: createModelRes.EntityList[0].Id //该楼层当前的模型id
-  //                             }]
-  //                         }
-  //                         this.updateFloorName(upDateModelData, (upDateModelSucess) => {
-  //                             if (upDateModelSucess.Result == "success") {
-  //                                 resolve({
-  //                                     Result: 'success',
-  //                                     FloorModelId: res.EntityList[0].Id,   //楼层模型文件
-  //                                     CurrentModelId: createModelRes.EntityList[0].Id //模型文件id
-  //                                 })
-  //                             }
-  //                         })
-  //                     })
-  //                 })
-  //             } else {
-  //                 let modelFile = {
-  //                     Content: [{
-  //                         // ProjectId: params.ProjectId,      //项目id
-  //                         FloorModelId: res.Content[0].Id, //模型所属楼层(FloorModel外键)
-  //                         ModelName: params.Form.file.name,        //模型文件名
-  //                         UserName: params.userName,
-  //                         UserId: params.userId,
-  //                         Note: params.Form.desc
-  //                         // ReplaceReason: 0
-  //                     }]
-  //                 }
-  //                 //创建模型文件
-  //                 this.createModelFile(modelFile, (createModelRes) => {
-  //                     // 与此楼文件进行绑定
-  //                     let upDateModelData = {
-  //                         Content: [{
-  //                             Id: res.Content[0].Id, //id
-  //                             CurrentModelId: createModelRes.EntityList[0].Id //该楼层当前的模型id
-  //                         }]
-  //                     }
-  //                     this.updateFloorName(upDateModelData, (upDateModelSucess) => {
-  //                         if (upDateModelSucess.Result == "success") {
-  //                             resolve({
-  //                                 Result: 'success',
-  //                                 FloorModelId: res.Content[0].Id,   //楼层模型文件
-  //                                 CurrentModelId: createModelRes.EntityList[0].Id //模型文件id
-  //                             })
-  //                         }
-  //                     })
-  //                 })
-  //             }
-  //         })
-  //     })
-  // },
-  // 删除楼层文件
-  deleteFloor(data) {
-    return httputils.postJson(`${baseUrl}/model-floor/delete`, data)
-  },
-  //编辑楼层文件的名字
-  updateFloorName(data, success) {
-    return httputils.postJson(`${baseUrl}/model-floor/update`, data, success)
-  },
+    // 查询模型文件夹下的所有模型文件
+    queryFloorList(data, success) {
 
 
+        let Filters = `FolderId='${data.FolderId}'`;
+        if (data.FloorName) {
+            Filters = `FolderId='${data.FolderId}';FloorName='${data.FloorName}';ProjectId='${data.ProjectId}'`;
+        }
+        if (data.Status) {
+            Filters += `;Status in [${data.Status}]`
+        }
+        let params = {
+            Filters: Filters,
+            PageNumber: 1,
+            PageSize: 500
+        }
+        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
+        }
+        return httputils.postJson(`${baseUrl}/model-floor/query`, params, success)
+    },
+    // 创建楼层
+    // createFloor(params) {
+    //     // 判断该楼层是否存在
+
+    //     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, //模型所属楼层(FloorModel外键)
+    //                             ModelName: params.Form.file.name,        //模型文件名
+    //                             UserName: params.userName,
+    //                             UserId: params.userId,
+    //                             Note: params.Form.desc
+    //                             // ReplaceReason: 0
+    //                         }]
+    //                     }
+    //                     //创建模型文件
+    //                     this.createModelFile(modelFile, (createModelRes) => {
+    //                         // 与此楼文件进行绑定
+    //                         let upDateModelData = {
+    //                             Content: [{
+    //                                 Id: res.EntityList[0].Id, //id
+    //                                 CurrentModelId: createModelRes.EntityList[0].Id //该楼层当前的模型id
+    //                             }]
+    //                         }
+    //                         this.updateFloorName(upDateModelData, (upDateModelSucess) => {
+    //                             if (upDateModelSucess.Result == "success") {
+    //                                 resolve({
+    //                                     Result: 'success',
+    //                                     FloorModelId: res.EntityList[0].Id,   //楼层模型文件
+    //                                     CurrentModelId: createModelRes.EntityList[0].Id //模型文件id
+    //                                 })
+    //                             }
+    //                         })
+    //                     })
+    //                 })
+    //             } else {
+    //                 let modelFile = {
+    //                     Content: [{
+    //                         // ProjectId: params.ProjectId,      //项目id
+    //                         FloorModelId: res.Content[0].Id, //模型所属楼层(FloorModel外键)
+    //                         ModelName: params.Form.file.name,        //模型文件名
+    //                         UserName: params.userName,
+    //                         UserId: params.userId,
+    //                         Note: params.Form.desc
+    //                         // ReplaceReason: 0
+    //                     }]
+    //                 }
+    //                 //创建模型文件
+    //                 this.createModelFile(modelFile, (createModelRes) => {
+    //                     // 与此楼文件进行绑定
+    //                     let upDateModelData = {
+    //                         Content: [{
+    //                             Id: res.Content[0].Id, //id
+    //                             CurrentModelId: createModelRes.EntityList[0].Id //该楼层当前的模型id
+    //                         }]
+    //                     }
+    //                     this.updateFloorName(upDateModelData, (upDateModelSucess) => {
+    //                         if (upDateModelSucess.Result == "success") {
+    //                             resolve({
+    //                                 Result: 'success',
+    //                                 FloorModelId: res.Content[0].Id,   //楼层模型文件
+    //                                 CurrentModelId: createModelRes.EntityList[0].Id //模型文件id
+    //                             })
+    //                         }
+    //                     })
+    //                 })
+    //             }
+    //         })
+    //     })
+    // },
+    // 删除楼层文件
+    deleteFloor(data) {
+        return httputils.postJson(`${baseUrl}/model-floor/delete`, data)
+    },
+    //编辑楼层文件的名字
+    updateFloorName(data, success) {
+        return httputils.postJson(`${baseUrl}/model-floor/update`, data, success)
+    },
 
 
-  // 创建模型文件
-  createModelFile(data, success) {
-    return httputils.postJson(`${baseUrl}/model-file/create`, data, success)
-  },
-  //删除模型文件(只有记录,文件不动)
-  deleteModelFile(data, success) {
-    return httputils.postJson(`${baseUrl}/model-file/delete`, data, success)
-  },
-  /**
-   * info: 删除模型文件
-   * @param {*} params string 模型文件的id
-   * @param {*} success  成功的回调函数
-   */
-  deleteModelFileList(params, success) {
-    let data = {
-      id: params.Id,
-      force: params.Force ? params.Force : false
-    }
-    return httputils.postJson(`${baseUrl}/model-file/delete-file`, data, success)
-  },
-  //查询模型文件
-  queryModelFile(FloorModelId, success) {
-    let params = {
-      distince: true,
-      filters: `floorModelId='${FloorModelId}';removed=false`
-    }
-    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);
-  //     }).catch(error => {
-  //         console.log('this is a catch')
-  //         console.log(error)
-  //     })
-  // },
 
 
-  //准备分片上传模型文件接口
-  modelFileUpload(data, success) {
-    return httputils.postJson(`${baseUrl}/model-file/upload`, data, success)
-  },
+    //以下是楼层文件接口
 
 
-  mergeModelFile(data, success) {
-    return httputils.postJson(`${baseUrl}/model-file/merge`, data, success)
-  }
+    // 创建模型文件
+    createModelFile(data, success) {
+        return httputils.postJson(`${baseUrl}/model-file/create`, data, success)
+    },
+    //删除模型文件(只有记录,文件不动)
+    deleteModelFile(data, success) {
+        return httputils.postJson(`${baseUrl}/model-file/delete`, data, success)
+    },
+    /**
+     * info: 删除模型文件
+     * @param {*} params string 模型文件的id
+     * @param {*} success  成功的回调函数
+     */
+    deleteModelFileList(params, success) {
+        let data = {
+            Id:params.Id,
+            Force: params.Force?params.Force:false
+        }
+        return httputils.postJson(`${baseUrl}/model-file/delete-file`, data, success)
+    },
+    //查询模型文件
+    queryModelFile(FloorModelId, success) {
+        let params = {
+            Distince: true,
+            Filters: `FloorModelId='${FloorModelId}';Removed=false`
+        }
+        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);
+    //     }).catch(error => {
+    //         console.log('this is a catch')
+    //         console.log(error)
+    //     })
+    // },
+
+    //准备分片上传模型文件接口
+    modelFileUpload(data, success) {
+        return httputils.postJson(`${baseUrl}/model-file/upload`, data, success)
+    },
+
+    mergeModelFile(data, success) {
+        return httputils.postJson(`${baseUrl}/model-file/merge`, data, success)
+    }
 
 
-  // 更新模型文件
-  // upDateModelFile(data, ProjectId, UserName, UserId, callback1, callback2) {
-  //     let modelFile = {
-  //         Content: [{
-  //             FloorModelId:data.replaceModelItem.Id, //模型id
-  //             ModelName: data.Form.file.name,        //模型名字
-  //             UserName: UserName,
-  //             UserId: UserId,
-  //             Note: data.replaceModelItem.Note,
-  //             ReplaceReason: data.Form.ReplaceReason
-  //         }]
-  //     }
-  //     // //创建模型文件
-  //     this.createModelFile(modelFile, (createModelRes) => {
-  //         // 与此楼文件进行绑定
-  //         let upDateModelData = {
-  //             Content: [{
-  //                 Id:data.replaceModelItem.Id, //楼层
-  //                 CurrentModelId: createModelRes.EntityList[0].Id
-  //             }]
-  //         }
-  //         this.updateFloorName(upDateModelData, (upDateModelSucess) => {
-  //             if (upDateModelSucess.Result == "success") {
-  //                 // 处理数据
-  //                 let formData = new FormData();
-  //                 formData.append(
-  //                   "model",
-  //                   JSON.stringify({
-  //                     FloorModelId: data.replaceModelItem.Id,
-  //                     Id:createModelRes.EntityList[0].Id
-  //                   })
-  //                 );
-  //                 formData.append("file", data.Form.file.raw);
-  //                 this.uploadModelFile(formData,ProjectId,callback1,callback2)
-  //             }
-  //         })
-  //     })
-  // }
+    // 更新模型文件
+    // upDateModelFile(data, ProjectId, UserName, UserId, callback1, callback2) {
+    //     let modelFile = {
+    //         Content: [{
+    //             FloorModelId:data.replaceModelItem.Id, //模型id
+    //             ModelName: data.Form.file.name,        //模型名字
+    //             UserName: UserName,
+    //             UserId: UserId,
+    //             Note: data.replaceModelItem.Note,
+    //             ReplaceReason: data.Form.ReplaceReason
+    //         }]
+    //     }
+    //     // //创建模型文件
+    //     this.createModelFile(modelFile, (createModelRes) => {
+    //         // 与此楼文件进行绑定
+    //         let upDateModelData = {
+    //             Content: [{
+    //                 Id:data.replaceModelItem.Id, //楼层
+    //                 CurrentModelId: createModelRes.EntityList[0].Id
+    //             }]
+    //         }
+    //         this.updateFloorName(upDateModelData, (upDateModelSucess) => {
+    //             if (upDateModelSucess.Result == "success") {
+    //                 // 处理数据
+    //                 let formData = new FormData();
+    //                 formData.append(
+    //                   "model",
+    //                   JSON.stringify({
+    //                     FloorModelId: data.replaceModelItem.Id,
+    //                     Id:createModelRes.EntityList[0].Id
+    //                   })
+    //                 );
+    //                 formData.append("file", data.Form.file.raw);
+    //                 this.uploadModelFile(formData,ProjectId,callback1,callback2)
+    //             }
+    //         })
+    //     })
+    // }
 
 
 }
 }
 export default api
 export default api
 
 
 //楼层与平面图绑定
 //楼层与平面图绑定
 export function bindFloorModel(param, success) {
 export function bindFloorModel(param, success) {
-  let url = `${baseUrl}/model-floor/bind`;
-  httputils.postJson(url, param, success)
+    let url = `${baseUrl}/model-floor/bind`;
+    httputils.postJson(url, param, success)
 }
 }
 
 
 //根据模型id 获取模型文件夹及文件名
 //根据模型id 获取模型文件夹及文件名
 export function getFileNameById(param, success) {
 export function getFileNameById(param, success) {
-  let url = `${baseUrl}/model-folder/get-name`;
-  httputils.postJson(url, param, success)
+    let url = `${baseUrl}/model-folder/get-name`;
+    httputils.postJson(url, param, success)
 }
 }
 
 
 // 根据条件查询统计数量
 // 根据条件查询统计数量
 export function countSyncLogCount(param, success) {
 export function countSyncLogCount(param, success) {
-  let url = `${baseUrl}/sync-log/count`;
-  httputils.postJson(url, param, success)
+    let url = `${baseUrl}/sync-log/count`;
+    httputils.postJson(url, param, success)
 }
 }
 
 
 // 查询同步日志
 // 查询同步日志
 export function querySyncLogCount(param, success) {
 export function querySyncLogCount(param, success) {
-  let url = `${baseUrl}/sync-log/query`;
-  httputils.postJson(url, param, success)
+    let url = `${baseUrl}/sync-log/query`;
+    httputils.postJson(url, param, success)
 }
 }
 
 
 // 查询模型文件
 // 查询模型文件
 export function queryFileByModelId(param, success) {
 export function queryFileByModelId(param, success) {
-  let url = `${baseUrl}/model-file/query`;
-  httputils.postJson(url, param, success)
+    let url = `${baseUrl}/model-file/query`;
+    httputils.postJson(url, param, success)
 }
 }
 
 
 // 模型流程监控
 // 模型流程监控
 export function modelPathControl(param, success) {
 export function modelPathControl(param, success) {
-  let url = `${baseUrl}/model-monitor/query`;
-  httputils.postJson(url, param, success)
+    let url = `${baseUrl}/model-monitor/query`;
+    httputils.postJson(url, param, success)
 }
 }
 
 
 // 模型流程监控-获取待分配模型数量
 // 模型流程监控-获取待分配模型数量
 export function unassignQuery(param, success) {
 export function unassignQuery(param, success) {
-  let url = `${revitUrl}/task/query`;
-  httputils.postJson(url, param, success)
+    let url = `${revitUrl}/task/query`;
+    httputils.postJson(url, param, success)
 }
 }

+ 2 - 2
src/api/scan/request.js

@@ -1961,7 +1961,7 @@ export function eqInSysUnlink(param, success) {
 
 
 //根据对象删除系统所在业务空间关系
 //根据对象删除系统所在业务空间关系
 export function spaceInSysUnlink(param, success) {
 export function spaceInSysUnlink(param, success) {
-  let url = `${baseUrl}${dataCenter}/sy-in-sp-base/unlink-list?type=${param.type}`;
+  let url = `${baseUrl}${rel}/sy-in-sp-base/unlink-list?type=${param.type}`;
   http.postJson(url, param.data, success)
   http.postJson(url, param.data, success)
 }
 }
 
 
@@ -1991,7 +1991,7 @@ export function eqForSpaceCreate(param, success) {
 
 
 //关系-----系统所在业务空间--删除关系
 //关系-----系统所在业务空间--删除关系
 export function syInSpaceDelete(param, success) {
 export function syInSpaceDelete(param, success) {
-  let url = `${baseUrl}${dataCenter}/sy-in-sp-base/unlink-list?type=${param.type}`;
+  let url = `${baseUrl}${rel}/sy-in-sp-base/unlink-list?type=${param.type}`;
   http.postJson(url, param.data, success)
   http.postJson(url, param.data, success)
 }
 }
 
 

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

@@ -195,7 +195,7 @@ export default {
         this.statusSet(file.id, 'merging');
         this.statusSet(file.id, 'merging');
         if(file.file.modelId){
         if(file.file.modelId){
           //模型文件合并专用接口
           //模型文件合并专用接口
-          request.mergeModelFile({ modelId: file.file.modelId, uploadId: file.file.uploadId, md5: file.file.md5 }, res => {
+          request.mergeModelFile({ ModelId: file.file.modelId, UploadId: file.file.uploadId, Md5: file.file.md5 }, res => {
             Bus.$emit('modelStatusChange')
             Bus.$emit('modelStatusChange')
             // 文件合并成功
             // 文件合并成功
             Bus.$emit('fileSuccess');
             Bus.$emit('fileSuccess');

+ 1 - 1
src/components/ledger/system/dialog/addCenoteDialog.vue

@@ -146,7 +146,7 @@ export default {
     savaRelation() {
     savaRelation() {
       if (this.selections.length) {
       if (this.selections.length) {
         let params = {
         let params = {
-          id: this.$route.query.SysID,
+          sysId: this.$route.query.SysID,
           shaftIdList: this.selections.map(item => {
           shaftIdList: this.selections.map(item => {
             return item.id
             return item.id
           })
           })

+ 1 - 1
src/components/ledger/system/dialog/addSpaceDialog.vue

@@ -176,7 +176,7 @@ export default {
             return {
             return {
               spaceId: item.id,
               spaceId: item.id,
               sysId: this.$route.query.SysID,
               sysId: this.$route.query.SysID,
-              objectType: item.ObjectType
+              objectType: item.classCode
             };
             };
           })
           })
         };
         };

+ 6 - 7
src/components/ledger/system/table/spaceTable.vue

@@ -11,14 +11,14 @@
                 :header-cell-style="headerStyle">
                 :header-cell-style="headerStyle">
         <el-table-column :label="`${inSpaceType}名称`" show-overflow-tooltip min-width="100">
         <el-table-column :label="`${inSpaceType}名称`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
           <template slot-scope="scope">
-            <div>{{ scope.row.RoomLocalName || scope.row.RoomName || '' }}</div>
+            <div>{{ scope.row.localName || scope.row.name || '' }}</div>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
         <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip
         <el-table-column prop="localId" :label="`${inSpaceType}本地编码`" show-overflow-tooltip
                          min-width="100"></el-table-column>
                          min-width="100"></el-table-column>
         <el-table-column :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="100">
         <el-table-column :label="`${inSpaceType}类型`" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
           <template slot-scope="scope">
-            <div>{{ spaceType[scope.row.ObjectType] }}</div>
+            <div>{{ spaceType[scope.row.classCode] }}</div>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
         <el-table-column prop="action" label="操作" min-width="100">
         <el-table-column prop="action" label="操作" min-width="100">
@@ -90,8 +90,7 @@ export default {
         ]
         ]
       };
       };
       queryLinkSys(params, res => {
       queryLinkSys(params, res => {
-        // todo 这个字段是个啥???
-        this.tableData = res.content[0].zoneSpaceBaseTable || [];
+        this.tableData = res.content[0].zoneSpaceBaseTableList || [];
       });
       });
     },
     },
     // 删除关系
     // 删除关系
@@ -105,11 +104,11 @@ export default {
           let params = {
           let params = {
             data: [
             data: [
               {
               {
-                SysId: this.params.SysID,
-                SpaceId: row.RoomID
+                sysId: this.params.SysID,
+                spaceId: row.id
               }
               }
             ],
             ],
-            type: row.ObjectType
+            type: row.classCode
           };
           };
           this.deleteSyInSh(params);
           this.deleteSyInSh(params);
         })
         })

+ 12 - 12
src/components/model/file/addFloorDialog.vue

@@ -188,22 +188,22 @@
           this.$message.error('该楼层名称已存在,请勿重复创建!');
           this.$message.error('该楼层名称已存在,请勿重复创建!');
         } else {
         } else {
           let data = {
           let data = {
-            fileName: this.form.file.name,
-            floorName: FloorName,
-            folderId: this.FolderId,
-            revitVersion: this.form.revitVersion,
-            note: this.form.desc,
-            projectId: this.projectId,
-            replaceReason: null,
-            size: this.form.file.size,
-            userName: this.userInfo.userName,
-            userId: this.userInfo.userId
+            FileName: this.form.file.name,
+            FloorName: FloorName,
+            FolderId: this.FolderId,
+            RevitVersion: this.form.revitVersion,
+            Note: this.form.desc,
+            ProjectId: this.projectId,
+            ReplaceReason: null,
+            Size: this.form.file.size,
+            UserName: this.userInfo.userName,
+            UserId: this.userInfo.userId
           };
           };
           request.modelFileUpload(data, res => {
           request.modelFileUpload(data, res => {
             //  创建成功
             //  创建成功
             this.$emit("finishCreateFloor", {
             this.$emit("finishCreateFloor", {
-              modelId: res.modelId,
-              uploadId: res.uploadId,
+              modelId: res.ModelId,
+              uploadId: res.UploadId,
               floorId: res.floorId,
               floorId: res.floorId,
               file: this.form.file
               file: this.form.file
             });
             });

+ 2 - 2
src/components/model/file/addFolder.vue

@@ -53,7 +53,7 @@ export default {
     addFolder() {
     addFolder() {
       this.$refs["addFolderModel"].validate(valid => {
       this.$refs["addFolderModel"].validate(valid => {
         if (valid) {
         if (valid) {
-          request.createModel({ projectId: this.projectId, name:this.ruleForm.name },res => {
+          request.createModel({ ProjectId: this.projectId, Name:this.ruleForm.name },res => {
               this.$message({
               this.$message({
                 message: "模型文件夹创建成功",
                 message: "模型文件夹创建成功",
                 type: "success"
                 type: "success"
@@ -72,7 +72,7 @@ export default {
       this.$refs["addFolderModel"].resetFields();
       this.$refs["addFolderModel"].resetFields();
     },
     },
     createModel(Name) {
     createModel(Name) {
-      return request.createModel({ projectId: this.projectId, name:Name });
+      return request.createModel({ ProjectId: this.projectId, Name });
     }
     }
   },
   },
   watch: {
   watch: {

+ 1 - 1
src/components/model/file/changeFolderName.vue

@@ -63,7 +63,7 @@ export default {
             this.$message({ message: "文件夹名字不可与原来相同!",type:'error' });
             this.$message({ message: "文件夹名字不可与原来相同!",type:'error' });
           } else {
           } else {
             request.updateModelName(
             request.updateModelName(
-              { name: this.ruleForm.name, id: this.currentFolderId },
+              { Name: this.ruleForm.name, Id: this.currentFolderId },
               () => {
               () => {
                 this.$message({
                 this.$message({
                   message: "模型文件夹创建成功",
                   message: "模型文件夹创建成功",

+ 14 - 19
src/components/model/file/modelLog.vue

@@ -3,26 +3,22 @@
   <div id="modelLog">
   <div id="modelLog">
     <el-dialog title="模型日志" :visible.sync="modelLogVisible" width="40%" :before-close="handleClose">
     <el-dialog title="模型日志" :visible.sync="modelLogVisible" width="40%" :before-close="handleClose">
       <div class="bodys">
       <div class="bodys">
-        <el-button v-show="filterlogData.length == 1" class="delete-model" @click="deleteModel(filterlogData[0])"><i
-          class="iconfont icon-delete el-icon--left"></i>删除模型
-        </el-button>
+        <el-button v-show="filterlogData.length == 1" class="delete-model" @click="deleteModel(filterlogData[0])"><i class="iconfont icon-delete el-icon--left"></i>删除模型</el-button>
         <el-tabs v-model="activeName" type="card" @tab-click="changeModel">
         <el-tabs v-model="activeName" type="card" @tab-click="changeModel">
           <el-tab-pane label="上传日志" name="first">
           <el-tab-pane label="上传日志" name="first">
             <el-table :data="filterlogData" stripe height="300px" style="width: 100%">
             <el-table :data="filterlogData" stripe height="300px" style="width: 100%">
               <el-table-column label="版本">
               <el-table-column label="版本">
                 <template slot-scope="scope">
                 <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>
+                  <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>
                 </template>
                 </template>
               </el-table-column>
               </el-table-column>
-              <el-table-column prop="revitVersion" label="revit版本"></el-table-column>
-              <el-table-column prop="acceptTime" label="上传时间"></el-table-column>
-              <el-table-column prop="userName" label="上传人"></el-table-column>
+              <el-table-column prop="RevitVersion" label="revit版本"></el-table-column>
+              <el-table-column prop="AcceptTime" label="上传时间"></el-table-column>
+              <el-table-column prop="UserName" label="上传人"></el-table-column>
               <el-table-column prop="address" label="操作">
               <el-table-column prop="address" label="操作">
                 <template slot-scope="scope">
                 <template slot-scope="scope">
-                  <el-button title="下载模型" @click="handleClick(scope.row)" v-if="!scope.row.removed" type='primary'
-                             size="mini" class="iconfont icon-download"></el-button>
+                  <el-button title="下载模型" @click="handleClick(scope.row)" v-if="!scope.row.Removed" type='primary' size="mini" class="iconfont icon-download"></el-button>
                   <!-- 需求:先不支持删除 -->
                   <!-- 需求:先不支持删除 -->
                   <!-- <el-button @click="deleteModel(scope.row)" v-if="!scope.row.Removed" type='danger' plain size="mini">删除</el-button> -->
                   <!-- <el-button @click="deleteModel(scope.row)" v-if="!scope.row.Removed" type='danger' plain size="mini">删除</el-button> -->
                 </template>
                 </template>
@@ -59,7 +55,7 @@ export default {
     };
     };
   },
   },
   computed: {
   computed: {
-    filterlogData: function () {
+    filterlogData: function() {
       let newLogData = [];
       let newLogData = [];
       if (this.logData.length) {
       if (this.logData.length) {
         this.logData.forEach(item => {
         this.logData.forEach(item => {
@@ -80,11 +76,11 @@ export default {
     },
     },
     handleClick(item) {
     handleClick(item) {
       console.log(item);
       console.log(item);
-      let url = item.Url.match(/(\/image-service\S*)$/g) ? item.Url.match(/(\/image-service\S*)$/g)[0] : ''
+      let url = item.Url.match(/(\/image-service\S*)$/g)?item.Url.match(/(\/image-service\S*)$/g)[0]:''
       if (item.Url) {
       if (item.Url) {
         let a = document.createElement("a");
         let a = document.createElement("a");
         a.href = url;
         a.href = url;
-        a.download = `${this.modelFolderName}${item.FloorName}模型文件v${item.Version}.rvt`;
+        a.download =`${this.modelFolderName}${item.FloorName}模型文件v${item.Version}.rvt`;
         a.click();
         a.click();
       } else {
       } else {
         this.$message({
         this.$message({
@@ -93,8 +89,7 @@ export default {
         });
         });
       }
       }
     },
     },
-    changeModel() {
-    },
+    changeModel() {},
     /**
     /**
      * 删除模型
      * 删除模型
      *
      *
@@ -110,8 +105,8 @@ export default {
         }
         }
       )
       )
         .then(() => {
         .then(() => {
-          request.deleteModelFileList({ Id: item.Id }, res => {
-            if (res.result == "success") {
+          request.deleteModelFileList({Id: item.Id}, res => {
+            if (res.Result == "success") {
               //  刷新页面
               //  刷新页面
               this.$emit("deleteFinish");
               this.$emit("deleteFinish");
               this.$message({
               this.$message({
@@ -121,7 +116,7 @@ export default {
             } else {
             } else {
               this.$message({
               this.$message({
                 type: "error",
                 type: "error",
-                message: res.result
+                message: res.Result
               });
               });
             }
             }
           });
           });

+ 26 - 46
src/components/model/file/versionDialog.vue

@@ -32,59 +32,39 @@
           <div v-for="(item, key) in versionData.createData" :key="'CL'+key">
           <div v-for="(item, key) in versionData.createData" :key="'CL'+key">
             <p>【{{ mapType[key] }}】</p>
             <p>【{{ mapType[key] }}】</p>
             <p v-for="(obj, i) in item" :key="obj.Id">
             <p v-for="(obj, i) in item" :key="obj.Id">
-              【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{
-                obj.FloorName || "无"
-              }}】;设备全局id:【{{ obj.ObjId || "无" }}】;BIMID:【{{ obj.BimId || "无" }}】;设备本地编码:【{{
-                obj.LocalId || "无"
-              }}】;设备本地名称:【{{ obj.LocalName || "无" }}】;CADID:【{{ obj.CadId || "无" }}】;</p>
+              【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;设备全局id:【{{ obj.ObjId || "无" }}】;BIMID:【{{ obj.BimId || "无" }}】;设备本地编码:【{{ obj.LocalId || "无" }}】;设备本地名称:【{{ obj.LocalName || "无" }}】;CADID:【{{ obj.CadId || "无" }}】;</p>
           </div>
           </div>
           <!-- 删除设备 -->
           <!-- 删除设备 -->
           <el-divider v-if="Object.keys(versionData.deleteData).length">删除设备</el-divider>
           <el-divider v-if="Object.keys(versionData.deleteData).length">删除设备</el-divider>
           <div v-for="(item, key) in versionData.deleteData" :key="'DL'+key">
           <div v-for="(item, key) in versionData.deleteData" :key="'DL'+key">
             <p>【{{ mapType[key] }}】</p>
             <p>【{{ mapType[key] }}】</p>
             <p v-for="(obj, i) in item" :key="obj.Id">
             <p v-for="(obj, i) in item" :key="obj.Id">
-              【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{
-                obj.FloorName || "无"
-              }}】;设备全局id:【{{ obj.ObjId || "无" }}】;BIMID:【{{ obj.BimId || "无" }}】;设备本地编码:【{{
-                obj.LocalId || "无"
-              }}】;设备本地名称:【{{ obj.LocalName || "无" }}】;CADID:【{{ obj.CadId || "无" }}】;</p>
+              【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;设备全局id:【{{ obj.ObjId || "无" }}】;BIMID:【{{ obj.BimId || "无" }}】;设备本地编码:【{{ obj.LocalId || "无" }}】;设备本地名称:【{{ obj.LocalName || "无" }}】;CADID:【{{ obj.CadId || "无" }}】;</p>
           </div>
           </div>
           <!-- 新增实体墙 -->
           <!-- 新增实体墙 -->
           <el-divider v-if="versionData.createWall.length">新增实体墙</el-divider>
           <el-divider v-if="versionData.createWall.length">新增实体墙</el-divider>
           <p v-for="(obj, i) in versionData.createWall" :key="obj.Id">
           <p v-for="(obj, i) in versionData.createWall" :key="obj.Id">
-            【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{
-              obj.ObjId || "无"
-            }}】;</p>
+            【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{ obj.ObjId || "无" }}】;</p>
           <!-- 删除实体墙 -->
           <!-- 删除实体墙 -->
           <el-divider v-if="versionData.deleteWall.length">删除实体墙</el-divider>
           <el-divider v-if="versionData.deleteWall.length">删除实体墙</el-divider>
           <p v-for="(obj, i) in versionData.deleteWall" :key="obj.Id">
           <p v-for="(obj, i) in versionData.deleteWall" :key="obj.Id">
-            【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{
-              obj.ObjId || "无"
-            }}】;</p>
+            【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{ obj.ObjId || "无" }}】;</p>
           <!-- 新增虚拟墙 -->
           <!-- 新增虚拟墙 -->
           <el-divider v-if="versionData.createVirtualWall.length">新增虚拟墙</el-divider>
           <el-divider v-if="versionData.createVirtualWall.length">新增虚拟墙</el-divider>
           <p v-for="(obj, i) in versionData.createVirtualWall" :key="obj.Id">
           <p v-for="(obj, i) in versionData.createVirtualWall" :key="obj.Id">
-            【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{
-              obj.ObjId || "无"
-            }}】;</p>
+            【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{ obj.ObjId || "无" }}】;</p>
           <!-- 删除虚拟墙 -->
           <!-- 删除虚拟墙 -->
           <el-divider v-if="versionData.deleteVirtualWall.length">删除虚拟墙</el-divider>
           <el-divider v-if="versionData.deleteVirtualWall.length">删除虚拟墙</el-divider>
           <p v-for="(obj, i) in versionData.deleteVirtualWall" :key="obj.Id">
           <p v-for="(obj, i) in versionData.deleteVirtualWall" :key="obj.Id">
-            【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{
-              obj.ObjId || "无"
-            }}】;</p>
+            【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{ obj.ObjId || "无" }}】;</p>
           <!-- 新增柱体 -->
           <!-- 新增柱体 -->
           <el-divider v-if="versionData.createColumn.length">新增柱体</el-divider>
           <el-divider v-if="versionData.createColumn.length">新增柱体</el-divider>
           <p v-for="(obj, i) in versionData.createColumn" :key="obj.Id">
           <p v-for="(obj, i) in versionData.createColumn" :key="obj.Id">
-            【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{
-              obj.ObjId || "无"
-            }}】;</p>
+            【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{ obj.ObjId || "无" }}】;</p>
           <!-- 删除柱体 -->
           <!-- 删除柱体 -->
           <el-divider v-if="versionData.deleteColumn.length">删除柱体</el-divider>
           <el-divider v-if="versionData.deleteColumn.length">删除柱体</el-divider>
           <p v-for="(obj, i) in versionData.deleteColumn" :key="obj.Id">
           <p v-for="(obj, i) in versionData.deleteColumn" :key="obj.Id">
-            【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{
-              obj.ObjId || "无"
-            }}】;</p>
+            【{{ i + 1 }}】、建筑:【{{ obj.BuildingName || "无" }}】;楼层:【{{ obj.FloorName || "无" }}】;Id:【{{ obj.ObjId || "无" }}】;</p>
         </div>
         </div>
         <div v-else>
         <div v-else>
           <div
           <div
@@ -153,14 +133,14 @@ export default {
     },
     },
     // 获取版本信息
     // 获取版本信息
     getData() {
     getData() {
-      if (this.modelFile.id || this.modelFile.currentModelId) {
-        this.versionData.userName = this.modelFile.userName;
-        this.versionData.acceptTime = this.modelFile.acceptTime;
+      if (this.modelFile.Id || this.modelFile.CurrentModelId) {
+        this.versionData.userName = this.modelFile.UserName;
+        this.versionData.acceptTime = this.modelFile.AcceptTime;
         let promise1 = new Promise((resolve, reject) => {
         let promise1 = new Promise((resolve, reject) => {
           querySyncLogCount({
           querySyncLogCount({
-            filters: `modelId='${this.modelFile.currentModelId ? this.modelFile.currentModelId : this.modelFile.id}'`,
-            pageNumber: 1,
-            pageSize: 1000,
+            Filters: `ModelId='${this.modelFile.CurrentModelId ? this.modelFile.CurrentModelId : this.modelFile.Id}'`,
+            PageNumber: 1,
+            PageSize: 1000,
           }, res => {
           }, res => {
             resolve(res)
             resolve(res)
           })
           })
@@ -171,14 +151,14 @@ export default {
           })
           })
         })
         })
         Promise.all([promise1, promise2]).then(values => {
         Promise.all([promise1, promise2]).then(values => {
-          this.logData = values[0].content;
           let typeList = values[1].Content;
           let typeList = values[1].Content;
+          this.logData = values[0].Content;
           typeList.forEach(item => {
           typeList.forEach(item => {
             this.mapType[item.Code] = item.Name;
             this.mapType[item.Code] = item.Name;
           });
           });
           console.log(this.mapType);
           console.log(this.mapType);
-          if (values[0].total / (values[0].pageSize * values[0].pageNumber) > 1) {
-            this.queryLogData(values[0].pageNumber + 1)
+          if (values[0].Total / (values[0].PageSize * values[0].PageNumber) > 1) {
+            this.queryLogData(values[0].PageNumber + 1)
           } else {
           } else {
             this.formatData();
             this.formatData();
             this.loading = false;
             this.loading = false;
@@ -233,23 +213,23 @@ export default {
     },
     },
     // 获取版本信息
     // 获取版本信息
     getVersionData() {
     getVersionData() {
-      if (this.modelFile.id || this.modelFile.currentModelId) {
-        this.versionData.userName = this.modelFile.userName;
-        this.versionData.acceptTime = this.modelFile.acceptTime;
+      if (this.modelFile.Id || this.modelFile.CurrentModelId) {
+        this.versionData.userName = this.modelFile.UserName;
+        this.versionData.acceptTime = this.modelFile.AcceptTime;
         this.queryLogData();
         this.queryLogData();
       }
       }
     },
     },
     queryLogData(pageNum) {
     queryLogData(pageNum) {
       pageNum = pageNum ? pageNum : 1
       pageNum = pageNum ? pageNum : 1
       let params = {
       let params = {
-        filters: `modelId='${this.modelFile.currentModelId ? this.modelFile.currentModelId : this.modelFile.id}'`,
-        pageNumber: pageNum,
-        pageSize: 1000,
+        Filters: `ModelId='${this.modelFile.CurrentModelId ? this.modelFile.CurrentModelId : this.modelFile.Id}'`,
+        PageNumber: pageNum,
+        PageSize: 1000,
       }
       }
       querySyncLogCount(params, res => {
       querySyncLogCount(params, res => {
-        this.logData = this.logData.concat(res.content);//拼接数据
-        if (res.total / (res.pageSize * res.pageNumber) > 1) {
-          this.queryLogData(res.pageNumber + 1)
+        this.logData = this.logData.concat(res.Content);//拼接数据
+        if (res.Total / (res.PageSize * res.PageNumber) > 1) {
+          this.queryLogData(res.PageNumber + 1)
         } else {
         } else {
           this.formatData();
           this.formatData();
           this.loading = false;
           this.loading = false;

+ 9 - 9
src/components/ready/buildfloor/modelFile.vue

@@ -45,10 +45,10 @@ export default {
     // 获取文件夹
     // 获取文件夹
     getDirectory() {
     getDirectory() {
       request.queryModel("", res => {
       request.queryModel("", res => {
-        this.options = res.content.map(t => {
+        this.options = res.Content.map(t => {
           return {
           return {
-            value: t.id,
-            label: t.name,
+            value: t.Id,
+            label: t.Name,
             children: []
             children: []
           }
           }
         })
         })
@@ -57,15 +57,15 @@ export default {
     // 通过id查询文件夹下模型文件
     // 通过id查询文件夹下模型文件
     handleItemChange(val) {
     handleItemChange(val) {
       let data = {
       let data = {
-        folderId: val[0],
-        projectId: this.projectId
+        FolderId: val[0],
+        ProjectId: this.projectId
       };
       };
       request.queryFloorList(data, res => {
       request.queryFloorList(data, res => {
-        let tempArr = res.content.map(t => {
-          this.modelIdToFloorId[t.currentModelId] = t.id;
+        let tempArr = res.Content.map(t => {
+          this.modelIdToFloorId[t.CurrentModelId] = t.Id;
           return {
           return {
-            value: t.currentModelId,
-            label: t.floorName
+            value: t.CurrentModelId,
+            label: t.FloorName
           }
           }
         })
         })
         this.pushChild(this.options, tempArr, val[0])
         this.pushChild(this.options, tempArr, val[0])

+ 3 - 3
src/components/ready/buildfloor/modelFolder.vue

@@ -45,10 +45,10 @@ export default {
     // 获取文件夹
     // 获取文件夹
     getDirectory() {
     getDirectory() {
       request.queryModel("", res => {
       request.queryModel("", res => {
-        this.options = res.content.map(t => {
+        this.options = res.Content.map(t => {
           return {
           return {
-            value: t.id,
-            label: t.name,
+            value: t.Id,
+            label: t.Name
           }
           }
         })
         })
       });
       });

+ 15 - 14
src/framework/components/messagesever/index.vue

@@ -19,27 +19,29 @@
         <div class="noticeList_scroll">
         <div class="noticeList_scroll">
           <el-scrollbar style="height:100%;">
           <el-scrollbar style="height:100%;">
             <ul class="noticeList">
             <ul class="noticeList">
-              <li class="noticeList_item" v-for="item in messageList" :key="item.Id"
-                  :title="item.Content.Message?item.Content.Message:''">
+              <li class="noticeList_item" v-for="item in messageList" :key="item.id"
+                  :title="item.content.message?item.content.message:''">
                 <div class="noticeItem_box">
                 <div class="noticeItem_box">
                   <div class="noticeItem_text">
                   <div class="noticeItem_text">
                     <i
                     <i
-                      :class="iconClassMap[item.Type]?iconClassMap[item.Type]:'msg-icon el-icon-warning warning-color'"></i>
+                      :class="iconClassMap[item.type]?iconClassMap[item.type]:'msg-icon el-icon-warning warning-color'"></i>
                     <p>
                     <p>
                       <span>{{
                       <span>{{
-                          `【${moduleMap[item.Module] ? moduleMap[item.Module] : item.Module}】 `
-                        }}</span>{{ item.Title ? item.Title : "" }}
+                          `【${moduleMap[item.module] ? moduleMap[item.module] : item.module}】 `
+                        }}</span>{{ item.title ? item.title : "" }}
                     </p>
                     </p>
                   </div>
                   </div>
                   <div class="noticeItem_time">
                   <div class="noticeItem_time">
-                    <span class="proname">{{ item.Project[0].ProjLocalName || '' }}</span>
-                    {{ item.CreateTime }}
-                    <el-link v-for="(btn, index) in item.Content.ButtonList?item.Content.ButtonList:[]"
-                             style="float:right;font-size:12px;margin-left:5px;" type="primary" :key="index"
-                             :href="`/image-service/common/file_get?systemId=revit&key=${btn.Url}`"
-                             :download="btn.FileName?btn.FileName:''">
-                      {{ btn.Name ? btn.Name : "" }}
-                    </el-link>
+                    <span class="proname">{{ item.project[0].localName || '' }}</span>
+                    {{ item.createTime }}
+                    <template v-if="item.content.buttonList.length">
+                      <el-link v-for="(btn, index) in item.content.buttonList"
+                               style="float:right;font-size:12px;margin-left:5px;" type="primary" :key="index"
+                               :href="`/image-service/common/file_get?systemId=revit&key=${btn.url}`"
+                               :download="btn.fileName?btn.fileName:''">
+                        {{ btn.name ? btn.name : "" }}
+                      </el-link>
+                    </template>
                   </div>
                   </div>
                 </div>
                 </div>
               </li>
               </li>
@@ -88,7 +90,6 @@ export default {
       messageList: [], // 历史消息
       messageList: [], // 历史消息
       subList: [], // 订阅的消息实例
       subList: [], // 订阅的消息实例
       topics: ["/topic/message.manage"], // 订阅的消息名称
       topics: ["/topic/message.manage"], // 订阅的消息名称
-      messageList: [],
       moduleMap: {//消息模块映射
       moduleMap: {//消息模块映射
         "Model": "模型文件管理"
         "Model": "模型文件管理"
       },
       },

+ 14 - 5
src/framework/layout/layout-store.js

@@ -11,19 +11,27 @@ export default {
   state: {
   state: {
     sidebarClosed: false,
     sidebarClosed: false,
     sidebarSelected: '', // sidebar选中的选项
     sidebarSelected: '', // sidebar选中的选项
-    userInfo: null, //{ username: 'admin' },
+    // userInfo: null, //{ username: 'admin' },
+    userInfo: {
+      username: 'yanruolan',
+      userId: '06328a53c69a41bb8f5bb1a552c6e8d6'
+    },
     permissions: {
     permissions: {
       "system:role:delete": true,
       "system:role:delete": true,
       "system:role:create": true,
       "system:role:create": true,
       "system:role:query": true,
       "system:role:query": true,
       "system:role:setOpts": true
       "system:role:setOpts": true
     },
     },
-    projectId: '',
-    projects: [],
+    projectId: 'Pj1101050029',
+    projects: [{
+      id: "Pj1101050029",
+      name: "北京东坝万达广场",
+      pwd: "saga123456"
+    }],
     breadcrumb: [],
     breadcrumb: [],
     uploaderList: [], //当前上传文件列表
     uploaderList: [], //当前上传文件列表
-    secret: "", //项目密码
-    userId: "", //用户id
+    secret: "saga123456", //项目密码
+    userId: "06328a53c69a41bb8f5bb1a552c6e8d6", //用户id
     rowEdit: false,//表格数据变化
     rowEdit: false,//表格数据变化
     errorReport: [],//扫楼错误报告
     errorReport: [],//扫楼错误报告
   },
   },
@@ -108,6 +116,7 @@ export default {
     },
     },
     loadUserInfo({ state }) {
     loadUserInfo({ state }) {
       console.log(state)
       console.log(state)
+      // 获取 userInfo 信息
       return new Promise((resolve, reject) => {
       return new Promise((resolve, reject) => {
         frameworkApi.loadUserInfo().then(resp => {
         frameworkApi.loadUserInfo().then(resp => {
           console.log(resp)
           console.log(resp)

+ 60 - 33
src/utils/authutils.js

@@ -44,41 +44,68 @@ export default {
       next()
       next()
     } else {
     } else {
       let userInfo = store.getters['layout/userInfo']
       let userInfo = store.getters['layout/userInfo']
-      console.log("user info ", userInfo)
-      if (!userInfo) {
-        // 本地是未登录状态, 保存目标页面地址, 去登录
-        let lastRoute = { path: to.path, params: to.params, query: to.query }
-        store.commit('setLastRoute', lastRoute)
-        toLogin()
-      } else {
-        if (to.meta.breadcrumbs) {
-          store.dispatch('setBreadcrumb', to.meta.breadcrumbs)
-        }
-        if (
-          (from.path == "/ledger/rentadd" && session.get("rentAddData") && session.get("rentAddData").length) ||
-          (from.path == "/ledger/cenoteadd" && session.get("cenoteAddData") && session.get("cenoteAddData").length) ||
-          (from.path == "/ledger/deviceadd" && session.get("deviceAddData") && session.get("deviceAddData").length) ||
-          (from.path == "/ledger/spaceadd" && session.get("spaceAddData") && session.get("spaceAddData").length) ||
-          (from.path == "/ledger/propertyadd" && session.get("propertyAddData") && session.get("propertyAddData").length) ||
-          (from.path == "/ledger/partsadd" && session.get("partsAddData") && session.get("partsAddData").length) ||
-          (from.path == "/ledger/systemadd" && session.get("systemAddData") && session.get("systemAddData").length)
-        ) { //判断新增信息是否保存
-          MessageBox.confirm("新增信息未保存,离开将丢失新增信息,是否继续?", "提示", {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            let arr = from.path.split("/")
-            let srt = arr[arr.length - 1].slice(0, -3)
-            session.remove(`${srt}AddData`)
-            next()
-          }).catch(() => {
-            next(false)
-          })
-        } else {
+      if (to.meta.breadcrumbs) {
+        store.dispatch('setBreadcrumb', to.meta.breadcrumbs)
+      }
+      if (
+        (from.path == "/ledger/rentadd" && session.get("rentAddData") && session.get("rentAddData").length) ||
+        (from.path == "/ledger/cenoteadd" && session.get("cenoteAddData") && session.get("cenoteAddData").length) ||
+        (from.path == "/ledger/deviceadd" && session.get("deviceAddData") && session.get("deviceAddData").length) ||
+        (from.path == "/ledger/spaceadd" && session.get("spaceAddData") && session.get("spaceAddData").length) ||
+        (from.path == "/ledger/propertyadd" && session.get("propertyAddData") && session.get("propertyAddData").length) ||
+        (from.path == "/ledger/partsadd" && session.get("partsAddData") && session.get("partsAddData").length) ||
+        (from.path == "/ledger/systemadd" && session.get("systemAddData") && session.get("systemAddData").length)
+      ) { //判断新增信息是否保存
+        MessageBox.confirm("新增信息未保存,离开将丢失新增信息,是否继续?", "提示", {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let arr = from.path.split("/")
+          let srt = arr[arr.length - 1].slice(0, -3)
+          session.remove(`${srt}AddData`)
           next()
           next()
-        }
+        }).catch(() => {
+          next(false)
+        })
+      } else {
+        next()
       }
       }
+      console.log("==================== user info ================", userInfo)
+      // if (!userInfo) {
+      //   // 本地是未登录状态, 保存目标页面地址, 去登录
+      //   let lastRoute = { path: to.path, params: to.params, query: to.query }
+      //   store.commit('setLastRoute', lastRoute)
+      //   toLogin()
+      // } else {
+      //   if (to.meta.breadcrumbs) {
+      //     store.dispatch('setBreadcrumb', to.meta.breadcrumbs)
+      //   }
+      //   if (
+      //     (from.path == "/ledger/rentadd" && session.get("rentAddData") && session.get("rentAddData").length) ||
+      //     (from.path == "/ledger/cenoteadd" && session.get("cenoteAddData") && session.get("cenoteAddData").length) ||
+      //     (from.path == "/ledger/deviceadd" && session.get("deviceAddData") && session.get("deviceAddData").length) ||
+      //     (from.path == "/ledger/spaceadd" && session.get("spaceAddData") && session.get("spaceAddData").length) ||
+      //     (from.path == "/ledger/propertyadd" && session.get("propertyAddData") && session.get("propertyAddData").length) ||
+      //     (from.path == "/ledger/partsadd" && session.get("partsAddData") && session.get("partsAddData").length) ||
+      //     (from.path == "/ledger/systemadd" && session.get("systemAddData") && session.get("systemAddData").length)
+      //   ) { //判断新增信息是否保存
+      //     MessageBox.confirm("新增信息未保存,离开将丢失新增信息,是否继续?", "提示", {
+      //       confirmButtonText: '确定',
+      //       cancelButtonText: '取消',
+      //       type: 'warning'
+      //     }).then(() => {
+      //       let arr = from.path.split("/")
+      //       let srt = arr[arr.length - 1].slice(0, -3)
+      //       session.remove(`${srt}AddData`)
+      //       next()
+      //     }).catch(() => {
+      //       next(false)
+      //     })
+      //   } else {
+      //     next()
+      //   }
+      // }
       return true
       return true
     }
     }
   },
   },

+ 45 - 53
src/views/data_admin/buildTask/addTask/addModelTask.vue

@@ -1,55 +1,50 @@
 <template>
 <template>
   <div id="bd-fl-manage">
   <div id="bd-fl-manage">
     <div class="header-nav">
     <div class="header-nav">
-      <el-button style="float:left;margin-right:20px;" size="small" type="default" icon="el-icon-back"
-                 @click="goBack"></el-button>
+      <el-button style="float:left;margin-right:20px;" size="small" type="default" icon="el-icon-back" @click="goBack"></el-button>
       <model-folder ref="modelFolder" @change="handleChangeModelFolder" style="margin-right:10px;"></model-folder>
       <model-folder ref="modelFolder" @change="handleChangeModelFolder" style="margin-right:10px;"></model-folder>
       <my-cascader :isWidth="false" ref="cascader" @change="changeDevice"></my-cascader>
       <my-cascader :isWidth="false" ref="cascader" @change="changeDevice"></my-cascader>
-      <el-button style="float:right;margin-top:1px;" @click="handleClickCreate">{{ buttonContent }}</el-button>
-      <el-switch v-show="CurrentModelId" style="float:right;margin-top:7px;margin-right:20px;" v-model="isLight"
-                 active-text="高亮显示未完成验证的区块"></el-switch>
+      <el-button style="float:right;margin-top:1px;" @click="handleClickCreate">{{buttonContent}}</el-button>
+      <el-switch v-show="CurrentModelId" style="float:right;margin-top:7px;margin-right:20px;" v-model="isLight" active-text="高亮显示未完成验证的区块"></el-switch>
     </div>
     </div>
     <el-row>
     <el-row>
       <div class="l-list">
       <div class="l-list">
         <h4>模型文件</h4>
         <h4>模型文件</h4>
         <div class="model-file-list">
         <div class="model-file-list">
           <el-scrollbar style="height:100%;">
           <el-scrollbar style="height:100%;">
-            <div v-for="item in modelFileList" :key="item.Id" :class="{'model-file-item':true,'active':item.active}"
-                 @click="handleChangeModelFile(item)">
-              <span>{{ item.FloorName }}</span>
+            <div v-for="item in modelFileList" :key="item.Id" :class="{'model-file-item':true,'active':item.active}" @click="handleChangeModelFile(item)">
+              <span>{{item.FloorName}}</span>
             </div>
             </div>
           </el-scrollbar>
           </el-scrollbar>
         </div>
         </div>
       </div>
       </div>
       <div class="r-model">
       <div class="r-model">
-        <draw-model ref="drawModel" :id="1" :CurrentModelId="CurrentModelId" :modelName="modelName" :isLight="isLight"
-                    @changeButtonContent="changeButtonContent"></draw-model>
+        <draw-model ref="drawModel" :id="1" :CurrentModelId="CurrentModelId" :modelName="modelName" :isLight="isLight" @changeButtonContent="changeButtonContent"></draw-model>
       </div>
       </div>
     </el-row>
     </el-row>
-    <modelTask-dialog :dialogVisible.sync="dialogVisible" :params="params"
-                      :newTaskTypes="newTaskTypes"></modelTask-dialog>
+    <modelTask-dialog :dialogVisible.sync="dialogVisible" :params="params" :newTaskTypes="newTaskTypes"></modelTask-dialog>
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
-import modelFolder from "@/components/ready/buildfloor/modelFolder"
-import myCascader from "@/components/ledger/lib/cascader"
-import drawModel from "@/components/data_admin/buildTask/draw/drawModel"
-import modelTaskDialog from "@/components/data_admin/buildTask/dialog/modelTaskDialog"
-import { mapGetters } from "vuex";
-import request from "@/api/model/file.js";
-
-export default {
-  components: {
-    modelFolder,
-    myCascader,
-    drawModel,
-    modelTaskDialog
-  },
-  data() {
-    return {
-      isLight: false,//是否高亮未完成验证区块
-      query: {},//query信息
+  import modelFolder from "@/components/ready/buildfloor/modelFolder"
+  import myCascader from "@/components/ledger/lib/cascader"
+  import drawModel from "@/components/data_admin/buildTask/draw/drawModel"
+  import modelTaskDialog from "@/components/data_admin/buildTask/dialog/modelTaskDialog"
+  import {mapGetters} from "vuex";
+  import request from "@/api/model/file.js";
+
+  export default {
+    components: {
+      modelFolder,
+      myCascader,
+      drawModel,
+      modelTaskDialog
+    },
+    data() {
+      return {
+        isLight: false,//是否高亮未完成验证区块
+        query: {},//query信息
       dialogVisible: false,//是否显示弹窗
       dialogVisible: false,//是否显示弹窗
       modelFolderName: '',//模型文件夹名字
       modelFolderName: '',//模型文件夹名字
       modelFolderId: '',//模型文件夹的id
       modelFolderId: '',//模型文件夹的id
@@ -64,7 +59,7 @@ export default {
   },
   },
   computed: {
   computed: {
     ...mapGetters("layout", ["projectId"]),
     ...mapGetters("layout", ["projectId"]),
-    params() {
+    params(){
       return {
       return {
         device: this.device,
         device: this.device,
         CurrentModelId: this.CurrentModelId,
         CurrentModelId: this.CurrentModelId,
@@ -75,7 +70,7 @@ export default {
         isVerification: this.query.isVerification
         isVerification: this.query.isVerification
       }
       }
     },
     },
-    modelName() {
+    modelName () {
       return `${this.modelFolderName}-${this.modelFileName}`
       return `${this.modelFolderName}-${this.modelFileName}`
     },
     },
   },
   },
@@ -84,20 +79,21 @@ export default {
     this.query = this.$route.query
     this.query = this.$route.query
   },
   },
   methods: {
   methods: {
-    goBack() {//返回
-      this.$router.push({ name: 'buildTask' })
+    goBack(){//返回
+      this.$router.push({name:'buildTask'})
     },
     },
-    handleChangeModelFolder(item) {//切换模型文件夹
+    handleChangeModelFolder(item){//切换模型文件夹
       let val = item.value
       let val = item.value
-      if (val) {
+      if(val){
         this.modelFolderName = item.label
         this.modelFolderName = item.label
         let data = {
         let data = {
-          folderId: val,
-          status: '4',
-          projectId: this.projectId
+          FolderId: val,
+          Status: '4',
+
+          ProjectId: this.projectId
         };
         };
         request.queryFloorList(data, res => {
         request.queryFloorList(data, res => {
-          this.modelFileList = res.content.map(item => {
+          this.modelFileList = res.Content.map(item => {
             item.active = false
             item.active = false
             return item
             return item
           })
           })
@@ -109,7 +105,7 @@ export default {
         this.resetSelected()
         this.resetSelected()
       }
       }
     },
     },
-    resetSelected() {
+    resetSelected(){
       this.modelFileList = []
       this.modelFileList = []
       this.CurrentModelId = ''
       this.CurrentModelId = ''
       this.modelFolderName = ''
       this.modelFolderName = ''
@@ -119,9 +115,9 @@ export default {
       this.dialogVisible = false
       this.dialogVisible = false
       this.$refs.drawModel.clearGraphy()
       this.$refs.drawModel.clearGraphy()
     },
     },
-    handleChangeModelFile(file) {//切换模型文件
+    handleChangeModelFile(file){//切换模型文件
       this.modelFileList.map(item => {
       this.modelFileList.map(item => {
-        file.Id == item.id ? item.active = true : item.active = false
+        file.Id == item.Id?item.active = true:item.active = false
         return item
         return item
       })
       })
       this.CurrentModelId = file.CurrentModelId
       this.CurrentModelId = file.CurrentModelId
@@ -129,11 +125,11 @@ export default {
       this.modelFileName = file.FloorName
       this.modelFileName = file.FloorName
       this.newTaskTypes = this.$route.query.newTaskTypes
       this.newTaskTypes = this.$route.query.newTaskTypes
     },
     },
-    changeDevice(val) {//切换设备类别
+    changeDevice(val){//切换设备类别
       this.device = val.code
       this.device = val.code
     },
     },
-    handleClickCreate() {//创建已选
-      if (!this.CurrentModelId) {
+    handleClickCreate(){//创建已选
+      if(!this.CurrentModelId){
         this.$message('请选择模型文件!')
         this.$message('请选择模型文件!')
         return false
         return false
       }
       }
@@ -142,7 +138,7 @@ export default {
       })
       })
       this.dialogVisible = true
       this.dialogVisible = true
     },
     },
-    changeButtonContent(val) {// 通过判断是否选中模型空间调整文案
+    changeButtonContent(val){// 通过判断是否选中模型空间调整文案
       this.buttonContent = val;
       this.buttonContent = val;
     }
     }
   },
   },
@@ -158,15 +154,12 @@ export default {
   overflow: hidden;
   overflow: hidden;
   height: 100%;
   height: 100%;
   position: relative;
   position: relative;
-
-  .header-nav {
+  .header-nav{
     height: 32px;
     height: 32px;
     padding-bottom: 10px;
     padding-bottom: 10px;
   }
   }
-
   .el-row {
   .el-row {
     height: calc(100% - 50px);
     height: calc(100% - 50px);
-
     & > div {
     & > div {
       float: left;
       float: left;
       height: 100%;
       height: 100%;
@@ -201,8 +194,7 @@ export default {
       .model-file-list {
       .model-file-list {
         height: calc(100% - 46px);
         height: calc(100% - 46px);
         line-height: 48px;
         line-height: 48px;
-
-        /deep/ .el-scrollbar__wrap {
+        /deep/.el-scrollbar__wrap {
           overflow-x: hidden;
           overflow-x: hidden;
         }
         }
 
 

+ 45 - 52
src/views/model/file/index.vue

@@ -24,10 +24,9 @@
             <ul class="lists">
             <ul class="lists">
               <el-scrollbar style="height:100%;">
               <el-scrollbar style="height:100%;">
                 <li @click="openFolder(index,item)" v-for="(item,index) in navigationModel" :key="index"
                 <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>
                 </li>
               </el-scrollbar>
               </el-scrollbar>
             </ul>
             </ul>
@@ -44,34 +43,28 @@
           <el-button size="small" @click="queryFloorFile(currentFolderId)">刷新</el-button>
           <el-button size="small" @click="queryFloorFile(currentFolderId)">刷新</el-button>
         </div>
         </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>
       </el-card>
     </div>
     </div>
     <!-- 弹窗 开始-->
     <!-- 弹窗 开始-->
 
 
     <!-- 模型日志弹窗 -->
     <!-- 模型日志弹窗 -->
     <modelLog :modelLogVisible="modelLogVisible" :modelFolderName="currentFolderName" @deleteFinish="updataLog"
     <modelLog :modelLogVisible="modelLogVisible" :modelFolderName="currentFolderName" @deleteFinish="updataLog"
-              @CloseModelLogDia="modelLogVisible=false" :logData="logData"></modelLog>
+      @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>
   </div>
 </template>
 </template>
@@ -149,8 +142,8 @@ export default {
     // 打开模型文件夹
     // 打开模型文件夹
     openFolder(index, item) {
     openFolder(index, item) {
       this.choiceIndex = index + 1;
       this.choiceIndex = index + 1;
-      this.currentFolderId = item.id;
-      this.currentFolderName = item.name;
+      this.currentFolderId = item.Id;
+      this.currentFolderName = item.Name;
       // 获取模型文件夹对应得楼层文件
       // 获取模型文件夹对应得楼层文件
       this.queryFloorFile(this.currentFolderId);
       this.queryFloorFile(this.currentFolderId);
     },
     },
@@ -166,8 +159,8 @@ export default {
         callback: action => {
         callback: action => {
           if (action == "confirm") {
           if (action == "confirm") {
             let params = {
             let params = {
-              id: this.currentFolderId,
-              projectId: this.projectId
+              Id: this.currentFolderId,
+              ProjectId: this.projectId
             };
             };
             request.deleteModel(params, res => {
             request.deleteModel(params, res => {
               this.$message({
               this.$message({
@@ -195,13 +188,13 @@ export default {
       this.navigationModel = [];
       this.navigationModel = [];
       this.loading = true;
       this.loading = true;
       request.queryModel("", res => {
       request.queryModel("", res => {
-        this.navigationModel = res.content;
+        this.navigationModel = res.Content;
         this.loading = false;
         this.loading = false;
         if (this.navigationModel.length) {
         if (this.navigationModel.length) {
           //默认选择第一个文件夹
           //默认选择第一个文件夹
           this.choiceIndex = 1;
           this.choiceIndex = 1;
-          this.currentFolderName = this.navigationModel[0].name;
-          this.currentFolderId = this.navigationModel[0].id;
+          this.currentFolderName = this.navigationModel[0].Name;
+          this.currentFolderId = this.navigationModel[0].Id;
           this.queryFloorFile(this.currentFolderId);
           this.queryFloorFile(this.currentFolderId);
         } else {
         } else {
           this.tableData = []
           this.tableData = []
@@ -216,16 +209,16 @@ export default {
      * @param currentFolderId 当前选择的文件夹id
      * @param currentFolderId 当前选择的文件夹id
      */
      */
     queryFloorFile(currentFolderId) {
     queryFloorFile(currentFolderId) {
-      if (currentFolderId) {
+      if(currentFolderId){
         this.tableData = [];
         this.tableData = [];
         this.tableLoading = true;
         this.tableLoading = true;
         let data = {
         let data = {
-          folderId: currentFolderId,
-          projectId: this.projectId
+          FolderId: currentFolderId,
+          ProjectId: this.projectId
         };
         };
         return new Promise((resolve, reject) => {
         return new Promise((resolve, reject) => {
           request.queryFloorList(data, res => {
           request.queryFloorList(data, res => {
-            res.content.map(item => {
+            res.Content.map(item => {
               /**
               /**
                * @info: 状态显示说明
                * @info: 状态显示说明
                * 0: 上传中(上传的用户可操作:中止)
                * 0: 上传中(上传的用户可操作:中止)
@@ -235,13 +228,13 @@ export default {
                * 2、20、21、3、31: 正常(所有用户可操作:下载、查看历史)
                * 2、20、21、3、31: 正常(所有用户可操作:下载、查看历史)
                * 4: 正常(所有用户可操作:下载、替换、查看历史)
                * 4: 正常(所有用户可操作:下载、替换、查看历史)
                */
                */
-              if (item.status == 2 || item.status == 20 || item.status == 21 || item.status == 3 || item.status == 31 || item.status == 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 {
               } else {
                 Object.assign(item, { precent: 100 });
                 Object.assign(item, { precent: 100 });
                 if (this.persentList.length != 0) {
                 if (this.persentList.length != 0) {
                   this.persentList.forEach(pItem => {
                   this.persentList.forEach(pItem => {
-                    if (item.id == pItem.Id) {
+                    if (item.Id == pItem.Id) {
                       Object.assign(item, { precent: pItem.precent ? pItem.precent : 0 });
                       Object.assign(item, { precent: pItem.precent ? pItem.precent : 0 });
                     }
                     }
                   });
                   });
@@ -254,7 +247,7 @@ export default {
               //   request.deleteModelFileList({Id: item.CurrentModelId}, res => {console.log('删除错误模型:',item.CurrentModelId)})
               //   request.deleteModelFileList({Id: item.CurrentModelId}, res => {console.log('删除错误模型:',item.CurrentModelId)})
               // }
               // }
             });
             });
-            this.tableData = res.content;
+            this.tableData = res.Content;
             this.tableLoading = false;
             this.tableLoading = false;
             resolve();
             resolve();
           });
           });
@@ -291,16 +284,16 @@ export default {
     //更新模型文件;
     //更新模型文件;
     updateModelFile(data) {
     updateModelFile(data) {
       let params = {
       let params = {
-        fileName: data.file.name,
-        floorName: data.replaceModelItem.FloorName,
-        folderId: data.replaceModelItem.FolderId,
-        revitVersion: data.revitVersion,
-        note: data.replaceModelItem.Note,
-        projectId: this.projectId,
-        replaceReason: 0,
-        size: data.file.size,
-        userName: this.userInfo.userName,
-        userId: this.userInfo.userId
+        FileName: data.file.name,
+        FloorName: data.replaceModelItem.FloorName,
+        FolderId: data.replaceModelItem.FolderId,
+        RevitVersion: data.revitVersion,
+        Note: data.replaceModelItem.Note,
+        ProjectId: this.projectId,
+        ReplaceReason: 0,
+        Size: data.file.size,
+        UserName: this.userInfo.userName,
+        UserId: this.userInfo.userId
       };
       };
       //  替换模型文件
       //  替换模型文件
       request.modelFileUpload(params, res => {
       request.modelFileUpload(params, res => {
@@ -311,14 +304,14 @@ export default {
         });
         });
         // 修改precent得值
         // 修改precent得值
         this.tableData.map(item => {
         this.tableData.map(item => {
-          if (item.id == data.replaceModelItem.Id) {
+          if (item.Id == data.replaceModelItem.Id) {
             item.precent = 0;
             item.precent = 0;
           }
           }
         });
         });
         this.queryFloorFile(this.currentFolderId);
         this.queryFloorFile(this.currentFolderId);
         Bus.$emit('openUploader', {
         Bus.$emit('openUploader', {
-          uploadId: res.uploadId,
-          modelId: res.modelId,
+          uploadId: res.UploadId,
+          modelId: res.ModelId,
           systemId: 'revit', //系统名称
           systemId: 'revit', //系统名称
           secret: '63afbef6906c342b', //系统密码
           secret: '63afbef6906c342b', //系统密码
         }, data.file.raw)
         }, data.file.raw)
@@ -326,16 +319,16 @@ export default {
     },
     },
     //查看模型日志
     //查看模型日志
     queryModelLog(item) {
     queryModelLog(item) {
-      this.FloorModelId = item.id; //楼层模型文件
+      this.FloorModelId = item.Id; //楼层模型文件
       request.queryModelFile(this.FloorModelId, res => {
       request.queryModelFile(this.FloorModelId, res => {
-        this.logData = res.content;
+        this.logData = res.Content;
         this.modelLogVisible = true;
         this.modelLogVisible = true;
       });
       });
     },
     },
     // 刷新日志
     // 刷新日志
     updataLog() {
     updataLog() {
       request.queryModelFile(this.FloorModelId, res => {
       request.queryModelFile(this.FloorModelId, res => {
-        this.logData = res.content;
+        this.logData = res.Content;
       });
       });
     },
     },
   },
   },

+ 18 - 19
src/views/model/file/pathcontrol/index.vue

@@ -388,14 +388,14 @@ export default {
     // 获取流转状态
     // 获取流转状态
     getMessage() {
     getMessage() {
       let pa = {
       let pa = {
-        filters: `id="${this.Id}"`
+        Filters: `Id="${this.Id}"`
       }
       }
       modelPathControl(pa, res => {
       modelPathControl(pa, res => {
-        if (res.content.length) {
-          const data = res.content[0];
-          if (data.schedulerExport && data.schedulerExport.beginTime) {
-            if (data.modelExport) {
-              data.modelExport.beginTime = data.schedulerExport.beginTime
+        if (res.Content.length) {
+          const data = res.Content[0];
+          if (data.SchedulerExport && data.SchedulerExport.BeginTime) {
+            if (data.ModelExport) {
+              data.ModelExport.BeginTime = data.SchedulerExport.BeginTime
             }
             }
           }
           }
           this.updateData(data);
           this.updateData(data);
@@ -417,10 +417,10 @@ export default {
     //
     //
     getUnassignNum() {
     getUnassignNum() {
       let pa = {
       let pa = {
-        filters: `status=0 or status=1 or status=2`
+        Filters: `Status=0 or Status=1 or Status=2`
       }
       }
       unassignQuery(pa, res => {
       unassignQuery(pa, res => {
-        this.waitAssign = res.total
+        this.waitAssign = res.Total
       })
       })
     },
     },
     // 定时器
     // 定时器
@@ -435,17 +435,16 @@ export default {
     },
     },
     // 计算耗时
     // 计算耗时
     updateData(data) {
     updateData(data) {
-      debugger
-      this.JsonAnalysis = this.formatTime(data.jsonAnalysis || {});
-      this.ModelCheck = this.formatTime(data.modelCheck || {})
-      this.ModelExport = this.formatTime(data.modelExport || {})
-      this.MultiFloorCheck = this.formatTime(data.multiFloorCheck || {})
-      this.SaveData = this.formatTime(data.saveData || {})
-      this.SchedulerCheck = this.formatTime(data.schedulerCheck || {})
-      this.SchedulerExport = this.formatTime(data.schedulerExport || {})
-      this.UploadState = this.formatTime(data.uploadState || {})
-      this.SyncDatacenter = this.formatTime(data.syncDatacenter || {})
-      this.SaveLog = this.formatTime(data.saveLog || {})
+      this.JsonAnalysis = this.formatTime(data.JsonAnalysis || {});
+      this.ModelCheck = this.formatTime(data.ModelCheck || {})
+      this.ModelExport = this.formatTime(data.ModelExport || {})
+      this.MultiFloorCheck = this.formatTime(data.MultiFloorCheck || {})
+      this.SaveData = this.formatTime(data.SaveData || {})
+      this.SchedulerCheck = this.formatTime(data.SchedulerCheck || {})
+      this.SchedulerExport = this.formatTime(data.SchedulerExport || {})
+      this.UploadState = this.formatTime(data.UploadState || {})
+      this.SyncDatacenter = this.formatTime(data.SyncDatacenter || {})
+      this.SaveLog = this.formatTime(data.SaveLog || {})
       if (this.UploadState.BeginTime) {
       if (this.UploadState.BeginTime) {
         let temp = { BeginTime: this.UploadState.BeginTime }
         let temp = { BeginTime: this.UploadState.BeginTime }
         if (this.SaveLog.EndTime) {
         if (this.SaveLog.EndTime) {

+ 277 - 293
src/views/model/report/index.vue

@@ -2,13 +2,13 @@
   <div class="report-index">
   <div class="report-index">
     <div class="statistics">
     <div class="statistics">
       <div class="building">
       <div class="building">
-        <p>建筑模型文件夹:<b>{{ ModelFileCount }}</b></p>
+        <p>建筑模型文件夹:<b>{{ModelFileCount}}</b></p>
       </div>
       </div>
       <div class="includefloor">
       <div class="includefloor">
-        <p>包含楼层模型文件:<b>{{ modelFloorCount }}</b></p>
+        <p>包含楼层模型文件:<b>{{modelFloorCount}}</b></p>
       </div>
       </div>
       <div class="problematic">
       <div class="problematic">
-        <p>检查出问题的楼层模型文件:<b>{{ problemCount }}</b></p>
+        <p>检查出问题的楼层模型文件:<b>{{problemCount}}</b></p>
       </div>
       </div>
     </div>
     </div>
     <div class="main-content">
     <div class="main-content">
@@ -17,8 +17,7 @@
           <template v-for="(item,index) in tableList">
           <template v-for="(item,index) in tableList">
             <el-tab-pane :name="item.Code" :key="index" :label="item.Name">
             <el-tab-pane :name="item.Code" :key="index" :label="item.Name">
               <span slot="label">
               <span slot="label">
-                <i :class="item.flag?'msg-icon el-icon-success success-color':'msg-icon el-icon-error error-color'"
-                   style="font-size:14px;"></i>
+                <i :class="item.flag?'msg-icon el-icon-success success-color':'msg-icon el-icon-error error-color'" style="font-size:14px;"></i>
                 <span>{{ item.Name }}</span>
                 <span>{{ item.Name }}</span>
               </span>
               </span>
             </el-tab-pane>
             </el-tab-pane>
@@ -27,10 +26,9 @@
       </div>
       </div>
       <div class="content-box">
       <div class="content-box">
         <div class="button">
         <div class="button">
-          <el-button @click="del" :disabled="toBeDelCount?false:true" :title="toBeDelCount ? '':'没有待删除的设备'">需从模型中删除的设备
+          <el-button @click="del"  :disabled="toBeDelCount?false:true" :title="toBeDelCount ? '':'没有待删除的设备'">需从模型中删除的设备
           </el-button>
           </el-button>
-          <el-button @click="supplement" :disabled="toBeSuppCount?false:true" :title="toBeSuppCount ? '':'没有待补充的设备'">
-            模型待补充的设备
+          <el-button @click="supplement" :disabled="toBeSuppCount?false:true" :title="toBeSuppCount ? '':'没有待补充的设备'">模型待补充的设备
           </el-button>
           </el-button>
           <el-button :loading="load" @click='getExportReport'>导出模型问题报告</el-button>
           <el-button :loading="load" @click='getExportReport'>导出模型问题报告</el-button>
         </div>
         </div>
@@ -62,8 +60,7 @@
             </el-table-column>
             </el-table-column>
             <el-table-column prop="questionItem" label="有问题的检查项" fixed width="150" style="border-right:1px solid red">
             <el-table-column prop="questionItem" label="有问题的检查项" fixed width="150" style="border-right:1px solid red">
               <template slot-scope="scope">
               <template slot-scope="scope">
-                <el-badge :value="scope.row.questionItem" class="item"
-                          :type='scope.row.questionItem?"warning":"success"'>
+                <el-badge :value="scope.row.questionItem" class="item" :type='scope.row.questionItem?"warning":"success"'>
                 </el-badge>
                 </el-badge>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
@@ -132,8 +129,7 @@
             </el-table-column>
             </el-table-column>
             <el-table-column prop="SystemReferEquipCheck" label='管网及相关设备检查' width="200">
             <el-table-column prop="SystemReferEquipCheck" label='管网及相关设备检查' width="200">
               <template slot-scope="scope">
               <template slot-scope="scope">
-                <el-badge :type='scope.row.SystemReferEquipCheck?"danger":"success"'
-                          :value="scope.row.SystemReferEquipCheck"
+                <el-badge :type='scope.row.SystemReferEquipCheck?"danger":"success"' :value="scope.row.SystemReferEquipCheck"
                           class="item"
                           class="item"
                           v-if="scope.row.SystemReferEquipCheck"/>
                           v-if="scope.row.SystemReferEquipCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
@@ -164,10 +160,8 @@
               </div>
               </div>
             </template>
             </template>
           </el-table>
           </el-table>
-          <el-pagination class="right" @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                         :current-page="page.pageNumber"
-                         :page-sizes="page.pageSizes" :page-size="page.pageSize"
-                         layout="total, sizes, prev, pager, next, jumper" :total="page.total">
+          <el-pagination class="right" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page.pageNumber"
+                         :page-sizes="page.pageSizes" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="page.total">
           </el-pagination>
           </el-pagination>
         </div>
         </div>
       </div>
       </div>
@@ -176,315 +170,305 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { mapGetters } from "vuex";
-import dasBoard from "@/views/dasboard/index";
-import { queryFloorList, queryLostReportList, queryModel, queryReportList } from "@/api/model/report.js";
-import { getSupplement, getToBeDelEquip } from "@/api/scan/request.js";
-import axios from 'axios'
+  import {mapGetters} from "vuex";
+  import dasBoard from "@/views/dasboard/index";
+  import {queryFloorList, queryLostReportList, queryModel, queryReportList} from "@/api/model/report.js";
+  import {getSupplement, getToBeDelEquip} from "@/api/scan/request.js";
+  import axios from 'axios'
 
 
-export default {
-  components: {
-    dasBoard
-  },
-  data() {
-    return {
-      params: null,
-      ModelFileCount: null,// 模型文件夹数量
-      modelFloorCount: null,// 包含楼层模型文件数量
-      problemCount: 0,// 检查出问题的楼层模型文件数量
-      tableList: [], // tab数据
-      tableData: [],// 列表数据
-      activeTab: '', // tab当前选中项
-      headerStyle: { // 列表样式
-        backgroundColor: '#e1e4e5',
-        color: '#2b2b2b',
-        lineHeight: '30px'
-      },
-      page: {
-        pageSize: 50,
-        pageSizes: [10, 20, 50, 100],
-        pageNumber: 1,
-        total: 0
-      },
-      loading: false,
-      load: false,
-      floorIconType: null,
-      toBeSuppCount: 0,
-      toBeDelCount: 0
-    }
-  },
-  mounted() {
-  },
-  created() {
-    this.params = {
-      Orders: "Name asc"
-    }
-    this.getModelFileCount();
-    this.getModelFloorCount();
-  },
-  computed: {
-    ...mapGetters('layout', ['projectId'])
-  },
-  methods: {
-    cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (column.label !== '模型楼层' && column.label !== '待删除设备数量' && column.label !== '待补充设备数量' && column.label !== '有问题的检查项') {
-        return {
-          background: '#f3f3f3',
+  export default {
+    components: {
+      dasBoard
+    },
+    data() {
+      return {
+        params: null,
+        ModelFileCount: null,// 模型文件夹数量
+        modelFloorCount: null,// 包含楼层模型文件数量
+        problemCount: 0,// 检查出问题的楼层模型文件数量
+        tableList: [], // tab数据
+        tableData: [],// 列表数据
+        activeTab: '', // tab当前选中项
+        headerStyle: { // 列表样式
+          backgroundColor: '#e1e4e5',
+          color: '#2b2b2b',
           lineHeight: '30px'
           lineHeight: '30px'
-        }
+        },
+        page: {
+          pageSize: 50,
+          pageSizes: [10, 20, 50, 100],
+          pageNumber: 1,
+          total: 0
+        },
+        loading: false,
+        load: false,
+        floorIconType: null,
+        toBeSuppCount: 0,
+        toBeDelCount: 0
       }
       }
     },
     },
-    getModelFloorCount() {// 获取楼层模型文件数量,计算出检查出问题的模型文件
-      let promise1 = new Promise(resolve => {
-        queryFloorList({ filters: "status=4", pageNumber: 1, pageSize: 500 }, res => {
-          resolve(res);
-        })
-      })
-      Promise.all([promise1]).then(response => {
-        this.problemCount = 0;
-        let res = response[0];
-        this.modelFloorCount = res.total;
-        this.modelFloor = res.content;
-        this.getModelFileIcon();
-        this.modelFloor.forEach(item => {
-          if (!item.dataCheckResult) {
-            this.problemCount++;
+    mounted() { },
+    created() {
+      this.params = {
+        Orders: "Name asc"
+      }
+      this.getModelFileCount();
+      this.getModelFloorCount();
+    },
+    computed: {
+      ...mapGetters('layout', ['projectId'])
+    },
+    methods: {
+      cellStyle({row, column, rowIndex, columnIndex}) {
+        if (column.label !== '模型楼层' && column.label !== '待删除设备数量' && column.label !== '待补充设备数量' && column.label !== '有问题的检查项') {
+          return {
+            background: '#f3f3f3',
+            lineHeight: '30px'
           }
           }
+        }
+      },
+      getModelFloorCount() {// 获取楼层模型文件数量,计算出检查出问题的模型文件
+        let promise1 = new Promise(resolve => {
+          queryFloorList({Filters:"Status=4",pageNumber:1,PageSize: 500}, res => {
+            resolve(res);
+          })
         })
         })
-      })
-    },
-    getModelFileIcon() {// 计算文件夹的图标
-      this.tableList.forEach(item => {
-        this.modelFloor.forEach(it => {
-          if (item.Code === it.folderId) {
+        Promise.all([promise1]).then(response => {
+          this.problemCount = 0;
+          let res = response[0];
+          this.modelFloorCount = res.Total;
+          this.modelFloor = res.Content;
+          this.getModelFileIcon();
+          this.modelFloor.forEach(item => {
             if (!item.DataCheckResult) {
             if (!item.DataCheckResult) {
-              item.flag = false;
+              this.problemCount++;
             }
             }
-          }
-        })
-      })
-    },
-    getData(tab) {// 切换tab时执行
-      this.getModelFloor();
-    },
-    getModelFileCount() {// 获取项目下所有模型文件夹
-      let params = {
-        orders: "name asc"
-      }
-      queryModel(params, res => {
-        this.ModelFileCount = res.content.length;
-        this.tableList = res.content;
-        if (this.tableList && this.tableList.length) {
-          this.tableList.forEach((item, index) => {
-            item.code = item.id;
           })
           })
-          this.activeTab = this.tableList[0].code;// 默认选中第一个模型文件夹
-        }
-        this.getModelFloor();
-      });
-    },
-    getModelFloor() {// 获取当前楼层下的模型楼层和各个检查项的数据
-      let params = {
-        ProjectId: this.projectId,
-        Id: `${this.activeTab}`,
-        PageNumber: this.page.pageNumber,
-        PageSize: this.page.pageSize
-      }
-      queryReportList(params, res => {
-        this.FloorName = res.Content;
-        this.tableData = [];
-        if (this.FloorName && this.FloorName.length) {
-          this.loading = true;
-          let i = 0;
-          this.FloorName.forEach(item => {
-            item.questionItem = 0;
-            for (let key in item) {
-              if (item[key] > 0 && key !== "FloorName" && key !== "questionItem") {
-                i += 1;
-                item.questionItem += 1;
+        })
+      },
+      getModelFileIcon() {// 计算文件夹的图标
+        this.tableList.forEach(item => {
+          this.modelFloor.forEach(it => {
+            if (item.Code === it.FolderId) {
+              if (!item.DataCheckResult) {
+                item.flag = false;
               }
               }
             }
             }
           })
           })
-          this.floorIconType = i;
-        }
-        this.getLostModelFloor();
-      })
-    },
-    getLostModelFloor() {// 获取缺失楼层
-      let params = {
-        ProjectId: this.projectId,
-        Filters: `FolderId='${this.activeTab}';Status=4`
-      }
-      queryLostReportList(params, res => {
-        this.LostFloorName = res.Content;
-        this.getToBeCount();
-      })
-    },
-    getToBeCount() {// 根据模型ID获取待删除数量和待补充数量
-      let equipComDelList = [],
-        toBeAdded = []
-      this.equipComDelList = [];
-      this.LostFloorName.forEach(item => {
-        if (item.CurrentModelId) {
-          equipComDelList.push({
-            ModelId: item.CurrentModelId
-          });
-          this.equipComDelList.push(item.CurrentModelId)
-        } else {
-          item.flag = 'lost';
-          item.FloorName = `${item.Note + item.FloorName}`
-        }
-        if (item.Id) {
-          toBeAdded.push({
-            ModelId: item.Id
-          })
+        })
+      },
+      getData(tab) {// 切换tab时执行
+        this.getModelFloor();
+      },
+      getModelFileCount() {// 获取项目下所有模型文件夹
+        queryModel(this.params, res => {
+          this.ModelFileCount = res.Content.length;
+          this.tableList = res.Content;
+          if (this.tableList && this.tableList.length) {
+            this.tableList.forEach((item, index) => {
+              item.Code = item.Id;
+            })
+            this.activeTab = this.tableList[0].Code;// 默认选中第一个模型文件夹
+          }
+          this.getModelFloor();
+        });
+      },
+      getModelFloor() {// 获取当前楼层下的模型楼层和各个检查项的数据
+        let params = {
+          ProjectId: this.projectId,
+          Id: `${this.activeTab}`,
+          PageNumber: this.page.pageNumber,
+          PageSize: this.page.pageSize
         }
         }
-      })
-      let params = {
-        ProjectId: this.projectId,
-        data: equipComDelList
-      }, paramsToBe = {
-        ProjectId: this.projectId,
-        data: toBeAdded
-      }
-      let promise1 = new Promise(resolve => {
-        getToBeDelEquip(params, res => {
-          resolve(res);
+        queryReportList(params, res => {
+          this.FloorName = res.Content;
+          this.tableData = [];
+          if (this.FloorName && this.FloorName.length) {
+            this.loading = true;
+            let i = 0;
+            this.FloorName.forEach(item => {
+              item.questionItem = 0;
+              for (let key in item) {
+                if (item[key] > 0 && key !== "FloorName" && key !== "questionItem") {
+                  i += 1;
+                  item.questionItem += 1;
+                }
+              }
+            })
+            this.floorIconType = i;
+          }
+          this.getLostModelFloor();
         })
         })
-      })
-      let promise2 = new Promise(resolve => {
-        getSupplement(paramsToBe, res => {
-          resolve(res);
+      },
+      getLostModelFloor() {// 获取缺失楼层
+        let params = {
+          ProjectId: this.projectId,
+          Filters: `FolderId='${this.activeTab}';Status=4`
+        }
+        queryLostReportList(params, res => {
+          this.LostFloorName = res.Content;
+          this.getToBeCount();
         })
         })
-      })
-      Promise.all([promise1, promise2]).then(response => {
-        let res = response[0];
-        let res1 = response[1];
-        this.toBeDelCount = 0;
-        this.toBeSuppCount = 0;
-        res.Content.forEach(item => {
-          if (item.Count > 0) {
-            this.toBeDelCount += 1;
+      },
+      getToBeCount() {// 根据模型ID获取待删除数量和待补充数量
+        let equipComDelList = [],
+          toBeAdded = []
+        this.equipComDelList = [];
+        this.LostFloorName.forEach(item => {
+          if (item.CurrentModelId) {
+            equipComDelList.push({
+              ModelId: item.CurrentModelId
+            });
+            this.equipComDelList.push(item.CurrentModelId)
+          } else {
+            item.flag = 'lost';
+            item.FloorName = `${item.Note + item.FloorName}`
           }
           }
-          this.LostFloorName.forEach(it => {
-            if (item.ModelId === it.CurrentModelId) {
-              it.toBeDel = item.Count;
-            }
+          if (item.Id) {
+            toBeAdded.push({
+              ModelId: item.Id
+            })
+          }
+        })
+        let params = {
+          ProjectId: this.projectId,
+          data: equipComDelList
+        }, paramsToBe = {
+          ProjectId: this.projectId,
+          data: toBeAdded
+        }
+        let promise1 = new Promise(resolve => {
+          getToBeDelEquip(params, res => {
+            resolve(res);
           })
           })
         })
         })
-        res1.Content.forEach(item => {
-          if (item.Count > 0) {
-            this.toBeSuppCount += 1;
-          }
-          this.LostFloorName.forEach(it => {
-            if (item.ModelId === it.Id) {
-              it.toBeSupplement = item.Count;
-            }
+        let promise2 = new Promise(resolve => {
+          getSupplement(paramsToBe, res => {
+            resolve(res);
           })
           })
         })
         })
-        if (this.LostFloorName && this.LostFloorName.length) {
-          this.LostFloorName.forEach(item => {
-            this.FloorName.forEach(it => {
-              if (item.FloorName === it.FloorName) {
-                for (let key in it) {
-                  item[key] = it[key];
-                }
+        Promise.all([promise1, promise2]).then(response => {
+          let res = response[0];
+          let res1 = response[1];
+          this.toBeDelCount = 0;
+          this.toBeSuppCount = 0;
+          res.Content.forEach(item => {
+            if (item.Count > 0) {
+              this.toBeDelCount += 1;
+            }
+            this.LostFloorName.forEach(it => {
+              if (item.ModelId === it.CurrentModelId) {
+                it.toBeDel = item.Count;
               }
               }
             })
             })
           })
           })
-          this.tableData = this.LostFloorName;
-        } else {
-          this.tableData = [];
-        }
-        this.page.total = this.tableData.length;
-        this.loading = false;
-      })
-    },
-    del() {// 点击需从模型中删除的设备
-      let equipComDelList = encodeURIComponent(JSON.stringify(this.equipComDelList));
-      let jumpRouter = this.$router.resolve({
-        path: '/model/report/deleted',
-        query: { equipComDelList: equipComDelList }
-      })
-      window.open(jumpRouter.href, '_blank')
-    },
-    supplement() {// 点击模型待补充的设备
-      let equipComDelList = encodeURIComponent(JSON.stringify(this.equipComDelList));
-      let jumpRouter = this.$router.resolve({
-        path: '/model/report/supplement',
-        query: { equipComDelList: equipComDelList }
-      })
-      window.open(jumpRouter.href, '_blank')
-    },
-    getExportReport() {// 导出模型问题报告
-      let that = this;
-      this.load = true;
-      axios({
-        method: 'post',
-        url: `/modelapi/report/non-blocking`,
-        data: {
-          Id: this.activeTab,
-          ProjectId: this.projectId
-        },
-        headers: {
-          ProjectId: this.projectId
-        },
-        responseType: 'blob'
-      }).then(function (res) {
-        if (res.data.type == 'application/vnd.ms-excel') {
-          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel;charset=utf-8' });
-          let fileName = decodeURI(res.headers['content-disposition']);
-          if (fileName)
-            fileName = fileName.substring(fileName.indexOf('=') + 1);
-          if ('download' in document.createElement('a')) { // 非IE下载
-            const elink = document.createElement('a')
-            elink.download = fileName
-            elink.style.display = 'none'
-            elink.href = URL.createObjectURL(blob)
-            document.body.appendChild(elink)
-            elink.click()
-            URL.revokeObjectURL(elink.href) // 释放URL 对象
-            document.body.removeChild(elink)
-            that.load = false;
-          } else { // IE10+下载
-            navigator.msSaveBlob(blob, fileName)
-            that.load = false;
+          res1.Content.forEach(item => {
+            if (item.Count > 0) {
+              this.toBeSuppCount += 1;
+            }
+            this.LostFloorName.forEach(it => {
+              if (item.ModelId === it.Id) {
+                it.toBeSupplement = item.Count;
+              }
+            })
+          })
+          if (this.LostFloorName && this.LostFloorName.length) {
+            this.LostFloorName.forEach(item => {
+              this.FloorName.forEach(it => {
+                if (item.FloorName === it.FloorName) {
+                  for (let key in it) {
+                    item[key] = it[key];
+                  }
+                }
+              })
+            })
+            this.tableData = this.LostFloorName;
+          } else {
+            this.tableData = [];
           }
           }
-        } else {
-          let reader = new FileReader()
-          reader.onload = e => {
-            if (e.target.readyState === 2) {
-              let res = {}
+          this.page.total = this.tableData.length;
+          this.loading = false;
+        })
+      },
+      del() {// 点击需从模型中删除的设备
+        let equipComDelList = encodeURIComponent(JSON.stringify(this.equipComDelList));
+        let jumpRouter = this.$router.resolve({ path: '/model/report/deleted', query: { equipComDelList: equipComDelList } })
+        window.open(jumpRouter.href, '_blank')
+      },
+      supplement() {// 点击模型待补充的设备
+        let equipComDelList = encodeURIComponent(JSON.stringify(this.equipComDelList));
+        let jumpRouter = this.$router.resolve({ path: '/model/report/supplement', query: { equipComDelList: equipComDelList } })
+        window.open(jumpRouter.href, '_blank')
+      },
+      getExportReport() {// 导出模型问题报告
+        let that = this;
+        this.load = true;
+        axios({
+          method: 'post',
+          url: `/modelapi/report/non-blocking`,
+          data: {
+            Id: this.activeTab,
+            ProjectId: this.projectId
+          },
+          headers: {
+            ProjectId: this.projectId
+          },
+          responseType: 'blob'
+        }).then(function (res) {
+          if (res.data.type == 'application/vnd.ms-excel') {
+            let blob = new Blob([res.data], { type: 'application/vnd.ms-excel;charset=utf-8' });
+            let fileName = decodeURI(res.headers['content-disposition']);
+            if (fileName)
+              fileName = fileName.substring(fileName.indexOf('=') + 1);
+            if ('download' in document.createElement('a')) { // 非IE下载
+              const elink = document.createElement('a')
+              elink.download = fileName
+              elink.style.display = 'none'
+              elink.href = URL.createObjectURL(blob)
+              document.body.appendChild(elink)
+              elink.click()
+              URL.revokeObjectURL(elink.href) // 释放URL 对象
+              document.body.removeChild(elink)
+              that.load = false;
+            } else { // IE10+下载
+              navigator.msSaveBlob(blob, fileName)
               that.load = false;
               that.load = false;
-              res = JSON.parse(e.target.result)
-              that.$message.error(res.Message);
             }
             }
+          } else {
+            let reader = new FileReader()
+            reader.onload = e => {
+              if (e.target.readyState === 2) {
+                let res = {}
+                that.load = false;
+                res = JSON.parse(e.target.result)
+                that.$message.error(res.Message);
+              }
+            }
+            reader.readAsText(res.data)
           }
           }
-          reader.readAsText(res.data)
+        })
+      },
+      tableRowClassName({ row, rowIndex, column }) {// 设置缺失楼层所在行的背景色
+        if (row.flag && row.flag === 'lost') {
+          return 'warning-row';
         }
         }
-      })
-    },
-    tableRowClassName({ row, rowIndex, column }) {// 设置缺失楼层所在行的背景色
-      if (row.flag && row.flag === 'lost') {
-        return 'warning-row';
+      },
+      handleSizeChange(val) {// 切换每页显示数量
+        this.page.pageSize = val;
+        this.getModelFloor();
+      },
+      handleCurrentChange(val) {// 切换页码
+        this.page.pageNumber = val;
+        this.getModelFloor();
       }
       }
     },
     },
-    handleSizeChange(val) {// 切换每页显示数量
-      this.page.pageSize = val;
-      this.getModelFloor();
-    },
-    handleCurrentChange(val) {// 切换页码
-      this.page.pageNumber = val;
-      this.getModelFloor();
-    }
-  },
-  watch: {
-    projectId() {
-      this.getModelFileCount();
-      this.getModelFloorCount();
+    watch: {
+      projectId() {
+        this.getModelFileCount();
+        this.getModelFloorCount();
+      }
     }
     }
   }
   }
-}
 </script>
 </script>
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>

+ 14 - 14
src/views/ready/buildfloor/drawGraphy/checkGraphy.vue

@@ -119,12 +119,12 @@ export default {
         return
         return
       }
       }
       let pa = {
       let pa = {
-        floorId: this.floor.FloorID,
-        buildingId: this.floor.BuildID,
-        cover: true,
+        FloorId: this.floor.FloorID,
+        BuildingId: this.floor.BuildID,
+        Cover: true,
       }
       }
       if (this.jsonKey) {
       if (this.jsonKey) {
-        pa.id = this.modelIdToFloorId[this.jsonKey]
+        pa.Id = this.modelIdToFloorId[this.jsonKey]
         bindFloorModel(pa, (res) => {
         bindFloorModel(pa, (res) => {
           this.$message.success('更新成功')
           this.$message.success('更新成功')
           this.handleClose()
           this.handleClose()
@@ -152,16 +152,16 @@ export default {
     // 通过id查询文件夹下模型文件
     // 通过id查询文件夹下模型文件
     handleItemChange(val) {
     handleItemChange(val) {
       let data = {
       let data = {
-        folderId: val[0],
-        status: '4',
-        projectId: this.projectId,
+        FolderId: val[0],
+        Status: '4',
+        ProjectId: this.projectId,
       }
       }
       request.queryFloorList(data, (res) => {
       request.queryFloorList(data, (res) => {
-        let tempArr = res.content.map((t) => {
-          this.modelIdToFloorId[t.currentModelId] = t.id
+        let tempArr = res.Content.map((t) => {
+          this.modelIdToFloorId[t.CurrentModelId] = t.Id
           return {
           return {
-            value: t.currentModelId,
-            label: t.floorName,
+            value: t.CurrentModelId,
+            label: t.FloorName,
           }
           }
         })
         })
         console.log(tempArr, 'tempArr')
         console.log(tempArr, 'tempArr')
@@ -186,10 +186,10 @@ export default {
     // 获取文件夹
     // 获取文件夹
     getDirectory() {
     getDirectory() {
       request.queryModel('', (res) => {
       request.queryModel('', (res) => {
-        this.options = res.content.map((t) => {
+        this.options = res.Content.map((t) => {
           return {
           return {
-            value: t.id,
-            label: t.name,
+            value: t.Id,
+            label: t.Name,
             children: [],
             children: [],
           }
           }
         })
         })

+ 14 - 15
src/views/ready/buildfloor/repetitionGraphy.vue

@@ -7,7 +7,7 @@
       <el-button v-if='(sign||otherSign)&&!isEdit' size='mini' @click='editGraphy'>编辑平面图</el-button>
       <el-button v-if='(sign||otherSign)&&!isEdit' size='mini' @click='editGraphy'>编辑平面图</el-button>
       <el-button v-if='isEdit' size='mini' @click='cancel'>取消</el-button>
       <el-button v-if='isEdit' size='mini' @click='cancel'>取消</el-button>
       <el-button v-if='isEdit' size='mini' @click='confirm' type='primary'>确认</el-button>
       <el-button v-if='isEdit' size='mini' @click='confirm' type='primary'>确认</el-button>
-      <span style='float:right;' v-if='file.folderName'>当前对应的模型文件:{{ file.folderName }} - {{ file.floorName }}</span>
+      <span style='float:right;' v-if='file.FolderName'>当前对应的模型文件:{{ file.FolderName }} - {{ file.FloorName }}</span>
     </div>
     </div>
     <!-- 展示图片 -->
     <!-- 展示图片 -->
     <div class='drawImg'>
     <div class='drawImg'>
@@ -20,8 +20,8 @@
 <script>
 <script>
 import drawFloor from './drawGraphy/drawFloor'
 import drawFloor from './drawGraphy/drawFloor'
 import checkGraphy from './drawGraphy/checkGraphy' //查看图片
 import checkGraphy from './drawGraphy/checkGraphy' //查看图片
-import {floorUpdateOutline, floorQueryAndSign} from '@/api/scan/request'
-import {getFileNameById} from '@/api/model/file'
+import { floorUpdateOutline, floorQueryAndSign } from '@/api/scan/request'
+import { getFileNameById } from '@/api/model/file'
 
 
 export default {
 export default {
   components: {
   components: {
@@ -59,11 +59,11 @@ export default {
     },
     },
     // 返回路由
     // 返回路由
     backRouter() {
     backRouter() {
-      this.$router.push({name: 'buildFloor'})
+      this.$router.push({ name: 'buildFloor' })
     },
     },
     // 替换模型文件
     // 替换模型文件
     changeGraphy() {
     changeGraphy() {
-      this.$refs.checkGraphy.showDialog({FloorID: this.FloorID, BuildID: this.BuildID})
+      this.$refs.checkGraphy.showDialog({ FloorID: this.FloorID, BuildID: this.BuildID })
     },
     },
     // 确认保存
     // 确认保存
     confirm() {
     confirm() {
@@ -88,8 +88,8 @@ export default {
         })
         })
       }
       }
       let pa = {
       let pa = {
-        content: [{id: this.FloorID, outline: Outline}],
-        Projection: ['outline'],
+        Content: [{ FloorID: this.FloorID, Outline: Outline }],
+        Projection: ['Outline'],
       }
       }
       floorUpdateOutline(pa, (res) => {
       floorUpdateOutline(pa, (res) => {
         this.isEdit = false
         this.isEdit = false
@@ -114,7 +114,7 @@ export default {
     getFileName(modelId) {
     getFileName(modelId) {
       if (!modelId) return
       if (!modelId) return
       let pa = {
       let pa = {
-        id: modelId,
+        Id: modelId,
       }
       }
       getFileNameById(pa, (res) => {
       getFileNameById(pa, (res) => {
         this.file = res
         this.file = res
@@ -122,17 +122,16 @@ export default {
     },
     },
     // 获取楼层
     // 获取楼层
     getFloorData() {
     getFloorData() {
-      let _this = this
       let floorParam = {
       let floorParam = {
         PageSize: 1000,
         PageSize: 1000,
-        Filters: `buildingId='${this.BuildID}'`,
+        Filters: `BuildID='${this.BuildID}'`,
       }
       }
       floorQueryAndSign(floorParam, (res) => {
       floorQueryAndSign(floorParam, (res) => {
-        this.alreadyRelatedModel = res.content.map((t) => {
-          if (t.id != _this.FloorID) return t.modelId
-          this.sign = t.sign > 0
-          this.FloorName = t.localName
-          this.$refs.drawFloor.buildFloorName = `${this.name}-${this.localName}`
+        this.alreadyRelatedModel = res.Content.map((t) => {
+          if (t.FloorID != this.FloorID) return t.ModelId
+          this.sign = t.Sign > 0
+          this.FloorName = t.FloorLocalName || t.FloorName
+          this.$refs.drawFloor.buildFloorName = `${this.BuildName}-${this.FloorName}`
         }).filter((t) => t)
         }).filter((t) => t)
       })
       })
     },
     },

+ 5 - 5
src/views/screen/splitscreen/equipledger/index.vue

@@ -7,7 +7,7 @@
     </div>
     </div>
     <div class="page-content" id="page-content" v-loading="canvasLoading">
     <div class="page-content" id="page-content" v-loading="canvasLoading">
       <div v-show="showCanvas">
       <div v-show="showCanvas">
-        <p>{{ file.folderName }} - {{ file.floorName }}</p>
+        <p>{{ file.FolderName }} - {{ file.FloorName }}</p>
         <canvas :height="cadHeight" :width="cadWidth" id="floorCanvas" :k="refreshCanvas"></canvas>
         <canvas :height="cadHeight" :width="cadWidth" id="floorCanvas" :k="refreshCanvas"></canvas>
       </div>
       </div>
       <div class="no-data" v-show="!showCanvas">
       <div class="no-data" v-show="!showCanvas">
@@ -48,9 +48,9 @@ export default {
       if (this.equip.ModelId && this.equip.BIMLocation) {
       if (this.equip.ModelId && this.equip.BIMLocation) {
         this.showCanvas = true;
         this.showCanvas = true;
         this.getGraphy();
         this.getGraphy();
-        queryFileByModelId({ filters: `id='${this.equip.ModelId}'` }, res => {
-          if (res.content.length) {
-            this.getFileName(res.content[0].floorModelId);
+        queryFileByModelId({ Filters: `Id='${this.equip.ModelId}'` }, res => {
+          if (res.Content.length) {
+            this.getFileName(res.Content[0].FloorModelId);
           }
           }
         });
         });
       } else {
       } else {
@@ -82,7 +82,7 @@ export default {
     },
     },
     // 获取文件夹及文件名称
     // 获取文件夹及文件名称
     getFileName(id) {
     getFileName(id) {
-      let pa = { id: id }
+      let pa = { Id: id }
       getFileNameById(pa, res => {
       getFileNameById(pa, res => {
         this.file = res
         this.file = res
       })
       })

+ 34 - 31
src/views/system/auth/index.vue

@@ -1,40 +1,43 @@
 <template>
 <template>
-    <div>
-        <h4>请稍候...</h4>
-    </div>
+  <div>
+    <h4>请稍候...</h4>
+  </div>
 </template>
 </template>
 <script>
 <script>
 import { mapGetters, mapMutations } from 'vuex'
 import { mapGetters, mapMutations } from 'vuex'
 import adminapi from '@/api/system/admin'
 import adminapi from '@/api/system/admin'
 import authutils from '@/utils/authutils'
 import authutils from '@/utils/authutils'
+
 export default {
 export default {
-    name: 'index',
-    props: [],
-    data() {
-        return {}
-    },
-    created() {
-        let token = this.$route.query.token
-        console.log(token)
-        this.$store.commit('setSsoToken', token)   
-        console.log(this.$store.state.ssoToken)         
-        this.$store.dispatch('layout/loadUserInfo').then(resp => {
-            console.log('store dispatch result ', resp)
-            // if (resp.result  == 'success') {
-            if (resp.Result  == 'success') {
-                let lastRoute = this.$store.getters['lastRoute']
-                console.log('last route ', lastRoute)
-                if (lastRoute) {
-                    this.$router.replace(lastRoute)
-                } else {
-                    this.$router.replace({path: "/"})
-                }
-            }else{
-                this.$router.replace('/nouser')
-            }
-        })
-    },
-    mounted() {},
-    components: {}
+  name: 'index',
+  props: [],
+  data() {
+    return {}
+  },
+  created() {
+    let token = this.$route.query.token
+    console.log(token)
+    this.$store.commit('setSsoToken', token)
+    console.log(this.$store.state.ssoToken)
+    this.$router.replace({ path: "/" })
+    // this.$store.dispatch('layout/loadUserInfo').then(resp => {
+    //     console.log('store dispatch result ', resp)
+    //     // if (resp.result  == 'success') {
+    //     if (resp.Result  == 'success') {
+    //         let lastRoute = this.$store.getters['lastRoute']
+    //         console.log('last route ', lastRoute)
+    //         if (lastRoute) {
+    //             this.$router.replace(lastRoute)
+    //         } else {
+    //             this.$router.replace({path: "/"})
+    //         }
+    //     }else{
+    //         this.$router.replace('/nouser')
+    //     }
+    // })
+  },
+  mounted() {
+  },
+  components: {}
 }
 }
 </script>
 </script>