提交 245eb85e 编写于 作者: 刘英杰's avatar 刘英杰

V20241104 优化保存

上级 adeb0b40
# HY占座系统 # HY占座系统
- 单点方式:/?token=门户token
[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} [data-v-04c97d1c] .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-04c97d1c] .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-04c97d1c] .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-04c97d1c] .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-04c97d1c]{padding-right:15px}.fileRow[data-v-04c97d1c]{display:flex;justify-content:space-between;align-items:center}.fileRow .delIcon[data-v-04c97d1c]{color:#ed4014}.fileRow .delIcon[data-v-04c97d1c]:hover{color:#f16643;cursor:pointer}.class-drawer[data-v-04c97d1c]{height:"calc(100% - 55px)";overflow:"auto";padding-bottom:"53px";position:"static";z-index:1100!important}.class-drawer .subTitle[data-v-04c97d1c]{margin-top:20px;font-size:14px;color:#191f25;font-weight:700}.class-drawer .drawer-footer[data-v-04c97d1c]{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-04c97d1c] .ivu-drawer-header-inner{font-size:20px;font-weight:600}
\ No newline at end of file \ No newline at end of file
.searchDiv .ivu-form-item[data-v-28ca940a]{margin-bottom:12px}.searchDiv .buttonCol[data-v-28ca940a]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-28ca940a]{margin-left:8px}.ivu-modal-close .ivu-icon-ios-close[data-v-10ec2039]{color:red;font-weight:700} .searchDiv .ivu-form-item[data-v-28ca940a]{margin-bottom:12px}.searchDiv .buttonCol[data-v-28ca940a]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-28ca940a]{margin-left:8px}.ivu-modal-close .ivu-icon-ios-close[data-v-8c6a9288]{color:red;font-weight:700}
\ No newline at end of file \ No newline at end of file
.searchDiv .ivu-form-item[data-v-28ca940a]{margin-bottom:12px}.searchDiv .buttonCol[data-v-28ca940a]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-28ca940a]{margin-left:8px}.cyrIcon[data-v-5d1582ba]{color:#515a6e}.cyrIcon[data-v-5d1582ba]:hover{color:#757d8f;cursor:pointer}.cyrIcon[data-v-5d1582ba]:active{color:#3f485c} .searchDiv .ivu-form-item[data-v-28ca940a]{margin-bottom:12px}.searchDiv .buttonCol[data-v-28ca940a]{margin-left:auto;text-align:right}.searchDiv .buttonCol .ivu-btn[data-v-28ca940a]{margin-left:8px}.cyrIcon[data-v-07fcce41]{color:#515a6e}.cyrIcon[data-v-07fcce41]:hover{color:#757d8f;cursor:pointer}.cyrIcon[data-v-07fcce41]:active{color:#3f485c}
\ No newline at end of file \ 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.096b99c6.js></script></body></html> <!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=IZXBZ-OTAWV-XU7PV-5FAAL-F6VXH-7XBQP&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=IZXBZ-OTAWV-XU7PV-5FAAL-F6VXH-7XBQP"></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.a09a66d7.js></script></body></html>
\ No newline at end of file \ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
<title><%= VUE_APP_TITLE %></title> <title><%= VUE_APP_TITLE %></title>
</head> </head>
<body> <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 charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=IZXBZ-OTAWV-XU7PV-5FAAL-F6VXH-7XBQP&libraries=drawing,geometry,place,convertor,visualization"></script>
<script type="text/javascript" src="https://mapapi.qq.com/web/mapComponents/geoLocation/v/geolocation.min.js"></script> <script type="text/javascript" src="https://mapapi.qq.com/web/mapComponents/geoLocation/v/geolocation.min.js"></script>
<script type="text/javascript" src="https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=ZNMBZ-NYOEO-WNMWL-SJF4C-MWKQT-KJB7W"></script> <script type="text/javascript" src="https://map.qq.com/api/gljs?v=1.exp&libraries=service&key=IZXBZ-OTAWV-XU7PV-5FAAL-F6VXH-7XBQP"></script>
<script type="text/javascript" src="/a/manager/identify/identify.js"></script> <script type="text/javascript" src="/a/manager/identify/identify.js"></script>
<noscript> <noscript>
<strong> <strong>
......
export interface RecordViewRequests { export interface RecordViewRequests {
key_name?: string; key_name?: string;
room_id?: string; room_id?: string;
room_name?: string;
/** 状态 0-未签到,1-签到 ,2-签退 */ /** 状态 0-未签到,1-签到 ,2-签退 */
sign_state?: string; sign_state?: string;
/** 状态 0-待使用,1-正在使用,2-已结束,9-已取消 */ /** 状态 0-待使用,1-正在使用,2-已结束,9-已取消 */
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<!-- timeTable 添加班次抽屉 --> <!-- timeTable 添加班次抽屉 -->
<Drawer v-model="showDrawer" <Drawer v-model="showDrawer"
class="class-drawer" title="配置开放时间" width="800" transfer> class="class-drawer" title="配置开放时间" transfer width="800">
<!-- <div class="subTitle">打卡时段</div>--> <!-- <div class="subTitle">打卡时段</div>-->
<div style="margin-top: 20px"> <div style="margin-top: 20px">
<!-- 第一次上班 --> <!-- 第一次上班 -->
...@@ -26,7 +26,8 @@ ...@@ -26,7 +26,8 @@
size="default" style="width: 120px"></TimePicker>--> size="default" style="width: 120px"></TimePicker>-->
<TimePicker v-model="item.timeRange" :clearable="false" format="HH:mm" <TimePicker v-model="item.timeRange" :clearable="false" format="HH:mm"
placeholder="未设置" placement="bottom-end" style="width: 240px" placeholder="未设置" placement="bottom-end" style="width: 240px"
type="timerange" @on-change="onChangeTimeTable($event,item,index)" @on-open-change="onOpenChangeTimeTable($event,item,index)"/> type="timerange" @on-change="onChangeTimeTable($event,item,index)"
@on-open-change="onOpenChangeTimeTable($event,item,index)"/>
&nbsp;可预约座位 &nbsp;可预约座位
<div style="margin-left: auto"> <div style="margin-left: auto">
<Poptip <Poptip
...@@ -86,7 +87,6 @@ ...@@ -86,7 +87,6 @@
:disabled="item.disabled" :disabled="item.disabled"
:placeholder="'请输入'+item.name" :placeholder="'请输入'+item.name"
clearable/> clearable/>
<Input <Input
v-if="item.type == 'textarea'" v-if="item.type == 'textarea'"
v-model="formData[item.id]" v-model="formData[item.id]"
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
label="默认开放区间"> label="默认开放区间">
<Table :key="aaa" :columns="item.columns" :data="item.data" border size="small"> <Table :key="aaa" :columns="item.columns" :data="item.data" border size="small">
<template slot="time" slot-scope="{ row, index }"> <template slot="time" slot-scope="{ row, index }">
<Tag v-for="(item,inde) in row.time" :key="inde" style="margin-right: 5px" color="blue">{{ <Tag v-for="(item,inde) in row.time" :key="inde" color="blue" style="margin-right: 5px">{{
item item
}} }}
</Tag> </Tag>
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
label="默认开放区间"> label="默认开放区间">
<Table :key="item.id" :columns="item.columns" :data="item.data" border size="small"> <Table :key="item.id" :columns="item.columns" :data="item.data" border size="small">
<template slot="time" slot-scope="{ row, index }"> <template slot="time" slot-scope="{ row, index }">
<Tag color="blue" v-for="(item,inde) in row.time" :key="inde" style="margin-right: 5px" >{{ <Tag v-for="(item,inde) in row.time" :key="inde" color="blue" style="margin-right: 5px">{{
item item
}} }}
</Tag> </Tag>
...@@ -304,13 +304,11 @@ export default { ...@@ -304,13 +304,11 @@ export default {
}, },
data() { data() {
return { return {
aaa: 123123,
// Modal显示value // Modal显示value
show: this.value, show: this.value,
modalTitle: '编辑', modalTitle: '编辑',
// 表单数据 // 表单数据
formData: {}, formData: {},
grid: { grid: {
xl: 12, xl: 12,
lg: 12, lg: 12,
...@@ -318,7 +316,6 @@ export default { ...@@ -318,7 +316,6 @@ export default {
sm: 24, sm: 24,
xs: 24, xs: 24,
}, },
// 上传按钮loading // 上传按钮loading
uploadBtLoading: [], uploadBtLoading: [],
...@@ -328,6 +325,7 @@ export default { ...@@ -328,6 +325,7 @@ export default {
regionDot: [],// 坐标范围 regionDot: [],// 坐标范围
//timeTable //timeTable
aaa: 123123,
showDrawer: false, showDrawer: false,
formDataTimeTable: { formDataTimeTable: {
time: [ time: [
...@@ -335,6 +333,7 @@ export default { ...@@ -335,6 +333,7 @@ export default {
{begin: '12:00', end: '15:00'}, {begin: '12:00', end: '15:00'},
], ],
}, },
//timeTable
} }
}, },
computed: {}, computed: {},
...@@ -389,8 +388,8 @@ export default { ...@@ -389,8 +388,8 @@ export default {
return allGreater || allLess || allOutside; return allGreater || allLess || allOutside;
}, },
onOpenChangeTimeTable(event, item, index) { onOpenChangeTimeTable(event, item, index) {
console.log("🚀🚀event, item, index🚀,",event, item, index) console.log("🚀🚀event, item, index🚀,", event, item, index)
if (!event){ if (!event) {
// 关闭浮层时触发 // 关闭浮层时触发
let deleteEventArray = this.formDataTimeTable.time.map(cur => { let deleteEventArray = this.formDataTimeTable.time.map(cur => {
return cur.timeRange.join('~'); return cur.timeRange.join('~');
...@@ -404,19 +403,19 @@ export default { ...@@ -404,19 +403,19 @@ export default {
} }
}, },
onChangeTimeTable(event, item, index) { onChangeTimeTable(event, item, index) {
/* try { /* try {
let deleteEventArray = this.formDataTimeTable.time.map(cur => { let deleteEventArray = this.formDataTimeTable.time.map(cur => {
return cur.timeRange.join('~'); return cur.timeRange.join('~');
}) })
if (deleteEventArray.indexOf(event.join('~')) !== -1) deleteEventArray.splice(deleteEventArray.indexOf(event.join('~')), 1); if (deleteEventArray.indexOf(event.join('~')) !== -1) deleteEventArray.splice(deleteEventArray.indexOf(event.join('~')), 1);
if (!(this.checkTimes(deleteEventArray, event))) { if (!(this.checkTimes(deleteEventArray, event))) {
//对比算法 ,大于、小于且不在已有时间段内 //对比算法 ,大于、小于且不在已有时间段内
this.formDataTimeTable.time.splice(index, 1) this.formDataTimeTable.time.splice(index, 1)
this.$Message.error('配置时间重叠,请重新配置时间') this.$Message.error('配置时间重叠,请重新配置时间')
} }
} catch (e) { } catch (e) {
}*/ }*/
}, },
save() { save() {
//深拷贝,防止污染 1~7天的数据 //深拷贝,防止污染 1~7天的数据
...@@ -597,7 +596,7 @@ export default { ...@@ -597,7 +596,7 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
/deep/.ivu-modal-mask { /deep/ .ivu-modal-mask {
position: fixed; position: fixed;
top: 0; top: 0;
bottom: 0; bottom: 0;
...@@ -608,7 +607,8 @@ export default { ...@@ -608,7 +607,8 @@ export default {
z-index: 1050 !important; z-index: 1050 !important;
} }
/deep/.ivu-modal-wrap {
/deep/ .ivu-modal-wrap {
position: fixed; position: fixed;
overflow: auto; overflow: auto;
top: 0; top: 0;
...@@ -619,6 +619,7 @@ export default { ...@@ -619,6 +619,7 @@ export default {
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
outline: 0; outline: 0;
} }
/*/deep/.ivu-message { /*/deep/.ivu-message {
font-size: 14px; font-size: 14px;
position: fixed; position: fixed;
......
...@@ -639,7 +639,7 @@ export default { ...@@ -639,7 +639,7 @@ export default {
{title: ' ', slot: 'action', width: 110} {title: ' ', slot: 'action', width: 110}
] ]
this.defaultOpeningHours(this.defaultFormData.service_interval_time); this.defaultOpeningHours(this.defaultFormData.service_interval_time);
// //默认开放时间
this.flag = 'add'; this.flag = 'add';
this.$refs.ceditmodal.regionDot = []; this.$refs.ceditmodal.regionDot = [];
...@@ -662,8 +662,14 @@ export default { ...@@ -662,8 +662,14 @@ export default {
minWidth: 510, minWidth: 510,
}, },
] ]
this.$forceUpdate() this.$forceUpdate();
this.defaultOpeningHours(row.service_interval_time); this.defaultOpeningHours(row.service_interval_time);
// //
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或