From 10c92555d0ae0c5a8da439195d621d0a3e2877fd Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 11 三月 2025 19:55:15 +0800
Subject: [PATCH] ll
---
admin/src/components/common/QueryForm/queryForm.vue | 4 ++--
h5/utils/config.js | 4 ++--
admin/src/views/business/dangerStatic.vue | 7 +++++++
admin/src/views/meeting/bookings.vue | 32 +++++++++++++++++---------------
h5/pages/wdata/home.vue | 2 +-
5 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/admin/src/components/common/QueryForm/queryForm.vue b/admin/src/components/common/QueryForm/queryForm.vue
index 52caa69..092d6b6 100644
--- a/admin/src/components/common/QueryForm/queryForm.vue
+++ b/admin/src/components/common/QueryForm/queryForm.vue
@@ -35,11 +35,11 @@
<el-date-picker v-model="searchForm[item.filed1]" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
class="w200"
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
- :placeholder="item.label" @change="changeForm(item.filed)" />
+ placeholder="寮�濮嬫椂闂�" @change="changeForm(item.filed)" />
<el-date-picker v-model="searchForm[item.filed2]" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
class="w200"
:clearable="(item.clearable !== null && item.clearable !== undefined && item.clearable !== '') ? item.clearable : true"
- :placeholder="item.label" @change="changeForm(item.filed)" />
+ placeholder="缁撴潫鏃堕棿" @change="changeForm(item.filed)" />
</el-form-item>
<el-form-item v-if="item.type === 'daterange' && (showZk || index < listLength)" :key="item.filed">
<el-date-picker v-model="searchForm[item.filed]" value-format="yyyy-MM-dd" type="daterange"
diff --git a/admin/src/views/business/dangerStatic.vue b/admin/src/views/business/dangerStatic.vue
index af9f3ee..d396341 100644
--- a/admin/src/views/business/dangerStatic.vue
+++ b/admin/src/views/business/dangerStatic.vue
@@ -112,6 +112,13 @@
})
let colors = ['#d75a44', '#e39f4d', '#f0d05f', '#7ac7f6', '#4469ee', '#698af0','#86a2f1','#a1b4f6','#a0b5f5', '#9fb5f4', '#b6c7f7', '#c8d5f8']
let option = {
+ grid: {
+ left: '0%',
+ // right: '4%',
+ // bottom: '3%',
+ top: '0%',
+ containLabel: true
+ },
title: [
{
text: '闅愭偅鎬绘暟',
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index b523871..ec94c98 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -76,28 +76,30 @@
<span class="long-title-style">{{ row.name }}</span>
</template>
</el-table-column>
- <el-table-column prop="roomName" label="浼氳瀹�" align="center" min-width="120px" show-overflow-tooltip>
+ <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="160px"></el-table-column>
+
+ <!-- <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="120px"></el-table-column> -->
+ <!-- <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="120px"></el-table-column> -->
+ <!-- <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="120px"></el-table-column> -->
+ <!-- <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="400px"></el-table-column> -->
+
+ <el-table-column prop="managerInfo" label="棰勭害浜�" align="center" min-width="100px"></el-table-column>
+
+ <el-table-column prop="createDate" label="鎿嶄綔鏃堕棿" align="center" min-width="150px"></el-table-column>
+ <el-table-column prop="roomName" label="浼氳瀹ゅ悕绉�" align="center" min-width="120px" show-overflow-tooltip>
<template slot-scope="{ row }">
<span class="long-title-style">{{ row.roomName }}</span>
</template>
</el-table-column>
- <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="120px"></el-table-column>
- <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="120px"></el-table-column>
- <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="120px"></el-table-column>
- <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="400px"></el-table-column>
- <el-table-column prop="meetingTime" label="浼氳鏃堕棿" align="center" min-width="300px"></el-table-column>
- <el-table-column prop="managerInfo" label="棰勭害浜�" align="center" min-width="100px"></el-table-column>
- <el-table-column label="浼氳鐘舵��" align="center" min-width="60px">
+ <el-table-column prop="roomName" label="浼氳鐘舵��" align="center" min-width="120px" show-overflow-tooltip>
<template slot-scope="{ row }">
- <span v-if="row.meetingStatus == 1">鏈紑濮�</span>
- <span v-if="row.meetingStatus == 2">杩涜涓�</span>
- <span v-if="row.meetingStatus == 3">宸茬粨鏉�</span>
- <span v-if="row.meetingStatus == 4">鍗冲皢寮�濮�</span>
- <span v-if="row.meetingStatus == 5">宸叉挙閿�</span>
- <!-- {{ row.status==0 ? '姝ｅ父' : '鍙栨秷' }} -->
+ <span v-if="row.meetingStatus == 1" class="long-title-style">鏈紑濮�</span>
+ <span v-if="row.meetingStatus == 2" class="long-title-style">杩涜涓�</span>
+ <span v-if="row.meetingStatus == 3" class="long-title-style">宸茬粨鏉�</span>
+ <span v-if="row.meetingStatus == 4" class="long-title-style">鍗冲皢寮�濮�</span>
+ <span v-if="row.meetingStatus == 5" class="long-title-style">宸叉挙閿�</span>
</template>
</el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="150px"></el-table-column>
<!-- <el-table-column prop="content" label="浼氳鍐呭" min-width="100px"></el-table-column> -->
<el-table-column v-if="
containPermissions([
diff --git a/h5/pages/wdata/home.vue b/h5/pages/wdata/home.vue
index ad1fc28..b3dbfa1 100644
--- a/h5/pages/wdata/home.vue
+++ b/h5/pages/wdata/home.vue
@@ -37,7 +37,7 @@
phone: ''
},
countDown: 0,
- code: ''
+ code: '111'
};
},
onShow() {
diff --git a/h5/utils/config.js b/h5/utils/config.js
index 05ff784..08884a3 100644
--- a/h5/utils/config.js
+++ b/h5/utils/config.js
@@ -1,8 +1,8 @@
-// export const baseUrl = 'zhyq_interface/'
+export const baseUrl = 'zhyq_interface/'
// export const baseUrl = 'http://192.168.0.173/gateway_interface/'
// export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'
-export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
+// export const baseUrl = 'https://atwl.ahzyssl.com/zhyq_interface/'
export const app_url = 'https://atwl.ahzyssl.com/zhyq_h5/#/'
--
Gitblit v1.9.3