mt-fe-group/yudao-dev
13
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

merge

Browse Source
This commit is contained in:
helloDy
2024-07-29 15:04:54 +08:00
parent 21988ae8b0 e4c6154eb6
commit 7ca1f07f56
112 changed files with 8097 additions and 6776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/equipment/analysis/quality/index.vue
View File

@@ -1,4 +1,4 @@
<!--
<!--
filename: index.vue
author: liubin
date: 2023-09-04 09:34:52
@@ -280,7 +280,7 @@ export default {
async fillProductOptions() {
const { data } = await this.$axios({
url: '/base/core-product/listAll',
url: '/base/core-product-material/listAll',
method: 'get',
});
const cfg = this.searchBarFormConfig.find(

6
src/views/equipment/base/config/AlarmGroup/components/BasicDrawer.vue
View File

@@ -1,8 +1,8 @@
<!--
<!--
filename: EquipmentDrawer.vue
author: liubin
date: 2023-08-22 14:38:56
description:
description:
-->
<template>
@@ -383,7 +383,7 @@ export default {
// 新增属性
handleAddAttr() {
if (!this.dataId) return this.$message.error('请先创建设备分组信息');
if (!this.dataId) return this.$message.warning('请先创建设备分组信息');
this.attrForm = {
id: null,
equipmentGroupId: this.dataId,

6
src/views/equipment/base/config/BindGroup/components/BasicDrawer.vue
View File

@@ -1,8 +1,8 @@
<!--
<!--
filename: EquipmentDrawer.vue
author: liubin
date: 2023-08-22 14:38:56
description:
description:
-->
<template>
@@ -382,7 +382,7 @@ export default {
// 新增属性
handleAddAttr() {
if (!this.dataId) return this.$message.error('请先创建设备分组信息');
if (!this.dataId) return this.$message.warning('请先创建设备分组信息');
this.attrForm = {
id: null,
equipmentGroupId: this.dataId,

6
src/views/equipment/timing-diagram/output/index.vue
View File

@@ -1,4 +1,4 @@
<!--
<!--
filename: index.vue
author: liubin
date: 2023-09-04 09:34:52
@@ -270,7 +270,7 @@ export default {
switch (btnName) {
case 'search':
if (!payload.recordTime || payload.recordTime.length <= 0) {
this.$message.error('请选择时间段');
this.$message.warning('请选择时间段');
return;
}
this.startTime = new Date(payload.recordTime).getTime();
@@ -493,7 +493,7 @@ export default {
if (code == 0) {
const newEqlist = this.objectToArray(data);
if (!newEqlist || newEqlist.length == 0) {
this.$message.error('该设备没有产量数据');
this.$message.warning('该设备没有产量数据');
return;
}
this.graphList.push(...newEqlist);

8
src/views/equipment/timing-diagram/status/index.vue
View File

@@ -1,4 +1,4 @@
<!--
<!--
filename: index.vue
author: liubin
date: 2023-09-04 09:34:52
@@ -338,7 +338,7 @@ export default {
switch (btnName) {
case 'search':
if (!payload.recordTime || payload.recordTime.length <= 0) {
this.$message.error('请选择时间段');
this.$message.warning('请选择时间段');
return;
}
@@ -373,7 +373,7 @@ export default {
async submitForm() {
if (this.existingEquipments.indexOf(this.queryParams.equipmentId) >= 0) {
this.$message.error('该设备已存在');
this.$message.warning('该设备已存在');
return;
}
const { code, data } = await this.$axios({
@@ -387,7 +387,7 @@ export default {
if (code == 0) {
const newEqlist = this.objectToArray(data);
if (!newEqlist || newEqlist.length == 0) {
this.$message.error('该设备没有状态数据');
this.$message.warning('该设备没有状态数据');
return;
}
this.graphList.push(newEqlist[0]);