bonus
/
Zlpt_Portal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:43b8e1182d97fede8b76b1a23faca53b4f083505
Branches Tags
bonus:main
bonus:ah-simple
bonus:ah-simple-cq
bonus:gz-simple
bonus:old-ah-simple
bonus:hongchao-dev
bonus:main-1218
bonus:hongchao-temp
bonus:dev-wangyiming
bonus:dev-songyang
bonus:dev-sjf-2023-12-5
bonus:template
...
compare: bonus:a6e21486feade653fc4860c8aab5782e19643d5e
Branches Tags
bonus:ah-simple
bonus:ah-simple-cq
bonus:gz-simple
bonus:old-ah-simple
bonus:main
bonus:hongchao-dev
bonus:main-1218
bonus:hongchao-temp
bonus:dev-wangyiming
bonus:dev-songyang
bonus:dev-sjf-2023-12-5
bonus:template

6 Commits
43b8e1182d ... a6e21486fe

Author SHA1 Message Date
songyang a6e21486fe ii 2023-12-08 21:15:08 +08:00
wlikett 66c40cfb4c 测试修改 2023-12-08 21:12:47 +08:00
13218645326 fa7fbaaa97 Merge branch 'dev-sjf-2023-12-5' 2023-12-08 20:33:14 +08:00
wlikett 3de81a1272 Merge branch 'dev-wangyiming' 
# Conflicts:
#	src/views/user/orderManagement/index.vue
 2023-12-08 20:32:13 +08:00
13218645326 8d4688350a 忽略文件 auto-imports.d 2023-12-08 20:30:57 +08:00
wlikett fdfd6ad203 测试修改 2023-12-08 20:30:52 +08:00
8 changed files with 199 additions and 193 deletions
Show Stats Expand all files Collapse all files

1
.gitignore vendored
View File

@ -28,3 +28,4 @@ coverage
*.sln
*.sw?
.prettierrc.js
auto-imports.d.ts

3
components.d.ts vendored
View File

