hwj_system
/
scmy
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
魔神煜修罗皇 2 years ago
parent fc8e7686e0 c7ba5fc8bc
commit 2c97d2043c
8 changed files with 31 additions and 170 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 161
      psdc-ui/src/views/analyse/nhdb/index.vue
  2. 10
      psdc-ui/src/views/analyse/nhtj/index.vue
  3. 12
      psdc-ui/src/views/control/timer/index.vue
  4. 4
      psdc-ui/src/views/emonitor/db/index.vue
  5. 4
      psdc-ui/src/views/emonitor/drgl/index.vue
  6. 4
      psdc-ui/src/views/emonitor/frdl/index.vue
  7. 4
      psdc-ui/src/views/emonitor/kqyrb/index.vue
  8. 2
      psdc-ui/src/views/emonitor/wdcgq/index.vue

161
psdc-ui/src/views/analyse/nhdb/index.vue
Unescape View File

@ -54,164 +54,7 @@ import {getCelueList} from '@/api/analyse/nhdb/nhdb'
const imgSrc = ref('../src/assets/images/策略icon.png')
const data = reactive({
celueInfoList:[
// {
// sceneName:'电磁锅炉供暖策略',
// data:[
// {
// key: 1,
// label:'开始执行时间',
// startTime:'2023-06-08 15:00:00'
// },
// {
// key: 2,
// label:'结束执行时间',
// startTime:'2023-06-08 18:00:00'
// },
// {
// key: 3,
// label:'执行前室内温度',
// startTime:'20℃'
// },
// {
// key: 4,
// label:'执行前室外温度',
// startTime:'14℃'
// },
// {
// key: 5,
// label:'执行后室内温度',
// startTime:'29℃'
// },
// {
// key: 6,
// label:'执行后室外温度',
// startTime:'15℃'
// },
// {
// key: 7,
// label:'执行时长',
// startTime:'3h'
// },
// {},
// {
// key: 8,
// label:'单位时间用电',
// startTime:'5kWh'
// },
// {},
// {
// key: 9,
// label:'总用电量',
// startTime:'16kWh'
// }
// ]
// },
// {
// sceneName:'空气源热泵供暖策略',
// data:[
// {
// key: 1,
// label:'开始执行时间',
// startTime:'2023-06-05 11:00:00'
// },
// {
// key: 2,
// label:'结束执行时间',
// startTime:'2023-06-05 13:00:00'
// },
// {
// key: 3,
// label:'执行前室内温度',
// startTime:'22℃'
// },
// {
// key: 4,
// label:'执行前室外温度',
// startTime:'15℃'
// },
// {
// key: 5,
// label:'执行后室内温度',
// startTime:'30℃'
// },
// {
// key: 6,
// label:'执行后室外温度',
// startTime:'15℃'
// },
// {
// key: 7,
// label:'执行时长',
// startTime:'2h'
// },
// {},
// {
// key: 8,
// label:'单位时间用电',
// startTime:'6kWh'
// },
// {},
// {
// key: 9,
// label:'总用电量',
// startTime:'12kWh'
// }
// ]
// },
// {
// sceneName:'空气源热泵供暖策略',
// data:[
// {
// key: 1,
// label:'开始执行时间',
// startTime:'2023-06-05 11:00:00'
// },
// {
// key: 2,
// label:'结束执行时间',
// startTime:'2023-06-05 13:00:00'
// },
// {
// key: 3,
// label:'执行前室内温度',
// startTime:'22℃'
// },
// {
// key: 4,
// label:'执行前室外温度',
// startTime:'15℃'
// },
// {
// key: 5,
// label:'执行后室内温度',
// startTime:'30℃'
// },
// {
// key: 6,
// label:'执行后室外温度',
// startTime:'15℃'
// },
// {
// key: 7,
// label:'执行时长',
// startTime:'2h'
// },
// {},
// {
// key: 8,
// label:'单位时间用电',
// startTime:'6kWh'
// },
// {},
// {
// key: 9,
// label:'总用电量',
// startTime:'12kWh'
// }
// ]
// },
]
celueInfoList:[]
})
onMounted(()=>{
@ -219,7 +62,7 @@ onMounted(()=>{
forId();
setTimeout(()=>{
indoorChartFun();
},300)
},1000)
})

