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
2bc52631
Commit
2bc52631
authored
Sep 13, 2024
by
胡占生
🇨🇳
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 菜单排序修改,点位管理回显修复,增加操作提示信息,增加视频流的拉流状态显示
parent
ae074865
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
28 additions
and
14 deletions
+28
-14
src/views/alarmControl/components/form.vue
src/views/alarmControl/components/form.vue
+0
-1
src/views/alarmControl/index.vue
src/views/alarmControl/index.vue
+2
-2
src/views/algorithmList/components/details.vue
src/views/algorithmList/components/details.vue
+1
-4
src/views/algorithmList/index.vue
src/views/algorithmList/index.vue
+12
-5
src/views/videoControl/pointControl/components/drawPoint.vue
src/views/videoControl/pointControl/components/drawPoint.vue
+3
-1
src/views/videoControl/pointControl/hooks/index.js
src/views/videoControl/pointControl/hooks/index.js
+5
-1
src/views/videoControl/pointControl/index.vue
src/views/videoControl/pointControl/index.vue
+5
-0
No files found.
src/views/alarmControl/components/form.vue
View file @
2bc52631
...
...
@@ -9,7 +9,6 @@
class=
"margin-top"
title=
""
:column=
"1"
:size=
"size"
border
>
<el-descriptions-item>
...
...
src/views/alarmControl/index.vue
View file @
2bc52631
...
...
@@ -75,8 +75,8 @@
<el-col
:span=
"division"
v-for=
"item in algList"
:key=
"item.name"
>
<el-card
class=
"alg-item"
shadow=
"hover"
>
<
template
v-slot:default
>
<div
style=
"
width: 100%
;overflow: hidden;"
>
<ImagePreview
style=
"display: grid; width: 100%; aspect-ratio: 16 / 9;overflow: hidden;"
:src=
"item.alarmImg"
/>
<div
style=
"
display: grid; width: 100%; aspect-ratio: 16 / 9
;overflow: hidden;"
>
<ImagePreview
:src=
"item.alarmImg"
/>
</div>
<h2
:style=
"
{color:item.alarmLevelColor}">
{{
item
.
alarmType
}}
</h2>
<p
style=
"color: #999999;font-size: 12px;"
>
...
...
src/views/algorithmList/components/details.vue
View file @
2bc52631
...
...
@@ -66,7 +66,7 @@
v-for=
"item in imgVideoData"
:key=
"item.id"
@
click=
"handBuiltImg(item.caseFile)"
>
<img
width=
"100%"
v-if=
"getFileType(item.caseFile)=='0'"
:src=
"'http://192.168.3.82'+item.caseFile"
alt=
""
style=
"border-radius: 10px;"
>
<img
width=
"100%"
v-if=
"getFileType(item.caseFile)=='0'"
:src=
"'http://192.168.3.82'+item.caseFile"
alt=
""
style=
"border-radius: 10px;"
>
<video
width=
"100%"
v-else
controls
class=
"drawImg"
style=
"border-radius: 10px;"
>
<source
:src=
"'http://192.168.3.82'+item.caseFile"
type=
"video/mp4"
/>
</video>
...
...
@@ -114,7 +114,6 @@
</video>
</div>
</div>
<!-- 进度条模块 -->
<div
v-else
style=
"text-align: center;"
>
<el-progress
:percentage=
"progressValue"
/>
...
...
@@ -150,7 +149,6 @@
</div>
</el-card>
<el-card
style=
"position: relative;padding: 20px;"
>
<div
class=
"img-box"
v-if=
"invalidList.length==0"
>
<img
src=
"@/assets/images/default/Image-1.png"
width=
"100%"
/>
</div>
...
...
@@ -167,7 +165,6 @@
</div>
<img
class=
"top-tip"
src=
"@/assets/images/close.png"
alt=
""
>
</div>
</el-card>
</div>
</el-card>
...
...
src/views/algorithmList/index.vue
View file @
2bc52631
...
...
@@ -2,7 +2,7 @@
<div
class=
"app-container home"
>
<TabTitle
:text=
"nowText"
/>
<div
class=
"add-but"
>
<div
class=
"add-but"
>
s
<div
class=
"search-input"
>
<el-input
v-model=
"queryParams.algorithmName"
...
...
@@ -11,12 +11,13 @@
class=
"input-with-select"
clearable
>
<template
#append
>
<div
@
click=
"searchList"
class
=
"cursor: pointer;"
>
<el-button
:icon=
"Search"
/>
搜索
<
!--
<
template
#append
>
<div
class=
"my-search"
style
=
"cursor: pointer;"
>
<el-button
type=
"primary"
plain
>
搜索
</el-button>
</div>
</
template
>
</
template
>
-->
</el-input>
<el-button
type=
"primary"
@
click=
"searchList"
plain
>
搜索
</el-button>
</div>
<!-- <el-button type="primary" plain @click="handAdd">新增算法</el-button> -->
<el-button
type=
"primary"
@
click=
"handeAdd"
plain
>
告警等级
</el-button>
...
...
@@ -300,6 +301,12 @@ import { el } from "element-plus/es/locales.mjs";
</
script
>
<
style
scoped
lang=
"scss"
>
.my-search
:active
{
color
:
#409EFF
;
}
.my-search
:focus-within
{
color
:
#409EFF
;
}
.el-menu-item.is-active
{
background
:
#E4F2FF
!
important
;
}
...
...
src/views/videoControl/pointControl/components/drawPoint.vue
View file @
2bc52631
...
...
@@ -413,7 +413,9 @@ function handleDeviceChange(e, index) {
getVideos
();
}
onMounted
(()
=>
{
getVideos
();
setTimeout
(()
=>
{
getVideos
();
},
100
)
aiAlgorithm
.
search
.
value
.
algorithmStatus
=
0
;
aiAlgorithm
.
getList
();
});
...
...
src/views/videoControl/pointControl/hooks/index.js
View file @
2bc52631
import
{
onMounted
,
ref
,
watch
}
from
"
vue
"
;
import
request
from
"
@/utils/request
"
;
import
{
ElMessageBox
}
from
"
element-plus
"
;
import
{
ElMessageBox
,
ElMessage
}
from
"
element-plus
"
;
function
useIndex
(
apis
,
callback
,
listReady
,
immList
=
true
)
{
const
visible
=
ref
(
false
);
const
search
=
ref
({});
...
...
@@ -42,6 +43,7 @@ function useIndex(apis, callback, listReady, immList = true) {
method
:
"
delete
"
,
}).
then
((
res
)
=>
{
if
(
immclose
)
{
ElMessage
.
success
(
"
您已删除成功!
"
);
visible
.
value
=
false
;
getList
();
}
...
...
@@ -96,6 +98,7 @@ function useIndex(apis, callback, listReady, immList = true) {
data
:
form
.
value
,
}).
then
((
res
)
=>
{
if
(
immclose
)
{
ElMessage
.
success
(
"
您已修改成功!
"
);
visible
.
value
=
false
;
getList
();
}
...
...
@@ -108,6 +111,7 @@ function useIndex(apis, callback, listReady, immList = true) {
data
:
form
.
value
,
}).
then
((
res
)
=>
{
if
(
immclose
)
{
ElMessage
.
success
(
"
您已新增成功!
"
);
visible
.
value
=
false
;
getList
();
}
...
...
src/views/videoControl/pointControl/index.vue
View file @
2bc52631
...
...
@@ -129,6 +129,11 @@
>
</
template
>
</el-table-column>
<el-table-column
label=
"设备拉流状态"
align=
"center"
prop=
"deviceFlowStatus"
>
<
template
#default
="
scope
"
>
<el-tag
:type=
"scope.row.deviceFlowStatus=='0'?'success':'danger'"
effect=
"dark"
>
{{
scope
.
row
.
deviceFlowStatus
==
'
0
'
?
'
正常
'
:
'
失败
'
}}
</el-tag>
</
template
>
</el-table-column>
<el-table-column
label=
"运行状态"
align=
"center"
prop=
"postSort"
>
<
template
#default
="
scope
"
>
<!--
<el-tag
--
>
...
...
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