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

代码优化

This commit is contained in:
BianLzhaoMin 2024-12-13 10:20:22 +08:00
parent 450285177c
commit 648e8b6ea9
11 changed files with 129 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
env/.env.dev vendored
View File

@ -8,9 +8,9 @@ VITE_API_URL = '/proxyApi'
# VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭 # VITE_proxyTarget = 'http://10.40.92.74:8080' #盛旭
# VITE_proxyTarget = 'http://192.168.2.246:28080' # 马帅 # VITE_proxyTarget = 'http://192.168.2.246:28080' # 马帅
VITE_proxyTarget = 'http://192.168.2.127:28080' # 梁超 # VITE_proxyTarget = 'http://192.168.2.127:28080' # 梁超
# VITE_proxyTarget = 'http://36.33.26.201:17788/proxyApi' # 测试服务 # VITE_proxyTarget = 'http://36.33.26.201:17788/proxyApi' # 测试服务
# VITE_proxyTarget = 'http://192.168.0.244:28580' # 测试服务 VITE_proxyTarget = 'http://192.168.0.244:28580' # 测试服务
# VITE_proxyTarget = 'http://192.168.2.72:28080' # 盛旭 # VITE_proxyTarget = 'http://192.168.2.72:28080' # 盛旭
# VITE_proxyTarget = 'http://10.40.92.185:9206' # 赵福海 ( 设备类型) # VITE_proxyTarget = 'http://10.40.92.185:9206' # 赵福海 ( 设备类型)

BIN
src/assets/img/home/swiper05.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 575 KiB

174
src/components/header/index.vue
View File

