diff --git a/package-lock.json b/package-lock.json index 171ae4a..da4aab7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@sentry/tracing": "^6.3.1", "axios": "^0.21.1", "echarts": "^5.4.2", - "element-plus": "^2.3.4", + "element-plus": "^2.8.6", "js-base64": "^3.7.7", "js-md5": "^0.7.3", "moment": "^2.29.4", @@ -628,9 +628,9 @@ } }, "node_modules/@element-plus/icons-vue": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-2.1.0.tgz", - "integrity": "sha512-PSBn3elNoanENc1vnCfh+3WA9fimRC7n+fWkf3rE5jvv+aBohNHABC/KAR5KWPecxWxDTVT1ERpRbOMRcOV/vA==", + "version": "2.3.1", + "resolved": "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz", + "integrity": "sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==", "peerDependencies": { "vue": "^3.2.0" } @@ -2655,12 +2655,12 @@ "integrity": "sha512-MrlFq/j+TYHOjeWsWGYfzevc25HNeJdsF6qaLFrqBTRWZQtWkb1myq/Q2veLWezVaa5OcSZ99CFwTT4aF4Mung==" }, "node_modules/element-plus": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.3.4.tgz", - "integrity": "sha512-SQr0J9z7N4z48WYk/l9NE2tizl8Q7j2OhqlpTc42k4pGncry3+rVX6dsmcsglFynn6vt3NzYxWJqmLFyDKQq+g==", + "version": "2.8.6", + "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.8.6.tgz", + "integrity": "sha512-fk5jB8V3efM02/4roZ5SWOLArgaYXbxEydZLlXSr+KPAwjNyHBlk2+HO5em8YKo5+RLBoHnn6BaThj6IE4nXoQ==", "dependencies": { "@ctrl/tinycolor": "^3.4.1", - "@element-plus/icons-vue": "^2.0.6", + "@element-plus/icons-vue": "^2.3.1", "@floating-ui/dom": "^1.0.1", "@popperjs/core": "npm:@sxzz/popperjs-es@^2.11.7", "@types/lodash": "^4.14.182", diff --git a/package.json b/package.json index 426ef94..84cdb67 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@sentry/tracing": "^6.3.1", "axios": "^0.21.1", "echarts": "^5.4.2", - "element-plus": "^2.3.4", + "element-plus": "^2.8.6", "js-base64": "^3.7.7", "js-md5": "^0.7.3", "moment": "^2.29.4", diff --git a/src/api/infoApi.js b/src/api/infoApi.js index 3165df1..dd68580 100644 --- a/src/api/infoApi.js +++ b/src/api/infoApi.js @@ -67,6 +67,10 @@ const infoApi = { exportP(params) { return postPBRequest('/template', params, 53211, params.template_name) }, + // 获取dlt645 point数据 + getDlt645Data() { + return postPBRequest("/template", {}, 53012); + }, // 驱动列表查询 getTx(params) { return postPBRequest('/driver', params, 54000) @@ -190,6 +194,6 @@ const infoApi = { // 写值 writeValue(params) { return postPBRequest("/data", params, 56001); - }, + } }; export default infoApi; \ No newline at end of file diff --git a/src/components/AddData.vue b/src/components/AddData.vue index 5d4474d..6d8ac71 100644 --- a/src/components/AddData.vue +++ b/src/components/AddData.vue @@ -125,7 +125,7 @@ export default { if (valid) { const res = props.type === '0' ? await infoApi.saveTx(state.addForm) : await infoApi.editTx(state.addForm); if (res.code == 0) { - ElMessage.success(res.message || "请求成功"); + ElMessage.success(res.data || res.message || "请求成功"); ctx.emit("dialogSuccess"); } else { ElMessage.error(res.data || res.message); diff --git a/src/components/AddMb.vue b/src/components/AddMb.vue index f92ffab..ce390c0 100644 --- a/src/components/AddMb.vue +++ b/src/components/AddMb.vue @@ -94,11 +94,11 @@ export default { if (valid) { const res = props.type === 'I' ? await infoApi.addMb(state.addForm) : await infoApi.editMb(state.addForm); if (res.code == 0) { - ElMessage.success(res.message || "请求成功"); + ElMessage.success(res.data || res.message || "请求成功"); // 关闭弹框 ctx.emit("dialogSuccess"); } else { - ElMessage.error(res.data); + ElMessage.error(res.data || res.message || "请求失败"); } } else { } diff --git a/src/components/AddPoint.vue b/src/components/AddPoint.vue index 09937f6..ca307b4 100644 --- a/src/components/AddPoint.vue +++ b/src/components/AddPoint.vue @@ -1,6 +1,8 @@