zhaojijng пре 2 година
родитељ
комит
4a2450f5d1
2 измењених фајлова са 23 додато и 17 уклоњено
  1. 12 8
      src/components/LastSaveEnergy.vue
  2. 11 9
      src/components/TemChart.vue

+ 12 - 8
src/components/LastSaveEnergy.vue

@@ -33,7 +33,7 @@
                         <div class="electWrap">
                             <div>节约电</div>
                             <div class="value">
-                                <span class="num">{{ lastAllEnergyRes.energySaving }}</span>度
+                                <span class="num">{{doNum(lastAllEnergy.energySaving,0) }}</span>度
                             </div>
                         </div>
                     </div>
@@ -58,7 +58,7 @@
                             src="@/assets/image/horImg/saveCo2.png"
                         />
                         <div class="co2Wrap sco2">
-                            减排<span class="value">{{ lastAllEnergyRes.cdmCo2 }}Kg</span>CO₂
+                            减排<span class="value">{{ doNum(lastAllEnergy.cdmCo2,2)}}Kg</span>CO₂
                         </div>
                     </div>
 
@@ -75,7 +75,7 @@
                             src="@/assets/image/horImg/saveCarbon.png"
                         />
                         <div class="co2Wrap sco2">
-                            减排<span class="value">{{ lastAllEnergyRes.cdmC }}Kg</span>碳
+                            减排<span class="value">{{doNum(lastAllEnergy.cdmC,2)}}Kg</span>碳
                         </div>
                     </div>
 
@@ -93,7 +93,7 @@
                         />
                         <div class="co2Wrap sco2">
                             为国家种<span class="value">{{
-                                lastAllEnergyRes.cdmTree
+                                doNum(lastAllEnergy.cdmTree,0)
                                 }}</span>棵树
                         </div>
                     </div>
@@ -141,9 +141,12 @@ export default defineComponent({
         const saveCont = ref();
 
         const allData = reactive({
-            lastAllEnergyRes: {},
+            //lastAllEnergyRes: {},
             videoWidth: 0,
             videoLeft: 0,
+            doNum(num, init) {
+                return num ? num.toFixed(init) : num;
+            },
         });
 
         let point1p = {}; // x 初始位置
@@ -292,10 +295,11 @@ export default defineComponent({
         });
 
         const projectStore = useProjectStore();
-        // const { lastAllEnergy } = storeToRefs(projectStore);
+        const { lastAllEnergy } = storeToRefs(projectStore);
+        //console.log("lastAllEnergyRes", lastAllEnergy);
 
         projectStore.$subscribe((mutation, state) => {
-            //订阅store的变化
+            //订阅store的变化  这个方法它不走
             const lastAllEnergy = state.lastAllEnergy || {};
             allData.lastAllEnergyRes = {
                 cdmCo2: lastAllEnergy.cdmCo2
@@ -315,7 +319,7 @@ export default defineComponent({
         onMounted(() => {
             //projectStore.setLastAllEnergy();
         });
-        return { ...toRefs(allData), svideo, saveCont };
+        return { ...toRefs(allData), svideo, saveCont, lastAllEnergy };
     },
     computed: {},
 });

+ 11 - 9
src/components/TemChart.vue

@@ -207,7 +207,7 @@ export default defineComponent({
                 .tooltip(false)
                 .position("time*temp")
                 .shape("breath-point");
-
+            //debugger;
             var lastpoint = cdata[cdata.length - 1];
             var nowtime = moment();
             var timestr = nowtime.format("YYYY.MM.DD");
@@ -217,14 +217,16 @@ export default defineComponent({
                 <div style='font-size:16px;font-weight:600;margin-top:4px;'>室内温度:${lastpoint &&
                     lastpoint.temp &&
                     Number(lastpoint.temp).toFixed(1)}℃</div></div>`;
-            chart.annotation().html({
-                position: lastpoint,
-                html: tooltipHtml,
-                alignX: "right",
-                alignY: "bottom",
-                offsetX: 60,
-                offsetY: -15,
-            });
+            lastpoint &&
+                lastpoint.time &&
+                chart.annotation().html({
+                    position: lastpoint,
+                    html: tooltipHtml,
+                    alignX: "right",
+                    alignY: "bottom",
+                    offsetX: 60,
+                    offsetY: -15,
+                });
 
             chart.annotation().text({
                 // position: ['min', 'max'], // 文本的起始位置,值为原始数据值,支持 callback