From a2441175073f8b09a7eff29effd7e3e617de2f7d Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期四, 06 六月 2024 18:23:01 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/console/base/shift-calendar.vue | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/src/views/console/base/shift-calendar.vue b/src/views/console/base/shift-calendar.vue
index 738a807..e2f1018 100644
--- a/src/views/console/base/shift-calendar.vue
+++ b/src/views/console/base/shift-calendar.vue
@@ -1,43 +1,50 @@
<!--
* @Date: 2024-04-04 21:51:24
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-05 00:15:20
+ * @LastEditTime: 2024-05-05 20:56:40
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/base/shift-calendar.vue
-->
<template>
- <el-main style="height: 100%;background-color: #fff;">
+ <el-main>
+ <el-card shadow="never">
<el-tabs tab-position="top" class="custom-tabs" v-model="activeName">
<el-tab-pane label="鐢熶骇鏃ュ巻" name="1">
<CalenderTab></CalenderTab>
</el-tab-pane>
- <el-tab-pane label="鐝埗" name="2"></el-tab-pane>
+ <el-tab-pane label="鐝埗" name="2">
+ <ShiftsystemVue v-if="activeName == 2"></ShiftsystemVue>
+ </el-tab-pane>
</el-tabs>
+ </el-card>
</el-main>
</template>
<script>
- import CalenderTab from './CalenderTab.vue';
- export default {
- components: {
- CalenderTab
- },
- data () {
- return {
- activeName: '1'
- }
+import CalenderTab from './CalenderTab.vue';
+import ShiftsystemVue from './Shiftsystem.vue';
+export default {
+ components: {
+ CalenderTab,
+ ShiftsystemVue
+ },
+ data() {
+ return {
+ activeName: '1'
}
}
+}
</script>
<style lang="scss" scoped>
.el-tabs--card {
- height: calc(100vh - 110px - 56px);
- /* overflow-y: auto; */
+ // height: calc(100vh - 110px - 56px);
+ /* overflow-y: auto; */
}
+
.el-tab-pane {
- height: calc(100vh - 110px - 56px);
- overflow-y: auto;
+ // height: calc(100vh - 110px - 56px);
+ // overflow-y: auto;
}
- // .custom-tabs {
- // height: 500px;
- // overflow: scroll;
- // }
-</style>
\ No newline at end of file
+
+// .custom-tabs {
+// height: 500px;
+// overflow: scroll;
+// }</style>
\ No newline at end of file
--
Gitblit v1.9.3