Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-platform
Commits
353538be
Commit
353538be
authored
Mar 28, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改部门 打开自定义添加
parent
a9a27b5f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
22 deletions
+32
-22
attendance-performance-manager-ui/admin/src/views/dept/list.vue
...ance-performance-manager-ui/admin/src/views/dept/list.vue
+18
-19
attendance-performance-manager/src/main/java/com/mortals/xhx/module/hik/door/service/impl/HikDoorServiceImpl.java
.../xhx/module/hik/door/service/impl/HikDoorServiceImpl.java
+1
-0
attendance-performance-manager/src/test/java/com/mortals/httpclient/http-client.env.json
...src/test/java/com/mortals/httpclient/http-client.env.json
+1
-1
attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
...-manager/src/test/java/com/mortals/httpclient/system.http
+12
-2
No files found.
attendance-performance-manager-ui/admin/src/views/dept/list.vue
View file @
353538be
...
@@ -4,8 +4,7 @@
...
@@ -4,8 +4,7 @@
<LayoutTable
<LayoutTable
notPagination
notPagination
:data=
"tableData"
:data=
"tableData"
notAdd
notDel
ref=
"layoutTable"
ref=
"layoutTable"
:config=
"tableConfig"
:config=
"tableConfig"
notSearch
notSearch
...
@@ -69,23 +68,23 @@ export default {
...
@@ -69,23 +68,23 @@ export default {
// {label: "顺序", prop: "orderNum",formatter: this.formatter},
// {label: "顺序", prop: "orderNum",formatter: this.formatter},
//
{label: "创建用户", prop: "createUserId", formatter: this.formatter},
{
label
:
"
创建用户
"
,
prop
:
"
createUserId
"
,
formatter
:
this
.
formatter
},
//
{
{
//
label: "操作",
label
:
"
操作
"
,
//
width: 240,
width
:
240
,
//
formatter: (row) => {
formatter
:
(
row
)
=>
{
//
return (
return
(
//
<
table
-
buttons
<
table
-
buttons
//
noAdd
noAdd
//
noView
noView
//
row={row}
row
=
{
row
}
//
onEdit={this.toEdit}
onEdit
=
{
this
.
toEdit
}
//
onView={this.toView}
onView
=
{
this
.
toView
}
//
onDel={this.toDel}
onDel
=
{
this
.
toDel
}
//
/>
/
>
//
);
);
//
},
},
//
},
},
],
],
},
},
};
};
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/hik/door/service/impl/HikDoorServiceImpl.java
View file @
353538be
...
@@ -63,6 +63,7 @@ public class HikDoorServiceImpl extends AbstractHikService implements IHikDoorSe
...
@@ -63,6 +63,7 @@ public class HikDoorServiceImpl extends AbstractHikService implements IHikDoorSe
HCNetSDK
hCNetSDK
=
createSDKInstance
();
HCNetSDK
hCNetSDK
=
createSDKInstance
();
//initLoadSdk(hCNetSDK);
//initLoadSdk(hCNetSDK);
int
userID
=
login
(
hCNetSDK
,
doorEntity
);
int
userID
=
login
(
hCNetSDK
,
doorEntity
);
log
.
info
(
"userID==>{}"
,
userID
);
List
<
EventInfo
>
eventInfoList
=
new
ArrayList
<>();
List
<
EventInfo
>
eventInfoList
=
new
ArrayList
<>();
...
...
attendance-performance-manager/src/test/java/com/mortals/httpclient/http-client.env.json
View file @
353538be
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
},
},
"pengxi"
:
{
"pengxi"
:
{
"baseUrl"
:
"http://1
0.102.252.13
:11039/attendance"
,
"baseUrl"
:
"http://1
18.122.189.109
:11039/attendance"
,
"baseLogin"
:
"http://192.168.0.98:11078/base"
"baseLogin"
:
"http://192.168.0.98:11078/base"
},
},
...
...
attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
View file @
353538be
...
@@ -147,7 +147,17 @@ Content-Type: application/json
...
@@ -147,7 +147,17 @@ Content-Type: application/json
}
}
###设备直连更新人员
###设备直连更新人员
GE
T {{baseUrl}}/test/updatePersonsByDevices
POS
T {{baseUrl}}/test/updatePersonsByDevices
Content-Type: application/json
Content-Type: application/json
{}
{}
\ No newline at end of file
###设备直连更新事件
POST {{baseUrl}}/test/searchEventsByDevices
Content-Type: application/json
{
"createTimeStart": "2024-03-27 00:00:00",
"createTimeEnd": "2024-03-27 23:59:59",
"deviceId": 4
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment