Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
Support
提交反馈
为 GitLab 提交贡献
登录
切换导航
H
HY占座系统
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
刘英杰
HY占座系统
提交
d5bda7e7
提交
d5bda7e7
编写于
7月 24, 2024
作者:
刘英杰
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
V20240724保存
上级
aeaf1529
流水线
#28015
已通过 ,包含阶段
in 37 second
变更
27
流水线
1
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
27 个修改的文件
包含
122 行增加
和
44 行删除
+122
-44
chunk-442a269c.af971eed.css
dist/css/chunk-442a269c.af971eed.css
+1
-0
chunk-5a82a64a.49907809.css
dist/css/chunk-5a82a64a.49907809.css
+1
-0
chunk-c81acdf2.52a97de4.css
dist/css/chunk-c81acdf2.52a97de4.css
+0
-1
index.html
dist/index.html
+1
-1
app.15447f3b.js
dist/js/app.15447f3b.js
+0
-15
app.b8c1148c.js
dist/js/app.b8c1148c.js
+15
-0
chunk-4278c554.1b5b4add.js
dist/js/chunk-4278c554.1b5b4add.js
+1
-1
chunk-442a269c.cb166cdc.js
dist/js/chunk-442a269c.cb166cdc.js
+1
-0
chunk-5a82a64a.cf350f86.js
dist/js/chunk-5a82a64a.cf350f86.js
+1
-1
chunk-6b176be6.922c7005.js
dist/js/chunk-6b176be6.922c7005.js
+1
-1
chunk-c19bb814.c8843db5.js
dist/js/chunk-c19bb814.c8843db5.js
+1
-1
chunk-c81acdf2.31bb939d.js
dist/js/chunk-c81acdf2.31bb939d.js
+0
-1
getApiCommonGetDomainName.d.ts
src/api/controller/Common/getApiCommonGetDomainName.d.ts
+12
-0
getApiCommonGetDomainName.js
src/api/controller/Common/getApiCommonGetDomainName.js
+8
-0
index.d.ts
src/api/controller/Common/index.d.ts
+1
-0
index.js
src/api/controller/Common/index.js
+1
-0
getApiTimeTaskDepartureTimeout.d.ts
...i/controller/TimeTask/getApiTimeTaskDepartureTimeout.d.ts
+12
-0
getApiTimeTaskDepartureTimeout.js
...api/controller/TimeTask/getApiTimeTaskDepartureTimeout.js
+8
-0
getApiTimeTaskNotSigned.d.ts
src/api/controller/TimeTask/getApiTimeTaskNotSigned.d.ts
+1
-1
getApiTimeTaskNotSigned.js
src/api/controller/TimeTask/getApiTimeTaskNotSigned.js
+1
-1
index.d.ts
src/api/controller/TimeTask/index.d.ts
+1
-0
index.js
src/api/controller/TimeTask/index.js
+1
-0
dict.js
src/config/modules/dict.js
+1
-1
index.js
src/hook/index.js
+36
-0
index.vue
src/pages/roomManagement/index.vue
+9
-14
index.vue
src/pages/seatManagement/index.vue
+2
-1
account.js
src/store/modules/admin/modules/account.js
+5
-4
未找到文件。
dist/css/chunk-442a269c.af971eed.css
0 → 100644
浏览文件 @
d5bda7e7
.ivu-modal-close
.ivu-icon-ios-close
[
data-v-1240b046
]
{
color
:
red
;
font-weight
:
700
}
\ No newline at end of file
dist/css/chunk-
23b55b36.29d1023c
.css
→
dist/css/chunk-
5a82a64a.49907809
.css
浏览文件 @
d5bda7e7
.tiledContainer
[
data-v-5e121241
]
{
width
:
100%
;
min-height
:
566px
;
padding-top
:
10px
}
.tiledContainer
.tiledContainer-h
[
data-v-5e121241
]
{
width
:
100%
;
height
:
50px
;
background-color
:
#f8f8fa
;
padding
:
10px
;
display
:
flex
;
justify-content
:
space-between
;
align-content
:
center
}
.tiledContainer
.tiledContainer-c
[
data-v-5e121241
]
{
position
:
relative
;
display
:
grid
;
grid-gap
:
10px
;
grid-template-columns
:
repeat
(
auto-fit
,
minmax
(
100px
,
auto
));
align-content
:
start
;
justify-content
:
start
;
height
:
34%
;
padding
:
10px
;
list-style
:
none
}
.tiledContainer
.tiledContainer-item
[
data-v-5e121241
]
{
height
:
120px
;
padding
:
15px
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
border
:
1px
solid
#e3e1e1
;
cursor
:
pointer
;
flex-wrap
:
wrap
}
.tiledContainer
.tiledContainer-item
[
data-v-5e121241
]
:hover
{
transition
:
border
;
transition-duration
:
.2s
;
transition-timing-function
:
unset
;
border
:
1px
solid
#1e93ff
}
.tiledContainer
.tiledContainer-item
:hover
.item_
[
data-v-5e121241
]
{
cursor
:
pointer
;
margin-right
:
5px
;
width
:
50px
;
height
:
50px
}
.demo-split
[
data-v-5e121241
]
{
height
:
calc
(
100vh
-
112px
)}
.demo-split
.demo-split-pane-L
[
data-v-5e121241
]
{
padding
:
10px
;
height
:
100%
;
background-color
:
#fff
}
.demo-split
.demo-split-pane-R
[
data-v-5e121241
]
{
padding-left
:
24px
}
.bottom
[
data-v-5e121241
],
.top
[
data-v-5e121241
]
{
text-align
:
center
}
.center
[
data-v-5e121241
]
{
width
:
300px
;
margin
:
10px
auto
;
overflow
:
hidden
}
.center-left
[
data-v-5e121241
]
{
float
:
left
}
.center-right
[
data-v-5e121241
]
{
float
:
right
}
.tiledContainer
[
data-v-6f8cfbc8
]
{
width
:
100%
;
min-height
:
566px
;
padding-top
:
10px
}
.tiledContainer
.tiledContainer-h
[
data-v-6f8cfbc8
]
{
width
:
100%
;
height
:
50px
;
background-color
:
#f8f8fa
;
padding
:
10px
;
display
:
flex
;
justify-content
:
space-between
;
align-content
:
center
}
.tiledContainer
.tiledContainer-c
[
data-v-6f8cfbc8
]
{
position
:
relative
;
display
:
grid
;
grid-gap
:
10px
;
grid-template-columns
:
repeat
(
auto-fit
,
minmax
(
100px
,
auto
));
align-content
:
start
;
justify-content
:
start
;
height
:
34%
;
padding
:
10px
;
list-style
:
none
}
.tiledContainer
.tiledContainer-item
[
data-v-6f8cfbc8
]
{
height
:
120px
;
padding
:
15px
;
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
border
:
1px
solid
#e3e1e1
;
cursor
:
pointer
;
flex-wrap
:
wrap
}
.tiledContainer
.tiledContainer-item
[
data-v-6f8cfbc8
]
:hover
{
transition
:
border
;
transition-duration
:
.2s
;
transition-timing-function
:
unset
;
border
:
1px
solid
#1e93ff
}
.tiledContainer
.tiledContainer-item
:hover
.item_
[
data-v-6f8cfbc8
]
{
cursor
:
pointer
;
margin-right
:
5px
;
width
:
50px
;
height
:
50px
}
.demo-split
[
data-v-6f8cfbc8
]
{
height
:
calc
(
100vh
-
112px
)}
.demo-split
.demo-split-pane-L
[
data-v-6f8cfbc8
]
{
padding
:
10px
;
height
:
100%
;
background-color
:
#fff
}
.demo-split
.demo-split-pane-R
[
data-v-6f8cfbc8
]
{
padding-left
:
24px
}
.bottom
[
data-v-6f8cfbc8
],
.top
[
data-v-6f8cfbc8
]
{
text-align
:
center
}
.center
[
data-v-6f8cfbc8
]
{
width
:
300px
;
margin
:
10px
auto
;
overflow
:
hidden
}
.center-left
[
data-v-6f8cfbc8
]
{
float
:
left
}
.center-right
[
data-v-6f8cfbc8
]
{
float
:
right
}
\ No newline at end of file
\ No newline at end of file
dist/css/chunk-c81acdf2.52a97de4.css
已删除
100644 → 0
浏览文件 @
aeaf1529
.ivu-modal-close
.ivu-icon-ios-close
[
data-v-33f0d42e
]
{
color
:
red
;
font-weight
:
700
}
\ No newline at end of file
dist/index.html
浏览文件 @
d5bda7e7
<!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.6916cc08.js
></script><script
src=
js/app.15447f3b.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=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.6916cc08.js
></script><script
src=
js/app.b8c1148c.js
></script></body></html>
\ No newline at end of file
\ No newline at end of file
dist/js/app.15447f3b.js
已删除
100644 → 0
浏览文件 @
aeaf1529
因为 它太大了无法显示 源差异 。您可以改为
查看blob
。
dist/js/app.b8c1148c.js
0 → 100644
浏览文件 @
d5bda7e7
因为 它太大了无法显示 源差异 。您可以改为
查看blob
。
dist/js/chunk-4278c554.
713b0576
.js
→
dist/js/chunk-4278c554.
1b5b4add
.js
浏览文件 @
d5bda7e7
此差异已折叠。
点击以展开。
dist/js/chunk-442a269c.cb166cdc.js
0 → 100644
浏览文件 @
d5bda7e7
此差异已折叠。
点击以展开。
dist/js/chunk-
23b55b36.3b8c6721
.js
→
dist/js/chunk-
5a82a64a.cf350f86
.js
浏览文件 @
d5bda7e7
此差异已折叠。
点击以展开。
dist/js/chunk-6b176be6.
c851da8a
.js
→
dist/js/chunk-6b176be6.
922c7005
.js
浏览文件 @
d5bda7e7
此差异已折叠。
点击以展开。
dist/js/chunk-c19bb814.
a8335558
.js
→
dist/js/chunk-c19bb814.
c8843db5
.js
浏览文件 @
d5bda7e7
此差异已折叠。
点击以展开。
dist/js/chunk-c81acdf2.31bb939d.js
已删除
100644 → 0
浏览文件 @
aeaf1529
此差异已折叠。
点击以展开。
src/api/controller/Common/getApiCommonGetDomainName.d.ts
0 → 100644
浏览文件 @
d5bda7e7
import
{
type
AxiosRequestConfig
}
from
"
axios
"
;
/**
* 获取域名
* /api/Common/GetDomainName
*/
export
declare
function
getApiCommonGetDomainName
(
config
?:
AxiosRequestConfig
):
import
(
"
axios
"
).
AxiosPromise
<
{
code
:
number
;
status
:
string
;
msg
:
string
;
msg_detail
:
string
;
response
:
string
;
}
>
;
src/api/controller/Common/getApiCommonGetDomainName.js
0 → 100644
浏览文件 @
d5bda7e7
import
request
from
"
@/plugins/request
"
;
/**
* 获取域名
* /api/Common/GetDomainName
*/
export
function
getApiCommonGetDomainName
(
config
)
{
return
request
.
get
(
`/api/Common/GetDomainName`
,
config
);
}
src/api/controller/Common/index.d.ts
浏览文件 @
d5bda7e7
...
@@ -4,3 +4,4 @@ export * from "./getApiCommonGetTypeSelect";
...
@@ -4,3 +4,4 @@ export * from "./getApiCommonGetTypeSelect";
export
*
from
"
./getApiCommonGetTypeAndRoomList
"
;
export
*
from
"
./getApiCommonGetTypeAndRoomList
"
;
export
*
from
"
./postApiCommonImageUpLoad
"
;
export
*
from
"
./postApiCommonImageUpLoad
"
;
export
*
from
"
./getApiCommonGetMaxAndMinOccupyseat
"
;
export
*
from
"
./getApiCommonGetMaxAndMinOccupyseat
"
;
export
*
from
"
./getApiCommonGetDomainName
"
;
src/api/controller/Common/index.js
浏览文件 @
d5bda7e7
...
@@ -4,3 +4,4 @@ export * from "./getApiCommonGetTypeSelect";
...
@@ -4,3 +4,4 @@ export * from "./getApiCommonGetTypeSelect";
export
*
from
"
./getApiCommonGetTypeAndRoomList
"
;
export
*
from
"
./getApiCommonGetTypeAndRoomList
"
;
export
*
from
"
./postApiCommonImageUpLoad
"
;
export
*
from
"
./postApiCommonImageUpLoad
"
;
export
*
from
"
./getApiCommonGetMaxAndMinOccupyseat
"
;
export
*
from
"
./getApiCommonGetMaxAndMinOccupyseat
"
;
export
*
from
"
./getApiCommonGetDomainName
"
;
src/api/controller/TimeTask/getApiTimeTaskDepartureTimeout.d.ts
0 → 100644
浏览文件 @
d5bda7e7
import
{
type
AxiosRequestConfig
}
from
"
axios
"
;
/**
* 暂时离开超时
* /api/TimeTask/DepartureTimeout
*/
export
declare
function
getApiTimeTaskDepartureTimeout
(
config
?:
AxiosRequestConfig
):
import
(
"
axios
"
).
AxiosPromise
<
{
code
:
number
;
status
:
string
;
msg
:
string
;
msg_detail
:
string
;
response
:
string
;
}
>
;
src/api/controller/TimeTask/getApiTimeTaskDepartureTimeout.js
0 → 100644
浏览文件 @
d5bda7e7
import
request
from
"
@/plugins/request
"
;
/**
* 暂时离开超时
* /api/TimeTask/DepartureTimeout
*/
export
function
getApiTimeTaskDepartureTimeout
(
config
)
{
return
request
.
get
(
`/api/TimeTask/DepartureTimeout`
,
config
);
}
src/api/controller/TimeTask/getApiTimeTaskNotSigned.d.ts
浏览文件 @
d5bda7e7
import
{
type
AxiosRequestConfig
}
from
"
axios
"
;
import
{
type
AxiosRequestConfig
}
from
"
axios
"
;
/**
/**
* 未签到加入不良记录
* 未签到
签退
加入不良记录
* /api/TimeTask/NotSigned
* /api/TimeTask/NotSigned
*/
*/
export
declare
function
getApiTimeTaskNotSigned
(
config
?:
AxiosRequestConfig
):
import
(
"
axios
"
).
AxiosPromise
<
{
export
declare
function
getApiTimeTaskNotSigned
(
config
?:
AxiosRequestConfig
):
import
(
"
axios
"
).
AxiosPromise
<
{
...
...
src/api/controller/TimeTask/getApiTimeTaskNotSigned.js
浏览文件 @
d5bda7e7
import
request
from
"
@/plugins/request
"
;
import
request
from
"
@/plugins/request
"
;
/**
/**
* 未签到加入不良记录
* 未签到
签退
加入不良记录
* /api/TimeTask/NotSigned
* /api/TimeTask/NotSigned
*/
*/
export
function
getApiTimeTaskNotSigned
(
config
)
{
export
function
getApiTimeTaskNotSigned
(
config
)
{
...
...
src/api/controller/TimeTask/index.d.ts
浏览文件 @
d5bda7e7
export
*
from
"
./getApiTimeTaskOccupyseatUseReminder
"
;
export
*
from
"
./getApiTimeTaskOccupyseatUseReminder
"
;
export
*
from
"
./getApiTimeTaskNotSigned
"
;
export
*
from
"
./getApiTimeTaskNotSigned
"
;
export
*
from
"
./getApiTimeTaskDepartureTimeout
"
;
src/api/controller/TimeTask/index.js
浏览文件 @
d5bda7e7
export
*
from
"
./getApiTimeTaskOccupyseatUseReminder
"
;
export
*
from
"
./getApiTimeTaskOccupyseatUseReminder
"
;
export
*
from
"
./getApiTimeTaskNotSigned
"
;
export
*
from
"
./getApiTimeTaskNotSigned
"
;
export
*
from
"
./getApiTimeTaskDepartureTimeout
"
;
src/config/modules/dict.js
浏览文件 @
d5bda7e7
...
@@ -52,7 +52,7 @@ class ConfigDict {
...
@@ -52,7 +52,7 @@ class ConfigDict {
//活动状态
//活动状态
'
0
'
:
'
blue
'
,
'
0
'
:
'
blue
'
,
'
1
'
:
'
success
'
,
'
1
'
:
'
success
'
,
'
2
'
:
'
primary
'
,
'
2
'
:
'
default
'
,
'
3
'
:
'
error
'
,
'
3
'
:
'
error
'
,
'
9
'
:
'
default
'
,
'
9
'
:
'
default
'
,
}
}
...
...
src/hook/index.js
浏览文件 @
d5bda7e7
...
@@ -36,6 +36,42 @@ export function blobFileDown(res) {
...
@@ -36,6 +36,42 @@ export function blobFileDown(res) {
window
.
URL
.
revokeObjectURL
(
href
);
//释放掉blob对象
window
.
URL
.
revokeObjectURL
(
href
);
//释放掉blob对象
}
}
export
function
setSession
(
value
,
key
){
//设置session
window
.
sessionStorage
.
setItem
(
key
,
JSON
.
stringify
(
value
));
}
export
function
getSession
(
key1
){
//获取session
let
info
=
JSON
.
parse
(
window
.
sessionStorage
.
getItem
(
key1
));
return
info
?
info
:{};
}
export
function
setStorage
(
value
,
key
){
//设置Storage
window
.
localStorage
.
setItem
(
key
,
JSON
.
stringify
(
value
));
}
export
function
getStorage
(
key
){
//获取Storage
let
info
=
JSON
.
parse
(
window
.
localStorage
.
getItem
(
key
));
return
info
?
info
:{};
}
export
function
saveForm
(
ok
,
cancel
)
{
export
function
saveForm
(
ok
,
cancel
)
{
// 公共弹窗删除
// 公共弹窗删除
...
...
src/pages/roomManagement/index.vue
浏览文件 @
d5bda7e7
...
@@ -82,7 +82,9 @@ export default {
...
@@ -82,7 +82,9 @@ export default {
room_name
:
[{
required
:
true
,
message
:
'
房间名称不能为空
'
,
trigger
:
'
blur
'
}],
room_name
:
[{
required
:
true
,
message
:
'
房间名称不能为空
'
,
trigger
:
'
blur
'
}],
room_type_id
:
[{
required
:
true
,
message
:
'
房间类型不能为空
'
,
trigger
:
'
change
'
}],
room_type_id
:
[{
required
:
true
,
message
:
'
房间类型不能为空
'
,
trigger
:
'
change
'
}],
area
:
[{
required
:
true
,
message
:
'
房间类型不能为空
'
,
trigger
:
'
change
'
}],
area
:
[{
required
:
true
,
message
:
'
房间类型不能为空
'
,
trigger
:
'
change
'
}],
room_address
:
[{
required
:
true
,
message
:
'
房间地址不能为空
'
,
trigger
:
'
change
'
}],
time_split
:
[{
type
:
'
string
'
,
required
:
true
,
message
:
'
分割时间段不能为空
'
,
trigger
:
'
change
'
}],
service_interval_time
:
[{
type
:
'
array
'
,
required
:
true
,
message
:
'
房间默认开放时间不能为空
'
,
trigger
:
'
change
'
}],
},
},
defaultFormData
:
{
defaultFormData
:
{
"
room_name
"
:
""
,
"
room_name
"
:
""
,
...
@@ -517,7 +519,7 @@ export default {
...
@@ -517,7 +519,7 @@ export default {
// 新增
// 新增
add
(){
add
(){
this
.
flag
=
'
add
'
this
.
flag
=
'
add
'
this
.
$refs
.
ceditmodal
.
regionDot
=
[]
this
.
$refs
.
ceditmodal
.
regionDot
=
[]
;
this
.
regionDot
=
[
this
.
regionDot
=
[
{
lat
:
19.984440261076596
,
lng
:
110.3360903263092
},
{
lat
:
19.984440261076596
,
lng
:
110.3360903263092
},
{
lat
:
19.98417306653825
,
lng
:
110.33607959747314
},
{
lat
:
19.98417306653825
,
lng
:
110.33607959747314
},
...
@@ -563,7 +565,7 @@ export default {
...
@@ -563,7 +565,7 @@ export default {
this
.
regionDot
=
res
.
response
.
attendance_area_list
this
.
regionDot
=
res
.
response
.
attendance_area_list
this
.
$refs
.
ceditmodal
.
regionDot
=
this
.
regionDot
;
//赋值给子组件
this
.
$refs
.
ceditmodal
.
regionDot
=
this
.
regionDot
;
//赋值给子组件
//11
//11
this
.
$refs
.
ceditmodal
.
modalInit
(
'
edit
'
,
res
.
response
)
this
.
$refs
.
ceditmodal
.
modalInit
(
'
edit
'
,
{...
res
.
response
,
time_split
:
String
(
res
.
response
.
time_split
)}
)
this
.
editModalLoading
=
false
this
.
editModalLoading
=
false
}).
catch
((
e
)
=>
{
}).
catch
((
e
)
=>
{
...
@@ -636,19 +638,11 @@ export default {
...
@@ -636,19 +638,11 @@ export default {
qrCode
(
row
){
qrCode
(
row
){
//生成钥匙二维码
//生成钥匙二维码
this
.
room
.
row
=
row
this
.
room
.
row
=
row
this
.
room
.
src
=
`/occupyseat/wx/#/scanRoomQrcode?room_id=
${
row
.
room_id
}
`
this
.
room
.
src
=
`
${
hooks
.
getStorage
(
'
doMain
'
)}
/SRFlowIfream/view/index.html?links=
${
hooks
.
getStorage
(
'
doMain
'
)}
/occupyseat/wx/#/scanRoomQrcode?room_id=
${
row
.
room_id
}
`
// this.room.src = `/occupyseat/wx/#/scanRoomQrcode?room_id=${row.room_id}`
this
.
room
.
show
=
true
this
.
room
.
show
=
true
},
},
}
}
}
}
</
script
>
</
script
>
...
@@ -732,4 +726,5 @@ export default {
...
@@ -732,4 +726,5 @@ export default {
color: red;
color: red;
font-weight: 700;
font-weight: 700;
}
}
</
style
>
</
style
>
src/pages/seatManagement/index.vue
浏览文件 @
d5bda7e7
...
@@ -302,7 +302,8 @@ export default {
...
@@ -302,7 +302,8 @@ export default {
qrCode
(
row
){
qrCode
(
row
){
//生成钥匙二维码
//生成钥匙二维码
this
.
room
.
row
=
row
this
.
room
.
row
=
row
this
.
room
.
src
=
`/occupyseat/wx/#/scanRoomQrcode?seat_id=
${
row
.
seat_id
}
`
this
.
room
.
src
=
`
${
hooks
.
getStorage
(
'
doMain
'
)}
/SRFlowIfream/view/index.html?links=
${
hooks
.
getStorage
(
'
doMain
'
)}
/occupyseat/wx/#/scanRoomQrcode?seat_id=
${
row
.
seat_id
}
`
// this.room.src = `/occupyseat/wx/#/scanRoomQrcode?seat_id=${row.seat_id}`
this
.
room
.
show
=
true
this
.
room
.
show
=
true
},
},
...
...
src/store/modules/admin/modules/account.js
浏览文件 @
d5bda7e7
...
@@ -6,6 +6,7 @@ import router from '@/router';
...
@@ -6,6 +6,7 @@ import router from '@/router';
import
Setting
from
'
@/setting
'
;
import
Setting
from
'
@/setting
'
;
import
Vue
from
"
vue
"
;
import
Vue
from
"
vue
"
;
import
*
as
config
from
'
@/config/index
'
import
*
as
config
from
'
@/config/index
'
import
*
as
hooks
from
'
@/hook/index
'
import
{
AccountLogin
,
AccountRegister
}
from
'
@api/account
'
;
import
{
AccountLogin
,
AccountRegister
}
from
'
@api/account
'
;
import
{
Modal
}
from
'
view-design
'
;
import
{
Modal
}
from
'
view-design
'
;
...
@@ -41,15 +42,15 @@ export default {
...
@@ -41,15 +42,15 @@ export default {
await
api
.
getApiGetTokenInfo
().
then
(
async
res
=>
{
await
api
.
getApiGetTokenInfo
().
then
(
async
res
=>
{
// 这个接口是解析单点返回的token(admin_token) 获取到用户信息 且每次请求都会带上此token(admin_token) 在请求拦截中配置
// 这个接口是解析单点返回的token(admin_token) 获取到用户信息 且每次请求都会带上此token(admin_token) 在请求拦截中配置
util
.
cookies
.
set
(
config
.
occupancy
.
userInfo
,
res
.
response
);
util
.
cookies
.
set
(
config
.
occupancy
.
userInfo
,
res
.
response
);
let
userObj
=
res
.
response
;
let
userObj
=
res
.
response
;
var
info
=
{
var
info
=
{
name
:
idt
.
GetTokenParams
(
idt
.
GetToken
()).
name
,
name
:
idt
.
GetTokenParams
(
idt
.
GetToken
()).
name
,
avatar
:
'
https://dev-file.iviewui.com/userinfoPDvn9gKWYihR24SpgC319vXY8qniCqj4/avatar
'
,
avatar
:
'
https://dev-file.iviewui.com/userinfoPDvn9gKWYihR24SpgC319vXY8qniCqj4/avatar
'
,
// access: userObj.role_and_power.length == 0 ? [] : [userObj.role_and_power[0].role_id],
// rolelist: userObj.role_and_power.length == 0 ? [] : userObj.role_and_power,
// currentRole: userObj.role_and_power[0].role_id,
// currentRoleName: userObj.role_and_power[0].role_name,
}
}
api
.
getApiCommonGetDomainName
().
then
(
doMain
=>
{
hooks
.
setStorage
(
doMain
.
response
,
'
doMain
'
)
})
// 获取动态菜单
// 获取动态菜单
// if (Setting.dynamicMenu) await dispatch('admin/menu/getMenuList', false, {root: true});
// if (Setting.dynamicMenu) await dispatch('admin/menu/getMenuList', false, {root: true});
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录