From af7344df96145370c9b919e6beb8f819f190f781 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 九月 2024 17:04:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/platform/LogisticsRecord/waybill.vue | 2 +-
screen/src/views/PlatformCall.vue | 13 ++++++++++---
admin/src/views/platform/queueUp.vue | 2 +-
admin/src/views/platform/LogisticsRecord/leaveAuth.vue | 8 ++++++--
screen/vite.config.js | 5 +++--
screen/src/router/index.js | 5 ++---
6 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
index 5bfab7f..5a0dfa0 100644
--- a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
+++ b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
@@ -16,7 +16,11 @@
</div>
<el-table class="mb20" v-loading="loading" :data="list" stripe>
<el-table-column type="index" label="搴忓彿" width="70" show-overflow-tooltip />
- <el-table-column prop="billCode" label="杩愬崟鍙�" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="billCode" label="杩愬崟鍙�/鍚堝悓鍙�" min-width="100" show-overflow-tooltip>
+ <template v-slot="scope">
+ <span>{{ scope.row.billCode || scope.row.contractNum }}</span>
+ </template>
+ </el-table-column>
<!-- <el-table-column prop="totalNum" label="鎬讳綔涓氶噺(涓囨敮)" min-width="100" show-overflow-tooltip /> -->
<el-table-column prop="carCodeFront" label="杞︾墝鍙�" min-width="100" show-overflow-tooltip />
<el-table-column prop="carCodeBack" label="鐢靛瓙閿佺姸鎬�" min-width="100" show-overflow-tooltip>
@@ -100,7 +104,7 @@
label: '鍚堝悓鍙�'
},
{
- filed: 'code',
+ filed: 'billCode',
type: 'input',
label: '杩愬崟鍙�'
},
diff --git a/admin/src/views/platform/LogisticsRecord/waybill.vue b/admin/src/views/platform/LogisticsRecord/waybill.vue
index 9018c0d..3786ca0 100644
--- a/admin/src/views/platform/LogisticsRecord/waybill.vue
+++ b/admin/src/views/platform/LogisticsRecord/waybill.vue
@@ -90,7 +90,7 @@
queryFormConfig: {
formItems: [
{
- filed: 'code',
+ filed: 'billCode',
type: 'input',
label: '杩愬崟鍙�'
},
diff --git a/admin/src/views/platform/queueUp.vue b/admin/src/views/platform/queueUp.vue
index 830fa91..b19f7ea 100644
--- a/admin/src/views/platform/queueUp.vue
+++ b/admin/src/views/platform/queueUp.vue
@@ -233,7 +233,7 @@
.plate_id {
display: flex;
- width: 110px;
+ width: 120px;
font-weight: 600;
height: 30px;
line-height: 30px;
diff --git a/screen/src/router/index.js b/screen/src/router/index.js
index aee2fea..b25624f 100644
--- a/screen/src/router/index.js
+++ b/screen/src/router/index.js
@@ -2,12 +2,11 @@
import HomeView from '../views/PlatformCall.vue'
const router = createRouter({
- history: createWebHashHistory(import.meta.env.BASE_URL),
+ history: createWebHashHistory(),
routes: [
{
path: '/',
- // name: 'EnergyConsum',
- component: () => import('../views/EnergyConsum.vue')
+ component: () => import('../views/PlatformCall.vue')
},
{
path: '/PlatformCall',
diff --git a/screen/src/views/PlatformCall.vue b/screen/src/views/PlatformCall.vue
index cc73a73..9d2a827 100644
--- a/screen/src/views/PlatformCall.vue
+++ b/screen/src/views/PlatformCall.vue
@@ -172,8 +172,11 @@
padding: item.status == 2 || item.status == 3,
}" class="status">{{ statusMap[item.status] }}</div>
</div>
- <div class="item">{{ item.platformName }}</div>
- <div class="item">{{ item.optTimeTemp }}</div>
+ <div class="item">{{ item.platformName || '-' }}</div>
+ <div class="item">
+ <div class="time_place">棰勮瀹屾垚鏃堕棿</div>
+ <div>{{ item.optTimeTemp || '-' }}</div>
+ </div>
</div>
</div>
<div class="current">
@@ -300,10 +303,14 @@
display: flex;
justify-content: center;
align-items: center;
+ flex-direction: column;
font-weight: 500;
font-size: 36px;
flex: 10;
-
+ .time_place{
+ font-weight: 500;
+ font-size: 24px;
+ }
.status {
width: 174px;
height: 76px;
diff --git a/screen/vite.config.js b/screen/vite.config.js
index 0d47c47..ed0cd2f 100644
--- a/screen/vite.config.js
+++ b/screen/vite.config.js
@@ -10,6 +10,7 @@
vue(),
VueDevTools(),
],
+ base: './',
resolve: {
alias: {
'@': fileURLToPath(new URL('./src', import.meta.url))
@@ -18,8 +19,8 @@
server: {
proxy: {
"/gateway_interface": {
- target: "http://192.168.0.103:10010",
- // target: "https://xiaoxianlianqi.cn/gateway_interface",
+ // target: "http://192.168.0.103:10010",
+ target: "http://10.50.250.253:8088/gateway_interface",
changeOrigin: true,
rewrite: (path) => path.replace(/^\/gateway_interface/, ""),
},
--
Gitblit v1.9.3