From a3b14906c05db52f19bcda5bf9ad63ffe3043d33 Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Tue, 29 Oct 2024 10:38:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E5=9B=BE=E6=8A=98=E5=8F=A0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/govern/device/planData/index.vue | 205 ++++++++++-----------
 1 file changed, 94 insertions(+), 111 deletions(-)

diff --git a/src/views/govern/device/planData/index.vue b/src/views/govern/device/planData/index.vue
index 2194941..9d47053 100644
--- a/src/views/govern/device/planData/index.vue
+++ b/src/views/govern/device/planData/index.vue
@@ -93,117 +93,6 @@
                                         </el-button>
                                     </el-descriptions-item>
                                 </el-descriptions>
-                                <div v-if="JSON.stringify(echartsData) != '{}'">
-                                    <h3 class="mt10 mb10 ml10">历史趋势</h3>
-                                    <div class="history_trend">
-                                        <div class="history_header" ref="headerRef">
-                                            <!-- <el-form :model="searchForm" class="history_select" id="history_select"> -->
-                                            <TableHeader
-                                                :showSearch="false"
-                                                ref="tableHeaderRef"
-                                                @selectChange="selectChange"
-                                            >
-                                                <template v-slot:select :key="num">
-                                                    <el-form-item for="-" label="统计指标">
-                                                        <el-select
-                                                            style="min-width: 200px"
-                                                            collapse-tags
-                                                            collapse-tags-tooltip
-                                                            v-model="searchForm.index"
-                                                            placeholder="请选择统计指标"
-                                                            @change="onIndexChange($event)"
-                                                            multiple
-                                                            :multiple-limit="3"
-                                                        >
-                                                            <el-option
-                                                                v-for="item in indexOptions"
-                                                                :key="item.id"
-                                                                :label="item.name"
-                                                                :value="item.id"
-                                                            ></el-option>
-                                                        </el-select>
-                                                    </el-form-item>
-                                                    <el-form-item for="-" label="值类型">
-                                                        <el-select
-                                                            style="width: 12px !important"
-                                                            v-model="searchForm.dataLevel"
-                                                        >
-                                                            <el-option value="Primary" label="一次值"></el-option>
-                                                            <el-option value="Secondary" label="二次值"></el-option>
-                                                        </el-select>
-                                                    </el-form-item>
-                                                    <el-form-item
-                                                        for="-"
-                                                        v-for="(item, index) in countData"
-                                                        :key="index"
-                                                        :label="item.name + '谐波次数'"
-                                                        label-width="180px"
-                                                        v-show="item.countOptions.length != 0"
-                                                    >
-                                                        <!-- multiple -->
-                                                        <el-select
-                                                            v-model="item.count"
-                                                            collapse-tags
-                                                            collapse-tags-tooltip
-                                                            placeholder="请选择谐波次数"
-                                                            style="width: 120px"
-                                                        >
-                                                            <el-option
-                                                                v-for="vv in item.countOptions"
-                                                                :key="vv"
-                                                                :label="vv"
-                                                                :value="vv"
-                                                            ></el-option>
-                                                        </el-select>
-                                                    </el-form-item>
-                                                    <el-form-item for="-" label="统计类型" label-width="80px">
-                                                        <el-select
-                                                            style="width: 120px"
-                                                            v-model="searchForm.type"
-                                                            placeholder="请选择值类型"
-                                                        >
-                                                            <el-option
-                                                                v-for="item in typeOptions"
-                                                                :key="item.id"
-                                                                :label="item.name"
-                                                                :value="item.id"
-                                                            ></el-option>
-                                                        </el-select>
-                                                    </el-form-item>
-                                                </template>
-                                                <template v-slot:operation>
-                                                    <el-button
-                                                        type="primary"
-                                                        icon="el-icon-Download"
-                                                        @click="handleExport"
-                                                    >
-                                                        数据导出
-                                                    </el-button>
-                                                    <el-button type="primary" icon="el-icon-Search" @click="init(true)">
-                                                        查询
-                                                    </el-button>
-                                                </template>
-                                            </TableHeader>
-                                        </div>
-                                        <div class="history_title">
-                                            <p>{{ chartTitle }}</p>
-                                        </div>
-                                        <div
-                                            class="history_chart"
-                                            v-loading="loading"
-                                            :style="EcharHeight"
-                                            :key="EcharHeight.height"
-                                            ref="chartRef"
-                                        >
-                                            <MyEchart
-                                                ref="historyChart"
-                                                v-if="echartsData"
-                                                :isExport="true"
-                                                :options="echartsData"
-                                            />
-                                        </div>
-                                    </div>
-                                </div>
                             </el-tab-pane>
                         </el-tabs>
                     </div>
@@ -212,6 +101,100 @@
                     </div>
                 </el-collapse-item>
             </el-collapse>
+
+            <div v-if="JSON.stringify(echartsData) != '{}'">
+                <h3 class="mt10 mb10">历史趋势</h3>
+                <div class="history_trend">
+                    <div class="history_header" ref="headerRef">
+                        <!-- <el-form :model="searchForm" class="history_select" id="history_select"> -->
+                        <TableHeader :showSearch="false" ref="tableHeaderRef" @selectChange="selectChange">
+                            <template v-slot:select :key="num">
+                                <el-form-item for="-" label="统计指标">
+                                    <el-select
+                                        style="min-width: 200px"
+                                        collapse-tags
+                                        collapse-tags-tooltip
+                                        v-model="searchForm.index"
+                                        placeholder="请选择统计指标"
+                                        @change="onIndexChange($event)"
+                                        multiple
+                                        :multiple-limit="3"
+                                    >
+                                        <el-option
+                                            v-for="item in indexOptions"
+                                            :key="item.id"
+                                            :label="item.name"
+                                            :value="item.id"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item for="-" label="值类型">
+                                    <el-select style="width: 12px !important" v-model="searchForm.dataLevel">
+                                        <el-option value="Primary" label="一次值"></el-option>
+                                        <el-option value="Secondary" label="二次值"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item
+                                    for="-"
+                                    v-for="(item, index) in countData"
+                                    :key="index"
+                                    :label="item.name + '谐波次数'"
+                                    label-width="180px"
+                                    v-show="item.countOptions.length != 0"
+                                >
+                                    <!-- multiple -->
+                                    <el-select
+                                        v-model="item.count"
+                                        collapse-tags
+                                        collapse-tags-tooltip
+                                        placeholder="请选择谐波次数"
+                                        style="width: 120px"
+                                    >
+                                        <el-option
+                                            v-for="vv in item.countOptions"
+                                            :key="vv"
+                                            :label="vv"
+                                            :value="vv"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item for="-" label="统计类型" label-width="80px">
+                                    <el-select
+                                        style="width: 120px"
+                                        v-model="searchForm.type"
+                                        placeholder="请选择值类型"
+                                    >
+                                        <el-option
+                                            v-for="item in typeOptions"
+                                            :key="item.id"
+                                            :label="item.name"
+                                            :value="item.id"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </template>
+                            <template v-slot:operation>
+                                <el-button type="primary" icon="el-icon-Download" @click="handleExport">
+                                    数据导出
+                                </el-button>
+                                <el-button type="primary" icon="el-icon-Search" @click="init(true)">查询</el-button>
+                            </template>
+                        </TableHeader>
+                    </div>
+                    <div class="history_title">
+                        <p>{{ chartTitle }}</p>
+                    </div>
+                    <div
+                        class="history_chart"
+                        v-loading="loading"
+                        :style="EcharHeight"
+                        :key="EcharHeight.height"
+                        ref="chartRef"
+                    >
+                        <MyEchart ref="historyChart" v-if="echartsData" :isExport="true" :options="echartsData" />
+                    </div>
+                </div>
+            </div>
         </div>
         <el-empty v-else description="请选择设备" class="device-manage-right" />
         <popup ref="dialogRef" @onSubmit="refreshTree" />