定时控制渲染可控设备列表

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
   })
 }

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',
+                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)'] //这里重点，用于设置颜色的数组，
+                //（有了这个属性，那我们完全可以自己在根据某些条件来生成这样一个数组）
               }
             }
           },
@@ -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',
+                color:'#767da1',
-                type:'dashed'
+                // 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',
+                type:'solid',
-                color:'#BEC3DA'
+                color:'#f3ffff'
               }
             },
             axisLine: {
-              show: true,
+              show: false,
               lineStyle:{
                 type:'dashed',
                 color:'#BEC3DA'

psdc-ui/src/views/system/cl/index.vue

@@ -52,7 +52,7 @@
 
 
     <!-- 新增对话框 -->
-    <el-dialog :title="title" v-model="open" width="600px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="600" append-to-body>
       <el-form :model="timingForm"  ref="userRef" label-width="88px">
         <el-row>
           <el-col :span="24">
@@ -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;
+//}
 </style>
 

psdc-ui/src/views/system/user/profile/index.vue

@@ -37,7 +37,7 @@
                </div>
             </el-card>
          </el-col>
-         <el-col :span="18" :xs="24">
+         <el-col :span="6" :xs="24">
             <el-card>
                <template v-slot:header>
                  <div class="clearfix">