feat: 设备台账联调

hx-ai-intelligent/src/api/deviceManage.ts

@@ -0,0 +1,10 @@
+const BASE_URL = '/carbon-smart';
+export enum device {
+  queryDeviceTree = `${BASE_URL}/deviceInfo/queryDeviceTree`,
+  queryDevicePage = `${BASE_URL}/deviceInfo/queryDevicePage`,
+  dropArea = `${BASE_URL}/deviceInfo/dropArea`,
+}
+
+export enum group {
+  queryDeviceGroupTree = `${BASE_URL}/deviceGroup/queryDeviceGroupTree`,
+}

hx-ai-intelligent/src/config/app.config.ts

@@ -19,7 +19,7 @@ export const appConfig = {
   projectType: 'web',
   baseApi: '/api',
   projectName: '济阳站_AI智能BAS系统',
-  enablePermissions: true,
+  enablePermissions: false,
   // themeColor: '#eee',
   siderPosition: 'left',
   baseHeader: '/parkingManage',
@@ -92,6 +92,7 @@ export const appConfig = {
         permissionVos: 'permissionVos',
       });
       sessionStorage.setItem('ORGID', info.orgId);
+      selectDefaultValue.value = info.orgId;
       return { data: { ...trD } };
     });
   },

hx-ai-intelligent/src/router/organizationManage.ts

