Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
Support
提交反馈
为 GitLab 提交贡献
登录
切换导航
H
HY占座系统
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
刘英杰
HY占座系统
提交
794b2b23
提交
794b2b23
编写于
10月 21, 2024
作者:
刘英杰
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
V20241021 系统配置/房间管理》默认开放时间更改为Table列表配置方式
上级
9dfff7ea
流水线
#30074
已通过 ,包含阶段
in 36 second
变更
3
流水线
1
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
74 行增加
和
26 行删除
+74
-26
CEditModal.vue
src/components/CEditModal.vue
+13
-22
index.vue
src/pages/roomManagement/index.vue
+1
-1
index.vue
src/pages/systemConfiguration/index.vue
+60
-3
未找到文件。
src/components/CEditModal.vue
浏览文件 @
794b2b23
...
...
@@ -19,11 +19,11 @@
<Row
style=
"margin-bottom: 10px"
>
<Col
v-for=
"(item,index) in formDataTimeTable.time"
:key=
"index"
span=
"24"
style=
"margin-bottom: 10px;display: flex;align-items: center"
>
<!--
<TimePicker
v-model=
"item.begin"
:editable=
"false"
confirm
format=
"HH:mm"
placeholder=
"未设置"
size=
"default"
style=
"width: 120px"
></TimePicker>
至
<TimePicker
v-model=
"item.end"
:editable=
"false"
confirm
format=
"HH:mm"
placeholder=
"未设置"
size=
"default"
style=
"width: 120px"
></TimePicker>
-->
<!--
<TimePicker
v-model=
"item.begin"
:editable=
"false"
confirm
format=
"HH:mm"
placeholder=
"未设置"
size=
"default"
style=
"width: 120px"
></TimePicker>
至
<TimePicker
v-model=
"item.end"
:editable=
"false"
confirm
format=
"HH:mm"
placeholder=
"未设置"
size=
"default"
style=
"width: 120px"
></TimePicker>
-->
<TimePicker
v-model=
"item.timeRange"
format=
"HH:mm"
placeholder=
"未设置"
placement=
"bottom-end"
style=
"width: 240px"
type=
"timerange"
/>
可预约座位
...
...
@@ -104,11 +104,7 @@
clearable
filterable
@
on-query-change=
"onQueryChange"
>
<Option
v-for=
"it in item.optList"
:key=
"it.value"
:value=
"it.value"
>
{{
it
.
label
}}
</Option>
<Option
v-for=
"it in item.optList"
:key=
"it.value"
:value=
"it.value"
>
{{
it
.
label
}}
</Option>
</Select>
<Select
...
...
@@ -119,11 +115,7 @@
clearable
filterable
multiple
>
<Option
v-for=
"it in item.optList"
:key=
"it.value"
:value=
"it.value"
>
{{
it
.
label
}}
</Option>
<Option
v-for=
"it in item.optList"
:key=
"it.value"
:value=
"it.value"
>
{{
it
.
label
}}
</Option>
</Select>
<Switch
...
...
@@ -131,7 +123,6 @@
v-model=
"formData[item['id']]"
:false-value=
"0"
:true-value=
"1"
/>
<TimePicker
v-else-if=
"item.type == 'timerange'"
v-model=
"formData[item['id']]"
...
...
@@ -309,7 +300,7 @@ export default {
},
data
()
{
return
{
aaa
:
123123
,
aaa
:
123123
,
// Modal显示value
show
:
this
.
value
,
modalTitle
:
'
编辑
'
,
...
...
@@ -352,7 +343,7 @@ export default {
methods
:
{
save
()
{
//深拷贝,防止污染 1~7天的数据
let
array
=
_
.
cloneDeep
(
this
.
formItem
.
find
(
cur
=>
cur
.
type
===
'
timeTable
'
).
data
);
let
array
=
_
.
cloneDeep
(
this
.
formItem
.
find
(
cur
=>
cur
.
type
===
'
timeTable
'
).
data
);
function
getFormatData
(
data
)
{
//获取开放时间段,格式化
...
...
@@ -372,7 +363,7 @@ export default {
'
周日
'
:
()
=>
array
[
6
].
time
=
getFormatData
(
this
.
formDataTimeTable
.
time
),
}
info
[
this
.
formDataTimeTable
.
day
]();
this
.
formItem
.
find
(
cur
=>
cur
.
type
===
'
timeTable
'
).
data
=
array
;
//Table列表输出
this
.
formItem
.
find
(
cur
=>
cur
.
type
===
'
timeTable
'
).
data
=
array
;
//Table列表输出
let
data
=
{
//格式化数据,
"
one
"
:
array
[
0
].
time
,
...
...
@@ -383,8 +374,8 @@ export default {
"
six
"
:
array
[
5
].
time
,
"
seven
"
:
array
[
6
].
time
,
};
this
.
formData
[
'
service_interval_time
'
]
=
JSON
.
stringify
(
data
)
//格式化为后端接口格式
this
.
formData
[
'
service_interval_time_info
'
]
=
data
//格式化为后端接口格式
this
.
formData
[
'
service_interval_time
'
]
=
JSON
.
stringify
(
data
)
//格式化为后端接口格式
this
.
formData
[
'
service_interval_time_info
'
]
=
data
//格式化为后端接口格式
// timeTable
...
...
@@ -516,7 +507,7 @@ export default {
let
id
=
this
.
formItem
[
tri
].
id
obj
[
id
]
=
obj
[
id
].
join
(
'
-
'
)
}
console
.
log
(
"
🚀🚀obj🚀,
"
,
obj
)
console
.
log
(
"
🚀🚀obj🚀,
"
,
obj
)
this
.
$emit
(
'
onSubmit
'
,
obj
)
}
else
{
this
.
$Message
.
warning
(
'
请检查输入项
'
)
...
...
src/pages/roomManagement/index.vue
浏览文件 @
794b2b23
...
...
@@ -694,7 +694,7 @@ export default {
this
.
formItem
[
this
.
formItem
.
findIndex
(
a
=>
a
.
id
===
'
timeTable
'
)].
columns
=
[
{
title
:
'
工作日
'
,
width
:
100
,
key
:
'
day
'
},
{
title
:
'
开放时间段
'
,
slot
:
'
time
'
,
minWidth
:
410
,},
{
title
:
'
'
,
slot
:
'
action
'
,
width
:
110
}
{
title
:
'
'
,
slot
:
'
action
'
,
width
:
110
}
,
]
this
.
$refs
.
ceditmodal
.
aaa
++
this
.
defaultOpeningHours
(
row
.
service_interval_time
);
...
...
src/pages/systemConfiguration/index.vue
浏览文件 @
794b2b23
<
script
>
import
CEditModal
from
'
@/components/CEditModal.vue
'
;
import
_
,
{
cloneDeep
}
from
'
lodash
'
;
import
_
from
'
lodash
'
;
import
*
as
api
from
'
@/api/controller/index
'
;
import
*
as
hooks
from
'
@/hook/index
'
;
...
...
@@ -102,6 +102,61 @@ export default {
/**
* 默认开放时间
* */
checkTimes
(
intervals
,
times
)
{
// Helper function to convert time string to minutes
function
timeToMinutes
(
timeStr
)
{
const
[
hours
,
minutes
]
=
timeStr
.
split
(
'
:
'
).
map
(
Number
);
return
hours
*
60
+
minutes
;
}
// Helper function to convert minutes back to time string
function
minutesToTime
(
minutes
)
{
const
hours
=
Math
.
floor
(
minutes
/
60
);
const
mins
=
minutes
%
60
;
return
`
${
String
(
hours
).
padStart
(
2
,
'
0
'
)}
:
${
String
(
mins
).
padStart
(
2
,
'
0
'
)}
`
;
}
// Convert intervals to start and end minutes
const
intervalMinutes
=
intervals
.
map
(
interval
=>
{
const
[
start
,
end
]
=
interval
.
split
(
'
~
'
).
map
(
timeToMinutes
);
return
{
start
,
end
};
});
// Convert times to minutes
const
timeMinutes
=
times
.
map
(
timeToMinutes
);
// Check if all times are greater than all intervals
const
allGreater
=
timeMinutes
.
every
(
time
=>
intervalMinutes
.
every
(({
end
})
=>
time
>
end
)
);
// Check if all times are less than all intervals
const
allLess
=
timeMinutes
.
every
(
time
=>
intervalMinutes
.
every
(({
start
})
=>
time
<
start
)
);
// Check if all times are outside all intervals
const
allOutside
=
timeMinutes
.
every
(
time
=>
intervalMinutes
.
every
(({
start
,
end
})
=>
time
<
start
||
time
>
end
)
);
return
allGreater
||
allLess
||
allOutside
;
}
,
onChangeTimeTable
(
event
,
item
,
index
)
{
let
a
=
this
.
formData
.
time
.
map
(
cur
=>
{
return
cur
.
timeRange
.
join
(
'
~
'
);
})
a
.
splice
(
this
.
formData
.
time
.
length
-
1
,
1
);
let
intervals
=
a
console
.
log
(
"
🚀intervals🚀🚀,
"
,
intervals
,
event
);
if
(
!
(
this
.
checkTimes
(
intervals
,
event
)))
{
this
.
formData
.
time
.
splice
(
index
,
1
)
this
.
$Message
.
error
(
'
配置时间重叠,请重新配置时间
'
)
}
},
save
()
{
//保存开放时间配置
console
.
log
(
"
🚀🚀🚀,
"
,
this
.
formData
);
...
...
@@ -172,6 +227,7 @@ export default {
"six": [],
"seven": [],
}*/
console
.
log
(
"
🚀🚀🚀,
"
,
data
)
this
.
workDayData
=
[
{
day
:
info
[
'
one
'
],
time
:
data
[
'
one
'
]},
{
day
:
info
[
'
two
'
],
time
:
data
[
'
two
'
]},
...
...
@@ -266,8 +322,9 @@ export default {
至
<TimePicker
v-model=
"item.end"
:editable=
"false"
confirm
format=
"HH:mm"
placeholder=
"未设置"
size=
"default"
style=
"width: 120px"
></TimePicker>
-->
<TimePicker
v-model=
"item.timeRange"
format=
"HH:mm"
placeholder=
"未设置"
placement=
"bottom-end"
style=
"width: 240px"
type=
"timerange"
/>
<TimePicker
v-model=
"item.timeRange"
format=
"HH:mm"
placeholder=
"未设置"
placement=
"bottom-end"
style=
"width: 240px"
type=
"timerange"
@
on-change=
"onChangeTimeTable($event,item,index)"
/>
可预约座位
<div
style=
"margin-left: auto"
>
<Poptip
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录