Skip to content

Y
yindong-tongbai-automation
Commit 36bbea09 authored by lei's avatar lei
Browse files
Options

银洞后台管理接口对接

parent 40bf9150
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 792 additions and 338 deletions
src/api/tyler/hoistSys.js
View file @ 36bbea09
...@@ -10,9 +10,9 @@ export function listHoistSelectData(query) { ...@@ -10,9 +10,9 @@ export function listHoistSelectData(query) {
} }
// 查询提升机历史数据列表 // 查询提升机历史数据列表
export function listHoistHisData(query) { export function queryHoistHisData(query) {
return request({ return request({
url: '/business/monitoring/data/list', url: '/business/elevator/history/query',
method: 'get', method: 'get',
params: query params: query
}) })
......
src/main.js
View file @ 36bbea09
...@@ -19,7 +19,7 @@ import './permission' // permission control ...@@ -19,7 +19,7 @@ import './permission' // permission control
import { getDicts } from "@/api/system/dict/data"; import { getDicts } from "@/api/system/dict/data";
import { getConfigKey } from "@/api/system/config"; import { getConfigKey } from "@/api/system/config";
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"; 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"; import Pagination from "@/components/Pagination";
// 自定义表格工具组件 // 自定义表格工具组件
...@@ -89,6 +89,15 @@ Vue.use(Element, { ...@@ -89,6 +89,15 @@ Vue.use(Element, {
}) })
Vue.config.productionTip = false 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({ new Vue({
el: '#app', el: '#app',
......
src/router/index.js
View file @ 36bbea09
...@@ -92,6 +92,11 @@ export const constantRoutes = [ ...@@ -92,6 +92,11 @@ export const constantRoutes = [
path: '/screen', path: '/screen',
hidden: true, hidden: true,
component: () => import('@/views/Screen/index'), component: () => import('@/views/Screen/index'),
},
{
path: '/video',
hidden: true,
component: () => import('@/views/videoPlay/index'),
} }
] ]
......
src/views/Screen/index.vue
View file @ 36bbea09
...@@ -162,7 +162,13 @@ export default { ...@@ -162,7 +162,13 @@ export default {
return; return;
}, },
openVideo() { openVideo() {
window.open(this.videoData); // window.open(this.videoData);
this.$router.push({
path: "/video",
query: {
videoUrl: this.videoData,
},
});
return; return;
}, },
}, },
......
src/views/Screen/items/tfxt.vue
View file @ 36bbea09
...@@ -570,7 +570,7 @@ export default { ...@@ -570,7 +570,7 @@ export default {
.fengji { .fengji {
position: absolute; position: absolute;
width: 195px; width: 206px;
pointer-events: auto; pointer-events: auto;
.fengji-title { .fengji-title {
......
src/views/drainage/waterPumpHis/index.vue
View file @ 36bbea09
<template> <template>
<div class="app-container"> <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-form-item label="" prop="pumpName">
<el-select v-model="queryParams.pumpName" placeholder="水泵名称" clearable> <el-select
v-model="queryParams.pumpName"
placeholder="水泵名称"
clearable
>
<el-option <el-option
v-for="dict in devList" v-for="dict in devList"
:key="dict.name" :key="dict.name"
...@@ -12,25 +23,54 @@ ...@@ -12,25 +23,54 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=""> <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-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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-item>
</el-form> </el-form>
<el-table
v-loading="loading"
<el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange"> :data="historyList"
@selection-change="handleSelectionChange"
>
<el-table-column label="水泵名称" align="center" prop="pumpName" /> <el-table-column label="水泵名称" align="center" prop="pumpName" />
<el-table-column label="水泵编号" align="center" prop="pumpId" /> <el-table-column label="水泵编号" align="center" prop="pumpId" />
<el-table-column label="电机电流" align="center" prop="motorCurrent" /> <el-table-column
<el-table-column label="电机轴承温度" align="center" prop="motorBearingTemp" /> label="水泵安装位置"
<el-table-column label="水泵轴承温度" align="center" prop="pumpBearingTemp" /> align="center"
<el-table-column label="水泵流量" align="center" prop="pumpFlow" /> prop="installationLocation"
<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="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"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.monitoringTime) }}</span> <span>{{ parseTime(scope.row.monitoringTime) }}</span>
</template> </template>
...@@ -38,21 +78,20 @@ ...@@ -38,21 +78,20 @@
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
</div> </div>
</template> </template>
<script> <script>
import {getHistory, listHistory} from "@/api/tyler/waterPumpHis"; import { getHistory, listHistory } from "@/api/tyler/waterPumpHis";
import {draDeviceName} from "@/api/tyler/common"; import { draDeviceName } from "@/api/tyler/common";
export default { export default {
name: "History", name: "History",
data() { data() {
return { return {
...@@ -82,12 +121,13 @@ ...@@ -82,12 +121,13 @@
pageSize: 10, pageSize: 10,
pumpId: null, pumpId: null,
pumpName: null, pumpName: null,
motorCurrent: null, pumpFrontTemp: null,
motorBearingTemp: null, pumpRearTemp: null,
pumpBearingTemp: null, motorFrontTemp: null,
pumpFlow: null, motorRearTemp: null,
drainagePressure: null, outletPressure: null,
monitoringTime: null inletVacuum: null,
monitoringTime: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -99,20 +139,22 @@ ...@@ -99,20 +139,22 @@
}; };
}, },
created() { created() {
draDeviceName({typeId:1}).then(res => { draDeviceName({ typeId: 1 }).then((res) => {
this.devList = res.data; this.devList = res.data;
}) });
this.getList(); this.getList();
}, },
methods: { methods: {
/** 查询水泵历史信息列表 */ /** 查询水泵历史信息列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listHistory(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listHistory(this.addDateRange(this.queryParams, this.dateRange)).then(
this.historyList = response.rows; (response) => {
this.total = response.total; this.historyList = response.rows;
this.loading = false; this.total = response.total;
}); this.loading = false;
}
);
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
...@@ -125,12 +167,13 @@ ...@@ -125,12 +167,13 @@
id: null, id: null,
pumpId: null, pumpId: null,
pumpName: null, pumpName: null,
motorCurrent: null, pumpFrontTemp: null,
motorBearingTemp: null, pumpRearTemp: null,
pumpBearingTemp: null, motorFrontTemp: null,
pumpFlow: null, motorRearTemp: null,
drainagePressure: null, outletPressure: null,
monitoringTime: null inletVacuum: null,
monitoringTime: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -141,15 +184,15 @@ ...@@ -141,15 +184,15 @@
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.dateRange = [] this.dateRange = [];
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id) this.ids = selection.map((item) => item.id);
this.single = selection.length!==1 this.single = selection.length !== 1;
this.multiple = !selection.length this.multiple = !selection.length;
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
...@@ -160,8 +203,8 @@ ...@@ -160,8 +203,8 @@
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids const id = row.id || this.ids;
getHistory(id).then(response => { getHistory(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改水泵历史信息"; this.title = "修改水泵历史信息";
...@@ -169,16 +212,16 @@ ...@@ -169,16 +212,16 @@
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
updateHistory(this.form).then(response => { updateHistory(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addHistory(this.form).then(response => { addHistory(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
...@@ -190,19 +233,27 @@ ...@@ -190,19 +233,27 @@
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除水泵历史信息编号为"' + ids + '"的数据项？').then(function() { this.$modal
return delHistory(ids); .confirm('是否确认删除水泵历史信息编号为"' + ids + '"的数据项？')
}).then(() => { .then(function () {
this.getList(); return delHistory(ids);
this.$modal.msgSuccess("删除成功"); })
}).catch(() => {}); .then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('business/history/export', { this.download(
...this.queryParams "business/history/export",
}, `history_${new Date().getTime()}.xlsx`) {
} ...this.queryParams,
} },
`history_${new Date().getTime()}.xlsx`
);
},
},
}; };
</script> </script>
src/views/drainage/waterPumpShishiData/index.vue
View file @ 36bbea09
<template> <template>
<div class="app-container"> <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-form-item label="" prop="deviceName">
<el-select v-model="queryParams.deviceName" placeholder="水泵名称" clearable> <el-select
v-model="queryParams.deviceName"
placeholder="水泵名称"
clearable
>
<el-option <el-option
v-for="dict in devList" v-for="dict in devList"
:key="dict.name" :key="dict.name"
...@@ -12,23 +23,43 @@ ...@@ -12,23 +23,43 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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-item>
</el-form> </el-form>
<el-table
v-loading="loading"
<el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange"> :data="historyList"
@selection-change="handleSelectionChange"
>
<el-table-column label="水泵名称" align="center" prop="pumpName" /> <el-table-column label="水泵名称" align="center" prop="pumpName" />
<el-table-column label="水泵编号" align="center" prop="pumpId" /> <el-table-column label="水泵编号" align="center" prop="pumpId" />
<el-table-column label="水泵安装位置" align="center" prop="installationLocation" /> <el-table-column
<el-table-column label="电机电流" align="center" prop="motorCurrent" /> label="水泵安装位置"
<el-table-column label="电机轴承温度" align="center" prop="motorBearingTemp" /> align="center"
<el-table-column label="水泵轴承温度" align="center" prop="pumpBearingTemp" /> prop="installationLocation"
<el-table-column label="水泵流量" align="center" prop="pumpFlow" /> />
<el-table-column label="排水管路压力" align="center" prop="drainagePressure" /> <el-table-column label="水泵前温" align="center" prop="pumpFrontTemp" />
<el-table-column label="监测时间" align="center" prop="monitoringTime" width="180"> <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"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.monitoringTime) }}</span> <span>{{ parseTime(scope.row.monitoringTime) }}</span>
</template> </template>
...@@ -36,21 +67,20 @@ ...@@ -36,21 +67,20 @@
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
</div> </div>
</template> </template>
<script> <script>
import {getHistory, listHistory} from "@/api/tyler/waterPumpShishiData"; import { getHistory, listHistory } from "@/api/tyler/waterPumpShishiData";
import {draDeviceName} from "@/api/tyler/common"; import { draDeviceName } from "@/api/tyler/common";
export default { export default {
name: "History", name: "History",
data() { data() {
return { return {
...@@ -79,13 +109,14 @@ ...@@ -79,13 +109,14 @@
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
pumpId: null, pumpId: null,
deviceName: null, pumpName: null,
motorCurrent: null, pumpFrontTemp: null,
motorBearingTemp: null, pumpRearTemp: null,
pumpBearingTemp: null, motorFrontTemp: null,
pumpFlow: null, motorRearTemp: null,
drainagePressure: null, outletPressure: null,
monitoringTime: null inletVacuum: null,
monitoringTime: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
...@@ -97,20 +128,22 @@ ...@@ -97,20 +128,22 @@
}; };
}, },
created() { created() {
draDeviceName({typeId:1}).then(res => { draDeviceName({ typeId: 1 }).then((res) => {
this.devList = res.data; this.devList = res.data;
}) });
this.getList(); this.getList();
}, },
methods: { methods: {
/** 查询水泵历史信息列表 */ /** 查询水泵历史信息列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listHistory(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listHistory(this.addDateRange(this.queryParams, this.dateRange)).then(
this.historyList = response.rows; (response) => {
this.total = response.total; this.historyList = response.rows;
this.loading = false; this.total = response.total;
}); this.loading = false;
}
);
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
...@@ -122,13 +155,14 @@ ...@@ -122,13 +155,14 @@
this.form = { this.form = {
id: null, id: null,
pumpId: null, pumpId: null,
deviceName: null, pumpName: null,
motorCurrent: null, pumpFrontTemp: null,
motorBearingTemp: null, pumpRearTemp: null,
pumpBearingTemp: null, motorFrontTemp: null,
pumpFlow: null, motorRearTemp: null,
drainagePressure: null, outletPressure: null,
monitoringTime: null inletVacuum: null,
monitoringTime: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -139,15 +173,15 @@ ...@@ -139,15 +173,15 @@
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.dateRange = [] this.dateRange = [];
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id) this.ids = selection.map((item) => item.id);
this.single = selection.length!==1 this.single = selection.length !== 1;
this.multiple = !selection.length this.multiple = !selection.length;
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
...@@ -158,8 +192,8 @@ ...@@ -158,8 +192,8 @@
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const id = row.id || this.ids const id = row.id || this.ids;
getHistory(id).then(response => { getHistory(id).then((response) => {
this.form = response.data; this.form = response.data;
this.open = true; this.open = true;
this.title = "修改水泵历史信息"; this.title = "修改水泵历史信息";
...@@ -167,16 +201,16 @@ ...@@ -167,16 +201,16 @@
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
updateHistory(this.form).then(response => { updateHistory(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addHistory(this.form).then(response => { addHistory(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
...@@ -188,19 +222,27 @@ ...@@ -188,19 +222,27 @@
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除水泵历史信息编号为"' + ids + '"的数据项？').then(function() { this.$modal
return delHistory(ids); .confirm('是否确认删除水泵历史信息编号为"' + ids + '"的数据项？')
}).then(() => { .then(function () {
this.getList(); return delHistory(ids);
this.$modal.msgSuccess("删除成功"); })
}).catch(() => {}); .then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('business/history/export', { this.download(
...this.queryParams "business/history/export",
}, `history_${new Date().getTime()}.xlsx`) {
} ...this.queryParams,
} },
`history_${new Date().getTime()}.xlsx`
);
},
},
}; };
</script> </script>
src/views/fanSys/fanReal/index.vue
View file @ 36bbea09
<template> <template>
<div class="app-container"> <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-form-item label="" prop="deviceName">
<el-select v-model="queryParams.deviceName" placeholder="风机名称" clearable> <el-select
v-model="queryParams.deviceName"
placeholder="风机名称"
clearable
>
<el-option <el-option
v-for="dict in deviceName" v-for="dict in deviceName"
:key="dict.value" :key="dict.value"
...@@ -13,53 +23,142 @@ ...@@ -13,53 +23,142 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label=""> <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-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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-item>
</el-form> </el-form>
<el-table
v-loading="loading"
<el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange"> :data="infoList"
<el-table-column type="selection" width="55" align="center" /> @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
<el-table-column label="监测时间" align="center" prop="time" width="160" /> label="风机名称"
<el-table-column label="电源电压预警值(V)" align="center" prop="powerSupplyVoltage" width="140" /> align="center"
<el-table-column label="电机电流预警值(A)" align="center" prop="motorCurrent" width="140" /> prop="deviceName"
<el-table-column label="运行频率预警值(HZ)" align="center" prop="operatingFrequency" width="140" /> width="120"
<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
<el-table-column label="风速预警值(m/s)" align="center" prop="windSpeed" width="120" /> label="风机编号"
<el-table-column label="风量预警值(m³/s)" align="center" prop="airVolume" width="140" /> align="center"
<el-table-column label="前轴温预警值(℃)" align="center" prop="frontAxisTemperature" width="120" /> prop="deviceId"
<el-table-column label="后轴温预警值(℃)" align="center" prop="rearAxisTemperature" width="120" /> 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
<el-table-column label="后振动预警值(mm/s)" align="center" prop="rearVibration" width="150"/> 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> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
</div> </div>
</template> </template>
<script> <script>
import { listrealFan } from "@/api/tyler/fan"; import { listrealFan } from "@/api/tyler/fan";
import { fanDeviceName } from "@/api/tyler/common"; import { fanDeviceName } from "@/api/tyler/common";
export default { export default {
name: "Info", name: "Info",
data() { data() {
return { return {
...@@ -89,41 +188,40 @@ ...@@ -89,41 +188,40 @@
pageSize: 10, pageSize: 10,
deviceName: null, deviceName: null,
deviceId: null, deviceId: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
id: [ id: [{ required: true, message: "id不能为空", trigger: "blur" }],
{ required: true, message: "id不能为空", trigger: "blur" }
],
deviceName: [ deviceName: [
{ required: true, message: "风机名称不能为空", trigger: "blur" } { required: true, message: "风机名称不能为空", trigger: "blur" },
], ],
deviceId: [ deviceId: [
{ required: true, message: "风机编号不能为空", trigger: "blur" } { required: true, message: "风机编号不能为空", trigger: "blur" },
], ],
}, },
deviceName:[], deviceName: [],
dateRange:[], dateRange: [],
}; };
}, },
created() { created() {
fanDeviceName().then(res=>{ fanDeviceName().then((res) => {
this.deviceName = res.data; this.deviceName = res.data;
}) });
this.getList(); this.getList();
}, },
methods: { methods: {
/** 查询风机基本信息列表 */ /** 查询风机基本信息列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listrealFan(this.addDateRange(this.queryParams, this.dateRange)).then(response => { listrealFan(this.addDateRange(this.queryParams, this.dateRange)).then(
this.infoList = response.rows; (response) => {
this.total = response.total; this.infoList = response.rows;
this.loading = false; this.total = response.total;
}); this.loading = false;
}
);
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
...@@ -148,7 +246,7 @@ ...@@ -148,7 +246,7 @@
rearAxisTemperature: null, rearAxisTemperature: null,
motorTemperature: null, motorTemperature: null,
frontVibration: null, frontVibration: null,
rearVibration: null rearVibration: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -159,13 +257,10 @@ ...@@ -159,13 +257,10 @@
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.dateRange = [] this.dateRange = [];
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
},
}
}; };
</script> </script>
src/views/hoistSys/hoistHis/index.vue
View file @ 36bbea09
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form
:model="queryParams"
<el-form-item label="" prop="cageSection"> ref="queryForm"
<el-select v-model="queryParams.cageSection" placeholder="提升机名称" clearable> size="small"
<el-option :inline="true"
v-for="dict in deviceName" v-show="showSearch"
:key="dict.value" label-width="68px"
:label="dict.name" >
:value="dict.name" <el-form-item label="">
/> <el-date-picker
</el-select> v-model="dateRange"
</el-form-item> style="width: 240px"
<el-form-item label=""> value-format="yyyy-MM-dd"
<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> type="daterange"
</el-form-item> range-separator="-"
<el-form-item> start-placeholder="开始日期"
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> end-placeholder="结束日期"
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> ></el-date-picker>
</el-form-item> </el-form-item>
</el-form> <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-form-item>
</el-form>
<el-table v-loading="loading" :data="dataList"> <el-table v-loading="loading" :data="dataList">
<el-table-column label="提升机名称" align="center" prop="cageSection" /> <el-table-column label="主控速度m/s" align="center" prop="mainSpeed" />
<el-table-column label="电渠电流" align="center" prop="powerChannelCurrent" /> <el-table-column label="编码器速度m/s" align="center" prop="coderSpeed" />
<el-table-column label="闸压力" align="center" prop="gatePressure" /> <el-table-column label="给定速度m/s" align="center" prop="givenSpeed" />
<el-table-column label="电极电流" align="center" prop="electrodeCurrent" /> <el-table-column
<el-table-column label="电机轴承温度" align="center" prop="motorBearingTemperature" /> label="从编码器速度m/s"
<el-table-column label="水泵轴承温度" align="center" prop="pumpBearingTemperature" /> align="center"
<el-table-column label="水泵流量" align="center" prop="pumpFlow" /> prop="slaveSpeed"
<el-table-column label="排水管路压力" align="center" prop="drainagePipePressure" /> />
<el-table-column label="监测时间" align="center" prop="monitoringTime" width="180"> <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"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.monitoringTime) }}</span> <span>{{ parseTime(scope.row.recordedAt) }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
</div> </div>
</template> </template>
<script> <script>
import { listHoistHisData, listHoistSelectData} from "@/api/tyler/hoistSys"; import { queryHoistHisData, listHoistSelectData } from "@/api/tyler/hoistSys";
export default { export default {
name: "Data", name: "Data",
data() { data() {
return { return {
...@@ -88,29 +118,25 @@ ...@@ -88,29 +118,25 @@
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
id: [ id: [{ required: true, message: "$comment不能为空", trigger: "blur" }],
{ required: true, message: "$comment不能为空", trigger: "blur" }
],
cageSection: [ cageSection: [
{ required: true, message: "罐笼所在中段不能为空", trigger: "blur" } { required: true, message: "罐笼所在中段不能为空", trigger: "blur" },
], ],
}, },
deviceName:[], deviceName: [],
dateRange:[], dateRange: [],
}; };
}, },
created() { created() {
listHoistSelectData().then(res => {
this.deviceName = res.data;
})
this.getList(); this.getList();
}, },
methods: { methods: {
/** 查询提升机历史数据列表 */ /** 查询提升机历史数据列表 */
getList() { getList() {
this.loading = true; 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.dataList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
...@@ -123,17 +149,11 @@ ...@@ -123,17 +149,11 @@
}, },
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {};
id: null, this.queryParams = {
pageNum: 1,
pageSize: 10,
cageSection: null, cageSection: null,
powerChannelCurrent: null,
gatePressure: null,
electrodeCurrent: null,
motorBearingTemperature: null,
pumpBearingTemperature: null,
pumpFlow: null,
drainagePipePressure: null,
monitoringTime: null
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -144,11 +164,10 @@ ...@@ -144,11 +164,10 @@
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.dateRange = [] this.dateRange = [];
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
}, },
}; };
</script> </script>
src/views/system/waterSysSet/index.vue
View file @ 36bbea09
This diff is collapsed.
src/views/videoPlay/index.vue 0 → 100644
View file @ 36bbea09
<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