@ -25,7 +25,6 @@ declare module 'vue' {
ElMenu: typeof import('element-plus/es')['ElMenu']
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
ElOption: typeof import('element-plus/es')['ElOption']
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']
@ -35,8 +34,6 @@ declare module 'vue' {
ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
ElTag: typeof import('element-plus/es')['ElTag']
ElTimeline: typeof import('element-plus/es')['ElTimeline']
ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
ElUpload: typeof import('element-plus/es')['ElUpload']
EquipCard: typeof import('./src/components/equipCard.vue')['default']
EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default']

16
src/components/uploadComponent/index.vue
View File

@ -33,7 +33,7 @@
<script lang="ts" setup>
import { ref, nextTick } from 'vue'
import { ElMessage } from 'element-plus'
import { Base64 } from 'js-base64'
// import { Base64 } from 'js-base64'
const tmpUploadUrl = import.meta.env.VITE_API_URL +"/zlpt-file/file/cos/upload"
console.log("tmpUploadUrl",tmpUploadUrl)
const actionUrl = ref(tmpUploadUrl)
@ -99,7 +99,7 @@
},
extraData: {}, //上传时的额外参数 如 name等
/*
/*
{
name:'12321'
}
@ -155,7 +155,7 @@
url: response.data,
name: file.name
})
} else {
ElMessage({
type: 'warning',
@ -218,11 +218,11 @@
//预览 'doc', 'docx', 'xlsx', 'xls', 'txt' 文件
name = name.replace(/&/g, '') // & 不兼容
const target = encodeURIComponent(
Base64.encode(
`${location.origin}/api/abk/web/v1/resource/file?fileId=${
url || response.data
}&fullfilename=${name}&sid=4AC67ADB4E264AB0A8B899A671072875`
)
// Base64.encode(
// `${location.origin}/api/abk/web/v1/resource/file?fileId=${
// url || response.data
// }&fullfilename=${name}&sid=4AC67ADB4E264AB0A8B899A671072875`
// )
)
if (props.officePreviewFlag && officeType.includes(suffixFileType)) {
// office预览的

4
src/http/api/home/index.ts
View File

@ -1,5 +1,5 @@
import { get, post } from '../../index'
export const getGoodsClassListApi = () => {
return get('/zlpt-order/maType/getEquipmentType', {})
}
return get('/zlpt-home/maType/getEquipmentType', {})
}

6
src/store/user.ts
View File

@ -39,13 +39,13 @@ export const useStore = defineStore('myUser', {
},
// 获取省份信息
async getprovinceList() {
const res: any = await post('/zlpt-company/baseAddress/selectAddress', {})
const res: any = await post('/zlpt-system/baseAddress/selectAddress', {})
this.provinceList = res.data
},
// 获取市级信息
async getmarketList(val: any) {
const res: any = await post('/zlpt-company/baseAddress/selectAddress', { code: val })
const res: any = await post('/zlpt-system/baseAddress/selectAddress', { code: val })
console.log(res, '市区信息');
this.marketList = res.data
@ -53,7 +53,7 @@ export const useStore = defineStore('myUser', {
},
// 获取区级信息
async getareaList(val: any) {
const res: any = await post('/zlpt-company/baseAddress/selectAddress', { code: val })
const res: any = await post('/zlpt-system/baseAddress/selectAddress', { code: val })
this.areaList = res.data
},
// 获取证件类型

23
src/views/equip/detail.vue
View File

@ -11,17 +11,17 @@
<div class="title">
<div class="name">{{ pageData.modelName }}{{ pageData.deviceName }}</div>
<div class="tag">
<div class="item">{{ pageData.maStatus }}</div>
<div class="item">{{ pageData.maStatus == '16' ? '待租' : pageData.maStatus }}</div>
<div class="item otherItem" v-if="pageData.isAudit == 1">已审核</div>
</div>
</div>
<div class="viewNnum">浏览{{ pageData.searchNum }}</div>
<div class="viewNnum">浏览{{ pageData.searchNum || 1050 }}</div>
<div class="infoBox">
<div class="item" v-for="(v, i) in equipBaseInfoList" :key="i">
<div class="label">{{ v.label }}：</div>
<div class="value">{{
v.key.split(',').map(key => {
return pageData[key]
return pageData[key] || v.default
}).join('')
}}
</div>
@ -56,7 +56,7 @@
<div class="business">
<img
:src="pageData.companyLogoUrl"
src="@/assets/img/bns-logo.png"
class="avatar"/>
<div class="fonts">
<div class="name">{{ pageData.companyName }}</div>
@ -105,7 +105,7 @@
:key="i"
:url="v.picUrl"
:name="`${v.modelName}${v.deviceName}`"
:tags="[v.maStatus,v.location]"
:tags="[v.maStatus=='16' ? '待租' : v.maStatus,v.location]"
:company="v.companyName"
:price="v.monthLeasePrice"
timeUnit="月"
@ -232,7 +232,7 @@
width="30%"
>
<div style="font-size: 16px;font-weight: 600;">
{{ pageData.authPhone }}
{{ pageData.authPhone || '18815622887' }}
</div>
<template #footer>
<span class="dialog-footer">
@ -264,11 +264,13 @@ const pageParams = route.params
const equipBaseInfoList = reactive([
{
label: '设备规格',
key: 'specification'
key: 'specification',
default:'起重量：5吨'
},
{
label: '设备单位',
key: 'companyName'
key: 'companyName',
default: '滁州公司'
},
{
label: '配备机手',
@ -534,7 +536,7 @@ const goDetail = (val) => {
//提交申请
const submit = async() => {
console.log(ruleForm.value)
console.log(pageData.value)
const params = {
addressId: ruleForm.value.address[2],
address: ruleForm.value.detailAddress,
@ -542,7 +544,8 @@ const submit = async() => {
duration: ruleForm.value.duration,
isMachinist: ruleForm.value.machinist,
invoiceType: ruleForm.value.invoiceType,
description: ruleForm.value.projectDescription
description: ruleForm.value.projectDescription,
maId:pageData.value.maId
}
const res = await apiSubmitLease(params)

2
src/views/equip/list.vue
View File

@ -32,7 +32,7 @@
<div class="label">
{{ v.list[v.index].name }}
</div>
<div class="select">
<div class="select" :style=" i == 0 ? 'min-height:105px' : ''">
<div class="item"
@click="selectScreen(i,val,v.index)"
v-for="(val,index) in v.list[v.index].select" :key="index">

337
src/views/home/index.vue
View File

@ -4,181 +4,186 @@
import { getGoodsClassListApi } from 'http/api/home'
import { useStore } from 'store/main'
import { getHotList } from 'http/api/equip'
import {reactive} from "vue";
const router = useRouter()
const leftNavList = ref([])
// 获取商品分类
const getGoodsClassList = async () => {
const res = await getGoodsClassListApi()
console.log(res, '商品分类列表')
leftNavList.value = res.rows
}
getGoodsClassList()
const leftNavList = [
{
name: '全部商品',
children: [
{
title: '挖掘机',
children: [
{ goodsName: '履带挖掘机' },
{ goodsName: '履带挖掘机' },
{ goodsName: '履带挖掘机' },
{ goodsName: '履带挖掘机' },
{ goodsName: '履带挖掘机' },
{ goodsName: '履带挖掘机' }
]
},
{
title: '开沟机',
children: [{ goodsName: '履带挖掘机' }]
},
{
title: '斗轮挖掘机',
children: [{ goodsName: '履带挖掘机' }]
}
]
},
{
name: '挖掘机',
children: [
{
title: '挖掘机',
children: [{ goodsName: '履带挖掘机' }]
},
{
title: '开沟机',
children: [{ goodsName: '履带挖掘机' }]
},
{
title: '斗轮挖掘机',
children: [{ goodsName: '履带挖掘机' }]
}
]
},
{
name: '土方机械',
children: [
{
title: '挖掘机',
children: [{ goodsName: '履带挖掘机' }]
},
{
title: '开沟机',
children: [{ goodsName: '履带挖掘机' }]
},
{
title: '斗轮挖掘机',
children: [{ goodsName: '履带挖掘机' }]
}
]
},
{
name: '工程起重机械',
children: [
{
title: '挖掘机',
children: [{ goodsName: '履带挖掘机' }]
},
{
title: '开沟机',
children: [{ goodsName: '履带挖掘机' }]
},
{
title: '斗轮挖掘机',
children: [{ goodsName: '履带挖掘机' }]
}
]
},
{
name: '动力设备',
children: [
{
title: '挖掘机',
children: [{ goodsName: '履带挖掘机' }]
},
{
title: '开沟机',
children: [{ goodsName: '履带挖掘机' }]
},
{
title: '斗轮挖掘机',
children: [{ goodsName: '履带挖掘机' }]
}
]
},
{
name: '压实机械',
children: [
{
title: '挖掘机',
children: [{ goodsName: '履带挖掘机' }]
},
{
title: '开沟机',
children: [{ goodsName: '履带挖掘机' }]
},
{
title: '斗轮挖掘机',
children: [{ goodsName: '履带挖掘机' }]
}
]
},
{
name: '路桥机械',
children: [
{
title: '挖掘机',
children: [{ goodsName: '履带挖掘机' }]
},
{
title: '开沟机',
children: [{ goodsName: '履带挖掘机' }]
},
{
title: '斗轮挖掘机',
children: [{ goodsName: '履带挖掘机' }]
}
]
},
{
name: '混凝土机械',
children: [
{
title: '挖掘机',
children: [{ goodsName: '履带挖掘机' }]
},
{
title: '开沟机',
children: [{ goodsName: '履带挖掘机' }]
},
{
title: '斗轮挖掘机',
children: [{ goodsName: '履带挖掘机' }]
}
]
},
{
name: '桩工机械',
children: [
{
title: '挖掘机',
children: [{ goodsName: '履带挖掘机' }]
},
{
title: '开沟机',
children: [{ goodsName: '履带挖掘机' }]
},
{
title: '斗轮挖掘机',
children: [{ goodsName: '履带挖掘机' }]
}
]
}
]
// [
// {
// name: '全部商品',
// children: [
// {
// title: '挖掘机',
// children: [
// { goodsName: '履带挖掘机' },
// { goodsName: '履带挖掘机' },
// { goodsName: '履带挖掘机' },
// { goodsName: '履带挖掘机' },
// { goodsName: '履带挖掘机' },
// { goodsName: '履带挖掘机' }
// ]
// },
// {
// title: '开沟机',
// children: [{ goodsName: '履带挖掘机' }]
// },
// {
// title: '斗轮挖掘机',
// children: [{ goodsName: '履带挖掘机' }]
// }
// ]
// },
// {
// name: '挖掘机',
// children: [
// {
// title: '挖掘机',
// children: [{ goodsName: '履带挖掘机' }]
// },
// {
// title: '开沟机',
// children: [{ goodsName: '履带挖掘机' }]
// },
// {
// title: '斗轮挖掘机',
// children: [{ goodsName: '履带挖掘机' }]
// }
// ]
// },
// {
// name: '土方机械',
// children: [
// {
// title: '挖掘机',
// children: [{ goodsName: '履带挖掘机' }]
// },
// {
// title: '开沟机',
// children: [{ goodsName: '履带挖掘机' }]
// },
// {
// title: '斗轮挖掘机',
// children: [{ goodsName: '履带挖掘机' }]
// }
// ]
// },
// {
// name: '工程起重机械',
// children: [
// {
// title: '挖掘机',
// children: [{ goodsName: '履带挖掘机' }]
// },
// {
// title: '开沟机',
// children: [{ goodsName: '履带挖掘机' }]
// },
// {
// title: '斗轮挖掘机',
// children: [{ goodsName: '履带挖掘机' }]
// }
// ]
// },
// {
// name: '动力设备',
// children: [
// {
// title: '挖掘机',
// children: [{ goodsName: '履带挖掘机' }]
// },
// {
// title: '开沟机',
// children: [{ goodsName: '履带挖掘机' }]
// },
// {
// title: '斗轮挖掘机',
// children: [{ goodsName: '履带挖掘机' }]
// }
// ]
// },
// {
// name: '压实机械',
// children: [
// {
// title: '挖掘机',
// children: [{ goodsName: '履带挖掘机' }]
// },
// {
// title: '开沟机',
// children: [{ goodsName: '履带挖掘机' }]
// },
// {
// title: '斗轮挖掘机',
// children: [{ goodsName: '履带挖掘机' }]
// }
// ]
// },
// {
// name: '路桥机械',
// children: [
// {
// title: '挖掘机',
// children: [{ goodsName: '履带挖掘机' }]
// },
// {
// title: '开沟机',
// children: [{ goodsName: '履带挖掘机' }]
// },
// {
// title: '斗轮挖掘机',
// children: [{ goodsName: '履带挖掘机' }]
// }
// ]
// },
// {
// name: '混凝土机械',
// children: [
// {
// title: '挖掘机',
// children: [{ goodsName: '履带挖掘机' }]
// },
// {
// title: '开沟机',
// children: [{ goodsName: '履带挖掘机' }]
// },
// {
// title: '斗轮挖掘机',
// children: [{ goodsName: '履带挖掘机' }]
// }
// ]
// },
// {
// name: '桩工机械',
// children: [
// {
// title: '挖掘机',
// children: [{ goodsName: '履带挖掘机' }]
// },
// {
// title: '开沟机',
// children: [{ goodsName: '履带挖掘机' }]
// },
// {
// title: '斗轮挖掘机',
// children: [{ goodsName: '履带挖掘机' }]
// }
// ]
// }
// ]
const handlerGoodsDetails = () => {
console.log('去往商品详情页')
}
const detailsList = ref([
@ -231,15 +236,15 @@
{{ item.name }}
<ul class="sub-goods">
<!-- 级联框内 类别名称 -->
<li v-for="child in item.children" :key="child.title">
<span>{{ child.title }}</span>
<li v-for="child in item.children" :key="child.id">
<span>{{ child.name }}</span>
<span>
<!-- 小类名称 -->
<a
v-for="son in child.children"
:key="son.goodsName"
:key="son.id"
@click="handlerGoodsDetails">
{{ son.goodsName }}
{{ son.name }}
</a>
</span>
</li>