From c7619152dfb1e07242323cba195832eb9b3a509e Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期日, 24 十二月 2023 14:09:09 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue
index b653554..5706370 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue
@@ -13,14 +13,20 @@
</a-form-item>
</a-col>
<a-col :md="2" :sm="2" :xs="2">
- <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-space>
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button v-has="'user.disposition'" type="primary" @click="handleAdd" icon="plus">閰嶇疆</a-button>
+ </a-space>
</a-col>
- <a-col :md="2" :sm="2">
- <!--//娌堥-->
- <a-button v-has="'user.disposition'" type="primary" @click="handleAdd" icon="plus">閰嶇疆</a-button>
+ <!--<a-col :md="2" :sm="2" :xs="2">-->
+ <!--<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>-->
+ <!--</a-col>-->
+ <!--<a-col :md="2" :sm="2">-->
+ <!--<!–//娌堥–>-->
+ <!--<a-button v-has="'user.disposition'" type="primary" @click="handleAdd" icon="plus">閰嶇疆</a-button>-->
- <!--<a-button type="primary" @click="handleAdd" icon="plus">閰嶇疆</a-button>-->
- </a-col>
+ <!--<!–<a-button type="primary" @click="handleAdd" icon="plus">閰嶇疆</a-button>–>-->
+ <!--</a-col>-->
</a-row>
--
Gitblit v1.9.3