@ -110,7 +110,7 @@ $bus.on('callBackText', (val) => {
// 角色切换按钮 // 角色切换按钮
const onRolesCheck = () => { const onRolesCheck = () => {
isRolesSelect.value = true isRolesSelect.value = !isRolesSelect.value
} }
// 选择角色 // 选择角色
const onSelectRoles = (type: number) => { const onSelectRoles = (type: number) => {
@ -160,87 +160,97 @@ const isMyInfoPage = () => {
<!-- 头部个人信息 收藏夹 手机版等图标 --> <!-- 头部个人信息 收藏夹 手机版等图标 -->
<div class="header-container"> <div class="header-container">
<div class="header-user-info"> <div class="header-user-info">
<div class="header-box wapper"> <div class="header-box">
<!-- <img
v-if="isMyInfoPage()"
:src="headerLogo"
style="height: 35px; cursor: pointer"
alt=""
/> -->
<el-image <el-image
style="width: 190px; cursor: pointer; margin-right: 50%" style="width: 190px; cursor: pointer"
v-if="isMyInfoPage()" v-if="isMyInfoPage()"
:src="headerLogo" :src="headerLogo"
fit="cover" fit="cover"
@click="$router.push('/home')" @click="$router.push('/home')"
/> />
<div class="header-item" v-if="isShowLogout"> <div class="header-right">
<!-- <img src="../assets/img/home/star.png" alt="" /> --> <div class="header-item" v-if="isShowLogout">
<a class="user-name" <!-- <img src="../assets/img/home/star.png" alt="" /> -->
>{{ activeLoginCompanyName }} / {{ store.userInfo.nickName }}</a <a class="user-name"
> >{{ activeLoginCompanyName }} / {{ store.userInfo.nickName }}</a
</div> >
<div class="header-item">
<a v-if="!isShowLogout" class="a-border-none" @click="$router.push('/login')"
>登录</a
>
<span v-if="!isShowLogout" style="margin: 0 3px">/</span>
<a
v-if="!isShowLogout"
style="padding: 0 20px 0 0"
@click="$router.push('/register')"
>注册</a
>
<a v-else @click="handlerLogout">退出登录</a>
</div>
<div class="header-item roles-check" @click="onRolesCheck" v-if="isShowLogout">
<!-- <img src="../assets/img/home/star.png" alt="" /> -->
<a style="display: flex; justify-content: center; padding-right: 10px">
{{ rolesName == 1 ? '出租方' : '承租方' }}
<el-icon style="margin-left: 10px"><ArrowDownBold /></el-icon>
</a>
<div class="select-list" v-if="isRolesSelect"> <div class="line"></div>
<div </div>
style="border-top-left-radius: 6px; border-top-right-radius: 6px"
@click.stop="onSelectRoles(1)" <div class="header-item">
<a
v-if="!isShowLogout"
class="a-border-none"
@click="$router.push('/login')"
>登录</a
> >
出租方 <span v-if="!isShowLogout" style="margin: 0 3px">/</span>
</div> <a
<div v-if="!isShowLogout"
style="border-bottom-left-radius: 6px; border-bottom-right-radius: 6px" style="padding: 0 20px 0 0"
@click.stop="onSelectRoles(2)" @click="$router.push('/register')"
>注册</a
> >
承租方 <a v-else @click="handlerLogout">退出登录</a>
<div class="line"></div>
</div>
<div class="header-item roles-check" @click="onRolesCheck" v-if="isShowLogout">
<!-- <img src="../assets/img/home/star.png" alt="" /> -->
<!-- <a style="display: flex; justify-content: center; padding-right: 10px">
{{ rolesName == 1 ? '出租方' : '承租方' }}
<el-icon style="margin-left: 10px"><ArrowDownBold /></el-icon>
</a> -->
<a style="display: flex; justify-content: center">
<i
style="
background-color: #c9e7e5;
color: #47c4ad;
padding: 4px 6px;
font-weight: bold;
font-size: 13px;
border-radius: 4px;
"
>
{{ rolesName == 1 ? '出租方' : '承租方' }}
</i>
<!-- <el-icon style="margin-left: 10px"><ArrowDownBold /></el-icon> -->
</a>
<div class="line"></div>
<div class="select-list" v-if="isRolesSelect">
<div
style="border-top-left-radius: 6px; border-top-right-radius: 6px"
@click.stop="onSelectRoles(1)"
>
出租方
</div>
<div
style="
border-bottom-left-radius: 6px;
border-bottom-right-radius: 6px;
"
@click.stop="onSelectRoles(2)"
>
承租方
</div>
</div> </div>
</div> </div>
</div> <div class="header-item">
<div class="header-item"> <a
<a @click="
@click=" () => {
() => { router.push({ name: 'my-user' })
router.push({ name: 'my-user' }) }
} "
" >
> 个人中心
个人中心</a </a>
> <div class="line"></div>
</div>
<!-- <div class="header-item last-item">
<img src="../../assets/img/home/phone.png" alt="" />
<a class="a-border-none">手机版</a>
<div class="qr-code">
<el-image
src="https://img.xjishu.com/img/zl/2017/10/212257159687020.gif"
fit="cover"
/>
扫二维码查看xxx
</div> </div>
</div> --> </div>
</div> </div>
</div> </div>
</div> </div>
@ -253,26 +263,34 @@ const isMyInfoPage = () => {
left: 0; left: 0;
z-index: 999; z-index: 999;
.header-user-info {
background-color: #f5f5f5;
}
/* 头部个人信息部分 */ /* 头部个人信息部分 */
.header-box { .header-box {
height: 37px; height: 47px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: space-between;
.header-right {
display: flex;
align-items: center;
justify-content: flex-end;
}
} }
.header-item { .header-item {
height: 37px; height: 47px;
display: flex; display: flex;
align-items: center; align-items: center;
color: #6d6d6d; color: #6d6d6d;
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;
.line {
width: 1px;
height: 15px;
background-color: #666655;
}
.user-name:hover { .user-name:hover {
color: #6d6d6d; color: #6d6d6d;
} }
@ -283,7 +301,7 @@ const isMyInfoPage = () => {
a { a {
padding: 0 20px; padding: 0 20px;
border-right: 1px solid #666655; // border-right: 1px solid #666655;
} }
a:hover { a:hover {

2
src/layout/header.vue
View File

@ -156,7 +156,7 @@ $bus.on('callBackText', (val) => {
// 角色切换按钮 // 角色切换按钮
const onRolesCheck = () => { const onRolesCheck = () => {
if (isAdmin.value) return if (isAdmin.value) return
isRolesSelect.value = true isRolesSelect.value = !isRolesSelect.value
} }
// 选择角色 // 选择角色
const onSelectRoles = (type: number) => { const onSelectRoles = (type: number) => {

4
src/views/cart/index.vue
View File

@ -1,5 +1,7 @@
<template> <template>
<Header /> <div style="width: 100%; background-color: #f5f5f5">
<Header class="wapper" />
</div>
<div class="container"> <div class="container">
<el-breadcrumb separator="/" class="primary-lease"> <el-breadcrumb separator="/" class="primary-lease">
<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>

20
src/views/demand-details/index.vue
View File

@ -1,5 +1,7 @@
<template> <template>
<Header /> <div style="width: 100%; background-color: #f5f5f5">
<Header class="wapper" />
</div>
<div class="container"> <div class="container">
<el-breadcrumb separator="/" class="primary-lease"> <el-breadcrumb separator="/" class="primary-lease">
<el-breadcrumb-item :to="{ path: backPath }">{{ backName }}</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: backPath }">{{ backName }}</el-breadcrumb-item>
@ -161,17 +163,18 @@
</div> </div>
</div> </div>
<div class="demand-record"> <div class="demand-record" v-if="leaseDetails.leaseStatus == 1">
<div class="publicTitle">接单信息</div> <div class="publicTitle">接单信息</div>
<div class="rental-record"> <div class="rental-record">
<el-table <el-table
:data="acceptOrders"
style="width: 100%" style="width: 100%"
:header-cell-style="{ background: '#f2f2f2', color: '#333' }" :header-cell-style="{ background: '#f2f2f2', color: '#333' }"
> >
<el-table-column align="center" prop="orderCode" label="接单人" /> <el-table-column align="center" prop="orderUser" label="接单人" />
<el-table-column align="center" prop="leaseName" label="接单人联系电话" /> <el-table-column align="center" prop="orderPhone" label="接单人联系电话" />
<el-table-column align="center" prop="leaseStartTime" label="接单公司" /> <el-table-column align="center" prop="orderCompany" label="接单公司" />
<el-table-column align="center" prop="leaseEndTime" label="接单时间" /> <el-table-column align="center" prop="orderTime" label="接单时间" />
</el-table> </el-table>
</div> </div>
</div> </div>
@ -189,14 +192,13 @@ import { useRoute, useRouter } from 'vue-router'
import { mainStore } from 'store/main' import { mainStore } from 'store/main'
const backPath = ref<any>('') const backPath = ref<any>('')
const backName = ref<any>('') const backName = ref<any>('')
const leaseDetails = reactive<any>({}) const leaseDetails = reactive<any>({})
const route = useRoute() const route = useRoute()
const router = useRouter() const router = useRouter()
const store: any = mainStore() const store: any = mainStore()
const userId = store.userInfo.userId const userId = store.userInfo.userId
const companyId = store.userInfo.companyId const companyId = store.userInfo.companyId
const acceptOrders = ref<any>([])
//设备简略基本信息 //设备简略基本信息
const equipBaseInfoList = reactive([ const equipBaseInfoList = reactive([
{ {
@ -274,6 +276,8 @@ if (router.options.history.state.back) {
// 获取详情数据 // 获取详情数据
const getLeaseInfoByIdData = async () => { const getLeaseInfoByIdData = async () => {
const res: any = await getLeaseInfoByIdApi({ id: route.query.id }) const res: any = await getLeaseInfoByIdApi({ id: route.query.id })
const { orderCompany, orderPhone, orderTime, orderUser } = res.data
acceptOrders.value.push({ orderCompany, orderPhone, orderTime, orderUser })
Object.assign(leaseDetails, res.data) Object.assign(leaseDetails, res.data)
} }

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

@ -12,6 +12,7 @@ import imgSrc from '../../assets/img/home/nw.png'
import swiper_1 from '../../assets/img/home/swiper01.png' import swiper_1 from '../../assets/img/home/swiper01.png'
import swiper_2 from '../../assets/img/home/swiper02.png' import swiper_2 from '../../assets/img/home/swiper02.png'
import swiper_4 from '../../assets/img/home/swiper04.png' import swiper_4 from '../../assets/img/home/swiper04.png'
import swiper_5 from '../../assets/img/home/swiper05.png'
const { getCompanyList, getGoodsClassList } = userClass() const { getCompanyList, getGoodsClassList } = userClass()
const router: any = useRouter() const router: any = useRouter()
@ -25,24 +26,7 @@ const classList: any = ref([])
const selectOptions = ref<boolean>(false) // 分类 const selectOptions = ref<boolean>(false) // 分类
const selectOptionsValue = ref<string>('分类筛选') const selectOptionsValue = ref<string>('分类筛选')
const loopList = ref([ const loopList = ref([swiper_5, swiper_2, swiper_4])
// 'https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/488bab245180ebf9f1f3d7db5301be4.png',
// 'https://jmy-pic.baidu.com/0/pic/-1857035387_-1067811148_-1621691324.png',
imgSrc,
// swiper_1,
swiper_2,
swiper_4,
])
// 获取商品分类
// const getGoodsClassList = async () => {
// const res: any = await getGoodsClassListApi()
// console.log(res, '商品分类列表')
// // leftNavList.value = res.rows
// classList.value = res.data
// }
// getGoodsClassList()
if (userStore.companyList.length === 0) { if (userStore.companyList.length === 0) {
getCompanyList() getCompanyList()

4
src/views/order/index.vue
View File

@ -1,5 +1,7 @@
<template> <template>
<Header /> <div style="width: 100%; background-color: #f5f5f5">
<Header class="wapper" />
</div>
<div class="container"> <div class="container">
<el-breadcrumb separator="/" class="primary-lease"> <el-breadcrumb separator="/" class="primary-lease">
<el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item> <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>

11
src/views/user/index.vue
View File

@ -25,8 +25,8 @@ const allList = [
{ title: '装备管理', name: 'goodsManagement', permission: ['1'] }, { title: '装备管理', name: 'goodsManagement', permission: ['1'] },
{ title: '订单管理', name: 'orderManagementCz', permission: ['1'] }, { title: '订单管理', name: 'orderManagementCz', permission: ['1'] },
{ title: '接单管理', name: 'accept-orders', permission: ['1'] }, { title: '接单管理', name: 'accept-orders', permission: ['1'] },
{ title: '退租管理', name: 'rent-termination', permission: ['1'] }, // { title: '退租管理', name: 'rent-termination', permission: ['1'] },
{ title: '结算管理', name: 'settlement-manage', permission: ['1'] }, // { title: '结算管理', name: 'settlement-manage', permission: ['1'] },
{ title: '质检管理', name: 'quality-manage', permission: ['1'] }, { title: '质检管理', name: 'quality-manage', permission: ['1'] },
{ title: '安全证书管理', name: 'security-certificate', permission: ['1'] }, { title: '安全证书管理', name: 'security-certificate', permission: ['1'] },
{ title: '标签管理', name: 'tag-manage', permission: ['1'] }, { title: '标签管理', name: 'tag-manage', permission: ['1'] },
@ -49,7 +49,10 @@ router.push({
<template> <template>
<!-- 个人中心页面 --> <!-- 个人中心页面 -->
<Header />
<div style="width: 100%; display: flex; background-color: #f5f5f5; justify-content: flex-end">
<Header style="margin-right: 20px" />
</div>
<div class="app-container" id="user-container"> <div class="app-container" id="user-container">
<div class="left-menu"> <div class="left-menu">
<div class="logo-title" @click="$router.push({ name: 'home' })"> <div class="logo-title" @click="$router.push({ name: 'home' })">
@ -80,7 +83,7 @@ router.push({
<style lang="scss"> <style lang="scss">
.app-container { .app-container {
display: flex; display: flex;
height: calc((100vh - 37px)); height: calc((100vh - 47px));
width: 100%; width: 100%;
.left-menu { .left-menu {

34
src/views/user/orderManagement/components/order-details.vue
View File

@ -241,7 +241,7 @@ if (props.orderStatus == 20) {
} }
if (props.orderStatus == 99) { if (props.orderStatus == 99) {
currentActive.value = 7 currentActive.value = 6
stepList.value[6].title = '订单取消' stepList.value[6].title = '订单取消'
isReject.value = true isReject.value = true
} }
@ -262,7 +262,7 @@ if (props.orderStatus == 99) {
<div style="padding: 20px 40px"> <div style="padding: 20px 40px">
<el-steps <el-steps
:active="currentActive" :active="currentActive"
:finish-status="isReject ? 'error' : 'success'" :finish-status="isReject ? 'wait' : 'success'"
:process-status="isReject ? 'error' : 'process'" :process-status="isReject ? 'error' : 'process'"
align-center align-center
> >
@ -275,36 +275,6 @@ if (props.orderStatus == 99) {
</el-steps> </el-steps>
</div> </div>
<TitleTip :titleText="`租赁信息`" /> <TitleTip :titleText="`租赁信息`" />
<!-- <div class="section">
<el-header>
<el-row type="flex" justify="space-between" align="middle">
<el-col :span="3">
<span>订单流程</span>
</el-col>
<el-col
:span="2"
style="text-align: right; margin-right: 80px; font-size: 20px"
>
<div style="color: green">{{ titleStaus }}</div>
</el-col>
</el-row>
</el-header>
<el-steps
class="step"
:space="600"
:active="orderStatusTemp === 7 ? 1 : orderStatusTemp - 2"
finish-status="success"
>
<el-step :title="getStepTitle(1)" :description="getDescription(1)"></el-step>
<el-step :title="getStepTitle(2)" :description="getDescription(2)"></el-step>
<el-step :title="getStepTitle(3)" :description="getDescription(3)"></el-step>
<el-step :title="getStepTitle(4)"></el-step>
<el-step :title="getStepTitle(5)"></el-step>
</el-steps>
</div> -->
<el-row style="padding: 10px 40px"> <el-row style="padding: 10px 40px">
<el-col :span="8"> <el-col :span="8">
<span> 订单编号： </span> <span> 订单编号： </span>

2
src/views/user/orderManagementCz/components/order-details.vue
View File

@ -241,7 +241,7 @@ if (props.orderStatus == 20) {
} }
if (props.orderStatus == 99) { if (props.orderStatus == 99) {
currentActive.value = 7 currentActive.value = 6
stepList.value[6].title = '订单取消' stepList.value[6].title = '订单取消'
isReject.value = true isReject.value = true
} }