@@ -10,7 +10,7 @@ const organizationManage = {
       name: 'UserManage',
       meta: { title: '用户管理', hideChildren: true, icon: 'zuzhiguanli' },
       component: Base,
-      redirect: { name: 'userManageIndex' },
+      redirect: { name: 'UserManageIndex' },
       children: [
         {
           path: 'index',

hx-ai-intelligent/src/view/equipmentManage/ledger/config.ts

@@ -1,180 +1,233 @@
 import { dateUtil } from '/nerv-lib/util/date-util';
-import data from './mock.json';
+import { device } from '/@/api/deviceManage';
-export const tableConfig = {
+import { ref } from 'vue';
-  title: '设备台账',
+import { http } from '/nerv-lib/util';
-  // api: '/carbon_emission/device/getDeviceList',
+
-  value: data.dataSource,
+export const tableConfig = (orgId) => {
-  treeConfig: {
+  return ref({
-    header: {
+    title: '设备信息',
-      icon: 'orgLink',
+    api: device.queryDevicePage,
-      title: '设备类别',
+    params: { orgId },
-    },
+    treeConfig: {
-    defaultExpandAll: true,
+      header: {
-    api: () => {
+        icon: 'orgLink',
-      return new Promise((resolve) => {
+        title: '设备类别',
-        setTimeout(() => {
+      },
-          resolve(data);
+      params: { orgId },
-        }, 100);
+      dynamicParams: 'code',
-      });
+      defaultExpandAll: true,
+      api: device.queryDeviceTree,
+      fieldNames: { title: 'deviceType', key: 'code' },
+      formConfig: {
+        schemas: [
+          {
+            field: 'deviceType',
+            label: '设备名称',
+            component: 'NsInput',
+            autoSubmit: true,
+            componentProps: {
+              placeholder: '请输入设备类型',
+            },
+          },
+        ],
+      },
     },
+    rowSelection: null,
+    columns: [
+      {
+        title: '设备名称',
+        dataIndex: 'deviceName',
+      },
+      {
+        title: '设备型号',
+        dataIndex: 'deviceModel',
+      },
+      {
+        title: 'SN码',
+        dataIndex: 'snCode',
+        textNumber: 5,
+        textEllipsis: true,
+      },
+      {
+        title: '设备一级区域',
+        dataIndex: 'device1Area',
+        textNumber: 5,
+        textEllipsis: true,
+      },
+      {
+        title: '设备二级区域',
+        dataIndex: 'device2Area',
+        textNumber: 5,
+        textEllipsis: true,
+      },
+      {
+        title: '设备详细位置',
+        dataIndex: 'deviceAddress',
+        textNumber: 5,
+        textEllipsis: true,
+      },
+      {
+        title: '设备规格',
+        dataIndex: 'deviceTp',
+      },
+      {
+        title: '设备厂商纳税人识别号',
+        dataIndex: 'deviceRatepay',
+      },
+      {
+        title: '设备厂商',
+        dataIndex: 'manufacturer',
+      },
+      {
+        title: '厂商联系人',
+        dataIndex: 'contactPerson',
+      },
+      {
+        title: '设备描述',
+        dataIndex: 'deviceDesc',
+        textNumber: 5,
+        textEllipsis: true,
+      },
+      {
+        title: 'IP地址',
+        dataIndex: 'ipAddress',
+      },
+      {
+        title: '生产日期',
+        dataIndex: 'manufactureDate',
+      },
+      {
+        title: '采购日期',
+        dataIndex: 'purchaseDate',
+      },
+      {
+        title: '启用日期',
+        dataIndex: 'startDate',
+      },
+      {
+        title: '设备成本（元）',
+        dataIndex: 'equipmentCost',
+        textNumber: 6,
+      },
+      {
+        title: '使用期限',
+        dataIndex: 'usagePeriod',
+        textNumber: 4,
+        customRender: ({ value }) => `${value}年`,
+      },
+      {
+        title: '额定功率',
+        dataIndex: 'ratedPower',
+        textNumber: 5,
+        // customRender: ({ value }) => `${value}年`,
+      },
+      {
+        title: '特殊参数',
+        textNumber: 5,
+        dataIndex: 'specialParameters',
+      },
+    ],
+
     formConfig: {
       schemas: [
         {
-          field: 'name',
+          field: 'deviceName',
           label: '设备名称',
           component: 'NsInput',
-          autoSubmit: true,
           componentProps: {
-            placeholder: '请输入',
+            placeholder: '请输入设备名称',
           },
         },
-      ],
+        {
-    },
+          field: 'areas',
-  },
+          label: '设备区域',
-  params: {
+          component: 'NsCascader',
-    page: 0,
+          format: (record) => {
-    pageSize: 10,
+            console.log(record);
-  },
-  rowSelection: null,
-  columns: [
-    {
-      title: '设备名称',
-      dataIndex: 'id',
-    },
-    {
-      title: '设备型号',
-      dataIndex: 'deviceCode',
-    },
-    {
-      title: 'SN码',
-      dataIndex: 'deviceName',
-      textNumber: 8,
-      textEllipsis: true,
-    },
-    {
-      title: '设备一级区域',
-      dataIndex: 'position',
-    },
-    {
-      title: '设备二级区域',
-      dataIndex: 'position',
-    },
-    {
-      title: '设备详细位置',
-      dataIndex: 'position',
-    },
-    {
-      title: '设备规格',
-      dataIndex: 'position',
-    },
-    {
-      title: '设备厂商纳税人识别号',
-      dataIndex: 'position',
-    },
-    {
-      title: '厂商联系人',
-      dataIndex: 'position',
-    },
-    {
-      title: '设备描述',
-      dataIndex: 'position',
-    },
-    {
-      title: 'IP地址',
-      dataIndex: 'position',
-    },
-    {
-      title: '生产日期',
-      dataIndex: 'position',
-    },
-    {
-      title: '采购日期',
-      dataIndex: 'position',
-    },
-    {
-      title: '启用日期',
-      dataIndex: 'position',
-    },
-    {
-      title: '设备成本（元）',
-      dataIndex: 'position',
-    },
-    {
-      title: '使用期限',
-      dataIndex: 'position',
-    },
-    {
-      title: '额定功率',
-      dataIndex: 'position',
-    },
-    {
-      title: '特殊参数',
-      dataIndex: 'position',
-    },
-  ],
 
-  formConfig: {
+            return record?.reduce(
-    schemas: [
+              (pre, cur) => {
-      {
+                const len = cur?.length - 1;
-        field: 'name',
+                pre[len].push(cur[len]);
-        label: '设备名称',
+                return pre;
-        component: 'NsInput',
+              },
-        componentProps: {
+              [[], []],
-          placeholder: '请输入',
+            );
-        },
+          },
-      },
+          fieldMap: ['area1', 'area2'],
-      {
+          componentProps: {
-        field: 'provider',
+            placeholder: '请选择设备区域',
-        label: '设备厂商',
+            multiple: true,
-        component: 'NsInput',
+            loadData: (selectedOptions, options) => {
-        componentProps: {
+              const targetOption = selectedOptions[selectedOptions.length - 1];
-          placeholder: '请输入',
+              if (!selectedOptions.length) {
-        },
+                http.post(device.dropArea, { orgId }).then((res) => {
-      },
+                  options.value = res.data?.map((item) => {
-      {
+                    return { label: item, value: item, children: [], isLeaf: false };
-        field: 'payWay',
+                  });
-        label: '设备区域',
+                });
-        component: 'NsSelect',
+              }
-        componentProps: {
+              const value = targetOption?.value;
-          placeholder: '请选择',
+              if (targetOption) {
-          options: [
+                targetOption.loading = true;
-            {
+                http.post(device.dropArea, { device1Area: value, orgId }).then((res) => {
-              label: '全部',
+                  targetOption.loading = false;
-              value: '',
+                  targetOption.children = res.data?.map((item) => {
+                    return { label: item, value: item, children: [], isLeaf: true };
+                  });
+                });
+              }
             },
-          ],
+          },
         },
-      },
+        {
-      {
+          field: 'manufacturer',
-        field: 'createTime',
+          label: '设备厂商',
-        label: '生产日期',
+          component: 'NsInput',
-        component: 'NsRangePicker',
+          componentProps: {
-        fieldMap: ['queryStartDate', 'queryEndDate'],
+            placeholder: '请输入设备厂商',
-        componentProps: {
+            options: [
-          valueFormat: 'YYYY-MM-DD',
+              {
+                label: '全部',
+                value: '',
+              },
+            ],
+          },
         },
-      },
+        {
-      {
+          field: 'createTime',
-        field: 'createTime1',
+          label: '生产日期',
-        label: '采购日期',
+          component: 'NsRangePicker',
-        component: 'NsRangePicker',
+          fieldMap: ['manufactureBeginDate', 'manufactureEndDate'],
-        fieldMap: ['queryStartDate', 'queryEndDate'],
+          componentProps: {
-        componentProps: {
+            valueFormat: 'YYYY-MM-DD',
-          valueFormat: 'YYYY-MM-DD',
+            placeholder: ['设备生产开始日期', '设备生产结束日期'],
+          },
         },
-      },
+        {
-      {
+          field: 'createTime1',
-        field: 'createTime2',
+          label: '采购日期',
-        label: '启用日期',
+          component: 'NsRangePicker',
-        component: 'NsRangePicker',
+          fieldMap: ['purchaseBeginDate', 'purchaseEndDate'],
-        fieldMap: ['queryStartDate', 'queryEndDate'],
+          componentProps: {
-        componentProps: {
+            valueFormat: 'YYYY-MM-DD',
-          valueFormat: 'YYYY-MM-DD',
+            placeholder: ['设备采购开始日期', '设备采购结束日期'],
+          },
         },
-      },
+        {
-    ],
+          field: 'createTime2',
-    params: {},
+          label: '启用日期',
-  },
+          component: 'NsRangePicker',
-  // pagination: { pageSizeOptions: false },
+          fieldMap: ['startBeginDate', 'startEndDate'],
-  rowKey: 'uuid',
+          componentProps: {
+            valueFormat: 'YYYY-MM-DD',
+            placeholder: ['设备启用开始日期', '设备启用结束日期'],
+          },
+        },
+      ],
+      params: {},
+    },
+    // pagination: { pageSizeOptions: false },
+    rowKey: 'uuid',
+  });
 };

hx-ai-intelligent/src/view/equipmentManage/ledger/index.vue

@@ -1,8 +1,14 @@
 <template>
-  <ns-view-list-table v-bind="tableConfig" />
+  <ns-view-list-table v-bind="config" />
 </template>
 <script lang="ts" setup>
   import { tableConfig } from './config';
+  import { computed, nextTick, ref } from 'vue';
+  const orgId = ref('');
+  const result = JSON.parse(sessionStorage.getItem('ORGID')!);
+  orgId.value = result;
+  const config = tableConfig(orgId.value);
+
   defineOptions({
     name: 'LedgerIndex', // 与页面路由name一致缓存才可生效
   });

lib/component/table/table-header.vue

@@ -1,9 +1,9 @@
 <!-- @format -->
 
 <template>
-  <div class="ns-table-header" v-if="!isEmpty(getActions)">
+  <div class="ns-table-header">
     <div class="ns-table-title ns-title-extra-box" v-if="tableTitle">{{ tableTitle }}</div>
-    <div class="ns-table-header-action">
+    <div class="ns-table-header-action" v-if="!isEmpty(getActions)">
       <slot name="header" :data="data"></slot>
       <template v-for="item in getActions" :key="item.name">
         <ns-button @click="item.finalHandle()" :disabled="item.dynamicDisabled" :type="item.type">

lib/component/tree/tree-api.vue

@@ -66,7 +66,7 @@
     treeState.loading = loading;
   };
   const httpPrams = computed(() => {
-    return { ...route.params, ...route.query, ...props.defaultParams };
+    return { ...route.params, ...route.query, ...props.params };
   });
 
   const getData = (params = {}) => {

lib/saas/view/system/layout/header.vue

@@ -431,7 +431,7 @@
     flex: 1;
     .projectTitle {
       font-size: 28px;
-      font-weight: 900;
+      font-weight: 500;
       letter-spacing: 2.33px;
       line-height: 40px;
       color: @primary-color;