Browse Source

adm:feat > 修改config丢失字段

shaun-sheep 4 years ago
parent
commit
50a749a03a

+ 3 - 3
config/index.js

@@ -210,7 +210,7 @@ module.exports = {
         }
       },
       '/api': {
-        target: 'http://60.205.177.43:28888',
+        target: 'http://60.205.177.43:8080',
         changeOrigin: true,
         pathRewrite: {
           "^/api": "/"
@@ -286,7 +286,7 @@ module.exports = {
       '/scanbuilding': {
         // 目标 API 地址
         // target: 'http://192.168.12.238:8080/',
-        target: 'http://60.205.177.43:28888',
+        target: 'http://60.205.177.43:8080',
         // 如果要代理 websockets
         ws: true,
         // 将主机标头的原点更改为目标URL
@@ -306,7 +306,7 @@ module.exports = {
       },
       '/modelapi': {
         // target: 'http://172.16.42.210:8082',
-        target: 'http://mbi.sagacloud.cn:8080/',
+        target: 'http://60.205.177.43:8080/',
         // target: 'http://192.168.20.218:8082',//景灏
         changeOrigin: true,
         pathRewrite: {

+ 298 - 298
src/api/model/file.js

@@ -1,347 +1,347 @@
 import httputils from '@/api/scan/httpUtil'
 import { Message } from 'element-ui';
 import axios from 'axios'
+
 const baseUrl = '/modelapi';
 const revitUrl = '/schedulerapi';
 
 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) {
+  // 查询模型文件夹下的所有模型文件
+  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}'`;
+    }
+    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 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)
-    },
+  //     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)
-    //     })
-    // },
+  // 创建模型文件
+  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)
-    },
+  //准备分片上传模型文件接口
+  modelFileUpload(data, success) {
+    return httputils.postJson(`${baseUrl}/model-file/upload`, data, success)
+  },
 
-    mergeModelFile(data, success) {
-        return httputils.postJson(`${baseUrl}/model-file/merge`, 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 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 获取模型文件夹及文件名
 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) {
-    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) {
-    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) {
-    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) {
-    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) {
-    let url = `${revitUrl}/task/query`;
-    httputils.postJson(url, param, success)
-}
+  let url = `${revitUrl}/task/query`;
+  httputils.postJson(url, param, success)
+}

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

@@ -1,5 +1,29 @@
 import fetch from './fetch'
-import { api, api1, baseUrl, business, physics, venders, zone, object, dictCustom, system, shContainSp, compSpace, shaft, compEquipQuery, statistics, floor, dict, locationPoint, graphicUrl, tenant, dataCenter, classDef } from './config.js'
+import {
+  api,
+  api1,
+  baseUrl,
+  business,
+  physics,
+  venders,
+  zone,
+  object,
+  dictCustom,
+  system,
+  shContainSp,
+  compSpace,
+  shaft,
+  compEquipQuery,
+  statistics,
+  floor,
+  dict,
+  locationPoint,
+  graphicUrl,
+  tenant,
+  dataCenter,
+  classDef,
+  component
+} from './config.js'
 import http from './httpUtil'
 import storage from '@/framework/utils/storage'
 
