From 4132fb04e4a81702e5e3a6ba13185b9264cc151a Mon Sep 17 00:00:00 2001 From: jiminglei <836545853@qq.com> Date: Mon, 15 May 2023 15:04:05 +0800 Subject: [PATCH 1/2] 11 --- psdc-ui/src/views/emonitor/db/index.vue | 364 +++++++++++++------- psdc-ui/src/views/emonitor/xrgl/index.vue | 388 +++++++++++++--------- psdc-ui/src/views/system/cl/index.vue | 1 + 3 files changed, 464 insertions(+), 289 deletions(-) diff --git a/psdc-ui/src/views/emonitor/db/index.vue b/psdc-ui/src/views/emonitor/db/index.vue index 6f725b6..2e4395f 100644 --- a/psdc-ui/src/views/emonitor/db/index.vue +++ b/psdc-ui/src/views/emonitor/db/index.vue @@ -5,28 +5,28 @@
pic

当前功率

-

{{data.num}}kW

+

{{data.totp}}kW

pic

日用电量

-

11kWh

+

{{data.eday}}kWh

pic

月用电量

-

141kWh

+

{{data.emonth}}kWh

pic

累计用电量

-

1641kWh

+

{{data.totwh}}kWh

@@ -63,7 +63,109 @@ export default { name: "db", setup() { let data = reactive({ - num:666, + totp:'', + totwh:'', + eday:'', + emonth:'', + glData:[], + glXz:[ + "00:00", + "00:15", + "00:30", + "00:45", + "01:00", + "01:15", + "01:30", + "01:45", + "02:00", + "02:15", + "02:30", + "02:45", + "03:00", + "03:15", + "03:30", + "03:45", + "04:00", + "04:15", + "04:30", + "04:45", + "05:00", + "05:15", + "05:30", + "05:45", + "06:00", + "06:15", + "06:30", + "06:45", + "07:00", + "07:15", + "07:30", + "07:45", + "08:00", + "08:15", + "08:30", + "08:45", + "09:00", + "09:15", + "09:30", + "09:45", + "10:00", + "10:15", + "10:30", + "10:45", + "11:00", + "11:15", + "11:30", + "11:45", + "12:00", + "12:15", + "12:30", + "12:45", + "13:00", + "13:15", + "13:30", + "13:45", + "14:00", + "14:15", + "14:30", + "14:45", + "15:00", + "15:15", + "15:30", + "15:45", + "16:00", + "16:15", + "16:30", + "16:45", + "17:00", + "17:15", + "17:30", + "17:45", + "18:00", + "18:15", + "18:30", + "18:45", + "19:00", + "19:15", + "19:30", + "19:45", + "20:00", + "20:15", + "20:30", + "20:45", + "21:00", + "21:15", + "21:30", + "21:45", + "22:00", + "22:15", + "22:30", + "22:45", + "23:00", + "23:15", + "23:30", + "23:45" + ], fdlData:'', fdlXz:'', }) @@ -79,6 +181,136 @@ export default { onMounted(() => {//需要获取到element,所以是onMounted的Hook getData(13).then((res)=>{ console.log(res) + data.totp=res.data.totp + data.totwh=res.data.totwh + data.eday=res.data.eday + data.emonth=res.data.emonth + delete res.data.todayUsePowers.deviceId + delete res.data.todayUsePowers.samDate + delete res.data.todayUsePowers.userId + let arr = Object.values(res.data.todayUsePowers) + data.glData=arr + + + + let myChart1 = echarts.getInstanceByDom(document.getElementById("myEcharts1")); + if (myChart1){ + myChart1.dispose() + } + myChart1 = echarts.init(document.getElementById("myEcharts1")); + myChart1.setOption({ + series: [ + { + type: 'gauge', + axisLine: { + lineStyle: { + width: 10, + color: [ + [0.3, '#67e0e3'], + [0.7, '#37a2da'], + [1, '#fd666d'] + ] + } + }, + pointer: { + itemStyle: { + color: 'inherit' + } + }, + // axisTick: { + // distance: -30, + // length: 8, + // lineStyle: { + // color: '#fff', + // width: 2 + // } + // }, + // splitLine: { + // distance: -30, + // length: 30, + // lineStyle: { + // color: '#fff', + // width: 4 + // } + // }, + axisLabel: { + color: 'inherit', + distance: 10, + fontSize: 10 + }, + detail: { + valueAnimation: true, + formatter: '{value} kW', + color: 'inherit' + }, + data: [ + { + value: data.totp + } + ] + } + ] + }); + window.onresize = function () {//自适应大小 + myChart1.resize(); + }; + + + + + let myChart2 = echarts.getInstanceByDom(document.getElementById("myEcharts2")); + if (myChart2){ + myChart2.dispose() + } + myChart2 = echarts.init(document.getElementById("myEcharts2")); + myChart2.setOption({ + title: {}, + tooltip: {}, + textStyle:{ + color:'#BEC3DA' + }, + xAxis: { + data:data.glXz, + axisLine:{ + lineStyle:{ + color:'#BEC3DA', + type:'dashed' + } + } + }, + yAxis: { + type: 'value', + name: "kW", + splitLine:{ + show:true, + lineStyle:{ + type:'dashed', + color:'#BEC3DA' + } + }, + axisLine: { + show: true, + lineStyle:{ + type:'dashed', + color:'#BEC3DA' + } + }, + }, + series: [ + { + name: "当前功率", + type: "line", + data: data.glData, + itemStyle:{ + color:'#2F8EE0' + }, + }, + ], + }); + window.onresize = function () {//自适应大小 + myChart2.resize(); + }; + }) getZdb(13).then((res)=>{ console.log(res) @@ -133,7 +365,7 @@ export default { { name: "今日用电量", type: "bar", - data: [data.fdlData], + data: data.fdlData, itemStyle:{ color:'#2F8EE0' }, @@ -145,126 +377,6 @@ export default { }; }) - - - let myChart1 = echarts.getInstanceByDom(document.getElementById("myEcharts1")); - if (myChart1){ - myChart1.dispose() - } - myChart1 = echarts.init(document.getElementById("myEcharts1")); - myChart1.setOption({ - series: [ - { - type: 'gauge', - axisLine: { - lineStyle: { - width: 10, - color: [ - [0.3, '#67e0e3'], - [0.7, '#37a2da'], - [1, '#fd666d'] - ] - } - }, - pointer: { - itemStyle: { - color: 'inherit' - } - }, - // axisTick: { - // distance: -30, - // length: 8, - // lineStyle: { - // color: '#fff', - // width: 2 - // } - // }, - // splitLine: { - // distance: -30, - // length: 30, - // lineStyle: { - // color: '#fff', - // width: 4 - // } - // }, - axisLabel: { - color: 'inherit', - distance: 10, - fontSize: 10 - }, - detail: { - valueAnimation: true, - formatter: '{value} kW', - color: 'inherit' - }, - data: [ - { - value: 70 - } - ] - } - ] - }); - window.onresize = function () {//自适应大小 - myChart1.resize(); - }; - - - let myChart2 = echarts.getInstanceByDom(document.getElementById("myEcharts2")); - if (myChart2){ - myChart2.dispose() - } - myChart2 = echarts.init(document.getElementById("myEcharts2")); - myChart2.setOption({ - title: {}, - tooltip: {}, - textStyle:{ - color:'#BEC3DA' - }, - xAxis: { - data: ["12-3", "12-4", "12-5", "12-6", "12-7", "12-8"], - axisLine:{ - lineStyle:{ - color:'#BEC3DA', - type:'dashed' - } - } - }, - yAxis: { - type: 'value', - name: "kW", - splitLine:{ - show:true, - lineStyle:{ - type:'dashed', - color:'#BEC3DA' - } - }, - axisLine: { - show: true, - lineStyle:{ - type:'dashed', - color:'#BEC3DA' - } - }, - }, - series: [ - { - name: "当前功率", - type: "line", - data: [5, 20, 36, 10, 10, 20], - itemStyle:{ - color:'#2F8EE0' - }, - }, - ], - }); - window.onresize = function () {//自适应大小 - myChart2.resize(); - }; - - - }) return { data diff --git a/psdc-ui/src/views/emonitor/xrgl/index.vue b/psdc-ui/src/views/emonitor/xrgl/index.vue index 8d77249..5f73a26 100644 --- a/psdc-ui/src/views/emonitor/xrgl/index.vue +++ b/psdc-ui/src/views/emonitor/xrgl/index.vue @@ -179,6 +179,44 @@ export default { "23:30", "23:45" ], + dayData:[], + dayXz:[], + emonthData:[], + emonthXz:[ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 25, + 26, + 27, + 28, + 29, + 30, + 31], + temIn:'', + temOut:'', + time:'', }) @@ -197,6 +235,7 @@ export default { //gl delete res.data.todayUsePowers.deviceId delete res.data.todayUsePowers.samDate + delete res.data.todayUsePowers.userId let arr = Object.values(res.data.todayUsePowers) data.glData=arr let myChart3 = echarts.getInstanceByDom(document.getElementById("myEcharts3")); @@ -254,188 +293,211 @@ export default { }) getXcgl(2).then((res)=>{ console.log(res) - }) - - - - let myChart = echarts.getInstanceByDom(document.getElementById("myEcharts")); - if (myChart){ - myChart.dispose() - } - myChart = echarts.init(document.getElementById("myEcharts")); - - let myChart2 = echarts.getInstanceByDom(document.getElementById("myEcharts2")); - if (myChart2){ - myChart2.dispose() - } - myChart2 = echarts.init(document.getElementById("myEcharts2")); - - - - let myChart4 = echarts.getInstanceByDom(document.getElementById("myEcharts4")); - if (myChart4){ - myChart4.dispose() - } - myChart4 = echarts.init(document.getElementById("myEcharts4")); - // 绘制图表 - myChart.setOption({ - title: {}, - tooltip: {}, - textStyle:{ - color:'#BEC3DA' - }, - xAxis: { - data: ["12-3", "12-4", "12-5", "12-6", "12-7", "12-8"], - axisLine:{ - lineStyle:{ - color:'#BEC3DA', - type:'dashed' - } - } - }, - yAxis: { - type: 'value', - name: "kWh", - splitLine:{ - show:true, - lineStyle:{ - type:'dashed', - color:'#BEC3DA' - } + //日用电量 + let arr = [] + let brr = [] + for(let i in res.xrglqhour){ + arr.push(res.xrglqhour[i].useElectric) + brr.push(res.xrglqhour[i].hour) + } + data.dayData=arr + data.dayXz=brr + let myChart = echarts.getInstanceByDom(document.getElementById("myEcharts")); + if (myChart){ + myChart.dispose() + } + myChart = echarts.init(document.getElementById("myEcharts")); + myChart.setOption({ + title: {}, + tooltip: {}, + textStyle:{ + color:'#BEC3DA' }, - axisLine: { - show: true, - lineStyle:{ - type:'dashed', - color:'#BEC3DA' + xAxis: { + data: data.dayXz, + axisLine:{ + lineStyle:{ + color:'#BEC3DA', + type:'dashed' + } } }, - }, - series: [ - { - name: "日用电量", - type: "bar", - data: [5, 20, 36, 10, 10, 20], - itemStyle:{ - color:'#2F8EE0' + yAxis: { + type: 'value', + name: "kWh", + splitLine:{ + show:true, + lineStyle:{ + type:'dashed', + color:'#BEC3DA' + } + }, + axisLine: { + show: true, + lineStyle:{ + type:'dashed', + color:'#BEC3DA' + } }, }, - ], - }); - window.onresize = function () {//自适应大小 - myChart.resize(); - }; - myChart2.setOption({ - title: {}, - tooltip: {}, - textStyle:{ - color:'#BEC3DA' - }, - xAxis: { - data: ["12-3", "12-4", "12-5", "12-6", "12-7", "12-8"], - axisLine:{ - lineStyle:{ - color:'#BEC3DA', - type:'dashed' - } - } - }, - yAxis: { - type: 'value', - name: "kWh", - splitLine:{ - show:true, - lineStyle:{ - type:'dashed', - color:'#BEC3DA' - } + series: [ + { + name: "日用电量", + type: "bar", + data: data.dayData, + itemStyle:{ + color:'#2F8EE0' + }, + }, + ], + }); + window.onresize = function () {//自适应大小 + myChart.resize(); + }; + + //月用电量 + let crr = [] + for(let i in res.xrglqday){ + crr.push(res.xrglqday[i].useElectric) + } + data.emonthData=crr + let myChart2 = echarts.getInstanceByDom(document.getElementById("myEcharts2")); + if (myChart2){ + myChart2.dispose() + } + myChart2 = echarts.init(document.getElementById("myEcharts2")); + + myChart2.setOption({ + title: {}, + tooltip: {}, + textStyle:{ + color:'#BEC3DA' }, - axisLine: { - show: true, - lineStyle:{ - type:'dashed', - color:'#BEC3DA' + xAxis: { + data: data.emonthXz, + axisLine:{ + lineStyle:{ + color:'#BEC3DA', + type:'dashed' + } } }, - }, - series: [ - { - name: "月用电量", - type: "bar", - data: [5, 20, 36, 10, 10, 20], - itemStyle:{ - color:'#2F8EE0' + yAxis: { + type: 'value', + name: "kWh", + splitLine:{ + show:true, + lineStyle:{ + type:'dashed', + color:'#BEC3DA' + } + }, + axisLine: { + show: true, + lineStyle:{ + type:'dashed', + color:'#BEC3DA' + } }, }, - ], - }); - window.onresize = function () {//自适应大小 - myChart2.resize(); - }; + series: [ + { + name: "月用电量", + type: "bar", + data: data.emonthData, + itemStyle:{ + color:'#2F8EE0' + }, + }, + ], + }); + window.onresize = function () {//自适应大小 + myChart2.resize(); + }; - myChart4.setOption({ - title: {}, - tooltip: {}, - legend: { - data: ['进水', '出水'], - textStyle:{ - color:'#BEC3DA' - } - }, - textStyle:{ - color:'#BEC3DA' - }, - xAxis: { - data: ["12-3", "12-4", "12-5", "12-6", "12-7", "12-8"], - axisLine:{ - lineStyle:{ - color:'#BEC3DA', - type:'dashed' - } - } - }, - yAxis: { - type: 'value', - name: "℃", - splitLine:{ - show:true, - lineStyle:{ - type:'dashed', + //进出水温度 + data.time=res.times + data.temIn=res.tempIn + data.temOut=res.tempOut + + let myChart4 = echarts.getInstanceByDom(document.getElementById("myEcharts4")); + if (myChart4){ + myChart4.dispose() + } + myChart4 = echarts.init(document.getElementById("myEcharts4")); + myChart4.setOption({ + title: {}, + tooltip: {}, + legend: { + data: ['进水', '出水'], + textStyle:{ color:'#BEC3DA' } }, - axisLine: { - show: true, - lineStyle:{ - type:'dashed', - color:'#BEC3DA' + textStyle:{ + color:'#BEC3DA' + }, + xAxis: { + data: data.time, + axisLine:{ + lineStyle:{ + color:'#BEC3DA', + type:'dashed' + } } }, - }, - series: [ - { - name: '进水', - type: 'line', - stack: 'Total', - itemStyle:{ - color:'#2F8EE0' + yAxis: { + type: 'value', + name: "℃", + splitLine:{ + show:true, + lineStyle:{ + type:'dashed', + color:'#BEC3DA' + } }, - data: [120, 132, 101, 134, 90, 230, 210] - }, - { - name: '出水', - type: 'line', - stack: 'Total', - itemStyle:{ - color:'#2F8EE0' + axisLine: { + show: true, + lineStyle:{ + type:'dashed', + color:'#BEC3DA' + } }, - data: [220, 182, 191, 234, 290, 330, 310] }, - ], - }); - window.onresize = function () {//自适应大小 - myChart4.resize(); - }; + series: [ + { + name: '进水', + type: 'line', + stack: 'Total', + itemStyle:{ + color:'#2F8EE0' + }, + data: data.temIn + }, + { + name: '出水', + type: 'line', + stack: 'Total', + itemStyle:{ + color:'#2F8EE0' + }, + data: data.temOut + }, + ], + }); + window.onresize = function () {//自适应大小 + myChart4.resize(); + }; + }) + + + + + + + + + }); return{ data diff --git a/psdc-ui/src/views/system/cl/index.vue b/psdc-ui/src/views/system/cl/index.vue index cbd4503..793e744 100644 --- a/psdc-ui/src/views/system/cl/index.vue +++ b/psdc-ui/src/views/system/cl/index.vue @@ -10,6 +10,7 @@ + 搜索 重置 From a71bbd82e9c99ddbf5cf5af36724b53e6801c3bc Mon Sep 17 00:00:00 2001 From: wj <347312259@qq.com> Date: Mon, 15 May 2023 15:06:41 +0800 Subject: [PATCH 2/2] 11 --- psdc-ui/src/api/control/manual.js | 4 + psdc-ui/src/api/control/timer.js | 6 + psdc-ui/src/assets/images/功率.png | Bin 0 -> 1979 bytes psdc-ui/src/assets/images/温度.png | Bin 0 -> 1829 bytes psdc-ui/src/assets/images/温度传感器.png | Bin 0 -> 1971 bytes psdc-ui/src/assets/images/用电量.png | Bin 0 -> 1667 bytes psdc-ui/src/views/control/manual/index.vue | 76 ++++++++++++- psdc-ui/src/views/control/timer/index.vue | 103 ++++++++++++++---- 8 files changed, 165 insertions(+), 24 deletions(-) create mode 100644 psdc-ui/src/assets/images/功率.png create mode 100644 psdc-ui/src/assets/images/温度.png create mode 100644 psdc-ui/src/assets/images/温度传感器.png create mode 100644 psdc-ui/src/assets/images/用电量.png diff --git a/psdc-ui/src/api/control/manual.js b/psdc-ui/src/api/control/manual.js index 6ee57e7..b754ed7 100644 --- a/psdc-ui/src/api/control/manual.js +++ b/psdc-ui/src/api/control/manual.js @@ -7,4 +7,8 @@ export function getDevice() { /** 获取调控日志列表*/ export function getControlLogList(data) { return request.post('/control/manual/controlLogList',data) +} +/** 获取策略列表*/ +export function getStrategyList(data) { + return request.get('/control/manual/strategyList',data) } \ No newline at end of file diff --git a/psdc-ui/src/api/control/timer.js b/psdc-ui/src/api/control/timer.js index e69de29..8ecf3d2 100644 --- a/psdc-ui/src/api/control/timer.js +++ b/psdc-ui/src/api/control/timer.js @@ -0,0 +1,6 @@ +import request from '@/utils/request' + +/** 获取定时控制列表*/ +export function getList(data) { + return request.post('/control/timer/list',data) +} \ No newline at end of file diff --git a/psdc-ui/src/assets/images/功率.png b/psdc-ui/src/assets/images/功率.png new file mode 100644 index 0000000000000000000000000000000000000000..ef520cfa7cd55ade92a1e242abcdb74b3b434854 GIT binary patch literal 1979 zcmV;s2SoUZP)=1)cueY) z>3AmT;12Di4|(xqniu~YeT}En&NOX0eW1;Bptc`6PU6HK8($KFWk^7PEpe9&SVA|1 zuDja@7YeMP=j^UYJJs)Pzd7IUeEM;&-}zuJj{I80|2Z^2bO8SiD2afQ2mneV04Rw7 zpdO!|)&uCUy@G?5256Yw2c2G{gIQ}tHRr%VO9S2lAcz7clQS5O zj$<_b2)xKYuTa$&LCdgs!*K*%&XcInS!DBQ7!6v>8_`hiz?2pI0(6@;_Ud)(+jiKsE9|F2rR?mLPO7U zTL5WL$=PtBp$9C(%I1(I!n>}nA7l#bhI*q5@4C8V`%{b1Ycieh9 zteERmZsWlRey z5jq|1s8VSi_-6IHZQnzy-z(;<;%w-2v{U;Li@-80&Nxp{cR&h;VN~Hc<2*sVND_;1 z*m^+rUEptvpW~~QueaHD2D) zu?Z@_x%ChR!(RM;rk}dc4$4@GL@=-%nk@~~!Sn~O<6dM00PrLeMk2pP>^qg51pxRG z0enm;M6;y<29_gkPb5O4sSfNO`G8^=Pxx^s?A`npL;(+CJ|f?okjF&g-#5kaL;$zL z4~Y9_84Wz9I^y<3zl?@(1Akq(Cb12zjuH9Z3J**22A6|hQe~PN)fS=JP)SS(0QV!K zMQ?Xn4cV$~WDOFV2;kb%9pV^hVkQ!yN>6t-C^mErEQeotdN;p!rpvbG209(>IA&{= za12Mskr&7^OEl*hA`vV)6EWd(CW0rKrxN?Qn$t!9!W$69?Fp{lx^C#0?dguS!a4$} z1)?}CTJo5QMBp@fV#0;=lC%?s!EyWcZR=F!u|2=_8XY?9(yeYWy-XAb_peMg2~N8tGmyhyqa@Ss_o<4j`Nk$wG>lu)N4zO!FCH|El@5gQ5F>8%zG`orXX<{Z4A&^=G zPq-ifKv&gCi7k?g<4?0!i2NVMCh__5U5Wj5M;lSDfENV>)D|JbXEBwWAtpU$Yej{w zTw))MPvH+U1AA_Bx5E$c=eesAyOv?`c!|#m-$uvLTHZ)Z{L2^5 z;WvT5NbF+?KYSAb9JV&2$>c`8(S>L}f$7vD#^R3=&c%xI^}4%>cZT8UIB}c+g$Uop zA0d`c5@(m1%x-j7cjB`m!&(qUjKn4}5}PFAI%z+I>sC;(fNX0??!u=EC_BU6CsB0OhG9`B-52^NF0QjlvE&SZwy;+q) zgL5yO#{2c}5VwDtjpAx-N>j^^l?$ELjh- zyvXB|*~`0bXZwk8E{0ELuP7?)l3kw=&#&RPflsLyN;MJAM)AAAr-&=eF(|53S#ju)-qd#~ZzC=J(UR869zC-|z*XHns{RqxDPbezp+=^H} ziJL1!xVJh&oN}ju>WS98P{6J5Fz!SiqRrZj4qNMgEbA=>K@>5WoW^j}htc@d|5jP= z26&N&H|B#k=7WLd&}gbdqsa|dnRBzidm{s#6>^&e-l6mg0;vTAQj1jAVI|m?D)$VZ z#dsosah2z?S}6U$14<$QD2V`|Bm#hv2mneV04Rw7pdAn{D^G5aIv; N002ovPDHLkV1o5&rm+A3 literal 0 HcmV?d00001 diff --git a/psdc-ui/src/assets/images/温度.png b/psdc-ui/src/assets/images/温度.png new file mode 100644 index 0000000000000000000000000000000000000000..90ce78ddac4bcc88c095ad9ca134e8379c288b5e GIT binary patch literal 1829 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 FV1hF*qS*id literal 0 HcmV?d00001 diff --git a/psdc-ui/src/assets/images/用电量.png b/psdc-ui/src/assets/images/用电量.png new file mode 100644 index 0000000000000000000000000000000000000000..832f09769a853c6d1f764bc614e9284a51cbc5ef GIT binary patch literal 1667 zcmV-}27LL6P)DH5qU}dPuoS8v(g#t5;8%RxnnGJNr8a0pQ&S&J#XvIV(V4tvCYfjE z&YgaYBV(M$Ip^Nk+TQh-nRD;ntT}t_efHVmst@%g@IQyFUSp(qKfpEu#7wGPZJnwco;_lfxY=W(?6 zg%y3TA|&W}4!hRav3aRg37_(!rE3z0E_*ShP>9IR4t5idV-3PnBLDz4FSX)Wg8;ip znQ)UuLRp~}&5Z&oOAU%R10=UR2`WnsXl@ixRwzI8m`Sjkcr?`saN2dUok-!6A4c)r z9|7X^PP-0Gb@F!v6A3z=!{Lo3iVEQQy8*Oz2eHa&q9F*VviuQqQ1&P{Twj~I-bLpl{RVv+0fn_#?fp3$39zFqL=;NEh}x*B1ud_O@&#pv%vk) z7(V!R_=(SpjPg(Rf`!Mr3NzI+#8zt;6;L~r4ey`zK*~_@+D*!|H#SiEN@TS_uVGf+ z>DYO07^A^>#_t5HGJ3PhX+!~q$P%qwF~$4btLDSxkbvIK>#|R ziAZqT*<)2o06R{5@~%@V6jGq^nP{cM%$^!|oc27b2y@}jktwux2O(xk8vrB;5Tyhf zs>w=r8lQeT8BP zY=6lHbB-{2;1zNHZvHNkLCfJtoj`0mh4E14f-Dn=NN{;Ys+9A_lKdyROFbbX5{}df zFlgyD$>k;MRRV>#1TrQB|i5UgsFG}2inG{jZB9tjmScy z21hs1SA>~xplyulx}N#~)!~ZZ#P5^ThSHH<$Q-LLrRoP}Lrd2ra|UCw{>3j|+;)@a z;puQsCU?UA^~G5Docw0WZFdw0FMFAvXCfgMPhi)D5#m{b>FD=~SUuk)t0GK)*X|1= zvIe`D_u)t&j(5*^sD-kuqd@%9Nf?ofn= z&8We_+7dZt0RVU0QEWZoCTiW~gKR|_3&pYRqz5fsWMWxaYLI=M*U~kKZ6`fht4>-d zJHj{LguQDWD7Veb2;b0zh|k)_@oS!5BrOyl<}_$IY^t?_Q0H`DYP)Puwk^n#@0f0&Z0F?v)z~9Tp8Xf*$xd#9M N002ovPDHLkV1hvo4~+l- literal 0 HcmV?d00001 diff --git a/psdc-ui/src/views/control/manual/index.vue b/psdc-ui/src/views/control/manual/index.vue index 9e72f2a..9790278 100644 --- a/psdc-ui/src/views/control/manual/index.vue +++ b/psdc-ui/src/views/control/manual/index.vue @@ -16,6 +16,7 @@ {{ item.deviceRunstatus }} +
确定
@@ -151,8 +152,18 @@