提交 05b210ee 编写于 作者: 刘英杰's avatar 刘英杰

V20241022 优化保存

上级 b13d07a2
流水线 #30112 已取消 ,包含阶段
[data-v-16f76021] .ivu-modal-mask{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(55,55,55,.6);height:100%;z-index:1050!important}[data-v-16f76021] .ivu-modal-wrap{position:fixed;overflow:auto;top:0;right:0;bottom:0;left:0;z-index:1050!important;-webkit-overflow-scrolling:touch;outline:0}[data-v-16f76021] .ivu-drawer-mask{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(55,55,55,.6);height:100%;z-index:1100!important}[data-v-16f76021] .ivu-drawer-wrap{position:fixed;overflow:auto;top:0;right:0;bottom:0;left:0;z-index:1100!important;-webkit-overflow-scrolling:touch;outline:0}.ivu-form-item[data-v-16f76021]{padding-right:15px}.fileRow[data-v-16f76021]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-16f76021]{color:#ed4014}.fileRow .delIcon[data-v-16f76021]:hover{color:#f16643;cursor:pointer}.class-drawer[data-v-16f76021]{height:"calc(100% - 55px)";overflow:"auto";padding-bottom:"53px";position:"static";z-index:1100!important}.class-drawer .subTitle[data-v-16f76021]{margin-top:20px;font-size:14px;color:#191f25;font-weight:700}.class-drawer .drawer-footer[data-v-16f76021]{width:100%;position:absolute;bottom:0;left:0;border-top:1px solid #e8e8e8;padding:10px 16px;text-align:right;background:#fff}.class-drawer[data-v-16f76021] .ivu-drawer-header-inner{font-size:20px;font-weight:600}
\ No newline at end of file
[data-v-0f694ac6] .ivu-modal-mask{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(55,55,55,.6);height:100%;z-index:1050!important}[data-v-0f694ac6] .ivu-modal-wrap{position:fixed;overflow:auto;top:0;right:0;bottom:0;left:0;z-index:1050!important;-webkit-overflow-scrolling:touch;outline:0}[data-v-0f694ac6] .ivu-drawer-mask{position:fixed;top:0;bottom:0;left:0;right:0;background-color:rgba(55,55,55,.6);height:100%;z-index:1100!important}[data-v-0f694ac6] .ivu-drawer-wrap{position:fixed;overflow:auto;top:0;right:0;bottom:0;left:0;z-index:1100!important;-webkit-overflow-scrolling:touch;outline:0}.ivu-form-item[data-v-0f694ac6]{padding-right:15px}.fileRow[data-v-0f694ac6]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-0f694ac6]{color:#ed4014}.fileRow .delIcon[data-v-0f694ac6]:hover{color:#f16643;cursor:pointer}.class-drawer[data-v-0f694ac6]{height:"calc(100% - 55px)";overflow:"auto";padding-bottom:"53px";position:"static";z-index:1100!important}.class-drawer .subTitle[data-v-0f694ac6]{margin-top:20px;font-size:14px;color:#191f25;font-weight:700}.class-drawer .drawer-footer[data-v-0f694ac6]{width:100%;position:absolute;bottom:0;left:0;border-top:1px solid #e8e8e8;padding:10px 16px;text-align:right;background:#fff}.class-drawer[data-v-0f694ac6] .ivu-drawer-header-inner{font-size:20px;font-weight:600}
\ No newline at end of file
.mainDiv[data-v-c7be7686]{width:100%;height:100%;display:flex;flex-wrap:wrap;justify-content:space-between}.mainDiv .bigCard[data-v-c7be7686],.mainDiv .smallCard[data-v-c7be7686]{margin-bottom:16px}.mainDiv .bigCard[data-v-c7be7686] .ivu-card-body,.mainDiv .smallCard[data-v-c7be7686] .ivu-card-body{height:calc(100% - 51px)}.mainDiv .bigCard[data-v-c7be7686] .ivu-card-body .ivu-form-item,.mainDiv .smallCard[data-v-c7be7686] .ivu-card-body .ivu-form-item{margin-bottom:12px}.mainDiv .bigCard[data-v-c7be7686]{width:calc(50% - 8px)}.mainDiv .smallCard[data-v-c7be7686]{width:calc(33.33333% - 10.66667px)}.mainDiv[data-v-c7be7686] .kjyyCard .ivu-card-body{overflow:auto}.mainDiv[data-v-c7be7686] .kjyyCard .ivu-card-body p[name=fastCP]{display:flex;justify-content:space-between}.mainDiv[data-v-c7be7686] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]{color:#ed4014}.mainDiv[data-v-c7be7686] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]:hover{color:#f16643}.mainDiv[data-v-c7be7686] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]:active{color:#e13d13}.mainDiv[data-v-c7be7686] .cplhsCard .ivu-card-body{display:flex;flex-direction:column;justify-content:space-evenly}.mainDiv[data-v-c7be7686] .save-bt{text-align:right;position:absolute;bottom:16px;right:16px}.mainDiv .roomOpeningHours[data-v-c7be7686]{display:flex;justify-content:space-between;flex-wrap:wrap}.mainDiv .flexBetWeen[data-v-c7be7686]{width:100%;height:100%;display:flex;justify-content:space-between}.class-drawer[data-v-c7be7686]{height:"calc(100% - 55px)";overflow:"auto";padding-bottom:"53px";position:"static"}.class-drawer .subTitle[data-v-c7be7686]{margin-top:20px;font-size:14px;color:#191f25;font-weight:700}.class-drawer .drawer-footer[data-v-c7be7686]{width:100%;position:absolute;bottom:0;left:0;border-top:1px solid #e8e8e8;padding:10px 16px;text-align:right;background:#fff}.class-drawer[data-v-c7be7686] .ivu-drawer-header-inner{font-size:20px;font-weight:600}
\ No newline at end of file
.mainDiv[data-v-19ccccc7]{width:100%;height:100%;display:flex;flex-wrap:wrap;justify-content:space-between}.mainDiv .bigCard[data-v-19ccccc7],.mainDiv .smallCard[data-v-19ccccc7]{margin-bottom:16px}.mainDiv .bigCard[data-v-19ccccc7] .ivu-card-body,.mainDiv .smallCard[data-v-19ccccc7] .ivu-card-body{height:calc(100% - 51px)}.mainDiv .bigCard[data-v-19ccccc7] .ivu-card-body .ivu-form-item,.mainDiv .smallCard[data-v-19ccccc7] .ivu-card-body .ivu-form-item{margin-bottom:12px}.mainDiv .bigCard[data-v-19ccccc7]{width:calc(50% - 8px)}.mainDiv .smallCard[data-v-19ccccc7]{width:calc(33.33333% - 10.66667px)}.mainDiv[data-v-19ccccc7] .kjyyCard .ivu-card-body{overflow:auto}.mainDiv[data-v-19ccccc7] .kjyyCard .ivu-card-body p[name=fastCP]{display:flex;justify-content:space-between}.mainDiv[data-v-19ccccc7] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]{color:#ed4014}.mainDiv[data-v-19ccccc7] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]:hover{color:#f16643}.mainDiv[data-v-19ccccc7] .kjyyCard .ivu-card-body p[name=fastCP] a[name=del]:active{color:#e13d13}.mainDiv[data-v-19ccccc7] .cplhsCard .ivu-card-body{display:flex;flex-direction:column;justify-content:space-evenly}.mainDiv[data-v-19ccccc7] .save-bt{text-align:right;position:absolute;bottom:16px;right:16px}.mainDiv .roomOpeningHours[data-v-19ccccc7]{display:flex;justify-content:space-between;flex-wrap:wrap}.mainDiv .flexBetWeen[data-v-19ccccc7]{width:100%;height:100%;display:flex;justify-content:space-between}.class-drawer[data-v-19ccccc7]{height:"calc(100% - 55px)";overflow:"auto";padding-bottom:"53px";position:"static"}.class-drawer .subTitle[data-v-19ccccc7]{margin-top:20px;font-size:14px;color:#191f25;font-weight:700}.class-drawer .drawer-footer[data-v-19ccccc7]{width:100%;position:absolute;bottom:0;left:0;border-top:1px solid #e8e8e8;padding:10px 16px;text-align:right;background:#fff}.class-drawer[data-v-19ccccc7] .ivu-drawer-header-inner{font-size:20px;font-weight:600}
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>自习室占座预约系统</title><link href=css/chunk-vendors.cc1990b1.css rel=stylesheet><link href=css/app.f8f860e0.css rel=stylesheet></head><body><script charset=utf-8 src="https://map.qq.com/api/js?v=2.exp&key=ZNMBZ-NYOEO-WNMWL-SJF4C-MWKQT-KJB7W&libraries=drawing,geometry,place,convertor,visualization"></script><script src=https://mapapi.qq.com/web/mapComponents/geoLocation/v/geolocation.min.js></script><script src="https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=ZNMBZ-NYOEO-WNMWL-SJF4C-MWKQT-KJB7W"></script><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 自习室占座预约系统。</strong></noscript><div id=app></div><script src=js/chunk-vendors.d90d1506.js></script><script src=js/app.c47b2ef6.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>自习室占座预约系统</title><link href=css/chunk-vendors.cc1990b1.css rel=stylesheet><link href=css/app.f8f860e0.css rel=stylesheet></head><body><script charset=utf-8 src="https://map.qq.com/api/js?v=2.exp&key=ZNMBZ-NYOEO-WNMWL-SJF4C-MWKQT-KJB7W&libraries=drawing,geometry,place,convertor,visualization"></script><script src=https://mapapi.qq.com/web/mapComponents/geoLocation/v/geolocation.min.js></script><script src="https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=ZNMBZ-NYOEO-WNMWL-SJF4C-MWKQT-KJB7W"></script><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 自习室占座预约系统。</strong></noscript><div id=app></div><script src=js/chunk-vendors.d90d1506.js></script><script src=js/app.a934b4e9.js></script></body></html>
\ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
......@@ -26,7 +26,7 @@
size="default" style="width: 120px"></TimePicker>-->
<TimePicker v-model="item.timeRange" :clearable="false" format="HH:mm"
placeholder="未设置" placement="bottom-end" style="width: 240px"
type="timerange" @on-change="onChangeTimeTable($event,item,index)"/>
type="timerange" @on-change="onChangeTimeTable($event,item,index)" @on-open-change="onOpenChangeTimeTable($event,item,index)"/>
&nbsp;可预约座位
<div style="margin-left: auto">
<Poptip
......@@ -388,8 +388,23 @@ export default {
return allGreater || allLess || allOutside;
},
onOpenChangeTimeTable(event, item, index) {
console.log("🚀🚀event, item, index🚀,",event, item, index)
if (!event){
// 关闭浮层时触发
let deleteEventArray = this.formDataTimeTable.time.map(cur => {
return cur.timeRange.join('~');
})
if (deleteEventArray.indexOf(item.timeRange.join('~')) !== -1) deleteEventArray.splice(deleteEventArray.indexOf(item.timeRange.join('~')), 1);
if (!(this.checkTimes(deleteEventArray, item.timeRange))) {
//对比算法 ,大于、小于且不在已有时间段内
this.formDataTimeTable.time.splice(index, 1)
this.$Message.error('配置时间重叠,请重新配置时间')
}
}
},
onChangeTimeTable(event, item, index) {
try {
/* try {
let deleteEventArray = this.formDataTimeTable.time.map(cur => {
return cur.timeRange.join('~');
})
......@@ -401,7 +416,7 @@ export default {
}
} catch (e) {
}
}*/
},
save() {
//深拷贝,防止污染 1~7天的数据
......
......@@ -139,9 +139,23 @@ export default {
return allGreater || allLess || allOutside;
},
onOpenChangeTimeTable(event, item, index) {
console.log("🚀🚀event, item, index🚀,",event, item, index)
if (!event){
// 关闭浮层时触发
let deleteEventArray = this.formData.time.map(cur => {
return cur.timeRange.join('~');
})
if (deleteEventArray.indexOf(item.timeRange.join('~')) !== -1) deleteEventArray.splice(deleteEventArray.indexOf(item.timeRange.join('~')), 1);
if (!(this.checkTimes(deleteEventArray, item.timeRange))) {
//对比算法 ,大于、小于且不在已有时间段内
this.formData.time.splice(index, 1)
this.$Message.error('配置时间重叠,请重新配置时间')
}
}
},
onChangeTimeTable(event, item, index) {
try {
/* try {
let deleteEventArray = this.formData.time.map(cur => {
return cur.timeRange.join('~');
})
......@@ -153,7 +167,7 @@ export default {
}
} catch (e) {
}
}*/
},
save() {
//保存开放时间配置
......@@ -322,7 +336,7 @@ export default {
size="default" style="width: 120px"></TimePicker>-->
<TimePicker v-model="item.timeRange" :clearable="false" format="HH:mm"
placeholder="未设置" placement="bottom-end" style="width: 240px"
type="timerange" @on-change="onChangeTimeTable($event,item,index)"/>
type="timerange" @on-change="onChangeTimeTable($event,item,index)" @on-open-change="onOpenChangeTimeTable($event,item,index)"/>
&nbsp;可预约座位
<div style="margin-left: auto">
<Poptip
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或