fix:修改页面添加计划添加页面

2024-08-08 14:33:33 +08:00
parent 3672d6feb3
commit 7758049b28
12 changed files with 71 additions and 36 deletions
--- a/hx-ai-intelligent/src/router/equipmentControl.ts
+++ b/hx-ai-intelligent/src/router/equipmentControl.ts
@@ -119,6 +119,25 @@ const equipmentControl = {
        },
      ],
    },
+    {
+      path: 'planToAdd',
+      name: 'planToAdd',
+      meta: { title: '计划添加', hideChildren: true, icon: 'shebeiqunkong' },
+      component: Base,
+      redirect: { name: 'planToAddIndex' },
+      children: [
+        {
+          path: 'index',
+          name: 'planToAddIndex',
+          component: () => import('/@/view/equipmentControl/planToAdd/index.vue'),
+          meta: {
+            title: '计划添加',
+            keepAlive: false,
+            // backApi: [],
+          },
+        },
+      ],
+    },
  ],
 };
 export default equipmentControl;
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmOverview/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmOverview/index.vue
@@ -136,21 +136,21 @@
  const echartPieOne = ref(null);
  const echartPieTow = ref(null);
  const getGraphChart = async () => {
-    let dayData = [];
+    let dayData: any = [];
    // 能源告警
-    let energyAlarm = [];
+    let energyAlarm: any = [];
    // 网关告警
-    let wgAlarm = [];
+    let wgAlarm: any = [];
    // 设备告警
-    let equipmentAlarm = [];
-    let total = [];
+    let equipmentAlarm: any = [];
+    let total: any = [];
    await http
      .post(alarmOverviewApi.getAlarmTrend, {
        orgId: orgId.value,
      })
      .then((res) => {
        if (res.msg === 'success') {
-          res.data.forEach((item: any, index) => {
+          res.data.forEach((item: any) => {
            energyAlarm.push(item.alarmEnergyConsumptionNum);
            wgAlarm.push(item.alarmGatewayNum);
            equipmentAlarm.push(item.alarmEquipmentNum);
@@ -180,7 +180,7 @@
        axisPointer: {
          type: 'shadow',
        },
-        formatter: function (params) {
+        formatter: function (params: any) {
          let res =
            params[0].axisValue +
            '<br/>' +
@@ -238,6 +238,11 @@
            show: false,
          },
          data: dayData,
+          axisLabel: {
+            show: true, // 显示所有刻度值
+            interval: 1, // 显示所有刻度，不跳过
+            // rotate: 45, // 可选：如果标签过长，可以旋转标签以避免重叠
+          },
        },
      ],
      yAxis: [
@@ -330,7 +335,7 @@
            color: '#000000',
            position: 'top',
            top: '10',
-            formatter: function (value) {
+            formatter: function (value: any) {
              return (
                Number(energyAlarm[value.dataIndex]) +
                Number(wgAlarm[value.dataIndex]) +
@@ -426,7 +431,7 @@
                fontSize: 14,
                fontWeight: 'bold',
              },
-              formatter: function (parms) {
+              formatter: function (parms: any) {
                return '[ ' + parms.data.name + ' ] : ' + parms.data.value;
              },
            },
@@ -538,7 +543,7 @@
                fontSize: 14,
                fontWeight: 'bold',
              },
-              formatter: function (parms) {
+              formatter: function (parms: any) {
                return '[ ' + parms.data.name + ' ] : ' + parms.data.value;
              },
            },
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue
@@ -145,8 +145,8 @@
                return data.list.length === 0;
              },
              handle: (data: any) => {
-                let ids = [];
-                data.list.forEach((item) => {
+                let ids: any = [];
+                data.list.forEach((item: any) => {
                  ids.push(item.id);
                });
                data.list = [];
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/equipmentAlarm/configureDeviceAlarms.vue
@@ -123,8 +123,8 @@
                return data.list.length === 0;
              },
              handle: (data: any) => {
-                let ids = [];
-                data.list.forEach((item) => {
+                let ids: any = [];
+                data.list.forEach((item: any) => {
                  ids.push(item.id);
                });
                data.list = [];
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/index.vue
@@ -180,10 +180,10 @@
      //获取 通知方式
      const getNotificationMethod = (data: any) => {
        if (!data) return '';
-        const methods = [];
+        const methods: any = [];
        const notifications = data.split(',');

-        notifications.forEach((notification) => {
+        notifications.forEach((notification: any) => {
          if (notification === '1') {
            methods.push('站内信息');
          } else if (notification === '2') {
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/index.vue
@@ -90,9 +90,10 @@
    {
      title: '姓名',
      dataIndex: 'realName',
-      width: 80,
+      width: 100,
      fixed: 'left',
      key: 'deviceName',
+      ellipsis: true,
    },
    {
      title: '性别',
@@ -142,8 +143,8 @@
  //点击联系人
  const chengUser = () => {
    visibleModel.value = true;
-    let ids = [];
-    dataSource.value.forEach((item) => {
+    let ids: any = [];
+    dataSource.value.forEach((item: any) => {
      ids.push(item.userId);
    });
    // 传到子页面
@@ -311,4 +312,3 @@
    width: 20%;
  }
 </style>
-../../../../api/alarmManagement/alarmSettings/notificationManagements
--- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/notificationManagement/linkPeople/index.vue
@@ -151,8 +151,8 @@
        getList();
      };
      // 递归处理部门树数据
-      const processDepartmentTree = (tree) => {
-        tree.forEach((item) => {
+      const processDepartmentTree = (tree: any) => {
+        tree.forEach((item: any) => {
          item.deptInfo = item.deptInfo;
          item.key = item.deptInfo.deptId;
          item.title = item.deptInfo.deptName;
@@ -162,9 +162,9 @@
      };

      // 获取部门树
-      const getDepartList = (params) => {
+      const getDepartList = (params: any) => {
        return http.post(department.queryDeptTree, params).then((res) => {
-          const result = res.data.map((item) => ({
+          const result = res.data.map((item: any) => ({
            key: item.orgInfo.orgId,
            orgInfo: item.orgInfo,
            title: item.orgInfo.orgName,
@@ -221,8 +221,8 @@
      const onSelectChange = (selectedRowKeys: any, selectedRows: any) => {
        selectedRowKey.value = selectedRowKeys;
        // 使用 forEach 循环遍历 selectedRows 数组
-        let newSelectRows = [];
-        selectedRows.forEach((item, index) => {
+        let newSelectRows: any = [];
+        selectedRows.forEach((item: any) => {
          if (item) {
            newSelectRows.push(item);
          }
@@ -244,6 +244,7 @@
        {
          title: '序号',
          dataIndex: 'index',
+          width: 80,
          customRender: (text: any) => {
            return text.index + 1;
          },
@@ -251,6 +252,8 @@
        {
          title: '姓名',
          dataIndex: 'realName',
+          width: 100,
+          ellipsis: true,
        },
        {
          title: '性别',
--- a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/look.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/look.vue
@@ -101,7 +101,7 @@
  };
  const getChatr = () => {
    let dayData = [];
-    let energyAlarm = [];
+    let energyAlarm: any = [];

    // Extend data for 30 days
    for (let i = 1; i < 30; i++) {
@@ -178,7 +178,7 @@
            show: true, // 显示 X 轴刻度标签
            color: 'rgb(89, 89, 89)', // X 轴刻度标签的字体颜色
            fontSize: 12, // X 轴刻度标签的字体大小
-            formatter: function (value) {
+            formatter: function (value: any) {
              // 可选：格式化 X 轴刻度标签文本
              return value;
            },
@@ -204,7 +204,7 @@
          },
          axisLabel: {
            show: true, // 显示
-            formatter: function (value) {
+            formatter: function (value: any) {
              return value + ' V'; // 在刻度值后加上单位
            },
          },
@@ -236,7 +236,7 @@
            color: 'rgb(89, 89, 89)',
            position: 'top',
            top: '10',
-            formatter: function (value) {
+            formatter: function (value: any) {
              return Number(energyAlarm[value.dataIndex]) + 'V';
            },
          },
--- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/look.vue
@@ -100,7 +100,7 @@
  };
  const getChatr = () => {
    let dayData = [];
-    let energyAlarm = [];
+    let energyAlarm: any = [];

    // Extend data for 30 days
    for (let i = 1; i < 30; i++) {
@@ -177,7 +177,7 @@
            show: true, // 显示 X 轴刻度标签
            color: 'rgb(89, 89, 89)', // X 轴刻度标签的字体颜色
            fontSize: 12, // X 轴刻度标签的字体大小
-            formatter: function (value) {
+            formatter: function (value: any) {
              // 可选：格式化 X 轴刻度标签文本
              return value;
            },
@@ -203,7 +203,7 @@
          },
          axisLabel: {
            show: true, // 显示
-            formatter: function (value) {
+            formatter: function (value: any) {
              return value + ' V'; // 在刻度值后加上单位
            },
          },
@@ -235,7 +235,7 @@
            color: 'rgb(89, 89, 89)',
            position: 'top',
            top: '10',
-            formatter: function (value) {
+            formatter: function (value: any) {
              return Number(energyAlarm[value.dataIndex]) + 'V';
            },
          },
--- a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/look.vue
@@ -164,7 +164,7 @@
            color: 'rgb(89, 89, 89)', // X 轴刻度标签的字体颜色
            fontSize: 12, // X 轴刻度标签的字体大小
            interval: 0, // 显示所有刻度标签
-            formatter: function (value) {
+            formatter: function (value: any) {
              // 可选：格式化 X 轴刻度标签文本
              return value;
            },
@@ -190,7 +190,7 @@
          },
          axisLabel: {
            show: true, // 显示
-            formatter: function (value) {
+            formatter: function (value: any) {
              return value;
            },
          },
--- a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue
+++ b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue
@@ -49,6 +49,7 @@
        visible.value = false;
      };
      const toggle = async (data) => {
+        console.log(data, 'xxxxxx');
        let states = await getEnum({ params: { enumType: 'AlarmLogStateEnum' } });
        stateOptions.value = states.data;
        let stateMap = {
--- a/hx-ai-intelligent/src/view/equipmentControl/planToAdd/index.vue
+++ b/hx-ai-intelligent/src/view/equipmentControl/planToAdd/index.vue
@@ -0,0 +1,7 @@
+<template> xxxxx </template>
+<script lang="ts" setup>
+  import { ref, onMounted, onUnmounted } from 'vue';
+
+  onMounted(() => {});
+  onUnmounted(() => {});
+</script>