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

测试修改

This commit is contained in:
wlikett 2023-12-08 20:30:52 +08:00
parent 8a20f51f23
commit fdfd6ad203
8 changed files with 191 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { ref, nextTick } from 'vue' import { ref, nextTick } from 'vue'
import { ElMessage } from 'element-plus' 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" const tmpUploadUrl = import.meta.env.VITE_API_URL +"/zlpt-file/file/cos/upload"
console.log("tmpUploadUrl",tmpUploadUrl) console.log("tmpUploadUrl",tmpUploadUrl)
const actionUrl = ref(tmpUploadUrl) const actionUrl = ref(tmpUploadUrl)
@ -218,11 +218,11 @@
//预览 'doc', 'docx', 'xlsx', 'xls', 'txt' 文件 //预览 'doc', 'docx', 'xlsx', 'xls', 'txt' 文件
name = name.replace(/&/g, '') // & 不兼容 name = name.replace(/&/g, '') // & 不兼容
const target = encodeURIComponent( const target = encodeURIComponent(
Base64.encode( // Base64.encode(
`${location.origin}/api/abk/web/v1/resource/file?fileId=${ // `${location.origin}/api/abk/web/v1/resource/file?fileId=${
url || response.data // url || response.data
}&fullfilename=${name}&sid=4AC67ADB4E264AB0A8B899A671072875` // }&fullfilename=${name}&sid=4AC67ADB4E264AB0A8B899A671072875`
) // )
) )
if (props.officePreviewFlag && officeType.includes(suffixFileType)) { if (props.officePreviewFlag && officeType.includes(suffixFileType)) {
// office预览的 // office预览的

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

@ -1,5 +1,5 @@
import { get, post } from '../../index' import { get, post } from '../../index'
export const getGoodsClassListApi = () => { 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() { async getprovinceList() {
const res: any = await post('/zlpt-company/baseAddress/selectAddress', {}) const res: any = await post('/zlpt-system/baseAddress/selectAddress', {})
this.provinceList = res.data this.provinceList = res.data
}, },
// 获取市级信息 // 获取市级信息
async getmarketList(val: any) { 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, '市区信息'); console.log(res, '市区信息');
this.marketList = res.data this.marketList = res.data
@ -53,7 +53,7 @@ export const useStore = defineStore('myUser', {
}, },
// 获取区级信息 // 获取区级信息
async getareaList(val: any) { 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 this.areaList = res.data
}, },
// 获取证件类型 // 获取证件类型

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

@ -56,7 +56,7 @@
<div class="business"> <div class="business">
<img <img
:src="pageData.companyLogoUrl" src="@/assets/img/bns-logo.png"
class="avatar"/> class="avatar"/>
<div class="fonts"> <div class="fonts">
<div class="name">{{ pageData.companyName }}</div> <div class="name">{{ pageData.companyName }}</div>

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

@ -32,7 +32,7 @@
<div class="label"> <div class="label">
{{ v.list[v.index].name }} {{ v.list[v.index].name }}
</div> </div>
<div class="select"> <div class="select" :style=" i == 0 ? 'min-height:105px' : ''">
<div class="item" <div class="item"
@click="selectScreen(i,val,v.index)" @click="selectScreen(i,val,v.index)"
v-for="(val,index) in v.list[v.index].select" :key="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 { getGoodsClassListApi } from 'http/api/home'
import { useStore } from 'store/main' import { useStore } from 'store/main'
import { getHotList } from 'http/api/equip' import { getHotList } from 'http/api/equip'
import {reactive} from "vue";
const router = useRouter() const router = useRouter()
const leftNavList = ref([])
// 获取商品分类 // 获取商品分类
const getGoodsClassList = async () => { const getGoodsClassList = async () => {
const res = await getGoodsClassListApi() const res = await getGoodsClassListApi()
console.log(res, '商品分类列表') console.log(res, '商品分类列表')
leftNavList.value = res.rows
} }
getGoodsClassList() 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 = () => { const handlerGoodsDetails = () => {
console.log('去往商品详情页') console.log('去往商品详情页')
} }
const detailsList = ref([ const detailsList = ref([
@ -231,15 +236,15 @@
{{ item.name }} {{ item.name }}
<ul class="sub-goods"> <ul class="sub-goods">
<!-- 级联框内 类别名称 --> <!-- 级联框内 类别名称 -->
<li v-for="child in item.children" :key="child.title"> <li v-for="child in item.children" :key="child.id">
<span>{{ child.title }}</span> <span>{{ child.name }}</span>
<span> <span>
<!-- 小类名称 --> <!-- 小类名称 -->
<a <a
v-for="son in child.children" v-for="son in child.children"
:key="son.goodsName" :key="son.id"
@click="handlerGoodsDetails"> @click="handlerGoodsDetails">
{{ son.goodsName }} {{ son.name }}
</a> </a>
</span> </span>
</li> </li>

7
src/views/user/orderManagement/index.vue
View File

@ -24,7 +24,7 @@
getList() getList()
} }
const tableData = ref([{ supplierCompany: '供应商' }]) const tableData = ref([])
/* 退租按钮 */ /* 退租按钮 */
const clickRentingTermination = () => { const clickRentingTermination = () => {
@ -104,6 +104,7 @@
<el-table <el-table
:data="tableData" :data="tableData"
style="width: 100%" style="width: 100%"
show-overflow-tooltip
:header-cell-style="{ :header-cell-style="{
background: '#3E98FF', background: '#3E98FF',
color: '#fff' color: '#fff'
@ -113,7 +114,7 @@
<el-table-column align="center" prop="time" label="订单创建日期" /> <el-table-column align="center" prop="time" label="订单创建日期" />
<el-table-column align="center" prop="payType" label="装备类型" /> <el-table-column align="center" prop="payType" label="装备类型" />
<el-table-column align="center" prop="deviceName" label="装备名称" /> <el-table-column align="center" prop="deviceName" label="装备名称" />
<el-table-column align="center" label="订单状态"> <el-table-column align="center" label="订单状态" width="80">
<template #default="{ row }"> <template #default="{ row }">
<el-tag v-if="row.orderStatus == 31">待确认</el-tag> <el-tag v-if="row.orderStatus == 31">待确认</el-tag>
<el-tag v-if="row.orderStatus == 32">待合同上传</el-tag> <el-tag v-if="row.orderStatus == 32">待合同上传</el-tag>
@ -121,7 +122,7 @@
<el-tag v-if="row.orderStatus == 36">进行中</el-tag> <el-tag v-if="row.orderStatus == 36">进行中</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="name" label="操作" width="320px"> <el-table-column align="center" prop="name" label="操作" width="160px">
<template #default="scope"> <template #default="scope">
<el-button size="small" type="primary" @click="clickPreviewDetails(scope.row)"> <el-button size="small" type="primary" @click="clickPreviewDetails(scope.row)">
查看 查看

2
src/views/user/orderManagementCz/index.vue
View File

@ -47,7 +47,7 @@
}) })
} }
const tableData: any = ref([{ address: '客户单位' }]) const tableData: any = ref([])
const time = ref([]) const time = ref([])
</script> </script>