diff --git a/index.html b/index.html index e8d1042..6e13ea1 100644 --- a/index.html +++ b/index.html @@ -1,10 +1,20 @@ - + + + + + + + %VITE_APP_TITLE% @@ -18,7 +28,6 @@ align-items: center; flex-direction: column; background: url(/logingbk.png) no-repeat; - } .app-loading .app-loading-wrap { @@ -71,7 +80,7 @@ left: calc(50% - 20px); width: 40px; height: 40px; - border: 4px solid #89E1A8; + border: 4px solid #89e1a8; border-right: 0; border-top-color: transparent; border-radius: 50%; @@ -140,9 +149,10 @@ - - - - + diff --git a/src/api/enterprises/index.ts b/src/api/enterprises/index.ts index 604e631..0fa2a8b 100644 --- a/src/api/enterprises/index.ts +++ b/src/api/enterprises/index.ts @@ -9,15 +9,15 @@ export interface EnterprisesVO { region: string // 企业所属区域 enterprisesName: string // 企业名称 address: string // 企业地址 - enterprisesStatus//企业状态 + enterprisesStatus //企业状态 contactName: string // 环保负责人姓名 environmentalContactPhone: string // 企业环保负责人联系电话 registrationNumber: string // 企业注册号 introduction: string // 企业图文介绍 establishmentDate: Date // 企业成立时间 gpsLocation: string // 企业经纬度 - signRadius:string//签到半径 - managerDeptId: number, // 管理部门 + signRadius: string //签到半径 + managerDeptId: number // 管理部门 tagList: any } @@ -66,4 +66,11 @@ export const EnterprisesApi = { return await request.get({ url: `"/system/system/tag-library/list`, params }) }, + /** + * 查询企业详情 + * @param id 企业ID + */ + enterpriseDetail: async (id: any) => { + return await request.get({ url: `/system/enterprise/pcget?id=` + id }) + } } diff --git a/src/api/infra/file/index.ts b/src/api/infra/file/index.ts index 0e1b2e7..a7eb09c 100644 --- a/src/api/infra/file/index.ts +++ b/src/api/infra/file/index.ts @@ -43,3 +43,8 @@ export const createFile = (data: any) => { export const updateFile = (data: any) => { return request.upload({ url: '/infra/file/upload', data }) } + +// 批量上传 +export const batchUploadFile = (data: any) => { + return request.upload({ url: '/infra/file/uploads', data }) +} diff --git a/src/api/qualification/index.ts b/src/api/qualification/index.ts index 62f162e..a93b432 100644 --- a/src/api/qualification/index.ts +++ b/src/api/qualification/index.ts @@ -20,13 +20,13 @@ export const EnterpriseQualificationApi = { return await request.get({ url: `/system/enterprise-qualification/page`, params }) }, - // 查询企业资质分页 - getEnterpriseQualificationPageEnterprise: async (params: any) => { - return await request.get({ url: `/system/enterprise-qualification/pageEnterprise`, params }) - }, + // 查询企业资质分页 + getEnterpriseQualificationPageEnterprise: async (params: any) => { + return await request.get({ url: `/system/enterprise-qualification/pageEnterprise`, params }) + }, // 查询企业资质详情 - getEnterpriseQualification: async (id: number) => { + getEnterpriseQualification: async (id: any) => { return await request.get({ url: `/system/enterprise-qualification/get?id=` + id }) }, @@ -48,5 +48,5 @@ export const EnterpriseQualificationApi = { // 导出企业资质 Excel exportEnterpriseQualification: async (params) => { return await request.download({ url: `/system/enterprise-qualification/export-excel`, params }) - }, + } } diff --git a/src/assets/imgs/position.png b/src/assets/imgs/position.png new file mode 100644 index 0000000..b9b8ab6 Binary files /dev/null and b/src/assets/imgs/position.png differ diff --git a/src/components/UploadFile/index.ts b/src/components/UploadFile/index.ts index 1a4e10d..0ab28fb 100644 --- a/src/components/UploadFile/index.ts +++ b/src/components/UploadFile/index.ts @@ -2,7 +2,6 @@ import UploadImg from './src/UploadImg.vue' import UploadImgs from './src/UploadImgs.vue' import UploadFile from './src/UploadFile.vue' import UploadExcel from './src/UploadExcel.vue' +import FileUploader from './src/FileUploader.vue' -export { UploadImg, UploadImgs, UploadFile, UploadExcel} - - +export { UploadImg, UploadImgs, UploadFile, UploadExcel, FileUploader } diff --git a/src/components/UploadFile/src/FileUploader.vue b/src/components/UploadFile/src/FileUploader.vue new file mode 100644 index 0000000..6418993 --- /dev/null +++ b/src/components/UploadFile/src/FileUploader.vue @@ -0,0 +1,320 @@ + + + + diff --git a/src/components/UploadFile/src/InnerImage.vue b/src/components/UploadFile/src/InnerImage.vue deleted file mode 100644 index c6ae50f..0000000 --- a/src/components/UploadFile/src/InnerImage.vue +++ /dev/null @@ -1,501 +0,0 @@ - - - - - diff --git a/src/components/UploadFile/src/InnerUploadImg.vue b/src/components/UploadFile/src/InnerUploadImg.vue deleted file mode 100644 index 3c2a418..0000000 --- a/src/components/UploadFile/src/InnerUploadImg.vue +++ /dev/null @@ -1,205 +0,0 @@ - - - - - diff --git a/src/components/UploadFile/src/InnerUploader.vue b/src/components/UploadFile/src/InnerUploader.vue deleted file mode 100644 index fecfa50..0000000 --- a/src/components/UploadFile/src/InnerUploader.vue +++ /dev/null @@ -1,568 +0,0 @@ - - - - - diff --git a/src/components/UploadFile/src/UploadImgs.vue b/src/components/UploadFile/src/UploadImgs.vue index 19aff5e..c811301 100644 --- a/src/components/UploadFile/src/UploadImgs.vue +++ b/src/components/UploadFile/src/UploadImgs.vue @@ -10,7 +10,7 @@ :drag="drag" :http-request="httpRequest" :limit="limit" - :multiple="false" + :multiple="limit > 1" :on-error="uploadError" :on-exceed="handleExceed" :on-success="uploadSuccess" @@ -18,7 +18,7 @@ >
- +
@@ -27,11 +27,11 @@
- + 查看
- + 删除
@@ -43,7 +43,7 @@ + + + + diff --git a/src/views/enterprises/components/getGpsByQq.vue b/src/views/enterprises/components/getGpsByQq.vue index d0c8b33..d58d455 100644 --- a/src/views/enterprises/components/getGpsByQq.vue +++ b/src/views/enterprises/components/getGpsByQq.vue @@ -1,43 +1,101 @@ - + diff --git a/src/views/enterprises/update.vue b/src/views/enterprises/update.vue index b5092bf..cd35c41 100644 --- a/src/views/enterprises/update.vue +++ b/src/views/enterprises/update.vue @@ -1,10 +1,10 @@ + diff --git a/src/views/qualification/EnterpriseQualificationForm.vue b/src/views/qualification/EnterpriseQualificationForm.vue deleted file mode 100644 index f30b009..0000000 --- a/src/views/qualification/EnterpriseQualificationForm.vue +++ /dev/null @@ -1,202 +0,0 @@ - - diff --git a/src/views/qualification/index.vue b/src/views/qualification/index.vue index bcae6d1..57a7f0d 100644 --- a/src/views/qualification/index.vue +++ b/src/views/qualification/index.vue @@ -112,14 +112,14 @@ - +