Skip to content

E
evm-store
Commit ca2c4302 authored by wanli's avatar wanli
Browse files
Options

🐞 fix(): 更新前端

parent cca4da40
Hide whitespace changes
Inline Side-by-side
Showing with 278 additions and 211 deletions
frontend/src/api/app-store.js
View file @ ca2c4302
import request from "@/utils/request";
export function setTemplate(data) {
return request({
url: "/report/reportmanage/setTemplate",
method: "post",
data,
});
}
export function getTemplate(params) {
return request({
url: "/report/reportmanage/templatesList",
method: "get",
params,
});
}
export function getReport(data) {
return request({
url: "/report/reportmanage/pdfGenerate",
method: "post",
data,
});
}
export function getWatchList() {
return request({
url: "/api/v1/evm_store/watch",
method: "get",
});
}
export function getMonitorData(params) {
return request({
url: "/api/v1/evm_store/monitor",
method: "get",
params,
});
}
export function addApp(params) {
return request({
url: "/api/v1/evm_store/apps/add",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/apps/add",
method: "post",
data: params,
});
}
export function getAppsList(params) {
return request({
url: "/api/v1/evm_store/apps/list",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/apps/list",
method: "post",
data: params,
});
}
export function updateApp(id, params) {
return request({
url: `/api/v1/evm_store/apps/update/${id}`,
method: "post",
data: params,
});
return request({
url: `/api/v1/evm_store/apps/update/${id}`,
method: "post",
data: params,
});
}
export function deleteApp(id) {
return request({
url: `/api/v1/evm_store/apps/delete/${id}`,
method: "post",
});
return request({
url: `/api/v1/evm_store/apps/delete/${id}`,
method: "post",
});
}
export function getBuildApp(id) {
return request({
url: `/api/v1/evm_store/apps/getBuildApp/${id}`,
method: "post"
})
return request({
url: `/api/v1/evm_store/apps/getBuildApp/${id}`,
method: "post",
});
}
export function rebuildApp(params) {
return request({
url: "/api/v1/evm_store/apps/get",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/apps/get",
method: "post",
data: params,
});
}
export function buildApp(id) {
return request({
url: `/api/v1/evm_store/apps/build/${id}`,
method: "post",
});
return request({
url: `/api/v1/evm_store/apps/build/${id}`,
method: "post",
});
}
export function getBuildLogsList(params) {
return request({
url: "/api/v1/evm_store/apps/buildLogs",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/apps/buildLogs",
method: "post",
data: params,
});
}
export function getDownloadList(params) {
return request({
url: "/api/v1/evm_store/download/list",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/download/list",
method: "post",
data: params,
});
}
export function addDownload(params) {
return request({
url: "/api/v1/evm_store/download/add",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/download/add",
method: "post",
data: params,
});
}
export function updateDownload(id, params) {
return request({
url: `/api/v1/evm_store/download/update/${id}`,
method: "post",
data: params,
});
return request({
url: `/api/v1/evm_store/download/update/${id}`,
method: "post",
data: params,
});
}
export function deleteDownload(params) {
return request({
url: "/api/v1/evm_store/framework/delete",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/framework/delete",
method: "post",
data: params,
});
}
export function addDevice(params) {
return request({
url: "/api/v1/evm_store/device/add",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/device/add",
method: "post",
data: params,
});
}
export function deleteDevice(id) {
return request({
url: `/api/v1/evm_store/device/delete/${id}`,
method: "post"
});
return request({
url: `/api/v1/evm_store/device/delete/${id}`,
method: "post",
});
}
export function getDeviceList(params) {
return request({
url: "/api/v1/evm_store/device/list",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/device/list",
method: "post",
data: params,
});
}
export function updateDevice(id, params) {
return request({
url: `/api/v1/evm_store/device/update/${id}`,
method: "post",
data: params,
});
return request({
url: `/api/v1/evm_store/device/update/${id}`,
method: "post",
data: params,
});
}
export function addUser(params) {
// 增
return request({
url: "/api/v1/evm_store/user/add",
method: "post",
data: params,
});
// 增
return request({
url: "/api/v1/evm_store/user/add",
method: "post",
data: params,
});
}
export function deleteUser(id) {
// 删
return request({
url: `/api/v1/evm_store/user/delete/${id}`,
method: "post",
});
// 删
return request({
url: `/api/v1/evm_store/user/delete/${id}`,
method: "post",
});
}
export function getUser(params) {
return request({
url: "/api/v1/evm_store/user/get",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/user/get",
method: "post",
data: params,
});
}
export function getUserList(params) {
// 查
return request({
url: "/api/v1/evm_store/user/list",
method: "post",
data: params,
});
// 查
return request({
url: "/api/v1/evm_store/user/list",
method: "post",
data: params,
});
}
export function updateUser(id, params) {
// 改
return request({
url: `/api/v1/evm_store/user/update/${id}`,
method: "post",
data: params,
});
// 改
return request({
url: `/api/v1/evm_store/user/update/${id}`,
method: "post",
data: params,
});
}
export function updateUserPassword(params) {
return request({
url: "/api/v1/evm_store/updatePassword",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/updatePassword",
method: "post",
data: params,
});
}
export function doLogin(params) {
return request({
url: "/api/v1/evm_store/login/login",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/login/login",
method: "post",
data: params,
});
}
export function doLogout(params) {
return request({
url: "/api/v1/evm_store/login/logout",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/login/logout",
method: "post",
data: params,
});
}
export function doRegister(params) {
return request({
url: "/api/v1/evm_store/login/register",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/login/register",
method: "post",
data: params,
});
}
export function addAppLogs(params) {
return request({
url: "/api/v1/evm_store/appLogs/add",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/appLogs/add",
method: "post",
data: params,
});
}
export function deleteAppLogs(params) {
return request({
url: "/api/v1/evm_store/appLogs/delete",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/appLogs/delete",
method: "post",
data: params,
});
}
export function getAppLogsList(params) {
return request({
url: "/api/v1/evm_store/appLogs/list",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/appLogs/list",
method: "post",
data: params,
});
}
export function updateAppLogs(params) {
return request({
url: "/api/v1/evm_store/appLogs/update",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/appLogs/update",
method: "post",
data: params,
});
}
export function getConvertString(params) {
return request({
url: "/api/v1/evm_store/system/convertString",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/system/convertString",
method: "post",
data: params,
});
}
export function actionOpqcp(params) {
return request({
url: "/api/v1/evm_store/opqcp",
method: "post",
data: params,
});
return request({
url: "/api/v1/evm_store/opqcp",
method: "post",
data: params,
});
}
export function getTopicList(params) {
return request({
url: "/uowap/index",
method: "get",
params
});
return request({
url: "/uowap/index",
method: "get",
params,
});
}
export function getTabList(params) {
return request({
url: "/uowap/index",
method: "get",
params
});
return request({
url: "/uowap/index",
method: "get",
params,
});
}
export function getAppList(params) {
return request({
url: "/uowap/index",
method: "get",
params
});
return request({
url: "/uowap/index",
method: "get",
params,
});
}
export function getDataList(params) {
return request({
url: "/uowap/index",
method: "get",
params
});
return request({
url: "/uowap/index",
method: "get",
params,
});
}
frontend/src/views/system/monitor.vue
View file @ ca2c4302
......@@ -393,7 +393,8 @@ import {
getMonitorData,
getReport,
getTemplate,
} from "@/api/index";
setTemplate,
} from "@/api/app-store";
import EvmChart from "./components/EvmChart";
import LvglChart from "./components/LvglChart";
import SystemChart from "./components/SystemChart";
......@@ -419,7 +420,7 @@ const dbObject = {
],
};
const indexedDb = Database();
const indexedDb = Database(), jsonFile = "evue-monitor.json";
let monitor = new indexedDb(dbObject);
function resetResult() {
......@@ -581,21 +582,26 @@ export default {
item.lvgl
)
);
});
appList = appList.concat(item.image.map((img) => {
appList = appList.concat(
this.imageList.map((img) => {
if (img.png_detail && img.png_detail.length) {
result.imageList = result.imageList.concat(
img.png_detail.map((p) => {
p.page = item.uri;
p.page = img.uri;
return p;
})
);
}
return Object.assign({ ts: Date.parse(item.system.timestamp), ...img })
}));
});
return Object.assign({
ts: Date.parse(this.globalData.system.timestamp),
...img,
});
})
);
result.appList = appList
result.appList = appList;
Object.keys(evm).forEach((k) => {
result.evmFirst[k] = 0;
......@@ -638,7 +644,7 @@ export default {
return item[k];
});
result.lvglMax[k] = Math.max.apply(null, t);
result.lvglMax[k] = Math.max.apply(null, t);
result.lvglMin[k] = Math.min.apply(null, t);
result.lvglAvg[k] = Math.ceil(
t.reduce((prev, curr) => prev + curr) / t.length
......@@ -662,37 +668,36 @@ export default {
return item[k];
});
result.systemMax[k] = Math.max.apply(null, t);
result.systemMax[k] = Math.max.apply(null, t);
result.systemMin[k] = Math.min.apply(null, t);
result.systemAvg[k] = Math.ceil(
t.reduce((prev, curr) => prev + curr) / t.length
);
});
result.imei = this.globalData.imei
result.timestamp = this.globalData.system.timestamp
result.imei = this.globalData.imei;
result.timestamp = this.globalData.system.timestamp;
let params = {
templateName: "evue-monitor.json",
return getReport({
templateJson: jsonFile,
dataJson: result,
};
return getReport(params);
});
})
.then((res) => {
if (res.retcode == 0) {
download(res.message.file, res.message.url).then(res => {
console.log(res)
}).catch(err => {
console.log(err)
})
this.$message.success("success")
if (res.code == 200) {
download(res.data.file, res.data.url)
.then((res) => {
console.log(res);
})
.catch((err) => {
console.error(err);
});
}
console.log(res);
this.$message.success(res.msg);
})
.catch((err) => {
// this.$message.error(err.msg);
console.log(err);
this.$message.error(err.msg);
console.error(err);
});
},
tableRowClassName({ row }) {
......@@ -787,7 +792,6 @@ export default {
// 将设备发送过来的消息存储到浏览器中
// 这里可以优化，将所有数据，保存到indexed datebase中
const m = deepClone(msg);
if (monitor.db) monitor.set(msg);
if (!this.deviceList) {
this.deviceList = [];
......@@ -801,17 +805,23 @@ export default {
else this.device = msg.imei;
}
// 处理单位
this.processData(m);
if (monitor.db) monitor.set(m);
// 如果接收到的数据不是当前选中的设备，那么则直接丢弃
if (msg.imei != this.device) {
return null;
}
// 处理单位
this.processData(m);
this.globalData = msg;
this.resetData(m);
},
processData(msg) {
function isNumber(value) {
return typeof value === "number" && !isNaN(value);
}
if (!msg) return null;
Object.keys(msg).forEach((item) => {
if (this.form[item]) {
......@@ -820,7 +830,8 @@ export default {
var k = keys[i];
if (item == "image") {
for (var j = 0; j < msg[item].length; j++) {
msg[item][j][k] = Math.ceil(msg[item][j][k] / 1024);
if (isNumber(msg[item][j][k]))
msg[item][j][k] = Math.ceil(msg[item][j][k] / 1024);
}
} else {
msg[item][k] = Math.ceil(msg[item][k] / 1024);
......@@ -828,6 +839,17 @@ export default {
}
}
});
msg.image.forEach((item) => {
if (item.png_detail && item.png_detail.length) {
item.png_detail = item.png_detail.map((png) => {
png.ratio = Math.floor(png.ratio * 100) / 100;
png.filesize = Math.floor(png.filesize / 1024);
png.uncompressed_size = Math.floor(png.uncompressed_size / 1024);
return png;
});
}
});
},
onSelectChange(res) {
this.device = res;
......@@ -891,11 +913,11 @@ export default {
}
});
if (this.globalData) {
if (this.globalData.evm) this.evm = this.globalData.evm;
if (this.globalData.lvgl) this.lvgl = this.globalData.lvgl;
if (this.globalData.image) this.image = this.globalData.image;
if (this.globalData.system) this.system = this.globalData.system;
if (m) {
if (m.evm) this.evm = m.evm;
if (m.lvgl) this.lvgl = m.lvgl;
if (m.image) this.image = m.image;
if (m.system) this.system = m.system;
}
},
},
......@@ -950,6 +972,12 @@ export default {
.catch((err) => {
console.log(err);
});
setTemplate({ templateName: jsonFile }).then(res => {
console.log(res.msg)
}).catch(err => {
console.log(err.msg)
})
},
};
</script>
......
tools/build_out/tests/http_interval.py
View file @ ca2c4302
'''
Author: your name
Date: 2021-07-22 19:01:41
LastEditTime: 2021-07-26 03:23:07
LastEditTime: 2021-07-26 10:22:30
LastEditors: Please set LastEditors
Description: In User Settings Edit
FilePath: \evm-store\tools\build_out\tests\http_interval.py
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment