Merge branch 'master' of https://gitee.com/tj-wang-yahui/AMS_HeatSys_Vue_V10

src/views/HandlerPage/TransferEnergyView.vue

@@ -62,7 +62,7 @@
             style="min-width: 150px"
             @change="selTypeChange"
           >
-            <el-option label="用量环比" :value="0" />
+            <!-- <el-option label="用量环比" :value="0" /> -->
             <el-option label="热单耗" :value="1" />
             <el-option label="电单耗" :value="2" />
             <el-option label="水单耗" :value="3" />
@@ -169,6 +169,7 @@ const tableHeight = ref(500);
 const computedWidth = ref("1200px");
 const computedHeight = ref("500px");
 const formRef = ref(null);
+const company = ref("W/㎡");
 const enertyInfo = reactive({
   supplyId: null,
   transferId: [],
@@ -248,21 +249,27 @@ function sendClick() {
           postQOQlistFun();
           break; //用量环比
         case 1:
+          company.value = "W/㎡";
           postHeatUctFun();
           break; //热单耗
         case 2:
+          company.value = "Kwh/㎡";
           postElecUcFun(); //电单耗
           break;
         case 3:
+          company.value = "Kg/㎡";
           postWaterUcFun(); //电单耗
           break;
         case 4:
+          company.value = "W/(㎡×℃)";
           postDayHeatFun(); //度日数热耗
           break;
         case 5:
+          company.value = "℃";
           postFirBackTFun(); //一网回温
           break;
         case 6:
+          company.value = "t/h/万㎡";
           postWPMLLFun(); //一网万平米流量
           break;
         case 7:
@@ -282,7 +289,6 @@ function sendClick() {
 function delJson() {}
 
 function selTypeChange() {
-  console.log(energyTypeDis);
   if (enertyInfo.type == 0) {
     energyTypeDis.value = true;
   } else {
@@ -461,7 +467,7 @@ function pageInitFun(res) {
   echartData.value = dataDeal(res.data.hourWater);
   echartData.value[0].listInfo.forEach((element) => {
     if (element.gatherTime) {
-      echartDataTime.push(element.gatherTime.split(" 00:00:00")[0]);
+      echartDataTime.push(element.gatherTime);
     }
   });
   echartData.value.forEach((element) => {
@@ -567,7 +573,7 @@ function echartInit() {
   var myChart = echarts.init(chartDom);
   var option;
   myChart.resize({ width: computedWidth.value, height: computedHeight.value });
-  var company = "T";
+  // var company = "T";
 
   option = {
     title: {
@@ -618,7 +624,7 @@ function echartInit() {
         name: "能耗",
         position: "right",
         axisLabel: {
-          formatter: "{value} " + company,
+          formatter: "{value} " + company.value,
         },
       },
     ],
@@ -632,7 +638,7 @@ function changeFun() {
   var divWidth = document.getElementById("contentBlock").offsetWidth;
   var divHeight = document.getElementById("contentBlock").scrollHeight;
   computedWidth.value = divWidth + "px";
-  computedHeight.value = divHeight * 0.7 + "px";
+  computedHeight.value = divHeight * 0.6 + "px";
   echartInit();
 }