From 6bcd1b4696f14b2eb6faba8ece3a041d5e128243 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期二, 09 四月 2024 20:44:10 +0800
Subject: [PATCH] 暂存
---
src/views/console/base/Shiftsystem.vue | 48 ++++++++++++++++++++++++
dist.zip | 0
src/layout/index.vue | 2
src/api/model/time.js | 7 +--
src/views/console/base/shift-calendar.vue | 10 +++-
public/img/initiallong.b9495273.png | 0
src/api/model/calender.js | 16 +++++++
src/views/console/base/CalenderTab.vue | 13 +++++-
8 files changed, 84 insertions(+), 12 deletions(-)
diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..3796fbc
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/public/img/initiallong.b9495273.png b/public/img/initiallong.b9495273.png
index 034a123..4c04dc1 100644
--- a/public/img/initiallong.b9495273.png
+++ b/public/img/initiallong.b9495273.png
Binary files differ
diff --git a/src/api/model/calender.js b/src/api/model/calender.js
index 38413c7..205ab5c 100644
--- a/src/api/model/calender.js
+++ b/src/api/model/calender.js
@@ -1,7 +1,7 @@
/*
* @Date: 2024-04-04 23:26:03
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-04 23:33:51
+ * @LastEditTime: 2024-04-09 20:39:23
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/api/model/calender.js
*/
import config from "@/config"
@@ -15,4 +15,18 @@
return await http.post(this.url, data, {params});
},
},
+ getShiftsystemList: {
+ url: `${config.API_URL}/blade-cps/shift/page`,
+ name: "鑾峰彇鐝埗鍒楄〃",
+ post: async function({data,params}){
+ return await http.post(this.url, {},{data, params});
+ },
+ },
+ getShiftsystemInfo: {
+ url: `${config.API_URL}/blade-cps/shift/`,
+ name: "鑾峰彇鐝埗淇℃伅",
+ get: async function({id}){
+ return await http.get(`${this.url}${id}`, {},{});
+ },
+ },
}
\ No newline at end of file
diff --git a/src/api/model/time.js b/src/api/model/time.js
index 336579e..e6dd431 100644
--- a/src/api/model/time.js
+++ b/src/api/model/time.js
@@ -1,8 +1,8 @@
/*
* @Date: 2024-04-07 21:49:32
- * @LastEditors: gaoshp
- * @LastEditTime: 2024-04-08 14:58:49
- * @FilePath: /cps-web/src/api/model/time.js
+ * @LastEditors: Sneed
+ * @LastEditTime: 2024-04-09 20:25:53
+ * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/api/model/time.js
*/
import config from "@/config"
import http from "@/utils/request"
@@ -42,5 +42,4 @@
},
},
-
}
\ No newline at end of file
diff --git a/src/layout/index.vue b/src/layout/index.vue
index c776846..18ee1a2 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -99,7 +99,7 @@
<div class="logo-bar personalized-logo">
<!-- <img class="logo" src="img/logo.png">
<span>{{ $CONFIG.APP_NAME }}</span> -->
- <img src="/img/initiallong.b9495273.png" class="img" style="width: 100%; height: 100%;">
+ <img src="/img/initiallong.b9495273.png" class="img" style="width: 100%; height: 70%;">
</div>
</div>
<div class="adminui-header-right">
diff --git a/src/views/console/base/CalenderTab.vue b/src/views/console/base/CalenderTab.vue
index a3d8a70..4e22a1e 100644
--- a/src/views/console/base/CalenderTab.vue
+++ b/src/views/console/base/CalenderTab.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-04 22:45:43
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-07 20:31:00
+ * @LastEditTime: 2024-04-09 20:15:57
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/base/CalenderTab.vue
-->
<template>
@@ -23,7 +23,7 @@
<el-button type="primary">鍒犻櫎</el-button>
</el-header>
<el-main>
- <Calendar :rows="12" disable-page-swipe :nav-visibility="''" :attributes='attributes'/>
+ <Calendar :min-date="minDate" :rows="1" disable-page-swipe :nav-visibility="''" :attributes='attributes'/>
</el-main>
</el-container>
</el-container>
@@ -45,13 +45,20 @@
],
current: 0,
total: 1,
- caleList: []
+ caleList: [],
+ minDate: '',
+ maxDate: ''
}
},
created() {
this.load()
+ this.init()
},
methods: {
+ init () {
+ this.minDate = new Date('2024-01-01')
+ this.maxDate = new Date('2024-01-31')
+ },
load() {
if (this.current * 15 >= this.total) {
return
diff --git a/src/views/console/base/Shiftsystem.vue b/src/views/console/base/Shiftsystem.vue
new file mode 100644
index 0000000..554122f
--- /dev/null
+++ b/src/views/console/base/Shiftsystem.vue
@@ -0,0 +1,48 @@
+<!--
+ * @Date: 2024-04-09 20:19:46
+ * @LastEditors: Sneed
+ * @LastEditTime: 2024-04-09 20:38:18
+ * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/base/Shiftsystem.vue
+-->
+<template>
+ <el-container>
+ <el-aside width="320px">
+ <el-table :data="tableData" stripe style="width: 100%" @row-click="rowClick">
+ <el-table-column prop="code" label="鐝埗缂栧彿" />
+ <el-table-column prop="name" label="鐝埗鍚嶇О" />
+ </el-table>
+ </el-aside>
+ <el-container>
+ 456
+ </el-container>
+ </el-container>
+</template>
+
+<script>
+export default {
+ data () {
+ return {
+ tableData: []
+ }
+ },
+ created () {
+ this.$API.calender.getShiftsystemList.post({params: {current:1,size: 15},data: {
+ code: "",name: "",statusList: [1]
+ }}).then(res => {
+ this.tableData = res?.data?.records || []
+ let current = this.tableData?.[0] || ''
+ current.id && this.rowClick(current)
+ })
+ },
+ methods: {
+ rowClick(row) {
+ console.log(row)
+ this.$API.calender.getShiftsystemInfo.get({id: row.id}).then(res => {
+ console.log(res.data)
+ })
+ }
+ },
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/console/base/shift-calendar.vue b/src/views/console/base/shift-calendar.vue
index 738a807..0faa3cc 100644
--- a/src/views/console/base/shift-calendar.vue
+++ b/src/views/console/base/shift-calendar.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-04 21:51:24
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-05 00:15:20
+ * @LastEditTime: 2024-04-09 20:19:15
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/base/shift-calendar.vue
-->
<template>
@@ -10,15 +10,19 @@
<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></ShiftsystemVue>
+ </el-tab-pane>
</el-tabs>
</el-main>
</template>
<script>
import CalenderTab from './CalenderTab.vue';
+import ShiftsystemVue from './Shiftsystem.vue';
export default {
components: {
- CalenderTab
+ CalenderTab,
+ ShiftsystemVue
},
data () {
return {
--
Gitblit v1.9.3