hear 3 rokov pred
rodič
commit
a24cd82c2b

+ 2 - 2
src/components/SearchComponent/index.tsx

@@ -294,12 +294,12 @@ const SearchComponent = <T extends Record<string, any>>(props: Props<T>) => {
                     state.componentProps = { showTime: true, allowClear: true };
                   });
                   f.setFieldState(typeFiled.query('.termType'), async (state) => {
-                    state.value = 'gte';
+                    state.value = 'eq';
                   });
                   // console.log(isModified);
                   if (isModified) {
                     f.setFieldState(typeFiled.query('.termType'), async (state) => {
-                      state.value = 'gte';
+                      state.value = 'eq';
                     });
                   }
 

+ 12 - 5
src/pages/account/NotificationRecord/index.tsx

@@ -76,11 +76,18 @@ const NotificationRecord = observer(() => {
       },
       valueType: 'select',
       request: () =>
-        service.getProvidersList().then((resp: any) =>
-          resp.map((item: any) => ({
-            label: item.label,
-            value: item.value,
-          })),
+        service.getProvidersList().then(
+          (resp: any) =>
+            resp
+              .filter((items: any) => items.value === 'alarm')
+              .map((item: any) => ({
+                label: item.label,
+                value: item.value,
+              })),
+          // resp.map((item: any) => ({
+          //   label: item.label,
+          //   value: item.value,
+          // })),
         ),
     },
     {

+ 2 - 2
src/pages/device/DashBoard/index.tsx

@@ -511,12 +511,12 @@ const DeviceBoard = () => {
             value={productTotal}
             footer={[
               {
-                title: '已发布',
+                title: '正常',
                 value: productPublish,
                 status: 'success',
               },
               {
-                title: '未发布',
+                title: '禁用',
                 value: productUnPublish,
                 status: 'error',
               },

+ 1 - 1
src/pages/device/Instance/Detail/Reation/index.tsx

@@ -55,7 +55,7 @@ const Reation = () => {
           </span>
         }
       >
-        {(data || [])?.map((item: any) => (
+        {(data.reverse() || [])?.map((item: any) => (
           <Descriptions.Item span={1} label={item.relationName} key={item.objectId}>
             <Ellipsis
               title={item?.related ? _.map(item?.related || [], 'name').join(',') : ''}

+ 4 - 3
src/pages/device/Instance/Detail/Running/index.tsx

@@ -1,10 +1,10 @@
 import { InstanceModel } from '@/pages/device/Instance';
-import { Card, Input, Tabs } from 'antd';
+import { Card, Empty, Input, Tabs } from 'antd';
 import type { DeviceMetadata } from '@/pages/device/Product/typings';
 import Property from '@/pages/device/Instance/Detail/Running/Property';
 import Event from '@/pages/device/Instance/Detail/Running/Event';
 import { useEffect, useState } from 'react';
-import Empty from '@/pages/device/components/Empty';
+import Emptys from '@/pages/device/components/Empty';
 import { useDomFullHeight } from '@/hooks';
 
 const Running = () => {
@@ -46,7 +46,7 @@ const Running = () => {
             height: minHeight - 150,
           }}
         >
-          <Empty />
+          <Emptys />
         </div>
       ) : (
         <div className="tabs-full-active">
@@ -64,6 +64,7 @@ const Running = () => {
               </Tabs.TabPane>
             ))}
           </Tabs>
+          {list.length === 0 && <Empty description="暂无数据" style={{ marginTop: '10%' }} />}
         </div>
       )}
     </Card>

+ 5 - 4
src/pages/system/Role/Detail/UserManage/index.tsx

@@ -117,14 +117,15 @@ const UserManage = () => {
         search={false}
         tableAlertOptionRender={() => (
           <Space size={16}>
-            <a
-              onClick={() => {
+            <Popconfirm
+              title="确认解绑嘛"
+              onConfirm={() => {
                 setSelectedRowKeys([]);
                 unBindUser(params.id, [...selectedRowKeys]);
               }}
             >
-              批量解绑
-            </a>
+              <a>批量解绑</a>
+            </Popconfirm>
           </Space>
         )}
         columnEmptyText={''}

+ 1 - 0
src/utils/menu/router.ts

@@ -191,6 +191,7 @@ export const getDetailNameByCode = {
 export const CommunityCodeList = [
   'account/Center',
   'account/NotificationSubscription',
+  'account/NotificationRecord',
   'system/Basis',
   'system/User',
   'system/Department',