From a28a61c8e434664d78791c56f48d121b1c70c8ca Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Thu, 8 Aug 2024 15:38:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9B=91=E6=8E=A7-=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0devId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/govern/device/control/detail.vue    |  1 +
 src/views/govern/device/control/index.vue     |  6 +-
 .../govern/reportCore/statistics/index.vue    | 80 +++++++++----------
 3 files changed, 41 insertions(+), 46 deletions(-)

diff --git a/src/views/govern/device/control/detail.vue b/src/views/govern/device/control/detail.vue
index e99756f..30536a5 100644
--- a/src/views/govern/device/control/detail.vue
+++ b/src/views/govern/device/control/detail.vue
@@ -60,6 +60,7 @@ const init = () => {
     echartsData.value = null
     loading.value = true
     getDeviceDataTrend({
+        devId:props.detail.pid,
         endTime: datePickerRef.value.timeValue[1],
         lineId: props.detail.lineId,
         startTime: datePickerRef.value.timeValue[0],
diff --git a/src/views/govern/device/control/index.vue b/src/views/govern/device/control/index.vue
index c096928..59a6842 100644
--- a/src/views/govern/device/control/index.vue
+++ b/src/views/govern/device/control/index.vue
@@ -238,7 +238,7 @@
                 <div v-if="!tableData" style="height: 42px"></div>
             </el-tabs>
         </div>
-        <el-empty v-else description="请选择设备" class="device-control-right"/>
+        <el-empty v-else description="请选择设备" class="device-control-right" />
         <Detail ref="detailRef" :detail="detail" @close="detail = null" v-if="detail"></Detail>
         <!-- 离线数据导入组件 -->
         <offLineDataImport ref="offLineDataImportRef"></offLineDataImport>
@@ -417,8 +417,8 @@ const timer: any = ref()
 //tab点击事件
 const handleClick = async (tab?: any) => {
     //点击tab时更新dataSet最新值
-    if(tab&&tab.props&&tab.props.name&&dataSet.value!=tab.props.name){
-         dataSet.value = tab.props.name
+    if (tab && tab.props && tab.props.name && dataSet.value != tab.props.name) {
+        dataSet.value = tab.props.name
     }
 
     tableLoading.value = true
diff --git a/src/views/govern/reportCore/statistics/index.vue b/src/views/govern/reportCore/statistics/index.vue
index 6c195c1..b603d23 100644
--- a/src/views/govern/reportCore/statistics/index.vue
+++ b/src/views/govern/reportCore/statistics/index.vue
@@ -9,47 +9,40 @@
                 ></PointTree>
             </pane>
             <pane style="background: #fff" :style="height">
-                <div class="default-main">
-                    <TableHeader ref="TableHeaderRef" datePicker>
-                        <template v-slot:select>
-                            <el-form-item label="模板策略">
-                                <el-select
-                                    v-model="Template"
-                                    @change="changetype"
-                                    placeholder="请选择模版"
-                                    value-key="id"
-                                >
-                                    <el-option
-                                        v-for="item in templatePolicy"
-                                        :key="item.id"
-                                        :label="item.name"
-                                        :value="item"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="报表类型:">
-                                <el-select
-                                    :disabled="true"
-                                    v-model="reportForm"
-                                    :popper-append-to-body="false"
-                                    placeholder="请选择报表类型"
-                                >
-                                    <el-option
-                                        v-for="item in reportFormList"
-                                        :key="item.value"
-                                        :label="item.label"
-                                        :value="item.value"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                        </template>
-                        <template #operation>
-                            <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出excel</el-button>
-                        </template>
-                    </TableHeader>
-                    <div class="box">
-                        <div id="luckysheet" :style="`height: calc(${tableStore.table.height} + 45px)`"></div>
-                    </div>
+                <TableHeader ref="TableHeaderRef" datePicker>
+                    <template v-slot:select>
+                        <el-form-item label="模板策略">
+                            <el-select v-model="Template" @change="changetype" placeholder="请选择模版" value-key="id">
+                                <el-option
+                                    v-for="item in templatePolicy"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="报表类型:">
+                            <el-select
+                                :disabled="true"
+                                v-model="reportForm"
+                                :popper-append-to-body="false"
+                                placeholder="请选择报表类型"
+                            >
+                                <el-option
+                                    v-for="item in reportFormList"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </template>
+                    <template #operation>
+                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出excel</el-button>
+                    </template>
+                </TableHeader>
+                <div class="box">
+                    <div id="luckysheet" :style="`height: calc(${tableStore.table.height} + 45px)`"></div>
                 </div>
             </pane>
         </splitpanes>
@@ -102,6 +95,7 @@ const tableStore = new TableStore({
         tableStore.table.params.lineId = dotList.value.id
     },
     loadCallback: () => {
+        console.log(tableStore.table.data)
         tableStore.table.data.forEach((item: any) => {
             item.celldata.forEach((k: any) => {
                 item.data[k.r][k.c].v = k.v
@@ -114,12 +108,12 @@ const tableStore = new TableStore({
             showtoolbar: false, // 是否显示工具栏
             showinfobar: false, // 是否显示顶部信息栏
             showsheetbar: true, // 是否显示底部sheet按钮
-            // data: data
             data: tableStore.table.data
         })
     }
 })
 provide('tableStore', tableStore)
+
 onMounted(() => {
     const dom = document.getElementById('navigation-splitpanes')
     if (dom) {
@@ -130,13 +124,13 @@ getTemplateByDept({ id: dictData.state.area[0].id }).then((res: any) => {
     templatePolicy.value = res.data
     Template.value = res.data[0]
     reportForm.value = res.data[0]?.reportForm
-    // tableStore.index()
 })
 const changetype = (val: any) => {
     reportForm.value = val.reportForm
 }
 
 const handleNodeClick = (data: any, node: any) => {
+    console.log(data.level,"+++++++++++++");
     if (data.level == 3) {
         dotList.value = data
         tableStore.index()