diff --git a/src/store/module/Mechanics.ts b/src/store/module/Mechanics.ts
index 42f62c5..f2509af 100644
--- a/src/store/module/Mechanics.ts
+++ b/src/store/module/Mechanics.ts
@@ -191,7 +191,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, {
if (ele.name == "H_ON") {
data.push({
value: ele.counts,
- name: "messages.work",
+ name: messages.work,
itemStyle:{
color:'#91CC75'
}
@@ -201,7 +201,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, {
if (ele.name == "H_IDLE") {
data.push({
value: ele.counts,
- name: "messages.halt",
+ name: messages.halt,
itemStyle:{
color:'#AAAAAA'
}
@@ -211,7 +211,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, {
if (ele.name == "H_OFF") {
data.push({
value: ele.counts,
- name:"messages.Standby",
+ name:messages.Standby,
itemStyle:{
color:'#FAC858'
}
@@ -221,7 +221,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, {
if (ele.name == "H_E_STOP") {
data.push({
value: ele.counts,
- name: "messages.STOP",
+ name: messages.STOP,
itemStyle:{
color:'#EE6666'
}
@@ -232,7 +232,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, {
if (status[0] == 0) {
data.push({
value: null,
- name: "messages.work",
+ name: messages.work,
itemStyle:{
color:'#91CC75'
}
@@ -241,7 +241,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, {
if (status[1] == 0) {
data.push({
value: null,
- name: "messages.halt",
+ name: messages.halt,
itemStyle:{
color:'#AAAAAA'
}
@@ -250,7 +250,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, {
if (status[2] == 0) {
data.push({
value: null,
- name: "messages.Standby",
+ name: messages.Standby,
itemStyle:{
color:'#FAC858'
}
@@ -259,7 +259,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, {
if (status[3] == 0) {
data.push({
value: null,
- name: "messages.halt",
+ name: messages.halt,
itemStyle:{
color:'#EE6666'
}
diff --git a/src/store/moduleSocket.ts b/src/store/moduleSocket.ts
index e852aab..d1f97b7 100644
--- a/src/store/moduleSocket.ts
+++ b/src/store/moduleSocket.ts
@@ -59,7 +59,7 @@ export const useSocketStore = defineStore(Names.socket, {
"icon": "icon-yanwubaojingqi",
"title": "烟雾检测",
"limit": "100",
- "unit": null,
+ "unit": 'ppm',
"value": [
{
"name": "精饰车间烟雾传感器",
@@ -155,7 +155,7 @@ export const useSocketStore = defineStore(Names.socket, {
} else {
val.listData.forEach(res => {
this.noise.listData.forEach(ele => {
- if (res.name == ele.name) {
+ if (res.devId == ele.devId) {
ele.value = res.value
}
})
@@ -196,7 +196,7 @@ export const useSocketStore = defineStore(Names.socket, {
} else {
val.Humiture.forEach(res => {
this.humiture.Humiture.forEach(ele => {
- if (res.name == ele.name) {
+ if (res.devId == ele.devId) {
ele.humidity = res.humidity
ele.temp = res.temp
}
diff --git a/src/views/FactoryViewEdit/index.vue b/src/views/FactoryViewEdit/index.vue
deleted file mode 100644
index 2462023..0000000
--- a/src/views/FactoryViewEdit/index.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-
-