diff --git a/locale/zh-CN.json b/locale/zh-CN.json index 50f5cab..3f254c8 100644 --- a/locale/zh-CN.json +++ b/locale/zh-CN.json @@ -1,4 +1,13 @@ { + "uni.picker.cancel": "取消", + "uni.picker.done": "确定", + "uni.picker.select": "请选择", + "uni.picker.year": "年", + "uni.picker.month": "月", + "uni.picker.day": "日", + "uni.picker.hour": "时", + "uni.picker.minute": "分", + "uni.picker.second": "秒", "locale.en-US": "English", "locale.zh-CN": "简体中文", "navBar.login": "登录", @@ -870,4 +879,5 @@ } + } \ No newline at end of file diff --git a/manifest.json b/manifest.json index c8c9de0..acd049a 100644 --- a/manifest.json +++ b/manifest.json @@ -1,186 +1,186 @@ { - "name" : "芯程物联", - "appid" : "__UNI__0B4DD99", - "description" : "开源物联网平台", - "versionName" : "1.0.0", - "versionCode" : 260, - "transformPx" : false, - "app-plus" : { - "kernel" : { - "ios" : "WKWebview" - }, - "usingComponents" : true, - "nvueCompiler" : "uni-app", - "compilerVersion" : 3, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 - }, - "modules" : { - "Barcode" : {}, - "OAuth" : {}, - "Camera" : {} - }, - "distribute" : { - "android" : { - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "minSdkVersion" : 22, - "targetSdkVersion" : 30, - "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ], - "permissionExternalStorage" : { - "request" : "none", - "prompt" : "应用保存运行状态等信息，需要获取读写手机存储权限，请允许。" - }, - "permissionPhoneState" : { - "request" : "none", - "prompt" : "为保证您正常、安全地使用，需要获取设备识别码使用权限，请允许。" - }, - "schemes" : "fastbee" - }, - "ios" : { - "idfa" : true, - "privacyDescription" : { - "NSLocationAlwaysUsageDescription" : "便于您使用该功能获取当前位置天气情况、WIFI列表等场景。", - "NSLocationAlwaysAndWhenInUseUsageDescription" : "便于您使用该功能获取当前位置天气情况、WIFI列表等场景。", - "NSLocalNetworkUsageDescription" : "允许访问蜂窝网络，用于扫码/关联式添加设备", - "NSLocationWhenInUseUsageDescription" : "便于您使用该功能获取当前位置天气情况、WIFI列表等场景。" - }, - "dSYMs" : false, - "urltypes" : "fastbee" - }, - "sdkConfigs" : { - "push" : {}, - "statics" : {}, - "maps" : {}, - "ad" : {}, - "oauth" : { - "weixin" : { - "appid" : "wx6be3f0d7bf7154e1", - "appsecret" : "b6c1d0da60bd5250857d211cdc64fdc9", - "UniversalLinks" : "" - } - } - }, - "splashscreen" : { - "iosStyle" : "common", - "androidStyle" : "default", - "alwaysShowBeforeRender" : false, - "waiting" : true, - "autoclose" : false, - "delay" : 0, - "android" : { - "hdpi" : "./static/logo.9.png", - "xhdpi" : "./static/logo.9.png", - "xxhdpi" : "./static/logo.9.png" - } - }, - "icons" : { - "android" : { - "hdpi" : "unpackage/res/icons/72x72.png", - "xhdpi" : "unpackage/res/icons/96x96.png", - "xxhdpi" : "unpackage/res/icons/144x144.png", - "xxxhdpi" : "unpackage/res/icons/192x192.png" - }, - "ios" : { - "appstore" : "unpackage/res/icons/1024x1024.png", - "ipad" : { - "app" : "unpackage/res/icons/76x76.png", - "app@2x" : "unpackage/res/icons/152x152.png", - "notification" : "unpackage/res/icons/20x20.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "proapp@2x" : "unpackage/res/icons/167x167.png", - "settings" : "unpackage/res/icons/29x29.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "spotlight" : "unpackage/res/icons/40x40.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png" - }, - "iphone" : { - "app@2x" : "unpackage/res/icons/120x120.png", - "app@3x" : "unpackage/res/icons/180x180.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "notification@3x" : "unpackage/res/icons/60x60.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "settings@3x" : "unpackage/res/icons/87x87.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png", - "spotlight@3x" : "unpackage/res/icons/120x120.png" - } - } - } - }, - "uniStatistics" : { - "enable" : false - }, - "nativePlugins" : {} - }, - "quickapp" : {}, - "mp-weixin" : { - "appid" : "wx735fe3b42677d2ac", - "setting" : { - "urlCheck" : false, - "minified" : true, - "es6" : true - }, - "usingComponents" : true, - "uniStatistics" : { - "enable" : false - }, - "optimization" : { - "subPackages" : true - }, - "permission" : { - "scope.userLocation" : { - "desc" : "便于您使用该功能获取当前位置天气情况、WIFI列表等场景。" - } - }, - "requiredPrivateInfos" : [ "getLocation" ], - "lazyCodeLoading" : "requiredComponents" - }, - "mp-alipay" : { - "usingComponents" : true - }, - "mp-baidu" : { - "usingComponents" : true - }, - "mp-toutiao" : { - "usingComponents" : true - }, - "uniStatistics" : { - "enable" : false - }, - "h5" : { - "title" : "蜂信物联", - "router" : { - "mode" : "hash", - "base" : "./" - }, - "devServer" : { - // "disableHostCheck": true, // 禁止访问本地host文件 - "port" : 8090 - }, - "optimization" : { - "treeShaking" : { - "enable" : false - } - }, - "template" : "uni_modules/jessibuca/hybrid/index.html", - "sdkConfigs" : { - "maps" : { - "qqmap" : { - "key" : "4PDBZ-4KQKU-AX6VO-GU7NB-INDZJ-YBFXC" - } - } - } - } -} + "name": "芯程物联", + "appid": "__UNI__0B4DD99", + "description": "开源物联网平台", + "versionName": "1.0.0", + "versionCode": 260, + "transformPx": false, + "app-plus": { + "kernel": { + "ios": "WKWebview" + }, + "usingComponents": true, + "nvueCompiler": "uni-app", + "compilerVersion": 3, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 + }, + "modules": { + "Barcode": {}, + "OAuth": {}, + "Camera": {} + }, + "distribute": { + "android": { + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "minSdkVersion": 22, + "targetSdkVersion": 30, + "abiFilters": ["armeabi-v7a", "arm64-v8a"], + "permissionExternalStorage": { + "request": "none", + "prompt": "应用保存运行状态等信息，需要获取读写手机存储权限，请允许。" + }, + "permissionPhoneState": { + "request": "none", + "prompt": "为保证您正常、安全地使用，需要获取设备识别码使用权限，请允许。" + }, + "schemes": "fastbee" + }, + "ios": { + "idfa": true, + "privacyDescription": { + "NSLocationAlwaysUsageDescription": "便于您使用该功能获取当前位置天气情况、WIFI列表等场景。", + "NSLocationAlwaysAndWhenInUseUsageDescription": "便于您使用该功能获取当前位置天气情况、WIFI列表等场景。", + "NSLocalNetworkUsageDescription": "允许访问蜂窝网络，用于扫码/关联式添加设备", + "NSLocationWhenInUseUsageDescription": "便于您使用该功能获取当前位置天气情况、WIFI列表等场景。" + }, + "dSYMs": false, + "urltypes": "fastbee" + }, + "sdkConfigs": { + "push": {}, + "statics": {}, + "maps": {}, + "ad": {}, + "oauth": { + "weixin": { + "appid": "wx6be3f0d7bf7154e1", + "appsecret": "b6c1d0da60bd5250857d211cdc64fdc9", + "UniversalLinks": "" + } + } + }, + "splashscreen": { + "iosStyle": "common", + "androidStyle": "default", + "alwaysShowBeforeRender": false, + "waiting": true, + "autoclose": false, + "delay": 0, + "android": { + "hdpi": "./static/logo.9.png", + "xhdpi": "./static/logo.9.png", + "xxhdpi": "./static/logo.9.png" + } + }, + "icons": { + "android": { + "hdpi": "unpackage/res/icons/72x72.png", + "xhdpi": "unpackage/res/icons/96x96.png", + "xxhdpi": "unpackage/res/icons/144x144.png", + "xxxhdpi": "unpackage/res/icons/192x192.png" + }, + "ios": { + "appstore": "unpackage/res/icons/1024x1024.png", + "ipad": { + "app": "unpackage/res/icons/76x76.png", + "app@2x": "unpackage/res/icons/152x152.png", + "notification": "unpackage/res/icons/20x20.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "proapp@2x": "unpackage/res/icons/167x167.png", + "settings": "unpackage/res/icons/29x29.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "spotlight": "unpackage/res/icons/40x40.png", + "spotlight@2x": "unpackage/res/icons/80x80.png" + }, + "iphone": { + "app@2x": "unpackage/res/icons/120x120.png", + "app@3x": "unpackage/res/icons/180x180.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "notification@3x": "unpackage/res/icons/60x60.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "settings@3x": "unpackage/res/icons/87x87.png", + "spotlight@2x": "unpackage/res/icons/80x80.png", + "spotlight@3x": "unpackage/res/icons/120x120.png" + } + } + } + }, + "uniStatistics": { + "enable": false + }, + "nativePlugins": {} + }, + "quickapp": {}, + "mp-weixin": { + "appid": "wx52ca113738fb0f64", + "setting": { + "urlCheck": false, + "minified": true, + "es6": true + }, + "usingComponents": true, + "uniStatistics": { + "enable": false + }, + "optimization": { + "subPackages": true + }, + "permission": { + "scope.userLocation": { + "desc": "便于您使用该功能获取当前位置天气情况、WIFI列表等场景。" + } + }, + "requiredPrivateInfos": ["getLocation"], + "lazyCodeLoading": "requiredComponents" + }, + "mp-alipay": { + "usingComponents": true + }, + "mp-baidu": { + "usingComponents": true + }, + "mp-toutiao": { + "usingComponents": true + }, + "uniStatistics": { + "enable": false + }, + "h5": { + "title": "蜂信物联", + "router": { + "mode": "hash", + "base": "./" + }, + "devServer": { + // "disableHostCheck": true, // 禁止访问本地host文件 + "port": 8090 + }, + "optimization": { + "treeShaking": { + "enable": false + } + }, + "template": "uni_modules/jessibuca/hybrid/index.html", + "sdkConfigs": { + "maps": { + "qqmap": { + "key": "4PDBZ-4KQKU-AX6VO-GU7NB-INDZJ-YBFXC" + } + } + } + } +} \ No newline at end of file diff --git a/node_modules/.vue-global-types/vue_99_0_0_0.d.ts b/node_modules/.vue-global-types/vue_99_0_0_0.d.ts new file mode 100644 index 0000000..1c73e1f --- /dev/null +++ b/node_modules/.vue-global-types/vue_99_0_0_0.d.ts @@ -0,0 +1,118 @@ +// @ts-nocheck +export {}; + +; declare global { + const __VLS_intrinsicElements: __VLS_IntrinsicElements; + const __VLS_directiveBindingRestFields: { instance: null, oldValue: null, modifiers: any, dir: any }; + const __VLS_unref: typeof import('vue').unref; + const __VLS_placeholder: any; + + type __VLS_NativeElements = __VLS_SpreadMerge; + type __VLS_IntrinsicElements = import('vue/jsx-runtime').JSX.IntrinsicElements; + type __VLS_Element = import('vue/jsx-runtime').JSX.Element; + type __VLS_GlobalComponents = import('vue').GlobalComponents; + type __VLS_GlobalDirectives = import('vue').GlobalDirectives; + type __VLS_IsAny = 0 extends 1 & T ? true : false; + type __VLS_PickNotAny = __VLS_IsAny extends true ? B : A; + type __VLS_SpreadMerge = Omit & B; + type __VLS_WithComponent = + N1 extends keyof LocalComponents ? N1 extends N0 ? Pick : { [K in N0]: LocalComponents[N1] } : + N2 extends keyof LocalComponents ? N2 extends N0 ? Pick : { [K in N0]: LocalComponents[N2] } : + N3 extends keyof LocalComponents ? N3 extends N0 ? Pick : { [K in N0]: LocalComponents[N3] } : + Self extends object ? { [K in N0]: Self } : + N1 extends keyof __VLS_GlobalComponents ? N1 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N1] } : + N2 extends keyof __VLS_GlobalComponents ? N2 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N2] } : + N3 extends keyof __VLS_GlobalComponents ? N3 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N3] } : + { [K in N0]: unknown }; + type __VLS_FunctionalComponentProps = + '__ctx' extends keyof __VLS_PickNotAny ? K extends { __ctx?: { props?: infer P } } ? NonNullable

: never + : T extends (props: infer P, ...args: any) => any ? P : + {}; + type __VLS_IsFunction = K extends keyof T + ? __VLS_IsAny extends false + ? unknown extends T[K] + ? false + : true + : false + : false; + type __VLS_NormalizeComponentEvent = ( + __VLS_IsFunction extends true + ? Props + : __VLS_IsFunction extends true + ? { [K in onEvent]?: Events[Event] } + : __VLS_IsFunction extends true + ? { [K in onEvent]?: Events[CamelizedEvent] } + : Props + ) & Record; + // fix https://github.com/vuejs/language-tools/issues/926 + type __VLS_UnionToIntersection = (U extends unknown ? (arg: U) => unknown : never) extends ((arg: infer P) => unknown) ? P : never; + type __VLS_OverloadUnionInner = U & T extends (...args: infer A) => infer R + ? U extends T + ? never + : __VLS_OverloadUnionInner & U & ((...args: A) => R)> | ((...args: A) => R) + : never; + type __VLS_OverloadUnion = Exclude< + __VLS_OverloadUnionInner<(() => never) & T>, + T extends () => never ? never : () => never + >; + type __VLS_ConstructorOverloads = __VLS_OverloadUnion extends infer F + ? F extends (event: infer E, ...args: infer A) => any + ? { [K in E & string]: (...args: A) => void; } + : never + : never; + type __VLS_NormalizeEmits = __VLS_PrettifyGlobal< + __VLS_UnionToIntersection< + __VLS_ConstructorOverloads & { + [K in keyof T]: T[K] extends any[] ? { (...args: T[K]): void } : never + } + > + >; + type __VLS_PrettifyGlobal = { [K in keyof T]: T[K]; } & {}; + type __VLS_PickFunctionalComponentCtx = NonNullable<__VLS_PickNotAny< + '__ctx' extends keyof __VLS_PickNotAny ? K extends { __ctx?: infer Ctx } ? Ctx : never : any + , T extends (props: any, ctx: infer Ctx) => any ? Ctx : any + >>; + type __VLS_UseTemplateRef = Readonly>; + + function __VLS_getVForSourceType>(source: T): [ + item: T extends number ? number + : T extends string ? string + : T extends any[] ? T[number] + : T extends Iterable ? T1 + : any, + index: number, + ][]; + function __VLS_getVForSourceType(source: T): [ + item: T[keyof T], + key: keyof T, + index: number, + ][]; + // @ts-ignore + function __VLS_getSlotParams(slot: T): Parameters<__VLS_PickNotAny, (...args: any[]) => any>>; + // @ts-ignore + function __VLS_getSlotParam(slot: T): Parameters<__VLS_PickNotAny, (...args: any[]) => any>>[0]; + function __VLS_asFunctionalDirective(dir: T): T extends import('vue').ObjectDirective + ? NonNullable + : T extends (...args: any) => any + ? T + : (arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown) => void; + function __VLS_makeOptional(t: T): { [K in keyof T]?: T[K] }; + function __VLS_asFunctionalComponent any ? InstanceType : unknown>(t: T, instance?: K): + T extends new (...args: any) => any + ? (props: (K extends { $props: infer Props } ? Props : any) & Record, ctx?: any) => __VLS_Element & { + __ctx?: { + attrs?: any; + slots?: K extends { $slots: infer Slots } ? Slots : any; + emit?: K extends { $emit: infer Emit } ? Emit : any; + expose?(exposed: K): void; + props?: (K extends { $props: infer Props } ? Props : any) & Record; + } + } + : T extends () => any ? (props: {}, ctx?: any) => ReturnType + : T extends (...args: any) => any ? T + : (_: {} & Record, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: {} & Record } }; + function __VLS_functionalComponentArgsRest any>(t: T): 2 extends Parameters['length'] ? [any] : []; + function __VLS_asFunctionalElement(tag: T, endTag?: T): (attrs: T & Record) => void; + function __VLS_asFunctionalSlot(slot: S): S extends () => infer R ? (props: {}) => R : NonNullable; + function __VLS_tryAsConstant(t: T): T; +} diff --git a/pagesA/home/device/status/base.vue b/pagesA/home/device/status/base.vue index b37ec98..e4fc024 100644 --- a/pagesA/home/device/status/base.vue +++ b/pagesA/home/device/status/base.vue @@ -810,6 +810,9 @@ } this.updateDeviceStatus(this.deviceInfo); this.initChart(); + console.log("wumoxing", JSON.stringify(this.deviceInfo.thingsModels)) + + } } }, @@ -1197,6 +1200,7 @@ }, /**监测图表*/ initChart() { + console.log(111) this.monitorChart = []; if (this.deviceInfo.chartList && this.deviceInfo.chartList.length !== 0) { for (let i = 0; i < this.deviceInfo.chartList.length; i++) { diff --git a/pagesA/home/device/status/gateway.vue b/pagesA/home/device/status/gateway.vue new file mode 100644 index 0000000..1657ec5 --- /dev/null +++ b/pagesA/home/device/status/gateway.vue @@ -0,0 +1,288 @@ + + + + + \ No newline at end of file diff --git a/pagesA/home/device/status/gatewayrunning-status.vue b/pagesA/home/device/status/gatewayrunning-status.vue new file mode 100644 index 0000000..33577ae --- /dev/null +++ b/pagesA/home/device/status/gatewayrunning-status.vue @@ -0,0 +1,1241 @@ + + + + + diff --git a/pagesA/home/device/status/index.vue b/pagesA/home/device/status/index.vue index aa42b91..6f4ba96 100644 --- a/pagesA/home/device/status/index.vue +++ b/pagesA/home/device/status/index.vue @@ -8,22 +8,22 @@ - + - + - + - + - + diff --git a/pagesA/home/device/status/voice.vue b/pagesA/home/device/status/voice.vue new file mode 100644 index 0000000..5bf8d59 --- /dev/null +++ b/pagesA/home/device/status/voice.vue @@ -0,0 +1,1329 @@ + + + + + \ No newline at end of file