From ce6411be45697a38b4afca6debbd07338aab6cb8 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 09 一月 2023 22:29:39 +0800
Subject: [PATCH] 修改前端页面
---
src/components/page/leaderShow/leaderIndex.vue | 14 +++++++-------
src/components/page/leaderShow/Dialog/handleOrderForm.vue | 2 +-
src/components/page/leaderShow/Dialog/xunjieOrderForm.vue | 1 -
src/components/page/park/index.vue | 5 +++--
src/components/page/leaderShow/Dialog/shangjiZhipaiForm.vue | 1 -
src/components/page/leaderShow/Dialog/inAndOutForm.vue | 2 +-
6 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/components/page/leaderShow/Dialog/handleOrderForm.vue b/src/components/page/leaderShow/Dialog/handleOrderForm.vue
index a5918c4..316c3fe 100644
--- a/src/components/page/leaderShow/Dialog/handleOrderForm.vue
+++ b/src/components/page/leaderShow/Dialog/handleOrderForm.vue
@@ -3,7 +3,7 @@
<el-dialog
title="鏅烘収娉婅溅璁㈠崟澶勭悊璁板綍"
:visible.sync="dialogVisible"
- width="50%">
+ width="60%">
<div class="daibanForm-main">
<el-table
:data="pageData.rows"
diff --git a/src/components/page/leaderShow/Dialog/inAndOutForm.vue b/src/components/page/leaderShow/Dialog/inAndOutForm.vue
index a9298d6..57312d0 100644
--- a/src/components/page/leaderShow/Dialog/inAndOutForm.vue
+++ b/src/components/page/leaderShow/Dialog/inAndOutForm.vue
@@ -18,7 +18,7 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
- align="left"
+ align="center"
header-align="center"
prop="parkName"
label="鍋滆溅鍦�"
diff --git a/src/components/page/leaderShow/Dialog/shangjiZhipaiForm.vue b/src/components/page/leaderShow/Dialog/shangjiZhipaiForm.vue
index 539ebd2..38c134e 100644
--- a/src/components/page/leaderShow/Dialog/shangjiZhipaiForm.vue
+++ b/src/components/page/leaderShow/Dialog/shangjiZhipaiForm.vue
@@ -136,7 +136,6 @@
//鍔犺浇鏁版嵁
loadData() {
let newObj = Object.assign({},this.pageData,this.type)
- console.log('newObj-----',newObj)
this.$byutil.loadPageData(this, this.pageConfig.pageDataUrl,newObj);
},
handleSizeChange(val) {
diff --git a/src/components/page/leaderShow/Dialog/xunjieOrderForm.vue b/src/components/page/leaderShow/Dialog/xunjieOrderForm.vue
index f7cb2a8..5e84c8b 100644
--- a/src/components/page/leaderShow/Dialog/xunjieOrderForm.vue
+++ b/src/components/page/leaderShow/Dialog/xunjieOrderForm.vue
@@ -137,7 +137,6 @@
//鍔犺浇鏁版嵁
loadData() {
let newObj = Object.assign({},this.pageData,this.type)
- console.log('newObj-----',newObj)
this.$byutil.loadPageData(this, this.pageConfig.pageDataUrl,newObj);
},
handleSizeChange(val) {
diff --git a/src/components/page/leaderShow/leaderIndex.vue b/src/components/page/leaderShow/leaderIndex.vue
index 58a6d0e..b7e9438 100644
--- a/src/components/page/leaderShow/leaderIndex.vue
+++ b/src/components/page/leaderShow/leaderIndex.vue
@@ -3,14 +3,14 @@
<div class="leaderIndex-title">
<h1>宄板嘲鐭垮尯缁煎悎琛屾斂鎵ф硶灞�鏅烘収娉婅溅骞冲彴</h1>
<div class="leader-title-left">
- <h2>娆㈣繋鐧诲綍锛寋{userName}}!</h2>
+ <h2>娆㈣繋鐧诲綍锛寋{userName}}</h2>
</div>
<div class="logout" @click="logout">
閫�鍑虹櫥褰�
</div>
- <div class="leader-title-right" @click="houtaiBtn">
- <h2>鍚庡彴绠＄悊</h2>
- </div>
+<!-- <div class="leader-title-right" @click="houtaiBtn">-->
+<!-- <h2>鍚庡彴绠＄悊</h2>-->
+<!-- </div>-->
<div class="weizhang-content">
<h2 @click="weizhangBtn(item)" v-if="index < 1" v-for="(item,index) in weizhangList" :key="index">杩濇硶杞﹁締锛歿{item.carNo}}杩涘叆{{item.parkName}} {{item.createTime}}</h2>
</div>
@@ -293,7 +293,7 @@
},
mounted() {
this.newTimes()
- this.userName = JSON.parse(this.getStore('userinfo')).name
+ this.userName = this.getStore('name')
this.getData()
this.$nextTick(() => {
this.createMap()
@@ -1172,7 +1172,7 @@
}
.leader-title-left{
position: absolute;
- left: 0.2083rem /* 40/192 */;
+ left: 0.3183rem /* 40/192 */;
top:0.0521rem /* 10/192 */;
cursor: pointer;
h2{
@@ -1381,7 +1381,7 @@
background: url('../../../assets/images/wait-bj.png') no-repeat center;
background-size: 100% 100%;
position: absolute;
- right: 0.667rem /* 50/75 */;
+ right: 0.3183rem /* 50/75 */;
top:0.0729rem /* 14/192 */;
color: #fff;
display: flex;
diff --git a/src/components/page/park/index.vue b/src/components/page/park/index.vue
index 5ad6bc8..ee12dd5 100644
--- a/src/components/page/park/index.vue
+++ b/src/components/page/park/index.vue
@@ -14,9 +14,10 @@
<el-table :data="pageData.rows" v-loading="pageData.isLoading" border style="width:100%;border:1px solid #bcbec2;">
<el-table-column type="index" width="50" label="搴忓彿" align="center"> </el-table-column>
- <el-table-column prop="name" label="鍋滆溅鍦哄悕绉�" align="center"></el-table-column>
+ <el-table-column prop="name" label="鍋滆溅鍦哄悕绉�" align="center" width="350"></el-table-column>
<el-table-column prop="code" label="缂栧彿" align="center" width="80"></el-table-column>
- <el-table-column prop="num" label="杞︿綅鏁伴噺" align="center" width="80"></el-table-column>
+ <el-table-column prop="num" label="璁″垝杞︿綅鏁伴噺" align="center" width="120"></el-table-column>
+ <el-table-column prop="carNum" label="褰撳墠杞︿綅鏁伴噺" align="center" width="120"></el-table-column>
<el-table-column prop="content" label="鎻忚堪" align="center"></el-table-column>
<el-table-column label="鎿嶄綔" fixed="right" width="250" align="center">
<template slot-scope="scope">
--
Gitblit v1.9.1