|
@@ -64,7 +64,7 @@
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
<script lang="ts">
|
|
<script lang="ts">
|
|
-import { ref, reactive, toRefs, onMounted } from "vue";
|
|
|
|
|
|
+import { ref, reactive, toRefs, onMounted, computed } from "vue";
|
|
import pageHead from "@/components/pageHead.vue";
|
|
import pageHead from "@/components/pageHead.vue";
|
|
import NowData from "@/components/NowData.vue";
|
|
import NowData from "@/components/NowData.vue";
|
|
import LastMonthData from "@/components/LastMonthData.vue";
|
|
import LastMonthData from "@/components/LastMonthData.vue";
|
|
@@ -93,14 +93,38 @@ export default {
|
|
LastSaveEnergy: LastSaveEnergy,
|
|
LastSaveEnergy: LastSaveEnergy,
|
|
},
|
|
},
|
|
setup() {
|
|
setup() {
|
|
|
|
+ const projectStore = useProjectStore();
|
|
|
|
+ var showAllPage = computed(() => {
|
|
|
|
+ console.log(
|
|
|
|
+ "lastAllEnergy",
|
|
|
|
+ projectStore.lastAllEnergy.energyTotal
|
|
|
|
+ );
|
|
|
|
+ if (
|
|
|
|
+ projectStore.lastAllEnergy.energyTotal === undefined &&
|
|
|
|
+ projectStore.lastAllEnergy.energyCompare === undefined
|
|
|
|
+ ) {
|
|
|
|
+ return 2;
|
|
|
|
+ } else {
|
|
|
|
+ return 3;
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ // projectStore.$subscribe((mutation, state) => {
|
|
|
|
+ // console.log(
|
|
|
|
+ // "projectStore--state",
|
|
|
|
+ // state,
|
|
|
|
+ // state.lastAllEnergy.energySaving
|
|
|
|
+ // );
|
|
|
|
+ // });
|
|
|
|
+
|
|
const allData = reactive({
|
|
const allData = reactive({
|
|
nowPage: 1,
|
|
nowPage: 1,
|
|
- showAllPage: 3,
|
|
|
|
|
|
+ //showAllPage: 3,
|
|
doneTowPage() {
|
|
doneTowPage() {
|
|
|
|
+ //debugger;
|
|
//第二屏刷新结束 通知
|
|
//第二屏刷新结束 通知
|
|
- if (allData.showAllPage == 3) {
|
|
|
|
|
|
+ if (showAllPage.value == 3) {
|
|
allData.nowPage = 3;
|
|
allData.nowPage = 3;
|
|
- } else if (allData.showAllPage == 2) {
|
|
|
|
|
|
+ } else if (showAllPage.value == 2) {
|
|
allData.nowPage = 1;
|
|
allData.nowPage = 1;
|
|
}
|
|
}
|
|
allData.timePageShow();
|
|
allData.timePageShow();
|