From ef27df95ffc9dfc8e9786a0a0b4029fd7cf4e8c0 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Wed, 24 May 2023 12:15:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?2023-05-24=2012:14:36=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=AD=96=E7=95=A5=E7=AE=A1=E7=90=86=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=8E=A5=E5=8F=A3!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/psdc/controller/manager/PsdcSceneController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/psdc-web/src/main/java/com/psdc/controller/manager/PsdcSceneController.java b/psdc-web/src/main/java/com/psdc/controller/manager/PsdcSceneController.java index 7168038..7c83cbf 100644 --- a/psdc-web/src/main/java/com/psdc/controller/manager/PsdcSceneController.java +++ b/psdc-web/src/main/java/com/psdc/controller/manager/PsdcSceneController.java @@ -91,7 +91,7 @@ public class PsdcSceneController extends BaseController { */ @PreAuthorize("@ss.hasPermi('system:cl:list')") @Log(title = "策略管理", businessType = BusinessType.DELETE) - @DeleteMapping() + @RequestMapping(value = "/del", method = RequestMethod.POST) public AjaxResult remove(@Validated @RequestBody PsdcSceneRequest sceneId) { return toAjax(psdcSceneService.deleteByScene(sceneId)); } From 4c2cdf0166071d2a50fa97d2175249978fa0bf90 Mon Sep 17 00:00:00 2001 From: jiminglei <836545853@qq.com> Date: Wed, 24 May 2023 14:30:40 +0800 Subject: [PATCH 2/4] 11 --- psdc-ui/src/api/bigview/bigview.js | 4 +- psdc-ui/src/api/emonitor/api.js | 28 +- psdc-ui/src/views/bigview/index.vue | 2 +- psdc-ui/src/views/emonitor/db/index.vue | 22 +- psdc-ui/src/views/emonitor/drgl/index.vue | 32 ++- psdc-ui/src/views/emonitor/frdl/index.vue | 1 + psdc-ui/src/views/emonitor/kqyrb/index.vue | 1 + psdc-ui/src/views/emonitor/sp/index.vue | 29 +- psdc-ui/src/views/emonitor/wdcgq/index.vue | 2 +- psdc-ui/src/views/emonitor/xrgl/index.vue | 1 + psdc-ui/src/views/system/cl/index.vue | 314 +++++++++++++++++---- 11 files changed, 345 insertions(+), 91 deletions(-) diff --git a/psdc-ui/src/api/bigview/bigview.js b/psdc-ui/src/api/bigview/bigview.js index 4d643e9..968f708 100644 --- a/psdc-ui/src/api/bigview/bigview.js +++ b/psdc-ui/src/api/bigview/bigview.js @@ -1,8 +1,8 @@ import request from '@/utils/request' /** 8个温度传感器接口*/ -export function getTemperature() { - return request.get('/indexLook/8wd') +export function getTemperature(data) { + return request.get('/indexLook/8wd/'+data) } /**运行设备工作信息查询接口*/ export function getDevicesInfo() { diff --git a/psdc-ui/src/api/emonitor/api.js b/psdc-ui/src/api/emonitor/api.js index 12013d7..672ab00 100644 --- a/psdc-ui/src/api/emonitor/api.js +++ b/psdc-ui/src/api/emonitor/api.js @@ -35,6 +35,30 @@ export function getFrld(data) { return request.get('/monitor/frdl/index/sel2/'+data) } //温度传感器 -export function getWdcgq() { - return request.get('/monitor/wdcgq/index/sel1') +export function getWdcgq(data) { + return request.get('/monitor/wdcgq/index/sel1/'+data) } +//沙盘 +export function getSp(data) { + return request.get('monitor/sp/index/sel1/'+data) +} +//策略管理 +export function getXl() { + return request.get('system/cl/index/selMyscene') +} +export function getTb(data) { + return request.post('system/cl/index/list',data) +} +export function postNew(data) { + return request.post('system/cl/index',data) +} +export function postXg(data) { + return request.put('system/cl/index',data) +} +export function postDel(data) { + return request.post('system/cl/index/del',data) +} +//获取用户设备列表 +export function getSb() { + return request.get('/monitor/db/index/selMydevices') +} \ No newline at end of file diff --git a/psdc-ui/src/views/bigview/index.vue b/psdc-ui/src/views/bigview/index.vue index 22297bb..a87722c 100644 --- a/psdc-ui/src/views/bigview/index.vue +++ b/psdc-ui/src/views/bigview/index.vue @@ -131,7 +131,7 @@ onMounted(()=>{ /** 8个温度传感器数据*/ const wdcgqArr = ref([]) function getWenduFun(){ - getTemperature().then((res)=>{ + getTemperature(16).then((res)=>{ wdcgqArr.value = res.data }) } diff --git a/psdc-ui/src/views/emonitor/db/index.vue b/psdc-ui/src/views/emonitor/db/index.vue index 160350b..5c533fd 100644 --- a/psdc-ui/src/views/emonitor/db/index.vue +++ b/psdc-ui/src/views/emonitor/db/index.vue @@ -181,15 +181,18 @@ 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 + if(res.data){ + 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 + } + @@ -304,6 +307,7 @@ export default { itemStyle:{ color:'#2F8EE0' }, + symbol: "none", //去掉拐角点 }, ], }); diff --git a/psdc-ui/src/views/emonitor/drgl/index.vue b/psdc-ui/src/views/emonitor/drgl/index.vue index 6f5ad1c..8e170f0 100644 --- a/psdc-ui/src/views/emonitor/drgl/index.vue +++ b/psdc-ui/src/views/emonitor/drgl/index.vue @@ -422,21 +422,24 @@ export default { }) getDrgl(1).then((res)=>{ console.log('1',res) - data.tempIn=res.data.tempIn - data.tempOut=res.data.tempOut - data.totp = res.data.totp - data.totwh = res.data.totwh - if(res.data.runStatus==1){ - data.runStatus = '开启' - }else if (res.data.runStatus==2){ - data.runStatus = '关闭' + if(res.data){ + data.tempIn=res.data.tempIn + data.tempOut=res.data.tempOut + data.totp = res.data.totp + data.totwh = res.data.totwh + if(res.data.runStatus==1){ + data.runStatus = '开启' + }else if (res.data.runStatus==2){ + data.runStatus = '关闭' + } + //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 } - //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")); if (myChart3){ myChart3.dispose() @@ -483,6 +486,7 @@ export default { itemStyle:{ color:'#2F8EE0' }, + symbol: "none", //去掉拐角点 }, ], }); diff --git a/psdc-ui/src/views/emonitor/frdl/index.vue b/psdc-ui/src/views/emonitor/frdl/index.vue index 066566a..c4bbe16 100644 --- a/psdc-ui/src/views/emonitor/frdl/index.vue +++ b/psdc-ui/src/views/emonitor/frdl/index.vue @@ -460,6 +460,7 @@ export default { itemStyle:{ color:'#2F8EE0' }, + symbol: "none", //去掉拐角点 }, ], }); diff --git a/psdc-ui/src/views/emonitor/kqyrb/index.vue b/psdc-ui/src/views/emonitor/kqyrb/index.vue index 4fa2746..9d403d1 100644 --- a/psdc-ui/src/views/emonitor/kqyrb/index.vue +++ b/psdc-ui/src/views/emonitor/kqyrb/index.vue @@ -480,6 +480,7 @@ export default { itemStyle:{ color:'#2F8EE0' }, + symbol: "none", //去掉拐角点 }, ], }); diff --git a/psdc-ui/src/views/emonitor/sp/index.vue b/psdc-ui/src/views/emonitor/sp/index.vue index d356c8b..30fd137 100644 --- a/psdc-ui/src/views/emonitor/sp/index.vue +++ b/psdc-ui/src/views/emonitor/sp/index.vue @@ -1,10 +1,35 @@ -