Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp

2024-07-23 14:39:56 +08:00
parent a2bfe148d3 9134cf4ac3
commit 9ca6cb83f0
16 changed files with 940 additions and 74 deletions
--- a/hx-ai-intelligent/src/api/alarmManagement/energyAlarm.ts
+++ b/hx-ai-intelligent/src/api/alarmManagement/energyAlarm.ts
@@ -0,0 +1,6 @@
+export enum energyAlarmApi {
+  getTableList = '/carbon-smart/api/AlarmEquipmentLog/selectAlarmEquipmentLog', //设备告警 列表
+  getCodeList = '/carbon-smart/api/AlarmEquipmentLog/selectErrorCodeList', //设备告警 列表
+  getSelectAlarmEquipmentLogStatusProcess = '/carbon-smart/api/AlarmEquipmentLogStatusProcess/selectAlarmEquipmentLogStatusProcess', //设备告警 状态 没有创建工单log接口
+  noCreatOrUpdateLog = '/carbon-smart/api/AlarmEquipmentLogStatusProcess/creatOrUpdate', //设备告警 状态 没有创建工单  添加 修改状态log
+}
--- a/hx-ai-intelligent/src/api/alarmManagement/gatewayAlarm.ts
+++ b/hx-ai-intelligent/src/api/alarmManagement/gatewayAlarm.ts
@@ -0,0 +1,3 @@
+export enum gatewayAlarmApi {
+  getTableList = '/carbon-smart/api/AlarmGatewayLog/selectAlarmGatewayLog', //网关告警 列表
+}
--- a/hx-ai-intelligent/src/router/alarmManagement.ts
+++ b/hx-ai-intelligent/src/router/alarmManagement.ts
@@ -62,6 +62,25 @@ const alarmManagement = {
        },
      ],
    },