10
psdc-ui/src/views/analyse/nhtj/index.vue
Unescape View File

@ -59,7 +59,7 @@
<!-- 生成图表弹出窗 -->
<el-dialog class="mrt" :title="title" v-model="open" width="1000px" append-to-body :close-on-click-modal="false" :show-close="false">
<el-dialog class="mrt" :title="title" v-model="open" width="50%" append-to-body :close-on-click-modal="false" :show-close="false">
<div class="chartBox">
<div id="chart"></div>
</div>
@ -551,6 +551,14 @@ const { filterForm } = toRefs(data);
.app-container{
padding: 8px;
}
.chartBox{
width: 100%;
height: 250px;
#chart{
width: 100%;
height: 100%;
}
}
}
</style>

12
psdc-ui/src/views/control/timer/index.vue
Unescape View File

@ -16,7 +16,7 @@
<!-- <el-option label="停止" value="0" />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="创建日期" style="width: 308px;">
<el-form-item label="创建日期" class="myFormItem">
<el-date-picker v-model="queryParams.dateRange"
value-format="YYYY-MM-DD"
type="daterange"
@ -542,7 +542,6 @@ const { queryParams } = toRefs(data);
background-color: #2F3D8A;
}
.mr30{
margin-left: 100px;
margin-top: -4px;
}
.collapse{
@ -632,6 +631,15 @@ const { queryParams } = toRefs(data);
.mybtn{
margin-bottom: 0px !important;
}
.mr30 {
margin-left: 0;
}
.myFormItem{
margin-right: 20px !important;
}
::v-deep .el-range-editor.el-input__wrapper{
width: 270px;
}
::v-deep .el-button{
margin-bottom: 8px;
font-size: 12px;

4
psdc-ui/src/views/emonitor/db/index.vue
Unescape View File

@ -67,7 +67,6 @@ export default {
emonth:'-- ',
glData:[],
glXz:[
"00:00",
"00:15",
"00:30",
"00:45",
@ -162,7 +161,7 @@ export default {
"23:00",
"23:15",
"23:30",
"23:45"
"23:45",
],
fdlData:'',
fdlXz:'',
@ -190,6 +189,7 @@ export default {
delete res.data.todayUsePowers.userId
let arr = Object.values(res.data.todayUsePowers)
data.glData=arr
console.log(data.glData)
}
//当前功率饼图

4
psdc-ui/src/views/emonitor/drgl/index.vue
Unescape View File

@ -102,7 +102,6 @@ export default {
runStatus:'-- ',
glData:[],
glXz:[
"00:00",
"00:15",
"00:30",
"00:45",
@ -197,7 +196,8 @@ export default {
"23:00",
"23:15",
"23:30",
"23:45"
"23:45",
"00:00",
],
dayData:[],
dayXz:[],

4
psdc-ui/src/views/emonitor/frdl/index.vue
Unescape View File

@ -99,7 +99,6 @@ export default {
runStatus:'-- ',
glData:[],
glXz:[
"00:00",
"00:15",
"00:30",
"00:45",
@ -194,7 +193,8 @@ export default {
"23:00",
"23:15",
"23:30",
"23:45"
"23:45",
"00:00",
],
dayData:[],
dayXz:[],

4
psdc-ui/src/views/emonitor/kqyrb/index.vue
Unescape View File

@ -102,7 +102,6 @@ export default {
runStatus:'-- ',
glData:[],
glXz:[
"00:00",
"00:15",
"00:30",
"00:45",
@ -197,7 +196,8 @@ export default {
"23:00",
"23:15",
"23:30",
"23:45"
"23:45",
"00:00",
],
dayData:[],
dayXz:[],

2
psdc-ui/src/views/emonitor/wdcgq/index.vue
Unescape View File

@ -383,6 +383,8 @@ p{
padding: 8px;
}
.card{
margin-bottom: 8px;
margin-right: 8px;
p{
font-size: 14px;
}

Write Preview
Loading…
Cancel
Save