@cpzxrobot/sdk 1.2.26 → 1.2.28

package/device_type_gateway.ts

@@ -1,4 +1,4 @@
-import { Cpzxrobot, Unit } from "."
+import { Cpzxrobot, Unit, DeviceType } from "."
 
 //缓存设备类型数据
 export class DeviceTypeGateway {
@@ -10,7 +10,7 @@ export class DeviceTypeGateway {
     this.context = context
   }
 
-  list(): Promise<[]> {
+  list(): Promise<DeviceType[]> {
     if (this.deviceTypes) {
       return Promise.resolve(this.deviceTypes)
     }

package/dist/factory_gateway.js

@@ -101,9 +101,9 @@ class FactoryGateway extends Object {
         return response.data;
     }
     //获得工厂的所有单元信息,以车间为单位树状结构
-    async units(id) {
+    async units(id = undefined) {
         var axios = await this.context.ready;
-        if (id === null) {
+        if (!id) {
             var farm = await this.context.user.getSelectedFarm();
             id = farm.id;
         }

package/factory_gateway.ts

@@ -116,9 +116,9 @@ export class FactoryGateway extends Object {
   }
 
   //获得工厂的所有单元信息,以车间为单位树状结构
-  async units(id: number|null): Promise<any> {
+  async units(id: number|undefined = undefined): Promise<any> {
     var axios = await this.context.ready;
-    if (id === null) {
+    if (!id) {
       var farm = await this.context.user.getSelectedFarm();
       id = farm.id;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cpzxrobot/sdk",
-  "version": "1.2.26",
+  "version": "1.2.28",
   "description": "提供给上海正芯数智APP第三方H5应用使用的SDK",
   "main": "dist/index.js",
   "scripts": {

package/types.d.ts

@@ -29,6 +29,7 @@ type Device = {
   supplier?: string;
   data?: number[];
   typeCode: string;
+  unitId: number;
 };
 
 type FeedTowerExtraInfo = {
@@ -97,6 +98,12 @@ type Unit = {
   workshopId?: number;
   factoryId?: number;
 };
+type DeviceType = {
+  id: number;
+  code: string;
+  name: string;
+  location?: string;
+};
 type HeatLamp = {
   id: number;
   unitId: number;
@@ -281,7 +288,7 @@ interface MyAxiosInstance {
   //option.title:上传文件选择框的标题
   //option.fileField:上传的文件字段名，默认为file
   //option.data:上传的数据，例如{id:123,name:"xxx"},文件会被附加到data中，作为文件字段上传
-  upload: (url: string,option?: {}) => Promise<any>;
+  upload: (url: string, option?: {}) => Promise<any>;
 }
 
 interface Assistant {
@@ -299,17 +306,17 @@ interface DataQueryArgs {
   start?: string;
   stop?: string;
   type?:
-    | "diffPerDay"
-    | "sumPerDay"
-    | "rangeOfDay"
-    | "rangeToday"
-    | "latest"
-    | "latestInRangePerDay"
-    | "last"
-    | "max"
-    | "raw"
-    | "difference";
-  period?: "1mo" | "1d" | "1h" |null; // 统计周期，默认为1d
+  | "diffPerDay"
+  | "sumPerDay"
+  | "rangeOfDay"
+  | "rangeToday"
+  | "latest"
+  | "latestInRangePerDay"
+  | "last"
+  | "max"
+  | "raw"
+  | "difference";
+  period?: "1mo" | "1d" | "1h" | null; // 统计周期，默认为1d
   offset?: string; // 可以设置统计偏移量，比如设置18h, 则统计从当天晚上6点开始
   [key: string]: any;
   aggerate?: string;
@@ -364,20 +371,20 @@ declare module "@cpzxrobot/sdk" {
       selectedFarm: Factory | null | undefined;
       selectedUnit: Unit | null | undefined;
     } = {
-      devAuth: "",
-      appCode: "",
-      baseURL: "https://www.cpzxrobot.com/",
-      selectedFarm: {
-        id: 0,
-        code: "",
-        name: "",
-        company_code: "",
-      },
-      selectedUnit: {
-        id: 0,
-        name: "",
-      },
-    }
+        devAuth: "",
+        appCode: "",
+        baseURL: "https://www.cpzxrobot.com/",
+        selectedFarm: {
+          id: 0,
+          code: "",
+          name: "",
+          company_code: "",
+        },
+        selectedUnit: {
+          id: 0,
+          name: "",
+        },
+      }
   ): Cpzxrobot;
   export {
     Cpzxrobot,