diff --git a/psdc-ui/src/views/analyse/nhfx/index.vue b/psdc-ui/src/views/analyse/nhfx/index.vue index a89cb93..8e60d74 100644 --- a/psdc-ui/src/views/analyse/nhfx/index.vue +++ b/psdc-ui/src/views/analyse/nhfx/index.vue @@ -1,10 +1,18 @@ diff --git a/psdc-ui/src/views/bigview/index.vue b/psdc-ui/src/views/bigview/index.vue index 4036821..43cd513 100644 --- a/psdc-ui/src/views/bigview/index.vue +++ b/psdc-ui/src/views/bigview/index.vue @@ -2,7 +2,7 @@

电能替代分布式控制试验平台

- 返回后台 + 返回后台
@@ -149,14 +149,15 @@ // import {ref,reactive} from 'vue' import {getTemperature} from '../../api/bigview/bigview' -// getWendu(); +getWendu(); -// const wendi1 = ref(0) -// function getWendu(){ -// getTemperature().then((res)=>{ -// console.log(res.data.data) -// }) -// } +const wendi1 = ref(0) +function getWendu(){ + console.log('请求接口') + getTemperature().then((res)=>{ + console.log(res.data) + }) +} @@ -281,7 +282,7 @@ import {getTemperature} from '../../api/bigview/bigview' .my3D_img{ width: 100%; height: 100%; - padding: 20px 60px 0 60px; + padding: 20px 70px 0 70px; img{ width: 100%; height: 100%; diff --git a/psdc-ui/src/views/control/manual/index.vue b/psdc-ui/src/views/control/manual/index.vue index 45619ba..d00109d 100644 --- a/psdc-ui/src/views/control/manual/index.vue +++ b/psdc-ui/src/views/control/manual/index.vue @@ -1,6 +1,6 @@ @@ -284,9 +346,9 @@ const onSubmit3 = () => { } } .control_table{ + position: relative; width: 100%; height: 90%; - border: 1px solid red; } } } @@ -306,5 +368,20 @@ const onSubmit3 = () => { ::v-deep .el-input__inner{ color: #f3ffff; } +::v-deep .el-pagination{ + position: absolute; + bottom: 10px; + left: 50%; + transform: translateX(-50%); +} +::v-deep .el-pagination__total{ + color: #f3ffff; +} +::v-deep .el-pagination__jump{ + color: #f3ffff; +} +::v-deep .el-pager{ + margin: 0 5px; +} diff --git a/psdc-ui/src/views/control/timer/index.vue b/psdc-ui/src/views/control/timer/index.vue index 1db90ce..916a378 100644 --- a/psdc-ui/src/views/control/timer/index.vue +++ b/psdc-ui/src/views/control/timer/index.vue @@ -1,16 +1,240 @@