@@ -1928,7 +1952,8 @@ export function linkSysSh(param, success) {
 
 //根据对象删除系统和设备的关系,只针对一个对象
 export function eqInSysUnlink(param, success) {
-  let url = `${baseUrl}${dataCenter}/sy-in-eq/unlink`;
+  // let url = `${baseUrl}${dataCenter}/sy-in-eq/unlink`;
+  let url = `${baseUrl}${dataCenter}/rel/sy-in-eq/unlink`;
   http.postJson(url, param, success)
 }
 

+ 2 - 2
src/components/ledger/cenote/dialog/addEquipDialog.vue

@@ -106,8 +106,8 @@ export default {
       let params = {
         data: {
           cascade: [{ name: 'equipCategory' }, { name: 'shaftList' }],
-          filters: `not equipId isNull`,
-          orders: "createTime desc, equipId desc",
+          filters: `not id isNull`,
+          orders: "createTime desc, id desc",
           pageNumber: this.page.pageNumber,
           pageSize: this.page.pageSize,
         },

+ 4 - 3
src/components/ledger/system/table/deviceTable.vue

@@ -88,7 +88,8 @@ export default {
         ]
       }
       queryLinkSys(params, res => {
-        this.tableData = res.content[0].equipment || []
+        this.tableData = res.content[0].equipmentList || []
+
       })
     },
     // 删除关系
@@ -100,8 +101,8 @@ export default {
         type: 'warning'
       }).then(() => {
         let params = {
-          EquipId: row.EquipID,
-          SysId: sysId
+          equipId: row.id,
+          sysId: sysId
         }
         this.deleteEqInSh(params);
       }).catch(() => {

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

@@ -53,7 +53,7 @@ export default {
     addFolder() {
       this.$refs["addFolderModel"].validate(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({
                 message: "模型文件夹创建成功",
                 type: "success"
@@ -72,7 +72,7 @@ export default {
       this.$refs["addFolderModel"].resetFields();
     },
     createModel(Name) {
-      return request.createModel({ ProjectId: this.projectId, Name });
+      return request.createModel({ projectId: this.projectId, name:Name });
     }
   },
   watch: {
@@ -81,4 +81,4 @@ export default {
     }
   }
 };
-</script>
+</script>

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

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

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

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

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

@@ -26,7 +26,7 @@
                 <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>
+                  <span :title="item.name">{{item.name}}</span>
                 </li>
               </el-scrollbar>
             </ul>
@@ -122,16 +122,16 @@ export default {
       isJump: true //是否可以调整页面
     };
   },
-  mounted() {
-    // // 文件选择后的回调
-    // Bus.$on('fileAdded', () => {
-    //   console.log('文件已选择')
-    // });
-    // // 文件上传成功的回调
-    // Bus.$on('fileSuccess', () => {
-    //   console.log('文件上传成功')
-    // });
-  },
+  // mounted() {
+  //   // // 文件选择后的回调
+  //   // Bus.$on('fileAdded', () => {
+  //   //   console.log('文件已选择')
+  //   // });
+  //   // // 文件上传成功的回调
+  //   // Bus.$on('fileSuccess', () => {
+  //   //   console.log('文件上传成功')
+  //   // });
+  // },
   destroyed() {
     // Bus.$off('fileAdded');
     // Bus.$off('fileSuccess');
@@ -188,13 +188,13 @@ export default {
       this.navigationModel = [];
       this.loading = true;
       request.queryModel("", res => {
-        this.navigationModel = res.Content;
+        this.navigationModel = res.content;
         this.loading = false;
         if (this.navigationModel.length) {
           //默认选择第一个文件夹
           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);
         } else {
           this.tableData = []
@@ -268,8 +268,8 @@ export default {
     },
     // 上传模型文件
     uploadModelFIle(data) {
-      Bus.$emit('openUploader', { 
-        uploadId: data.uploadId, 
+      Bus.$emit('openUploader', {
+        uploadId: data.uploadId,
         modelId: data.modelId,
         systemId: 'revit', //系统名称
         secret: '63afbef6906c342b', //系统密码
@@ -309,8 +309,8 @@ export default {
           }
         });
         this.queryFloorFile(this.currentFolderId);
-        Bus.$emit('openUploader', { 
-          uploadId: res.UploadId, 
+        Bus.$emit('openUploader', {
+          uploadId: res.UploadId,
           modelId: res.ModelId,
           systemId: 'revit', //系统名称
           secret: '63afbef6906c342b', //系统密码

+ 348 - 332
src/views/model/report/index.vue

@@ -2,13 +2,13 @@
   <div class="report-index">
     <div class="statistics">
       <div class="building">
-        <p>建筑模型文件夹:<b>{{ModelFileCount}}</b></p>
+        <p>建筑模型文件夹:<b>{{ ModelFileCount }}</b></p>
       </div>
       <div class="includefloor">
-        <p>包含楼层模型文件:<b>{{modelFloorCount}}</b></p>
+        <p>包含楼层模型文件:<b>{{ modelFloorCount }}</b></p>
       </div>
       <div class="problematic">
-        <p>检查出问题的楼层模型文件:<b>{{problemCount}}</b></p>
+        <p>检查出问题的楼层模型文件:<b>{{ problemCount }}</b></p>
       </div>
     </div>
     <div class="main-content">
@@ -17,7 +17,8 @@
           <template v-for="(item,index) in tableList">
             <el-tab-pane :name="item.Code" :key="index" :label="item.Name">
               <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>
             </el-tab-pane>
@@ -26,9 +27,10 @@
       </div>
       <div class="content-box">
         <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 @click="supplement" :disabled="toBeSuppCount?false:true" :title="toBeSuppCount ? '':'没有待补充的设备'">模型待补充的设备
+          <el-button @click="supplement" :disabled="toBeSuppCount?false:true" :title="toBeSuppCount ? '':'没有待补充的设备'">
+            模型待补充的设备
           </el-button>
           <el-button :loading="load" @click='getExportReport'>导出模型问题报告</el-button>
         </div>
@@ -60,7 +62,8 @@
             </el-table-column>
             <el-table-column prop="questionItem" label="有问题的检查项" fixed width="150" style="border-right:1px solid red">
               <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>
               </template>
             </el-table-column>
@@ -129,7 +132,8 @@
             </el-table-column>
             <el-table-column prop="SystemReferEquipCheck" label='管网及相关设备检查' width="200">
               <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"
                           v-if="scope.row.SystemReferEquipCheck"/>
                 <i class="msg-icon el-icon-success success-color1" style="font-size:20px;"
@@ -160,8 +164,10 @@
               </div>
             </template>
           </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>
         </div>
       </div>
@@ -170,385 +176,395 @@
 </template>
 
 <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',
+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',
           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',
-            lineHeight: '30px'
+    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++;
           }
-        }
-      },
-      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 => {
+      })
+    },
+    getModelFileIcon() {// 计算文件夹的图标
+      this.tableList.forEach(item => {
+        this.modelFloor.forEach(it => {
+          if (item.Code === it.FolderId) {
             if (!item.DataCheckResult) {
-              this.problemCount++;
+              item.flag = false;
             }
-          })
+          }
         })
-      },
-      getModelFileIcon() {// 计算文件夹的图标
-        this.tableList.forEach(item => {
-          this.modelFloor.forEach(it => {
-            if (item.Code === it.FolderId) {
-              if (!item.DataCheckResult) {
-                item.flag = false;
-              }
-            }
+      })
+    },
+    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;
           })
-        })
-      },
-      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
+          this.activeTab = this.tableList[0].Code;// 默认选中第一个模型文件夹
         }
-        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.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;
               }
-            })
-            this.floorIconType = i;
-          }
-          this.getLostModelFloor();
-        })
-      },
-      getLostModelFloor() {// 获取缺失楼层
-        let params = {
-          ProjectId: this.projectId,
-          Filters: `FolderId='${this.activeTab}';Status=4`
+            }
+          })
+          this.floorIconType = i;
         }
