Przeglądaj źródła

fix: 物模型indexDB及备案信息

hear 3 lat temu
rodzic
commit
b451d6217c

+ 14 - 7
src/pages/device/components/Metadata/Base/index.tsx

@@ -21,6 +21,7 @@ import { PermissionButton } from '@/components';
 import { onlyMessage } from '@/utils/util';
 import { onlyMessage } from '@/utils/util';
 import { message } from 'antd';
 import { message } from 'antd';
 import { InstanceModel, service as instanceService } from '@/pages/device/Instance';
 import { InstanceModel, service as instanceService } from '@/pages/device/Instance';
+import { service as productService } from '@/pages/device/Product';
 
 
 interface Props {
 interface Props {
   type: MetadataType;
   type: MetadataType;
@@ -49,7 +50,7 @@ const BaseMetadata = observer((props: Props) => {
 
 
   const removeItem = async (record: MetadataItem) => {
   const removeItem = async (record: MetadataItem) => {
     const removeDB = () => {
     const removeDB = () => {
-      return DB.getDB(param.id).table(`${type}`).delete(record.id!);
+      return DB.getDB().table(`${type}`).delete(record.id!);
     };
     };
     const _currentData = removeMetadata(type, [record], typeMap.get(target), removeDB);
     const _currentData = removeMetadata(type, [record], typeMap.get(target), removeDB);
     const result = await asyncUpdateMedata(target, _currentData);
     const result = await asyncUpdateMedata(target, _currentData);
@@ -129,11 +130,17 @@ const BaseMetadata = observer((props: Props) => {
   ];
   ];
 
 
   const initData = useCallback(async () => {
   const initData = useCallback(async () => {
-    // resetMetadata()
-    const result = await DB.getDB(param.id).table(`${type}`).toArray();
-    console.log('------sssss--', result);
-
-    setData(result.sort((a, b) => b?.sortsIndex - a?.sortsIndex));
+    // const result = await DB.getDB().table(`${type}`).toArray();
+    const resp =
+      target === 'product'
+        ? await productService.detail(param.id)
+        : await instanceService.detail(param.id);
+    if (resp.status === 200) {
+      InstanceModel.detail = resp?.result || [];
+      const item = JSON.parse(resp.result?.metadata || '{}');
+      // console.log(item)
+      setData(item[type]?.sort((a: any, b: any) => b?.sortsIndex - a?.sortsIndex));
+    }
   }, [param.id, type]);
   }, [param.id, type]);
 
 
   useEffect(() => {
   useEffect(() => {
@@ -159,7 +166,7 @@ const BaseMetadata = observer((props: Props) => {
       //   .startsWithAnyOfIgnoreCase(name)
       //   .startsWithAnyOfIgnoreCase(name)
       //   .toArray();
       //   .toArray();
       // setData(result.sort((a, b) => b?.sortsIndex - a?.sortsIndex));
       // setData(result.sort((a, b) => b?.sortsIndex - a?.sortsIndex));
-      const result = await DB.getDB(param.id).table(`${type}`).toArray();
+      const result = await DB.getDB().table(`${type}`).toArray();
       const arr = result
       const arr = result
         .filter((item) => item.name.indexOf(name) > -1)
         .filter((item) => item.name.indexOf(name) > -1)
         .sort((a, b) => b?.sortsIndex - a?.sortsIndex);
         .sort((a, b) => b?.sortsIndex - a?.sortsIndex);

+ 1 - 0
src/pages/rule-engine/Scene/Save/action/DeviceOutput/actions/TypeModel.tsx

@@ -103,6 +103,7 @@ export default observer((props: Props) => {
 
 
   useEffect(() => {
   useEffect(() => {
     setLabelValue(props.label);
     setLabelValue(props.label);
+    console.log('-------', props.label);
   }, []);
   }, []);
 
 
   const renderNode = (type: string) => {
   const renderNode = (type: string) => {

+ 7 - 1
src/pages/user/Login/index.less

@@ -152,7 +152,13 @@
     line-height: 110px;
     line-height: 110px;
     letter-spacing: 0.03em;
     letter-spacing: 0.03em;
   }
   }
-
+  .records {
+    position: absolute;
+    top: 96%;
+    left: 35%;
+    color: rgba(0, 0, 0, 0.35);
+    font-size: 14px;
+  }
   .systemDesc {
   .systemDesc {
     width: 513px;
     width: 513px;
     height: 17px;
     height: 17px;

+ 8 - 2
src/pages/user/Login/index.tsx

@@ -320,8 +320,14 @@ const Login: React.FC = () => {
             src={basis.backgroud || require('/public/images/login.png')}
             src={basis.backgroud || require('/public/images/login.png')}
             style={{ width: '100%', height: '100%' }}
             style={{ width: '100%', height: '100%' }}
           />
           />
-          {/*<div className={styles.systemName}>{SystemConst.SYSTEM_NAME}</div>*/}
-          {/*<div className={styles.systemDesc}>OPEN SOURCE INTERNET OF THINGS BASIC PLATFORM</div>*/}
+          <a
+            href={'https://beian.miit.gov.cn/#/Integrated/index'}
+            target="_blank"
+            rel="noopener noreferrer"
+            className={styles.records}
+          >
+            备案:渝ICP备19017719号-1
+          </a>
         </div>
         </div>
       </div>
       </div>
     </Spin>
     </Spin>