+    {
+      path: 'EnergyAlarm',
+      name: 'EnergyAlarm',
+      meta: { title: '能碳告警', hideChildren: true, icon: 'gaojingguanli' },
+      component: Base,
+      redirect: { name: 'EnergyAlarmIndex' },
+      children: [
+        {
+          path: 'index',
+          name: 'EnergyAlarmIndex',
+          component: () => import('/@/view/alarmManagement/energyAlarm/index.vue'),
+          meta: {
+            title: '能碳告警',
+            keepAlive: false,
+            // backApi: [],
+          },
+        },
+      ],
+    },
    {
      path: 'alarmSettings',
      name: 'AlarmSettings',
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue
@@ -138,7 +138,6 @@
  import { energyAlarms } from '/@/api/alarmManagement/alarmSettings/energyAlarm';
  import { http } from '/nerv-lib/util';
  import { dict } from '/@/api';
-  import { async } from '@antv/x6/lib/registry/marker/async';

  // import type { Rule } from 'ant-design-vue/es/form';

@@ -367,7 +366,7 @@
        message: '请输入异常描述',
        trigger: 'blur',
        validator: (rules: any, abnormalDescription: any, cbfn: any) => {
-          if (abnormalDescription.trim() !== '') {
+          if (abnormalDescription && abnormalDescription.trim() !== '') {
            cbfn();
          } else {
            cbfn('告警标题不能为空');
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/editConfigureDeviceAlarm.vue
@@ -46,6 +46,7 @@
            :disabled="!(infoObject && infoObject.deviceType && infoObject.deviceType.length > 0)"
            style="width: 100%"
            :autoClearSearchValue="true"
+            allow-clear
            @change="selectDevice"
            placeholder="请选择设备名称">
            <template v-for="(item, index) in deviceNameTreeData" :key="index">
@@ -59,6 +60,8 @@
          <a-select
            v-model:value="infoObject.devicePoint"
            show-search
+            :autoClearSearchValue="true"
+            allow-clear
            placeholder="请选择设备点位"
            style="width: 100%"
            :disabled="!infoObject?.deviceId"
@@ -78,6 +81,7 @@
          <a-select
            v-model:value="infoObject.valueType"
            placeholder="请选择取值类型"
+            allow-clear
            style="width: 100%"
            :options="qzOptions" />
        </a-form-item>
@@ -151,11 +155,8 @@
  import type { ShowSearchType } from 'ant-design-vue/es/cascader';
  import { device } from '/@/api/deviceManage';
  import { deviceAlarms } from '/@/api/alarmManagement/alarmSettings/deviceAlarms';
-
  import { http } from '/nerv-lib/util';

-  import { async } from '@antv/x6/lib/registry/marker/async';
-
  const visible = ref(false);
  // 父级数据
  const equipmentAlarm = ref({});
@@ -187,13 +188,16 @@
  let deviceNameTreeData = ref([]);
  //选择设备类型方法
  const selectDeviceType = (value: any, selectedOptions: any) => {
-    //获取该类型设备
-    getDevicePage({
-      orgId: orgId.value,
-      deviceCode: selectedOptions[selectedOptions.length - 1].code,
-      pageNum: 1,
-      pageSize: 999,
-    });
+    infoObject.value.deviceId = null;
+    if (selectedOptions && selectedOptions.length > 0) {
+      //获取该类型设备
+      getDevicePage({
+        orgId: orgId.value,
+        deviceCode: selectedOptions[selectedOptions.length - 1].code,
+        pageNum: 1,
+        pageSize: 999,
+      });
+    }
  };
  //选择设备方法
  const selectDevice = () => {
@@ -379,7 +383,7 @@
        message: '请输入异常描述',
        trigger: 'blur',
        validator: (rules: any, abnormalDescription: any, cbfn: any) => {
-          if (abnormalDescription.trim() !== '') {
+          if (abnormalDescription && abnormalDescription.trim() !== '') {
            cbfn();
          } else {
            cbfn('告警标题不能为空');
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
@@ -73,7 +73,6 @@
  import { http } from '/nerv-lib/util';
  import linkPeople from './linkPeople/index.vue';
  import { notificationManagementApi } from '/@/api/alarmManagement/alarmSettings/notificationManagements';
-  import { async } from '@antv/x6/lib/registry/marker/async';

  //table 数据
  const columns = [
--- a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/index.vue
@@ -0,0 +1,48 @@
+<template>
+  <ns-view-list-table v-bind="config" ref="mainRef">
+    <template #bodyCell="{ record, column }">
+      <template v-if="column.dataIndex === 'alarmTitle'">
+        <div style="color: #2778ff">{{ record.alarmTitle }}</div>
+        {{ record.abnormalDescription }}
+      </template>
+      <template v-if="column.dataIndex === 'priority'">
+        {{ record.priority ? record.priority.label : '' }}
+      </template>
+      <template v-if="column.dataIndex === 'alarmLogState'">
+        {{ record.alarmLogState ? record.alarmLogState.label : '' }}
+      </template>
+    </template>
+  </ns-view-list-table>
+  <!-- 详情页面 -->
+  <Look ref="look" />
+  <!-- 状态页面 -->
+  <Status ref="status" @logAdd="logAdd" />
+</template>
+<script lang="ts">
+  import { notificationtableConfig } from './ts/config';
+  import Look from './look.vue';
+  import Status from './status.vue';
+  import { ref } from 'vue';
+
+  export default {
+    name: 'EquipmentAlarmIndex',
+    components: { Look, Status },
+
+    setup() {
+      const look = ref(null);
+      const status = ref(null);
+      const mainRef = ref(null);
+      const config = notificationtableConfig(look, status);
+      const logAdd = () => {
+        mainRef.value?.nsTableRef.reload();
+      };
+      return {
+        config,
+        look,
+        status,
+        mainRef,
+        logAdd,
+      };
+    },
+  };
+</script>
--- a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/look.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/look.vue
@@ -0,0 +1,272 @@
+<template>
+  <ns-drawer
+    v-model:visible="visible"
+    width="520"
+    :title="' '"
+    :footer-style="{ textAlign: 'right' }"
+    :ok="btnClick"
+    :cancel="handleClose"
+    placement="right"
+    @close="handleClose">
+    <div style="width: 100%; height: 100%; overflow-y: auto; overflow-x: hidden">
+      <!-- top -->
+      <div class="box">
+        <div class="card"></div>
+        <div style="left: 25px; position: absolute; height: 35px; line-height: 35px">
+          告警编号：{{ infoObject.alarmCode }}
+        </div>
+        <div style="right: 20px; position: absolute; height: 35px; line-height: 35px">
+          {{ infoObject.updateTime }}
+        </div>
+      </div>
+      <!-- center -->
+      <div style="width: 100%; height: 400px">
+        <div style="width: 100%; height: 100%" ref="graphChart"></div>
+      </div>
+      <!-- bottom -->
+      <div style="width: 100%; margin-top: 10px">
+        <a-descriptions :column="1" bordered>
+          <a-descriptions-item label="优先级">{{
+            infoObject.priority ? infoObject.priority.label : ''
+          }}</a-descriptions-item>
+          <a-descriptions-item label="状态">{{
+            infoObject.alarmLogState ? infoObject.alarmLogState.label : ''
+          }}</a-descriptions-item>
+          <a-descriptions-item label="错误码">{{ infoObject.errorCode }}</a-descriptions-item>
+          <a-descriptions-item label="告警描述">
+            <div style="color: #2778ff">{{ infoObject.alarmTitle }}</div>
+            {{ infoObject.abnormalDescription }}</a-descriptions-item
+          >
+          <a-descriptions-item label="设备信息"> {{ infoObject.deviceInfo }} </a-descriptions-item>
+          <a-descriptions-item label="重复次数">
+            {{ infoObject.alarmRepetitions }}
+          </a-descriptions-item>
+        </a-descriptions>
+      </div>
+    </div>
+    <template #footer>
+      <a-button type="primary" @click="handleClose">确定</a-button>
+    </template>
+  </ns-drawer>
+</template>
+<script lang="ts" setup>
+  defineOptions({
+    name: 'look', // 与页面路由name一致缓存才可生效
+  });
+  import { ref } from 'vue';
+  import * as echarts from 'echarts';
+
+  let chartInstance: echarts.ECharts | null = null;
+  const graphChart = ref(null);
+  const infoObject = ref({
+    priority: null,
+    alarmCode: null,
+    alarmLogState: null,
+    errorCode: null,
+    alarmTitle: null,
+    abnormalDescription: null,
+    deviceInfo: null,
+    alarmRepetitions: null,
+    updateTime: null,
+  });
+  const visible = ref(false);
+  const handleClose = () => {
+    visible.value = false;
+    if (chartInstance) {
+      chartInstance.dispose();
+    }
+    infoObject.value = {
+      priority: null,
+      alarmCode: null,
+      alarmLogState: null,
+      errorCode: null,
+      alarmTitle: null,
+      abnormalDescription: null,
+      deviceInfo: null,
+      alarmRepetitions: null,
+      updateTime: null,
+    };
+  };
+  const btnClick = () => {
+    handleClose();
+  };
+  const toggle = (data: any) => {
+    infoObject.value = data;
+    visible.value = true;
+    setTimeout(() => {
+      getChatr();
+    }, 500);
+  };
+  const getChatr = () => {
+    let dayData = [];
+    let energyAlarm = [];
+
+    // Extend data for 30 days
+    for (let i = 1; i < 30; i++) {
+      dayData.push(`3/${i}`);
+      energyAlarm.push(Math.floor(Math.random() * 250));
+    }
+    if (chartInstance) {
+      chartInstance.dispose();
+    }
+    chartInstance = echarts.init(graphChart.value);
+    const option = {
+      // title: {
+      //   text: '告警趋势/ 近30天',
+      //   textStyle: {
+      //     fontSize: 16,
+      //     fontWeight: 'normal',
+      //     color: '#aaaaaa',
+      //   },
+      //   left: '1%',
+      //   top: '2%',
+      // },
+      tooltip: {
+        trigger: 'axis',
+        axisPointer: {
+          type: 'shadow',
+        },
+        formatter: function (params: any) {
+          let res = params[0].marker + '    ' + params[0].seriesName + '  :    ' + params[0].data;
+          return res;
+        },
+      },
+      grid: {
+        left: '10%', // 设置图表距离左边的距离
+        right: '4%', // 设置图表距离右边的距离
+        top: '6%',
+        borderWidth: 0,
+        y2: 60, // 距离底边
+      },
+      legend: [
+        {
+          show: false,
+          top: 5,
+          left: 'center', // 将图例居中显示
+          textStyle: {
+            color: 'rgb(89, 89, 89)',
+            fontSize: '14',
+            fontWeight: 'normal',
+          }, // 注意这里的颜色值要用引号括起来
+          data: ['电压值'],
+          itemGap: 30, // 这里可以调整图例项之间的间距，单位为像素
+        },
+      ],
+      // toolbox: {
+      //   show: true,
+      //   feature: {
+      //     restore: {},
+      //     saveAsImage: {},
+      //   },
+      // },
+      calculable: true,
+      xAxis: [
+        {
+          type: 'category',
+          splitLine: {
+            show: false,
+          },
+          axisTick: {
+            show: true,
+          },
+          splitArea: {
+            show: false,
+          },
+          axisLabel: {
+            show: true, // 显示 X 轴刻度标签
+            color: 'rgb(89, 89, 89)', // X 轴刻度标签的字体颜色
+            fontSize: 12, // X 轴刻度标签的字体大小
+            formatter: function (value) {
+              // 可选：格式化 X 轴刻度标签文本
+              return value;
+            },
+          },
+          data: dayData,
+        },
+      ],
+      yAxis: [
+        {
+          type: 'value',
+          shwo: false,
+          splitLine: {
+            show: true,
+          },
+          axisLine: {
+            show: false,
+          },
+          axisTick: {
+            show: false,
+          },
+          splitArea: {
+            show: false,
+          },
+          axisLabel: {
+            show: true, // 显示
+            formatter: function (value) {
+              return value + ' V'; // 在刻度值后加上单位
+            },
+          },
+        },
+      ],
+      dataZoom: [
+        {
+          height: 12,
+          start: 0,
+          end: 100,
+          handleSize: '300%', // 设置滑块的大小
+          bottom: 15,
+        },
+      ],
+      series: [
+        {
+          name: '电压值',
+          type: 'line',
+          itemStyle: {
+            normal: {
+              barBorderRadius: 0,
+              color: '#2778FF',
+            },
+          },
+          symbol: 'circle', // 数据点的形状，这里设置为圆形
+          symbolSize: 8,
+          label: {
+            show: true,
+            color: 'rgb(89, 89, 89)',
+            position: 'top',
+            top: '10',
+            formatter: function (value) {
+              return Number(energyAlarm[value.dataIndex]) + 'V';
+            },
+          },
+          data: energyAlarm,
+        },
+      ],
+    };
+    chartInstance = echarts.init(graphChart.value);
+    chartInstance.setOption(option);
+  };
+  defineExpose({
+    toggle,
+  });
+</script>
+<style scoped lang="less">
+  .box {
+    width: 100%;
+    height: 35px;
+    display: flex;
+    position: relative;
+    font-size: @font-size-base;
+    border-bottom: 1px solid @primary-color;
+  }
+  .card {
+    position: absolute;
+    left: 0px;
+    top: 0px;
+    width: 5px;
+    height: 35px;
+    background-color: @primary-color;
+  }
+  :deep(.ant-descriptions-item-label) {
+    width: 25%;
+  }
+</style>
--- a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/notificationManagementMock.json
+++ b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/notificationManagementMock.json
@@ -0,0 +1,108 @@
+{
+  "listData":[
+    {
+      "id": "d4",
+      "isDel": "0",
+      "officesId": "84",
+      "deviceCode": "37430200143",
+      "deviceName": "地听测试电表",
+      "category": "1",
+      "type": "1001",
+      "energyCount": "1",
+      "serialNumber": "69",
+      "pidCode": null,
+      "brand": "",
+      "types": "",
+      "manufacturer": "elit non in",
+      "contacts": "ad reprehenderit",
+      "phonenumber": "34",
+      "position": "in esse commodo1",
+      "activeState": "1",
+      "measurementDirection": "1",
+      "deviceMagnification": 62,
+      "deviceAccuracy": "89",
+      "frequency": "anim consequat irure",
+      "standardFrequency": "ut elit",
+      "deviceHead": "pariatur ex velit",
+      "constructor": "84566",
+      "voltageType": "cillum aliquip reprehenderit",
+      "pt": 61,
+      "ct": 64,
+      "communicationProtocol": "cupidatat nisi ea ad",
+      "ip": "",
+      "port": "",
+      "com": "",
+      "slaveAddress": "",
+      "dlt": "",
+      "conversionIdentifier": "48",
+      "multiplicationAdjustment": "1",
+      "accessMethod": "1",
+      "replacementFrequency": "0",
+      "dataDetail": "sit",
+      "insertTime": null,
+      "children": null,
+      "devicePointList": null,
+      "insertUser": null,
+      "priority": "1",
+      "alarmTitle": "电压异常告警",
+      "errorCode": "A001",
+      "monitorTime":"1",
+      "repetitions":"1",
+      "monitorTimeUnit": "分",
+      "enableRules": "1",
+      "isUse":true
+    }   , {
+      "id": "d5",
+      "isDel": "0",
+      "officesId": "84",
+      "deviceCode": "37430200143",
+      "deviceName": "地听测试电表",
+      "category": "1",
+      "type": "1001",
+      "energyCount": "1",
+      "serialNumber": "69",
+      "pidCode": null,
+      "brand": "",
+      "types": "",
+      "manufacturer": "elit non in",
+      "contacts": "ad reprehenderit",
+      "phonenumber": "34",
+      "position": "in esse commodo2",
+      "activeState": "1",
+      "measurementDirection": "1",
+      "deviceMagnification": 62,
+      "deviceAccuracy": "89",
+      "frequency": "anim consequat irure",
+      "standardFrequency": "ut elit",
+      "deviceHead": "pariatur ex velit",
+      "constructor": "84566",
+      "voltageType": "cillum aliquip reprehenderit",
+      "pt": 61,
+      "ct": 64,
+      "communicationProtocol": "cupidatat nisi ea ad",
+      "ip": "",
+      "port": "",
+      "com": "",
+      "slaveAddress": "",
+      "dlt": "",
+      "conversionIdentifier": "48",
+      "multiplicationAdjustment": "1",
+      "accessMethod": "1",
+      "replacementFrequency": "0",
+      "dataDetail": "sit",
+      "insertTime": null,
+      "children": null,
+      "devicePointList": null,
+      "insertUser": null,
+      "priority": "1",
+      "alarmTitle": "电压异常告警",
+      "errorCode": "A001",
+      "monitorTime":"1",
+      "repetitions":"1",
+      "monitorTimeUnit": "分",
+      "enableRules": "0",
+      "isUse":true
+    }
+  ]
+  
+}
--- a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/status.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/status.vue
@@ -0,0 +1,170 @@
+<template>
+  <ns-drawer
+    v-model:visible="visible"
+    width="550"
+    :title="' '"
+    :footer-style="{ textAlign: 'right' }"
+    :ok="btnClick"
+    :cancel="handleClose"
+    placement="right"
+    @close="handleClose">
+    <a-tabs>
+      <a-tab-pane key="1" tab="更新状态">
+        <div style="width: 100%; padding: 24px">
+          <a-form ref="formRef" :model="infoObject">
+            <a-form-item ref="state" label="当前状态" name="state">
+              <a-select
+                v-model:value="infoObject.state"
+                show-search
+                placeholder="请选择当前状态"
+                style="width: 85%"
+                :options="stateOptions"
+                :disabled="showEdit" />
+              <ns-icon
+                size="20"
+                @click="changeShowEdit"
+                style="margin-left: 20px"
+                :name="showEdit ? 'bianji' : 'baocun'" />
+            </a-form-item>
+            <a-form-item label="备注" name="remarks">
+              <a-textarea
+                v-model:value="infoObject.remarks"
+                placeholder="请输入异常描述"
+                :disabled="showEdit"
+                style="width: 85%"
+                :autoSize="{ minRows: 4, maxRows: 4 }" />
+            </a-form-item>
+          </a-form>
+        </div>
+      </a-tab-pane>
+      <a-tab-pane key="2" tab="状态流程">
+        <!-- 自动生成工单 -->
+        <div v-if="infoObject.createWorkOrder === 1"> xxxx </div>
+        <!-- 没有自动生成工单 -->
+        <NsSteps v-else v-bind="config" />
+      </a-tab-pane>
+    </a-tabs>
+    <template #footer>
+      <a-button type="primary" @click="btnClick">确定</a-button>
+    </template>
+  </ns-drawer>
+</template>
+<script>
+  import { defineComponent } from 'vue';
+  import { ref } from 'vue';
+  import NsSteps from '/@/components/ns-steps.vue';
+  import { NsMessage } from '/nerv-lib/component';
+  import { http } from '/nerv-lib/util';
+  import { energyAlarmApi } from '/@/api/alarmManagement/energyAlarm';
+
+  export default defineComponent({
+    components: { NsSteps },
+
+    setup(props, { emit }) {
+      const visible = ref(false);
+      const showEdit = ref(true);
+      const infoObject = ref({});
+      const equipmentAlarm = ref({});
+      const stateOptions = ref();
+      const logList = ref([]);
+      const config = ref({
+        size: logList.value.length,
+        dataSource: logList.value,
+      });
+      const handleClose = () => {
+        showEdit.value = true;
+        equipmentAlarm.value = {};
+        infoObject.value = {};
+        visible.value = false;
+      };
+      const btnClick = () => {
+        delete infoObject.value.createTime;
+        infoObject.value.alarmEquipmentLogId = equipmentAlarm.value.id;
+        if (equipmentAlarm.value.createWorkOrder === 0) {
+          http.post(energyAlarmApi.noCreatOrUpdateLog, infoObject.value).then((res) => {
+            if (res.msg === 'success') {
+              NsMessage.success('操作成功');
+              showEdit.value = true;
+              equipmentAlarm.value = {};
+              infoObject.value = {};
+              visible.value = false;
+              emit('logAdd', null);
+            }
+          });
+        }
+      };
+      //修改状态
+      const changeShowEdit = () => {
+        // 未生成工单
+        if (equipmentAlarm.value.createWorkOrder === 0) {
+          showEdit.value = !showEdit.value;
+        }
+      };
+      const toggle = async (data) => {
+        equipmentAlarm.value = { ...data };
+        visible.value = true;
+        if (equipmentAlarm.value.createWorkOrder === 1) {
+          stateOptions.value = [
+            { value: 1, label: '待处理' },
+            { value: 2, label: '处理中' },
+            { value: 3, label: '已完成' },
+            { value: 4, label: '超时' },
+            { value: 5, label: '已关闭' },
+          ];
+        } else {
+          stateOptions.value = [
+            { value: 1, label: '待处理' },
+            { value: 2, label: '处理中' },
+            { value: 3, label: '已完成' },
+            { value: 5, label: '已关闭' },
+          ];
+        }
+        console.log(data, 'data');
+        await http
+          .post(energyAlarmApi.getSelectAlarmEquipmentLogStatusProcess, {
+            alarmEquipmentLogId: data.id,
+          })
+          .then((res) => {
+            if (res.msg === 'success') {
+              logList.value = res.data;
+              infoObject.value = { ...logList.value[0] };
+              infoObject.value.state = infoObject.value.state.value;
+              let colorMap = {
+                1: '#ff7602',
+                2: '#00a1e6',
+                3: '#04d919',
+                4: '#d9001b',
+                5: '#a6a6a6',
+              };
+              logList.value.forEach((item) => {
+                item.stateName = item.state.label;
+                item.color = colorMap[item.state.value];
+                item.src = 'state-' + item.state.value;
+              });
+              config.value.dataSource = logList.value;
+            }
+          });
+      };
+      return {
+        infoObject,
+        changeShowEdit,
+        showEdit,
+        equipmentAlarm,
+        stateOptions,
+        btnClick,
+        visible,
+        logList,
+        config,
+        handleClose,
+        toggle,
+      };
+    },
+  });
+</script>
+<style scoped lang="less">
+  :deep(.ant-form-item-label) {
+    z-index: 20;
+    text-align: right;
+    width: 17%;
+  }
+</style>
--- a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/ts/config.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/ts/config.ts
@@ -0,0 +1,187 @@
+import { energyAlarmApi } from '/@/api/alarmManagement/energyAlarm';
+import { dict } from '/@/api';
+
+const tableKeyMap = [
+  {
+    title: '序号',
+    dataIndex: 'address',
+    width: 80,
+    customRender: (text: any) => {
+      return text.index + 1;
+    },
+  },
+  {
+    title: '告警编号',
+    dataIndex: 'alarmCode',
+  },
+  {
+    title: '告警描述',
+    dataIndex: 'alarmTitle',
+  },
+  {
+    title: '类型',
+    dataIndex: 'priority',
+  },
+  {
+    title: '优先级',
+    dataIndex: 'priority',
+  },
+  {
+    title: '状态',
+    dataIndex: 'alarmLogState',
+  },
+  {
+    title: '错误码',
+    dataIndex: 'errorCode',
+  },
+  {
+    title: '监测点位',
+    dataIndex: 'deviceInfo',
+  },
+  {
+    title: '更新时间',
+    dataIndex: 'updateTime',
+  },
+  {
+    title: '重复次数',
+    dataIndex: 'alarmRepetitions',
+  },
+];
+export const notificationtableConfig = (look: any, status: any) => {
+  return {
+    title: '告警记录',
+    api: energyAlarmApi.getTableList,
+    headerActions: [{}],
+    scroll: { x: 2000 },
+    columns: tableKeyMap,
+    // rowSelection: null, 选择按钮
+    columnActions: {
+      title: '操作',
+      actions: [
+        {
+          label: '详情',
+          name: 'FeedBackDetail',
+          dynamicParams: ['uuid', 'appealType'],
+          handle: (data: any) => {
+            look.value.toggle(data);
+          },
+        },
+        {
+          label: '状态',
+          name: 'FeedBackDetail',
+          dynamicParams: ['uuid', 'appealType'],
+          handle: (data: any) => {
+            status.value.toggle(data);
+          },
+        },
+      ],
+    },
+
+    formConfig: {
+      schemas: [
+        {
+          field: 'dataSourcesType',
+          label: '类型',
+          component: 'nsSelectApi',
+          // dynamicParams: {
+          //   id: 'deviceName', //帮定上级联动数据
+          // },
+          componentProps: {
+            api: () => dict({ params: { dicKey: 'ENERGY_TYPE' } }),
+            immediate: true,
+            allowClear: true,
+            labelField: 'cnValue',
+            valueField: 'id',
+            placeholder: '请选择类型',
+            showSearch: true,
+            filterOption: (input: string, option: any) => {
+              return option.cnValue.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+            },
+            // autoSelectFirst: true,
+          },
+        },
+        {
+          field: 'priority',
+          label: '优先级',
+          component: 'NsSelect',
+          componentProps: {
+            placeholder: '请选择告警优先级',
+            allowClear: true,
+            options: [
+              {
+                label: '紧急',
+                value: 1,
+              },
+              {
+                label: '重要',
+                value: 2,
+              },
+              {
+                label: '一般',
+                value: 3,
+              },
+            ],
+          },
+        },
+        {
+          field: 'alarmLogState',
+          label: '状态',
+          component: 'NsSelect',
+          componentProps: {
+            placeholder: '请选择状态',
+            allowClear: true,
+            options: [
+              {
+                label: '待处理',
+                value: 1,
+              },
+              {
+                label: '处理中',
+                value: 2,
+              },
+              {
+                label: '已完成',
+                value: 3,
+              },
+              {
+                label: '超时',
+                value: 4,
+              },
+              {
+                label: '关闭',
+                value: 5,
+              },
+            ],
+          },
+        },
+        {
+          field: 'errorCode',
+          label: '错误码',
+          component: 'NsSelectApi',
+          componentProps: {
+            allowClear: true,
+            placeholder: '请选择错误码',
+            autoSelectFirst: false,
+            api: energyAlarmApi.getCodeList,
+            resultField: 'data',
+            labelField: 'errorCode',
+            valueField: 'errorCode',
+          },
+        },
+        {
+          field: 'createTime',
+          label: '数据日期',
+          component: 'NsRangePicker',
+          allowClear: true,
+          fieldMap: ['startTime', 'endTime'],
+          componentProps: {
+            valueFormat: 'YYYY-MM-DD',
+            placeholder: ['开始日期', '结束日期'],
+          },
+        },
+      ],
+    },
+    // pagination: { pageSizeOptions: false },
+    rowKey: 'id',
+  };
+};
--- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue
@@ -94,6 +94,7 @@
    infoObject.value = data;
    visible.value = true;
    setTimeout(() => {
+      //获取数据 echarts图展示
      getChatr();
    }, 500);
  };
--- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue
@@ -11,7 +11,7 @@
    <a-tabs>
      <a-tab-pane key="1" tab="更新状态">
        <div style="width: 100%; padding: 24px">
-          <a-form ref="formRef" :model="infoObject">
+          <a-form ref="formRef" :model="infoObject" :rules="rules">
            <a-form-item ref="state" label="当前状态" name="state">
              <a-select
                v-model:value="infoObject.state"
@@ -29,7 +29,7 @@
            <a-form-item label="备注" name="remarks">
              <a-textarea
                v-model:value="infoObject.remarks"
-                placeholder="请输入异常描述"
+                placeholder="请输入备注"
                :disabled="showEdit"
                style="width: 85%"
                :autoSize="{ minRows: 4, maxRows: 4 }" />
@@ -71,6 +71,24 @@
        size: logList.value.length,
        dataSource: logList.value,
      });
+      // 表单校验
+      const rules = {
+        remarks: [
+          {
+            required: true,
+            message: '请输入备注',
+            trigger: 'change',
+            validator: (rules, remarks, cbfn) => {
+              if (remarks && remarks.trim() !== '') {
+                cbfn();
+              } else {
+                cbfn('备注不能为空');
+              }
+            },
+          },
+        ],
+        state: [{ required: true, message: '请选择当前状态', trigger: 'change' }],
+      };
      const handleClose = () => {
        showEdit.value = true;
        equipmentAlarm.value = {};
@@ -147,6 +165,7 @@
      };
      return {
        infoObject,
+        rules,
        changeShowEdit,
        showEdit,
        equipmentAlarm,
--- a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/index.vue
@@ -1,5 +1,14 @@
 <template>
-  <ns-view-list-table v-bind="config" ref="mainRef" />
+  <ns-view-list-table v-bind="config" ref="mainRef">
+    <template #bodyCell="{ record, column }">
+      <template v-if="column.dataIndex === 'priority'">
+        {{ record.priority ? record.priority.label : '' }}
+      </template>
+      <template v-if="column.dataIndex === 'alarmLogState'">
+        {{ record.alarmLogState ? record.alarmLogState.label : '' }}
+      </template>
+    </template>
+  </ns-view-list-table>
  <!-- 详情页面 -->
  <Look ref="look" />
  <!-- 状态页面 -->
--- a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue
@@ -13,10 +13,10 @@
      <div class="box">
        <div class="card"></div>
        <div style="left: 25px; position: absolute; height: 35px; line-height: 35px">
-          告警编号：20230310001
+          告警编号：{{ infoObject.alarmCode }}
        </div>
        <div style="right: 20px; position: absolute; height: 35px; line-height: 35px">
-          2024-03-10 15:08:10
+          {{ infoObject.updateTime }}
        </div>
      </div>
      <!-- center -->
@@ -26,12 +26,20 @@
      <!-- bottom -->
      <div style="width: 100%; margin-top: 10px">
        <a-descriptions :column="1" bordered>
-          <a-descriptions-item label="优先级">紧急</a-descriptions-item>
-          <a-descriptions-item label="状态">新告警</a-descriptions-item>
-          <a-descriptions-item label="错误码">C003</a-descriptions-item>
-          <a-descriptions-item label="告警描述">网关心跳包丢失</a-descriptions-item>
-          <a-descriptions-item label="设备信息">1号网关_Di23j596_0001 </a-descriptions-item>
-          <a-descriptions-item label="重复次数"> 0 </a-descriptions-item>
+          <a-descriptions-item label="优先级">{{
+            infoObject.priority ? infoObject.priority.label : ''
+          }}</a-descriptions-item>
+          <a-descriptions-item label="状态">{{
+            infoObject.alarmLogState ? infoObject.alarmLogState.label : ''
+          }}</a-descriptions-item>
+          <a-descriptions-item label="错误码">{{ infoObject.errorCode }}</a-descriptions-item>
+          <a-descriptions-item label="告警描述">{{
+            infoObject.alarmDescription
+          }}</a-descriptions-item>
+          <a-descriptions-item label="设备信息">{{ infoObject.deviceInfo }} </a-descriptions-item>
+          <a-descriptions-item label="断往时长">
+            {{ infoObject.durationOfNetworkDisconnection }}</a-descriptions-item
+          >
        </a-descriptions>
      </div>
    </div>
@@ -49,16 +57,35 @@

  let chartInstance: echarts.ECharts | null = null;
  const graphChart = ref(null);
+  const infoObject = ref({
+    alarmCode: null,
+    updateTime: null,
+    priority: null,
+    alarmLogState: null,
+    errorCode: null,
+    alarmDescription: null,
+    deviceInfo: null,
+    durationOfNetworkDisconnection: null,
+  });
  const visible = ref(false);
  const handleClose = () => {
    visible.value = false;
+    infoObject.value = {
+      alarmCode: null,
+      updateTime: null,
+      priority: null,
+      alarmLogState: null,
+      errorCode: null,
+      alarmDescription: null,
+      deviceInfo: null,
+      durationOfNetworkDisconnection: null,
+    };
  };
  const btnClick = () => {
-    console.log('btnClick');
    handleClose();
  };
  const toggle = (data: any) => {
-    console.log(data, 'data');
+    infoObject.value = { ...data };
    visible.value = true;
    setTimeout(() => {
      getChatr();
--- a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/ts/config.ts
+++ b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/ts/config.ts
@@ -1,7 +1,4 @@
-import { dateUtil } from '/nerv-lib/util/date-util';
-import data from '../notificationManagementMock.json';
-import { http } from '/nerv-lib/util';
-import { ref } from 'vue';
+import { gatewayAlarmApi } from '/@/api/alarmManagement/gatewayAlarm';
 const tableKeyMap = [
  {
    title: '序号',
@@ -12,44 +9,41 @@ const tableKeyMap = [
  },
  {
    title: '告警编号',
-    dataIndex: 'id',
+    dataIndex: 'alarmCode',
  },
  {
    title: '告警描述',
-    dataIndex: 'deviceCode',
+    dataIndex: 'alarmDescription',
  },
  {
    title: '优先级',
-    dataIndex: 'deviceName',
+    dataIndex: 'priority',
  },
  {
    title: '状态',
-    dataIndex: 'position',
+    dataIndex: 'alarmLogState',
  },
  {
    title: '错误码',
-    dataIndex: 'position',
-    textEllipsis: true,
+    dataIndex: 'errorCode',
  },
  {
    title: '设备信息',
-    dataIndex: 'position',
+    dataIndex: 'deviceInfo',
  },
  {
    title: '更新时间',
-    dataIndex: 'enableRules',
+    dataIndex: 'updateTime',
  },
  {
    title: '断网时长',
-    dataIndex: 'enableRules',
+    dataIndex: 'durationOfNetworkDisconnection',
  },
 ];
-const mockData = ref(data.listData);
 export const notificationtableConfig = (look: any, status: any) => {
  return {
    title: '告警记录',
-    // api: '/carbon_emission/device/getDeviceList',
-    value: mockData.value,
+    api: gatewayAlarmApi.getTableList,
    headerActions: [{}],
    columns: tableKeyMap,
    // rowSelection: null, 选择按钮
@@ -78,56 +72,57 @@ export const notificationtableConfig = (look: any, status: any) => {

    formConfig: {
      schemas: [
+        // {
+        //   field: 'name',
+        //   label: '告警类型',
+        //   component: 'NsSelect',
+        //   defaultValue: '2',
+        //   componentProps: {
+        //     placeholder: '请选择告警优先级',
+        //     disabled: true, // 不可选择
+        //     options: [
+        //       {
+        //         label: '紧急',
+        //         value: '1',
+        //       },
+        //       {
+        //         label: '重要',
+        //         value: '2',
+        //       },
+        //       {
+        //         label: '一般',
+        //         value: '3',
+        //       },
+        //     ],
+        //   },
+        // },
        {
-          field: 'name',
-          label: '告警类型',
-          component: 'NsSelect',
-          defaultValue: '2',
-          componentProps: {
-            placeholder: '请选择告警优先级',
-            disabled: true,
-            options: [
-              {
-                label: '紧急',
-                value: '1',
-              },
-              {
-                label: '重要',
-                value: '2',
-              },
-              {
-                label: '一般',
-                value: '3',
-              },
-            ],
-          },
-        },
-        {
-          field: 'provider',
+          field: 'alarmLogState',
          label: '状态',
          component: 'NsSelect',
          componentProps: {
            placeholder: '请选择状态',
+            allowClear: true,
            options: [
              {
                label: '待处理',
-                value: '1',
+                value: 1,
              },
              {
                label: '处理中',
-                value: '2',
+                value: 2,
              },
              {
                label: '已完成',
-                value: '3',
+                value: 3,
              },
              {
                label: '超时',
-                value: '4',
+                value: 4,
              },
              {
                label: '关闭',
-                value: '5',
+                value: 5,
              },
            ],
          },
@@ -136,7 +131,7 @@ export const notificationtableConfig = (look: any, status: any) => {
          field: 'createTime',
          label: '数据日期',
          component: 'NsRangePicker',
-          fieldMap: ['manufactureBeginDate', 'manufactureEndDate'],
+          fieldMap: ['startTime', 'endTime'],
          componentProps: {
            valueFormat: 'YYYY-MM-DD',
            placeholder: ['开始日期', '结束日期'],