xiaomeng/wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pc-master #124

Merged
xiaomeng merged 2 commits from pc-master into portal 2024-03-05 07:58:59 +00:00
Conversation 0 Commits 2 Files Changed 3 +25 -25
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a74261c964 - Show all commits

50
src/components/setParamsControl.vue
View File

@ -84,7 +84,7 @@ export default {
this.routerList.push( this.routerList.push(
{ {
id: el.id, sort: el.sort, id: el.id, sort: el.sort,
name: "目标值", name: el.nickName,
router: "targetTemperature", router: "targetTemperature",
list: [ list: [
{ name: "目标温度", list: [], router: "targetTemperature", isRouter: true, index: 1 }, { name: "目标温度", list: [], router: "targetTemperature", isRouter: true, index: 1 },
@ -97,7 +97,7 @@ export default {
this.routerList.push( this.routerList.push(
{ {
id: el.id, sort: el.sort, id: el.id, sort: el.sort,
name: "报警设置", name: el.nickName,
router: "alarmSettings", router: "alarmSettings",
list: [], list: [],
isRouter: true isRouter: true
@ -106,7 +106,7 @@ export default {
} else if (el.id == 19) { } else if (el.id == 19) {
this.routerList.push({ this.routerList.push({
id: el.id, sort: el.sort, id: el.id, sort: el.sort,
name: "通风窗控制", list: [ name: el.nickName, list: [
{ name: '通风窗1', status: -1, router: 'sunroofControl', index: 1 }, { name: '通风窗1', status: -1, router: 'sunroofControl', index: 1 },
{ name: '通风窗2', status: -1, router: 'sunroofControl', index: 2 }, { name: '通风窗2', status: -1, router: 'sunroofControl', index: 2 },
{ name: '通风窗3', status: -1, router: 'sunroofControl', index: 3 }, { name: '通风窗3', status: -1, router: 'sunroofControl', index: 3 },
@ -116,7 +116,7 @@ export default {
} else if (el.id == 25) { } else if (el.id == 25) {
this.routerList.push({ this.routerList.push({
id: el.id, sort: el.sort, id: el.id, sort: el.sort,
name: "外遮阳控制", list: [ name: el.nickName, list: [
{ name: '外遮阳1', status: -1, router: 'outsizeSunshade', index: 1 }, { name: '外遮阳1', status: -1, router: 'outsizeSunshade', index: 1 },
{ name: '外遮阳2', status: -1, router: 'outsizeSunshade', index: 2 }, { name: '外遮阳2', status: -1, router: 'outsizeSunshade', index: 2 },
], router: "outsizeSunshade", ], router: "outsizeSunshade",
@ -124,7 +124,7 @@ export default {
} else if (el.id == 24) { } else if (el.id == 24) {
this.routerList.push({ this.routerList.push({
id: el.id, sort: el.sort, id: el.id, sort: el.sort,
name: "内遮阳控制", list: [ name: el.nickName, list: [
{ name: '内遮阳1', status: -1, router: 'insizeSunshade', index: 1 }, { name: '内遮阳1', status: -1, router: 'insizeSunshade', index: 1 },
{ name: '内遮阳2', status: -1, router: 'insizeSunshade', index: 2 }, { name: '内遮阳2', status: -1, router: 'insizeSunshade', index: 2 },
], router: "insizeSunshade", ], router: "insizeSunshade",
@ -132,14 +132,14 @@ export default {
} else if (el.id == 27) { } else if (el.id == 27) {
this.routerList.push({ this.routerList.push({
id: el.id, sort: el.sort, id: el.id, sort: el.sort,
name: "内保温", list: [ name: el.nickName, list: [
{ name: '内保温1', status: -1, router: 'internalInsulation', index: 1 }, { name: '内保温1', status: -1, router: 'internalInsulation', index: 1 },
{ name: '内保温2', status: -1, router: 'internalInsulation', index: 2 }, { name: '内保温2', status: -1, router: 'internalInsulation', index: 2 },
], router: "internalInsulation", ], router: "internalInsulation",
}); });
} else if (el.id == 26) { } else if (el.id == 26) {
this.routerList.push({ this.routerList.push({
id: el.id, sort: el.sort, name: "风机湿帘", list: [ id: el.id, sort: el.sort, name: el.nickName, list: [
{ name: '风机', status: -1, router: 'wetFan', index: 1 }, { name: '风机', status: -1, router: 'wetFan', index: 1 },
{ name: '湿帘泵', status: -1, router: 'wetFan', index: 2 }, { name: '湿帘泵', status: -1, router: 'wetFan', index: 2 },
{ name: '湿帘外翻窗', status: -1, router: 'wetFan', index: 3 }, { name: '湿帘外翻窗', status: -1, router: 'wetFan', index: 3 },
@ -148,7 +148,7 @@ export default {
} else if (el.id == 21) { } else if (el.id == 21) {
this.routerList.push({ this.routerList.push({
id: el.id, sort: el.sort, id: el.id, sort: el.sort,
name: "环流风扇", list: [ name: el.nickName, list: [
{ name: '环流风扇1', status: -1, router: 'circulationCan', index: 1 }, { name: '环流风扇1', status: -1, router: 'circulationCan', index: 1 },
{ name: '环流风扇2', status: -1, router: 'circulationCan', index: 2 }, { name: '环流风扇2', status: -1, router: 'circulationCan', index: 2 },
], router: "circulationCan", ], router: "circulationCan",
@ -156,13 +156,13 @@ export default {
} else if (el.id == 20) { } else if (el.id == 20) {
this.routerList.push({ this.routerList.push({
id: el.id, sort: el.sort, id: el.id, sort: el.sort,
name: "补光灯", list: [], router: "LED", name: el.nickName, list: [], router: "LED",
isRouter: true, isRouter: true,
}); });
} else if (el.id == 23) { } else if (el.id == 23) {
this.routerList.push({ this.routerList.push({
id: el.id, sort: el.sort, id: el.id, sort: el.sort,
name: "高压微雾", list: [ name: el.nickName, list: [
{ name: '高压微雾1', status: -1, router: 'coercionMist', index: 1 }, { name: '高压微雾1', status: -1, router: 'coercionMist', index: 1 },
{ name: '高压微雾2', status: -1, router: 'coercionMist', index: 2 }, { name: '高压微雾2', status: -1, router: 'coercionMist', index: 2 },
], router: "coercionMist" ], router: "coercionMist"
@ -171,33 +171,33 @@ export default {
if (!this.routerList.some(item => item.router === "electromagneticControl")) { if (!this.routerList.some(item => item.router === "electromagneticControl")) {
this.routerList.push({ this.routerList.push({
id: el.id, sort: el.sort, id: el.id, sort: el.sort,
name: "电磁自动控制", name: el.nickName,
list: [], list: [],
router: "electromagneticControl" router: "electromagneticControl"
}); });
} }
let targetObject = this.routerList.find(item => item.router === 'electromagneticControl'); let targetObject = this.routerList.find(item => item.router === 'electromagneticControl');
if (el.id == 11) { if (el.id == 11) {
targetObject.list.push({ name: '1#电磁阀', status: -1, router: 'electromagneticControl', index: 1 }); targetObject.list.push({name: el.nickName, status: -1, router: 'electromagneticControl', index: 1 });
} else if (el.id == 12) { } else if (el.id == 12) {
targetObject.list.push({ name: '2#电磁阀', status: -1, router: 'electromagneticControl', index: 2 }); targetObject.list.push({name: el.nickName, status: -1, router: 'electromagneticControl', index: 2 });
} else if (el.id == 13) { } else if (el.id == 13) {
targetObject.list.push({ name: '3#电磁阀', status: -1, router: 'electromagneticControl', index: 3 }); targetObject.list.push({name: el.nickName, status: -1, router: 'electromagneticControl', index: 3 });
} else if (el.id == 14) { } else if (el.id == 14) {
targetObject.list.push({ name: '4#电磁阀', status: -1, router: 'electromagneticControl', index: 4 }); targetObject.list.push({name: el.nickName, status: -1, router: 'electromagneticControl', index: 4 });
} else if (el.id == 15) { } else if (el.id == 15) {
targetObject.list.push({ name: '5#电磁阀', status: -1, router: 'electromagneticControl', index: 5 }); targetObject.list.push({name: el.nickName, status: -1, router: 'electromagneticControl', index: 5 });
} else if (el.id == 16) { } else if (el.id == 16) {
targetObject.list.push({ name: '6#电磁阀', status: -1, router: 'electromagneticControl', index: 6 }); targetObject.list.push({name: el.nickName, status: -1, router: 'electromagneticControl', index: 6 });
} else if (el.id == 17) { } else if (el.id == 17) {
targetObject.list.push({ name: '7#电磁阀', status: -1, router: 'electromagneticControl', index: 7 }); targetObject.list.push({name: el.nickName, status: -1, router: 'electromagneticControl', index: 7 });
} else if (el.id == 18) { } else if (el.id == 18) {
targetObject.list.push({ name: '8#电磁阀', status: -1, router: 'electromagneticControl', index: 8 }); targetObject.list.push({name: el.nickName, status: -1, router: 'electromagneticControl', index: 8 });
} }
} else if (el.id == 5) { } else if (el.id == 5) {
this.routerList.push({ this.routerList.push({
id: el.id, sort: el.sort, id: el.id, sort: el.sort,
name: "传感器通道配置", name: el.nickName,
list: [], list: [],
router: "sensorSet-con", router: "sensorSet-con",
isRouter: true, isRouter: true,
@ -205,7 +205,7 @@ export default {
} else if (el.id == 6) { } else if (el.id == 6) {
this.routerList.push({ this.routerList.push({
id: el.id, sort: el.sort, id: el.id, sort: el.sort,
name: "传感器输入合成", name: el.nickName,
list: [], list: [],
router: "synthesis-con", router: "synthesis-con",
isRouter: true, isRouter: true,
@ -213,17 +213,17 @@ export default {
} else if (el.id == 7) { } else if (el.id == 7) {
this.routerList.push({ this.routerList.push({
id: el.id, sort: el.sort, id: el.id, sort: el.sort,
name: "数据上传", name: el.nickName,
list: [], list: [],
router: "upload-con", router: "upload-con",
isRouter: true, isRouter: true,
}); });
} else if (el.id == 2) { } else if (el.id == 2) {
this.routerList.push({ id: el.id, sort: el.sort, name: "强制输出参数", list: [], router: "forceOutput", isRouter: true }); this.routerList.push({ id: el.id, sort: el.sort, name: el.nickName, list: [], router: "forceOutput", isRouter: true });
} else if (el.id == 4) { } else if (el.id == 4) {
this.routerList.push({ id: el.id, sort: el.sort, name: "设备固有参数", list: [], router: "intrinsicParameter", isRouter: true }); this.routerList.push({ id: el.id, sort: el.sort, name: el.nickName, list: [], router: "intrinsicParameter", isRouter: true });
} else if (el.id == 22) { } else if (el.id == 22) {
this.routerList.push({ name: "厂家内部参数配置", list: [], router: "parameterSet", isRouter: true }); this.routerList.push({ name: el.nickName, list: [], router: "parameterSet", isRouter: true });
} else if (el.id == 8) { } else if (el.id == 8) {
this.routerList.push( this.routerList.push(
{ id: el.id, sort: el.sort, name: "加热水泵", list: [], router: "waterPump", isRouter: true }, { id: el.id, sort: el.sort, name: "加热水泵", list: [], router: "waterPump", isRouter: true },