src/api/ems/site.js

@@ -1,183 +1,193 @@
 import request from '@/utils/request'
+
 // 站点列表
-export function getSiteInfoList({siteName,startTime, endTime,pageSize,pageNum}) {
-  return request({
-    url: `/ems/siteConfig/getSiteInfoList?siteName=${siteName}&startTime=${startTime}&endTime=${endTime}&pageSize=${pageSize}&pageNum=${pageNum}`,
-    method: 'get'
-  })
+export function getSiteInfoList({siteName, startTime, endTime, pageSize, pageNum}) {
+    return request({
+        url: `/ems/siteConfig/getSiteInfoList?siteName=${siteName}&startTime=${startTime}&endTime=${endTime}&pageSize=${pageSize}&pageNum=${pageNum}`,
+        method: 'get'
+    })
 }
 
 // 设备列表
-export function getDeviceInfoList({siteId,pageSize,pageNum}) {
-  return request({
-    url: `/ems/siteConfig/getDeviceInfoList?siteId=${siteId}&pageSize=${pageSize}&pageNum=${pageNum}`,
-    method: 'get'
-  })
+export function getDeviceInfoList({siteId, pageSize, pageNum}) {
+    return request({
+        url: `/ems/siteConfig/getDeviceInfoList?siteId=${siteId}&pageSize=${pageSize}&pageNum=${pageNum}`,
+        method: 'get'
+    })
 }
 
 // 设备详情
 export function getDeviceDetailInfo(id) {
-  return request({
-    url: `/ems/siteConfig/getDeviceDetailInfo?id=${id}`,
-    method: 'get'
-  })
+    return request({
+        url: `/ems/siteConfig/getDeviceDetailInfo?id=${id}`,
+        method: 'get'
+    })
 }
 
 // 获取所有设备类别
 export function getDeviceCategory() {
-  return request({
-    url: `/ems/siteConfig/getDeviceCategory`,
-    method: 'get'
-  })
+    return request({
+        url: `/ems/siteConfig/getDeviceCategory`,
+        method: 'get'
+    })
 }
 
 // 新增设备
 export function addDevice(data) {
-  return request({
-    url: `/ems/siteConfig/addDevice`,
-    method: 'post',
-    data
-  })
+    return request({
+        url: `/ems/siteConfig/addDevice`,
+        method: 'post',
+        data
+    })
 }
+
 // 编辑设备
 export function updateDevice(data) {
-  return request({
-    url: `/ems/siteConfig/updateDevice`,
-    method: 'post',
-    data
-  })
+    return request({
+        url: `/ems/siteConfig/updateDevice`,
+        method: 'post',
+        data
+    })
 }
+
 // 删除设备
 export function deleteService(id) {
-  return request({
-    url: `/ems/siteConfig/deleteService/`+id,
-    method: 'delete',
-  })
+    return request({
+        url: `/ems/siteConfig/deleteService/` + id,
+        method: 'delete',
+    })
 }
+
 // 获取上级设备id列表
-export function getParentDeviceId({siteId,deviceCategory}) {
-  return request({
-    url: `/ems/siteConfig/getParentDeviceId?siteId=${siteId}&deviceCategory=${deviceCategory}`,
-    method: 'get',
-  })
+export function getParentDeviceId({siteId, deviceCategory}) {
+    return request({
+        url: `/ems/siteConfig/getParentDeviceId?siteId=${siteId}&deviceCategory=${deviceCategory}`,
+        method: 'get',
+    })
 }
+
 //获取所有设备
 export function getDeviceList(siteId) {
-  return request({
-    url: `/ems/siteConfig/getDeviceList?siteId=${siteId}`,
-    method: 'get',
-  })
+    return request({
+        url: `/ems/siteConfig/getDeviceList?siteId=${siteId}`,
+        method: 'get',
+    })
 }
 
 //获取设备点位table
-export function getDevicePointList({siteId,deviceId,deviceCategory,parentId,pageNum,pageSize,dataPointName='',sortMethod,sortData,dataPoint,lower,upper,ipAddress,ipPort}) {
-  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}`,
-    method: 'get',
-  })
+export function getDevicePointList(data) {
+    return request({
+        url: `/ems/siteConfig/getDevicePointList`,
+        method: 'get',
+        params: data
+    })
 }
 
 
 //获取设备类型下面的所有设备列表
 export function getDeviceListBySiteAndCategory({siteId, deviceCategory}) {
-  return request({
-    url: `/ems/siteConfig/getDeviceListBySiteAndCategory?siteId=${siteId}&deviceCategory=${deviceCategory}`,
-    method: 'get',
-  })
+    return request({
+        url: `/ems/siteConfig/getDeviceListBySiteAndCategory?siteId=${siteId}&deviceCategory=${deviceCategory}`,
+        method: 'get',
+    })
 }
 
 //新增设备保护
 export function addProtectPlan(data) {
-  return request({
-    url: `/ems/protectPlan`,
-    method: 'post',
-    data
-  })
+    return request({
+        url: `/ems/protectPlan`,
+        method: 'post',
+        data
+    })
 }
 
 //修改设备保护
 export function updateProtectPlan(data) {
-  return request({
-    url: `/ems/protectPlan`,
-    method: 'put',
-    data
-  })
+    return request({
+        url: `/ems/protectPlan`,
+        method: 'put',
+        data
+    })
 }
 
 //删除设备保护
 export function deleteProtectPlan(id) {
-  return request({
-    url: `/ems/protectPlan/${id}`,
-    method: 'delete',
-  })
+    return request({
+        url: `/ems/protectPlan/${id}`,
+        method: 'delete',
+    })
 }
 
 //设备保护详情
 export function getProtectPlan(id) {
-  return request({
-    url: `/ems/protectPlan/${id}`,
-    method: 'get',
-  })
+    return request({
+        url: `/ems/protectPlan/${id}`,
+        method: 'get',
+    })
 }
 
 //设备保护详情列表
 //http://localhost:8089/ems/protectPlan/list?pageSize=10&pageNum=1&faultName=总压&siteId=021_DDS_01
-export function protectPlanList({siteId, faultName,pageSize,pageNum}) {
-  return request({
-    url: `/ems/protectPlan/list?siteId=${siteId}&faultName=${faultName}&pageSize=${pageSize}&pageNum=${pageNum}`,
-    method: 'get',
-  })
+export function protectPlanList({siteId, faultName, pageSize, pageNum}) {
+    return request({
+        url: `/ems/protectPlan/list?siteId=${siteId}&faultName=${faultName}&pageSize=${pageSize}&pageNum=${pageNum}`,
+        method: 'get',
+    })
 }
 
 // 点位导出
 export function exportPointList(data) {
-  return request({
-    url: `/ems/pointMatch/export`,
-    method: 'post',
-    data
-  })
-}
-// 点位导入
-export function importPointList(data) {
-  return request({
-    url: `/ems/pointMatch/importData`,
-    method: 'post',
-    data
-  })
+    return request({
+        url: `/ems/pointMatch/export`,
+        method: 'post',
+        data
+    })
 }
 
+// 点位导入
+export function importPointList(data) {
+    return request({
+        url: `/ems/pointMatch/importData`,
+        method: 'post',
+        data
+    })
+}
 
 
 //mqtt
-export function getMqttList({pageSize,pageNum,mqttTopic,topicName,siteId}) {
-  return request({
-    url: `/ems/mqttConfig/list?pageSize=${pageSize}&pageNum=${pageNum}&mqttTopic=${mqttTopic}&topicName=${topicName}&siteId=${siteId}`,
-    method: 'get',
-  })
+export function getMqttList({pageSize, pageNum, mqttTopic, topicName, siteId}) {
+    return request({
+        url: `/ems/mqttConfig/list?pageSize=${pageSize}&pageNum=${pageNum}&mqttTopic=${mqttTopic}&topicName=${topicName}&siteId=${siteId}`,
+        method: 'get',
+    })
 }
+
 export function getMqttDetail(id) {
-  return request({
-    url: `/ems/mqttConfig/${id}`,
-    method: 'get',
-  })
+    return request({
+        url: `/ems/mqttConfig/${id}`,
+        method: 'get',
+    })
 }
+
 export function addMqtt(data) {
-  return request({
-    url: `/ems/mqttConfig`,
-    method: 'post',
-    data
-  })
+    return request({
+        url: `/ems/mqttConfig`,
+        method: 'post',
+        data
+    })
 }
+
 export function editMqtt(data) {
-  return request({
-    url: `/ems/mqttConfig`,
-    method: 'put',
-    data
-  })
+    return request({
+        url: `/ems/mqttConfig`,
+        method: 'put',
+        data
+    })
 }
+
 export function deleteMqtt(id) {
-  return request({
-    url: `/ems/mqttConfig/${id}`,
-    method: 'delete',
-  })
+    return request({
+        url: `/ems/mqttConfig/${id}`,
+        method: 'delete',
+    })
 }

src/views/ems/dzjk/sbjk/dtdc/Table.vue

@@ -1,19 +1,19 @@
 <template>
   <div>
     <el-table
-      class="common-table"
-      :data="tableData"
-      stripe
-      style="width: 100%; margin-top: 25px"
+        class="common-table"
+        :data="tableData"
+        stripe
+        style="width: 100%; margin-top: 25px"
     >
-      <el-table-column prop="deviceId" label="单体编号"> </el-table-column>
-      <el-table-column prop="clusterDeviceId" 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="voltage" label="电压 (V)">
         <template slot-scope="scope">
           <el-button
-            @click="chartDetail(scope.row, '电压 (V)')"
-            type="text"
-            size="small"
+              @click="chartDetail(scope.row, '电压 (V)')"
+              type="text"
+              size="small"
           >
             {{ scope.row.voltage }}
           </el-button>
@@ -22,9 +22,9 @@
       <el-table-column prop="temperature" label="温度 (℃)">
         <template slot-scope="scope">
           <el-button
-            @click="chartDetail(scope.row, '温度 (℃)')"
-            type="text"
-            size="small"
+              @click="chartDetail(scope.row, '温度 (℃)')"
+              type="text"
+              size="small"
           >
             {{ scope.row.temperature }}
           </el-button>
@@ -33,9 +33,9 @@
       <el-table-column prop="soc" label="SOC (%)">
         <template slot-scope="scope">
           <el-button
-            @click="chartDetail(scope.row, 'SOC (%)')"
-            type="text"
-            size="small"
+              @click="chartDetail(scope.row, 'SOC (%)')"
+              type="text"
+              size="small"
           >
             {{ scope.row.soc }}
           </el-button>
@@ -44,15 +44,15 @@
       <el-table-column prop="soh" label="SOH (%)">
         <template slot-scope="scope">
           <el-button
-            @click="chartDetail(scope.row, 'SOH (%)')"
-            type="text"
-            size="small"
+              @click="chartDetail(scope.row, 'SOH (%)')"
+              type="text"
+              size="small"
           >
             {{ scope.row.soh }}
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="操作">
+      <el-table-column label="操作" width="160">
         <template slot-scope="scope">
           <el-button @click="$emit('pointDetail',scope.row,'point')" type="text" size="small">
             详细
@@ -118,7 +118,7 @@ export default {
   methods: {
     //查看表格行图表
     chartDetail(row, dataType = "") {
-      this.$emit("chart", { ...row, dataType });
+      this.$emit("chart", {...row, dataType});
     },
   },
 };

src/views/ems/site/sblb/PointTable.vue

@@ -2,140 +2,140 @@
 <template>
   <div>
     <el-dialog
-      v-loading="loading"
-      :close-on-click-modal="false"
-      :visible.sync="show"
-      append-to-body
-      class="ems-dialog"
-      destroy-on-close
-      lock-scroll
-      show-close
-      :title="dataType === 'point' ? '点位清单' : '报警点位'"
-      width="950px"
+        v-loading="loading"
+        :close-on-click-modal="false"
+        :visible.sync="show"
+        append-to-body
+        class="ems-dialog"
+        destroy-on-close
+        lock-scroll
+        show-close
+        :title="dataType === 'point' ? '点位清单' : '报警点位'"
+        width="950px"
     >
       <el-form :inline="true" label-width="100px">
         <el-form-item label="点位名称">
           <el-input
-            v-model="form.dataPointName"
-            clearable
-            placeholder="请输入点位名称"
-            style="width: 150px"
+              v-model="form.dataPointName"
+              clearable
+              placeholder="请输入点位名称"
+              style="width: 150px"
           ></el-input>
         </el-form-item>
         <el-form-item label="点位">
           <el-input
-            v-model="form.dataPoint"
-            clearable
-            placeholder="请输入点位"
-            style="width: 150px"
+              v-model="form.dataPoint"
+              clearable
+              placeholder="请输入点位"
+              style="width: 150px"
           ></el-input>
         </el-form-item>
-<!--        <el-form-item label="modbus ip">-->
-<!--          <el-input-->
-<!--            v-model="form.ipAddress"-->
-<!--            clearable-->
-<!--            placeholder="请输入ip"-->
-<!--            style="width: 150px"-->
-<!--          ></el-input>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="modbus ip">-->
+        <!--          <el-input-->
+        <!--            v-model="form.ipAddress"-->
+        <!--            clearable-->
+        <!--            placeholder="请输入ip"-->
+        <!--            style="width: 150px"-->
+        <!--          ></el-input>-->
+        <!--        </el-form-item>-->
         <br>
         <el-form-item label="最小值">
           <el-input
-            v-model="form.lower"
-            clearable
-            placeholder="请输入最小值"
-            style="width: 150px"
+              v-model="form.lower"
+              clearable
+              placeholder="请输入最小值"
+              style="width: 150px"
           ></el-input>
         </el-form-item>
         <el-form-item label="最大值">
           <el-input
-            v-model="form.upper"
-            clearable
-            placeholder="请输入最大值"
-            style="width: 150px"
+              v-model="form.upper"
+              clearable
+              placeholder="请输入最大值"
+              style="width: 150px"
           ></el-input>
         </el-form-item>
-<!--        <el-form-item label="modbus 端口">-->
-<!--          <el-input-->
-<!--            v-model="form.ipPort"-->
-<!--            clearable-->
-<!--            placeholder="请输入端口"-->
-<!--            style="width: 150px"-->
-<!--          ></el-input>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="modbus 端口">-->
+        <!--          <el-input-->
+        <!--            v-model="form.ipPort"-->
+        <!--            clearable-->
+        <!--            placeholder="请输入端口"-->
+        <!--            style="width: 150px"-->
+        <!--          ></el-input>-->
+        <!--        </el-form-item>-->
         <el-form-item style="margin-left: 20px">
           <el-button type="primary" @click="search">搜索</el-button>
         </el-form-item>
       </el-form>
 
       <el-table
-        :data="tableData"
-        class="common-table"
-        max-height="400px"
-        stripe
-        style="width: 100%"
-        :default-sort="defaultSort"
-        @sort-change="handleSortChange"
+          :data="tableData"
+          class="common-table"
+          max-height="400px"
+          stripe
+          style="width: 100%"
+          :default-sort="defaultSort"
+          @sort-change="handleSortChange"
       >
-        <el-table-column label="数据点位" prop="dataPoint"> </el-table-column>
+        <el-table-column label="数据点位" prop="dataPoint"></el-table-column>
         <el-table-column
-          label="数据点位名称"
-          prop="pointName"
+            label="数据点位名称"
+            prop="pointName"
         ></el-table-column>
-<!--        <el-table-column label="modbus地址">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span>{{-->
-<!--              `${scope.row.ipAddress || ""} ${scope.row.ipPort || ""}`-->
-<!--            }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+        <!--        <el-table-column label="modbus地址">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <span>{{-->
+        <!--              `${scope.row.ipAddress || ""} ${scope.row.ipPort || ""}`-->
+        <!--            }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <el-table-column label="寄存器地址" prop="寄存器地址"></el-table-column>
         <el-table-column
-          label="最新值"
-          prop="pointValue"
-          align="right"
-          sortable="custom"
+            label="最新值"
+            prop="pointValue"
+            align="right"
+            sortable="custom"
         >
           <template slot-scope="scope">
             <span class="pointer" @click="showChart(scope.row)">{{
-              scope.row.pointValue
-            }}</span>
+                scope.row.pointValue
+              }}</span>
           </template>
         </el-table-column>
         <el-table-column label="单位" prop="dataUnit"></el-table-column>
         <el-table-column
-          label="更新时间"
-          min-width="160px"
-          prop="updateTime"
-          sortable="custom"
+            label="更新时间"
+            min-width="160px"
+            prop="updateTime"
+            sortable="custom"
         >
         </el-table-column>
       </el-table>
       <el-pagination
-        v-show="tableData.length > 0"
-        :current-page="pageNum"
-        :page-size="pageSize"
-        :page-sizes="[10, 20, 30, 40]"
-        :pager-count="5"
-        :total="totalSize"
-        background
-        layout="total, sizes, prev, pager, next, jumper"
-        small
-        style="margin-top: 15px; text-align: center"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
+          v-show="tableData.length > 0"
+          :current-page="pageNum"
+          :page-size="pageSize"
+          :page-sizes="[10, 20, 30, 40]"
+          :pager-count="5"
+          :total="totalSize"
+          background
+          layout="total, sizes, prev, pager, next, jumper"
+          small
+          style="margin-top: 15px; text-align: center"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
       >
       </el-pagination>
     </el-dialog>
-    <point-chart ref="pointChart" :site-id="siteId" />
+    <point-chart ref="pointChart" :site-id="siteId"/>
   </div>
 </template>
 <script>
-import { getDevicePointList } from "@/api/ems/site";
+import {getDevicePointList} from "@/api/ems/site";
 import pointChart from "@/views/ems/dzjk/sbjk/PointChart.vue";
 
 export default {
-  components: { pointChart },
+  components: {pointChart},
   watch: {
     show(val) {
       if (!val) {
@@ -169,10 +169,10 @@ export default {
   data() {
     return {
       // 默认排序
-      defaultSort: { prop: "updateTime", order: "descending" },
+      defaultSort: {prop: "updateTime", order: "descending"},
       show: false,
       loading: false,
-      dataType:'',//展示的数据类型 point点位/alarmPoint报警点位
+      dataType: '',//展示的数据类型 point点位/alarmPoint报警点位
       form: {
         sortData: "updateTime", //最新值升序不传或者asc、降序desc）
         sortMethod: "desc", //升序不传或者asc、降序desc）
@@ -194,9 +194,9 @@ export default {
     };
   },
   methods: {
-    showChart({ pointName }) {
+    showChart({pointName}) {
       if (pointName) {
-        const { deviceCategory, deviceId } = this;
+        const {deviceCategory, deviceId} = this;
         if (this.isDtdc)
           this.$refs.pointChart.showChart({
             pointName,
@@ -235,7 +235,7 @@ export default {
         this.getData()
       });
     },
-    showTable({ deviceCategory, siteId, deviceId, parentId = "" },dataType) {
+    showTable({deviceCategory, siteId, deviceId, parentId = ""}, dataType) {
       this.dataType = dataType;
       this.deviceCategory = deviceCategory;
       this.siteId = siteId;
@@ -244,28 +244,6 @@ export default {
       this.show = true;
       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() {
       const {
         siteId,
@@ -298,10 +276,19 @@ export default {
         dataPoint,
         lower,
         upper,
-        ipAddress:'',
-        ipPort:'',
+        // ipAddress: '',
+        // 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;
+          });
     },
   },
 };