Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
ai-yunshou-vue
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
AI云守
ai-yunshou-vue
Commits
cff090da
Commit
cff090da
authored
Sep 10, 2024
by
胡占生
🇨🇳
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 视频预览界面 实时预警修复,日志管理 修复查询问题
parent
53dd3b78
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
23 deletions
+31
-23
src/views/alarmControl/index.vue
src/views/alarmControl/index.vue
+10
-10
src/views/logControl/index.vue
src/views/logControl/index.vue
+16
-6
src/views/videoControl/videoPreview/index.vue
src/views/videoControl/videoPreview/index.vue
+5
-7
No files found.
src/views/alarmControl/index.vue
View file @
cff090da
...
@@ -17,6 +17,16 @@
...
@@ -17,6 +17,16 @@
/>
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"算法列表"
prop=
"applicationScenarios"
>
<el-select
v-model=
"queryParams.applicationScenarios"
placeholder=
"请选择算法列表"
clearable
style=
"width: 200px"
>
<el-option
v-for=
"disc in algorithm_scen"
:key=
"disc.value"
:label=
"disc.label"
:value=
"disc.value"
/>
</el-select>
</el-form-item>
<el-form-item
label=
"创建时间"
>
<el-form-item
label=
"创建时间"
>
<el-date-picker
<el-date-picker
v-model=
"dateRange"
v-model=
"dateRange"
...
@@ -27,16 +37,6 @@
...
@@ -27,16 +37,6 @@
end-placeholder=
"结束日期"
end-placeholder=
"结束日期"
></el-date-picker>
></el-date-picker>
</el-form-item>
</el-form-item>
<el-form-item
label=
"算法场景"
prop=
"applicationScenarios"
>
<el-select
v-model=
"queryParams.applicationScenarios"
placeholder=
"请选择算法场景"
clearable
style=
"width: 200px"
>
<el-option
v-for=
"disc in algorithm_scen"
:key=
"disc.value"
:label=
"disc.label"
:value=
"disc.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"Search"
@
click=
"handleQuery"
>
搜索
</el-button>
<el-button
type=
"primary"
icon=
"Search"
@
click=
"handleQuery"
>
搜索
</el-button>
<el-button
icon=
"Refresh"
@
click=
"resetQuery"
>
重置
</el-button>
<el-button
icon=
"Refresh"
@
click=
"resetQuery"
>
重置
</el-button>
...
...
src/views/logControl/index.vue
View file @
cff090da
...
@@ -40,9 +40,9 @@
...
@@ -40,9 +40,9 @@
<el-date-picker
v-model=
"dateRange"
value-format=
"YYYY-MM-DD"
type=
"daterange"
range-separator=
"-"
<el-date-picker
v-model=
"dateRange"
value-format=
"YYYY-MM-DD"
type=
"daterange"
range-separator=
"-"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
></el-date-picker>
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
></el-date-picker>
</el-form-item>
</el-form-item>
<el-form-item
label=
"
摄像头
"
prop=
"deptName"
>
<el-form-item
label=
"
算法名称
"
prop=
"deptName"
>
<el-select
v-model=
"queryParams.deptName"
placeholder=
"请选择
摄像头
"
clearable
style=
"width: 200px"
>
<el-select
v-model=
"queryParams.deptName"
placeholder=
"请选择
算法
"
clearable
style=
"width: 200px"
>
<el-option
v-for=
"dict in
sys_job_status"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value
"
/>
<el-option
v-for=
"dict in
algList"
:key=
"dict.algorithmEnglish"
:label=
"dict.algorithmName"
:value=
"dict.algorithmEnglish
"
/>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item>
<el-form-item>
...
@@ -251,6 +251,7 @@ import {listAlgLog,listCameraLog} from "@/api/logControl/index";
...
@@ -251,6 +251,7 @@ import {listAlgLog,listCameraLog} from "@/api/logControl/index";
import
{
list
as
OpList
}
from
"
@/api/monitor/operlog
"
;
import
{
list
as
OpList
}
from
"
@/api/monitor/operlog
"
;
import
{
list
as
LoList
}
from
"
@/api/monitor/logininfor
"
;
import
{
list
as
LoList
}
from
"
@/api/monitor/logininfor
"
;
import
{
get
}
from
"
@vueuse/core
"
;
import
{
get
}
from
"
@vueuse/core
"
;
import
{
listAlg
}
from
"
@/api/algorithmList/index.js
"
;
const
router
=
useRouter
();
const
router
=
useRouter
();
const
{
proxy
}
=
getCurrentInstance
();
const
{
proxy
}
=
getCurrentInstance
();
const
{
sys_job_group
,
sys_job_status
,
sys_oper_type
,
sys_common_status
}
=
proxy
.
useDict
(
const
{
sys_job_group
,
sys_job_status
,
sys_oper_type
,
sys_common_status
}
=
proxy
.
useDict
(
...
@@ -262,6 +263,7 @@ const { sys_job_group, sys_job_status,sys_oper_type, sys_common_status } = proxy
...
@@ -262,6 +263,7 @@ const { sys_job_group, sys_job_status,sys_oper_type, sys_common_status } = proxy
const
nowText
=
ref
(
"
日志管理
"
);
const
nowText
=
ref
(
"
日志管理
"
);
const
activeName
=
ref
(
"
摄像头日志
"
);
const
activeName
=
ref
(
"
摄像头日志
"
);
const
AlgLogList
=
ref
([]);
const
AlgLogList
=
ref
([]);
const
algList
=
ref
([]);
const
CameraLogList
=
ref
([]);
const
CameraLogList
=
ref
([]);
const
OperateLogList
=
ref
([]);
const
OperateLogList
=
ref
([]);
const
logininforList
=
ref
([]);
const
logininforList
=
ref
([]);
...
@@ -302,7 +304,8 @@ const { queryParams, form, rules } = toRefs(data);
...
@@ -302,7 +304,8 @@ const { queryParams, form, rules } = toRefs(data);
function
handleClick
(
val
)
{
function
handleClick
(
val
)
{
activeName
.
value
=
val
.
props
.
name
activeName
.
value
=
val
.
props
.
name
console
.
log
(
"
🚀 ~ handleClick ~ activeName.value:
"
,
activeName
.
value
)
dateRange
.
value
=
[];
queryParams
.
value
=
{}
getAllList
()
getAllList
()
}
}
...
@@ -313,6 +316,14 @@ function getAllList(){
...
@@ -313,6 +316,14 @@ function getAllList(){
if
(
activeName
.
value
==
'
登录日志
'
)
getLogininforList
()
if
(
activeName
.
value
==
'
登录日志
'
)
getLogininforList
()
}
}
/** 查询算法列表 */
function
getAlgList
()
{
listAlg
({
pageNum
:
1
,
pageSize
:
100
}).
then
(
(
response
)
=>
{
algList
.
value
=
response
.
rows
;
}
);
}
/** 查询算法日志列表 */
/** 查询算法日志列表 */
function
getAlgLogList
()
{
function
getAlgLogList
()
{
loading
.
value
=
true
;
loading
.
value
=
true
;
...
@@ -383,7 +394,6 @@ function reset() {
...
@@ -383,7 +394,6 @@ function reset() {
concurrent
:
1
,
concurrent
:
1
,
status
:
"
0
"
,
status
:
"
0
"
,
};
};
proxy
.
resetForm
(
"
jobRef
"
);
proxy
.
resetForm
(
"
jobRef
"
);
}
}
...
@@ -518,7 +528,7 @@ function handleExport() {
...
@@ -518,7 +528,7 @@ function handleExport() {
`job_
${
new
Date
().
getTime
()}
.xlsx`
`job_
${
new
Date
().
getTime
()}
.xlsx`
);
);
}
}
getAlgList
()
getAllList
();
getAllList
();
</
script
>
</
script
>
<
style
scoped
lang=
"scss"
>
<
style
scoped
lang=
"scss"
>
...
...
src/views/videoControl/videoPreview/index.vue
View file @
cff090da
...
@@ -188,14 +188,12 @@ function handleNodeClick(row) {
...
@@ -188,14 +188,12 @@ function handleNodeClick(row) {
const
treeID
=
row
.
id
.
split
(
"
-
"
)[
1
];
const
treeID
=
row
.
id
.
split
(
"
-
"
)[
1
];
if
(
treeType
==
'
点位
'
){
if
(
treeType
==
'
点位
'
){
handlvideoPath
(
treeID
)
handlvideoPath
(
treeID
)
queryParams
.
value
.
locationId
=
treeID
;
queryParams
.
value
.
regionId
=
null
;
}
else
{
queryParams
.
value
.
regionId
=
treeID
;
queryParams
.
value
.
locationId
=
null
;
}
}
clearTimeout
(
timeoutId
);
// else{
getWaringData
()
// queryParams.value.regionId = treeID;
// }
// clearTimeout(timeoutId);
// getWaringData()
}
}
function
handjudge
(
row
)
{
function
handjudge
(
row
)
{
const
treeType
=
row
.
id
.
split
(
"
-
"
)[
0
];
const
treeType
=
row
.
id
.
split
(
"
-
"
)[
0
];
...
...
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