Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
web-project
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
海康威视
web-project
Commits
de0abc11
Commit
de0abc11
authored
Sep 19, 2024
by
hubaoshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决一些分页和导出bug
parent
8e60692e
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
99 additions
and
15 deletions
+99
-15
PipelineTemp.js
src/api/AIStation/PipelineTemp.js
+2
-2
TransTemp.js
src/api/AIStation/TransTemp.js
+2
-2
ExtinguisherHistoryPage.vue
...ws/AIStation/ExtinguisherPage/ExtinguisherHistoryPage.vue
+3
-3
index.vue
src/views/AIStation/ExtinguisherPage/index.vue
+15
-0
index.vue
src/views/AIStation/MoveMonitorPage/index.vue
+15
-0
PipelineTempAlarmPage.vue
...iews/AIStation/PipelineTempPage/PipelineTempAlarmPage.vue
+6
-6
PipelineTempHistoryPage.vue
...ws/AIStation/PipelineTempPage/PipelineTempHistoryPage.vue
+2
-2
index.vue
src/views/AIStation/PipelineTempPage/index.vue
+15
-0
index.vue
src/views/AIStation/RecyclePumpPage/index.vue
+12
-0
TransTempAlarmPage.vue
src/views/AIStation/TransTempPage/TransTempAlarmPage.vue
+3
-0
index.vue
src/views/AIStation/TransTempPage/index.vue
+15
-0
VoiceCommandPage.vue
src/views/AIStation/VoiceCommandPage.vue
+9
-0
No files found.
src/api/AIStation/PipelineTemp.js
View file @
de0abc11
...
@@ -21,9 +21,9 @@ export const exportPipelineTempNewData = (item) =>{
...
@@ -21,9 +21,9 @@ export const exportPipelineTempNewData = (item) =>{
}
}
export
const
exportPipelineTempHistoryData
=
(
item
)
=>
{
export
const
exportPipelineTempHistoryData
=
(
item
)
=>
{
return
httpTwo
.
get
(
`/buspipelinetemperature/historyExport?stationId=
${
item
.
stationId
}
&alarmStatus=
${
item
.
alarmStatus
}
`
,
''
,
''
,{
responseType
:
'blob'
})
return
httpTwo
.
get
(
`/buspipelinetemperature/historyExport?stationId=
${
item
.
stationId
}
&alarmStatus=
${
item
.
alarmStatus
}
&beginTime=
${
item
.
beginTime
}
&endTime=
${
item
.
endTime
}
`
,
''
,
''
,{
responseType
:
'blob'
})
}
}
export
const
exportPipelineTempAlarmData
=
(
item
)
=>
{
export
const
exportPipelineTempAlarmData
=
(
item
)
=>
{
return
httpTwo
.
get
(
`/buspipelinetemperaturealarm/export?stationId=
${
item
.
stationId
}
&alarmStatus=
${
item
.
alarmStatus
}
`
,
''
,
''
,{
responseType
:
'blob'
})
return
httpTwo
.
get
(
`/buspipelinetemperaturealarm/export?stationId=
${
item
.
stationId
}
&alarmStatus=
${
item
.
alarmStatus
}
&beginTime=
${
item
.
beginTime
}
&endTime=
${
item
.
endTime
}
&thermalAlarmType=
${
item
.
thermalAlarmType
}
`
,
''
,
''
,{
responseType
:
'blob'
})
}
}
src/api/AIStation/TransTemp.js
View file @
de0abc11
...
@@ -21,9 +21,9 @@ export const exportTransTempNewData = (item) =>{
...
@@ -21,9 +21,9 @@ export const exportTransTempNewData = (item) =>{
}
}
export
const
exportTransTempHistoryData
=
(
item
)
=>
{
export
const
exportTransTempHistoryData
=
(
item
)
=>
{
return
httpTwo
.
get
(
`/bustransfertemperature/historyExport?stationId=
${
item
.
stationId
}
&alarmStatus=
${
item
.
alarmStatus
}
`
,
''
,
''
,{
responseType
:
'blob'
})
return
httpTwo
.
get
(
`/bustransfertemperature/historyExport?stationId=
${
item
.
stationId
}
&alarmStatus=
${
item
.
alarmStatus
}
&beginTime=
${
item
.
beginTime
}
&endTime=
${
item
.
endTime
}
`
,
''
,
''
,{
responseType
:
'blob'
})
}
}
export
const
exportTransTempAlarmData
=
(
item
)
=>
{
export
const
exportTransTempAlarmData
=
(
item
)
=>
{
return
httpTwo
.
get
(
`/bustransfertemperaturealarm/export?stationId=
${
item
.
stationId
}
&alarmStatus=
${
item
.
alarmStatus
}
`
,
''
,
''
,{
responseType
:
'blob'
})
return
httpTwo
.
get
(
`/bustransfertemperaturealarm/export?stationId=
${
item
.
stationId
}
&alarmStatus=
${
item
.
alarmStatus
}
&beginTime=
${
item
.
beginTime
}
&endTime=
${
item
.
endTime
}
&alarmType=
${
item
.
alarmType
}
`
,
''
,
''
,{
responseType
:
'blob'
})
}
}
src/views/AIStation/ExtinguisherPage/ExtinguisherHistoryPage.vue
View file @
de0abc11
...
@@ -70,9 +70,9 @@ function getData() {
...
@@ -70,9 +70,9 @@ function getData() {
function
getDataByParams
()
{
function
getDataByParams
()
{
getListHistoryData
(
params
.
value
).
then
(
res
=>
{
getListHistoryData
(
params
.
value
).
then
(
res
=>
{
d
ata
.
value
=
res
.
rows
HistoryD
ata
.
value
=
res
.
rows
Page
.
total
=
res
.
total
history
Page
.
total
=
res
.
total
Page
.
rows
=
res
.
pageSize
history
Page
.
rows
=
res
.
pageSize
})
})
}
}
...
...
src/views/AIStation/ExtinguisherPage/index.vue
View file @
de0abc11
...
@@ -140,6 +140,21 @@ const handleExport = () => {
...
@@ -140,6 +140,21 @@ const handleExport = () => {
beginTime
:
queryParams
.
beginTime
,
beginTime
:
queryParams
.
beginTime
,
endTime
:
queryParams
.
endTime
,
endTime
:
queryParams
.
endTime
,
})
})
if
(
item
.
stationId
===
undefined
){
item
.
stationId
=
''
}
if
(
item
.
beginTime
==
null
){
item
.
beginTime
=
''
}
if
(
item
.
endTime
==
null
){
item
.
endTime
=
''
}
if
(
item
.
alarmStatus
===
undefined
){
item
.
alarmStatus
=
''
}
if
(
item
.
alarmType
===
undefined
){
item
.
alarmType
=
''
}
if
(
selectedBtn
.
value
===
1
)
{
if
(
selectedBtn
.
value
===
1
)
{
exportNewExtinguisherData
(
item
).
then
(
res
=>
{
exportNewExtinguisherData
(
item
).
then
(
res
=>
{
const
blob
=
new
Blob
([
res
])
const
blob
=
new
Blob
([
res
])
...
...
src/views/AIStation/MoveMonitorPage/index.vue
View file @
de0abc11
...
@@ -135,6 +135,21 @@ const handleExport = () => {
...
@@ -135,6 +135,21 @@ const handleExport = () => {
beginTime
:
queryParams
.
beginTime
,
beginTime
:
queryParams
.
beginTime
,
endTime
:
queryParams
.
endTime
,
endTime
:
queryParams
.
endTime
,
}
}
if
(
item
.
stationId
===
undefined
){
item
.
stationId
=
''
}
if
(
item
.
beginTime
==
null
){
item
.
beginTime
=
''
}
if
(
item
.
endTime
==
null
){
item
.
endTime
=
''
}
if
(
item
.
alarmStatus
===
undefined
){
item
.
alarmStatus
=
''
}
if
(
item
.
alarmType
===
undefined
){
item
.
alarmType
=
''
}
console
.
log
(
'selectedBtn.value:'
,
selectedBtn
.
value
)
console
.
log
(
'selectedBtn.value:'
,
selectedBtn
.
value
)
if
(
selectedBtn
.
value
===
1
)
{
if
(
selectedBtn
.
value
===
1
)
{
console
.
log
(
'11111'
)
console
.
log
(
'11111'
)
...
...
src/views/AIStation/PipelineTempPage/PipelineTempAlarmPage.vue
View file @
de0abc11
...
@@ -120,12 +120,12 @@ const handleSortChange = (column, prop, order) => {
...
@@ -120,12 +120,12 @@ const handleSortChange = (column, prop, order) => {
<el-table-column
prop=
"eventTime"
align=
"center"
label=
"报警时间"
sortable
/>
<el-table-column
prop=
"eventTime"
align=
"center"
label=
"报警时间"
sortable
/>
<el-table-column
prop=
"thermalAlarmType"
align=
"center"
label=
"报警类型"
>
<el-table-column
prop=
"thermalAlarmType"
align=
"center"
label=
"报警类型"
>
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
<span
v-if=
"scope.row.thermalAlarmType=== '
0
'"
>
定温报警
</span>
<span
v-if=
"scope.row.thermalAlarmType=== '
constantTemperature
'"
>
定温报警
</span>
<span
v-else-if=
"scope.row.thermalAlarmType=== '
1
'"
>
温升报警
</span>
<span
v-else-if=
"scope.row.thermalAlarmType=== '
temperatureRise
'"
>
温升报警
</span>
<span
v-else-if=
"scope.row.thermalAlarmType=== '
2
'"
>
温差报警
</span>
<span
v-else-if=
"scope.row.thermalAlarmType=== '
temperatureDifference
'"
>
温差报警
</span>
<span
v-else-if=
"scope.row.thermalAlarmType=== '
3
'"
>
温降报警
</span>
<span
v-else-if=
"scope.row.thermalAlarmType=== '
temperatureDrop
'"
>
温降报警
</span>
<span
v-else-if=
"scope.row.thermalAlarmType=== '
4
'"
>
断纤报警
</span>
<span
v-else-if=
"scope.row.thermalAlarmType=== '
fiberBreak
'"
>
断纤报警
</span>
<span
v-else-if=
"scope.row.thermalAlarmType=== '
5
'"
>
热成像温度报警
</span>
<span
v-else-if=
"scope.row.thermalAlarmType=== '
thermalImaging
'"
>
热成像温度报警
</span>
<span
v-else
>
-
</span>
<span
v-else
>
-
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
...
...
src/views/AIStation/PipelineTempPage/PipelineTempHistoryPage.vue
View file @
de0abc11
...
@@ -155,8 +155,8 @@ const handleSortChange = (data) => {
...
@@ -155,8 +155,8 @@ const handleSortChange = (data) => {
//查询数据
//查询数据
getPipListHistoryData
(
item
).
then
(
res
=>
{
getPipListHistoryData
(
item
).
then
(
res
=>
{
HistoryData
.
value
=
res
.
rows
HistoryData
.
value
=
res
.
rows
Page
.
rows
=
res
.
pageSize
history
Page
.
rows
=
res
.
pageSize
Page
.
total
=
res
.
total
history
Page
.
total
=
res
.
total
})
})
};
};
</
script
>
</
script
>
...
...
src/views/AIStation/PipelineTempPage/index.vue
View file @
de0abc11
...
@@ -159,6 +159,21 @@ const handleExport = () => {
...
@@ -159,6 +159,21 @@ const handleExport = () => {
beginTime
:
queryParams
.
beginTime
,
beginTime
:
queryParams
.
beginTime
,
endTime
:
queryParams
.
endTime
,
endTime
:
queryParams
.
endTime
,
}
}
if
(
item
.
stationId
===
undefined
){
item
.
stationId
=
''
}
if
(
item
.
beginTime
==
null
){
item
.
beginTime
=
''
}
if
(
item
.
endTime
==
null
){
item
.
endTime
=
''
}
if
(
item
.
alarmStatus
===
undefined
){
item
.
alarmStatus
=
''
}
if
(
item
.
thermalAlarmType
===
undefined
){
item
.
thermalAlarmType
=
''
}
console
.
log
(
'selectedBtn.value:'
,
selectedBtn
.
value
)
console
.
log
(
'selectedBtn.value:'
,
selectedBtn
.
value
)
if
(
selectedBtn
.
value
===
1
)
{
if
(
selectedBtn
.
value
===
1
)
{
console
.
log
(
'11111'
)
console
.
log
(
'11111'
)
...
...
src/views/AIStation/RecyclePumpPage/index.vue
View file @
de0abc11
...
@@ -117,6 +117,18 @@ const handleExport = () => {
...
@@ -117,6 +117,18 @@ const handleExport = () => {
beginTime
:
queryParams
.
beginTime
,
beginTime
:
queryParams
.
beginTime
,
endTime
:
queryParams
.
endTime
,
endTime
:
queryParams
.
endTime
,
}
}
if
(
item
.
stationId
===
undefined
){
item
.
stationId
=
''
}
if
(
item
.
beginTime
==
null
){
item
.
beginTime
=
''
}
if
(
item
.
endTime
==
null
){
item
.
endTime
=
''
}
if
(
item
.
alarmStatus
===
undefined
){
item
.
alarmStatus
=
''
}
console
.
log
(
'selectedBtn.value:'
,
selectedBtn
.
value
)
console
.
log
(
'selectedBtn.value:'
,
selectedBtn
.
value
)
if
(
selectedBtn
.
value
===
1
)
{
if
(
selectedBtn
.
value
===
1
)
{
console
.
log
(
'11111'
)
console
.
log
(
'11111'
)
...
...
src/views/AIStation/TransTempPage/TransTempAlarmPage.vue
View file @
de0abc11
...
@@ -93,6 +93,9 @@ function getDataByParams() {
...
@@ -93,6 +93,9 @@ function getDataByParams() {
if
(
item
.
endTime
==
null
){
if
(
item
.
endTime
==
null
){
item
.
endTime
=
''
item
.
endTime
=
''
}
}
if
(
item
.
alarmType
===
undefined
){
item
.
alarmType
=
''
}
getTransListAlarmData
(
item
).
then
(
res
=>
{
getTransListAlarmData
(
item
).
then
(
res
=>
{
TransTempAlarmData
.
value
=
res
.
rows
TransTempAlarmData
.
value
=
res
.
rows
Page
.
total
=
res
.
total
Page
.
total
=
res
.
total
...
...
src/views/AIStation/TransTempPage/index.vue
View file @
de0abc11
...
@@ -166,6 +166,21 @@ const handleExport = () => {
...
@@ -166,6 +166,21 @@ const handleExport = () => {
beginTime
:
queryParams
.
beginTime
,
beginTime
:
queryParams
.
beginTime
,
endTime
:
queryParams
.
endTime
,
endTime
:
queryParams
.
endTime
,
}
}
if
(
item
.
stationId
===
undefined
){
item
.
stationId
=
''
}
if
(
item
.
beginTime
==
null
){
item
.
beginTime
=
''
}
if
(
item
.
endTime
==
null
){
item
.
endTime
=
''
}
if
(
item
.
alarmStatus
===
undefined
){
item
.
alarmStatus
=
''
}
if
(
item
.
alarmType
===
undefined
){
item
.
alarmType
=
''
}
console
.
log
(
'selectedBtn.value:'
,
selectedBtn
.
value
)
console
.
log
(
'selectedBtn.value:'
,
selectedBtn
.
value
)
if
(
selectedBtn
.
value
===
1
)
{
if
(
selectedBtn
.
value
===
1
)
{
console
.
log
(
'11111'
)
console
.
log
(
'11111'
)
...
...
src/views/AIStation/VoiceCommandPage.vue
View file @
de0abc11
...
@@ -93,6 +93,15 @@ const handleExport = () => {
...
@@ -93,6 +93,15 @@ const handleExport = () => {
ipAddress
:
queryParams
.
value
.
ipAddress
,
ipAddress
:
queryParams
.
value
.
ipAddress
,
macAddress
:
queryParams
.
value
.
macAddress
,
macAddress
:
queryParams
.
value
.
macAddress
,
}
}
if
(
item
.
stationId
===
undefined
){
item
.
stationId
=
''
}
if
(
item
.
beginTime
==
null
){
item
.
beginTime
=
''
}
if
(
item
.
endTime
==
null
){
item
.
endTime
=
''
}
exportVoiceCommands
(
item
).
then
(
res
=>
{
exportVoiceCommands
(
item
).
then
(
res
=>
{
const
blob
=
new
Blob
([
res
])
const
blob
=
new
Blob
([
res
])
const
downloadElement
=
document
.
createElement
(
'a'
)
const
downloadElement
=
document
.
createElement
(
'a'
)
...
...
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