From 25ff9ab7f31f441d383e74f0aaddab9cd5328050 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Tue, 12 Dec 2023 11:03:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/icing/index.vue | 58 +++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/views/icing/index.vue b/src/views/icing/index.vue
index 53dbd7f..bef505d 100644
--- a/src/views/icing/index.vue
+++ b/src/views/icing/index.vue
@@ -155,12 +155,14 @@
             </div>
             <div class="graphBox" v-if="echartsShow">
               <div
-                class="codeBox"
+                class="codeBox1"
                 v-for="(item, index) in codeList"
                 :key="index"
               >
                 <h3>相位(标识): ({{ item }})</h3>
-                <div :id="'lineEchart' + index" class="lineChartBox"></div>
+                <div class="codeBox">
+                  <div :id="'lineEchart' + index" class="lineChartBox"></div>
+                </div>
               </div>
               <div class="noDatabox" v-if="codeList.length == 0">
                 <img src="../../assets/img/nopic1.jpg" />
@@ -303,8 +305,8 @@ export default {
         id: this.id,
         bt: sTime,
         et: eTime,
-        p: this.page,
-        ps: 1000,
+        p: 1,
+        ps: 1000000,
       })
         .then((res) => {
           console.log(res);
@@ -339,7 +341,7 @@ export default {
         "最小风偏角时拉力",
       ];
       timeXData = this.chartsData.map((item) =>
-        this.$moment(item.updateTime * 1000).format("HH:mm:ss")
+        this.$moment(item.updateTime * 1000).format("YYYY-MM-DD HH:mm:ss")
       );
       timeXData = [...new Set(timeXData)];
       console.log(timeXData);
@@ -417,13 +419,13 @@ export default {
                 show: true,
                 realtime: true,
                 start: 0,
-                end: 85,
+                end: 100,
               },
               {
                 type: "inside",
                 realtime: true,
                 start: 0,
-                end: 85,
+                end: 100,
               },
             ],
             xAxis: [
@@ -564,23 +566,23 @@ export default {
     },
     onSubmit() {
       console.log(this.formdata.starttime, this.formdata.endtime);
-      if (
-        new Date(this.formdata.starttime).getDate() ===
-        new Date(this.formdata.endtime).getDate()
-      ) {
-        this.getIcingData(this.paramsData);
-        console.log("开始时间和结束时间为同一天");
-      } else {
-        this.$message({
-          duration: 1500,
-          showClose: true,
-          message: "请选择同一天",
-          type: "warning",
-        });
-        return;
-        console.log("开始时间和结束时间不是同一天");
-      }
-      // this.getIcingData(this.paramsData);
+      // if (
+      //   new Date(this.formdata.starttime).getDate() ===
+      //   new Date(this.formdata.endtime).getDate()
+      // ) {
+      //   this.getIcingData(this.paramsData);
+      //   console.log("开始时间和结束时间为同一天");
+      // } else {
+      //   this.$message({
+      //     duration: 1500,
+      //     showClose: true,
+      //     message: "请选择同一天",
+      //     type: "warning",
+      //   });
+      //   return;
+      //   console.log("开始时间和结束时间不是同一天");
+      // }
+      this.getIcingData(this.paramsData);
     },
     //点击分页
     handleCurrentChange(val) {
@@ -640,9 +642,9 @@ export default {
       margin: 0 auto;
       height: calc(100% - 54px);
       overflow: auto;
-      .codeBox {
+      .codeBox1 {
         width: 100%;
-        height: 400px;
+        height: 500px;
         h3 {
           font-size: 14px;
           color: #333;
@@ -651,6 +653,10 @@ export default {
           font-weight: normal;
           text-align: center;
         }
+        .codeBox {
+          width: 100%;
+          height: 450px;
+        }
         .lineChartBox {
           width: 100%;
           height: 372px;