Merge branch 'master' of http://192.168.1.22:3000/Web/admin-sjzx

src/components/table/header/index.vue

@@ -248,7 +248,7 @@ const setTheDate = (val: any) => {
 }
 // 导出
 const onExport = () => {
-    
+    console.log('222')
     tableStore.onTableAction('export', { showAllFlag: true })
 }
 

src/utils/tableStore.ts

@@ -215,7 +215,7 @@ export default class TableStore {
                         )
                     ).then(res => {
                         this.table.allData = filtration(res.data.records || res.data)
-                        console.log('11111',this.table.allData)
+                        console.log('11111',this.table)
                         this.table.exportProcessingData && this.table.exportProcessingData()
                         this.table.allFlag = data.showAllFlag || true
                     })

src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue

@@ -1796,8 +1796,7 @@ const getEcharts = () => {
     echarts.connect('group')
 }
 const conditionChange = () => {
-    console.log(123)
-
+    
     //判断一个指标时
     if (formData.condition.length == 1) {
         if (
@@ -1933,9 +1932,9 @@ const conditionChange = () => {
         ]
     }
     setTimeout(() => {
-        // console.log('🚀 ~ setTimeout ~  tableHeaderRef.value:', tableHeaderRef.value)
+         //console.log('🚀 ~ setTimeout ~  tableHeaderRef.value:', tableHeaderRef.value)
 
-        tableHeaderRef.value && tableHeaderRef.value?.computedSearchRow()
+        //tableHeaderRef.value && tableHeaderRef.value?.computedSearchRow()
     }, 100)
 }
 

src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaizhibiaohegelv/index.vue

@@ -236,9 +236,9 @@ const init = () => {
                     msg += params[0].name + '<br/>'
                     for (let i in params) {
                         if (params[i].data == 3.14159) {
-                            msg +=params[i].marker+ params[i].seriesName + ': 暂无数据<br/>'
+                            msg +=params[i].marker + ': 暂无数据<br/>'
                         } else {
-                            msg += params[i].marker+ params[i].seriesName + ': ' + params[i].data + '<br/>'
+                            msg += params[i].marker + ': ' + params[i].data + '<br/>'
                         }
                     }
                     return msg

src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue

@@ -41,7 +41,7 @@
                     </template>
                     <template #operation>
                         <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出excel</el-button>
-                        <el-button icon="el-icon-Download" :loading="loading" @click="exportReport" type="primary">
+                        <el-button icon="el-icon-Download" :loading="loading" @click="exportReport" type="primary" v-if="VITE_FLAG">
                             下载报告
                         </el-button>
                     </template>
@@ -69,6 +69,7 @@ import { ElMessage } from 'element-plus'
 defineOptions({
     name: 'harmonic-boot/xieboReport'
 })
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const showTree = ref(false)
 const height = mainHeight(20)
 const size = ref(23)

src/views/pqs/voltageSags/sagGovern/businessUser/index.vue

@@ -44,9 +44,9 @@ import EventUploadPopup from '@/views/pqs/voltageSags/sagGovern/businessUser/eve
 
 import UserPopup from './userPopup.vue'
 
-defineOptions({
-    name: 'businessUser'
-})
+// defineOptions({
+//     name: 'businessUser'
+// })
 
 const { push } = useRouter()
 //区域联级选择