diff --git a/env/.env.dev b/env/.env.dev index 10d949b..814bc24 100644 --- a/env/.env.dev +++ b/env/.env.dev @@ -5,4 +5,4 @@ VITE_BUILD_MODE = 'dev' # 开发环境接口地址 VITE_API_URL = '/proxyApi' -VITE_proxyTarget = 'http://10.40.92.16:9502' +VITE_proxyTarget = 'http://10.40.92.16:9206' diff --git a/index.html b/index.html index d448ed4..db3d86d 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - 施工承载力管控系统 + 南网机具租赁共享平台
diff --git a/src/http/api/enterprise.ts b/src/http/api/enterprise.ts index b31c652..b608130 100644 --- a/src/http/api/enterprise.ts +++ b/src/http/api/enterprise.ts @@ -92,7 +92,7 @@ export const apiGetCompanyInfoById = (id: any) => { //=============================================企业业务开通管理 // business​/open​/exportExcel -export const apiBusinessOpenExportExcel = (params: any) => { +export const apiBusinessOpenExportExcel = ( ) => { let strUrl = `business/open/exportExcel` return get(strUrl,{}) } diff --git a/src/http/api/equip.ts b/src/http/api/equip.ts new file mode 100644 index 0000000..91a66c7 --- /dev/null +++ b/src/http/api/equip.ts @@ -0,0 +1,16 @@ +import { post, get, detele } from '../index' + +// 下架列表 +export const apiOffList = (data: any) => { + return post('/off/selectList', data) +} +// 新增或者修改企业类型 +export const apiUpOffList = (data: any) => { + // 1 上 2下 + return post('/off/upOffList', data) +} + +// 下架列表 +export const apiSelectInfo = (params: any) => { + return post(`/off/selectInfo`, params) +} diff --git a/src/utils/index.ts b/src/utils/index.ts index ee270d0..66f02c1 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -67,5 +67,21 @@ export const throttle = ReturnType>( } } +export const exportBlob =(res:any)=>{ + const blob = new Blob([res]); //res为后台返回的文件流，注意参数是以数组的形式上传 + const href = URL.createObjectURL(blob); //URL都要大写，这点也要注意 + const link = document.createElement("a") //生成a标签用于模拟下载 + link.download = "test.xlsx"; //自定义下载文件名称 + link.href = href //把生成的href赋值到a标签上，在这里我遇到一个问题， + //直接赋值无法把href赋值到a标签的href上（不知道是不是因为封装框架的问题） + //我采用了原生的方法 + //link.setAttribute("href", href); + document.body.appendChild(link); + link.click(); + //释放空间 + document.body.removeChild("link"); + URL.removeObjectURL(href); +} + + - \ No newline at end of file diff --git a/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/1.json b/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/1.json new file mode 100644 index 0000000..174a60e --- /dev/null +++ b/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/1.json @@ -0,0 +1,204 @@ +/** 设备id */ +@Excel(name = "设备id") +@ApiModelProperty(value = "设备id") +private Long maId; + +/** 系统编码 */ +@Excel(name = "系统编码") +@ApiModelProperty(value = "系统编码") +private String code; + +/** 类型id */ +@Excel(name = "类型id") +@ApiModelProperty(value = "类型id") +private Long typeId; + +/** 设备状态(自有，待上架，上架，在租，下架)考虑数据字典 */ +@Excel(name = "设备状态(自有，待上架，上架，在租，下架)考虑数据字典") +@ApiModelProperty(value = "设备状态(自有，待上架，上架，在租，下架)考虑数据字典") +private String maStatus; + +/** 租赁范围 */ +@Excel(name = "租赁范围") +@ApiModelProperty(value = "租赁范围") +private Long leaseScope; + +/** 设备所在地 */ +@Excel(name = "设备所在地") +@ApiModelProperty(value = "设备所在地") +private String location; + +@Excel(name = "设备所在省id") +@ApiModelProperty(value = "设备所在省id") +private Integer provinceId; + +@Excel(name = "设备所在市id") +@ApiModelProperty(value = "设备所在市id") +private Integer cityId; + +@Excel(name = "设备所在区id") +@ApiModelProperty(value = "设备所在省id") +private Integer areaId; + +/** 设备品牌 */ +@Excel(name = "设备品牌") +@ApiModelProperty(value = "设备品牌") +private String brand; + +/** 设备型号 */ +@Excel(name = "设备型号") +@ApiModelProperty(value = "设备型号") +private String modelName; + +/** 出厂日期 */ +@Excel(name = "出厂日期") +@ApiModelProperty(value = "出厂日期") +private String productionDate; + +/** 工作时长 */ +@Excel(name = "工作时长") +@ApiModelProperty(value = "工作时长") +private String workingHours; + +/** 整机序列号 */ +@Excel(name = "整机序列号") +@ApiModelProperty(value = "整机序列号") +private String serialNumber; + +/** 设备月租价 */ +@Excel(name = "设备月租价") +@ApiModelProperty(value = "设备月租价") +private Float monthLeasePrice; + +/** 设备天租价 */ +@Excel(name = "设备天租价") +@ApiModelProperty(value = "设备天租价") +private Float dayLeasePrice; + +/** 设备主照片 */ +@Excel(name = "设备主照片") +@ApiModelProperty(value = "设备主照片") +private String picUrl; + +/** 机手月租金 */ +@Excel(name = "机手月租金") +@ApiModelProperty(value = "机手月租金") +private Float jsMonthPrice; + +/** 机手天租金 */ +@Excel(name = "机手天租金") +@ApiModelProperty(value = "机手天租金") +private Float jsDayPrice; + +/** 详细描述 */ +@Excel(name = "详细描述") +@ApiModelProperty(value = "详细描述") +private String description; + +/** gps编号 */ +@Excel(name = "gps编号") +@ApiModelProperty(value = "gps编号") +private String gpsCode; + +/** 设备所属公司 */ +@Excel(name = "设备所属公司") +@ApiModelProperty(value = "设备所属公司") +private Long ownCo; + +/** 创建人 */ +@Excel(name = "创建人") +@ApiModelProperty(value = "创建人") +private Long creator; + +/** 设备规格 */ +@Excel(name = "设备规格") +@ApiModelProperty(value = "设备规格") +private String specification; + +/** 订金 */ +@Excel(name = "订金") +@ApiModelProperty(value = "订金") +private BigDecimal deposit; + +/** 是否删除 */ +@Excel(name = "是否配备机手") +@ApiModelProperty(value = "是否配备机手") +private String isOperator; + +/** 是否删除 */ +@Excel(name = "是否删除") +@ApiModelProperty(value = "是否删除") +private String isActive; +/**文件附件*/ +private List fileList; +/**城市*/ +private String city; + + +//企业名称 +@ApiModelProperty(value = "企业名称", required = true) +private String companyName; + +//装备类型 父级类型typeName +@ApiModelProperty(value = "装备类型", required = true) +private String parentDevType; + +//类型名称 当前设备类型名称typeName +@ApiModelProperty(value = "类型名称", required = true) +private String devTypeName; + +//装备名称 devTypeName+model_name +@ApiModelProperty(value = "装备名称", required = true) +private String devName; + +//设备检验信息图片路径 +@ApiModelProperty(value = "设备检验信息图片路径", required = true) +private String inspectImageUrl; + +//设备保险信息图片路径 +@ApiModelProperty(value = "设备保险信息图片路径", required = true) +private String insureImageUrl; + + +//系统编码 +@ApiModelProperty(value = "系统编码", required = true) +private String code; + +//装备名称 +@ApiModelProperty(value = "装备名称", required = true) +private String name; + +//企业名称 +@ApiModelProperty(value = "企业名称", required = true) +private String companyName; + +//类型id 根据这个查谁的父id是这个 +@ApiModelProperty(value = "类型id", required = true) +private Integer typeId; + + +@ApiModelProperty(value = "系统编码", required = true) + private String code; + + //装备名称 + @ApiModelProperty(value = "装备名称", required = true) + private String name; + + //企业名称 + @ApiModelProperty(value = "企业名称", required = true) + private String companyName; + + //类型id 根据这个查谁的父id是这个 + @ApiModelProperty(value = "类型id", required = true) + private Integer typeId; + + + /** 设备月租价 */ + @Excel(name = "设备月租价") + @ApiModelProperty(value = "设备月租价") + private Float monthLeasePrice; + + /** 设备天租价 */ + @Excel(name = "设备天租价") + @ApiModelProperty(value = "设备天租价") + private Float dayLeasePrice; \ No newline at end of file diff --git a/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/addCom.vue b/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/addCom.vue index f88befc..e7e7cbe 100644 --- a/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/addCom.vue +++ b/src/views/enterpriseEquipmentManage/equipmentListingApproval/com/addCom.vue @@ -1,12 +1,53 @@