xzzn/emsfront
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into single-develop

Browse Source
This commit is contained in:
白菜
2025-12-05 09:49:54 +08:00
parent 9cfce671a6 7f3d02b8fb
commit b4c49c3e58
3 changed files with 240 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/api/ems/site.js
View File

@ -1,6 +1,7 @@
import request from '@/utils/request' import request from '@/utils/request'
// 站点列表 // 站点列表
export function getSiteInfoList({siteName,startTime, endTime,pageSize,pageNum}) { export function getSiteInfoList({siteName, startTime, endTime, pageSize, pageNum}) {
return request({ return request({
url: `/ems/siteConfig/getSiteInfoList?siteName=${siteName}&startTime=${startTime}&endTime=${endTime}&pageSize=${pageSize}&pageNum=${pageNum}`, url: `/ems/siteConfig/getSiteInfoList?siteName=${siteName}&startTime=${startTime}&endTime=${endTime}&pageSize=${pageSize}&pageNum=${pageNum}`,
method: 'get' method: 'get'
@ -8,7 +9,7 @@ export function getSiteInfoList({siteName,startTime, endTime,pageSize,pageNum})
} }
// 设备列表 // 设备列表
export function getDeviceInfoList({siteId,pageSize,pageNum}) { export function getDeviceInfoList({siteId, pageSize, pageNum}) {
return request({ return request({
url: `/ems/siteConfig/getDeviceInfoList?siteId=${siteId}&pageSize=${pageSize}&pageNum=${pageNum}`, url: `/ems/siteConfig/getDeviceInfoList?siteId=${siteId}&pageSize=${pageSize}&pageNum=${pageNum}`,
method: 'get' method: 'get'
@ -39,6 +40,7 @@ export function addDevice(data) {
data data
}) })
} }
// 编辑设备 // 编辑设备
export function updateDevice(data) { export function updateDevice(data) {
return request({ return request({
@ -47,20 +49,23 @@ export function updateDevice(data) {
data data
}) })
} }
// 删除设备 // 删除设备
export function deleteService(id) { export function deleteService(id) {
return request({ return request({
url: `/ems/siteConfig/deleteService/`+id, url: `/ems/siteConfig/deleteService/` + id,
method: 'delete', method: 'delete',
}) })
} }
// 获取上级设备id列表 // 获取上级设备id列表
export function getParentDeviceId({siteId,deviceCategory}) { export function getParentDeviceId({siteId, deviceCategory}) {
return request({ return request({
url: `/ems/siteConfig/getParentDeviceId?siteId=${siteId}&deviceCategory=${deviceCategory}`, url: `/ems/siteConfig/getParentDeviceId?siteId=${siteId}&deviceCategory=${deviceCategory}`,
method: 'get', method: 'get',
}) })
} }
//获取所有设备 //获取所有设备
export function getDeviceList(siteId) { export function getDeviceList(siteId) {
return request({ return request({
@ -70,10 +75,11 @@ export function getDeviceList(siteId) {
} }
//获取设备点位table //获取设备点位table
export function getDevicePointList({siteId,deviceId,deviceCategory,parentId,pageNum,pageSize,dataPointName='',sortMethod,sortData,dataPoint,lower,upper,ipAddress,ipPort}) { export function getDevicePointList(data) {
return request({ return request({
url: `/ems/siteConfig/getDevicePointList?siteId=${siteId}&deviceId=${deviceId}&pageNum=${pageNum}&pageSize=${pageSize}&deviceCategory=${deviceCategory}&dataPointName=${dataPointName}&parentId=${parentId}&dataPoint=${dataPoint}&lower=${lower}&upper=${upper}&pageNum=${pageNum}&sortMethod=${sortMethod}&sortData=${sortData}&ipAddress=${ipAddress}&ipPort=${ipPort}`, url: `/ems/siteConfig/getDevicePointList`,
method: 'get', method: 'get',
params: data
}) })
} }
@ -122,7 +128,7 @@ export function getProtectPlan(id) {
//设备保护详情列表 //设备保护详情列表
//http://localhost:8089/ems/protectPlan/list?pageSize=10&pageNum=1&faultName=总压&siteId=021_DDS_01 //http://localhost:8089/ems/protectPlan/list?pageSize=10&pageNum=1&faultName=总压&siteId=021_DDS_01
export function protectPlanList({siteId, faultName,pageSize,pageNum}) { export function protectPlanList({siteId, faultName, pageSize, pageNum}) {
return request({ return request({
url: `/ems/protectPlan/list?siteId=${siteId}&faultName=${faultName}&pageSize=${pageSize}&pageNum=${pageNum}`, url: `/ems/protectPlan/list?siteId=${siteId}&faultName=${faultName}&pageSize=${pageSize}&pageNum=${pageNum}`,
method: 'get', method: 'get',
@ -137,6 +143,7 @@ export function exportPointList(data) {
data data
}) })
} }
// 点位导入 // 点位导入
export function importPointList(data) { export function importPointList(data) {
return request({ return request({
@ -147,20 +154,21 @@ export function importPointList(data) {
} }
//mqtt //mqtt
export function getMqttList({pageSize,pageNum,mqttTopic,topicName,siteId}) { export function getMqttList({pageSize, pageNum, mqttTopic, topicName, siteId}) {
return request({ return request({
url: `/ems/mqttConfig/list?pageSize=${pageSize}&pageNum=${pageNum}&mqttTopic=${mqttTopic}&topicName=${topicName}&siteId=${siteId}`, url: `/ems/mqttConfig/list?pageSize=${pageSize}&pageNum=${pageNum}&mqttTopic=${mqttTopic}&topicName=${topicName}&siteId=${siteId}`,
method: 'get', method: 'get',
}) })
} }
export function getMqttDetail(id) { export function getMqttDetail(id) {
return request({ return request({
url: `/ems/mqttConfig/${id}`, url: `/ems/mqttConfig/${id}`,
method: 'get', method: 'get',
}) })
} }
export function addMqtt(data) { export function addMqtt(data) {
return request({ return request({
url: `/ems/mqttConfig`, url: `/ems/mqttConfig`,
@ -168,6 +176,7 @@ export function addMqtt(data) {
data data
}) })
} }
export function editMqtt(data) { export function editMqtt(data) {
return request({ return request({
url: `/ems/mqttConfig`, url: `/ems/mqttConfig`,
@ -175,6 +184,7 @@ export function editMqtt(data) {
data data
}) })
} }
export function deleteMqtt(id) { export function deleteMqtt(id) {
return request({ return request({
url: `/ems/mqttConfig/${id}`, url: `/ems/mqttConfig/${id}`,

8
src/views/ems/dzjk/sbjk/dtdc/Table.vue
View File

@ -6,8 +6,8 @@
stripe stripe
style="width: 100%; margin-top: 25px" style="width: 100%; margin-top: 25px"
> >
<el-table-column prop="deviceId" label="单体编号"> </el-table-column> <el-table-column prop="deviceId" label="单体编号"></el-table-column>
<el-table-column prop="clusterDeviceId" label="簇号"> </el-table-column> <el-table-column prop="clusterDeviceId" label="簇号"></el-table-column>
<el-table-column prop="voltage" label="电压 (V)"> <el-table-column prop="voltage" label="电压 (V)">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -52,7 +52,7 @@
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column label="操作" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="$emit('pointDetail',scope.row,'point')" type="text" size="small"> <el-button @click="$emit('pointDetail',scope.row,'point')" type="text" size="small">
详细 详细
@ -118,7 +118,7 @@ export default {
methods: { methods: {
//查看表格行图表 //查看表格行图表
chartDetail(row, dataType = "") { chartDetail(row, dataType = "") {
this.$emit("chart", { ...row, dataType }); this.$emit("chart", {...row, dataType});
}, },
}, },
}; };

101
src/views/ems/site/sblb/PointTable.vue
View File

@ -30,14 +30,14 @@
style="width: 150px" style="width: 150px"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="modbus ip">--> <!-- <el-form-item label="modbus ip">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="form.ipAddress"--> <!-- v-model="form.ipAddress"-->
<!-- clearable--> <!-- clearable-->
<!-- placeholder="请输入ip"--> <!-- placeholder="请输入ip"-->
<!-- style="width: 150px"--> <!-- style="width: 150px"-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<br> <br>
<el-form-item label="最小值"> <el-form-item label="最小值">
<el-input <el-input
@ -55,14 +55,14 @@
style="width: 150px" style="width: 150px"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="modbus 端口">--> <!-- <el-form-item label="modbus 端口">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="form.ipPort"--> <!-- v-model="form.ipPort"-->
<!-- clearable--> <!-- clearable-->
<!-- placeholder="请输入端口"--> <!-- placeholder="请输入端口"-->
<!-- style="width: 150px"--> <!-- style="width: 150px"-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item style="margin-left: 20px"> <el-form-item style="margin-left: 20px">
<el-button type="primary" @click="search">搜索</el-button> <el-button type="primary" @click="search">搜索</el-button>
</el-form-item> </el-form-item>
@ -77,18 +77,18 @@
:default-sort="defaultSort" :default-sort="defaultSort"
@sort-change="handleSortChange" @sort-change="handleSortChange"
> >
<el-table-column label="数据点位" prop="dataPoint"> </el-table-column> <el-table-column label="数据点位" prop="dataPoint"></el-table-column>
<el-table-column <el-table-column
label="数据点位名称" label="数据点位名称"
prop="pointName" prop="pointName"
></el-table-column> ></el-table-column>
<!-- <el-table-column label="modbus地址">--> <!-- <el-table-column label="modbus地址">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <span>{{--> <!-- <span>{{-->
<!-- `${scope.row.ipAddress || ""} ${scope.row.ipPort || ""}`--> <!-- `${scope.row.ipAddress || ""} ${scope.row.ipPort || ""}`-->
<!-- }}</span>--> <!-- }}</span>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="寄存器地址" prop="寄存器地址"></el-table-column> <el-table-column label="寄存器地址" prop="寄存器地址"></el-table-column>
<el-table-column <el-table-column
label="最新值" label="最新值"
@ -127,15 +127,15 @@
> >
</el-pagination> </el-pagination>
</el-dialog> </el-dialog>
<point-chart ref="pointChart" :site-id="siteId" /> <point-chart ref="pointChart" :site-id="siteId"/>
</div> </div>
</template> </template>
<script> <script>
import { getDevicePointList } from "@/api/ems/site"; import {getDevicePointList} from "@/api/ems/site";
import pointChart from "@/views/ems/dzjk/sbjk/PointChart.vue"; import pointChart from "@/views/ems/dzjk/sbjk/PointChart.vue";
export default { export default {
components: { pointChart }, components: {pointChart},
watch: { watch: {
show(val) { show(val) {
if (!val) { if (!val) {
@ -169,10 +169,10 @@ export default {
data() { data() {
return { return {
// 默认排序 // 默认排序
defaultSort: { prop: "updateTime", order: "descending" }, defaultSort: {prop: "updateTime", order: "descending"},
show: false, show: false,
loading: false, loading: false,
dataType:'',//展示的数据类型 point点位/alarmPoint报警点位 dataType: '',//展示的数据类型 point点位/alarmPoint报警点位
form: { form: {
sortData: "updateTime", //最新值升序不传或者asc、降序desc） sortData: "updateTime", //最新值升序不传或者asc、降序desc）
sortMethod: "desc", //升序不传或者asc、降序desc） sortMethod: "desc", //升序不传或者asc、降序desc）
@ -194,9 +194,9 @@ export default {
}; };
}, },
methods: { methods: {
showChart({ pointName }) { showChart({pointName}) {
if (pointName) { if (pointName) {
const { deviceCategory, deviceId } = this; const {deviceCategory, deviceId} = this;
if (this.isDtdc) if (this.isDtdc)
this.$refs.pointChart.showChart({ this.$refs.pointChart.showChart({
pointName, pointName,
@ -235,7 +235,7 @@ export default {
this.getData() this.getData()
}); });
}, },
showTable({ deviceCategory, siteId, deviceId, parentId = "" },dataType) { showTable({deviceCategory, siteId, deviceId, parentId = ""}, dataType) {
this.dataType = dataType; this.dataType = dataType;
this.deviceCategory = deviceCategory; this.deviceCategory = deviceCategory;
this.siteId = siteId; this.siteId = siteId;
@ -244,28 +244,6 @@ export default {
this.show = true; this.show = true;
this.getData() this.getData()
}, },
getAlarmPointData(param){
this.loading = true;
getDevicePointList(param)
.then((response) => {
this.tableData = response?.rows || [];
this.totalSize = response?.total || 0;
})
.finally(() => {
this.loading = false;
});
},
getPointData(param){
this.loading = true;
getDevicePointList(param)
.then((response) => {
this.tableData = response?.rows || [];
this.totalSize = response?.total || 0;
})
.finally(() => {
this.loading = false;
});
},
getData() { getData() {
const { const {
siteId, siteId,
@ -298,10 +276,19 @@ export default {
dataPoint, dataPoint,
lower, lower,
upper, upper,
ipAddress:'', // ipAddress: '',
ipPort:'', // ipPort: '',
} }
this.dataType === 'point' ? this.getPointData(params) : this.getAlarmPointData(params) params.isAlarm = this.dataType === 'point' ? 0 : 1
this.loading = true;
getDevicePointList(params)
.then((response) => {
this.tableData = response?.rows || [];
this.totalSize = response?.total || 0;
})
.finally(() => {
this.loading = false;
});
}, },
}, },
}; };