From 1988d77f4df3c01a9137303e0c959b3442c14377 Mon Sep 17 00:00:00 2001 From: lzhe <lzhe@example.com> Date: 星期一, 30 九月 2024 22:10:30 +0800 Subject: [PATCH] 1 --- src/views/console/base/CalenderTab.vue | 208 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 194 insertions(+), 14 deletions(-) diff --git a/src/views/console/base/CalenderTab.vue b/src/views/console/base/CalenderTab.vue index 853691a..b3ab3b5 100644 --- a/src/views/console/base/CalenderTab.vue +++ b/src/views/console/base/CalenderTab.vue @@ -1,15 +1,16 @@ <!-- * @Date: 2024-04-04 22:45:43 - * @LastEditors: Sneed - * @LastEditTime: 2024-05-05 00:14:21 - * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/console/base/CalenderTab.vue + * @LastEditors: gaosp + * @LastEditTime: 2024-09-07 15:15:29 + * @FilePath: /mdc/Users/mache/Documents/demo/cps-web/src/views/console/base/CalenderTab.vue --> <template> <el-container> <el-aside width="220px"> <el-button type="primary" icon="el-icon-plus" @click="add">鏂板缓鏃ュ巻</el-button> <div v-infinite-scroll="load"> - <el-card shadow="never" class="card" v-for="item in caleList" :key="item.id" @click="select(item)"> + <el-card shadow="never" class="card" :class="selectInfo.id === item.id ? 'active' : ''" + v-for="item in caleList" :key="item.id" @click="select(item)"> <h3>{{ item.code }}</h3> <p>鏃ュ巻鍚嶇О: {{ item.name }}</p> <p>搴旂敤骞翠唤: {{ item.year }}</p> @@ -19,8 +20,8 @@ <el-container> <el-header> <span>鏃ュ巻銆恵{ selectInfo.code }}銆憑{ selectInfo.name }}</span> - <el-button type="primary" style="margin-left: auto;" size="small">鍏宠仈宸ヤ綅</el-button> - <el-button type="primary" size="small">缂栬緫鏃ュ巻</el-button> + <el-button type="primary" style="margin-left: auto;" size="small" @click="relationWork">鍏宠仈宸ヤ綅</el-button> + <!-- <el-button type="primary" size="small">缂栬緫鏃ュ巻</el-button> --> <el-popconfirm title="纭畾鍒犻櫎鍚楋紵" @confirm="table_del"> <template #reference> <el-button type="primary" size="small">鍒犻櫎</el-button> @@ -28,12 +29,30 @@ </el-popconfirm> </el-header> <el-main> - <Calendar :min-date="minDate" :rows="1" disable-page-swipe :nav-visibility="''" :attributes='attributes' - @dayclick="dayclick($event, item)" /> + <el-row> + <el-col :span="6" style="padding: 10px;" v-for="item in months" :key="item.month"> + <Calendar :initial-page="{ month: item.month + 1, year: item.year }" :rows="1" + disable-page-swipe :nav-visibility="''" :attributes='item.attributes' /> + </el-col> + </el-row> + <!-- :initial-page="{ month: item.month + 1, year: item.year }" --> + </el-main> </el-container> <el-drawer v-model="drawer" size="80%" title="鐢熶骇鏃ュ巻" :direction="direction" :before-close="handleClose"> - <Add></Add> + <Add :shiftList="shiftList" @success="success"></Add> + </el-drawer> + <el-drawer v-model="raworkVisible" size="80%" title="鐢熶骇鏃ュ巻" :direction="direction" :before-close="handleClose"> + <el-container v-if="raworkVisible"> + <el-main> + <el-tree ref="workstations" default-expand-all :data="workStations" show-checkbox node-key="id" + :props="defaultProps" :render-content="renderContent" /> + </el-main> + <el-footer style="text-align: right"> + <el-button type="primary" @click="saveBefore">淇濆瓨</el-button> + </el-footer> + </el-container> + </el-drawer> </el-container> </template> @@ -42,6 +61,7 @@ import { Calendar, DatePicker } from 'v-calendar'; import 'v-calendar/style.css'; import Add from './Add.vue' +import moment from 'moment'; export default { components: { Calendar, @@ -52,7 +72,8 @@ return { shiftList: [], selectInfo: {}, - drawer: true, + drawer: false, + months: [], attributes: [ ], @@ -60,7 +81,12 @@ total: 1, caleList: [], minDate: '', - maxDate: '' + maxDate: '', + raworkVisible: false, + defaultProps: { + label: 'title', + children: 'children', + }, } }, created() { @@ -68,12 +94,88 @@ this.init() }, methods: { + relationWork() { + this.$HTTP.post('/api/blade-cps/group/groupWorkstation', { groupCategory: 1, groupType: 'group_workstation' }).then(res => { + if (res.code === 200) { + this.raworkVisible = true + this.workStations = this.formatData(res.data) + console.log(this.workStations) + } + }) + + }, + formatData(data, current) { + let newData = [] + if (!current) { + newData = data.filter(item => item.parentId == 0).map(v => { + v.children = this.formatData(data, v).sort((a, b) => { + return b.sort - a.sort + }) + return v + }) + } else { + let res = data.filter(v => v.parentId == current.id) + res = res.map(item => { + item.children = this.formatData(data, item).sort((a, b) => { + return b.sort - a.sort + }) + return item + }) + return res + } + return newData + }, + renderContent(h, { data }) { + if (data.isWorkstation) { + return h('div', {}, [ + h('span', {}, data.title), + data.calendarCode ? h('span', { + style: { + marginLeft: '10px', + color: 'var(--el-color-primary)' + } + }, `宸插叧鑱�(${data.calendarCode})`) : '' + ]) + } else { + return data.title + } + }, + saveBefore() { + let workstation = this.$refs.workstations.getCheckedNodes().filter(v => v.isWorkstation) || [] + if (workstation.length == 0) { + return this.$message.warning("璇烽�夋嫨"); + } + if (workstation.some(v => v.calendarCode).length > 0) { + this.$confirm(`鎵�閫夊伐浣嶅凡鏈夋帓鐝紝纭瑕侀噸鏂板叧鑱旂敓浜ф棩鍘嗗悧锛焋, '鎻愮ず', { + type: 'warning', + }).then(() => { + this.save(workstation.map(v => v.id)) + }).catch(() => { + return false + }) + } else { + this.save(workstation.map(v => v.id)) + } + console.log(this.$refs.workstations.getCheckedNodes().filter(v => v.isWorkstation)) + }, + save(workstationIdList) { + console.log(workstationIdList, this.selectInfo) + this.$HTTP.post('/api/blade-cps/calendar/associate-workstation', { + calendarCode: this.selectInfo.code, + workstationIdList + }).then(res => { + if (res.code === 200) { + this.$message.success("鎿嶄綔鎴愬姛"); + this.raworkVisible = false + } else { + this.$message.error(res.msg); + } + }) + }, dayclick(day) { console.log(day) }, init() { - this.minDate = new Date('2024-01-01') - this.maxDate = new Date('2024-01-31') this.$HTTP.post('/api/blade-cps/shift/list', { statusList: [1] }).then(res => { if (res.code === 200) { this.shiftList = res.data @@ -84,6 +186,13 @@ this.selectInfo = { ...row } + this.months = [] + this.$HTTP.get(`/api/blade-cps/calendar/${row.id}`).then(res => { + if (res.code === 200) { + console.log(res.data) + this.setDay(res.data) + } + }) }, table_del() { this.$HTTP.delete(`/api/blade-cps/calendar/${this.selectInfo.id}`).then(res => { @@ -116,6 +225,74 @@ } }) + }, + success() { + this.drawer = false + this.load(true) + }, + setDay(data) { + let year = data.year + this.$HTTP.post('/api/blade-cps/shift-off-day/list', { + year: year, + startOffDay: `${year}-01-01`, + endOffDay: `${year}-12-31` + }).then(res => { + if (res.code === 200) { + let arr = [] + res.data.forEach(v => { + arr.push(v.startOffDay) + let day = moment(v.startOffDay) + while (day.add(1, 'd').unix() <= moment(v.endOffDay).unix()) { + arr.push(day.format('YYYY-MM-DD')) + } + }) + + for (let i = 0; i < 12; i++) { + this.months.push({ + year: year, + month: i, + attributes: [ + { + dot: 'yellow', + dates: arr.filter(item => { + // console.log(moment(item).month(), 'mmonth', item) + return moment(item).month() === i + }) + }, + { + highlight: true, + dates: data.calendarDayVOList.filter(item => { + console.log(moment(item).month(), '>>>123') + return moment(item.calendarDate).month() === i + }).map(v => v.calendarDate), + } + ] + }) + } + } + }) + + + // this.months.forEach((item, i) => { + // let start = moment(`${currentYear}-${i + 1}-01`) + // let end = moment(`${currentYear}-${i + 2}-01`) + // let dates = [] + // while (start.unix() < end.unix()) { + // if (this.checkboxGroup1.includes(start.day()) && this.holiday === 0) { + // this.pushDate(start) && dates.push(start.format('YYYY-MM-DD')) + // } else if (this.checkboxGroup1.includes(start.day()) && this.holiday === 1) { + // if (!this.months[i].attributes[0].dates.includes(start.format('YYYY-MM-DD'))) { + // this.pushDate(start) && dates.push(start.format('YYYY-MM-DD')) + // } + // } else if (this.checkboxGroup1.includes(start.day()) && this.holiday === 2) { + // if (this.months[i].attributes[0].dates.includes(start.format('YYYY-MM-DD'))) { + // this.pushDate(start) && dates.push(start.format('YYYY-MM-DD')) + // } + // } + // start.add(1, 'd') + // } + // this.months[i].attributes[1].dates = dates + // }) } } } @@ -127,8 +304,11 @@ margin: 12px 12px 12px 0; } +.card.active { + border: 1px solid var(--el-color-primary); +} + .vc-arrow { display: none !important; - ; } </style> \ No newline at end of file -- Gitblit v1.9.3