-        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
-            })
-          }
-        })
-        let params = {
-          ProjectId: this.projectId,
-          data: equipComDelList
-        }, paramsToBe = {
-          ProjectId: this.projectId,
-          data: toBeAdded
+        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}`
         }
-        let promise1 = new Promise(resolve => {
-          getToBeDelEquip(params, res => {
-            resolve(res);
+        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);
         })
-        let promise2 = new Promise(resolve => {
-          getSupplement(paramsToBe, res => {
-            resolve(res);
-          })
+      })
+      let promise2 = new Promise(resolve => {
+        getSupplement(paramsToBe, res => {
+          resolve(res);
         })
-        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;
+      })
+      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.LostFloorName.forEach(it => {
-              if (item.ModelId === it.CurrentModelId) {
-                it.toBeDel = item.Count;
-              }
-            })
           })
-          res1.Content.forEach(item => {
-            if (item.Count > 0) {
-              this.toBeSuppCount += 1;
+        })
+        res1.Content.forEach(item => {
+          if (item.Count > 0) {
+            this.toBeSuppCount += 1;
+          }
+          this.LostFloorName.forEach(it => {
+            if (item.ModelId === it.Id) {
+              it.toBeSupplement = item.Count;
             }
-            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];
-                  }
+        })
+        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 = [];
+          })
+          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;
           }
-          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)
+        } else {
+          let reader = new FileReader()
+          reader.onload = e => {
+            if (e.target.readyState === 2) {
+              let res = {}
               that.load = false;
-            } else { // IE10+下载
-              navigator.msSaveBlob(blob, fileName)
-              that.load = false;
-            }
-          } 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);
-              }
+              res = JSON.parse(e.target.result)
+              that.$message.error(res.Message);
             }
-            reader.readAsText(res.data)
           }
-        })
-      },
-      tableRowClassName({ row, rowIndex, column }) {// 设置缺失楼层所在行的背景色
-        if (row.flag && row.flag === 'lost') {
-          return 'warning-row';
+          reader.readAsText(res.data)
         }
-      },
-      handleSizeChange(val) {// 切换每页显示数量
-        this.page.pageSize = val;
-        this.getModelFloor();
-      },
-      handleCurrentChange(val) {// 切换页码
-        this.page.pageNumber = val;
-        this.getModelFloor();
-      }
+      })
     },
-    watch: {
-      projectId() {
-        this.getModelFileCount();
-        this.getModelFloorCount();
+    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();
+    }
+  },
+  watch: {
+    projectId() {
+      this.getModelFileCount();
+      this.getModelFloorCount();
     }
   }
+}
 </script>
 
 <style lang="less" scoped>
-  .report-index {
-    .statistics {
-      display: flex;
-      width: 100%;
-      padding: 20px 0;
-      background: white;
-      margin-bottom: 10px;
+.report-index {
+  .statistics {
+    display: flex;
+    width: 100%;
+    padding: 20px 0;
+    background: white;
+    margin-bottom: 10px;
 
-      div {
-        flex: 1;
-        text-align: center;
+    div {
+      flex: 1;
+      text-align: center;
 
-        p {
-          b {
-            font-size: 20px;
-            margin-left: 20px;
-          }
+      p {
+        b {
+          font-size: 20px;
+          margin-left: 20px;
         }
       }
     }
+  }
 
-    .main-content {
-      width: 100%;
-      height: calc(100% - 90px);
-      background: white;
+  .main-content {
+    width: 100%;
+    height: calc(100% - 90px);
+    background: white;
 
-      .content-box {
-        height: calc(100% - 105px);
+    .content-box {
+      height: calc(100% - 105px);
 
-        .table {
-          margin-top: 15px;
-        }
+      .table {
+        margin-top: 15px;
       }
     }
+  }
 
-    .button {
-      padding-left: 10px;
-
-    }
+  .button {
+    padding-left: 10px;
 
-    .success-color {
-      color: #67c23a;
-    }
+  }
 
-    .error-color {
-      color: #f56c6c;
-    }
+  .success-color {
+    color: #67c23a;
+  }
 
-    .success-color1 {
-      color: #67c23a60;
-    }
+  .error-color {
+    color: #f56c6c;
+  }
 
-    .error-color1 {
-      color: #f56c6c60;
-    }
+  .success-color1 {
+    color: #67c23a60;
+  }
 
-    /deep/ .el-table_1_column_4 {
-      border-right: 1px solid #e2e2e2 !important;
-    }
+  .error-color1 {
+    color: #f56c6c60;
+  }
 
-    /deep/ .el-table {
-      .el-table__fixed {
-        height: auto !important;
-        bottom: 17px;
-      }
-    }
+  /deep/ .el-table_1_column_4 {
+    border-right: 1px solid #e2e2e2 !important;
+  }
 
-    /deep/ .el-table__row.warning-row {
-      td {
-        background: #f9f9f9 !important;
-      }
+  /deep/ .el-table {
+    .el-table__fixed {
+      height: auto !important;
+      bottom: 17px;
     }
+  }
 
-    /deep/ .el-badge__content--danger {
-      background-color: #F56C6C60;
+  /deep/ .el-table__row.warning-row {
+    td {
+      background: #f9f9f9 !important;
     }
+  }
 
+  /deep/ .el-badge__content--danger {
+    background-color: #F56C6C60;
   }
 
+}
+
 </style>

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

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