Commit 36bbea09 authored by lei's avatar lei

银洞后台管理接口对接

parent 40bf9150
......@@ -10,9 +10,9 @@ export function listHoistSelectData(query) {
}
// 查询提升机历史数据列表
export function listHoistHisData(query) {
export function queryHoistHisData(query) {
return request({
url: '/business/monitoring/data/list',
url: '/business/elevator/history/query',
method: 'get',
params: query
})
......
......@@ -19,7 +19,7 @@ import './permission' // permission control
import { getDicts } from "@/api/system/dict/data";
import { getConfigKey } from "@/api/system/config";
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
import { hasRole,findLabelByValue } from "@/utils/tyler";
import { hasRole, findLabelByValue } from "@/utils/tyler";
// 分页组件
import Pagination from "@/components/Pagination";
// 自定义表格工具组件
......@@ -89,6 +89,15 @@ Vue.use(Element, {
})
Vue.config.productionTip = false
Vue.directive('removeAriaHidden', {
bind(el, binding) {
const ariaEls = el.querySelectorAll('.el-radio__original')
ariaEls.forEach((item) => {
item.removeAttribute('aria-hidden')
})
}
})
new Vue({
el: '#app',
......
......@@ -92,6 +92,11 @@ export const constantRoutes = [
path: '/screen',
hidden: true,
component: () => import('@/views/Screen/index'),
},
{
path: '/video',
hidden: true,
component: () => import('@/views/videoPlay/index'),
}
]
......
......@@ -162,7 +162,13 @@ export default {
return;
},
openVideo() {
window.open(this.videoData);
// window.open(this.videoData);
this.$router.push({
path: "/video",
query: {
videoUrl: this.videoData,
},
});
return;
},
},
......
......@@ -570,7 +570,7 @@ export default {
.fengji {
position: absolute;
width: 195px;
width: 206px;
pointer-events: auto;
.fengji-title {
......
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="" prop="pumpName">
<el-select v-model="queryParams.pumpName" placeholder="水泵名称" clearable>
<el-select
v-model="queryParams.pumpName"
placeholder="水泵名称"
clearable
>
<el-option
v-for="dict in devList"
:key="dict.name"
......@@ -12,25 +23,54 @@
</el-select>
</el-form-item>
<el-form-item label="">
<el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange">
<el-table
v-loading="loading"
:data="historyList"
@selection-change="handleSelectionChange"
>
<el-table-column label="水泵名称" align="center" prop="pumpName" />
<el-table-column label="水泵编号" align="center" prop="pumpId" />
<el-table-column label="电机电流" align="center" prop="motorCurrent" />
<el-table-column label="电机轴承温度" align="center" prop="motorBearingTemp" />
<el-table-column label="水泵轴承温度" align="center" prop="pumpBearingTemp" />
<el-table-column label="水泵流量" align="center" prop="pumpFlow" />
<el-table-column label="排水管路压力" align="center" prop="drainagePressure" />
<el-table-column label="监测时间" align="center" prop="monitoringTime" width="180">
<el-table-column
label="水泵安装位置"
align="center"
prop="installationLocation"
/>
<el-table-column label="水泵前温" align="center" prop="pumpFrontTemp" />
<el-table-column label="水泵后温" align="center" prop="pumpRearTemp" />
<el-table-column label="电机前温" align="center" prop="motorFrontTemp" />
<el-table-column label="电机后温" align="center" prop="motorRearTemp" />
<el-table-column label="出水压力" align="center" prop="outletPressure" />
<el-table-column label="吸水负压" align="center" prop="inletVacuum" />
<el-table-column
label="监测时间"
align="center"
prop="monitoringTime"
width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.monitoringTime) }}</span>
</template>
......@@ -38,21 +78,20 @@
</el-table>
<pagination
v-show="total>0"
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
<script>
import {getHistory, listHistory} from "@/api/tyler/waterPumpHis";
import {draDeviceName} from "@/api/tyler/common";
import { getHistory, listHistory } from "@/api/tyler/waterPumpHis";
import { draDeviceName } from "@/api/tyler/common";
export default {
export default {
name: "History",
data() {
return {
......@@ -82,12 +121,13 @@
pageSize: 10,
pumpId: null,
pumpName: null,
motorCurrent: null,
motorBearingTemp: null,
pumpBearingTemp: null,
pumpFlow: null,
drainagePressure: null,
monitoringTime: null
pumpFrontTemp: null,
pumpRearTemp: null,
motorFrontTemp: null,
motorRearTemp: null,
outletPressure: null,
inletVacuum: null,
monitoringTime: null,
},
// 表单参数
form: {},
......@@ -99,20 +139,22 @@
};
},
created() {
draDeviceName({typeId:1}).then(res => {
draDeviceName({ typeId: 1 }).then((res) => {
this.devList = res.data;
})
});
this.getList();
},
methods: {
/** 查询水泵历史信息列表 */
getList() {
this.loading = true;
listHistory(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listHistory(this.addDateRange(this.queryParams, this.dateRange)).then(
(response) => {
this.historyList = response.rows;
this.total = response.total;
this.loading = false;
});
}
);
},
// 取消按钮
cancel() {
......@@ -125,12 +167,13 @@
id: null,
pumpId: null,
pumpName: null,
motorCurrent: null,
motorBearingTemp: null,
pumpBearingTemp: null,
pumpFlow: null,
drainagePressure: null,
monitoringTime: null
pumpFrontTemp: null,
pumpRearTemp: null,
motorFrontTemp: null,
motorRearTemp: null,
outletPressure: null,
inletVacuum: null,
monitoringTime: null,
};
this.resetForm("form");
},
......@@ -141,15 +184,15 @@
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = []
this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
......@@ -160,8 +203,8 @@
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getHistory(id).then(response => {
const id = row.id || this.ids;
getHistory(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改水泵历史信息";
......@@ -169,16 +212,16 @@
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
updateHistory(this.form).then(response => {
updateHistory(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addHistory(this.form).then(response => {
addHistory(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
......@@ -190,19 +233,27 @@
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除水泵历史信息编号为"' + ids + '"的数据项?').then(function() {
this.$modal
.confirm('是否确认删除水泵历史信息编号为"' + ids + '"的数据项?')
.then(function () {
return delHistory(ids);
}).then(() => {
})
.then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
})
.catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('business/history/export', {
...this.queryParams
}, `history_${new Date().getTime()}.xlsx`)
}
}
this.download(
"business/history/export",
{
...this.queryParams,
},
`history_${new Date().getTime()}.xlsx`
);
},
},
};
</script>
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="" prop="deviceName">
<el-select v-model="queryParams.deviceName" placeholder="水泵名称" clearable>
<el-select
v-model="queryParams.deviceName"
placeholder="水泵名称"
clearable
>
<el-option
v-for="dict in devList"
:key="dict.name"
......@@ -12,23 +23,43 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange">
<el-table
v-loading="loading"
:data="historyList"
@selection-change="handleSelectionChange"
>
<el-table-column label="水泵名称" align="center" prop="pumpName" />
<el-table-column label="水泵编号" align="center" prop="pumpId" />
<el-table-column label="水泵安装位置" align="center" prop="installationLocation" />
<el-table-column label="电机电流" align="center" prop="motorCurrent" />
<el-table-column label="电机轴承温度" align="center" prop="motorBearingTemp" />
<el-table-column label="水泵轴承温度" align="center" prop="pumpBearingTemp" />
<el-table-column label="水泵流量" align="center" prop="pumpFlow" />
<el-table-column label="排水管路压力" align="center" prop="drainagePressure" />
<el-table-column label="监测时间" align="center" prop="monitoringTime" width="180">
<el-table-column
label="水泵安装位置"
align="center"
prop="installationLocation"
/>
<el-table-column label="水泵前温" align="center" prop="pumpFrontTemp" />
<el-table-column label="水泵后温" align="center" prop="pumpRearTemp" />
<el-table-column label="电机前温" align="center" prop="motorFrontTemp" />
<el-table-column label="电机后温" align="center" prop="motorRearTemp" />
<el-table-column label="出水压力" align="center" prop="outletPressure" />
<el-table-column label="吸水负压" align="center" prop="inletVacuum" />
<el-table-column
label="监测时间"
align="center"
prop="monitoringTime"
width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.monitoringTime) }}</span>
</template>
......@@ -36,21 +67,20 @@
</el-table>
<pagination
v-show="total>0"
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
<script>
import {getHistory, listHistory} from "@/api/tyler/waterPumpShishiData";
import {draDeviceName} from "@/api/tyler/common";
import { getHistory, listHistory } from "@/api/tyler/waterPumpShishiData";
import { draDeviceName } from "@/api/tyler/common";
export default {
export default {
name: "History",
data() {
return {
......@@ -79,13 +109,14 @@
pageNum: 1,
pageSize: 10,
pumpId: null,
deviceName: null,
motorCurrent: null,
motorBearingTemp: null,
pumpBearingTemp: null,
pumpFlow: null,
drainagePressure: null,
monitoringTime: null
pumpName: null,
pumpFrontTemp: null,
pumpRearTemp: null,
motorFrontTemp: null,
motorRearTemp: null,
outletPressure: null,
inletVacuum: null,
monitoringTime: null,
},
// 表单参数
form: {},
......@@ -97,20 +128,22 @@
};
},
created() {
draDeviceName({typeId:1}).then(res => {
draDeviceName({ typeId: 1 }).then((res) => {
this.devList = res.data;
})
});
this.getList();
},
methods: {
/** 查询水泵历史信息列表 */
getList() {
this.loading = true;
listHistory(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listHistory(this.addDateRange(this.queryParams, this.dateRange)).then(
(response) => {
this.historyList = response.rows;
this.total = response.total;
this.loading = false;
});
}
);
},
// 取消按钮
cancel() {
......@@ -122,13 +155,14 @@
this.form = {
id: null,
pumpId: null,
deviceName: null,
motorCurrent: null,
motorBearingTemp: null,
pumpBearingTemp: null,
pumpFlow: null,
drainagePressure: null,
monitoringTime: null
pumpName: null,
pumpFrontTemp: null,
pumpRearTemp: null,
motorFrontTemp: null,
motorRearTemp: null,
outletPressure: null,
inletVacuum: null,
monitoringTime: null,
};
this.resetForm("form");
},
......@@ -139,15 +173,15 @@
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = []
this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
......@@ -158,8 +192,8 @@
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getHistory(id).then(response => {
const id = row.id || this.ids;
getHistory(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改水泵历史信息";
......@@ -167,16 +201,16 @@
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
updateHistory(this.form).then(response => {
updateHistory(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addHistory(this.form).then(response => {
addHistory(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
......@@ -188,19 +222,27 @@
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除水泵历史信息编号为"' + ids + '"的数据项?').then(function() {
this.$modal
.confirm('是否确认删除水泵历史信息编号为"' + ids + '"的数据项?')
.then(function () {
return delHistory(ids);
}).then(() => {
})
.then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
})
.catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('business/history/export', {
...this.queryParams
}, `history_${new Date().getTime()}.xlsx`)
}
}
this.download(
"business/history/export",
{
...this.queryParams,
},
`history_${new Date().getTime()}.xlsx`
);
},
},
};
</script>
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="" prop="deviceName">
<el-select v-model="queryParams.deviceName" placeholder="风机名称" clearable>
<el-select
v-model="queryParams.deviceName"
placeholder="风机名称"
clearable
>
<el-option
v-for="dict in deviceName"
:key="dict.value"
......@@ -13,53 +23,142 @@
</el-select>
</el-form-item>
<el-form-item label="">
<el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="风机名称" align="center" prop="deviceName" width="120"/>
<el-table-column label="风机编号" align="center" prop="deviceId" width="120"/>
<el-table-column label="监测时间" align="center" prop="time" width="160" />
<el-table-column label="电源电压预警值(V)" align="center" prop="powerSupplyVoltage" width="140" />
<el-table-column label="电机电流预警值(A)" align="center" prop="motorCurrent" width="140" />
<el-table-column label="运行频率预警值(HZ)" align="center" prop="operatingFrequency" width="140" />
<el-table-column label="设定频率预警值(HZ)" align="center" prop="setFrequency" width="140" />
<el-table-column label="风压预警值(Kpa)" align="center" prop="windPressure" width="120" />
<el-table-column label="风速预警值(m/s)" align="center" prop="windSpeed" width="120" />
<el-table-column label="风量预警值(m³/s)" align="center" prop="airVolume" width="140" />
<el-table-column label="前轴温预警值(℃)" align="center" prop="frontAxisTemperature" width="120" />
<el-table-column label="后轴温预警值(℃)" align="center" prop="rearAxisTemperature" width="120" />
<el-table-column label="电机温度预警值(℃)" align="center" prop="motorTemperature" width="140" />
<el-table-column label="前振动预警值(mm/s)" align="center" prop="frontVibration" width="150" />
<el-table-column label="后振动预警值(mm/s)" align="center" prop="rearVibration" width="150"/>
<el-table
v-loading="loading"
:data="infoList"
@selection-change="handleSelectionChange"
>
<el-table-column
label="风机名称"
align="center"
prop="deviceName"
width="120"
/>
<el-table-column
label="风机编号"
align="center"
prop="deviceId"
width="120"
/>
<el-table-column
label="监测时间"
align="center"
prop="time"
width="160"
/>
<el-table-column
label="电源电压预警值(V)"
align="center"
prop="powerSupplyVoltage"
width="140"
/>
<el-table-column
label="电机电流预警值(A)"
align="center"
prop="motorCurrent"
width="140"
/>
<el-table-column
label="运行频率预警值(HZ)"
align="center"
prop="operatingFrequency"
width="140"
/>
<el-table-column
label="设定频率预警值(HZ)"
align="center"
prop="setFrequency"
width="140"
/>
<el-table-column
label="风压预警值(Kpa)"
align="center"
prop="windPressure"
width="120"
/>
<el-table-column
label="风速预警值(m/s)"
align="center"
prop="windSpeed"
width="120"
/>
<el-table-column
label="风量预警值(m³/s)"
align="center"
prop="airVolume"
width="140"
/>
<el-table-column
label="前轴温预警值(℃)"
align="center"
prop="frontAxisTemperature"
width="120"
/>
<el-table-column
label="后轴温预警值(℃)"
align="center"
prop="rearAxisTemperature"
width="120"
/>
<el-table-column
label="电机温度预警值(℃)"
align="center"
prop="motorTemperature"
width="140"
/>
<el-table-column
label="前振动预警值(mm/s)"
align="center"
prop="frontVibration"
width="150"
/>
<el-table-column
label="后振动预警值(mm/s)"
align="center"
prop="rearVibration"
width="150"
/>
</el-table>
<pagination
v-show="total>0"
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
<script>
import { listrealFan } from "@/api/tyler/fan";
import { fanDeviceName } from "@/api/tyler/common";
import { listrealFan } from "@/api/tyler/fan";
import { fanDeviceName } from "@/api/tyler/common";
export default {
export default {
name: "Info",
data() {
return {
......@@ -89,41 +188,40 @@
pageSize: 10,
deviceName: null,
deviceId: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "id不能为空", trigger: "blur" }
],
id: [{ required: true, message: "id不能为空", trigger: "blur" }],
deviceName: [
{ required: true, message: "风机名称不能为空", trigger: "blur" }
{ required: true, message: "风机名称不能为空", trigger: "blur" },
],
deviceId: [
{ required: true, message: "风机编号不能为空", trigger: "blur" }
{ required: true, message: "风机编号不能为空", trigger: "blur" },
],
},
deviceName:[],
dateRange:[],
deviceName: [],
dateRange: [],
};
},
created() {
fanDeviceName().then(res=>{
fanDeviceName().then((res) => {
this.deviceName = res.data;
})
});
this.getList();
},
methods: {
/** 查询风机基本信息列表 */
getList() {
this.loading = true;
listrealFan(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listrealFan(this.addDateRange(this.queryParams, this.dateRange)).then(
(response) => {
this.infoList = response.rows;
this.total = response.total;
this.loading = false;
});
}
);
},
// 取消按钮
cancel() {
......@@ -148,7 +246,7 @@
rearAxisTemperature: null,
motorTemperature: null,
frontVibration: null,
rearVibration: null
rearVibration: null,
};
this.resetForm("form");
},
......@@ -159,13 +257,10 @@
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = []
this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
}
},
};
</script>
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="" prop="cageSection">
<el-select v-model="queryParams.cageSection" placeholder="提升机名称" clearable>
<el-option
v-for="dict in deviceName"
:key="dict.value"
:label="dict.name"
:value="dict.name"
/>
</el-select>
</el-form-item>
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="">
<el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="dataList">
<el-table-column label="提升机名称" align="center" prop="cageSection" />
<el-table-column label="电渠电流" align="center" prop="powerChannelCurrent" />
<el-table-column label="闸压力" align="center" prop="gatePressure" />
<el-table-column label="电极电流" align="center" prop="electrodeCurrent" />
<el-table-column label="电机轴承温度" align="center" prop="motorBearingTemperature" />
<el-table-column label="水泵轴承温度" align="center" prop="pumpBearingTemperature" />
<el-table-column label="水泵流量" align="center" prop="pumpFlow" />
<el-table-column label="排水管路压力" align="center" prop="drainagePipePressure" />
<el-table-column label="监测时间" align="center" prop="monitoringTime" width="180">
<el-table-column label="主控速度m/s" align="center" prop="mainSpeed" />
<el-table-column label="编码器速度m/s" align="center" prop="coderSpeed" />
<el-table-column label="给定速度m/s" align="center" prop="givenSpeed" />
<el-table-column
label="从编码器速度m/s"
align="center"
prop="slaveSpeed"
/>
<el-table-column label="主罐位置m" align="center" prop="position" />
<el-table-column
label="位置偏差m"
align="center"
prop="locationDeviation"
/>
<el-table-column label="电枢电流A" align="center" prop="motorCurrent" />
<el-table-column
label="磁场电流A"
align="center"
prop="runningPressure"
/>
<el-table-column
label="运行油压MPa"
align="center"
prop="controlPosition"
/>
<el-table-column
label="记录时间"
align="center"
prop="recordedAt"
width="180"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.monitoringTime) }}</span>
<span>{{ parseTime(scope.row.recordedAt) }}</span>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
<script>
import { listHoistHisData, listHoistSelectData} from "@/api/tyler/hoistSys";
import { queryHoistHisData, listHoistSelectData } from "@/api/tyler/hoistSys";
export default {
export default {
name: "Data",
data() {
return {
......@@ -88,29 +118,25 @@
form: {},
// 表单校验
rules: {
id: [
{ required: true, message: "$comment不能为空", trigger: "blur" }
],
id: [{ required: true, message: "$comment不能为空", trigger: "blur" }],
cageSection: [
{ required: true, message: "罐笼所在中段不能为空", trigger: "blur" }
{ required: true, message: "罐笼所在中段不能为空", trigger: "blur" },
],
},
deviceName:[],
dateRange:[],
deviceName: [],
dateRange: [],
};
},
created() {
listHoistSelectData().then(res => {
this.deviceName = res.data;
})
this.getList();
},
methods: {
/** 查询提升机历史数据列表 */
getList() {
this.loading = true;
listHoistHisData(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
queryHoistHisData(
this.addDateRange(this.queryParams, this.dateRange)
).then((response) => {
this.dataList = response.rows;
this.total = response.total;
this.loading = false;
......@@ -123,17 +149,11 @@
},
// 表单重置
reset() {
this.form = {
id: null,
this.form = {};
this.queryParams = {
pageNum: 1,
pageSize: 10,
cageSection: null,
powerChannelCurrent: null,
gatePressure: null,
electrodeCurrent: null,
motorBearingTemperature: null,
pumpBearingTemperature: null,
pumpFlow: null,
drainagePipePressure: null,
monitoringTime: null
};
this.resetForm("form");
},
......@@ -144,11 +164,10 @@
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = []
this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
},
};
</script>
<template>
<div class="automation-control">
<el-form :model="formData" :rules="rules" ref="formRef" inline>
<!-- 自动化控制排水系统开关 -->
<el-card>
<div class="control-header">
......@@ -18,93 +19,156 @@
<el-card>
<div class="section">
<h3>设置峰谷值时间段</h3>
<el-time-picker
is-range
v-model="timeRange"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="HH:mm:ss"
value-format="HH:mm:ss"
@change="handleTimeRangeChange"
></el-time-picker>
<!-- <el-table :data="timeperiodList" size="mini">
<el-table-column
label="时间段(24小时)"
prop="timePeriod"
width="120"
align="center"
></el-table-column>
<el-table-column label="选择峰谷平期" width="300" align="center">
<template slot-scope="scope">
<el-radio-group v-model="scope.row.value" size="mini">
<el-radio label="0">峰时段</el-radio>
<el-radio label="1">谷时段</el-radio>
<el-radio label="2">平时段</el-radio>
</el-radio-group>
</template>
</el-table-column>
</el-table> -->
<el-row :gutter="20">
<el-col
:span="8"
v-for="(group, index) in groupedTimeperiodList"
:key="index"
>
<el-table :data="group" size="mini">
<el-table-column label="时间段" width="120" align="center">
<template slot-scope="scope">
{{ scope.row.timePeriod }}
</template>
</el-table-column>
<el-table-column
label="选择峰谷平期"
width="400"
align="center"
>
<template slot-scope="scope">
<el-radio-group
v-model="scope.row.value"
size="mini"
v-removeAriaHidden
>
<el-radio label="0">峰时段</el-radio>
<el-radio label="1">谷时段</el-radio>
<el-radio label="2">平时段</el-radio>
</el-radio-group>
</template>
</el-table-column>
</el-table>
</el-col>
</el-row>
</div>
<el-divider></el-divider>
<!-- 液体高度设置 -->
<div class="section">
<h3>
设置液体高度
<el-link type="primary" :underline="false" @click="setDis"
>设置说明</el-link
>
</h3>
<!-- 每个水仓的设置 -->
<div
v-for="(sump, index) in formData.draPeakSumpVos"
:key="sump.sumpId"
>
<div class="sump-item">
<div class="sump-header">
<span>{{ sump.sumpName }}液位高度(m):</span>
</div>
<div class="threshold-inputs">
<div class="threshold-item">
<span>A点值</span>
<h3 style="margin-bottom: 20px">设置液体高度</h3>
<el-row>
<el-col :span="3" class="flex-center" style="height: 40px">
七中水池液位高度(m):
</el-col>
<el-col :span="18">
<el-form-item label="上限值" prop="waterLevel">
<el-input
v-model="sump.heghtThresholdA"
placeholder="请输入A点值"
size="small"
v-model="formData.waterLevel"
placeholder="请输入水位高度"
></el-input>
</div>
<div class="threshold-item">
<span>B点值</span>
</el-form-item>
<el-form-item label="平点值" prop="waterLevel">
<el-input
v-model="sump.heghtThresholdB"
placeholder="请输入B点值"
size="small"
v-model="formData.waterLevel"
placeholder="请输入水位高度"
></el-input>
</div>
<div class="threshold-item">
<span>C点值</span>
</el-form-item>
<el-form-item label="谷点值" prop="waterLevel">
<el-input
v-model="sump.heghtThresholdC"
placeholder="请输入C点值"
size="small"
v-model="formData.waterLevel"
placeholder="请输入水位高度"
></el-input>
</div>
<div class="threshold-item">
<span>D点值</span>
</el-form-item>
<el-form-item label="下限值" prop="waterLevel">
<el-input
v-model="sump.heghtThresholdD"
placeholder="请输入D点值"
size="small"
v-model="formData.waterLevel"
placeholder="请输入水位高度"
></el-input>
</div>
</div>
<div class="pump-selection">
<span>对应控制水泵:</span>
<div class="pump-checkboxes">
<el-checkbox
v-for="pump in sump.draPeakPumpVos"
:key="pump.pumpId"
v-model="pump.pumpStatus"
:true-label="1"
:false-label="0"
size="small"
>
{{ pump.pumpName }}
</el-checkbox>
</div>
</div>
</div>
<el-divider
v-if="index < formData.draPeakSumpVos.length - 1"
></el-divider>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="flex-center" style="height: 40px"
>二中水仓液位高度(m):
</el-col>
<el-col :span="18">
<el-form-item label="上限值" prop="waterLevel">
<el-input
v-model="formData.waterLevel"
placeholder="请输入水位高度"
></el-input>
</el-form-item>
<el-form-item label="平点值" prop="waterLevel">
<el-input
v-model="formData.waterLevel"
placeholder="请输入水位高度"
></el-input>
</el-form-item>
<el-form-item label="谷点值" prop="waterLevel">
<el-input
v-model="formData.waterLevel"
placeholder="请输入水位高度"
></el-input>
</el-form-item>
<el-form-item label="下限值" prop="waterLevel">
<el-input
v-model="formData.waterLevel"
placeholder="请输入水位高度"
></el-input>
</el-form-item>
</el-col>
</el-row>
<h3 style="margin-bottom: 20px">设置液位下降速率</h3>
<el-row>
<el-col :span="3" class="flex-center" style="height: 40px">
设置水仓水位采集频率:
</el-col>
<el-col :span="18" class="flex-align">
<el-form-item prop="waterLevel" style="margin-bottom: 0">
<el-input v-model="formData.waterLevel"></el-input>
</el-form-item>
<span class="unit-text">分钟</span>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="flex-center" style="height: 40px">
设置二中水仓液位下降值:
</el-col>
<el-col :span="18" class="flex-align">
<el-form-item prop="waterLevel" style="margin-bottom: 0">
<el-input v-model="formData.waterLevel"></el-input>
</el-form-item>
<span class="unit-text">CM</span>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="flex-center" style="height: 40px">
设置七中水仓液位下降值:
</el-col>
<el-col :span="18" class="flex-align">
<el-form-item prop="waterLevel" style="margin-bottom: 0">
<el-input v-model="formData.waterLevel"></el-input>
</el-form-item>
<span class="unit-text">CM</span>
</el-col>
</el-row>
</div>
<!-- 按钮区域 -->
......@@ -113,6 +177,8 @@
<el-button type="primary" @click="handleSave">保存设置</el-button>
</div>
</el-card>
</el-form>
<!-- 弹窗 -->
<el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
<div class="warter-lev">
......@@ -143,8 +209,108 @@ export default {
peakEndTime: "",
draPeakSumpVos: [],
},
rules: {},
timeRange: [],
title: "液位高度设置说明:",
timeperiodList: [
{
timePeriod: "00:00-01:00",
value: "0",
},
{
timePeriod: "01:00-02:00",
value: "0",
},
{
timePeriod: "02:00-03:00",
value: "0",
},
{
timePeriod: "03:00-04:00",
value: "0",
},
{
timePeriod: "04:00-05:00",
value: "0",
},
{
timePeriod: "05:00-06:00",
value: "0",
},
{
timePeriod: "06:00-07:00",
value: "0",
},
{
timePeriod: "07:00-08:00",
value: "0",
},
{
timePeriod: "08:00-09:00",
value: "0",
},
{
timePeriod: "09:00-10:00",
value: "0",
},
{
timePeriod: "10:00-11:00",
value: "0",
},
{
timePeriod: "11:00-12:00",
value: "0",
},
{
timePeriod: "12:00-13:00",
value: "0",
},
{
timePeriod: "13:00-14:00",
value: "0",
},
{
timePeriod: "14:00-15:00",
value: "0",
},
{
timePeriod: "15:00-16:00",
value: "0",
},
{
timePeriod: "16:00-17:00",
value: "0",
},
{
timePeriod: "17:00-18:00",
value: "0",
},
{
timePeriod: "18:00-19:00",
value: "0",
},
{
timePeriod: "19:00-20:00",
value: "0",
},
{
timePeriod: "20:00-21:00",
value: "0",
},
{
timePeriod: "21:00-22:00",
value: "0",
},
{
timePeriod: "22:00-23:00",
value: "0",
},
{
timePeriod: "23:00-24:00",
value: "0",
},
],
};
},
created() {
......@@ -224,10 +390,33 @@ export default {
this.open = true;
},
},
computed: {
groupedTimeperiodList() {
return [
this.timeperiodList.slice(0, 8),
this.timeperiodList.slice(8, 16),
this.timeperiodList.slice(16, 24),
];
},
},
};
</script>
<style lang="scss" scoped>
.flex-center {
display: flex;
align-items: center;
}
.flex-align {
display: flex;
align-items: center;
}
.unit-text {
margin-left: 10px;
vertical-align: middle;
}
.pump-checkboxes {
display: flex;
flex-wrap: wrap;
......
<template>
<div class="">
<video
:src="videoUrl"
:poster="posterUrl"
controls
width="100%"
height="100%"
@loadedmetadata="handleLoadedMetadata"
></video>
</div>
</template>
<script>
export default {
name: "",
props: {},
components: {},
data() {
return {
videoUrl: null,
posterUrl: null,
};
},
computed: {},
watch: {},
created() {
//从URL获取视频地址
this.videoUrl = this.$route.query.videoUrl;
},
mounted() {},
methods: {
handleLoadedMetadata() {},
},
};
</script>
<style scoped lang="scss"></style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment