From 8d613f7a57bf136eb3bbe020cd54ebc90e4629ad Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Thu, 31 Jul 2025 15:55:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=91=E5=8D=97=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/systerm.ts                            |  4 +-
 src/layouts/admin/components/globalPopUp.vue  | 14 ++++--
 .../admin/components/navBar/classic.vue       | 17 ++++---
 src/layouts/admin/components/navMenus.vue     |  4 +-
 .../area/TransientEventList/index.vue         |  8 +--
 .../Region/components/Compatibility.vue       | 26 +++++-----
 .../Region/transientList/index.vue            |  2 +-
 .../online/eventStudy/index.vue               |  2 +-
 .../weekly/components/causeStatistics.vue     | 12 ++---
 .../pqs/voltageSags/report/weekly/index.vue   |  8 +--
 src/views/system/version/index.vue            | 49 +++++++++----------
 11 files changed, 77 insertions(+), 69 deletions(-)

diff --git a/src/api/systerm.ts b/src/api/systerm.ts
index 14d2b7e4..c269862e 100644
--- a/src/api/systerm.ts
+++ b/src/api/systerm.ts
@@ -31,14 +31,14 @@ export function getTheme() {
 }
 export function addVersion(data:any) {
     return createAxios({
-        url: '/cs-system-boot/appVersion/add',
+        url: '/system-boot/appVersion/add',
         method: 'post',
         data
     })
 }
 export function getLastData(data:any) {
     return createAxios({
-        url: '/cs-system-boot/appVersion/getLastData',
+        url: '/system-boot/appVersion/getLastData',
         method: 'post',
         params:data
     })
diff --git a/src/layouts/admin/components/globalPopUp.vue b/src/layouts/admin/components/globalPopUp.vue
index f228367b..0b32350e 100644
--- a/src/layouts/admin/components/globalPopUp.vue
+++ b/src/layouts/admin/components/globalPopUp.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <!-- 全局暂降事件 -->
-        <el-drawer v-model="drawer" title="暂降事件" size="1000px" :before-close="handleClose">
+        <el-drawer v-model="drawer" title="暂降事件" size="1050px" :before-close="handleClose">
             <div :style="height">
                 <vxe-table
                     v-bind="defaultAttribute"
@@ -13,15 +13,19 @@
                     <vxe-column type="seq" width="70px" title="序号"></vxe-column>
                     <vxe-column field="time" width="180px" sortable title="发生时刻"></vxe-column>
                     <vxe-column field="lineName" title="监测点"></vxe-column>
-                    <vxe-column field="powerCompany" title="变电站"></vxe-column>
-                    <vxe-column field="powerCompany" title="供电公司"></vxe-column>
-                    <vxe-column field="persistTime" width="120px" sortable title="持续时间(s)"></vxe-column>
+                    <vxe-column field="powerCompany" title="变电站" width="100px"></vxe-column>
+                    <vxe-column field="powerCompany" title="供电公司" width="100px"></vxe-column>
+                    <vxe-column field="persistTime" width="120px" sortable title="持续时间(s)">
+                         <template #default="{ row }">
+                            {{ Math.floor(row.persistTime * 1000) / 1000 }}
+                        </template>
+                    </vxe-column>
                     <vxe-column field="eventValue" width="160px" sortable title="暂降(骤升)幅值(%)">
                         <template #default="{ row }">
                             {{ Math.floor(row.eventValue * 10000) / 100 }}
                         </template>
                     </vxe-column>
-                    <vxe-column field="eventType" width="110px" title="暂降类型">
+                    <vxe-column field="eventType" width="100px" title="暂降类型">
                         <template #default="{ row }">
                             {{ event.filter(item => item.id == row.eventType)[0]?.name || '/' }}
                         </template>
diff --git a/src/layouts/admin/components/navBar/classic.vue b/src/layouts/admin/components/navBar/classic.vue
index 54390d21..99e94a00 100644
--- a/src/layouts/admin/components/navBar/classic.vue
+++ b/src/layouts/admin/components/navBar/classic.vue
@@ -8,9 +8,10 @@
                 size="18"
             />
         </div>
-        <span class="nav-bar-title">{{ getTheme.name }} 
-            <span style="font-size: 14px;" >
-                (v1.0.1)
+        <span class="nav-bar-title">
+            {{ getTheme.name }}
+            <span style="font-size: 14px">
+                ({{ Version||'v1.0.0' }})
             </span>
             <!-- <span style="font-size: 14px;" v-if="Version?.versionName">
                 ({{ Version?.versionName }})
@@ -26,7 +27,8 @@ import NavTabs from '@/layouts/admin/components/navBar/tabs.vue'
 import NavMenus from '../navMenus.vue'
 import { showShade } from '@/utils/pageShade'
 import { getLastData } from '@/api/systerm'
-const Version: any = ref({})
+
+const Version: any = ref('')
 const config = useConfig()
 const getTheme = JSON.parse(window.localStorage.getItem('getTheme') as string)
 
@@ -37,10 +39,9 @@ const onMenuCollapse = () => {
     config.setLayout('menuCollapse', false)
 }
 onMounted(() => {
-    // getLastData({ versionType: 'WEB' }).then(res => {
-    //     Version.value = res.data
-
-    // })
+    getLastData({ versionType: 'WEB' }).then(res => {
+        Version.value = res.data.versionName
+    })
     document.title = getTheme.name
 })
 </script>
diff --git a/src/layouts/admin/components/navMenus.vue b/src/layouts/admin/components/navMenus.vue
index 144b28ec..a88c0f44 100644
--- a/src/layouts/admin/components/navMenus.vue
+++ b/src/layouts/admin/components/navMenus.vue
@@ -13,7 +13,7 @@
                 </span>
             </div>
         </el-tooltip>
-        <el-tooltip effect="dark" content="截图" placement="bottom">
+        <!-- <el-tooltip effect="dark" content="截图" placement="bottom">
             <div @click="savePng" class="nav-menu-item">
                 <Icon
                     :color="configStore.getColorVal('headerBarTabColor')"
@@ -40,7 +40,7 @@
                     size="18"
                 />
             </div>
-        </el-tooltip>
+        </el-tooltip> -->
         <el-dropdown style="height: 100%" @command="handleCommand">
             <div class="admin-info" :class="state.currentNavMenu == 'adminInfo' ? 'hover' : ''">
                 <el-avatar :size="25" fit="fill">
diff --git a/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue b/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue
index daedfa95..062fe0e2 100644
--- a/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue
@@ -74,10 +74,10 @@
                     </el-form-item>
                 </template>
                 <template v-slot:operation>
-                    <el-button :icon='Download' type='primary' @click='download'>下载波形</el-button>
+                    <el-button :icon="Download" type="primary" @click="download">下载波形</el-button>
                 </template>
             </TableHeader>
-            <Table ref="tableRef" :checkboxConfig='checkboxConfig'/>
+            <Table ref="tableRef" :checkboxConfig="checkboxConfig" />
         </div>
         <div :style="{ height: pageHeight.height }" style="padding: 10px; overflow: hidden" v-if="!view">
             <waveForm ref="waveFormRef" senior :boxoList="boxoList" :wp="wp" @backbxlb="backbxlb" />
@@ -114,7 +114,7 @@ const tableStore = new TableStore({
     url: '/event-boot/transient/getTransientValue',
     method: 'POST',
     column: [
-         { width: '60', type: 'checkbox' },
+        { width: '60', type: 'checkbox' },
         {
             field: 'index',
             title: '序号',
@@ -268,7 +268,7 @@ const download = () => {
             ElMessage.warning('暂无可下载的波形文件!')
             return
         }
-        ElMessage.success('下载中。。。!')
+        ElMessage.info('下载中......')
         let blob = new Blob([res], { type: 'application/zip' }) // console.log(blob) // var href = window.URL.createObjectURL(blob); //创建下载的链接
         const url = window.URL.createObjectURL(blob)
         const link = document.createElement('a') // 创建a标签
diff --git a/src/views/pqs/voltageSags/Region/components/Compatibility.vue b/src/views/pqs/voltageSags/Region/components/Compatibility.vue
index c58848f8..a6665543 100644
--- a/src/views/pqs/voltageSags/Region/components/Compatibility.vue
+++ b/src/views/pqs/voltageSags/Region/components/Compatibility.vue
@@ -108,7 +108,7 @@ const info = async (list: any) => {
     datalist.value = []
     list.forEach((item: any) => {
         // if (item.eventValue < 2 && item.eventValue > 0) {
-            datalist.value.push(item)
+        datalist.value.push(item)
         // }
     })
     await gongfunction()
@@ -124,7 +124,8 @@ const info = async (list: any) => {
                 }
 
                 let relVal = ''
-                relVal = "<font style='color:" + "'>供电公司:" + '&nbsp' + '&nbsp' + a[0].value[3] + '</font><br/>'
+                relVal = "<font style='color:" + "'>监测点名称:" + '&nbsp' + '&nbsp' + a[0].value[7] + '</font><br/>'
+                relVal += "<font style='color:" + "'>供电公司:" + '&nbsp' + '&nbsp' + a[0].value[3] + '</font><br/>'
                 relVal += "<font style='color:" + "'>变电站:" + '&nbsp' + '&nbsp' + a[0].value[4] + '</font><br/>'
                 relVal += "<font style='color:" + "'>发生时刻:" + '&nbsp' + '&nbsp' + a[0].value[2] + '</font><br/>'
                 relVal +=
@@ -225,7 +226,8 @@ const info = async (list: any) => {
                 }
 
                 let relVal = ''
-                relVal = "<font style='color:" + "'>供电公司:" + '&nbsp' + '&nbsp' + a[0].value[3] + '</font><br/>'
+                relVal = "<font style='color:" + "'>监测点名称:" + '&nbsp' + '&nbsp' + a[0].value[7] + '</font><br/>'
+                relVal += "<font style='color:" + "'>供电公司:" + '&nbsp' + '&nbsp' + a[0].value[3] + '</font><br/>'
                 relVal += "<font style='color:" + "'>变电站:" + '&nbsp' + '&nbsp' + a[0].value[4] + '</font><br/>'
                 relVal += "<font style='color:" + "'>发生时刻:" + '&nbsp' + '&nbsp' + a[0].value[2] + '</font><br/>'
                 relVal +=
@@ -233,10 +235,15 @@ const info = async (list: any) => {
                     "'>持续时间:" +
                     '&nbsp' +
                     '&nbsp' +
-                    a[0].value[0].toFixed(3) +
+                    Math.floor(a[0].value[0] * 1000) / 1000 +
                     's</font><br/>'
                 relVal +=
-                    "<font style='color:" + "'>特征幅值:" + '&nbsp' + '&nbsp' + a[0].value[1].toFixed(3) + '%</font>'
+                    "<font style='color:" +
+                    "'>特征幅值:" +
+                    '&nbsp' +
+                    '&nbsp' +
+                    Math.floor(a[0].value[1] * 1000) / 1000 +
+                    '%</font>'
                 return relVal
             }
         },
@@ -302,7 +309,6 @@ const info = async (list: any) => {
     radioChange(radio.value)
 }
 const radioChange = (e: any) => {
-
     if (e == 'ITIC') {
         echartList.value = ITIC.value
         TableData.value[0].totalEvents = pointI.value.length + pointIun.value.length
@@ -330,7 +336,6 @@ const gongfunction = () => {
     if (total == 0) {
     } else {
         for (var i = 0; i < datalist.value.length; i++) {
-        
             var point = []
             var xx = datalist.value[i].persistTime
             var yy = datalist.value[i].eventValue * 100
@@ -339,7 +344,8 @@ const gongfunction = () => {
             var substation = datalist.value[i].subName
             var index = datalist.value[i].lineId
             var eventId = datalist.value[i].eventId
-            point = [xx, yy, time, company, substation, index, eventId]
+            var lineName = datalist.value[i].lineName 
+            point = [xx, yy, time, company, substation, index, eventId, lineName]
 
             if (xx <= 0.003) {
                 var line = 0
@@ -415,8 +421,6 @@ const gongfunction = () => {
                 }
             }
 
-            
-
             if (xx < 0.05) {
                 standF++
                 pointF.value.push({
@@ -438,7 +442,7 @@ const gongfunction = () => {
                     })
                 }
             } else if (xx < 0.5) {
-                if (yy > 50) {
+                if (yy > 70) {
                     standF++
                     pointF.value.push({
                         value: point,
diff --git a/src/views/pqs/voltageSags/Region/transientList/index.vue b/src/views/pqs/voltageSags/Region/transientList/index.vue
index 89a23a4e..7a3d8f50 100644
--- a/src/views/pqs/voltageSags/Region/transientList/index.vue
+++ b/src/views/pqs/voltageSags/Region/transientList/index.vue
@@ -337,7 +337,7 @@ const download = () => {
             ElMessage.warning('暂无可下载的波形文件!')
             return
         }
-        ElMessage.success('下载中。。。!')
+          ElMessage.info('下载中......')
         let blob = new Blob([res], { type: 'application/zip' }) // console.log(blob) // var href = window.URL.createObjectURL(blob); //创建下载的链接
         const url = window.URL.createObjectURL(blob)
         const link = document.createElement('a') // 创建a标签
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue
index bc242508..00b1cb6a 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue
@@ -148,7 +148,7 @@ const download = () => {
             ElMessage.warning('暂无可下载的波形文件!')
             return
         }
-        ElMessage.success('下载中。。。!')
+        ElMessage.info('下载中......')
         let blob = new Blob([res], { type: 'application/zip' }) // console.log(blob) // var href = window.URL.createObjectURL(blob); //创建下载的链接
         const url = window.URL.createObjectURL(blob)
         const link = document.createElement('a') // 创建a标签
diff --git a/src/views/pqs/voltageSags/report/weekly/components/causeStatistics.vue b/src/views/pqs/voltageSags/report/weekly/components/causeStatistics.vue
index 16e4c406..6c584e24 100644
--- a/src/views/pqs/voltageSags/report/weekly/components/causeStatistics.vue
+++ b/src/views/pqs/voltageSags/report/weekly/components/causeStatistics.vue
@@ -7,8 +7,8 @@
         </TableHeader>
         <!-- <Table isGroup ref="tableRef" /> -->
         <vxe-table height="200" ref="tableRef" auto-resize :data="tableStore.table.data" v-bind="defaultAttribute">
-            <vxe-table-colgroup title="暂态原因统计表">
-                <vxe-table-column field="transientCause" title="暂态原因"></vxe-table-column>
+            <vxe-table-colgroup title="暂降原因统计表">
+                <vxe-table-column field="transientCause" title="暂降原因"></vxe-table-column>
                 <vxe-table-column field="fault" title="短路故障"></vxe-table-column>
                 <vxe-table-column field="excitation" title="变压器激磁"></vxe-table-column>
                 <vxe-table-column field="disturbance" title="电压扰动"></vxe-table-column>
@@ -85,7 +85,7 @@ const tableStore = new TableStore({
         tableStore.table.data = arr
         options.value = {
             title: {
-                text: '暂态原因统计',
+                text: '暂降原因统计',
                 top: '20'
             },
             legend: {
@@ -106,13 +106,13 @@ const tableStore = new TableStore({
             dataZoom: { show: false },
             tooltip: {
                 formatter: function (params) {
-                    return `暂态原因统计:  <br/>${params.data.name}:${params.data.value}次  <br/>占比:${params.data.zb}%`
+                    return `暂降原因统计:  <br/>${params.data.name}:${params.data.value}次  <br/>占比:${params.data.zb}%`
                 }
             },
             options: {
                 series: [
                     {
-                        name: '暂态原因统计',
+                        name: '暂降原因统计',
                         type: 'pie',
                         radius: '60%',
                         label: {
@@ -152,7 +152,7 @@ nextTick(() => {
 // 导出
 const exportEvent = () => {
     tableRef.value.exportData({
-        filename: '暂态原因统计', // 文件名字
+        filename: '暂降原因统计', // 文件名字
         sheetName: 'Sheet1',
         type: 'xlsx', //导出文件类型 xlsx 和 csv
         useStyle: true,
diff --git a/src/views/pqs/voltageSags/report/weekly/index.vue b/src/views/pqs/voltageSags/report/weekly/index.vue
index a98e500a..8b21605b 100644
--- a/src/views/pqs/voltageSags/report/weekly/index.vue
+++ b/src/views/pqs/voltageSags/report/weekly/index.vue
@@ -11,7 +11,7 @@
                     </el-tab-pane>
                 </el-tabs>
             </el-tab-pane>
-            <el-tab-pane label="暂态原因统计" name="2"><CauseStatistics /></el-tab-pane>
+            <el-tab-pane label="暂降原因统计" name="2"><CauseStatistics /></el-tab-pane>
             <el-tab-pane v-for="item in list" :label="item.name" :name="item.id" :key="item.id">
                 <Table :info="item"></Table>
             </el-tab-pane>
@@ -74,7 +74,7 @@ const list = ref([
     //     ]
     // },
     {
-        name: '详细事件列表',
+        name: '暂降事件列表',
         id: '4',
         url: '/event-boot/report/getContinueTime',
         column: [
@@ -86,7 +86,7 @@ const list = ref([
                     return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
                 }
             },
-            { field: 'startTime', title: '暂态事件发生时刻', width: '200' },
+            { field: 'startTime', title: '暂降事件发生时刻', width: '200' },
             { field: 'gdName', title: '供电公司', width: '150' },
             { field: 'subName', title: '变电站' },
             { field: 'lineName', title: '监测点' },
@@ -105,7 +105,7 @@ const list = ref([
                 formatter: ({ row }: any) => (row.featureAmplitude * 100).toFixed(2)
             },
             { field: 'duration', title: '持续时间(s)', width: '120' },
-            { field: 'advanceType', title: '暂态类型(机器判断)', width: '150' }
+            { field: 'advanceType', title: '暂降类型(机器判断)', width: '150' }
         ]
     },
     {
diff --git a/src/views/system/version/index.vue b/src/views/system/version/index.vue
index f6c7b7e0..bbd6f787 100644
--- a/src/views/system/version/index.vue
+++ b/src/views/system/version/index.vue
@@ -2,8 +2,6 @@
     <div class="default-main">
         <TableHeader :showReset="false">
             <template #select>
-
-
                 <!-- <el-radio-group v-model.trim="tableStore.table.params.versionType" @change="tableStore.index()">
                     <el-radio-button label="web" value="WEB" />
                     <el-radio-button label="app" value="APP" />
@@ -18,26 +16,28 @@
         <el-dialog width="600px" v-model.trim="dialogVisible" title="新增版本">
             <el-form :inline="false" :model="form" label-width="auto" class="form-one">
                 <el-form-item label="版本号">
-                    <el-input maxlength="32" show-word-limit v-model.trim="form.appVersion" placeholder="请输入版本号" />
+                    <el-input
+                        maxlength="32"
+                        show-word-limit
+                        v-model.trim="form.appVersion"
+                        placeholder="请输入版本号"
+                    />
                 </el-form-item>
                 <el-form-item label="整改内容">
-                    <el-input maxlength="300" type="textarea" show-word-limit v-model.trim="form.content"
-                        placeholder="请输入整改内容" />
+                    <el-input
+                        maxlength="300"
+                        type="textarea"
+                        show-word-limit
+                        v-model.trim="form.content"
+                        placeholder="请输入整改内容"
+                    />
                 </el-form-item>
                 <el-form-item label="发布类型">
-
                     <el-select v-model.trim="form.sev" placeholder="请选择发布类型">
                         <el-option label="优化" :value="0" />
                         <el-option label="bug调整" :value="1" />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="版本类型">
-
-                    <el-select v-model.trim="form.versionType" placeholder="请选择版本类型">
-                        <el-option label="web" value="WEB" />
-                        <el-option label="app" value="APP" />
-                    </el-select>
-                </el-form-item>
             </el-form>
 
             <template #footer>
@@ -62,17 +62,19 @@ const dialogVisible = ref(false)
 const form = ref({
     appVersion: '',
     content: '',
-    versionType: '',
-    sev: '',
+    versionType: 'WEB',
+    sev: ''
 })
 const tableStore = new TableStore({
-    url: '/cs-system-boot/appVersion/getAllData',
+    url: '/system-boot/appVersion/getAllData',
     method: 'POST',
     showPage: false,
     paramsPOST: true,
     column: [
         {
-            title: '序号', width: 80, formatter: (row: any) => {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
@@ -80,17 +82,15 @@ const tableStore = new TableStore({
 
         { title: '创建时间', field: 'createTime', width: '220' },
         {
-            title: '发布类型', field: 'sev', formatter: (row,) => {
+            title: '发布类型',
+            field: 'sev',
+            formatter: row => {
                 return row.cellValue == 0 ? '优化' : 'bug调整'
             },
             width: '150'
         },
-        { title: '整改内容', field: 'content' },
-
-
-
-
-    ],
+        { title: '整改内容', field: 'content' }
+    ]
 })
 tableStore.table.params.versionType = 'WEB'
 provide('tableStore', tableStore)
@@ -119,5 +119,4 @@ const addMenu = () => {
     form.value.sev = tableStore.table.data[0].sev || 0
     form.value.versionType = tableStore.table.data[0].versionType || 'WEB'
 }
-
 </script>