From bce71ea39b831ff182490113f2bd0019c13d66f2 Mon Sep 17 00:00:00 2001 From: wj <347312259@qq.com> Date: Mon, 5 Jun 2023 10:30:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=8E=A7=E5=88=B6=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=E5=8F=AF=E6=8E=A7=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- psdc-ui/src/views/control/timer/index.vue | 8 +-- psdc-ui/src/views/emonitor/db/index.vue | 55 ++++++++++++++++--- psdc-ui/src/views/system/cl/index.vue | 6 +- .../src/views/system/user/profile/index.vue | 2 +- 4 files changed, 57 insertions(+), 14 deletions(-) diff --git a/psdc-ui/src/views/control/timer/index.vue b/psdc-ui/src/views/control/timer/index.vue index eb614ce..bf421cd 100644 --- a/psdc-ui/src/views/control/timer/index.vue +++ b/psdc-ui/src/views/control/timer/index.vue @@ -165,7 +165,7 @@ import {Delete,SwitchButton} from '@element-plus/icons-vue' import {ElMessage, ElMessageBox} from "element-plus"; import {ref, reactive, watch, onMounted, watchEffect} from "vue"; import {getList, getAddTimer, getDeleteTimer, getUpDateStatus} from '@/api/control/timer' -import { getDevice } from '@/api/control/manual' +import { getDevice,getControlDeviceList } from '@/api/control/manual' /** 页面加载时*/ @@ -267,7 +267,7 @@ function getListFun(){ timingList.value = res.rows for(let i = 0;i < timingList.value.length;i++){ - if(timingList.value[i].runday.length != 10){ + if(timingList.value[i].runday.length != 10){ // 如果不是日期类型的 let rundayArr = timingList.value[i].runday.split(','); // 将字符串拆成数组 let rundayStr = ''; for(let j = 0;j < rundayArr.length;j++){ @@ -491,9 +491,9 @@ const watchTime = watch(()=> timingForm.executeTime, (val) => { selectTimer.value = `${hours}:${minutes}:${seconds}` console.log('选择时间：',selectTimer.value) }) -//获取所有设备 +//获取可控所有设备 function getAllDev(){ - getDevice().then((res)=>{ + getControlDeviceList().then((res)=>{ devArr.value = res.data }) } diff --git a/psdc-ui/src/views/emonitor/db/index.vue b/psdc-ui/src/views/emonitor/db/index.vue index 27b4321..2eb907b 100644 --- a/psdc-ui/src/views/emonitor/db/index.vue +++ b/psdc-ui/src/views/emonitor/db/index.vue @@ -275,12 +275,31 @@ export default { textStyle:{ color:'#BEC3DA' }, + grid:{ + show: true, + top: '20%', + bottom:'15%', + left:'5%', + right:'3%', + borderWidth: 1, + borderColor: '#767da1', + }, xAxis: { data:data.glXz, axisLine:{ lineStyle:{ - color:'#BEC3DA', - type:'dashed' + color:'#767da1' + } + }, + axisTick: { + show: false // 去掉x轴刻度 + }, + splitArea: { + show: true, + interval:0, + areaStyle: { + color: ['rgb(54,68,148,.8)', 'rgb(37,51,133,.8)'] //这里重点，用于设置颜色的数组， + //（有了这个属性，那我们完全可以自己在根据某些条件来生成这样一个数组） } } }, @@ -295,7 +314,7 @@ export default { } }, axisLine: { - show: true, + show: false, lineStyle:{ type:'dashed', color:'#BEC3DA' @@ -337,6 +356,15 @@ export default { myChart3.setOption({ title: {}, tooltip: {}, + grid:{ + show: true, + top: '20%', + bottom:'15%', + left:'5%', + right:'3%', + borderWidth: 1, + borderColor: '#767da1', + }, textStyle:{ color:'#BEC3DA' }, @@ -345,8 +373,19 @@ export default { data:data.fdlXz, axisLine:{ lineStyle:{ - color:'#BEC3DA', - type:'dashed' + color:'#767da1', + // type:'dashed' + } + }, + axisTick: { + show: false // 去掉x轴刻度 + }, + splitArea: { + show: true, + interval:0, + areaStyle: { + color: ['rgb(54,68,148,.8)', 'rgb(37,51,133,.8)'] //这里重点，用于设置颜色的数组， + //（有了这个属性，那我们完全可以自己在根据某些条件来生成这样一个数组） } } }, @@ -356,12 +395,12 @@ export default { splitLine:{ show:true, lineStyle:{ - type:'dashed', - color:'#BEC3DA' + type:'solid', + color:'#f3ffff' } }, axisLine: { - show: true, + show: false, lineStyle:{ type:'dashed', color:'#BEC3DA' diff --git a/psdc-ui/src/views/system/cl/index.vue b/psdc-ui/src/views/system/cl/index.vue index 08122a7..64f25d7 100644 --- a/psdc-ui/src/views/system/cl/index.vue +++ b/psdc-ui/src/views/system/cl/index.vue @@ -52,7 +52,7 @@ - + @@ -457,6 +457,7 @@ function handleXg(dat) { var deviceId = data.sblb[i].deviceId for (let j = 0;j < dat.deviceVos.length ;j++ ) { if ( deviceId === dat.deviceVos[j].deviceId){ + console.log(dat.deviceVos[j].tempValue) data.sblb[i].controlKey = dat.deviceVos[j].tempValue; } } @@ -622,5 +623,8 @@ const { queryParams } = toRefs(data); ::v-deep .el-checkbox { width: 560px; } +//::v-deep .el-dialog:not(.is-fullscreen){ +// width: auto; +//} diff --git a/psdc-ui/src/views/system/user/profile/index.vue b/psdc-ui/src/views/system/user/profile/index.vue index 16a3e78..4c6ff95 100644 --- a/psdc-ui/src/views/system/user/profile/index.vue +++ b/psdc-ui/src/views/system/user/profile/index.vue @@ -37,7 +37,7 @@ - +