diff --git a/package.json b/package.json index 1db0bee..995dc94 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "url": "https://gitee.com/y_project/RuoYi-Vue.git" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@riophae/vue-treeselect": "0.4.0", "axios": "0.28.1", "clipboard": "2.0.8", diff --git a/src/api/ManageApi/index.js b/src/api/ManageApi/index.js index 6a131a0..f7c0e4f 100644 --- a/src/api/ManageApi/index.js +++ b/src/api/ManageApi/index.js @@ -387,8 +387,18 @@ export function getqyrzById(id) { method: 'get' }); } -//企业基本信息 -// 修改企业基本信息 +//企业入驻信息 +// 修改信息 +// 根据项目ID分页查询所有入驻企业 +export function getqyBasicInformationPage(params) { + return request({ + url: '/gysl/enterprise/page', + method: 'get', + params + }); +} + +// 修改信息 export function updateqyBasicInformation(data) { return request({ url: '/gysl/enterprise/edit', @@ -397,20 +407,14 @@ export function updateqyBasicInformation(data) { }); } -// 删除企业基本信息 +// 删除信息 export function deleteqyBasicInformation(idList) { return request({ url: '/gysl/enterprise/delete', method: 'delete', - params: { idList } - }); -} - -// 通过主键查询单条企业基本信息 -export function getqyBasicInformationById(id) { - return request({ - url: `/gysl/enterprise/${id}`, - method: 'get' + params: { + idList: idList.join(',') // 将数组转换为逗号分隔的字符串 + } }); } diff --git a/src/views/components/ProjectDetails/Basic.vue b/src/views/components/ProjectDetails/Basic.vue index b44a880..15544b4 100644 --- a/src/views/components/ProjectDetails/Basic.vue +++ b/src/views/components/ProjectDetails/Basic.vue @@ -268,25 +268,16 @@ export default { rules: { name: [ { required: true, message: '项目名称不能为空', trigger: 'blur' }, - { max: 50, message: '项目名称长度不能超过50个字', trigger: 'blur' } ], xmfrdwxz: [ { required: true, message: '项目法人单位不能为空', trigger: 'blur' }, - { max: 50, message: '项目法人单位长度不能超过50个字', trigger: 'blur' } ], nature: [ { required: true, message: '项目法人单位性质不能为空', trigger: 'change' } ], - sgdw: [ - { max: 50, message: '施工单位长度不能超过50个字', trigger: 'blur' } - ], - sjdw: [ - { max: 50, message: '设计单位长度不能超过50个字', trigger: 'blur' } - ], ztze: [ { required: true, message: '总投资额不能为空', trigger: 'blur' }, { type: 'number', message: '总投资额必须是数字', trigger: 'blur' }, - { max: 50, message: '总投资额长度不能超过50个字', trigger: 'blur' } ], ssgnq: [ { required: true, message: '所属功能区不能为空', trigger: 'change' } @@ -300,35 +291,15 @@ export default { xzfl: [ { required: true, message: '现状分类不能为空', trigger: 'change' } ], - jsdd: [ - { max: 50, message: '建设地点长度不能超过50个字', trigger: 'blur' } - ], - prioritize: [ - { max: 50, message: '重点发展产业长度不能超过50个字', trigger: 'blur' } - ], jsms: [ { required: true, message: '建设模式不能为空', trigger: 'change' } ], - label: [ - { max: 50, message: '项目标签长度不能超过50个字', trigger: 'blur' } - ], projectLeader: [ { required: true, message: '项目负责人不能为空', trigger: 'blur' }, - { max: 50, message: '项目负责人长度不能超过50个字', trigger: 'blur' } ], phone: [ { required: true, message: '联系方式不能为空', trigger: 'blur' }, { pattern: /^[\d-]+$/, message: '联系方式只能包含数字和连字符', trigger: 'blur' }, - { max: 50, message: '联系方式长度不能超过50个字', trigger: 'blur' } - ], - issuingTime: [ - { max: 50, message: '施工许可证发放时间长度不能超过50个字', trigger: 'blur' } - ], - acceptanceTime: [ - { max: 50, message: '竣工验收时间长度不能超过50个字', trigger: 'blur' } - ], - jsjd: [ - { max: 50, message: '建设进度长度不能超过50个字', trigger: 'blur' } ], unitIntroduction: [ { max: 1000, message: '项目法人单位简介长度不能超过1000个字', trigger: 'blur' } @@ -377,6 +348,16 @@ export default { } }, methods: { + /** 导出 */ + handleExport() { + this.download( + "/gysl/basicInformation/exportInfo", + { + idList: this.basicInfo.id + }, + `基本信息${new Date().getTime()}.xlsx` + ); + }, // 格式化描述信息 formatDescriptions(data) { return [ diff --git a/src/views/components/ProjectDetails/Buildings.vue b/src/views/components/ProjectDetails/Buildings.vue index c5f6328..2a21f7a 100644 --- a/src/views/components/ProjectDetails/Buildings.vue +++ b/src/views/components/ProjectDetails/Buildings.vue @@ -117,7 +117,7 @@ - + @@ -285,7 +285,7 @@ export default { // 是否显示弹出层(用户导入) open: false, // 弹出层标题(用户导入) - title: "web资产导入", + title: "建筑信息导入", // 是否禁用上传 isUploading: false, // 是否更新已经存在的用户数据 @@ -293,7 +293,7 @@ export default { // 设置上传的请求头部 headers: { Authorization: "Bearer " + getToken() }, // 上传的地址 - url: location.origin + "/gysl/buildingInformation/importProjectBuilding", + url: process.env.VUE_APP_BASE_API + "/gysl/buildingInformation/importProjectBuilding", }, rules: { name: [ @@ -304,27 +304,21 @@ export default { ], floor: [ { required: true, message: '请输入层数', trigger: 'blur' }, - { type: 'number', message: '层数必须是数字', trigger: 'blur' }, ], totalBuildingHeight: [ { required: true, message: '请输入总建筑高度(米)', trigger: 'blur' }, - { type: 'number', message: '总建筑高度(米)必须是数字', trigger: 'blur' }, ], scgd: [ { required: true, message: '请输入首层高度(米)', trigger: 'blur' }, - { type: 'number', message: '首层高度(米)必须是数字', trigger: 'blur' }, ], twoAndFourCg: [ { required: true, message: '请输入2至4层层高(米)', trigger: 'blur' }, - { type: 'number', message: '2至4层层高(米)必须是数字', trigger: 'blur' }, ], scdmhz: [ { required: true, message: '请输入首层地面荷载(吨/平方米)', trigger: 'blur' }, - { type: 'number', message: '首层地面荷载(吨/平方米)必须是数字', trigger: 'blur' }, ], bzcmj: [ { required: true, message: '请输入标准层面积(千平方米)', trigger: 'blur' }, - { type: 'number', message: '标准层面积(千平方米)必须是数字', trigger: 'blur' }, ] } }; @@ -333,12 +327,13 @@ export default { this.fetchBuildings(); }, methods: { + /** 导出 */ /** 导出 */ handleExport() { this.download( - "/tc/assetCurrent/export", + "/gysl/basicInformation/exportInfo", { - ...this.formInline, + idList: this.xmId }, `建筑信息${new Date().getTime()}.xlsx` ); @@ -350,9 +345,9 @@ export default { /** 下载模板操作 */ importTemplate() { this.download( - "/tc/assetCurrent/importTemplate", + "/gysl/buildingInformation/importTemplate", {}, - `web资产导入模板${new Date().getTime()}.xlsx` + `楼栋导入模板${new Date().getTime()}.xlsx` ); }, // 文件上传中处理 diff --git a/src/views/components/ProjectDetails/Companyenter.vue b/src/views/components/ProjectDetails/Companyenter.vue index 1075cf3..7370782 100644 --- a/src/views/components/ProjectDetails/Companyenter.vue +++ b/src/views/components/ProjectDetails/Companyenter.vue @@ -67,7 +67,10 @@
- + +