Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yindong-tongbai-automation
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
lichunliang
yindong-tongbai-automation
Commits
3b5716d6
Commit
3b5716d6
authored
Apr 01, 2025
by
forevertyler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:bug
parent
09d39816
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
61 additions
and
21 deletions
+61
-21
index.vue
src/views/drainage/drainageDev/index.vue
+37
-6
index.vue
src/views/index.vue
+14
-9
index.vue
src/views/monitoringDevices/envMonitoringAlarm/index.vue
+3
-2
index.vue
src/views/monitoringDevices/envMonitoringDevices/index.vue
+2
-1
index.vue
src/views/monitoringDevices/envMonitoringHis/index.vue
+2
-2
index.vue
src/views/personPos/areaHis/index.vue
+1
-1
index.vue
src/views/personPos/perHis/index.vue
+2
-0
No files found.
src/views/drainage/drainageDev/index.vue
View file @
3b5716d6
...
...
@@ -117,7 +117,7 @@
<el-input
v-model=
"form.installationLocation"
placeholder=
"请输入设备安装位置"
/>
</el-form-item>
<el-form-item
label=
"设备类型"
prop=
"deviceType"
>
<el-select
v-model=
"form.deviceType"
placeholder=
"请选择设备类型
"
>
<el-select
@
change=
"deviceTypeChange"
v-model=
"form.deviceType"
placeholder=
"请选择设备类型"
:disabled=
"disabledType
"
>
<el-option
v-for=
"dict in dict.type.drainage_dev_type"
:key=
"dict.value"
...
...
@@ -127,7 +127,7 @@
</el-select>
</el-form-item>
<div
v-
if=
"form.deviceType==1
"
>
<div
v-
show=
"form.deviceType==='1'
"
>
<el-form-item
label=
"电机电流预警值"
prop=
"motorCurrentAlert"
>
<el-input
v-model=
"form.motorCurrentAlert"
placeholder=
"请输入电机电流预警值"
/>
</el-form-item>
...
...
@@ -145,7 +145,7 @@
</el-form-item>
</div>
<div
v-
if=
"form.deviceType==2
"
>
<div
v-
show=
"form.deviceType==='2'
"
>
<el-form-item
label=
"液位高度预警值"
prop=
"heghtThreshold"
>
<el-input
v-model=
"form.heghtThreshold"
placeholder=
"请输入液位高度预警值"
/>
</el-form-item>
...
...
@@ -218,7 +218,8 @@
deviceType
:
[
{
required
:
true
,
message
:
"
设备类型不能为空
"
,
trigger
:
"
change
"
}
]
}
},
disabledType
:
false
,
};
},
created
()
{
...
...
@@ -256,6 +257,19 @@
};
this
.
resetForm
(
"
form
"
);
},
deviceTypeChange
(
val
){
// console.log(val,'val')
if
(
val
==
1
){
this
.
form
.
heghtThreshold
=
null
}
else
if
(
val
==
2
){
this
.
form
.
motorCurrentAlert
=
null
this
.
form
.
motorBearingTempAlert
=
null
this
.
form
.
pumpBearingTempAlert
=
null
this
.
form
.
pumpFlowAlert
=
null
this
.
form
.
drainagePressureAlert
=
null
}
},
/** 搜索按钮操作 */
handleQuery
()
{
this
.
queryParams
.
pageNum
=
1
;
...
...
@@ -276,14 +290,20 @@
handleAdd
()
{
this
.
reset
();
this
.
open
=
true
;
this
.
disabledType
=
false
;
this
.
title
=
"
添加排水设备信息
"
;
},
/** 修改按钮操作 */
handleUpdate
(
row
)
{
this
.
reset
();
this
.
form
=
row
this
.
open
=
true
;
this
.
disabledType
=
true
;
this
.
title
=
"
修改排水设备信息
"
;
this
.
form
=
{
...
row
};
// console.log('form.deviceType:', this.form.deviceType); // 调试输出
this
.
open
=
false
;
// 关闭弹窗
this
.
$nextTick
(()
=>
{
this
.
open
=
true
;
// 重新打开弹窗,强制重新渲染
});
// const id = row.id || this.ids
// getInfo(id).then(response => {
// this.form = response.data;
...
...
@@ -291,8 +311,19 @@
// this.title = "修改排水设备信息";
// });
},
/** 提交按钮 */
submitForm
()
{
if
(
this
.
form
.
deviceType
==
1
){
this
.
form
.
heghtThreshold
=
null
}
else
if
(
this
.
form
.
deviceType
==
2
){
this
.
form
.
motorCurrentAlert
=
null
this
.
form
.
motorBearingTempAlert
=
null
this
.
form
.
pumpBearingTempAlert
=
null
this
.
form
.
pumpFlowAlert
=
null
this
.
form
.
drainagePressureAlert
=
null
}
this
.
$refs
[
"
form
"
].
validate
(
valid
=>
{
if
(
valid
)
{
if
(
this
.
form
.
id
!=
null
)
{
...
...
src/views/index.vue
View file @
3b5716d6
<
template
>
<div
class=
"app-container"
>
<div
style=
"width: 500px;
"
>
<video
width=
"500"
controls=
""
autoplay=
""
name=
"media"
>
<source
:src=
"
`$
{previewUrl}${videoData}`
" type="video/mp4">
<div
v-if=
"videoData
"
>
<video
width=
"500"
controls
autoplay
name=
"media"
>
<source
:src=
"
videoData
"
type=
"video/mp4"
>
</video>
</div>
<div
v-else
>
加载中...
</div>
<div
class=
"upv"
>
<el-upload
ref=
"upload"
...
...
@@ -75,18 +78,20 @@ export default {
name
:
null
,
videoPath
:
null
},
videoData
:
''
,
videoData
:
null
,
fileSize
:
1024
,
}
},
mounted
()
{
this
.
$nextTick
(
function
()
{
this
.
getList
()
});
created
()
{
this
.
getList
()
},
methods
:
{
getList
(){
listVideo
().
then
(
res
=>
{
this
.
videoData
=
res
.
data
this
.
videoData
=
this
.
previewUrl
+
res
.
data
;
this
.
$nextTick
(()
=>
{
this
.
$forceUpdate
();
});
})
},
//上传图片
...
...
src/views/monitoringDevices/envMonitoringAlarm/index.vue
View file @
3b5716d6
...
...
@@ -162,7 +162,7 @@
},
created
()
{
typeNameList
().
then
(
res
=>
{
console
.
log
(
res
,
'
res
'
)
//
console.log(res,'res')
this
.
typeName
=
res
.
data
})
this
.
getList
();
...
...
@@ -204,9 +204,10 @@
},
/** 重置按钮操作 */
resetQuery
()
{
this
.
dateRange
=
[];
this
.
resetForm
(
"
queryForm
"
);
this
.
handleQuery
();
this
.
dateRange
=
[];
},
// 多选框选中数据
handleSelectionChange
(
selection
)
{
...
...
src/views/monitoringDevices/envMonitoringDevices/index.vue
View file @
3b5716d6
...
...
@@ -37,6 +37,7 @@
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleUpdate(scope.row)"
>
修改预警值
</el-button>
</
template
>
...
...
@@ -66,7 +67,7 @@
</el-form-item>
<el-form-item
label=
"预警阈值"
prop=
"threshold"
>
<el-input
v-model=
"form.threshold"
placeholder=
"请输入预警阈值"
/
>
<el-input
-number
v-model=
"form.threshold"
:min=
"0"
label=
"预警阈值"
></el-input-number
>
</el-form-item>
...
...
src/views/monitoringDevices/envMonitoringHis/index.vue
View file @
3b5716d6
...
...
@@ -100,7 +100,7 @@
},
created
()
{
typeNameList
().
then
(
res
=>
{
console
.
log
(
res
,
'
res
'
)
//
console.log(res,'res')
this
.
typeName
=
res
.
data
})
this
.
getList
();
...
...
@@ -139,9 +139,9 @@
},
/** 重置按钮操作 */
resetQuery
()
{
this
.
dateRange
=
[];
this
.
resetForm
(
"
queryForm
"
);
this
.
handleQuery
();
this
.
dateRange
=
[];
},
// 多选框选中数据
handleSelectionChange
(
selection
)
{
...
...
src/views/personPos/areaHis/index.vue
View file @
3b5716d6
...
...
@@ -64,7 +64,7 @@
<span>
{{
parseTime
(
scope
.
row
.
leaveTime
)
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"停留时间"
align=
"center"
prop=
"residenceTime"
/>
<el-table-column
label=
"停留时间
(h)
"
align=
"center"
prop=
"residenceTime"
/>
</el-table>
...
...
src/views/personPos/perHis/index.vue
View file @
3b5716d6
...
...
@@ -212,11 +212,13 @@ export default {
},
/** 搜索按钮操作 */
handleQuery
()
{
this
.
queryParams
.
pageNum
=
1
;
this
.
getList
();
},
/** 重置按钮操作 */
resetQuery
()
{
this
.
dateRange
=
[];
this
.
resetForm
(
"
queryForm
"
);
this
.
handleQuery
();
},
...
...
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