接口对接

This commit is contained in:
songyang 2023-12-08 12:09:54 +08:00
parent fb27448f50
commit be333962e8
13 changed files with 35 additions and 84 deletions

3
components.d.ts vendored
View File

@ -10,7 +10,6 @@ declare module 'vue' {
ElButton: typeof import('element-plus/es')['ElButton']
ElCarousel: typeof import('element-plus/es')['ElCarousel']
ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
ElCascader: typeof import('element-plus/es')['ElCascader']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCol: typeof import('element-plus/es')['ElCol']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
@ -29,8 +28,6 @@ declare module 'vue' {
ElPageHeader: typeof import('element-plus/es')['ElPageHeader']
ElPagination: typeof import('element-plus/es')['ElPagination']
ElProgress: typeof import('element-plus/es')['ElProgress']
ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
ElRow: typeof import('element-plus/es')['ElRow']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElTable: typeof import('element-plus/es')['ElTable']

4
env/.env.dev vendored
View File

@ -5,9 +5,9 @@ VITE_BUILD_MODE = 'dev'
VITE_API_URL = '/proxyApi'
# 开发环境接口地址
VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭
# VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭
# VITE_proxyTarget = 'http://10.40.92.185:9200' # 赵福海 (登录)
VITE_proxyTarget = 'http://10.40.92.186:8080' # 赵福海 (登录)
# VITE_proxyTarget = 'http://10.40.92.185:9206' # 赵福海 ( 设备类型)
# VITE_proxyTarget = 'http://10.40.92.253:8080' # 牛 (个人中心 基础信息企业申请认证)

View File

@ -4,16 +4,16 @@ import { get, post } from '../../index'
// 装备入驻提交
export const equipmentDeploymentApi = (data: any) => {
return post('/dev', data)
return post('/zlpt-equip/dev', data)
}
// 获取商品入驻列表
export const getEquipmentListApi = (data: any) => {
return post('/dev/list', data)
return post('/zlpt-equip/dev/list', data)
}
// 商品删除接口
export const deleteGoodstApi = (data: any) => {
return post('/dev/remove', data)
return post('/zlpt-equip/dev/remove', data)
}

View File

@ -4,16 +4,16 @@ import { get, post } from '../../index'
// 装备上架接口
export const goodsUpApi = (data: any) => {
return post('/off', data)
return post('/zlpt-equip/off', data)
}
// 装备下架接口
export const goodsDownApi = (data: any) => {
return post('/off/upOffList ', data)
return post('/zlpt-equip/off/upOffList ', data)
}
// 装备删除接口
export const goodsDeleteApi = (data: any) => {
return post('/off/remove', data)
return post('/zlpt-equip/off/remove', data)
}

View File

@ -4,5 +4,5 @@ import { get, post } from '../../index'
// 获取订单列表
export const getOrderListApi = () => {
return get('/info/list', {})
return get('/zlpt-order/info/list', {})
}

View File

@ -58,7 +58,7 @@ const routes: Array<RouteRecordRaw> = [
{
path: '/',
component: () => import('views/AppMain.vue'),
redirect: '/home',
redirect: '/login',
meta: {
title: '首页',
keepAlive: true,

View File

@ -58,25 +58,25 @@ export const useStore = defineStore('myUser', {
},
// 获取证件类型
async getIdTypeList() {
const res: any = await post('/company_type/selectIdCard', {})
const res: any = await post('/zlpt-company/company_type/selectIdCard', {})
console.log(res, '证件类型');
this.idTypeList = res.rows
},
// 获取企业类型
async getcompanyTypeList() {
const res: any = await post('/company_type/selectCompanyTypeList', {})
const res: any = await post('/zlpt-company/company_type/selectCompanyTypeList', {})
console.log(res, '企业类型');
this.companyTypeList = res.rows
},
// 获取企业所属
async getcompanyLtdList() {
const res: any = await post('/company_type/selectCompanyLtd', {})
const res: any = await post('/zlpt-company/company_type/selectCompanyLtd', {})
console.log(res, '企业所属');
this.companyLtdList = res.rows
},
// 获取设备类型大类
async getDeviceTypeList() {
const res: any = await post('/type/list', {})
const res: any = await post('/zlpt-equip/type/list', {})
this.deviceTypeList = res.rows
console.log(res, '设备类型大类**---***');
@ -84,14 +84,14 @@ export const useStore = defineStore('myUser', {
},
// 获取设备类型小类
async getDeviceTypeSonList(val: any) {
const res: any = await post('/type/list', { typeId: val })
const res: any = await post('/zlpt-equip/type/list', { typeId: val })
this.deviceTypeSonList = res.rows
console.log(res, '设备类型子类**---***');
},
// 获取设备类型大类
async getDeviceTypeSunList(val: any) {
const res: any = await post('/type/list', { typeId: val })
const res: any = await post('/zlpt-equip/type/list', { typeId: val })
this.deviceTypeSunList = res.rows
console.log(res, '设备类型小类**---***');

View File

@ -22,7 +22,7 @@
}
userStore.setToken(res.data.access_token)
//
router.push('/')
router.push('/home')
}
</script>

View File

@ -142,8 +142,8 @@
<div class="user-name">
<span class="free-user active-user">免费用户</span>
/
<span class="standard-user">标准用户</span>
<!-- /
<span class="standard-user">标准用户</span> -->
</div>
<el-button size="small" type="primary">开通付费</el-button>

View File

@ -162,15 +162,15 @@
const pageNumber = 1
const total: any = ref(0)
const tableData: any = reactive({
list: []
})
const tableData: any = ref([])
//
const getList = async () => {
const res: any = await getEquipmentListApi({})
console.log('商品管理99999', res)
total.value = res.total
tableData.list = res.rows
tableData.value = res.rows.filter((item: any) => item !== null)
}
getList()
@ -301,54 +301,6 @@
{ v_label: '操作', v_props: 'v_operate', v_slot: 'operate', width: '140px' }
])
// const tableData: any = [
// {
// v_code: '123456',
// v_lease_scope: '2023/12/12',
// v_equipment_type: '',
// v_equipment_name: '2023',
// v_rent: '123/',
// v_type: 1,
// v_operate: ''
// },
// {
// v_code: '123456',
// v_lease_scope: '2023/12/12',
// v_equipment_type: '',
// v_equipment_name: '2023',
// v_rent: '123/',
// v_type: 2,
// v_operate: ''
// },
// {
// v_code: '123456',
// v_lease_scope: '2023/12/12',
// v_equipment_type: '',
// v_equipment_name: '2023',
// v_rent: '123/',
// v_type: 3,
// v_operate: ''
// },
// {
// v_code: '123456',
// v_lease_scope: '2023/12/12',
// v_equipment_type: '',
// v_equipment_name: '2023',
// v_rent: '123/',
// v_type: 3,
// v_operate: ''
// },
// {
// v_code: '123456',
// v_lease_scope: '2023/12/12',
// v_equipment_type: '',
// v_equipment_name: '2023',
// v_rent: '123/',
// v_type: 3,
// v_operate: ''
// }
// ]
// lable
const formItemList: any = ref([
{ v_label: '编码', v_typ: 'ipt' },
@ -389,7 +341,7 @@
</FormComponent>
<!-- 表格 -->
<TableComponent :tableProps="tableProps" :tableData="tableData.list" @getRowId="getRowId">
<TableComponent :tableProps="tableProps" :tableData="tableData" @getRowId="getRowId">
<template v-slot:v_type="{ row }">
<el-tag v-if="row.maStatus === '15'" size="small" type="info">待上架审批</el-tag>
<el-tag v-if="row.maStatus === '16'" size="small" type="warning">待租</el-tag>

View File

@ -18,8 +18,10 @@
const getList = async () => {
const res: any = await getEquipmentListApi({})
console.log('获取数据列表***', res)
total.value = res.total
tableData.value = res.rows
tableData.value = res.rows.filter((item: any) => item !== null)
total.value = tableData.value.length
}
getList()
@ -181,7 +183,7 @@
<el-button size="small" type="success" @click="groundingBtn(row)">上架</el-button>
<el-button size="small" type="warning" @click="offShelfBtn(row)">下架</el-button>
<el-button size="small" type="primary" @click="editRowInfo(row)">编辑</el-button>
<el-button size="small" type="danger" @click="deleteRowInfo(row)">删除</el-button>
<!-- <el-button size="small" type="danger" @click="deleteRowInfo(row)">删除</el-button> -->
</template>
</TableComponent>

View File

@ -69,7 +69,7 @@
<img
src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
alt="" />
<span>1234566XXX</span>
<span>15336652321</span>
</div>
<!-- 按钮 -->

View File

@ -7,9 +7,9 @@
const router = useRouter()
const pageSize = 20
const pageNumber = 1
const total: any = 20
const pageSize = ref(20)
const pageNumber = ref(1)
const total: any = ref(0)
//
const getList = async () => {
@ -46,7 +46,7 @@
<!-- 订单管理(承租方) -->
<el-config-provider :locale="zhCn">
<el-form :model="queryParams" :inline="true" label-width="auto" size="small">
<el-form :model="queryParams" :inline="true" size="small">
<el-form-item label="订单编号:" prop="menuName">
<el-input />
</el-form-item>
@ -71,7 +71,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary">查询</el-button>
<el-button type="success">保存</el-button>
<el-button type="success">重置</el-button>
</el-form-item>
</el-form>