Bladeren bron

代码提交

LiuShu_0203 5 maanden geleden
bovenliggende
commit
f976fb5199
1 gewijzigde bestanden met toevoegingen van 6 en 13 verwijderingen
  1. 6 13
      src/App.vue

+ 6 - 13
src/App.vue

@@ -237,8 +237,7 @@
                             </div>
                             <div class="Freezer_middle_belowdataboxs2">
                                 <div class="Freezer_middle_belowdataboxs2_title">解冻时长</div>
-                                <div v-if="meterialParamlistfalog === false" class="chartssno">暂未运行</div>
-                                <div v-else id="chartss"></div>
+                                <div id="chartss"></div>
                             </div>
                         </div>
                     </div>
@@ -422,6 +421,7 @@ const updateTime = () => {
 
 const progressbar = (datalist: any) => {
     const chartElement = document.getElementById('chartss');
+    console.log(datalist, 'datalist');
     if (chartElement) {
         const myChart = echarts.init(chartElement);
         const option = {
@@ -471,7 +471,7 @@ const progressbar = (datalist: any) => {
                         }
                     },
                     barWidth: 20,
-                    data: [Number(datalist.runTime).toFixed(2)],
+                    data: [datalist.jdTime === null ? 0 : Number(datalist.jdTime).toFixed(2)],
                     label: {
                         show: true,
                         position: 'insideTop',
@@ -487,7 +487,7 @@ const progressbar = (datalist: any) => {
                     type: 'bar',
                     barWidth: 20,
                     barGap: '-100%',
-                    data: [Number(datalist.jdTime).toFixed(2)],
+                    data: [datalist.runTime === null ? 10 : Number(datalist.runTime).toFixed(2)],
                     itemStyle: {
                         normal: {
                             color: {
@@ -511,7 +511,7 @@ const progressbar = (datalist: any) => {
                         show: true,
                         position: 'right',
                         formatter() {
-                            const total = Number(datalist.jdTime).toFixed(2); // 假设总条数为20
+                            const total = datalist.jdTime ? 0 : Number(datalist.jdTime).toFixed(2); // 假设总条数为20
                             return `${total}h`;
                         },
                         fontSize: 16,
@@ -868,18 +868,12 @@ const uselistData = () => {
         });
 };
 
-const meterialParamlistfalog = ref<boolean>(false);
 const usemeterialParamlist = (item: any) => {
     const meterialId = Number(item);
     meterialParamlist(meterialId)
         .then((res: any) => {
             if (res && res.code === 200) {
-                if (res.data.jdTime === null && res.data.runTime === null) {
-                    meterialParamlistfalog.value = false;
-                } else {
-                    meterialParamlistfalog.value = true;
-                    progressbar(res.data);
-                }
+                progressbar(res.data);
             } else {
                 console.log('获取数据失败');
             }
@@ -900,7 +894,6 @@ const handleMqttMessage = (topic: string, message: any) => {
                 alarmdata.value.shift();
             }
             alarmdata.value.push(data);
-            // console.log(alarmdata.value, 'alarmdata.value');
         } catch (error) {
             console.error('解析消息失败:', error);
         }