From d61559d5bb7665b8f2480df48babf31e7248faa3 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Mon, 2 Dec 2024 15:31:06 +0800
Subject: [PATCH] =?UTF-8?q?bug=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/router.ts                           |  2 -
 .../businessUser/event/eventUploadPopup.vue   | 12 ++++-
 .../businessUser/event/eventView.vue          |  8 ++--
 .../sagGovern/businessUser/event/sags3D.vue   | 48 +++++++++----------
 .../businessUser/productLine/index.vue        |  2 +-
 5 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/src/utils/router.ts b/src/utils/router.ts
index 0efbfe62..a9ea05ff 100644
--- a/src/utils/router.ts
+++ b/src/utils/router.ts
@@ -47,8 +47,6 @@ export const getFirstRoute = (routes: RouteRecordRaw[], menuType = 'tab'): false
     })
     let find: boolean | RouteRecordRaw = false
     for (const key in routes) {
-        console.log(`11111111`,routes[key].path);
-        
         if (
             routes[key].meta?.type == 'menu' &&
             routes[key].meta?.menu_type == menuType &&
diff --git a/src/views/pqs/voltageSags/sagGovern/businessUser/event/eventUploadPopup.vue b/src/views/pqs/voltageSags/sagGovern/businessUser/event/eventUploadPopup.vue
index 748659fa..59709201 100644
--- a/src/views/pqs/voltageSags/sagGovern/businessUser/event/eventUploadPopup.vue
+++ b/src/views/pqs/voltageSags/sagGovern/businessUser/event/eventUploadPopup.vue
@@ -185,9 +185,17 @@ const changeProductLine = () => {
 /**
  * 选择待上传文件
  */
-const choose = (e: any) => {
-    form.file = e.raw
+const choose = (e: any, fileList: UploadUserFile[]) => {
+    const file = e.raw
+    if (file.type === 'text/csv' || file.name.endsWith('.csv')) {
+        form.file = file
+    } else {
+        ElMessage.error('请选择CSV文件')
+        fileList.pop() // 移除无效文件
+        form.file = null
+    }
 }
+
 const handleExceed: UploadProps['onExceed'] = files => {
     uploadEventData.value!.clearFiles()
     const file = files[0] as UploadRawFile
diff --git a/src/views/pqs/voltageSags/sagGovern/businessUser/event/eventView.vue b/src/views/pqs/voltageSags/sagGovern/businessUser/event/eventView.vue
index 8ee7d27c..3098aba5 100644
--- a/src/views/pqs/voltageSags/sagGovern/businessUser/event/eventView.vue
+++ b/src/views/pqs/voltageSags/sagGovern/businessUser/event/eventView.vue
@@ -19,9 +19,9 @@
         <event-upload-popup ref='eventUploadPopup' />
 
         <el-radio-group v-model='radio' id='tabTitle' @change='switchRadio'>
-            <el-radio-button label='暂降数据' />
-            <el-radio-button label='电压暂降事件统计' />
-            <el-radio-button label='耐受曲线信息' />
+            <el-radio-button value='暂降数据' >暂降数据</el-radio-button>
+            <el-radio-button value='电压暂降事件统计' >电压暂降事件统计</el-radio-button>
+            <el-radio-button value='耐受曲线信息' >耐受曲线信息</el-radio-button>
         </el-radio-group>
         <div class='tableExtraButton'>
             <el-button :icon='Upload' type='primary' @click='importEventData'>导入</el-button>
@@ -172,7 +172,7 @@ const tableStore = new TableStore({
 // 注入到子组件
 provide('tableStore', tableStore)
 onMounted(() => {
-    tableHeader.value.setTheDate(1)
+    // tableHeader.value.setTheDate(1)
 })
 //初始化页面
 const initData = async () => {
diff --git a/src/views/pqs/voltageSags/sagGovern/businessUser/event/sags3D.vue b/src/views/pqs/voltageSags/sagGovern/businessUser/event/sags3D.vue
index 128af7d0..6e845d09 100644
--- a/src/views/pqs/voltageSags/sagGovern/businessUser/event/sags3D.vue
+++ b/src/views/pqs/voltageSags/sagGovern/businessUser/event/sags3D.vue
@@ -1,21 +1,21 @@
 <template>
     <SecondSheet>
-        <div style="height: 100%; overflow: hidden">
-            <div class="switch-tab">
-                <el-radio-group v-model="radio" size="small">
-                    <el-radio-button label="三维图" />
-                    <el-radio-button label="表格" />
+        <div style='height: 100%; overflow: hidden'>
+            <div class='switch-tab'>
+                <el-radio-group v-model='radio' size='small'>
+                    <el-radio-button value='三维图'>三维图</el-radio-button>
+                    <el-radio-button value='表格'>表格</el-radio-button>
                 </el-radio-group>
             </div>
-            <Table ref="tableRef" height="auto" isGroup />
+            <Table ref='tableRef' height='auto' isGroup />
             <SecondSheet v-if="radio === '三维图'">
-                <MyEchart :options="options" v-if="options"></MyEchart>
+                <MyEchart :options='options' v-if='options'></MyEchart>
             </SecondSheet>
         </div>
     </SecondSheet>
 </template>
 
-<script lang="ts" setup>
+<script lang='ts' setup>
 import { ref, provide } from 'vue'
 import SecondSheet from '@/components/secondSheet/index.vue'
 import Table from '@/components/table/index.vue'
@@ -25,7 +25,7 @@ import MyEchart from '@/components/echarts/MyEchart.vue'
 const radio = ref('三维图')
 const options = ref()
 const apiData = ref()
-const tableStore = new TableStore({
+const tableStore3D = new TableStore({
     showPage: false,
     // 若页面表格高度需要调整，请修改publicHeight(内容区域除表格外其他内容的高度)
     url: '/advance-boot/sgEvent/3DList',
@@ -44,8 +44,8 @@ const tableStore = new TableStore({
         }
     ],
     loadCallback: () => {
-        const eventCount = tableStore.table.data.values
-        tableStore.table.data = {
+        const eventCount = tableStore3D.table.data.values
+        tableStore3D.table.data = {
             amplitudes: ['0.8~0.9', '0.7~0.8', '0.6~0.7', '0.5~0.6', '0.4~0.5', '0.1~0.4'],
             durations: ['0.01~0.02', '0.02~0.05', '0.05~0.07', '0.07~0.10', '0.10~1.00'],
             values: [
@@ -136,9 +136,9 @@ const tableStore = new TableStore({
                 msg: '查询成功'
             }
         }
-        apiData.value = tableStore.table.data
-        tableStore.table.column![0].children![1].children = []
-        tableStore.table.column![0].children![1].children!.push(
+        apiData.value = tableStore3D.table.data
+        tableStore3D.table.column![0].children![1].children = []
+        tableStore3D.table.column![0].children![1].children!.push(
             ...(apiData.value.durations.map((item: string) => {
                 return {
                     title: item,
@@ -146,12 +146,12 @@ const tableStore = new TableStore({
                 }
             }) as any[])
         )
-        tableStore.table.data = apiData.value.table.rows
+        tableStore3D.table.data = apiData.value.table.rows
         initEchart()
     }
 })
 // 注入到子组件
-provide('tableStore', tableStore)
+provide('tableStore3D', tableStore3D)
 
 const initEchart = () => {
     options.value = {
@@ -176,7 +176,7 @@ const initEchart = () => {
                 },
                 backgroundColor: 'rgba(0,0,0,0.35)',
                 borderWidth: 0,
-                formatter: function (params: any) {
+                formatter: function(params: any) {
                     let tips = ''
                     tips += '<font>暂降幅值(p.u.):' + apiData.value.amplitudes[params.value[0]] + '</font><br/>'
                     tips += '<font>持续时间(s):' + apiData.value.durations[params.value[1]] + '</font><br/>'
@@ -248,16 +248,16 @@ const initEchart = () => {
         }
     }
 }
-const search = (id:string,beginTime:string,endTime:string) => {
-    // 从父组件tableStore获取参数
-    tableStore.table.params.searchBeginTime = beginTime
-    tableStore.table.params.searchEndTime = endTime
-    tableStore.table.params.userId = id
-    tableStore.index()
+const search = (id: string, beginTime: string, endTime: string) => {
+    // 从父组件tableStore3D获取参数
+    tableStore3D.table.params.searchBeginTime = beginTime
+    tableStore3D.table.params.searchEndTime = endTime
+    tableStore3D.table.params.userId = id
+    tableStore3D.index()
 }
 defineExpose({ search })
 </script>
-<style lang="scss">
+<style lang='scss'>
 .switch-tab {
     position: absolute;
     right: 16px;
diff --git a/src/views/pqs/voltageSags/sagGovern/businessUser/productLine/index.vue b/src/views/pqs/voltageSags/sagGovern/businessUser/productLine/index.vue
index 20668413..59976864 100644
--- a/src/views/pqs/voltageSags/sagGovern/businessUser/productLine/index.vue
+++ b/src/views/pqs/voltageSags/sagGovern/businessUser/productLine/index.vue
@@ -1,7 +1,7 @@
 <!--生产线管理界面-->
 <template>
   <div class='default-main'>
-    <TableHeader>
+    <TableHeader :showReset="false">
       <template v-slot:operation>
         <el-button type='primary' @click='refresh' class='ml10' :icon='Refresh'>刷新</el-button>
         <el-button type='primary' @click='add' class='ml10' :icon='Plus'>新增</el-button>