From 8e75a78f55d60565eb48b25eafd4eb07939ce2cc Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:05 +0800
Subject: [PATCH] Merge branch 'master' into develop
---
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue | 362 +++++++++++++++++++++++++++++----------------------
1 files changed, 208 insertions(+), 154 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
index 902b674..cb49c1c 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
@@ -1,6 +1,6 @@
<template>
<div ref="device">
- <a-modal :title="title" :width="800" :visible="visible" :confirmLoading="confirmLoading" :getContainer="() => this.$refs.device"
+ <a-modal :title="title" :width="900" :visible="visible" :confirmLoading="confirmLoading" :getContainer="() => this.$refs.device"
:okButtonProps="{ props: {disabled: disableSubmit} }" @ok="handleOk" @cancel="handleCancel" cancelText="鍏抽棴">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
@@ -13,55 +13,9 @@
</a-col>
</a-row>
<a-row :gutter="24">
- <a-col :span="12">
- <a-form-item label="鐢熸晥鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-date-picker v-decorator="['takeEffectDate',validatorRules.takeEffectDate]" :disabled="disableSubmit"
- :readOnly="disableSubmit" :disabledDate="disabledDate"/>
- </a-form-item>
- </a-col>
- <a-col :span="12">
- <a-form-item label="澶辨晥鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-date-picker v-decorator="['invalidDate',validatorRules.invalidDate]" :disabled="disableSubmit"
- :readOnly="disableSubmit" :disabledDate="disabledDateEnd"/>
- </a-form-item>
- </a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span='12'>
- <a-form-item label="鏄熸湡涓�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select v-decorator="['monShiftId', validatorRules.monShiftId]" placeholder="璇烽�夋嫨鐝埗"
- :allowClear='allowClear' @change="initShiftSubList">
- <a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
- {{ em.label }}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- <a-col :span="12">
- <a-form-item label="鏄熸湡浜�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select v-decorator="['tueShiftId', validatorRules.tueShiftId]" placeholder="璇烽�夋嫨鐝埗"
- :allowClear='allowClear' @change="initShiftSubList">
- <a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
- {{ em.label }}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span='12'>
- <a-form-item label="鏄熸湡涓�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select v-decorator="['wedShiftId', validatorRules.wedShiftId]" placeholder="璇烽�夋嫨鐝埗"
- :allowClear='allowClear' @change="initShiftSubList">
- <a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
- {{ em.label }}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- <a-col :span="12">
- <a-form-item label="鏄熸湡鍥�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select v-decorator="['thuShiftId', validatorRules.thuShiftId]" placeholder="璇烽�夋嫨鐝埗"
+ <a-col :span="24">
+ <a-form-item label="鐝埗" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
+ <a-select v-decorator="['shiftId', validatorRules.shiftId]" placeholder="璇烽�夋嫨鐝埗"
:allowClear='allowClear' @change="initShiftSubList">
<a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
{{ em.label }}
@@ -70,79 +24,23 @@
</a-form-item>
</a-col>
</a-row>
+
<a-row :gutter="24">
- <a-col :span='12'>
- <a-form-item label="鏄熸湡浜�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select v-decorator="['friShiftId', validatorRules.friShiftId]" placeholder="璇烽�夋嫨鐝埗"
- :allowClear='allowClear' @change="initShiftSubList">
- <a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
- {{ em.label }}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- <a-col :span="12">
- <a-form-item label="鏄熸湡鍏�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select v-decorator="['satShiftId', validatorRules.satShiftId]" placeholder="璇烽�夋嫨鐝埗"
- :allowClear='allowClear' @change="initShiftSubList">
- <a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
- {{ em.label }}
- </a-select-option>
- </a-select>
- </a-form-item>
+ <a-col :span="24">
+ <a-form-item label="鐢熸晥鏃堕棿" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
+ <div class="mainBox">
+ <Calendar
+ v-on:choseDay="clickDay"
+ v-on:changeMonth="changeDate"
+ v-on:isToday="clickToday"
+ :markDate = 'shiData'
+ :agoDayHide = 'value'
+ ></Calendar>
+ </div>
+
+ </a-form-item>
</a-col>
</a-row>
- <a-row :gutter="24">
- <a-col :span='12'>
- <a-form-item label="鏄熸湡鏃�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-select v-decorator="['sunShiftId', validatorRules.sunShiftId]" placeholder="璇烽�夋嫨鐝埗"
- :allowClear='allowClear' @change="initShiftSubList">
- <a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
- {{ em.label }}
- </a-select-option>
- </a-select>
- </a-form-item>
- </a-col>
- <a-col :span="12">
- </a-col>
- </a-row>
- <!--<a-row :gutter="24">-->
- <!--<a-col :span="12">-->
- <!--<a-form-item label="璁惧" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<a-input v-decorator="['equmentName',validatorRules.equmentName]" :disabled="true" :readOnly="true"/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--<a-col :span="12">-->
- <!--<a-form-item label="鏄惁璺ㄥぉ" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<a-switch v-model="isDaySpan" :disabled="true" checked-children="鏄�" un-checked-children="鍚�"/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--</a-row>-->
- <!--<a-row :gutter="24">-->
- <!--<a-col :span="12">-->
- <!--<a-form-item label="寮�濮嬫椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<a-input v-decorator="['startDate',validatorRules.startDate]" :disabled="true" :readOnly="true"/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--<a-col :span="12">-->
- <!--<a-form-item label="缁撴潫鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<a-input v-decorator="['endDate',validatorRules.endDate]" :disabled="true" :readOnly="true"/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--</a-row>-->
- <!--<a-row :gutter="24">-->
- <!--<a-col :span="12">-->
- <!--<a-form-item label="寮�濮嬩紤鎭椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<a-input v-decorator="['sleepStartDate',validatorRules.sleepStartDate]" :disabled="true"-->
- <!--:readOnly="true"/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--<a-col :span="12">-->
- <!--<a-form-item label="缁撴潫浼戞伅鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
- <!--<a-input v-decorator="['sleepEndDate',validatorRules.sleepEndDate]" :disabled="true" :readOnly="true"/>-->
- <!--</a-form-item>-->
- <!--</a-col>-->
- <!--</a-row>-->
</a-form>
</a-spin>
<device-calend-list-model ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"></device-calend-list-model>
@@ -163,12 +61,19 @@
duplicateCheck
} from '@/api/api'
+ import Calendar from 'vue-calendar-component';
+
export default {
name: 'ShiftInfoModel',
- components: {DeviceCalendListModel},
+ components: {DeviceCalendListModel,Calendar},
props: {},
data() {
return {
+ value:'',
+ date:'',
+ week:"",
+ selectDate: [],
+ // 褰撳墠鏃ユ湡
allowClear:true,
title: '',
isDaySpan: false,
@@ -219,20 +124,113 @@
url: {
add: '/mdc/mdcDeviceCalendar/add',
edit: '/mdc/mdcshiftsub/edit',
- initShiftList: '/mdc/mdcMdcShift/deleteShift',
+ initShiftList: '/mdc/mdcMdcShift/initShiftList',
initShiftSubList: '/mdc/mdcshiftsub/initShiftSubList',
getShiftSubById: '/mdc/mdcshiftsub/getShiftSubById',
settingCalendar: '/mdc/mdcDeviceCalendar/add',
},
shiftList: [],
shiftSubList: [],
- disableSubmit: true
+ disableSubmit: true,
+ calData:undefined,
+ shiData:[],
+ sendDte:[]
}
},
created() {
+ this.value = Math.round(new Date().getTime()/1000).toString()
+ var now = new Date();
+ this.date = now.getDate();//寰楀埌鏃ユ湡
+ var day = now.getDay();//寰楀埌鍛ㄥ嚑
+ var arr_week = new Array("鏄熸湡鏃�", "鏄熸湡涓�", "鏄熸湡浜�", "鏄熸湡涓�", "鏄熸湡鍥�", "鏄熸湡浜�", "鏄熸湡鍏�");
+ this.week = arr_week[day];
+ this.getWorking()
},
methods: {
+ // clickDay(data) {
+ // console.log(data); //閫変腑鏌愬ぉ
+ // },
+ changeDate(data) {
+ // console.log(data); //宸﹀彸鐐瑰嚮鍒囨崲鏈堜唤
+ },
+ clickToday(data) {
+ //console.log(data); // 璺冲埌浜嗘湰鏈�
+ },
+ // markChange(){
+ //
+ // },
+ getWorking(){//鑾峰彇褰撳墠鏈堝伐浣滄棩
+ let myDate = new Date();
+ let tY = myDate.getFullYear();//寰楀埌褰撳墠骞�
+ let tM = myDate.getMonth();//寰楀埌褰撳墠鏈�+1
+ let tD = new Date(tY,tM+1,0);
+ let tT=tD.getDate();//寰楀埌褰撳墠鏈堢殑澶╂暟
+
+ for(var i=1;i<=tT;i++){
+ let week =new Date(tY,tM,i).getDay()
+ if(week>=1&&week<=5){
+ let dd = tY + "/" + (tM + 1) + "/" + i;
+ let temp={className: "mark1",date:dd}
+ this.selectDate.push(temp)
+ }
+ }
+//console.log(JSON.stringify(this.selectDate))
+ },
+ resetSelect(){//閲嶇疆閫変腑鐨勬棩鏈�
+ this.selectDate=[]
+ this.shiData = []
+ this.sendDte = []
+ },
+ fun(obj){
+ console.log(obj)
+ if(obj){
+ if(obj = obj.split("/")){
+ var timShi = obj[1];
+ var timFen = obj[2];
+ if(timShi < 10){
+ timShi = '0'+timShi
+ }
+ if(timFen < 10){
+ timFen = '0'+timFen
+ }
+ var dd = (obj[0] + timShi +timFen)
+ return dd
+ }
+ }
+ },
+ clickDay(today){//閫変腑鏃ユ湡
+ let existDate = this.selectDate;
+ let isExist = true;
+ for (var i = 0; i < existDate.length; i++) {
+ if (existDate[i].date === today) {
+ this.selectDate.splice(i,1);
+ this.shiData.splice(i,1);
+ this.sendDte.splice(i,1)
+ isExist = false;
+ }
+ }
+ if (isExist) {//褰撳墠鏃ユ湡瀛樺湪绉婚櫎
+ let tempDate = {date: today, className: "mark1"}
+ // let ddd = this.fun(today)
+ let ddd = today
+ let ccc = this.fun(today)
+ this.selectDate.push(tempDate)
+ this.shiData.push(ddd)
+ this.sendDte.push(ccc)
+ }
+ },
+ onSelect(value) {
+ console.log(value);
+ let arr = []
+ arr.push(value);
+ this.value = arr
+ // this.value = value;
+ // this.selectedValue = value;
+ },
+ onPanelChange(value) {
+ this.value = value;
+ },
deviceSearch() {
this.$refs.deviceRepairListModel.openPage()
this.$refs.deviceRepairListModel.title = '閫夋嫨璁惧'
@@ -276,16 +274,17 @@
// })
},
add(record) {
+ this.resetSelect()
let _this = this
this.visible = true
this.form.resetFields()
this.model = Object.assign({}, record)
this.initShiftList()
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'equmentName'))
+ this.form.setFieldsValue(pick(this.model))
this.form.setFieldsValue({
- takeEffectDate: moment(),
- invalidDate: moment().endOf('month')
+ // takeEffectDate: moment(),
+ // invalidDate: moment().endOf('month')
})
})
},
@@ -301,12 +300,22 @@
if (!err) {
that.confirmLoading = true
let formData = Object.assign(this.model, values)
+
+ formData.dateList = this.sendDte
postAction(this.url.settingCalendar, formData).then((res) => {
if (res.success) {
- that.$message.success(res.message)
+ // that.$message.success(res.message)
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.$emit('ok', res.result)
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.confirmLoading = false
@@ -318,37 +327,14 @@
handleCancel() {
this.close()
},
- // shiftSubChange(val) {
- // let _this = this
- // getAction(this.url.getShiftSubById, { shiftSubId: val }).then((res) => {
- // if (res.success) {
- // if (res.result.isDaySpan == 'true') {
- // _this.isDaySpan = true
- // } else {
- // _this.isDaySpan = false
- // }
- // _this.form.setFieldsValue({
- // startDate: res.result.startDate,
- // endDate: res.result.endDate
- // })
- // if (res.result.sleepStartDate) {
- // _this.form.setFieldsValue({
- // sleepStartDate: res.result.sleepStartDate
- // })
- // }
- // if (res.result.sleepStartDate) {
- // _this.form.setFieldsValue({
- // sleepEndDate: res.result.sleepEndDate
- // })
- // }
- // }
- // })
- // }
+
}
}
</script>
<style scoped lang="less">
+
+
/deep/ .ant-modal-content{
/*background: -moz-linear-gradient(left, rgba(0, 0, 0, 0.66) 0%, rgba(0, 0, 0, 0.27) 100%);*/
/*background: -webkit-gradient(linear, left left, right right, color-stop(0%, rgba(0, 0, 0, 0.66)), color-stop(100%, rgba(0, 0, 0, 0.4)));*/
@@ -383,4 +369,72 @@
.ant-tabs-content .ant-form-item {
margin-bottom: 0px;
}
+
+ /deep/ .mark1{
+ color:white!important;
+ background-color: #1890ff!important;
+ border-radius: 50%;
+ }
+ /deep/.mainBox .wh_content_all{
+ background-color: #ffffff;
+ border: 1px silver solid;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ }
+ /deep/ .mainBox .wh_content_all .wh_jiantou1{
+ border-top: 2px solid #000000;
+ border-left: 2px solid #000000;
+ }
+ /deep/ .mainBox .wh_content_all .wh_jiantou2{
+ border-top: 2px solid #000000;
+ border-right: 2px solid #000000;
+ }
+ /deep/ .mainBox .wh_content_all .wh_top_changge li{
+ color: black;
+ }
+ /deep/ .mainBox .wh_content_all .wh_content_item{
+ margin-top: 5px;
+ }
+ /deep/ .mainBox .wh_content_all .wh_content_item .wh_top_tag{
+ color: #000000;
+ }
+ /deep/ .mainBox .wh_content_all .wh_content_item .wh_item_date {
+ color: #000000;
+ }
+ /deep/ .mainBox .wh_content_all .wh_content_item .wh_item_date:hover{
+ color: #1890ff;
+ border:1px solid #1890ff;
+ border-radius: 50%;
+ }
+ /deep/ .mainBox .wh_content_all .wh_content_item .wh_other_dayhide{
+ color: #bfbfbf!important;
+ }
+ /deep/ .mainBox .wh_content_all .wh_content_item .wh_want_dayhide{
+ color: #bfbfbf!important;
+ }
+ /deep/ .mainBox .wh_content_all .wh_content_item .wh_chose_day{
+ background: #ffffff;
+ color: #000000;
+ }
+ /deep/ .mainBox .wh_content_all .wh_content_item .wh_isMark {
+ /*color: #1890ff;*/
+ /*border:1px solid #1890ff;*/
+ /*border-radius: 50%;*/
+ color: #ffffff;
+ background-color: blue;
+ }
+ /deep/ .mainBox .wh_content_all .wh_content_item .wh_isToday {
+ /*background: #33ad53;*/
+ /*background: #ff4d4d!important;*/
+ background-color: #ffffff;
+ color: #000000;
+ }
+
</style>
+
+
+
+
+
+
--
Gitblit v1.9.3