diff --git a/.env b/.env index 4c77e08c..9456365e 100644 --- a/.env +++ b/.env @@ -1,8 +1,8 @@ # 标题 -VITE_APP_TITLE=芋道管理系统 +VITE_APP_TITLE=生产运营管理系统 # 项目本地运行端口号 -VITE_PORT=80 +VITE_PORT=8088 # open 运行 npm run dev 时自动打开浏览器 VITE_OPEN=true diff --git a/.env.prod b/.env.prod index 8b78c415..fc0d00bc 100644 --- a/.env.prod +++ b/.env.prod @@ -4,10 +4,12 @@ NODE_ENV=production VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://localhost:48080' +VITE_BASE_URL='http://47.106.185.127:48080' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务 VITE_UPLOAD_TYPE=server +# 上传路径 +VITE_UPLOAD_URL='http://47.106.185.127:48080/admin-api/infra/file/upload' # 接口地址 VITE_API_URL=/admin-api diff --git a/src/api/iot/mqttdatarecord/index.ts b/src/api/iot/mqttdatarecord/index.ts index 88f0851b..db0943b9 100644 --- a/src/api/iot/mqttdatarecord/index.ts +++ b/src/api/iot/mqttdatarecord/index.ts @@ -6,6 +6,8 @@ export interface MqttDataRecordVO { deviceName: string // 设备 attribute: string // 属性 attrValue: string // 属性值 + deviceTime: number + createTime: number } // 设备数据记录 API diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue index d2c03fa0..3994b10e 100644 --- a/src/views/iot/device/index.vue +++ b/src/views/iot/device/index.vue @@ -178,13 +178,14 @@ diff --git a/src/views/iot/mqttdata/index.vue b/src/views/iot/mqttdata/index.vue index c9b51830..f16aef15 100644 --- a/src/views/iot/mqttdata/index.vue +++ b/src/views/iot/mqttdata/index.vue @@ -68,14 +68,6 @@ 搜索 重置 - - 新增 - - + - - + + - + + @@ -130,24 +123,32 @@ - + +
+

dewewe

+
+
+ + + + +