Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
Support
提交反馈
为 GitLab 提交贡献
登录
切换导航
D
dutyManagement
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
刘英杰
dutyManagement
提交
1e299f4b
提交
1e299f4b
编写于
12月 05, 2023
作者:
刘英杰
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
整合签到列表代码
上级
63515242
变更
12
展开全部
显示空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
2205 行增加
和
116 行删除
+2205
-116
.gitignore
.gitignore
+2
-0
.gitlab-ci.yml
.gitlab-ci.yml
+14
-0
main.js
src/main.js
+3
-1
SSO.vue
src/pages/SSO.vue
+2
-2
SSOInfo.vue
src/pages/SSOInfo.vue
+6
-6
index.vue
src/pages/messageDetails/index.vue
+1
-1
index.vue
src/pages/myDuty/index.vue
+17
-10
ceshi.vue
src/pages/signList/ceshi.vue
+981
-0
index.vue
src/pages/signList/index.vue
+171
-90
mybanben.vue
src/pages/signList/mybanben.vue
+981
-0
index.vue
src/pages/welcome/index.vue
+26
-4
vite.config.js
vite.config.js
+1
-2
未找到文件。
.gitignore
浏览文件 @
1e299f4b
...
@@ -17,6 +17,8 @@ dist-ssr
...
@@ -17,6 +17,8 @@ dist-ssr
!.vscode/extensions.json
!.vscode/extensions.json
.idea
.idea
.DS_Store
.DS_Store
/node_modules
#/dist
*.suo
*.suo
*.ntvs*
*.ntvs*
*.njsproj
*.njsproj
...
...
.gitlab-ci.yml
0 → 100644
浏览文件 @
1e299f4b
default
:
before_script
:
-
chcp
65001
stages
:
-
publish
build
:
stage
:
publish
script
:
-
remove-item -Force -Recurse D:\ASC_web\A00051\dutyManagement\wx*
-
xcopy "dist" "D:\ASC_web\A00051\dutyManagement\wx\" /s/e/y/
only
:
-
wx
src/main.js
浏览文件 @
1e299f4b
import
{
createApp
}
from
'
vue
'
import
{
createApp
}
from
'
vue
'
import
'
./style.css
'
import
'
./style.css
'
import
App
from
'
./App.vue
'
import
App
from
'
./App.vue
'
import
router
from
"
./router/index.js
"
;
import
router
from
"
./router/index.js
"
;
import
'
animate.css
'
//引入
import
'
animate.css
'
//引入
import
VueCookies
from
'
vue-cookies
'
import
VueCookies
from
'
vue-cookies
'
import
VConsole
from
'
vconsole
'
;
import
VConsole
from
'
vconsole
'
;
const
app
=
createApp
(
App
)
const
app
=
createApp
(
App
)
// const vConsole = new VConsole();
// const vConsole = new VConsole();
app
.
config
.
globalProperties
.
$cookies
=
VueCookies
app
.
config
.
globalProperties
.
$cookies
=
VueCookies
app
.
use
(
router
)
app
.
use
(
router
)
app
.
mount
(
'
#app
'
)
app
.
mount
(
'
#app
'
)
src/pages/SSO.vue
浏览文件 @
1e299f4b
...
@@ -49,10 +49,10 @@ const getTokenActionWx = async (date) => {
...
@@ -49,10 +49,10 @@ const getTokenActionWx = async (date) => {
}
}
const
getToken
=
async
()
=>
{
const
getToken
=
async
()
=>
{
if
(
Number
(
router
.
currentRoute
.
value
.
query
.
type
)
===
2
)
{
if
(
Number
(
router
.
currentRoute
.
value
.
query
.
type
)
===
2
)
{
Cookies
.
set
(
'
token
'
,
router
.
currentRoute
.
value
.
query
.
token
)
//
Cookies.set('token', router.currentRoute.value.query.token)
// localStorage.setItem('token', router.currentRoute.value.query.token)
// localStorage.setItem('token', router.currentRoute.value.query.token)
let
date
=
{
let
date
=
{
token
:
Cookies
.
get
(
'
token
'
)
token
:
router
.
currentRoute
.
value
.
query
.
token
}
}
await
getTokenAction
(
date
)
await
getTokenAction
(
date
)
}
else
if
(
Number
(
router
.
currentRoute
.
value
.
query
.
type
)
===
1
)
{
}
else
if
(
Number
(
router
.
currentRoute
.
value
.
query
.
type
)
===
1
)
{
...
...
src/pages/SSOInfo.vue
浏览文件 @
1e299f4b
...
@@ -39,12 +39,12 @@ const getTokenActionWx = async (date) => {
...
@@ -39,12 +39,12 @@ const getTokenActionWx = async (date) => {
Cookies
.
set
(
'
admin-token
'
,
res
.
response
.
access_token
.
token_content
)
Cookies
.
set
(
'
admin-token
'
,
res
.
response
.
access_token
.
token_content
)
Cookies
.
set
(
'
time
'
,
res
.
response
.
access_token
.
expires
)
Cookies
.
set
(
'
time
'
,
res
.
response
.
access_token
.
expires
)
let
links
=
router
.
currentRoute
.
value
.
query
.
links
let
links
=
router
.
currentRoute
.
value
.
query
.
links
let
id
=
router
.
currentRoute
.
value
.
query
.
id
//
let id = router.currentRoute.value.query.id
await
router
.
push
({
await
router
.
push
({
path
:
`/
${
links
}
`
,
path
:
`/
${
links
}
`
,
query
:
{
//
query: {
id
:
id
//
id: id
}
//
}
})
})
}
}
}
}
...
@@ -54,8 +54,8 @@ const getToken = async () => {
...
@@ -54,8 +54,8 @@ const getToken = async () => {
let
date
=
{
let
date
=
{
token
:
Cookies
.
get
(
'
token
'
)
token
:
Cookies
.
get
(
'
token
'
)
}
}
console
.
log
(
"
🚀🚀🚀,ASC的data
"
,
date
)
//
console.log("🚀🚀🚀,ASC的data", date)
console
.
log
(
"
🚀🚀🚀,ASC的token
"
,
Cookies
.
get
(
'
token
'
))
//
console.log("🚀🚀🚀,ASC的token", Cookies.get('token'))
await
getTokenAction
(
date
)
await
getTokenAction
(
date
)
}
else
if
(
Number
(
router
.
currentRoute
.
value
.
query
.
type
)
===
1
)
{
}
else
if
(
Number
(
router
.
currentRoute
.
value
.
query
.
type
)
===
1
)
{
let
date
=
{
let
date
=
{
...
...
src/pages/messageDetails/index.vue
浏览文件 @
1e299f4b
...
@@ -71,7 +71,7 @@ onMounted(() => {
...
@@ -71,7 +71,7 @@ onMounted(() => {
getDutyMessage
()
getDutyMessage
()
})
})
const
onClickLeft
=
()
=>
router
.
push
({
const
onClickLeft
=
()
=>
router
.
push
({
name
:
'
welcome
'
name
:
'
signList
'
});
});
</
script
>
</
script
>
<
style
>
<
style
>
...
...
src/pages/myDuty/index.vue
浏览文件 @
1e299f4b
...
@@ -37,7 +37,8 @@
...
@@ -37,7 +37,8 @@
<van-dropdown-menu
:overlay=
"false"
>
<van-dropdown-menu
:overlay=
"false"
>
<van-dropdown-item
@
close=
"closeMenu"
:key=
"myDuty.menuKey"
@
open=
"openMenu"
title=
"日期"
>
<van-dropdown-item
@
close=
"closeMenu"
:key=
"myDuty.menuKey"
@
open=
"openMenu"
title=
"日期"
>
<
template
#default
>
<
template
#default
>
<van-calendar
v-model:show=
"myDuty.show"
type=
"range"
@
confirm=
"dateRange"
/>
<van-calendar
:minDate=
"myDuty.minDate"
:maxDate=
"myDuty.maxDate"
v-model:show=
"myDuty.show"
type=
"range"
@
confirm=
"dateRange"
/>
</
template
>
</
template
>
</van-dropdown-item>
</van-dropdown-item>
<van-dropdown-item
v-model=
"myDuty[item[2]]"
v-for=
"(item,index) in myDuty.addDutySelectList"
:key=
"index"
<van-dropdown-item
v-model=
"myDuty[item[2]]"
v-for=
"(item,index) in myDuty.addDutySelectList"
:key=
"index"
...
@@ -110,7 +111,7 @@
...
@@ -110,7 +111,7 @@
</template>
</template>
<
style
scoped
lang=
"less"
>
<
style
scoped
lang=
"less"
>
.container {
.container {
//box-sizing: border-box; //background-color: #706c6c; //width: 100%; //height: 100%; //min-height: 896px; //display: flex; //flex-wrap: wrap; //justify-content: center; //align-content: flex-start;
//box-sizing: border-box; //background-color: #706c6c; //width: 100%; //height: 100%; //min-height: 896px; //display: flex; //flex-wrap: wrap; //justify-content: center; //align-content: flex-start;
.cardContainer {
.cardContainer {
...
@@ -141,6 +142,8 @@ import Cookies from 'js-cookie'
...
@@ -141,6 +142,8 @@ import Cookies from 'js-cookie'
const
onClickLeft
=
()
=>
history
.
back
();
const
onClickLeft
=
()
=>
history
.
back
();
let
myDuty
=
reactive
({
let
myDuty
=
reactive
({
minDate
:
new
Date
(
dayjs
().
year
(),
dayjs
().
month
()
-
1
,
1
),
maxDate
:
new
Date
(
dayjs
().
year
(),
dayjs
().
month
()
+
1
,
1
),
addDutySelectList
:
[],
addDutySelectList
:
[],
DatePickerKey
:
1
,
DatePickerKey
:
1
,
showCenter
:
false
,
showCenter
:
false
,
...
@@ -243,6 +246,7 @@ const onLoad = async () => {
...
@@ -243,6 +246,7 @@ const onLoad = async () => {
"
page_size
"
:
myDuty
.
page_size
,
"
page_size
"
:
myDuty
.
page_size
,
}
}
const
res
=
await
api
.
GetWatchList
(
data
)
const
res
=
await
api
.
GetWatchList
(
data
)
// showToast('刷新成功!')
list
.
value
=
res
.
response
.
data
list
.
value
=
res
.
response
.
data
myDuty
.
total
=
res
.
response
.
data_count
myDuty
.
total
=
res
.
response
.
data_count
// 异步更新数据
// 异步更新数据
...
@@ -254,7 +258,7 @@ const onLoad = async () => {
...
@@ -254,7 +258,7 @@ const onLoad = async () => {
// 数据全部加载完成
// 数据全部加载完成
if
(
list
.
value
.
length
>=
Number
(
myDuty
.
total
))
{
if
(
list
.
value
.
length
>=
Number
(
myDuty
.
total
))
{
finished
.
value
=
true
;
finished
.
value
=
true
;
showToast
(
'
加载完成!
'
)
//
showToast('加载完成!')
}
else
if
(
list
.
value
.
length
<
Number
(
myDuty
.
total
))
{
}
else
if
(
list
.
value
.
length
<
Number
(
myDuty
.
total
))
{
myDuty
.
page_size
=
myDuty
.
page_size
+
10
myDuty
.
page_size
=
myDuty
.
page_size
+
10
...
@@ -304,6 +308,7 @@ function pickerChgSftOpen(obj) {
...
@@ -304,6 +308,7 @@ function pickerChgSftOpen(obj) {
changeShiftsPickerShow
.
value
=
true
changeShiftsPickerShow
.
value
=
true
attendanceObj
.
value
=
obj
attendanceObj
.
value
=
obj
}
}
// 搜索值改变
// 搜索值改变
function
searchChange
(
val
)
{
function
searchChange
(
val
)
{
pickerLoading
.
value
=
true
pickerLoading
.
value
=
true
...
@@ -324,6 +329,7 @@ function searchChange(val) {
...
@@ -324,6 +329,7 @@ function searchChange(val) {
pickerLoading
.
value
=
false
pickerLoading
.
value
=
false
})
})
}
}
// 换班选择器确认
// 换班选择器确认
function
pickerConfirm
(
val
)
{
function
pickerConfirm
(
val
)
{
// console.log('选择器确认', val)
// console.log('选择器确认', val)
...
@@ -352,6 +358,7 @@ function pickerConfirm(val) {
...
@@ -352,6 +358,7 @@ function pickerConfirm(val) {
})
})
}
}
// 换班选择器取消
// 换班选择器取消
function
pickerCancel
()
{
function
pickerCancel
()
{
changeShiftsPickerShow
.
value
=
false
changeShiftsPickerShow
.
value
=
false
...
...
src/pages/signList/ceshi.vue
0 → 100644
浏览文件 @
1e299f4b
此差异已折叠。
点击以展开。
src/pages/signList/index.vue
浏览文件 @
1e299f4b
此差异已折叠。
点击以展开。
src/pages/signList/mybanben.vue
0 → 100644
浏览文件 @
1e299f4b
此差异已折叠。
点击以展开。
src/pages/welcome/index.vue
浏览文件 @
1e299f4b
...
@@ -15,7 +15,16 @@
...
@@ -15,7 +15,16 @@
<!--
<router-link
to=
"/messageDetails"
>
-->
<!--
<router-link
to=
"/messageDetails"
>
-->
<!--
<van-button>
123123
</van-button>
-->
<!--
<van-button>
123123
</van-button>
-->
<!--
</router-link>
-->
<!--
</router-link>
-->
<van-cell-group
style=
"width: 100%;margin-top: 10px"
>
<van-cell-group
style=
"width: 100%;margin-top: 10px"
>
<!--
<van-swipe
@
change=
"swiperNext"
class=
"my-swipe"
indicator-color=
"white"
>
-->
<!--
<van-swipe-item>
1
</van-swipe-item>
-->
<!--
<van-swipe-item>
2
</van-swipe-item>
-->
<!--
<van-swipe-item>
3
</van-swipe-item>
-->
<!--
<van-swipe-item
style=
"color: red;"
>
-->
<!--
</van-swipe-item>
-->
<!--
</van-swipe>
-->
<div
class=
"dateContainer"
>
<div
class=
"dateContainer"
>
<div
class=
"left"
@
click=
"reductionDate"
>
<div
class=
"left"
@
click=
"reductionDate"
>
<span
class=
"SlideButton"
><van-icon
name=
"arrow-left"
/></span>
<span
class=
"SlideButton"
><van-icon
name=
"arrow-left"
/></span>
...
@@ -58,7 +67,6 @@
...
@@ -58,7 +67,6 @@
<
template
#extra
>
<
template
#extra
>
<van-tag
type=
"primary"
plain
>
<van-tag
type=
"primary"
plain
>
<span>
{{
item
.
watchtypename
+
'
-
'
+
item
.
dept_name
+
'
-
'
+
item
.
campusname
}}
</span></van-tag>
<span>
{{
item
.
watchtypename
+
'
-
'
+
item
.
dept_name
+
'
-
'
+
item
.
campusname
}}
</span></van-tag>
</
template
>
</
template
>
</van-cell>
</van-cell>
</van-cell-group>
</van-cell-group>
...
@@ -105,6 +113,12 @@ let GetWatchListObject = reactive({
...
@@ -105,6 +113,12 @@ let GetWatchListObject = reactive({
GetWatchListInitArray
:
[],
GetWatchListInitArray
:
[],
})
})
const
swiperPrev
=
()
=>
{
console
.
log
(
"
🚀swiperPrev🚀🚀,
"
,)
}
const
swiperNext
=
(
e
)
=>
{
console
.
log
(
"
🚀🚀swiperNext🚀,
"
,
e
)
}
const
onRefresh
=
async
()
=>
{
const
onRefresh
=
async
()
=>
{
dateArray
.
loading
=
true
dateArray
.
loading
=
true
GetWatchListObject
.
startTime
=
dayjs
().
format
(
'
YYYY-MM-DD
'
)
GetWatchListObject
.
startTime
=
dayjs
().
format
(
'
YYYY-MM-DD
'
)
...
@@ -263,6 +277,14 @@ onMounted(() => {
...
@@ -263,6 +277,14 @@ onMounted(() => {
})
})
</
script
>
</
script
>
<
style
scoped
lang=
"less"
>
<
style
scoped
lang=
"less"
>
.my-swipe .van-swipe-item {
width: 100px;
color: #fff;
font-size: 20px;
line-height: 150px;
text-align: center;
background-color: #39ed81;
}
.container {
.container {
.dateContainer {
.dateContainer {
...
...
vite.config.js
浏览文件 @
1e299f4b
...
@@ -15,9 +15,8 @@ export default defineConfig({
...
@@ -15,9 +15,8 @@ export default defineConfig({
],
],
base
:
'
./
'
,
base
:
'
./
'
,
server
:
{
server
:
{
// host: "
127.0.0.1
",
// host: "
0.0.0.0
",
// cors: true,
// cors: true,
// port: 8991,
// port: 8991,
// open: true, //自动打开
// open: true, //自动打开
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录