jiejie.liu 2 ヶ月 前
コミット
520ac5612a

BIN
.DS_Store


+ 4 - 2
jg/electron/main.mjs

@@ -13,8 +13,10 @@ let mainWindow = null;
 
 function createWindow() {
   mainWindow = new BrowserWindow({
-    width: 1000,
-    height: 800,
+    width: 1400,
+    height: 900,
+    minWidth:800,
+    minHeight:600,
     webPreferences: {
       preload: path.join(__dirname, "./preload.mjs"),
       contextIsolation: true,

+ 30 - 20
jg/src/layouts/index.vue

@@ -1,39 +1,40 @@
 <script setup lang="ts">
-import LayFooter from '@/layouts/components/LayFooter.vue';
-import LayHeader from '@/layouts/components/LayHeader/index.vue';
-import LayMenu from '@/layouts/components/LayMenu/index.vue';
-import LayTabs from '@/layouts/components/LayTabs/index.vue';
-import { useAppStore, useRouteStore } from '@/stores';
-import { $t } from '@/utils';
+import LayFooter from "@/layouts/components/LayFooter.vue";
+import LayHeader from "@/layouts/components/LayHeader/index.vue";
+import LayMenu from "@/layouts/components/LayMenu/index.vue";
+import LayTabs from "@/layouts/components/LayTabs/index.vue";
+import { useAppStore, useRouteStore } from "@/stores";
+import { $t } from "@/utils";
 
-defineOptions({ name: 'Layout' });
+defineOptions({ name: "Layout" });
 
 const appStore = useAppStore();
 const routeStore = useRouteStore();
 
-const {
-  transitionAnimation,
-  loadFlag,
-  watermark,
-  isDark,
-  footer,
-} = storeToRefs(appStore);
+const { transitionAnimation, loadFlag, watermark, isDark, footer } =
+  storeToRefs(appStore);
 
 const watermarkConfig = reactive({
-  content: 'Meet you',
+  content: "Meet you",
   font: {
     fontSize: 16,
-    color: 'rgba(0, 0, 0, .15)',
+    color: "rgba(0, 0, 0, .15)",
   },
 });
 
 watchEffect(() => {
-  watermarkConfig.font.color = isDark.value ? 'rgba(255, 255, 255, .15)' : 'rgba(0, 0, 0, .15)';
+  watermarkConfig.font.color = isDark.value
+    ? "rgba(255, 255, 255, .15)"
+    : "rgba(0, 0, 0, .15)";
 });
 </script>
 
 <template>
-  <el-watermark class="watermark wh-full" :content="watermark ? watermarkConfig.content : ''" :font="watermarkConfig.font">
+  <el-watermark
+    class="watermark wh-full"
+    :content="watermark ? watermarkConfig.content : ''"
+    :font="watermarkConfig.font"
+  >
     <el-container>
       <LayMenu />
       <el-container>
@@ -41,12 +42,20 @@ watchEffect(() => {
           <LayHeader />
           <LayTabs />
         </el-header>
-        <el-main class="bg-[var(--el-bg-color-page)]" style="--el-main-padding: 0">
+        <el-main
+          class="bg-[var(--el-bg-color-page)]"
+          style="--el-main-padding: 0"
+        >
           <el-scrollbar class="main-scrollbar">
             <router-view v-slot="{ Component, route }">
               <transition :name="transitionAnimation" mode="out-in" appear>
                 <keep-alive :include="routeStore.cacheRoutes">
-                  <component :is="Component" v-if="loadFlag" :key="route.fullPath" class="p-16" />
+                  <component
+                    :is="Component"
+                    v-if="loadFlag"
+                    :key="route.fullPath"
+                    class="p-16"
+                  />
                 </keep-alive>
               </transition>
             </router-view>
@@ -64,6 +73,7 @@ watchEffect(() => {
 <style scoped lang="scss">
 .main-scrollbar {
   :deep(.el-scrollbar__view) {
+    height: 100%;
     &:has(.main-content) {
       height: 100%;
     }

+ 6 - 2
jg/src/views/laserRangeFinder/components/MultilevelTable.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-12-09 16:41:31
- * @LastEditTime: 2025-03-05 17:32:53
+ * @LastEditTime: 2025-03-24 15:09:46
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/laserRangeFinder/components/MultilevelTable.vue
@@ -29,7 +29,11 @@
       <el-table-column prop="blade3AngleDeviation" label="叶片3">
         0.83
       </el-table-column>
-      <el-table-column prop="bladeRelativeAngleDeviation" label="相对偏差">
+      <el-table-column
+        prop="bladeRelativeAngleDeviation"
+        min-width="100"
+        label="相对偏差"
+      >
         1.33
       </el-table-column>
     </el-table-column>

+ 19 - 25
jg/src/views/laserRangeFinder/components/descrBox.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-12-09 16:24:28
- * @LastEditTime: 2025-03-24 13:39:39
+ * @LastEditTime: 2025-03-24 14:36:54
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/laserRangeFinder/components/descrBox.vue
@@ -12,10 +12,10 @@
       <el-descriptions
         class="margin-top"
         title="叶片角度偏差"
-        :column="4"
+        :column="2"
         border
       >
-        <el-descriptions-item label="叶片1">
+        <el-descriptions-item label="叶片1" label-width="120" width="100px">
           <template #label>
             <div>叶片1</div>
             <div>角度偏差°</div>
@@ -23,7 +23,7 @@
           -0.5
           {{ currentRow && currentRow.blade1AngleDeviation }}
         </el-descriptions-item>
-        <el-descriptions-item label="叶片2">
+        <el-descriptions-item label="叶片2" label-width="120" width="100px">
           <template #label>
             <div>叶片2</div>
             <div>角度偏差°</div>
@@ -31,7 +31,7 @@
           -0.33
           {{ currentRow && currentRow.blade2AngleDeviation }}
         </el-descriptions-item>
-        <el-descriptions-item label="叶片3">
+        <el-descriptions-item label="叶片3" label-width="120" width="100px">
           <template #label>
             <div>叶片3</div>
             <div>角度偏差°</div>
@@ -39,7 +39,7 @@
           0.83
           {{ currentRow && currentRow.blade3AngleDeviation }}
         </el-descriptions-item>
-        <el-descriptions-item label="相对">
+        <el-descriptions-item label="相对" label-width="120" width="100px">
           <template #label>
             <div>相对</div>
             <div>角度偏差°</div>
@@ -48,8 +48,8 @@
           {{ currentRow && currentRow.bladeRelativeAngleDeviation }}
         </el-descriptions-item>
       </el-descriptions>
-      <el-descriptions class="margin-top" title="叶片净空值" :column="4" border>
-        <el-descriptions-item label="叶片1">
+      <el-descriptions class="margin-top" title="叶片净空值" :column="2" border>
+        <el-descriptions-item label="叶片1" label-width="120" width="100px">
           <template #label>
             <div>叶片1</div>
             <div>净空值m</div>
@@ -57,7 +57,7 @@
           2.12
           {{ currentRow && currentRow.blade1ClearanceValue }}
         </el-descriptions-item>
-        <el-descriptions-item label="叶片2">
+        <el-descriptions-item label="叶片2" label-width="120" width="100px">
           <template #label>
             <div>叶片2</div>
             <div>净空值m</div>
@@ -65,7 +65,7 @@
           2.08
           {{ currentRow && currentRow.blade2ClearanceValue }}
         </el-descriptions-item>
-        <el-descriptions-item label="叶片3">
+        <el-descriptions-item label="叶片3" label-width="120" width="100px">
           <template #label>
             <div>叶片3</div>
             <div>净空值m</div>
@@ -73,7 +73,7 @@
           2.10
           {{ currentRow && currentRow.blade3ClearanceValue }}
         </el-descriptions-item>
-        <el-descriptions-item label="平均">
+        <el-descriptions-item label="平均" label-width="120" width="100px">
           <template #label>
             <div>平均</div>
             <div>净空值m</div>
@@ -85,10 +85,10 @@
       <el-descriptions
         class="margin-top"
         title="叶片扭转变形"
-        :column="4"
+        :column="2"
         border
       >
-        <el-descriptions-item label="叶片1">
+        <el-descriptions-item label="叶片1" label-width="120" width="100px">
           <template #label>
             <div>叶片1</div>
             <div>扭转角°</div>
@@ -96,7 +96,7 @@
           0.21
           {{ currentRow && currentRow.blade1TorsionalDeformation }}
         </el-descriptions-item>
-        <el-descriptions-item label="叶片2">
+        <el-descriptions-item label="叶片2" label-width="120" width="100px">
           <template #label>
             <div>叶片2</div>
             <div>扭转角°</div>
@@ -104,7 +104,7 @@
           -0.18
           {{ currentRow && currentRow.blade2TorsionalDeformation }}
         </el-descriptions-item>
-        <el-descriptions-item label="叶片3">
+        <el-descriptions-item label="叶片3" label-width="120" width="100px">
           <template #label>
             <div>叶片3</div>
             <div>扭转角°</div>
@@ -112,7 +112,7 @@
           0.06
           {{ currentRow && currentRow.blade3TorsionalDeformation }}
         </el-descriptions-item>
-        <el-descriptions-item label="平均">
+        <el-descriptions-item label="平均" label-width="120" width="100px">
           <template #label>
             <div>平均</div>
             <div>扭转角°</div>
@@ -121,14 +121,8 @@
           {{ currentRow && currentRow.bladeRelativeTorsionalDeformation }}
         </el-descriptions-item>
       </el-descriptions>
-      <el-descriptions
-        class="margin-top"
-        title="塔筒晃动"
-        style="width: 50%"
-        :column="4"
-        border
-      >
-        <el-descriptions-item label="塔筒">
+      <el-descriptions class="margin-top" title="塔筒晃动" :column="2" border>
+        <el-descriptions-item label="塔筒" label-width="120" width="100px">
           <template #label>
             <div>塔筒</div>
             <div>晃动幅值mm</div>
@@ -136,7 +130,7 @@
           58
           {{ currentRow && currentRow.towerSwayAmplitude }}
         </el-descriptions-item>
-        <el-descriptions-item label="叶片2">
+        <el-descriptions-item label="叶片2" label-width="120" width="100px">
           <template #label>
             <div>塔筒</div>
             <div>晃动主频Hz</div>

+ 326 - 210
jg/src/views/laserRangeFinder/index.vue

@@ -2,226 +2,299 @@
   <!-- 激光测距仪页面 -->
   <div class="global-variable">
     <el-card class="box-card">
-      <div class="searchbox">
-        <el-collapse v-model="activeNames">
-          <el-button
-            size="small"
-            @click="validateAndHandleChange"
-            type="primary"
-            >导入测量数据</el-button
-          >
-          <el-button
-            size="small"
-            @click="validateAndHandleChange"
-            type="primary"
-            >导入定位数据</el-button
+      <div>
+        <el-steps :active="stepsActive">
+          <el-step
+            title="导入数据"
+            :icon="UploadFilled"
+            @click="() => (stepsActive = 0)"
           >
-          <el-collapse-item title="数据筛选" name="1">
-            <template #title>
-              <div class="titleLeft">数据筛选</div>
-              <div class="titleRight">
-                <el-button type="primary" @click.stop="getTableData">
-                  查询
-                </el-button>
+          </el-step>
+          <el-step
+            title="数据计算"
+            :icon="Setting"
+            @click="() => (stepsActive = 1)"
+          ></el-step>
+          <el-step
+            title="查看结果"
+            :icon="Histogram"
+            @click="() => (stepsActive = 2)"
+          ></el-step>
+        </el-steps>
+      </div>
+      <div class="stepOne" v-if="stepsActive === 0">
+        <el-upload
+          class="upload-demo"
+          drag
+          action=""
+          show-file-list
+          :accept="'.csv, .xlsx, .xls'"
+          :auto-upload="false"
+          limit="1"
+        >
+          <div class="iconText">
+            <app-icon icon="UploadFilled" size="50px" />
+            <div class="el-upload__text">
+              导入测量数据 <em>点击选择文件</em>
+            </div>
+          </div>
+          <template #tip>
+            <div class="el-upload__tip">
+              导入测量数据 ,文件格式只能上传xlsx/xls、Excel、CSV 格式
+            </div>
+          </template>
+        </el-upload>
+        <el-upload
+          class="upload-demo"
+          drag
+          action=""
+          show-file-list
+          :accept="'.csv, .xlsx, .xls'"
+          :auto-upload="false"
+          limit="1"
+        >
+          <div class="iconText">
+            <app-icon icon="UploadFilled" size="50px" />
+            <div class="el-upload__text">
+              导入定位数据 <em>点击选择文件</em>
+            </div>
+          </div>
 
-                <el-button
-                  v-if="tabActiveName === 'list'"
-                  type="primary"
-                  @click.stop="onSubmit"
-                >
-                  导出
-                </el-button>
-              </div>
-            </template>
-            <el-form
-              :inline="true"
-              :model="formInline"
-              class="demo-form-inline"
-            >
-              <el-row :gutter="10">
-                <el-col :xs="16" :sm="8" :md="7" :lg="6" :xl="4">
-                  <el-form-item label="场站">
-                    <selecttree
-                      style="width: 220px"
-                      placeholder="请选择场站"
-                      :list="parentOpt"
-                      type="1"
-                      v-model="formInline.companyCode"
-                      @change="parentChange"
-                      :defaultParentProps="{
-                        children: 'children',
-                        label: 'companyName',
-                        value: 'codeNumber',
-                      }"
-                    >
-                    </selecttree>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="16" :sm="8" :md="7" :lg="6" :xl="4">
-                  <el-form-item label="风机">
-                    <el-select
-                      v-model="formInline.unitvalue"
-                      placeholder="请选择"
-                      @change="handleWindTuebineData"
-                    >
-                      <el-option
-                        v-for="item in unitoptions"
-                        :key="item.engineCode"
-                        :label="item.engineName"
-                        :value="item.engineCode"
-                      >
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="14" :md="12" :lg="10" :xl="6">
-                  <el-form-item label="时间">
-                    <el-date-picker
-                      v-model="formInline.timevalue"
-                      type="daterange"
-                      range-separator="至"
-                      start-placeholder="开始日期"
-                      end-placeholder="结束日期"
-                    >
-                    </el-date-picker>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </el-collapse-item>
-        </el-collapse>
+          <template #tip>
+            <div class="el-upload__tip">
+              导入定位数据 ,文件格式只能上传xlsx/xls、Excel、CSV 格式
+            </div>
+          </template>
+        </el-upload>
+        <!-- <el-button @click="validateAndHandleChange" type="primary"
+            >导入测量数据</el-button
+          > -->
+        <!-- <el-button @click="validateAndHandleChange" type="primary"
+            >导入定位数据</el-button
+          > -->
       </div>
-      <div class="main-body">
-        <div class="data-map">
-          <el-tabs
-            type="border-card"
-            v-model="tabActiveName"
-            @tab-click="handleTabChange"
+      <div class="stepTwo" v-if="stepsActive === 1">
+        <el-empty
+          :image-size="300"
+          v-loading="true"
+          element-loading-text="数据测量中..."
+          element-loading-background="rgba(255, 255, 255, 0.3)"
+          class="loadingView"
+          description=" "
+        />
+      </div>
+      <div class="stepThree" v-if="stepsActive === 2">
+        <div class="searchbox">
+          <el-collapse
+            v-model="activeNames"
+            v-if="tabActiveName !== 'copy' && tabActiveName !== 'init'"
           >
-            <el-tab-pane label="原始图" name="init">
-              <template #label>
-                <img
-                  style="width: 30px; height: 20px; display: inline-block"
-                  src="@/assets/analyse/04.png"
-                  alt=""
-                />
-                原始图
-              </template>
-              <div class="boxContent">
-                <div class="left" v-if="tabActiveName === 'init'">
-                  <el-empty
-                    description="暂无数据,请先进行数据筛选"
-                    :image-size="200"
-                    v-if="currentInitRow === null"
-                  ></el-empty>
-                  <div
-                    v-else-if="
-                      currentInitRow !== null && tabActiveName === 'init'
-                    "
+            <el-collapse-item title="数据筛选" name="1">
+              <template #title>
+                <div class="titleLeft">数据筛选</div>
+                <div class="titleRight">
+                  <el-button type="primary" @click.stop="getTableData">
+                    查询
+                  </el-button>
+                  <el-button
+                    v-if="tabActiveName === 'list'"
+                    type="primary"
+                    @click.stop="onSubmit"
                   >
-                    <InitCharts
-                      ref="initCharts"
-                      :type="tabActiveName"
-                      :key="chartKey"
-                    ></InitCharts>
-                    <CylinderOfTower
-                      ref="waveformDiagram"
-                      type="Waveformdiagram"
-                      :key="chartKey"
-                    ></CylinderOfTower>
-                    <CylinderOfTower
-                      ref="spectrogram"
-                      type="spectrogram"
-                      :key="chartKey"
-                    ></CylinderOfTower>
-                  </div>
+                    导出
+                  </el-button>
                 </div>
-                <div class="right">
-                  <DescrBox
-                    type="init"
-                    :tableData="tableData"
-                    ref="initTable"
-                    :windName="windName"
-                    :windTurbineName="windTurbineName"
-                    :currentIndex="currentInitIndex"
-                    :currentRow="currentInitRow"
-                    @handleInitCurrentChange="handleInitCurrentChange"
-                  ></DescrBox>
-                </div>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="拟合图" name="copy">
-              <template #label>
-                <img
-                  style="width: 25px; height: 20px; display: inline-block"
-                  src="@/assets/analyse/01.png"
-                  alt=""
-                />
-                拟合图
               </template>
-              <div class="boxContent" v-if="tabActiveName === 'copy'">
-                <div class="left">
-                  <el-empty
-                    description="暂无数据,请先进行数据筛选"
-                    :image-size="200"
-                    v-if="currentCopyRow === null"
-                  ></el-empty>
-                  <div
-                    v-else-if="
-                      currentCopyRow !== null && tabActiveName === 'copy'
-                    "
-                  >
-                    <PlotOfFit
-                      type="LeafRootOutline"
-                      :key="chartKey"
-                    ></PlotOfFit>
-                    <PlotOfFit
-                      type="LeafRootRelativeOutline"
-                      :key="chartKey"
-                    ></PlotOfFit>
-                    <PlotOfFit
-                      type="LeafTipProfile"
-                      :key="chartKey"
-                    ></PlotOfFit>
-                    <PlotOfFit
-                      type="LeafTipRelativeProfile"
-                      :key="chartKey"
-                    ></PlotOfFit>
+              <el-form
+                :inline="true"
+                :model="formInline"
+                class="demo-form-inline"
+              >
+                <el-row :gutter="10">
+                  <el-col :xs="16" :sm="8" :md="7" :lg="6" :xl="4">
+                    <el-form-item label="场站">
+                      <selecttree
+                        style="width: 220px"
+                        placeholder="请选择场站"
+                        :list="parentOpt"
+                        type="1"
+                        v-model="formInline.companyCode"
+                        @change="parentChange"
+                        :defaultParentProps="{
+                          children: 'children',
+                          label: 'companyName',
+                          value: 'codeNumber',
+                        }"
+                      >
+                      </selecttree>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="16" :sm="8" :md="7" :lg="6" :xl="4">
+                    <el-form-item label="风机">
+                      <el-select
+                        v-model="formInline.unitvalue"
+                        placeholder="请选择"
+                        @change="handleWindTuebineData"
+                      >
+                        <el-option
+                          v-for="item in unitoptions"
+                          :key="item.engineCode"
+                          :label="item.engineName"
+                          :value="item.engineCode"
+                        >
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="14" :md="12" :lg="10" :xl="6">
+                    <el-form-item label="时间">
+                      <el-date-picker
+                        v-model="formInline.timevalue"
+                        type="daterange"
+                        range-separator="至"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"
+                      >
+                      </el-date-picker>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+            </el-collapse-item>
+          </el-collapse>
+        </div>
+        <div class="main-body">
+          <div class="data-map">
+            <el-tabs
+              type="border-card"
+              v-model="tabActiveName"
+              @tab-click="handleTabChange"
+            >
+              <el-tab-pane label="原始图" name="init">
+                <template #label>
+                  <img
+                    style="width: 30px; height: 20px; display: inline-block"
+                    src="@/assets/analyse/04.png"
+                    alt=""
+                  />
+                  原始图
+                </template>
+                <div class="boxContent">
+                  <div class="left" v-if="tabActiveName === 'init'">
+                    <el-empty
+                      description="暂无数据,请先进行数据筛选"
+                      :image-size="200"
+                      v-if="currentInitRow === null"
+                    ></el-empty>
+                    <div
+                      v-else-if="
+                        currentInitRow !== null && tabActiveName === 'init'
+                      "
+                    >
+                      <InitCharts
+                        ref="initCharts"
+                        :type="tabActiveName"
+                        :key="chartKey"
+                      ></InitCharts>
+                      <CylinderOfTower
+                        ref="waveformDiagram"
+                        type="Waveformdiagram"
+                        :key="chartKey"
+                      ></CylinderOfTower>
+                      <CylinderOfTower
+                        ref="spectrogram"
+                        type="spectrogram"
+                        :key="chartKey"
+                      ></CylinderOfTower>
+                    </div>
+                  </div>
+                  <div class="right">
+                    <DescrBox
+                      type="init"
+                      :tableData="tableData"
+                      ref="initTable"
+                      :windName="windName"
+                      :windTurbineName="windTurbineName"
+                      :currentIndex="currentInitIndex"
+                      :currentRow="currentInitRow"
+                      @handleInitCurrentChange="handleInitCurrentChange"
+                    ></DescrBox>
                   </div>
                 </div>
-                <div class="right">
-                  <DescrBox
-                    type="copy"
-                    ref="copyTable"
+              </el-tab-pane>
+              <el-tab-pane label="拟合图" name="copy">
+                <template #label>
+                  <img
+                    style="width: 25px; height: 20px; display: inline-block"
+                    src="@/assets/analyse/01.png"
+                    alt=""
+                  />
+                  拟合图
+                </template>
+                <div class="boxContent" v-if="tabActiveName === 'copy'">
+                  <div class="left">
+                    <el-empty
+                      description="暂无数据,请先进行数据筛选"
+                      :image-size="200"
+                      v-if="currentCopyRow === null"
+                    ></el-empty>
+                    <div
+                      v-else-if="
+                        currentCopyRow !== null && tabActiveName === 'copy'
+                      "
+                    >
+                      <PlotOfFit
+                        type="LeafRootOutline"
+                        :key="chartKey"
+                      ></PlotOfFit>
+                      <PlotOfFit
+                        type="LeafRootRelativeOutline"
+                        :key="chartKey"
+                      ></PlotOfFit>
+                      <PlotOfFit
+                        type="LeafTipProfile"
+                        :key="chartKey"
+                      ></PlotOfFit>
+                      <PlotOfFit
+                        type="LeafTipRelativeProfile"
+                        :key="chartKey"
+                      ></PlotOfFit>
+                    </div>
+                  </div>
+                  <div class="right">
+                    <DescrBox
+                      type="copy"
+                      ref="copyTable"
+                      :windName="windName"
+                      :windTurbineName="windTurbineName"
+                      :tableData="tableData"
+                      :currentRow="currentCopyRow"
+                      :currentIndex="currentCopyIndex"
+                      @handleCopyCurrentChange="handleCopyCurrentChange"
+                    ></DescrBox>
+                  </div>
+                </div>
+              </el-tab-pane>
+              <el-tab-pane label="数据列表" name="list">
+                <template #label>
+                  <img
+                    style="width: 20px; height: 20px; display: inline-block"
+                    src="@/assets/analyse/dataList1.png"
+                    alt=""
+                  />
+                  数据列表
+                </template>
+                <div>
+                  <MultilevelTable
+                    ref="multilevelTable"
                     :windName="windName"
                     :windTurbineName="windTurbineName"
                     :tableData="tableData"
-                    :currentRow="currentCopyRow"
-                    :currentIndex="currentCopyIndex"
-                    @handleCopyCurrentChange="handleCopyCurrentChange"
-                  ></DescrBox>
+                  ></MultilevelTable>
                 </div>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="数据列表" name="list">
-              <template #label>
-                <img
-                  style="width: 20px; height: 20px; display: inline-block"
-                  src="@/assets/analyse/dataList1.png"
-                  alt=""
-                />
-                数据列表
-              </template>
-              <div>
-                <MultilevelTable
-                  ref="multilevelTable"
-                  :windName="windName"
-                  :windTurbineName="windTurbineName"
-                  :tableData="tableData"
-                ></MultilevelTable>
-              </div>
-            </el-tab-pane>
-          </el-tabs>
+              </el-tab-pane>
+            </el-tabs>
+          </div>
         </div>
       </div>
     </el-card>
@@ -245,6 +318,7 @@ import axios from "axios";
 export default {
   data() {
     return {
+      stepsActive: 0,
       chartKey: 0, // 用于强制重新渲染子组件
       activeNames: ["1"],
       tabActiveName: "init",
@@ -440,6 +514,50 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.global-variable {
+  width: 100%;
+  height: 100%;
+  .box-card {
+    width: 100%;
+    height: 100%;
+    :deep(.el-card__body) {
+      height: 100% !important;
+      width: 100%;
+      // background-color: aqua;
+    }
+    .stepOne {
+      margin-top: 30px;
+      height: calc(100% - 150px);
+      // height: 100%;
+      width: 100%;
+      display: flex !important;
+      justify-content: space-around;
+
+      .upload-demo {
+        width: 48%;
+        height: 100%;
+        :deep(.el-upload) {
+          width: 100%;
+          height: 80%;
+        }
+        :deep(.el-upload-dragger) {
+          width: 100%;
+          height: 100%;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+      }
+    }
+    .stepTwo {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: calc(100% - 100px);
+      width: 100%;
+    }
+  }
+}
 .searchbox {
   p {
     margin-right: 20px;
@@ -448,15 +566,13 @@ export default {
     width: 180px;
   }
 
-  .titleLeft {
-  }
   ::v-deep .el-collapse-item__header {
     position: relative !important;
   }
   .titleRight {
     display: flex;
     position: absolute;
-    right: 100px;
+    right: 50px;
   }
 }
 .dialog-actions {