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

# Conflicts:
#	src/components/PreviewFile/index.vue

.env.hainan

@@ -0,0 +1,5 @@
+NODE_ENV = hainan
+VITE_NAME="hainan"
+# 电网一张图 地图图层
+VITE_NARIMAP=null
+VITE_NRGISCOMMON=null

package.json

@@ -6,9 +6,11 @@
   "scripts": {
     "dev": "vite --mode dev",
     "dev:jibei": "vite --mode jibei",
+    "dev:hainan": "vite --mode hainan",
     "dev:removeMode": "vite --mode removeMode",
     "build": "vite build --mode dev",
     "build:jibei": "vite build --mode jibei",
+    "build:hainan": "vite build --mode hainan",
     "build:removeMode": "vite build --mode removeMode",
     "preview": "vite preview"
   },
@@ -19,7 +21,7 @@
     "@form-create/element-ui": "^3.1.24",
     "@fortawesome/fontawesome-free": "^6.5.1",
     "@kjgl77/datav-vue3": "^1.7.4",
-    "@vue-office/docx": "^1.6.2",
+    "@vue-office/docx": "^1.6.3",
     "@vue-office/excel": "^1.7.8",
     "@vue-office/pdf": "^2.0.2",
     "@vueuse/core": "^10.7.0",

src/api/device-boot/Business.ts

@@ -134,6 +134,22 @@ export function selectUserList(data: any) {
         data
     })
 }
+//获取用户
+export function selectUserAssessMentList(data: any) {
+    return createAxios({
+        url: '/supervision-boot/userReport/selectUserAssessMentList',
+        method: 'post',
+        data
+    })
+}
+//绑定用户
+export function bindAssessmentId(data: any) {
+    return createAxios({
+        url: '/supervision-boot/userReport/bindAssessmentId',
+        method: 'get',
+        params: data
+    })
+}
 //查询列表
 export function getStatusManageList(data: any) {
     return createAxios({

src/api/system-boot/file.ts

@@ -7,8 +7,20 @@ const SYSTEM_PREFIX = '/system-boot'
  * @param file
  */
 export const uploadFile = (file: any, path: string) => {
+    const regex = /\[|\]/g
+    // 替换规则：[ 换成 (，] 换成 )
+
+    const newFile = new File(
+        [file], // 原文件的二进制内容
+        file.name.replace(regex, match => (match === '[' ? '(' : ')')), // 新的文件名
+        {
+            type: file.type, // 复用原文件的MIME类型
+            lastModified: file.lastModified // 复用最后修改时间
+        }
+    )
+
     let form = new FormData()
-    form.append('file', file)
+    form.append('file', newFile)
     form.append('path', path)
     return createAxios({
         url: SYSTEM_PREFIX + '/file/upload',

src/components/PreviewFile/index.vue

@@ -1,11 +1,19 @@
 <template>
     <div style="overflow: auto; height: 100vh">
-        <vue-office-docx v-if="url.includes('.doc') || url.includes('.docx')" :src="url" />
-        <vue-office-excel v-if="url.includes('.xls') || url.includes('.xlsx')" :src="url" :options="excelOptions" />
+        <vue-office-docx v-if="urlKey.includes('.doc') || urlKey.includes('.docx')" :src="url" />
+        <vue-office-excel
+            v-if="urlKey.includes('.xls') || urlKey.includes('.xlsx')"
+            :src="url"
+            :options="excelOptions"
+        />
         <!-- <vue-office-pdf v-if="url.includes('.pdf')" :src="url" /> -->
-        <iframe v-if="url.includes('.pdf')" :src="url" style="width: 100%; height: 99%"></iframe>
-        <img v-if="url.includes('.png') || url.includes('.jpg') || url.includes('.gif') || url.includes('.bmp')"
-            :src="url" />
+        <iframe v-if="urlKey.includes('.pdf')||urlKey.includes('.txt')" :src="url" style="width: 100%; height: 99%"></iframe>
+        <img
+            v-if="
+                urlKey.includes('.png') || urlKey.includes('.jpg') || urlKey.includes('.gif') || urlKey.includes('.bmp')
+            "
+            :src="url"
+        />
     </div>
 </template>
 <script lang="ts" setup>
@@ -19,22 +27,34 @@ import VueOfficeExcel from '@vue-office/excel'
 //引入VueOfficePdf组件
 import VueOfficePdf from '@vue-office/pdf'
 import { downloadFile } from '@/api/system-boot/file'
+import { previewFile } from '@/utils/fileDownLoad'
+
 const { push, options, currentRoute } = useRouter()
 const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 // const url = 'http://192.168.1.22:9009/excelreport' + currentRoute.value.href?.split('?')[1]
 const url = ref('')
 const excelOptions = ref({})
-if(VITE_FLAG){
-     url.value = '/api-docx/excelreport' + currentRoute.value?.href?.split('?')[1]
-     excelOptions.value = ref({
+const urlKey = currentRoute.value?.href?.split('?')[1]
+
+if (VITE_FLAG) {
+    url.value = '/api-docx/excelreport' + currentRoute.value?.href?.split('?')[1]
+    excelOptions.value = ref({
         xls: currentRoute.value.href?.split('?')[1].split('.')[1] == 'xls' ? true : false
     })
-}else{
-    //下载
-    
-}
+} else {
+    setTimeout(async () => {
+      
+        const previewUrl = await previewFile(currentRoute.value?.href?.split('?')[1])
+        url.value = previewUrl
+        excelOptions.value = ref({
+            xls: currentRoute.value.href?.split('?')[1].split('.')[1] == 'xls' ? true : false
+        })
+    }, 0)
+ }
 
 onMounted(() => {
+    // 从路由参数获取文件路径
+
     console.log()
 })
 </script>

src/components/table/header/index.vue

@@ -232,6 +232,16 @@ const onResetForm = () => {
     //时间重置成默认值
     datePickerRef.value?.setTheDate(3)
 
+    if(props.showTimeAll){
+         timeAll.value = false
+         delete tableStore.table.params.searchBeginTime
+         delete tableStore.table.params.searchEndTime
+         delete tableStore.table.params.startTime
+         delete tableStore.table.params.endTime
+         delete tableStore.table.params.timeFlag
+         delete tableStore.table.params.interval
+    }
+
     if (props.datePicker && timeAll.value) {
         tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0]
         tableStore.table.params.searchEndTime = datePickerRef.value.timeValue[1]
@@ -248,7 +258,7 @@ const setTheDate = (val: any) => {
 }
 // 导出
 const onExport = () => {
-    
+    console.log('222')
     tableStore.onTableAction('export', { showAllFlag: true })
 }
 

src/components/tree/pqs/algorithmTree.vue

@@ -1,88 +1,106 @@
-<template>
-    <div class="point-tree">
-        <div style="flex: 1; overflow: hidden">
-            <Tree
-                ref="treeRef"
-                :data="tree"
-                :canExpand="false"
-                style="width: 100%; height: 100%"
-                v-bind="$attrs"
-                default-expand-all
-                
-                @onAddTree="onAddTree"
-            />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup>
-import { nextTick, onMounted, ref, useAttrs } from 'vue'
-import Tree from '../index.vue'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { useDictData } from '@/stores/dictData'
-import { getTerminalTreeForFive } from '@/api/device-boot/terminalTree'
-import { useConfig } from '@/stores/config'
-import { queryAllAlgorithmLibrary } from '@/api/supervision-boot/database/index'
-defineOptions({
-    name: 'pms/pointTree'
-})
-const emit = defineEmits(['init', 'onAddTree'])
-const attrs = useAttrs()
-const adminInfo = useAdminInfo()
-const dictData = useDictData()
-const config = useConfig()
-const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
-const tree = ref()
-const treeRef = ref()
-
-const loadData = (id?: any) => {
-    console.log('🚀 ~ loadData ~ id:', id)
-    let nodeKey = ''
-    queryAllAlgorithmLibrary().then(res => {
-        res.data.forEach((item: any) => {
-            item.icon = 'el-icon-FolderOpened'
-            item.color = config.getColorVal('elementUiPrimary')
-            item.children.forEach((item2: any) => {
-                item2.icon = 'el-icon-Document'
-                item2.color = config.getColorVal('elementUiPrimary')
-                item2.childrens = item2.children
-                item2.children = []
-                if (item2.id == id) {
-                    emit('init', item2)
-                }
-            })
-        })
-
-        nodeKey = res.data[0].children[0].id
-
-        tree.value = res.data
-        if (id) {
-            setTimeout(() => {
-                treeRef.value.treeRef.setCurrentKey(id)
-            }, 10)
-        } else {
-            setTimeout(() => {
-                treeRef.value.treeRef.setCurrentKey(nodeKey)
-                emit('init', res.data[0].children[0])
-            }, 10)
-        }
-    })
-}
-
-const onAddTree = () => {
-    emit('onAddTree')
-}
-loadData()
-defineExpose({ loadData })
-</script>
-<style lang="scss">
-.point-tree {
-    height: 100%;
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    background: #fff;
-    border: 1px solid var(--el-border-color);
-}
-</style>
- 
+<template>
+    <div class="point-tree">
+        <div style="flex: 1; overflow: hidden">
+            <Tree
+                ref="treeRef"
+                :data="tree"
+                :canExpand="false"
+                style="width: 100%; height: 100%"
+                v-bind="$attrs"
+                default-expand-all
+                @onAddTree="onAddTree"
+            />
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { nextTick, onMounted, ref, useAttrs } from 'vue'
+import Tree from '../index.vue'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { useDictData } from '@/stores/dictData'
+import { getTerminalTreeForFive } from '@/api/device-boot/terminalTree'
+import { useConfig } from '@/stores/config'
+import { queryAllAlgorithmLibrary } from '@/api/supervision-boot/database/index'
+defineOptions({
+    name: 'pms/pointTree'
+})
+const emit = defineEmits(['init', 'onAddTree'])
+const attrs = useAttrs()
+const adminInfo = useAdminInfo()
+const dictData = useDictData()
+const config = useConfig()
+const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+const tree = ref()
+const treeRef = ref()
+
+const loadData = (id?: any) => {
+    console.log('🚀 ~ loadData ~ id:', id)
+    let nodeKey = ''
+    queryAllAlgorithmLibrary().then(res => {
+        res.data.forEach((item: any) => {
+            item.icon = 'el-icon-FolderOpened'
+            item.color = config.getColorVal('elementUiPrimary')
+            item.children.forEach((item2: any) => {
+                item2.icon = 'el-icon-Document'
+                item2.color = config.getColorVal('elementUiPrimary')
+                item2.childrens = item2.children
+                item2.children = []
+                if (item2.id == id) {
+                    emit('init', item2)
+                }
+            })
+        })
+
+        nodeKey = res.data[0].children[0].id
+
+        tree.value = res.data
+        if (id) {
+            setTimeout(() => {
+                treeRef.value.treeRef.setCurrentKey(id)
+            }, 10)
+        } else {
+            setTimeout(() => {
+                treeRef.value.treeRef.setCurrentKey(nodeKey)
+                emit('init', res.data[0].children[0])
+            }, 10)
+        }
+    })
+}
+
+const onAddTree = () => {
+    emit('onAddTree')
+}
+const setKey = (id: string) => {
+    treeRef.value.treeRef.setCurrentKey(id)
+    return findNodeById(tree.value, id)
+}
+const findNodeById = (tree1: any, targetId: any) => {
+    for (const node of tree1) {
+        // 1. 当前节点匹配ID，直接返回该节点
+        if (node.id === targetId) {
+            return node
+        }
+        // 2. 当前节点有子节点，递归查找子节点
+        if (node.children && node.children.length > 0) {
+            const result: any = findNodeById(node.children, targetId)
+            // 子节点中找到结果，立即返回（终止递归）
+            if (result) return result
+        }
+    }
+    // 3. 遍历完未找到，返回null
+    return null
+}
+loadData()
+defineExpose({ loadData, setKey })
+</script>
+<style lang="scss">
+.point-tree {
+    height: 100%;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    background: #fff;
+    border: 1px solid var(--el-border-color);
+}
+</style>

src/layouts/admin/components/logo.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="layout-logo">
-        <img v-if="!config.layout.menuCollapse" class="logo-img" :src="getTheme.logoUrl" />
+        <img  v-if="!config.layout.menuCollapse && getTheme && getTheme.logoUrl"  class="logo-img" :src="getTheme.logoUrl" />
         <!--        <div-->
         <!--            v-if="!config.layout.menuCollapse"-->
         <!--            :style="{ color: config.getColorVal('menuActiveColor') }"-->
@@ -28,7 +28,9 @@ import { Session } from '@/utils/storage'
 import { setNavTabsWidth } from '@/utils/layout'
 
 const config = useConfig()
-const getTheme = JSON.parse(window.localStorage.getItem('getTheme') as string)
+const getTheme = window.localStorage.getItem('getTheme') 
+  ? JSON.parse(window.localStorage.getItem('getTheme') as string) 
+  : null
 const onMenuCollapse = function () {
     if (config.layout.shrink && !config.layout.menuCollapse) {
         closeShade()

src/layouts/admin/components/navBar/classic.vue

@@ -9,7 +9,7 @@
             />
         </div>
         <span class="nav-bar-title">
-            {{ getTheme.name }}
+            {{ getTheme?.name || '' }}
             <span style="font-size: 14px">({{ Version || 'v1.0.0' }})</span>
             <!-- <span style="font-size: 14px;" v-if="Version?.versionName">
                 ({{ Version?.versionName }})
@@ -28,8 +28,10 @@ import { getLastData } from '@/api/systerm'
 
 const Version: any = ref(null)
 const config = useConfig()
-const getTheme = JSON.parse(window.localStorage.getItem('getTheme') as string)
-
+const getTheme = window.localStorage.getItem('getTheme') 
+  ? JSON.parse(window.localStorage.getItem('getTheme') as string) 
+  : { name: '' }
+const VITE_FLAG = import.meta.env.VITE_NAME == 'hainan'
 const onMenuCollapse = () => {
     showShade('ba-aside-menu-shade', () => {
         config.setLayout('menuCollapse', true)
@@ -37,10 +39,13 @@ const onMenuCollapse = () => {
     config.setLayout('menuCollapse', false)
 }
 onMounted(() => {
-    getLastData({ versionType: 'WEB' }).then(res => {
-        Version.value = res.data.versionName
-    })
-    document.title = getTheme.name
+    if(!VITE_FLAG){
+         getLastData({ versionType: 'WEB' }).then(res => {
+            Version.value = res.data.versionName
+        })
+    }
+   
+    document.title = getTheme?.name || ''
 })
 </script>
 

src/utils/fileDownLoad.ts

@@ -1,37 +1,48 @@
 import { downloadFile } from '@/api/system-boot/file'
 // 下载文件
 export const download = (urls: string) => {
-    downloadFile({ filePath: urls }).then((res: any) => {
-        let blob = new Blob([res], {
-            type: urls.includes('.pdf')
-                ? 'application/pdf'
-                : urls.includes('.zip')
-                ? 'application/zip'
-                : urls.includes('.doc')
-                ? 'application/msword'
-                : urls.includes('.docx')
-                ? 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
-                : urls.includes('.xls')
-                ? 'application/vnd.ms-excel'
-                : urls.includes('.xlsx')
-                ? 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-                : urls.includes('.png')
-                ? 'image/png'
-                : urls.includes('.jpeg')
-                ? 'image/jpeg'
-                : urls.includes('.jpg')
-                ? 'image/jpg'
-                : ''
+    //console.log('下载', urls)
+
+    downloadFile({ filePath: urls })
+        .then((res: any) => {
+            // 1. 确定文件MIME类型（优化：用更简洁的方式）
+            const getFileType = (url: string) => {
+                const ext = url.split('.').pop()?.toLowerCase() || ''
+                const mimeMap: Record<string, string> = {
+                    pdf: 'application/pdf',
+                    zip: 'application/zip',
+                    doc: 'application/msword',
+                    docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                    xls: 'application/vnd.ms-excel',
+                    xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                    png: 'image/png',
+                    jpeg: 'image/jpeg',
+                    jpg: 'image/jpg'
+                }
+                return mimeMap[ext] || ''
+            }
+          
+            const blob = new Blob([res], { type: getFileType(urls) })
+         
+            // 2. 提取文件名并保留原生后缀（核心修复点）
+            const fileName = urls.split('/').at(-1) || '下载文件' // 先提取URL最后一段（文件名）
+
+            // 3. 创建下载链接
+            const url = window.URL.createObjectURL(blob)
+            const link = document.createElement('a')
+            link.href = url
+            link.download = fileName // 直接使用原文件名（保留后缀）
+            document.body.appendChild(link)
+            link.click()
+
+            // 4. 清理资源（优化）
+            link.remove()
+            window.URL.revokeObjectURL(url) // 释放blob URL
+        })
+        .catch(err => {
+            console.error('下载失败：', err)
+            // 可添加错误提示（如Toast）
         })
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a')
-        let name = removeLastDotSuffix(urls.split('/')[2])
-        link.href = url
-        link.download = name
-        document.body.appendChild(link)
-        link.click()
-        link.remove()
-    })
 }
 function removeLastDotSuffix(str: string) {
     // 找到最后一个 . 的位置
@@ -39,3 +50,42 @@ function removeLastDotSuffix(str: string) {
     // 如果存在 .，截取到 . 之前的部分；否则返回原字符串
     return lastDotIndex !== -1 ? str.slice(0, lastDotIndex) : str
 }
+
+// 预览文件
+export const previewFile = async (urls: any) => {
+    //console.log('预览', urls)
+    let url = ''
+    //console.log('urls', decodeURI(urls))
+    await downloadFile({ filePath: decodeURI(urls) })
+        .then((res: any) => {
+            
+            // 1. 确定文件MIME类型（优化：用更简洁的方式）
+            const getFileType = (url: string) => {
+                const ext = url.split('.').pop()?.toLowerCase() || ''
+                const mimeMap: Record<string, string> = {
+                    pdf: 'application/pdf',
+                    zip: 'application/zip',
+                    doc: 'application/msword',
+                    docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                    xls: 'application/vnd.ms-excel',
+                    xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                    png: 'image/png',
+                    jpeg: 'image/jpeg',
+                    jpg: 'image/jpg'
+                }
+                return mimeMap[ext] || ''
+            }
+            
+            const blob = new Blob([res], { type: getFileType(decodeURI(urls)) })
+
+
+            // 3. 创建下载链接
+            url = window.URL.createObjectURL(blob)
+        })
+        .catch(err => {
+            console.error('下载失败：', err)
+            // 可添加错误提示（如Toast）
+        })
+    //console.log('url', url)
+    return url
+}

src/utils/request.ts

@@ -1,326 +1,327 @@
-import type { AxiosRequestConfig, Method } from 'axios'
-import axios from 'axios'
-import { ElLoading, ElNotification, type LoadingOptions } from 'element-plus'
-import { refreshToken } from '@/api/user-boot/user'
-import router from '@/router/index'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { debounce } from 'lodash-es';
-let loginExpireTimer:any = null
-window.requests = []
-window.tokenRefreshing = false
-const pendingMap = new Map()
-const loadingInstance: LoadingInstance = {
-    target: null,
-    count: 0
-}
-const VITE_FLAG = import.meta.env.VITE_NAME == 'removeMode'
-// console.log('🚀 ~ import.meta.env.VITE_NAME:', import.meta.env.VITE_NAME)
-/**
- * 根据运行环境获取基础请求URL
- */
-export const getUrl = (): string => {
-    return '/api'
-}
-function removeBeforeSecondSlash(str: string) {
-    // 找到第一个斜杠的位置
-    const firstSlashIndex = str.indexOf('/')
-    if (firstSlashIndex === -1) {
-        // 如果没有斜杠，返回原字符串
-        return str
-    }
-    // 从第一个斜杠之后开始找第二个斜杠
-    const secondSlashIndex = str.indexOf('/', firstSlashIndex + 1)
-    if (secondSlashIndex === -1) {
-        // 如果只有一个斜杠，返回原字符串
-        return str
-    }
-    // 返回第二个斜杠及之后的内容
-    return str.substring(secondSlashIndex)
-}
-/**
- * 创建`Axios`
- * 默认开启`reductDataFormat(简洁响应)`,返回类型为`ApiPromise`
- * 关闭`reductDataFormat`,返回类型则为`AxiosPromise`
- */
-function createAxios<Data = any, T = ApiPromise<Data>>(
-    axiosConfig: AxiosRequestConfig,
-    options: Options = {},
-    loading: LoadingOptions = {}
-): T {
-    const adminInfo = useAdminInfo()
-
-    const Axios = axios.create({
-        baseURL: getUrl(),
-        timeout: 1000 * 60 * 5,
-        headers: {},
-        responseType: 'json'
-    })
-
-    options = Object.assign(
-        {
-            CancelDuplicateRequest: true, // 是否开启取消重复请求, 默认为 true
-            loading: false, // 是否开启loading层效果, 默认为false
-            reductDataFormat: true, // 是否开启简洁的数据结构响应, 默认为true
-            showErrorMessage: true, // 是否开启接口错误信息展示,默认为true
-            showCodeMessage: true, // 是否开启code不为1时的信息提示, 默认为true
-            showSuccessMessage: false, // 是否开启code为1时的信息提示, 默认为false
-            anotherToken: '' // 当前请求使用另外的用户token
-        },
-        options
-    )
-
-    // 请求拦截
-    Axios.interceptors.request.use(
-        async (config: any) => {
-            //嵌入去除所有请求头
-            if (VITE_FLAG) {
-                config.url = await removeBeforeSecondSlash(config.url)
-            }
-
-            // 取消重复请求
-
-            if (
-                !(
-                    config.url == '/system-boot/file/upload' ||
-                    config.url == '/harmonic-boot/grid/getAssessOverview' ||
-                    config.url == '/system-boot/file/getFileVO' ||
-                    config.url == '/harmonic-boot/gridDiagram/getGridDiagramAreaData'
-                )
-            )
-                removePending(config)
-
-            options.CancelDuplicateRequest && addPending(config)
-            // 创建loading实例
-            if (options.loading) {
-                loadingInstance.count++
-                if (loadingInstance.count === 1) {
-                    loadingInstance.target = ElLoading.service(loading)
-                }
-            }
-            // 自动携带token
-            if (config.headers) {
-                const token = adminInfo.getToken()
-                if (token) {
-                    ;(config.headers as anyObj).Authorization = token
-                } else {
-                    config.headers.Authorization = 'Basic bmpjbnRlc3Q6bmpjbnBxcw=='
-                }
-            }
-            if (config.url == '/user-boot/user/generateSm2Key' || config.url == '/pqs-auth/oauth/token') {
-                config.headers.Authorization = 'Basic bmpjbnRlc3Q6bmpjbnBxcw=='
-            }
-
-            return config
-        },
-        error => {
-            return Promise.reject(error)
-        }
-    )
-
-    // 响应拦截
-    Axios.interceptors.response.use(
-        response => {
-            removePending(response.config)
-            options.loading && closeLoading(options) // 关闭loading
-
-            if (
-                response.data.code === 'A0000' ||
-                response.data.type === 'application/json' ||
-                Array.isArray(response.data) ||
-                response.data.size ||
-                response.config.url == '/harmonic-boot/exportmodel/exportModelJB' ||
-                response.config.url == '/system-boot/file/download' ||
-                response.config.url == '/harmonic-boot/powerStatistics/exportExcelListTemplate' ||
-                response.config.url == '/harmonic-boot/powerStatistics/exportExcelRangTemplate'
-                // ||
-                // response.data.type === 'application/octet-stream' ||
-                // response.data.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-            ) {
-                return options.reductDataFormat ? response.data : response
-            } else if (response.data.code == 'A0202') {
-                if (!window.tokenRefreshing) {
-                    window.tokenRefreshing = true
-
-                    return refreshToken()
-                        .then(res => {
-                            adminInfo.setToken(res.data.access_token, 'auth')
-                            window.requests.forEach(cb => cb(res.data.access_token))
-                            window.requests = []
-
-                            return Axios(response.config)
-                        })
-                        .catch(err => {
-                            adminInfo.removeToken()
-                            router.push({ name: 'login' })
-                            return Promise.reject(err)
-                        })
-                        .finally(() => {
-                            window.tokenRefreshing = false
-                        })
-                } else {
-                    return new Promise(resolve => {
-                        // 用函数形式将 resolve 存入，等待刷新后再执行
-                        window.requests.push((token: string) => {
-                            response.headers.Authorization = `${token}`
-                            resolve(Axios(response.config))
-                        })
-                    })
-                }
-            } else if (response.data.code == 'A0024' || response.data.code == 'null') {
-                // // 登录失效
-                // 清除上一次的定时器
-                if (loginExpireTimer) {
-                    clearTimeout(loginExpireTimer)
-                }
-                loginExpireTimer = setTimeout(() => {
-                    ElNotification({
-                        type: 'error',
-                        message: response.data.message
-                    })
-                    adminInfo.removeToken()
-                    router.push({ name: 'login' })
-                    loginExpireTimer = null // 执行后清空定时器
-                }, 100) // 可根据实际情况调整延迟时间
-                return Promise.reject(response.data)
-            } else {
-                if (options.showCodeMessage) {
-                    ElNotification({
-                        type: 'error',
-                        message: response.data.message || '未知错误'
-                    })
-                }
-                return Promise.reject(response.data)
-            }
-        },
-        error => {
-            error.config && removePending(error.config)
-            options.loading && closeLoading(options) // 关闭loading
-            return Promise.reject(error) // 错误继续返回给到具体页面
-        }
-    )
-    return Axios(axiosConfig) as T
-}
-
-export default createAxios
-
-/**
- * 关闭Loading层实例
- */
-function closeLoading(options: Options) {
-    if (options.loading && loadingInstance.count > 0) loadingInstance.count--
-    if (loadingInstance.count === 0) {
-        loadingInstance.target.close()
-        loadingInstance.target = null
-    }
-}
-
-/**
- * 储存每个请求的唯一cancel回调, 以此为标识
- */
-function addPending(config: AxiosRequestConfig) {
-    const pendingKey = getPendingKey(config)
-    config.cancelToken =
-        config.cancelToken ||
-        new axios.CancelToken(cancel => {
-            if (!pendingMap.has(pendingKey)) {
-                pendingMap.set(pendingKey, cancel)
-            }
-        })
-}
-
-/**
- * 删除重复的请求
- */
-function removePending(config: AxiosRequestConfig) {
-    const pendingKey = getPendingKey(config)
-    if (pendingMap.has(pendingKey)) {
-        const cancelToken = pendingMap.get(pendingKey)
-        cancelToken(pendingKey)
-        pendingMap.delete(pendingKey)
-    }
-}
-
-/**
- * 生成每个请求的唯一key
- */
-function getPendingKey(config: AxiosRequestConfig) {
-    let { data } = config
-    const { url, method, params, headers } = config
-    if (typeof data === 'string') data = JSON.parse(data) // response里面返回的config.data是个字符串对象
-    return [
-        url,
-        method,
-        headers && (headers as anyObj).Authorization ? (headers as anyObj).Authorization : '',
-        headers && (headers as anyObj)['ba-user-token'] ? (headers as anyObj)['ba-user-token'] : '',
-        JSON.stringify(params),
-        JSON.stringify(data)
-    ].join('&')
-}
-
-/**
- * 根据请求方法组装请求数据/参数
- */
-export function requestPayload(method: Method, data: anyObj, paramsPOST: boolean) {
-    if (method == 'GET') {
-        return {
-            params: data
-        }
-    } else if (method == 'POST') {
-        if (paramsPOST) {
-            return { params: data }
-        } else {
-            return { data: data }
-        }
-    }
-}
-// 适配器, 用于适配不同的请求方式
-export function baseRequest(url, value = {}, method = 'post', options = {}) {
-    url = sysConfig.API_URL + url
-    if (method === 'post') {
-        return service.post(url, value, options)
-    } else if (method === 'get') {
-        return service.get(url, { params: value, ...options })
-    } else if (method === 'formdata') {
-        // form-data表单提交的方式
-        return service.post(url, qs.stringify(value), {
-            headers: {
-                'Content-Type': 'multipart/form-data'
-            },
-            ...options
-        })
-    } else {
-        // 其他请求方式，例如：put、delete
-        return service({
-            method: method,
-            url: url,
-            data: value,
-            ...options
-        })
-    }
-}
-// 模块内的请求, 会自动加上模块的前缀
-export const moduleRequest =
-    moduleUrl =>
-    (url, ...arg) => {
-        return baseRequest(moduleUrl + url, ...arg)
-    }
-
-interface LoadingInstance {
-    target: any
-    count: number
-}
-
-interface Options {
-    // 是否开启取消重复请求, 默认为 true
-    CancelDuplicateRequest?: boolean
-    // 是否开启loading层效果, 默认为false
-    loading?: boolean
-    // 是否开启简洁的数据结构响应, 默认为true
-    reductDataFormat?: boolean
-    // 是否开启code不为A0000时的信息提示, 默认为true
-    showCodeMessage?: boolean
-    // 是否开启code为0时的信息提示, 默认为false
-    showSuccessMessage?: boolean
-    // 当前请求使用另外的用户token
-    anotherToken?: string
-}
+import type { AxiosRequestConfig, Method } from 'axios'
+import axios from 'axios'
+import { ElLoading, ElNotification, type LoadingOptions } from 'element-plus'
+import { refreshToken } from '@/api/user-boot/user'
+import router from '@/router/index'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { debounce } from 'lodash-es'
+let loginExpireTimer: any = null
+window.requests = []
+window.tokenRefreshing = false
+const pendingMap = new Map()
+const loadingInstance: LoadingInstance = {
+    target: null,
+    count: 0
+}
+const VITE_FLAG = import.meta.env.VITE_NAME == 'removeMode'
+// console.log('🚀 ~ import.meta.env.VITE_NAME:', import.meta.env.VITE_NAME)
+/**
+ * 根据运行环境获取基础请求URL
+ */
+export const getUrl = (): string => {
+    return '/api'
+}
+function removeBeforeSecondSlash(str: string) {
+    // 找到第一个斜杠的位置
+    const firstSlashIndex = str.indexOf('/')
+    if (firstSlashIndex === -1) {
+        // 如果没有斜杠，返回原字符串
+        return str
+    }
+    // 从第一个斜杠之后开始找第二个斜杠
+    const secondSlashIndex = str.indexOf('/', firstSlashIndex + 1)
+    if (secondSlashIndex === -1) {
+        // 如果只有一个斜杠，返回原字符串
+        return str
+    }
+    // 返回第二个斜杠及之后的内容
+    return str.substring(secondSlashIndex)
+}
+/**
+ * 创建`Axios`
+ * 默认开启`reductDataFormat(简洁响应)`,返回类型为`ApiPromise`
+ * 关闭`reductDataFormat`,返回类型则为`AxiosPromise`
+ */
+function createAxios<Data = any, T = ApiPromise<Data>>(
+    axiosConfig: AxiosRequestConfig,
+    options: Options = {},
+    loading: LoadingOptions = {}
+): T {
+    const adminInfo = useAdminInfo()
+
+    const Axios = axios.create({
+        baseURL: getUrl(),
+        timeout: 1000 * 60 * 5,
+        headers: {},
+        responseType: 'json'
+    })
+
+    options = Object.assign(
+        {
+            CancelDuplicateRequest: true, // 是否开启取消重复请求, 默认为 true
+            loading: false, // 是否开启loading层效果, 默认为false
+            reductDataFormat: true, // 是否开启简洁的数据结构响应, 默认为true
+            showErrorMessage: true, // 是否开启接口错误信息展示,默认为true
+            showCodeMessage: true, // 是否开启code不为1时的信息提示, 默认为true
+            showSuccessMessage: false, // 是否开启code为1时的信息提示, 默认为false
+            anotherToken: '' // 当前请求使用另外的用户token
+        },
+        options
+    )
+
+    // 请求拦截
+    Axios.interceptors.request.use(
+        async (config: any) => {
+            //嵌入去除所有请求头
+            if (VITE_FLAG) {
+                config.url = await removeBeforeSecondSlash(config.url)
+            }
+
+            // 取消重复请求
+
+            if (
+                !(
+                    config.url == '/system-boot/file/upload' ||
+                    config.url == '/harmonic-boot/grid/getAssessOverview' ||
+                    config.url == '/system-boot/file/getFileVO' ||
+                    config.url == '/harmonic-boot/gridDiagram/getGridDiagramAreaData' ||
+                    config.url == '/supervision-boot/userReport/bindAssessmentId'
+                )
+            )
+                removePending(config)
+
+            options.CancelDuplicateRequest && addPending(config)
+            // 创建loading实例
+            if (options.loading) {
+                loadingInstance.count++
+                if (loadingInstance.count === 1) {
+                    loadingInstance.target = ElLoading.service(loading)
+                }
+            }
+            // 自动携带token
+            if (config.headers) {
+                const token = adminInfo.getToken()
+                if (token) {
+                    ;(config.headers as anyObj).Authorization = token
+                } else {
+                    config.headers.Authorization = 'Basic bmpjbnRlc3Q6bmpjbnBxcw=='
+                }
+            }
+            if (config.url == '/user-boot/user/generateSm2Key' || config.url == '/pqs-auth/oauth/token') {
+                config.headers.Authorization = 'Basic bmpjbnRlc3Q6bmpjbnBxcw=='
+            }
+
+            return config
+        },
+        error => {
+            return Promise.reject(error)
+        }
+    )
+
+    // 响应拦截
+    Axios.interceptors.response.use(
+        response => {
+            removePending(response.config)
+            options.loading && closeLoading(options) // 关闭loading
+
+            if (
+                response.data.code === 'A0000' ||
+                response.data.type === 'application/json' ||
+                Array.isArray(response.data) ||
+                response.data.size ||
+                response.config.url == '/harmonic-boot/exportmodel/exportModelJB' ||
+                response.config.url == '/system-boot/file/download' ||
+                response.config.url == '/harmonic-boot/powerStatistics/exportExcelListTemplate' ||
+                response.config.url == '/harmonic-boot/powerStatistics/exportExcelRangTemplate'
+                // ||
+                // response.data.type === 'application/octet-stream' ||
+                // response.data.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+            ) {
+                return options.reductDataFormat ? response.data : response
+            } else if (response.data.code == 'A0202') {
+                if (!window.tokenRefreshing) {
+                    window.tokenRefreshing = true
+
+                    return refreshToken()
+                        .then(res => {
+                            adminInfo.setToken(res.data.access_token, 'auth')
+                            window.requests.forEach(cb => cb(res.data.access_token))
+                            window.requests = []
+
+                            return Axios(response.config)
+                        })
+                        .catch(err => {
+                            adminInfo.removeToken()
+                            router.push({ name: 'login' })
+                            return Promise.reject(err)
+                        })
+                        .finally(() => {
+                            window.tokenRefreshing = false
+                        })
+                } else {
+                    return new Promise(resolve => {
+                        // 用函数形式将 resolve 存入，等待刷新后再执行
+                        window.requests.push((token: string) => {
+                            response.headers.Authorization = `${token}`
+                            resolve(Axios(response.config))
+                        })
+                    })
+                }
+            } else if (response.data.code == 'A0024' || response.data.code == 'null') {
+                // // 登录失效
+                // 清除上一次的定时器
+                if (loginExpireTimer) {
+                    clearTimeout(loginExpireTimer)
+                }
+                loginExpireTimer = setTimeout(() => {
+                    ElNotification({
+                        type: 'error',
+                        message: response.data.message
+                    })
+                    adminInfo.removeToken()
+                    router.push({ name: 'login' })
+                    loginExpireTimer = null // 执行后清空定时器
+                }, 100) // 可根据实际情况调整延迟时间
+                return Promise.reject(response.data)
+            } else {
+                if (options.showCodeMessage) {
+                    ElNotification({
+                        type: 'error',
+                        message: response.data.message || '未知错误'
+                    })
+                }
+                return Promise.reject(response.data)
+            }
+        },
+        error => {
+            error.config && removePending(error.config)
+            options.loading && closeLoading(options) // 关闭loading
+            return Promise.reject(error) // 错误继续返回给到具体页面
+        }
+    )
+    return Axios(axiosConfig) as T
+}
+
+export default createAxios
+
+/**
+ * 关闭Loading层实例
+ */
+function closeLoading(options: Options) {
+    if (options.loading && loadingInstance.count > 0) loadingInstance.count--
+    if (loadingInstance.count === 0) {
+        loadingInstance.target.close()
+        loadingInstance.target = null
+    }
+}
+
+/**
+ * 储存每个请求的唯一cancel回调, 以此为标识
+ */
+function addPending(config: AxiosRequestConfig) {
+    const pendingKey = getPendingKey(config)
+    config.cancelToken =
+        config.cancelToken ||
+        new axios.CancelToken(cancel => {
+            if (!pendingMap.has(pendingKey)) {
+                pendingMap.set(pendingKey, cancel)
+            }
+        })
+}
+
+/**
+ * 删除重复的请求
+ */
+function removePending(config: AxiosRequestConfig) {
+    const pendingKey = getPendingKey(config)
+    if (pendingMap.has(pendingKey)) {
+        const cancelToken = pendingMap.get(pendingKey)
+        cancelToken(pendingKey)
+        pendingMap.delete(pendingKey)
+    }
+}
+
+/**
+ * 生成每个请求的唯一key
+ */
+function getPendingKey(config: AxiosRequestConfig) {
+    let { data } = config
+    const { url, method, params, headers } = config
+    if (typeof data === 'string') data = JSON.parse(data) // response里面返回的config.data是个字符串对象
+    return [
+        url,
+        method,
+        headers && (headers as anyObj).Authorization ? (headers as anyObj).Authorization : '',
+        headers && (headers as anyObj)['ba-user-token'] ? (headers as anyObj)['ba-user-token'] : '',
+        JSON.stringify(params),
+        JSON.stringify(data)
+    ].join('&')
+}
+
+/**
+ * 根据请求方法组装请求数据/参数
+ */
+export function requestPayload(method: Method, data: anyObj, paramsPOST: boolean) {
+    if (method == 'GET') {
+        return {
+            params: data
+        }
+    } else if (method == 'POST') {
+        if (paramsPOST) {
+            return { params: data }
+        } else {
+            return { data: data }
+        }
+    }
+}
+// 适配器, 用于适配不同的请求方式
+export function baseRequest(url, value = {}, method = 'post', options = {}) {
+    url = sysConfig.API_URL + url
+    if (method === 'post') {
+        return service.post(url, value, options)
+    } else if (method === 'get') {
+        return service.get(url, { params: value, ...options })
+    } else if (method === 'formdata') {
+        // form-data表单提交的方式
+        return service.post(url, qs.stringify(value), {
+            headers: {
+                'Content-Type': 'multipart/form-data'
+            },
+            ...options
+        })
+    } else {
+        // 其他请求方式，例如：put、delete
+        return service({
+            method: method,
+            url: url,
+            data: value,
+            ...options
+        })
+    }
+}
+// 模块内的请求, 会自动加上模块的前缀
+export const moduleRequest =
+    moduleUrl =>
+    (url, ...arg) => {
+        return baseRequest(moduleUrl + url, ...arg)
+    }
+
+interface LoadingInstance {
+    target: any
+    count: number
+}
+
+interface Options {
+    // 是否开启取消重复请求, 默认为 true
+    CancelDuplicateRequest?: boolean
+    // 是否开启loading层效果, 默认为false
+    loading?: boolean
+    // 是否开启简洁的数据结构响应, 默认为true
+    reductDataFormat?: boolean
+    // 是否开启code不为A0000时的信息提示, 默认为true
+    showCodeMessage?: boolean
+    // 是否开启code为0时的信息提示, 默认为false
+    showSuccessMessage?: boolean
+    // 当前请求使用另外的用户token
+    anotherToken?: string
+}

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/bearingCapacity/userManagement/index.vue

@@ -56,8 +56,10 @@
                     </el-form-item>
 
                     <el-form-item label="区域" prop="regionList">
-                        <el-cascader v-model="form.regionList" style="width: 100%" :props="props" :options="areaList" />
+                        <!-- <el-cascader v-model="form.regionList" style="width: 100%" :props="props" :options="areaList" /> -->
+                        <el-cascader v-model="form.regionList" :props="props" :options="areaList"  style="width: 100%"  placeholder="请选择区域" />
                     </el-form-item>
+                 
                     <el-form-item label="详细地址：" prop="area">
                         <el-input
                             clearable
@@ -93,6 +95,8 @@ import { mainHeight } from '@/utils/layout'
 import { useDictData } from '@/stores/dictData'
 import equipment from './equipment.vue'
 import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity'
+import { getAreaDept } from '@/api/harmonic-boot/area'
+
 defineOptions({
     name: 'estimate/photovoltaic'
 })
@@ -104,7 +108,8 @@ const disabled = ref(false)
 const TableHeaderRef = ref()
 const equipmentRef = ref()
 const title = ref('')
-const areaList: any = dictData.areaSelect()
+//const areaList: any = dictData.areaSelect()
+const areaList = ref([])
 const userShow: any = ref('Power_Station_Users')
 
 const form = ref({
@@ -263,14 +268,20 @@ tableStore.table.params.userType = ''
 provide('tableStore', tableStore)
 onMounted(() => {
     tableStore.index()
+
+
 })
 const useChange = (e: string) => {
     userShow.value = uesrList.filter(item => item.id == e)[0].code
 }
 // 新增
-const add = () => {
+const add = async () => {
     disabled.value = false
     title.value = '新增承载能力待评估用户'
+
+    await getAreaDept().then(res => {
+        areaList.value = JSON.parse(JSON.stringify(res.data))
+    })
     dialogVisible.value = true
 }
 // 保存

src/views/pqs/business/terminal/FrontManagement/index.vue

@@ -218,6 +218,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { ElButton } from 'element-plus'
 import { mainHeight } from '@/utils/layout'
 import Bind from './bind.vue'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'hainan'
 defineOptions({
     name: 'BusinessAdministrator/TerminalManagement/FrontManagement'
 })
@@ -332,29 +333,32 @@ const tableStore = new TableStore({
                         formData.value = JSON.parse(JSON.stringify(row))
                     }
                 },
-                // {
-                //     name: 'edit',
-                //     title: '重启',
-                //     type: 'warning',
-                //     icon: 'el-icon-Delete',
-                //     render: 'confirmButton',
-                //     popconfirm: {
-                //         confirmButtonText: '确认',
-                //         cancelButtonText: '取消',
-                //         confirmButtonType: 'warning',
-                //         title: '确定重启吗？'
-                //     },
-                //     click: row => {
-                //         askRestartProcess({
-                //             deviceRebootType: null,
-                //             nodeId: row.id,
-                //             processNo: 1
-                //         }).then(res => {
-                //             ElMessage.success('重启成功')
-                //             tableStore.index()
-                //         })
-                //     }
-                // },
+                {
+                    name: 'edit',
+                    title: '重启',
+                    type: 'warning',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    disabled: row => {
+                        return VITE_FLAG
+                    },
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'warning',
+                        title: '确定重启吗？'
+                    },
+                    click: row => {
+                        askRestartProcess({
+                            deviceRebootType: null,
+                            nodeId: row.id,
+                            processNo: 1
+                        }).then(res => {
+                            ElMessage.success('重启成功')
+                            tableStore.index()
+                        })
+                    }
+                },
 
                 {
                     name: 'del',

src/views/pqs/business/terminal/userLedger/components/detail.vue

@@ -1,5 +1,9 @@
 <template>
     <div class="default-main">
+         <div v-if="detailLoading" class="loading">
+            <el-spin description="加载中..." />
+        </div>
+        <div v-else>
         <el-descriptions :column="2" border>
             <el-descriptions-item label="所在地市">
                 {{ detailData.city }}
@@ -208,6 +212,7 @@
                 }}
             </el-descriptions-item>
         </el-descriptions>
+        </div>
     </div>
 </template>
 <script lang="ts" setup>

src/views/pqs/database/algorithm/components/addTree.vue

@@ -1,96 +1,96 @@
-<template>
-    <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" :title="title" width="700px">
-        <el-scrollbar>
-            <el-form :inline="false" :model="form" label-width="auto" :rules="rules" ref="formRef">
-                <el-form-item label="上级名称">
-                    <!-- <el-input v-model="form.pid" placeholder="上级名称" /> -->
-                    <el-tree-select
-                        v-model="form.pid"
-                        :data="dataTree"
-                        check-strictly
-                        clearable
-                        default-expand-all
-                        :render-after-expand="false"
-                        :props="defaultProps"
-                    />
-                </el-form-item>
-                <el-form-item label="名称" prop="name">
-                    <el-input v-model="form.name" placeholder="名称" />
-                </el-form-item>
-            </el-form>
-        </el-scrollbar>
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="dialogVisible = false">取消</el-button>
-                <el-button type="primary" @click="submit">确认</el-button>
-            </span>
-        </template>
-    </el-dialog>
-</template>
-<script lang="ts" setup>
-import { ref, inject } from 'vue'
-import { reactive } from 'vue'
-import { ElMessage } from 'element-plus'
-import { queryAllAlgorithmLibrary, addAlgorithm } from '@/api/supervision-boot/database/index'
-const dialogVisible = ref(false)
-const title = ref('')
-const emit = defineEmits(['getTree'])
-const formRef = ref()
-// 注意不要和表单ref的命名冲突
-const form = reactive<anyObj>({
-    name: '',
-    pid: ''
-})
-const defaultProps = {
-    children: 'children',
-    label: 'name',
-    value: 'id'
-}
-const rules = {
-    name: [{ required: true, message: '请输入名称', trigger: 'blur' }]
-}
-const dataTree = ref([])
-const open = (text: string, data?: anyObj) => {
-    getTheTree()
-    title.value = text
-    dialogVisible.value = true
-    if (data) {
-        // 表单赋值
-        for (let key in form) {
-            form[key] = data[key]
-        }
-    } else {
-        // 在此处恢复默认表单
-        for (let key in form) {
-            form[key] = ''
-        }
-    }
-}
-const getTheTree = () => {
-    queryAllAlgorithmLibrary().then(res => {
-        res.data.forEach((item: any) => {
-            item.children.forEach((item2: any) => {
-                item2.childrens = item2.children
-                item2.children = []
-            })
-        })
-        dataTree.value = res.data
-    })
-}
-const submit = () => {
-    formRef.value.validate(async (valid: boolean) => {
-        if (valid) {
-            addAlgorithm({
-                pid: form.pid.length == 0 ? '' : form.pid,
-                name: form.name
-            }).then(res => {
-                ElMessage.success('新增成功')
-                emit('getTree')
-                dialogVisible.value = false
-            })
-        }
-    })
-}
-
-defineExpose({ open })
-</script>
+<template>
+    <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" :title="title" width="700px">
+        <el-scrollbar>
+            <el-form :inline="false" :model="form" label-width="auto" :rules="rules" ref="formRef">
+                <el-form-item label="上级名称">
+                    <!-- <el-input v-model="form.pid" placeholder="上级名称" /> -->
+                    <el-tree-select
+                        v-model="form.pid"
+                        :data="dataTree"
+                        check-strictly
+                        clearable
+                        default-expand-all
+                        :render-after-expand="false"
+                        :props="defaultProps"
+                    />
+                </el-form-item>
+                <el-form-item label="名称" prop="name">
+                    <el-input v-model="form.name" placeholder="名称" />
+                </el-form-item>
+            </el-form>
+        </el-scrollbar>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject } from 'vue'
+import { reactive } from 'vue'
+import { ElMessage } from 'element-plus'
+import { queryAllAlgorithmLibrary, addAlgorithm } from '@/api/supervision-boot/database/index'
+const dialogVisible = ref(false)
+const title = ref('')
+const emit = defineEmits(['getTree'])
+const formRef = ref()
+// 注意不要和表单ref的命名冲突
+const form = reactive<anyObj>({
+    name: '',
+    pid: ''
+})
+const defaultProps = {
+    children: 'children',
+    label: 'name',
+    value: 'id'
+}
+const rules = {
+    name: [{ required: true, message: '请输入名称', trigger: 'blur' }]
+}
+const dataTree = ref([])
+const open = (text: string, data?: anyObj) => {
+    getTheTree()
+    title.value = text
+    dialogVisible.value = true
+    if (data) {
+        // 表单赋值
+        for (let key in form) {
+            form[key] = data[key]
+        }
+    } else {
+        // 在此处恢复默认表单
+        for (let key in form) {
+            form[key] = ''
+        }
+    }
+}
+const getTheTree = () => {
+    queryAllAlgorithmLibrary().then(res => {
+        res.data.forEach((item: any) => {
+            item.children.forEach((item2: any) => {
+                item2.childrens = item2.children
+                item2.children = []
+            })
+        })
+        dataTree.value = res.data
+    })
+}
+const submit = () => {
+    formRef.value.validate(async (valid: boolean) => {
+        if (valid) {
+            addAlgorithm({
+                pid: form.pid.length == 0 ? '' : form.pid,
+                name: form.name
+            }).then(res => {
+                ElMessage.success('新增成功')
+                emit('getTree')
+                dialogVisible.value = false
+            })
+        }
+    })
+}
+
+defineExpose({ open })
+</script>

src/views/pqs/database/algorithm/components/form.vue

@@ -1,190 +1,190 @@
-<template>
-    <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" :title="title" width="1200px">
-
-        <el-form :model="form" label-width="120px" class="form-two" :rules="rules" ref="formRef">
-            <el-form-item :label="title == '修改算法' ? '选择修改的数据' : '选择父级'" :prop="title == '修改算法' ? 'pid' : ''">
-                <el-tree-select v-model="form.pid" :data="dataTree" check-strictly clearable filterable
-                    @node-click="changeTree" default-expand-all :render-after-expand="false" :props="defaultProps"
-                    @clear="TreeList = {}" />
-            </el-form-item>
-            <el-form-item label="名称" prop="name" v-if="title == '修改算法' ? TreeList.level != 4 : TreeList.level != 3">
-                <el-input v-model="form.name" placeholder="名称" clearable maxlength="32" show-word-limit @input="handleInput('name', $event)"/>
-            </el-form-item>
-            <!-- <div v-if="title == '修改算法' ? TreeList.level == 4 : TreeList.level == 3"> -->
-            <el-form-item label="算法名称" prop="name" v-if="title == '修改算法' ? TreeList.level == 4 : TreeList.level == 3">
-                <el-input v-model="form.name" placeholder="请输入算法名称" clearable maxlength="32" show-word-limit @input="handleInput('name', $event)"/>
-            </el-form-item>
-            <el-form-item label="计算周期" prop="period" v-if="title == '修改算法' ? TreeList.level == 4 : TreeList.level == 3">
-                <el-select v-model="form.period" placeholder="请选择计算周期" clearable>
-                    <el-option v-for="item in cycle" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>
-            </el-form-item>
-            <el-form-item label="数据来源" prop="source" v-if="title == '修改算法' ? TreeList.level == 4 : TreeList.level == 3">
-                <el-input v-model="form.source" placeholder="请输入数据来源" clearable maxlength="32" show-word-limit @input="handleInput('source', $event)"/>
-            </el-form-item>
-            <!-- <el-form-item label="定义" prop="definition" style="width: 100%;" v-if="title == '修改算法' ? TreeList.level == 4 : TreeList.level == 3">
-                      
-                        <editor v-model="form.definition" />
-                    </el-form-item> -->
-            <!-- </div> -->
-        </el-form>
-        <div style="display: flex" v-if="title == '修改算法' ? TreeList.level == 4 : TreeList.level == 3">
-            <div style="width: 140px;margin-right: -20px;text-align: center;flex-shrink: 0;">定义</div>
-            <editor v-model="form.definition" />
-        </div>
-
-        <template #footer>
-            <span class="dialog-footer">
-                <el-button @click="dialogVisible = false">取消</el-button>
-                <el-button type="primary" @click="submit" v-loading="loading">确认</el-button>
-            </span>
-        </template>
-    </el-dialog>
-</template>
-<script lang="ts" setup>
-import { ref, nextTick } from 'vue'
-import { reactive } from 'vue'
-import { ElMessage } from 'element-plus'
-import { queryAllAlgorithmLibrary, addAlgorithm, updateAlgorithmLibrary } from '@/api/supervision-boot/database/index'
-import editor from '@/components/wangEditor/index.vue'
-const emit = defineEmits(['getTree'])
-const dialogVisible = ref(false)
-const title = ref('')
-const formRef = ref()
-const loading = ref(false)
-const dataTree = ref([])
-const key = ref(0)
-const TreeList: any = ref({})
-const List = ref({})
-const defaultProps = {
-    children: 'children',
-    label: 'name',
-    value: 'id'
-}
-// 注意不要和表单ref的命名冲突
-const form = reactive<anyObj>({
-    name: '',
-    period: '',
-    definition: '',
-    source: '',
-    pid: ''
-})
-const rules = {
-    name: [{ required: true, message: '请输入算法名称', trigger: 'blur' }],
-    period: [{ required: true, message: '请选择计算周期', trigger: 'change' }],
-    pid: [{ required: true, message: '请选择数据', trigger: 'change' }],
-    definition: [{ required: true, message: '请输入定义', trigger: 'blur' }],
-    source: [{ required: true, message: '请输入数据来源', trigger: 'blur' }]
-}
-const cycle = [
-    { value: '0', label: '日' },
-    { value: '1', label: '月' },
-    { value: '2', label: '季' },
-    { value: '3', label: '年' }
-]
-const changeTree = (row: any) => {
-    console.log("🚀 ~ changeTree ~ row:", row)
-    TreeList.value = row
-    if (title.value == '修改算法') {
-        if (row.level != 4) {
-            form.name = row.name
-
-        } else {
-            for (let key in form) {
-                form[key] = row[key]
-            }
-        }
-
-        form.id = row.id
-        key.value += 1
-    }
-}
-
-const open = (row: any) => {
-    title.value = row.title
-    dialogVisible.value = true
-    List.value = row.row
-    getTheTree()
-    // 在此处恢复默认表单
-    nextTick(() => {
-        for (let key in form) {
-            form[key] = ''
-        }
-        if (row.title == '修改算法') {
-
-            form.pid = row.row.id
-            TreeList.value = row.row
-            changeTree(row.row)
-
-            // row.row
-        }
-    })
-    formRef.value?.resetFields()
-}
-const submit = async () => {
-    loading.value = true
-    formRef.value.validate(async (valid: boolean) => {
-        if (valid) {
-            if (title.value == '新增算法') {
-                let forms: any = {}
-                if (TreeList.value.level == 3) {
-                    forms = form
-                } else {
-                    forms.name = form.name
-                    forms.pid = form.pid
-                }
-                await addAlgorithm(forms).then(res => {
-                    ElMessage.success('新增成功')
-                    dialogVisible.value = false
-                    emit('getTree')
-                })
-            } else {
-                let forms: any = {}
-                if (TreeList.value.level == 4) {
-                    forms = JSON.parse(JSON.stringify(form))
-                } else {
-                    forms.name = form.name
-                    forms.id = form.id
-                }
-                forms.pid = null
-                await updateAlgorithmLibrary(forms).then(res => {
-                    ElMessage.success('修改成功')
-                    dialogVisible.value = false
-                    emit('getTree')
-                })
-            }
-        }
-    })
-    await setTimeout(() => {
-
-        loading.value = false
-    }, 0)
-}
-const getTheTree = () => {
-    queryAllAlgorithmLibrary().then(res => {
-        res.data.forEach((item: any) => {
-            item.children.forEach((item2: any) => {
-                item2.children.forEach((item3: any) => {
-                    if (title.value != '修改算法') {
-                        item3.childrens = item3.children
-                        item3.children = []
-                    }
-                })
-            })
-        })
-
-        dataTree.value = res.data
-    })
-}
-
-
-const handleInput = (field: string, value: string) => {
-    // 过滤空格
-    const filteredValue = value.replace(/\s/g, '')
-    if (filteredValue !== value) {
-        form[field] = filteredValue
-    }
-}
-
-defineExpose({ open })
-</script>
+<template>
+    <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" :title="title" width="1200px">
+
+        <el-form :model="form" label-width="120px" class="form-two" :rules="rules" ref="formRef">
+            <el-form-item :label="title == '修改算法' ? '选择修改的数据' : '选择父级'" :prop="title == '修改算法' ? 'pid' : ''">
+                <el-tree-select v-model="form.pid" :data="dataTree" check-strictly clearable filterable
+                    @node-click="changeTree" default-expand-all :render-after-expand="false" :props="defaultProps"
+                    @clear="TreeList = {}" />
+            </el-form-item>
+            <el-form-item label="名称" prop="name" v-if="title == '修改算法' ? TreeList.level != 4 : TreeList.level != 3">
+                <el-input v-model="form.name" placeholder="名称" clearable maxlength="32" show-word-limit @input="handleInput('name', $event)"/>
+            </el-form-item>
+            <!-- <div v-if="title == '修改算法' ? TreeList.level == 4 : TreeList.level == 3"> -->
+            <el-form-item label="算法名称" prop="name" v-if="title == '修改算法' ? TreeList.level == 4 : TreeList.level == 3">
+                <el-input v-model="form.name" placeholder="请输入算法名称" clearable maxlength="32" show-word-limit @input="handleInput('name', $event)"/>
+            </el-form-item>
+            <el-form-item label="计算周期" prop="period" v-if="title == '修改算法' ? TreeList.level == 4 : TreeList.level == 3">
+                <el-select v-model="form.period" placeholder="请选择计算周期" clearable>
+                    <el-option v-for="item in cycle" :key="item.value" :label="item.label" :value="item.value" />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="数据来源" prop="source" v-if="title == '修改算法' ? TreeList.level == 4 : TreeList.level == 3">
+                <el-input v-model="form.source" placeholder="请输入数据来源" clearable maxlength="32" show-word-limit @input="handleInput('source', $event)"/>
+            </el-form-item>
+            <!-- <el-form-item label="定义" prop="definition" style="width: 100%;" v-if="title == '修改算法' ? TreeList.level == 4 : TreeList.level == 3">
+                      
+                        <editor v-model="form.definition" />
+                    </el-form-item> -->
+            <!-- </div> -->
+        </el-form>
+        <div style="display: flex" v-if="title == '修改算法' ? TreeList.level == 4 : TreeList.level == 3">
+            <div style="width: 140px;margin-right: -20px;text-align: center;flex-shrink: 0;">定义</div>
+            <editor v-model="form.definition" />
+        </div>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit" v-loading="loading">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, nextTick } from 'vue'
+import { reactive } from 'vue'
+import { ElMessage } from 'element-plus'
+import { queryAllAlgorithmLibrary, addAlgorithm, updateAlgorithmLibrary } from '@/api/supervision-boot/database/index'
+import editor from '@/components/wangEditor/index.vue'
+const emit = defineEmits(['getTree'])
+const dialogVisible = ref(false)
+const title = ref('')
+const formRef = ref()
+const loading = ref(false)
+const dataTree = ref([])
+const key = ref(0)
+const TreeList: any = ref({})
+const List = ref({})
+const defaultProps = {
+    children: 'children',
+    label: 'name',
+    value: 'id'
+}
+// 注意不要和表单ref的命名冲突
+const form = reactive<anyObj>({
+    name: '',
+    period: '',
+    definition: '',
+    source: '',
+    pid: ''
+})
+const rules = {
+    name: [{ required: true, message: '请输入算法名称', trigger: 'blur' }],
+    period: [{ required: true, message: '请选择计算周期', trigger: 'change' }],
+    pid: [{ required: true, message: '请选择数据', trigger: 'change' }],
+    definition: [{ required: true, message: '请输入定义', trigger: 'blur' }],
+    source: [{ required: true, message: '请输入数据来源', trigger: 'blur' }]
+}
+const cycle = [
+    { value: '0', label: '日' },
+    { value: '1', label: '月' },
+    { value: '2', label: '季' },
+    { value: '3', label: '年' }
+]
+const changeTree = (row: any) => {
+    console.log("🚀 ~ changeTree ~ row:", row)
+    TreeList.value = row
+    if (title.value == '修改算法') {
+        if (row.level != 4) {
+            form.name = row.name
+
+        } else {
+            for (let key in form) {
+                form[key] = row[key]
+            }
+        }
+
+        form.id = row.id
+        key.value += 1
+    }
+}
+
+const open = (row: any) => {
+    title.value = row.title
+    dialogVisible.value = true
+    List.value = row.row
+    getTheTree()
+    // 在此处恢复默认表单
+    nextTick(() => {
+        for (let key in form) {
+            form[key] = ''
+        }
+        if (row.title == '修改算法') {
+
+            form.pid = row.row.id
+            TreeList.value = row.row
+            changeTree(row.row)
+
+            // row.row
+        }
+    })
+    formRef.value?.resetFields()
+}
+const submit = async () => {
+    loading.value = true
+    formRef.value.validate(async (valid: boolean) => {
+        if (valid) {
+            if (title.value == '新增算法') {
+                let forms: any = {}
+                if (TreeList.value.level == 3) {
+                    forms = form
+                } else {
+                    forms.name = form.name
+                    forms.pid = form.pid
+                }
+                await addAlgorithm(forms).then(res => {
+                    ElMessage.success('新增成功')
+                    dialogVisible.value = false
+                    emit('getTree')
+                })
+            } else {
+                let forms: any = {}
+                if (TreeList.value.level == 4) {
+                    forms = JSON.parse(JSON.stringify(form))
+                } else {
+                    forms.name = form.name
+                    forms.id = form.id
+                }
+                forms.pid = null
+                await updateAlgorithmLibrary(forms).then(res => {
+                    ElMessage.success('修改成功')
+                    dialogVisible.value = false
+                    emit('getTree')
+                })
+            }
+        }
+    })
+    await setTimeout(() => {
+
+        loading.value = false
+    }, 0)
+}
+const getTheTree = () => {
+    queryAllAlgorithmLibrary().then(res => {
+        res.data.forEach((item: any) => {
+            item.children.forEach((item2: any) => {
+                item2.children.forEach((item3: any) => {
+                    if (title.value != '修改算法') {
+                        item3.childrens = item3.children
+                        item3.children = []
+                    }
+                })
+            })
+        })
+
+        dataTree.value = res.data
+    })
+}
+
+
+const handleInput = (field: string, value: string) => {
+    // 过滤空格
+    const filteredValue = value.replace(/\s/g, '')
+    if (filteredValue !== value) {
+        form[field] = filteredValue
+    }
+}
+
+defineExpose({ open })
+</script>

src/views/pqs/database/algorithm/index.vue

@@ -1,346 +1,59 @@
 <template>
-    <div class="default-main" :style="height">
-        <!-- 算法库 -->
-        <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
-            <pane :size="size">
-                <algorithmTree
-                    ref="treeRef"
-                    :default-expand-all="false"
-                    :default-expanded-keys="monitoringPoint.state.lineId ? [monitoringPoint.state.lineId] : []"
-                    :current-node-key="monitoringPoint.state.lineId"
-                    @node-click="handleNodeClick"
-                    @init="handleNodeClick"
-                    @onAddTree="onAddTree"
-                ></algorithmTree>
-            </pane>
-            <pane style="background: #fff" :style="height">
-                <div class="boxTop">
-                    <div>
-                        <el-radio-group v-model="radio">
-                            <el-radio-button v-for="(item, i) in dotList?.childrens" :label="item.name" :value="i" />
-                        </el-radio-group>
-                    </div>
-                    <div v-if="information">
-                        <el-button icon="el-icon-Plus" type="primary" @click="addUser">新增</el-button>
-                        <el-button icon="el-icon-Edit" type="primary" @click="revise">修改</el-button>
-                        <el-button icon="el-icon-Delete" type="primary" @click="deletes">删除</el-button>
-                    </div>
-                </div>
-
-                <div :style="heightTab">
-                    <vxe-table height="auto" v-bind="defaultAttribute" :data="dotList?.childrens[radio]?.children">
-                        <vxe-column field="name" title="算法名称"></vxe-column>
-                        <vxe-column field="createTime" title="创建时间"></vxe-column>
-
-                        <vxe-column field="period" title="计算周期">
-                            <template #default="{ row }">
-                                {{
-                                    row.period == 0
-                                        ? '日'
-                                        : row.period == 1
-                                        ? '月'
-                                        : row.period == 2
-                                        ? '季'
-                                        : row.period == 3
-                                        ? '年'
-                                        : ''
-                                }}
-                            </template>
-                        </vxe-column>
-                        <vxe-column field="source" title="数据来源"></vxe-column>
-                        <!-- <vxe-column field="useFLag" title="是否启用">
-                            <template #default="{ row }">
-                                <el-tag :type="row.useFLag === 1 ? 'success' : 'info'" effect="dark"
-                                    style="cursor: pointer" @click="change(row)">
-                                    {{ row.useFLag === 1 ? '是' : '否' }}
-                                </el-tag>
-                            </template>
-                        </vxe-column> -->
-                        <vxe-column field="definition" title="定义">
-                            <template #default="{ row }">
-                                <el-button type="primary" link @click="view(row)">查看</el-button>
-                            </template>
-                        </vxe-column>
-                        <!-- <vxe-column title="操作" width="150px">
-                            <template #default="{ row }">
-                                <el-button type="primary" link @click="edit(row)">修改</el-button>
-                                <el-button type="danger" link @click="del(row)">删除</el-button>
-                                <el-popconfirm title="确定删除吗？" confirm-button-type='danger'  @confirm="del(row)">
-                                    <template #reference>
-                                        <el-button type="danger" link>删除</el-button>
-                                    </template>
-                                </el-popconfirm>
-                            </template>
-                        </vxe-column> -->
-                    </vxe-table>
-                </div>
-            </pane>
-        </splitpanes>
-        <!-- 树弹框 -->
-        <addTree ref="addTreeRef" @getTree="treeRef.loadData(dotList.id)" />
-        <!-- 弹框 -->
-        <PopupEdit
-            ref="popupEditRef"
-            v-if="popupEditFlag"
-            @getTree="treeRef.loadData(dotList.id), (popupEditFlag = false)"
-        />
-        <!-- 定义 -->
-        <el-dialog draggable v-model="viewFlag" title="定义" width="60%">
-            <div style="min-height: 300px; max-height: 55vh">
-                <div class="editor" ref="editorRef" v-html="summary" />
-            </div>
-        </el-dialog>
-        <!-- 删除 -->
-        <el-dialog draggable v-model="dialogVisible" title="请选择需要删除的数据" width="400">
-            <el-tree-select
-                v-model="TreeValue"
-                :data="TreeData"
-                filterable
-                check-strictly
-                :props="defaultProps"
-                default-expand-all
-                :render-after-expand="false"
-            />
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button @click="dialogVisible = false">取消</el-button>
-                    <el-button type="primary" @click="del">删除</el-button>
-                </div>
-            </template>
-        </el-dialog>
+    <div class="default-main">
+        <el-tabs v-model="activeName" type="border-card">
+            <el-tab-pane label="总览" name="1" v-if="tabList.includes('1')">
+                <overview v-if="activeName == '1'" @algorithm="algorithm" />
+            </el-tab-pane>
+            <el-tab-pane label="算法库" name="2" v-if="tabList.includes('2')">
+                <list v-if="activeName == '2'" ref="listRef" />
+            </el-tab-pane>
+        </el-tabs>
     </div>
 </template>
+
 <script setup lang="ts">
-import { onMounted, ref, provide } from 'vue'
-import 'splitpanes/dist/splitpanes.css'
-import { Splitpanes, Pane } from 'splitpanes'
-import algorithmTree from '@/components/tree/pqs/algorithmTree.vue'
+import { nextTick, ref, provide, onMounted } from 'vue'
 import { mainHeight } from '@/utils/layout'
-import { defaultAttribute } from '@/components/table/defaultAttribute'
-import { getLineExport, getList, selectReleation } from '@/api/event-boot/report'
-import addTree from './components/addTree.vue'
-import PopupEdit from './components/form.vue'
-import { useMonitoringPoint } from '@/stores/monitoringPoint'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { deleteyById } from '@/api/supervision-boot/database/index'
-import { queryAllAlgorithmLibrary, updateAlgorithmLibrary } from '@/api/supervision-boot/database/index'
-import { useAdminInfo } from '@/stores/adminInfo'
-import katex from 'katex'
-import 'katex/dist/katex.css'
-const adminInfo = useAdminInfo()
+import overview from './overview.vue'
+import list from './list.vue'
+import { useRoute } from 'vue-router'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+const route = useRoute()
+const Undocumented = ref()
+const InterferenceUserTable = ref()
 defineOptions({
-    name: 'database/algorithm'
+    name: 'supervision/interferencemanagement  '
 })
-const monitoringPoint = useMonitoringPoint()
-const height = mainHeight(20)
-const heightTab = mainHeight(82)
-const size = ref(23)
-const addTreeRef = ref()
-const editorRef = ref()
-const dialogVisible = ref(false)
-const viewFlag = ref(false)
-const popupEditFlag = ref(false)
-const treeRef = ref()
-const summary = ref('')
-const popupEditRef = ref()
-const TreeData = ref([])
-const TreeValue = ref([])
-const information = adminInfo.roleCode.includes('information_info')
-
-const defaultProps = {
-    label: 'name',
-    value: 'id'
-}
-const dotList: any = ref()
-
-const templatePolicy: any = ref([])
-// const tableStore = new TableStore({
-//     url: '/supervision-boot/libalgorithm/queryAllAlgorithmLibrary',
-//     method: 'GET',
-//     column: [
-//         { title: '算法名称', field: 'name' },
-//         {
-//             title: '定义',
-//             field: 'name1'
-//         },
-//         {
-//             title: '计算公式',
-//             field: 'name2'
-//         },
-//         {
-//             title: '计算周期',
-//             field: 'name3'
-//         },
-//         {
-//             title: '数据来源',
-//             field: 'name4'
-//         },
-//         {
-//             title: '是否启用',
-//             field: 'name5',
-//             render: 'tag',
-//             effect: 'dark',
-//             custom: {
-//                 0: 'info',
-//                 1: 'success'
-//             },
-//             replaceValue: {
-//                 0: '否',
-//                 1: '是'
-//             }
-//         }
-//     ],
-//     loadCallback: () => {}
-// })
-const radio = ref(0)
-
-// 新增弹框
-const addUser = () => {
-    popupEditFlag.value = true
-    setTimeout(() => {
-        popupEditRef.value.open({
-            title: '新增算法'
-        })
-    }, 100)
-}
-// 修改弹框
-const revise = () => {
-    popupEditFlag.value = true
-    setTimeout(() => {
-        popupEditRef.value.open({
-            title: '修改算法',
-            row: dotList.value
-        })
-    }, 100)
-}
-
+const activeName = ref('1')
+const id = ref('')
+const key = ref('')
+const listRef = ref()
+const tabList = ref(['1', '2'])
 onMounted(() => {
-    const dom = document.getElementById('navigation-splitpanes')
-    if (dom) {
-        size.value = Math.round((180 / dom.offsetHeight) * 120)
+    let key = window.location.href.split('?')[0].slice(-1)
+    const isNumber = /^\d$/.test(key)
+    if (isNumber) {
+        tabList.value = [key]
+        activeName.value = key
     }
-    // tableStore.index()
 })
-
-const view = (row: any) => {
-    viewFlag.value = true
-    summary.value = row.definition
+const algorithm = (val: any) => {
+    activeName.value = '2'
     setTimeout(() => {
-        const spans = document.querySelectorAll('span[data-value]')
-        // 遍历每个 span 标签
-        spans.forEach(function (span) {
-            let val = katex.renderToString(span.getAttribute('data-value'), {
-                throwOnError: false
-            })
-            // var newDiv = document.createElement('div');
-            var newDiv = span
-            newDiv.innerHTML = val
-
-            span.parentNode.replaceChild(newDiv, span)
-        })
+        listRef.value.getList(val)
     }, 100)
-
-    //
-}
-
-const handleNodeClick = (data: any, node: any) => {
-    if (data.pid != '0') {
-        dotList.value = data
-        radio.value = 0
-    }
-}
-const onAddTree = () => {
-    addTreeRef.value.open('新增')
-}
-const deletes = () => {
-    TreeValue.value = []
-    queryAllAlgorithmLibrary().then(res => {
-        TreeData.value = res.data
-    })
-    dialogVisible.value = true
-}
-// 删除
-const del = () => {
-    if (TreeValue.value.length == 0) {
-        return ElMessage.warning('请选择数据')
-    }
-    ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-    }).then(() => {
-        deleteyById({ id: TreeValue.value }).then(res => {
-            ElMessage.success('删除成功')
-            dialogVisible.value = false
-            treeRef.value.loadData()
-        })
-    })
-
-    // if (TreeValue.value.length > 0) {
-    //     ElMessage.warning('请选择数据')
-    //     return
-    // }
-}
-// 启用
-const change = (row: any) => {
-    console.log('🚀 ~ change ~ row:', row)
-    ElMessageBox.confirm(`请确认是否${row.useFLag == 0 ? '启用' : '关闭'}算法?`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-    }).then(() => {
-        updateAlgorithmLibrary({ ...row, useFLag: row.useFLag == 0 ? 1 : 0 }).then(res => {
-            ElMessage.success(row.useFLag == 0 ? '启用' : '关闭' + '成功')
-            treeRef.value.loadData(dotList.value.id)
-        })
-    })
 }
+const layout = mainHeight(63) as any
 </script>
-<style lang="scss">
-.splitpanes.default-theme .splitpanes__pane {
-    background: #eaeef1;
+
+<style lang="scss" scoped>
+.bars_w {
+    width: 100%;
+    height: 500px;
 }
 
-.grid-content {
-    text-align: center;
-}
-
-.el-divider--horizontal {
-    margin: 10px 0;
-}
-
-.mTop {
-    margin-top: 5px;
-    margin-bottom: 5px;
-}
-
-.boxTop {
-    height: 52px;
-    padding: 10px 10px 10px 0;
-    display: flex;
-    justify-content: space-between;
-}
-
-.editor {
-    table {
-        width: 100%;
-        border-collapse: collapse;
-    }
-
-    th,
-    td {
-        border: 1px solid black;
-        padding: 8px;
-        text-align: center;
-    }
-
-    th {
-        background-color: #f2f2f2;
-        font-weight: bold;
-    }
-
-    td {
-        background-color: #ffffff;
-    }
+:deep(.el-tabs__content) {
+    height: v-bind('layout.height');
+    overflow-y: auto;
 }
 </style>

src/views/pqs/database/algorithm/list.vue

@@ -0,0 +1,359 @@
+<template>
+    <div class="default-main" :style="height">
+        <!-- 算法库 -->
+        <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
+            <pane :size="size">
+                <algorithmTree
+                    ref="treeRef"
+                    :default-expand-all="false"
+                    :default-expanded-keys="monitoringPoint.state.lineId ? [monitoringPoint.state.lineId] : []"
+                    :current-node-key="monitoringPoint.state.lineId"
+                    @node-click="handleNodeClick"
+                    @init="handleNodeClick"
+                    @onAddTree="onAddTree"
+                ></algorithmTree>
+            </pane>
+            <pane style="background: #fff; width: 100%" :style="height">
+                <div class="boxTop">
+                    <div>
+                        <el-radio-group v-model="radio">
+                            <el-radio-button v-for="(item, i) in dotList?.childrens" :label="item.name" :value="i" />
+                        </el-radio-group>
+                    </div>
+                    <div v-if="information">
+                        <el-button icon="el-icon-Plus" type="primary" @click="addUser">新增</el-button>
+                        <el-button icon="el-icon-Edit" type="primary" @click="revise">修改</el-button>
+                        <el-button icon="el-icon-Delete" type="primary" @click="deletes">删除</el-button>
+                    </div>
+                </div>
+
+                <div :style="heightTab">
+                    <vxe-table height="auto" v-bind="defaultAttribute" :data="dotList?.childrens[radio]?.children">
+                        <vxe-column field="name" title="算法名称"></vxe-column>
+                        <vxe-column field="createTime" title="创建时间"></vxe-column>
+
+                        <vxe-column field="period" title="计算周期">
+                            <template #default="{ row }">
+                                {{
+                                    row.period == 0
+                                        ? '日'
+                                        : row.period == 1
+                                        ? '月'
+                                        : row.period == 2
+                                        ? '季'
+                                        : row.period == 3
+                                        ? '年'
+                                        : ''
+                                }}
+                            </template>
+                        </vxe-column>
+                        <vxe-column field="source" title="数据来源"></vxe-column>
+                        <!-- <vxe-column field="useFLag" title="是否启用">
+                            <template #default="{ row }">
+                                <el-tag :type="row.useFLag === 1 ? 'success' : 'info'" effect="dark"
+                                    style="cursor: pointer" @click="change(row)">
+                                    {{ row.useFLag === 1 ? '是' : '否' }}
+                                </el-tag>
+                            </template>
+                        </vxe-column> -->
+                        <vxe-column field="definition" title="定义">
+                            <template #default="{ row }">
+                                <el-button type="primary" link @click="view(row)">查看</el-button>
+                            </template>
+                        </vxe-column>
+                        <!-- <vxe-column title="操作" width="150px">
+                            <template #default="{ row }">
+                                <el-button type="primary" link @click="edit(row)">修改</el-button>
+                                <el-button type="danger" link @click="del(row)">删除</el-button>
+                                <el-popconfirm title="确定删除吗？" confirm-button-type='danger'  @confirm="del(row)">
+                                    <template #reference>
+                                        <el-button type="danger" link>删除</el-button>
+                                    </template>
+                                </el-popconfirm>
+                            </template>
+                        </vxe-column> -->
+                    </vxe-table>
+                </div>
+            </pane>
+        </splitpanes>
+        <!-- 树弹框 -->
+        <addTree ref="addTreeRef" @getTree="treeRef.loadData(dotList.id)" />
+        <!-- 弹框 -->
+        <PopupEdit
+            ref="popupEditRef"
+            v-if="popupEditFlag"
+            @getTree="treeRef.loadData(dotList.id), (popupEditFlag = false)"
+        />
+        <!-- 定义 -->
+        <el-dialog draggable v-model="viewFlag" title="定义" width="60%">
+            <div style="min-height: 300px; max-height: 55vh">
+                <div class="editor" ref="editorRef" v-html="summary" />
+            </div>
+        </el-dialog>
+        <!-- 删除 -->
+        <el-dialog draggable v-model="dialogVisible" title="请选择需要删除的数据" width="400">
+            <el-tree-select
+                v-model="TreeValue"
+                :data="TreeData"
+                filterable
+                check-strictly
+                :props="defaultProps"
+                default-expand-all
+                :render-after-expand="false"
+            />
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button @click="dialogVisible = false">取消</el-button>
+                    <el-button type="primary" @click="del">删除</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+<script setup lang="ts">
+import { onMounted, ref, provide, nextTick } from 'vue'
+import 'splitpanes/dist/splitpanes.css'
+import { Splitpanes, Pane } from 'splitpanes'
+import algorithmTree from '@/components/tree/pqs/algorithmTree.vue'
+import { mainHeight } from '@/utils/layout'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { getLineExport, selectReleation } from '@/api/event-boot/report'
+import addTree from './components/addTree.vue'
+import PopupEdit from './components/form.vue'
+import { useMonitoringPoint } from '@/stores/monitoringPoint'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { deleteyById } from '@/api/supervision-boot/database/index'
+import { queryAllAlgorithmLibrary, updateAlgorithmLibrary } from '@/api/supervision-boot/database/index'
+import { useAdminInfo } from '@/stores/adminInfo'
+import katex from 'katex'
+import 'katex/dist/katex.css'
+const adminInfo = useAdminInfo()
+defineOptions({
+    name: 'database/algorithm'
+})
+const monitoringPoint = useMonitoringPoint()
+const height = mainHeight(20)
+const heightTab = mainHeight(82)
+const size = ref(23)
+const addTreeRef = ref()
+const editorRef = ref()
+const dialogVisible = ref(false)
+const viewFlag = ref(false)
+const popupEditFlag = ref(false)
+const treeRef = ref()
+const summary = ref('')
+const popupEditRef = ref()
+const TreeData = ref([])
+const TreeValue = ref([])
+const information = adminInfo.roleCode.includes('information_info')
+
+const defaultProps = {
+    label: 'name',
+    value: 'id'
+}
+const dotList: any = ref()
+
+const templatePolicy: any = ref([])
+// const tableStore = new TableStore({
+//     url: '/supervision-boot/libalgorithm/queryAllAlgorithmLibrary',
+//     method: 'GET',
+//     column: [
+//         { title: '算法名称', field: 'name' },
+//         {
+//             title: '定义',
+//             field: 'name1'
+//         },
+//         {
+//             title: '计算公式',
+//             field: 'name2'
+//         },
+//         {
+//             title: '计算周期',
+//             field: 'name3'
+//         },
+//         {
+//             title: '数据来源',
+//             field: 'name4'
+//         },
+//         {
+//             title: '是否启用',
+//             field: 'name5',
+//             render: 'tag',
+//             effect: 'dark',
+//             custom: {
+//                 0: 'info',
+//                 1: 'success'
+//             },
+//             replaceValue: {
+//                 0: '否',
+//                 1: '是'
+//             }
+//         }
+//     ],
+//     loadCallback: () => {}
+// })
+const radio = ref(0)
+
+// 新增弹框
+const addUser = () => {
+    popupEditFlag.value = true
+    setTimeout(() => {
+        popupEditRef.value.open({
+            title: '新增算法'
+        })
+    }, 100)
+}
+// 修改弹框
+const revise = () => {
+    popupEditFlag.value = true
+    setTimeout(() => {
+        popupEditRef.value.open({
+            title: '修改算法',
+            row: dotList.value
+        })
+    }, 100)
+}
+
+onMounted(() => {
+    const dom = document.getElementById('navigation-splitpanes')
+    if (dom) {
+        size.value = Math.round((180 / dom.offsetHeight) * 120)
+    }
+    // tableStore.index()
+})
+
+const view = (row: any) => {
+    viewFlag.value = true
+    summary.value = row.definition
+    setTimeout(() => {
+        const spans = document.querySelectorAll('span[data-value]')
+        // 遍历每个 span 标签
+        spans.forEach(function (span) {
+            let val = katex.renderToString(span.getAttribute('data-value'), {
+                throwOnError: false
+            })
+            // var newDiv = document.createElement('div');
+            var newDiv = span
+            newDiv.innerHTML = val
+
+            span.parentNode.replaceChild(newDiv, span)
+        })
+    }, 100)
+
+    //
+}
+
+const handleNodeClick = (data: any, node: any) => {
+    if (data.pid != '0') {
+        dotList.value = data
+        radio.value = 0
+    }
+}
+const onAddTree = () => {
+    addTreeRef.value.open('新增')
+}
+const deletes = () => {
+    TreeValue.value = []
+    queryAllAlgorithmLibrary().then(res => {
+        TreeData.value = res.data
+    })
+    dialogVisible.value = true
+}
+// 删除
+const del = () => {
+    if (TreeValue.value.length == 0) {
+        return ElMessage.warning('请选择数据')
+    }
+    ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+    }).then(() => {
+        deleteyById({ id: TreeValue.value }).then(res => {
+            ElMessage.success('删除成功')
+            dialogVisible.value = false
+            treeRef.value.loadData()
+        })
+    })
+
+    // if (TreeValue.value.length > 0) {
+    //     ElMessage.warning('请选择数据')
+    //     return
+    // }
+}
+// 启用
+const change = (row: any) => {
+    console.log('🚀 ~ change ~ row:', row)
+    ElMessageBox.confirm(`请确认是否${row.useFLag == 0 ? '启用' : '关闭'}算法?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+    }).then(() => {
+        updateAlgorithmLibrary({ ...row, useFLag: row.useFLag == 0 ? 1 : 0 }).then(res => {
+            ElMessage.success(row.useFLag == 0 ? '启用' : '关闭' + '成功')
+            treeRef.value.loadData(dotList.value.id)
+        })
+    })
+}
+const getList = (val: any) => {
+    setTimeout(async () => {
+        dotList.value = await treeRef.value.setKey(val.data.pid)
+        await dotList.value?.childrens.forEach((item: any, i: number) => {
+            if (item.id == val.data.id) {
+                radio.value = i
+            }
+        })
+    }, 500)
+}
+defineExpose({
+    getList
+})
+</script>
+<style lang="scss">
+.splitpanes.default-theme .splitpanes__pane {
+    background: #eaeef1;
+}
+
+.grid-content {
+    text-align: center;
+}
+
+.el-divider--horizontal {
+    margin: 10px 0;
+}
+
+.mTop {
+    margin-top: 5px;
+    margin-bottom: 5px;
+}
+
+.boxTop {
+    height: 52px;
+    padding: 10px 10px 10px 0;
+    display: flex;
+    justify-content: space-between;
+}
+
+.editor {
+    table {
+        width: 100%;
+        border-collapse: collapse;
+    }
+
+    th,
+    td {
+        border: 1px solid black;
+        padding: 8px;
+        text-align: center;
+    }
+
+    th {
+        background-color: #f2f2f2;
+        font-weight: bold;
+    }
+
+    td {
+        background-color: #ffffff;
+    }
+}
+</style>

src/views/pqs/database/algorithm/overview.vue

@@ -0,0 +1,196 @@
+<template>
+    <div class="default-main pt50" :style="height">
+        <!-- 算法库 -->
+        <!--  -->
+
+        <MyEchart :options="echartList" style="width: 100%" :style="height" @echart-click="echartClick"></MyEchart>
+    </div>
+</template>
+<script setup lang="ts">
+import { onMounted, ref, provide } from 'vue'
+import 'splitpanes/dist/splitpanes.css'
+
+import { mainHeight } from '@/utils/layout'
+
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import { useRouter } from 'vue-router'
+import { queryAllAlgorithmLibrary, updateAlgorithmLibrary } from '@/api/supervision-boot/database/index'
+import { useAdminInfo } from '@/stores/adminInfo'
+import 'katex/dist/katex.css'
+import { useConfig } from '@/stores/config'
+const router = useRouter()
+const config = useConfig()
+const adminInfo = useAdminInfo()
+defineOptions({
+    name: 'database/algorithm'
+})
+const emits = defineEmits(['algorithm'])
+const height = mainHeight(20)
+const size = ref(23)
+
+const popupEditFlag = ref(false)
+
+const popupEditRef = ref()
+const TreeList: any = ref([])
+
+const echartList = ref({})
+
+const dotList: any = ref()
+
+const radio = ref(0)
+
+// 新增弹框
+const addUser = () => {
+    popupEditFlag.value = true
+    setTimeout(() => {
+        popupEditRef.value.open({
+            title: '新增算法'
+        })
+    }, 100)
+}
+
+onMounted(() => {
+    const dom = document.getElementById('navigation-splitpanes')
+    if (dom) {
+        size.value = Math.round((180 / dom.offsetHeight) * 120)
+    }
+    info()
+    // tableStore.index()
+})
+
+const info = () => {
+    queryAllAlgorithmLibrary().then(async res => {
+        TreeList.value = await setTreeAllNodeExpand([
+            {
+                name: '算法库',
+                level: 0,
+                children: res.data
+            }
+        ])
+
+        echartList.value = {
+            series: [
+                {
+                    type: 'tree',
+                    data: TreeList.value,
+                    top: '20',
+                    bottom: '40',
+                    left: '20',
+                    symbolSize: 7,
+                    label: {
+                        position: 'left',
+                        verticalAlign: 'middle',
+                        align: 'left',
+                        fontSize: 14,
+                        fontWeight: 600,
+                        backgroundColor: config.layout.elementUiPrimary[0],
+                        color: '#fff',
+                        borderRadius: 5,
+                        formatter: function (params) {
+                            return [`{name|${params.data.name}}`]
+                        },
+                        rich: {
+                            name: {
+                                fontSize: 14,
+                                fontWeight: 'bold',
+                                padding: [10, 10]
+                            }
+                        }
+                    },
+                    leaves: {
+                        label: {
+                            position: 'left',
+                            verticalAlign: 'middle',
+                            fontWeight: 600,
+                            align: 'left'
+                        }
+                    },
+
+                    edgeShape: 'polyline', // 折线连接线
+                    roam: true, // 可移动,可缩放
+                    expandAndCollapse: false,
+                    animationDuration: 550,
+                    animationDurationUpdate: 750
+                }
+            ]
+        }
+    })
+}
+// 点击echart
+const echartClick = (params: any) => {
+   if(params.data.level == 3){
+     emits('algorithm', params)
+   }
+}
+const setTreeAllNodeExpand = (treeData: any) => {
+    if (!treeData) return []
+    // 兼容单对象/数组两种树数据格式
+    const data = Array.isArray(treeData) ? treeData : [treeData]
+    return data.map(node => {
+        // 深拷贝节点，彻底隔离原数据
+        const newNode = {
+            ...node,
+            collapsed: node.level <= 2 ? false : true // 强制添加展开属性
+        }
+        // 递归处理子节点
+        if (node.children && node.children.length > 0) {
+            newNode.children = setTreeAllNodeExpand(node.children)
+        }
+        return newNode
+    })
+}
+</script>
+<style lang="scss">
+.splitpanes.default-theme .splitpanes__pane {
+    background: #eaeef1;
+}
+
+.grid-content {
+    text-align: center;
+}
+
+.el-divider--horizontal {
+    margin: 10px 0;
+}
+
+.mTop {
+    margin-top: 5px;
+    margin-bottom: 5px;
+}
+
+.boxTop {
+    height: 52px;
+    padding: 10px 10px 10px 0;
+
+    display: flex;
+    justify-content: space-between;
+}
+
+.editor {
+    table {
+        width: 100%;
+        border-collapse: collapse;
+    }
+
+    th,
+    td {
+        border: 1px solid black;
+        padding: 8px;
+        text-align: center;
+    }
+
+    th {
+        background-color: #f2f2f2;
+        font-weight: bold;
+    }
+
+    td {
+        background-color: #ffffff;
+    }
+}
+.button {
+    position: absolute;
+    right: 10px;
+    top: 10px;
+}
+</style>

src/views/pqs/database/case/components/annex.vue

@@ -12,7 +12,7 @@
                     <div style="display: flex;align-items: center;">
                         <div>{{ item.name }}</div>
 
-                        <el-icon class="elView" v-if="item.name && VITE_FLAG" @click="view(item)">
+                        <el-icon class="elView" v-if="item.name" @click="view(item)">
                             <View />
                         </el-icon>
                         <el-icon class="elView" v-if="item.name" @click="download(item)">
@@ -50,7 +50,7 @@ import { ref, reactive } from 'vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { getFileNameAndFilePath, downloadFile } from '@/api/system-boot/file'
 import { Download, View } from '@element-plus/icons-vue'
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+
 const dialogVisible = ref(false)
 const tableData: any = ref({
 

src/views/pqs/database/standard/index.vue

@@ -20,13 +20,13 @@
                 <el-empty v-if="url.length == 0" description="暂无数据" class="custom-empty"
                     :style="`height: calc(${height.height} - 60px);`" />
                 <div :style="`height: calc(${height.height} - 60px);overflow: auto;`" v-else>
-                    <vue-office-docx v-if="url.includes('.doc') || url.includes('.docx')" :src="url" />
-                    <vue-office-excel v-if="url.includes('.xls') || url.includes('.xlsx')" :src="url"
+                    <vue-office-docx v-if="urlKey.includes('.doc') || urlKey.includes('.docx')" :src="url" />
+                    <vue-office-excel v-if="urlKey.includes('.xls') || urlKey.includes('.xlsx')" :src="url"
                         :options="excelOptions" />
                     <!-- <vue-office-pdf v-if="url.includes('.pdf')" :src="url"/> -->
-                    <iframe v-if="url.includes('.pdf')" :src="url" style="width: 100%; height: 99%"></iframe>
+                    <iframe v-if="urlKey.includes('.pdf')" :src="url" style="width: 100%; height: 99%"></iframe>
                     <img v-if="
-                        url.includes('.png') || url.includes('.jpg') || url.includes('.gif') || url.includes('.bmp')
+                        urlKey.includes('.png') || urlKey.includes('.jpg') || urlKey.includes('.gif') || urlKey.includes('.bmp')
                     " :src="url" />
                 </div>
             </pane>
@@ -56,6 +56,7 @@ import VueOfficeExcel from '@vue-office/excel'
 import VueOfficePdf from '@vue-office/pdf'
 import { deleteyLibstandard } from '@/api/supervision-boot/database/index'
 import { useAdminInfo } from '@/stores/adminInfo'
+import {previewFile } from '@/utils/fileDownLoad'
 const adminInfo = useAdminInfo()
 defineOptions({
     name: 'database/standard'
@@ -77,7 +78,7 @@ onMounted(() => {
     }
 })
 
-
+const urlKey=ref('')
 const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const handleNodeClick = (data: any, node: any) => {
     console.log("🚀 ~ handleNodeClick ~ data:", data)
@@ -86,13 +87,14 @@ const handleNodeClick = (data: any, node: any) => {
     flag.value = false
     if (data?.url != null && data?.url != '') {
         flag.value = true
-
-        setTimeout(() => {
+        urlKey.value = data.url
+        setTimeout(async () => {
              if(VITE_FLAG){
                    url.value = `/api-docx/excelreport` + data.url
                    excelOptions.value = { xls: data.url.split('.')[1] == 'xls' ? true : false }
              }else{
-                   
+                   const previewUrl = await previewFile(data.url);
+                    url.value = previewUrl;
              }
          
             // getFileNameAndFilePath({ filePath: data.url }).then(res => {

src/views/pqs/database/stencil/index.vue

@@ -36,7 +36,7 @@ defineOptions({
 })
 const information = adminInfo.roleCode.includes('information_info')
 const popupEditRef = ref()
-
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const TableHeaderRef = ref()
 
 const tableStore = new TableStore({
@@ -59,6 +59,9 @@ const tableStore = new TableStore({
                     type: 'primary',
                     icon: 'el-icon-Plus',
                     render: 'basicButton',
+                    // disabled: row => {
+                    //     return !VITE_FLAG
+                    // },
                     click: row => {
                         window.open(window.location.origin + '/#/previewFile?' + row.url)
                     }

src/views/pqs/harmonicMonitoring/area/getIntegrityData/components/charts.vue

@@ -75,11 +75,11 @@ const tableStore = new TableStore({
             yData = []
         chartsData.value.map((item: any) => {
             xData.push(item.type)
-            if (item.single == 0 || item.single == 3.14159) {
-                yData.push(1)
-            } else {
+            // if (item.single == 0 || item.single == 3.14159) {
+            //     yData.push(0)
+            // } else {
                 yData.push(item.single)
-            }
+            //}
         })
         // tableStore.table.data.type
         const legendColorList = ['#0099CC', '#9A6601', '#CCCCCC', '#FFFFFF']
@@ -111,7 +111,19 @@ const tableStore = new TableStore({
             },
            
             tooltip: {
-               
+                formatter: function (params: any) {
+                    var tips = ''
+                    for (var i = 0; i < params.length; i++) {
+                        if (params[i].value == 3.14159) {
+                            tips += params[i].name + '</br>'
+                            tips += params[i].marker + '完整性:暂无数据'
+                        } else {
+                            tips += params[i].name + '</br>'
+                            tips += params[i].marker + '完整性:' + params[i].value.toFixed(2)
+                        }
+                    }
+                    return tips
+                }
                 // formatter: function (params: any) {
                 //     var tips = `<div style="min-width:80px;display:flex;justify-content:space-between;align-items:center">
                 //         <span style="margin-left:5px;dislpay:block;min-width:80px;color:#000">${params[0].name}</span></div>`
@@ -181,7 +193,21 @@ const tableStore = new TableStore({
 
                             // 定制显示（按顺序）
                             color: function (params) {
-                                if (params.value >= 90) {
+                                if (params.value == 3.14159) {
+                                    return new echarts.graphic.LinearGradient(
+                                        0,
+                                        1,
+                                        0,
+                                        0,
+                                        [
+                                            {
+                                                offset: 1,
+                                                color: '#ccc'
+                                            }
+                                        ],
+                                        false
+                                    )
+                                } else if (params.value >= 90) {
                                     return new echarts.graphic.LinearGradient(
                                         0,
                                         1,
@@ -209,7 +235,7 @@ const tableStore = new TableStore({
                                         ],
                                         false
                                     )
-                                } else if (params.value > 0.5 && params.value <= 60) {
+                                } else if (params.value > 0 && params.value <= 60) {
                                     return new echarts.graphic.LinearGradient(
                                         0,
                                         1,
@@ -223,7 +249,7 @@ const tableStore = new TableStore({
                                         ],
                                         false
                                     )
-                                } else if (params.value > 0 && params.value <= 0.5) {
+                                } else if (params.value == 0) {
                                     return new echarts.graphic.LinearGradient(
                                         0,
                                         1,

src/views/pqs/harmonicMonitoring/area/getIntegrityData/index.vue

@@ -56,7 +56,7 @@
                     </el-form-item>
                 </template>
                 <template #operation>
-                    <el-button type="primary" icon="el-icon-Tickets" @click="makeUp">补招</el-button>
+                    <el-button type="primary" icon="el-icon-Tickets" @click="makeUp" v-if="!VITE_FLAG">补招</el-button>
                 </template>
             </TableHeader>
         </div>
@@ -113,6 +113,7 @@ const adminInfo = useAdminInfo()
 defineOptions({
     name: 'harmonic-boot/harmonic/getIntegrityData'
 })
+const VITE_FLAG = import.meta.env.VITE_NAME == 'hainan'
 const logRef = ref()
 const tableRef = ref()
 const chartsRef = ref()

src/views/pqs/harmonicMonitoring/area/onlinerate/components/charts.vue

@@ -109,10 +109,10 @@ const tableStore = new TableStore({
                     for (var i = 0; i < params.length; i++) {
                         if (params[i].value == 1) {
                             tips += params[i].name + '</br>'
-                            tips += '在线率:暂无数据'
+                            tips += params[i].marker + '在线率:暂无数据'
                         } else {
                             tips += params[i].name + '</br>'
-                            tips += '在线率:' + params[i].value.toFixed(2)
+                            tips += params[i].marker + '在线率:' + params[i].value.toFixed(2)
                         }
                     }
                     return tips

src/views/pqs/harmonicMonitoring/area/onlinerate/index.vue

@@ -131,6 +131,12 @@ import TableHeader from '@/components/table/header/index.vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import charts from './components/charts.vue'
+
+
+defineOptions({
+    name: 'device-boot/getOnlineRateData'
+})
+
 const tableRef = ref()
 const chartsRef = ref()
 const dictData = useDictData()

src/views/pqs/harmonicMonitoring/area/powerAssessment/index.vue

@@ -164,6 +164,7 @@ provide('tableStore', tableStore)
 tableStore.table.params.deptIndex = dictData.state.area[0].id
 tableStore.table.params.monitorFlag = 2
 tableStore.table.params.powerFlag = sign[0]?.algoDescribe || 0
+
 tableStore.table.params.statisticalType = {}
 
 

src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/MonitoringPointTab.vue

@@ -291,7 +291,7 @@ tableStore.table.params.isUpToGrid = 0
 tableStore.table.params.type = 1
 
 const handleStatisticalTypeChange = (newVal: { id: any }) => {
-    console.log('🚀 ~ handleStatisticalTypeChange ~ newVal:', newVal)
+   
     if (newVal) {
         tableStore.table.params.statisticalType = newVal
         tableStore.table.params.ids = [newVal.id]

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

@@ -105,6 +105,7 @@ const loading = ref(false)
 provide('tableStore', tableStore)
 
 onMounted(() => {
+    TableHeaderRef.value.setTheDate(4)
     const dom = document.getElementById('navigation-splitpanes')
     if (dom) {
         size.value = Math.round((180 / dom.offsetHeight) * 120)
@@ -116,7 +117,7 @@ getTemplateByDept({ id: dictData.state.area[0].id })
         Template.value = res.data[0]
         reportForm.value = res.data[0]?.reportForm
         showTree.value = true
-        tableStore.index()
+        TableHeaderRef.value.onComSearch()
     })
     .catch((err: any) => {
         showTree.value = true

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

@@ -1448,7 +1448,7 @@ const rendering = () => {
 }
 const getEcharts = () => {
     list.value.forEach((item: any, i: number) => {
-        console.log('🚀 ~ getEcharts ~ item:', item)
+ 
 
         const values = item.value && item.value.length > 0 ? item.value.map(k => k[1]) : [0]
         let [min, max] = yMethod([item.maxValue, item.minValue, ...values])
@@ -1485,13 +1485,17 @@ const getEcharts = () => {
                     fontSize: 14
                 },
                 backgroundColor: 'rgba(0,0,0,0.55)',
-
+       
                 formatter: function (params: any) {
                     let tips = ''
                     tips += '时刻:' + params[0].data[0] + '</br/>'
                     for (let i = 0; i < params.length; i++) {
+
+                      
                         if (params[i].seriesName == '暂态触发点') {
+                          
                             tips += ''
+
                             return tips
                         }
                         if (params[i].seriesName == 'A相谐波电流方向') {
@@ -1526,41 +1530,50 @@ const getEcharts = () => {
                             let str = (params[i].value[1] * 1).toString()
                             let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
                             let str1 = str.replace(reg, '$1,')
+                            let cleanStr = str1.replace(/,/g, '') 
+                            let num = Number(cleanStr)
                             tips +=
                                 params[i].marker +
                                 params[i].seriesName.replace('(kV)', '') +
                                 ':' +
-                                (Number.isNaN(Number(str1)) ? '/' : str1) +
+                                (Number.isNaN(Number(num)) ? '/' : num) +
                                 'kV<br/>'
                         } else if (params[i].seriesName == '零序电压(V)' || params[i].seriesName == '负序电压(V)') {
                             let str = (params[i].value[1] * 1).toString()
                             let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
                             let str1 = str.replace(reg, '$1,')
+                             let cleanStr = str1.replace(/,/g, '') 
+                            let num = Number(cleanStr)
                             tips +=
                                 params[i].marker +
                                 params[i].seriesName.replace('(V)', '') +
                                 ':' +
-                                (Number.isNaN(Number(str1)) ? '/' : str1) +
+                                (Number.isNaN(Number(num)) ? '/' : num) +
                                 'V<br/>'
                         } else if (params[i].seriesName !== '正序电压(kV)') {
                             let str = (params[i].value[1] * 1).toString()
                             let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
                             let str1 = str.replace(reg, '$1,')
+                            let cleanStr = str1.replace(/,/g, '') 
+                            let num = Number(cleanStr)
                             tips +=
                                 params[i].marker +
                                 params[i].seriesName +
                                 ':' +
-                                (Number.isNaN(Number(str1)) ? '/' : str1) +
+                                (Number.isNaN(Number(num)) ? '/' : num) +
                                 '<br/>'
                         } else {
                             let str = (params[i].value[2] * 1).toString()
+                            
                             let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
                             let str1 = str.replace(reg, '$1,')
+                            let cleanStr = str1.replace(/,/g, '') 
+                            let num = Number(cleanStr)
                             tips +=
                                 params[i].marker +
                                 params[i].seriesName +
                                 ':' +
-                                (Number.isNaN(Number(str1)) ? '/' : str1) +
+                                (Number.isNaN(Number(num)) ? '/' : num) +
                                 '<br/>'
 
                             let str2 = (params[i].value[3] * 1).toString()
@@ -1575,6 +1588,8 @@ const getEcharts = () => {
                                 ':' +
                                 (Number.isNaN(Number(str2)) ? '/' : str2) +
                                 '<br/>'
+                                
+                            
                         }
                     }
 
@@ -1796,8 +1811,7 @@ const getEcharts = () => {
     echarts.connect('group')
 }
 const conditionChange = () => {
-    console.log(123)
-
+    
     //判断一个指标时
     if (formData.condition.length == 1) {
         if (
@@ -1933,9 +1947,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

@@ -231,14 +231,14 @@ const init = () => {
                 },
                 backgroundColor: 'rgba(0,0,0,0.55)',
                 formatter: function (params: any) {
-                    //console.log(params)
+                    console.log(params)
                     let msg = ''
-                    msg += params[0].name + '<br/>'
+                    msg += params[0].name 
                     for (let i in params) {
                         if (params[i].data == 3.14159) {
-                            msg +=params[i].marker+ params[i].seriesName + ': 暂无数据<br/>'
+                            msg += '（' + params[i].seriesName + '）' + '<br/>' + params[i].marker +  ': 暂无数据<br/>'
                         } else {
-                            msg += params[i].marker+ params[i].seriesName + ': ' + params[i].data + '<br/>'
+                            msg += '（' +  params[i].seriesName + '）' + '<br/>' + 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)
@@ -77,7 +78,7 @@ const TableHeaderRef = ref()
 const dotList: any = ref({})
 const Template: any = ref({})
 const reportForm: any = ref('')
-
+const name = ref('')
 const templatePolicy: any = ref([])
 const reportFormList: any = ref([
     {
@@ -100,6 +101,7 @@ const tableStore = new TableStore({
     beforeSearchFun: () => {
         tableStore.table.params.tempId = Template.value.id
         tableStore.table.params.lineId = dotList.value.id
+        name.value = dotList.value.name
     },
     loadCallback: () => {
         tableStore.table.data.forEach((item: any) => {
@@ -162,7 +164,15 @@ const handleNodeClick = (data: any, node: any) => {
 }
 
 const exportEvent = () => {
-    exportExcel(luckysheet.getAllSheets(), '统计报表下载')
+    // 基础获取
+    const now = new Date()
+    const year = now.getFullYear() // 4位年份
+    const month = now.getMonth() + 1 // 月份0-11，需+1
+    const day = now.getDate() // 日期1-31
+
+    // 格式化YYYY - MM - DD（补零）
+    const formattedDate = `${year}${String(month).padStart(2, '0')}${String(day).padStart(2, '0')}`
+    exportExcel(luckysheet.getAllSheets(), name.value + formattedDate)
 }
 const exportReport = () => {
     loading.value = true

src/views/pqs/qualityInspeection/panorama/components/details/point.vue

@@ -35,7 +35,7 @@
                 </div>
                 <div class="pie">
                     <!-- <MyEChart style="height: 260px" :options="picEChart" /> -->
-                    <MyEChart style="height: 260px; width: 50%" :options="picEChart" />
+                    <MyEChart style="height: 260px; width: 50%" :options="picEChart" @echartClick="echartClick" />
                     <el-table size="small" height="260px" style="width: 50%" :data="picList">
                         <el-table-column prop="orgName" width="90px" align="center">
                             <template #default="scope">
@@ -75,10 +75,12 @@ const picList: any = ref([])
 const Voltage = dictData.getBasicData('Dev_Voltage_Stand')
 const tableData: any = ref([])
 const options = dictData.getBasicData('Statistical_Type', ['Report_Type', 'Power_Network', 'JB_Power_Flag'])
+console.log("🚀 ~ options:", options)
 const time = ref('1')
 const statisticalType = ref('Load_Type')
 const loadTypeArr = dictData.getBasicData('Interference_Source')
-
+import { useRouter } from 'vue-router'
+const router = useRouter()
 const rowList: any = ref({})
 const trendEChart: any = ref()
 
@@ -236,6 +238,18 @@ const handleClose = () => {
     tableData.value = []
     dialogVisible.value = false
 }
+const echartClick = (params: any) => {
+    console.log('🚀 ~ echartClick ~ params:', params.name.split('(')[0])
+    router.push({
+        name: 'Supervision/Terminaldetection',
+        query: {
+            type: 'lodType',
+            name: params.name.split('(')[0],
+            statisticalType:statisticalType.value,
+            t: Date.now()
+        }
+    })
+}
 
 defineExpose({ open })
 </script>

src/views/pqs/qualityInspeection/panorama/components/details/propInfo.vue

@@ -61,7 +61,7 @@ const open = (data: any) => {
     loading.value = true
     show.value = true
     setTimeout(() => {
-        dataList.value = data
+        dataList.value = data.sort((a, b) => b.vharmonicValue - a.vharmonicValue)
         loading.value = false
     }, 1000)
 }

src/views/pqs/qualityInspeection/panorama/components/style/map.scss

@@ -205,13 +205,16 @@
     width: 450px;
     z-index: 0;
 }
-.psrmapBut{
+.psrmapBut {
     position: absolute;
     bottom: 103px;
     right: 60px;
     // z-index: 0.1;
 }
-#nrDeviceCard{
+#nrDeviceCard {
     z-index: 1;
 }
 
+:deep(.nari-devicecard-popup) {
+    display: none!important;
+}

src/views/pqs/runManage/alarmCleaning/components/alarm.vue

@@ -28,12 +28,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="终端厂家:">
-                    <el-select
-                        v-model="tableStore.table.params.manufacturer"
-                        clearable
-                      
-                        placeholder="请选择终端厂家"
-                    >
+                    <el-select v-model="tableStore.table.params.manufacturer" clearable placeholder="请选择终端厂家">
                         <el-option
                             v-for="item in terminaloption"
                             :key="item.id"
@@ -76,7 +71,7 @@
                                     isNaN((monitoringPoints.abnormalNum / monitoringPoints.runNum) * 100)
                                         ? 0
                                         : Math.floor((monitoringPoints.abnormalNum / monitoringPoints.runNum) * 10000) /
-                                      100
+                                          100
                                 }}%
                             </div>
                         </div>
@@ -128,7 +123,7 @@
                     <MyEchart :options="options"></MyEchart>
                 </div>
                 <el-form :inline="true" class="form">
-                    <el-form-item label="告警持续天数"></el-form-item>
+                    <!-- <el-form-item label="告警持续天数"></el-form-item>
                     <el-form-item label="告警阀值(天)">
                         <el-input-number
                             v-model="tableStore.table.params.alarmDayLimit"
@@ -144,6 +139,13 @@
                             :step="1"
                             step-strictly
                         />
+                    </el-form-item> -->
+                    <el-form-item label="数据筛选">
+                        <el-input
+                            placeholder="请输入监测点名称/终端名称"
+                            v-model="tableStore.table.params.searchValue"
+                            clearable
+                        ></el-input>
                     </el-form-item>
                     <el-form-item class="form_but">
                         <el-button type="primary" @click="MonitorVerify" icon="el-icon-Search">查询</el-button>
@@ -493,7 +495,7 @@ tableStore.table.params.name = ''
 provide('tableStore', tableStore)
 </script>
 <style lang="scss" scoped>
-      @import '@/assets/font/iconfont.css';
+@import '@/assets/font/iconfont.css';
 .card-list {
     display: flex;
     .monitoringPoints {

src/views/pqs/runManage/alarmCleaning/components/alarmDetails.vue

@@ -1,7 +1,7 @@
 <template>
-    <el-dialog draggable width="1350px" class="cn-operate-dialog" v-model="dialogVisible" :title="title">
+    <el-dialog draggable width="1400px" class="cn-operate-dialog" v-model="dialogVisible" :title="title">
         <div style="display: flex" v-loading="loading">
-            <div :style="height1" class="mr10 box" style="width: 500px">
+            <div :style="height1" class="mr10 box" style="width: 550px">
                 <vxe-table
                     height="auto"
                     :data="TableData"
@@ -11,45 +11,100 @@
                     @current-change="currentChangeEvent"
                 >
                     <vxe-column type="seq" title="序号" width="60px"></vxe-column>
-                    <vxe-column field="date" title="日期"></vxe-column>
-                    <vxe-column field="bdName" title="所属电站(场站)" width="120px"></vxe-column>
-                    <vxe-column field="monitorName" title="监测点名称" width="120px"></vxe-column>
-                    <vxe-column field="timeSum" title="告警时间(分钟)" width="80px"></vxe-column>
+                    <!-- <vxe-column field="date" title="日期"></vxe-column> -->
+                    <vxe-column field="bdName" title="所属电站(场站)"></vxe-column>
+                    <vxe-column field="monitorName" title="监测点名称"></vxe-column>
+                    <vxe-column field="timeSum" title="告警天数" width="80px">
+                        <template v-slot="{ row }">
+                            {{ row.dateTargetList?.length }}
+                        </template>
+                    </vxe-column>
                 </vxe-table>
             </div>
 
-            <div :style="height" style="width: 820px" v-loading="loading1">
-                <vxe-table
-                    height="auto"
-                    :data="TableData1.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
-                    v-bind="defaultAttribute"
-                >
-                    <vxe-column type="seq" title="序号" width="80px">
-                        <template #default="{ rowIndex }">
-                            <span>{{ (pageNum - 1) * pageSize + rowIndex + 1 }}</span>
-                        </template>
-                    </vxe-column>
-                    <vxe-column field="time" title="时间" :formatter="formatter"></vxe-column>
-                    <vxe-column field="targetName" title="指标类型" min-width="100px"></vxe-column>
-                    <vxe-column field="phaseType" title="相别" width="80px">
-                        <template v-slot="{ row }">
-                            {{ row.phaseType == 'T' ? '/' : row.phaseType }}
-                        </template>
-                    </vxe-column>
+            <div style="width: 820px" v-loading="loading1">
+                <el-form :inline="true" class="form">
+                    <el-form-item label="统计日期">
+                        <el-select
+                            v-model="timeList"
+                            clearable
+                            placeholder="请选择告警天数"
+                            style="width: 180px"
+                            @change="change"
+                        >
+                            <el-option
+                                v-for="item in dateList"
+                                :key="item.date"
+                                :label="item.date"
+                                :value="item.date"
+                            />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="统计指标" v-if="numKey != 0">
+                        <el-select
+                            v-model="targetKey"
+                            filterable
+                            clearable
+                            placeholder="请选择指标"
+                            style="width: 150px"
+                        >
+                            <el-option
+                                v-for="item in targetList"
+                                :key="item.key"
+                                :label="item.targetName"
+                                :value="item.key"
+                            />
+                        </el-select>
+                    </el-form-item>
 
-                    <vxe-column field="type" title="数据类型" width="105px" :formatter="formatter"></vxe-column>
-                    <vxe-column field="val" title="值" width="85px" :formatter="formatter"></vxe-column>
-                    <vxe-column field="overLimitValue" title="限值" width="85px" :formatter="formatter"></vxe-column>
-                </vxe-table>
-                <div class="table-pagination">
-                    <el-pagination
-                        v-model:currentPage="pageNum"
-                        v-model:page-size="pageSize"
-                        :page-sizes="[10, 20, 50, 100, 200]"
-                        background
-                        layout="sizes,total, ->, prev, pager, next, jumper"
-                        :total="TableData1.length"
-                    ></el-pagination>
+                    <el-form-item class="form_but">
+                        <span class="mr20">
+                            告警时间：
+                            <span class="title">{{ timeSum }}</span>
+                            分钟
+                        </span>
+
+                        <el-button type="primary" @click="init" icon="el-icon-Search">查询</el-button>
+                    </el-form-item>
+                </el-form>
+                <div :style="height">
+                    <vxe-table
+                        height="auto"
+                        :data="TableData1?.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
+                        v-bind="defaultAttribute"
+                    >
+                        <vxe-column type="seq" title="序号" width="80px">
+                            <template #default="{ rowIndex }">
+                                <span>{{ (pageNum - 1) * pageSize + rowIndex + 1 }}</span>
+                            </template>
+                        </vxe-column>
+                        <vxe-column field="time" width="150px" title="时间" :formatter="formatter"></vxe-column>
+                        <vxe-column field="targetName" title="指标类型" min-width="100px"></vxe-column>
+                        <vxe-column field="phaseType" title="相别" width="80px">
+                            <template v-slot="{ row }">
+                                {{ row.phaseType == 'T' ? '/' : row.phaseType }}
+                            </template>
+                        </vxe-column>
+
+                        <vxe-column field="type" title="数据类型" width="105px" :formatter="formatter"></vxe-column>
+                        <vxe-column field="val" title="值" width="85px" :formatter="formatter"></vxe-column>
+                        <vxe-column
+                            field="overLimitValue"
+                            title="限值"
+                            width="85px"
+                            :formatter="formatter"
+                        ></vxe-column>
+                    </vxe-table>
+                    <div class="table-pagination">
+                        <el-pagination
+                            v-model:currentPage="pageNum"
+                            v-model:page-size="pageSize"
+                            :page-sizes="[10, 20, 50, 100, 200]"
+                            background
+                            layout="sizes,total, ->, prev, pager, next, jumper"
+                            :total="TableData1?.length || 0"
+                        ></el-pagination>
+                    </div>
                 </div>
             </div>
         </div>
@@ -57,44 +112,47 @@
 </template>
 <script lang="ts" setup>
 import { ref, inject } from 'vue'
-import { useDictData } from '@/stores/dictData'
+import { reactive } from 'vue'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { ElMessage } from 'element-plus'
 import { monitorLimitTable, monitorLimitTableDetail } from '@/api/device-boot/dataVerify'
 import { mainHeight } from '@/utils/layout'
-const dictData = useDictData()
-const StatisList = dictData.getBasicData('Steady_Statis')
 const dialogVisible = ref(false)
 const height1 = mainHeight(-110, 2)
-const height = mainHeight(10, 2)
+const height = mainHeight(90, 2)
 const tableRef = ref()
 const title = ref('')
 const loading = ref(false)
 const loading1 = ref(false)
 const TableData = ref([])
 const TableData1 = ref([])
+const dateList: any = ref([])
 const pageNum = ref(1)
 const pageSize = ref(20)
 const numKey = ref(0)
 const targetKey = ref('')
-const clickRow = ref({})
+const targetList: any = ref([])
+const timeSum = ref('')
+const timeList = ref('')
+const showColumn = ref(true)
+
 const open = (data: anyObj, time: string[], num: number) => {
-    // title.value = (num == 0 ? data.targetName : data.monitorName) + '_告警详情展示'
+    // title.value = (num == 0 ? data.targetName : data.monitorName) + '_告警监测点详情'
     loading.value = true
     title.value = '告警监测点详情'
-    numKey.value = num
-    targetKey.value = data.key
     TableData.value = []
+    numKey.value = num
+    targetKey.value = data.key || ''
     monitorLimitTable({
         monitorIds: num == 0 ? data.ids : [data.monitorId],
         targetKey: num == 0 ? data.key : '',
         searchBeginTime: time[0],
         searchEndTime: time[1]
     })
-       .then(async(res) => {
+        .then(async res => {
             TableData.value = res.data
-           await tableRef.value.setCurrentRow(TableData.value[0])
-           await currentChangeEvent()
+            await tableRef.value.setCurrentRow(TableData.value[0])
+            await currentChangeEvent()
             loading.value = false
         })
         .catch(() => {
@@ -103,16 +161,28 @@ const open = (data: anyObj, time: string[], num: number) => {
     dialogVisible.value = true
 }
 const currentChangeEvent = () => {
+    let data = tableRef.value.getCurrentRecord()
+
+    dateList.value = data.dateTargetList
+    targetList.value = dateList.value[0].targetKeys
+    timeList.value = data.dateTargetList[0].date
+
+    init()
+}
+const init = () => {
+    if (timeList.value == '') return ElMessage.warning('请选择告警天数！')
     loading1.value = true
-    clickRow.value = tableRef.value.getCurrentRecord()
     TableData1.value = []
+    let data = tableRef.value.getCurrentRecord()
     monitorLimitTableDetail({
-        monitorIds: [clickRow.value.monitorId],
-        searchBeginTime: clickRow.value.date,
-        targetKey: numKey.value == 0 ? targetKey.value : ''
+        monitorIds: [data.monitorId],
+        searchBeginTime: timeList.value,
+        targetKey: targetKey.value || '' //numKey.value == 0 ? targetKey.value : ''
     })
         .then(res => {
-            TableData1.value = res.data
+            timeSum.value = res.data.timeSum
+            TableData1.value = res.data.time
+            showColumn.value = res.data[0]?.featureAmplitude == null ? true : false
             loading1.value = false
             pageNum.value = 1
         })
@@ -120,9 +190,37 @@ const currentChangeEvent = () => {
             loading1.value = false
         })
 }
+const change = () => {
+    if (timeList.value == '') targetKey.value = ''
+    let list = dateList.value
+        .filter(item => timeList.value == item.date)
+        ?.map(item => {
+            return item.targetKeys
+        })
+        .flat()
+    targetList.value = deduplicateByKey(list)
+    if (!targetList.value.some(item => item.key == targetKey.value) ) {
+        targetKey.value = ''
+    }
+    console.log('🚀 ~ change ~ targetList.value:', targetList.value)
+}
+// 核心去重逻辑
+function deduplicateByKey(data) {
+    // 使用Map存储唯一key，保证顺序且去重
+    const uniqueMap = new Map()
+    data.forEach(item => {
+        if (!uniqueMap.has(item.key)) {
+            uniqueMap.set(item.key, item)
+        }
+    })
+
+    // 转换为数组并按sort排序
+    const deduplicatedData = Array.from(uniqueMap.values())
+    return deduplicatedData
+}
 const formatter = (row: any) => {
     if (row.column.field == 'time') {
-        return clickRow.value.date + ' ' + row.cellValue
+        return timeList.value + ' ' + row.cellValue
     } else if (row.column.field == 'type') {
         return row.cellValue === 'null' ? '/' : row.cellValue
     } else {
@@ -145,7 +243,21 @@ defineExpose({ open })
 }
 :deep(.box) {
     .row--current {
-//background-color: var(--el-color-primary-light-8) !important;
+        //    background-color: var(--el-color-primary-light-8) !important;
     }
 }
+.form {
+    position: relative;
+    .form_but {
+        position: absolute;
+        right: -22px;
+    }
+}
+.title {
+    font-weight: 600;
+    font-size: 16px;
+}
+:deep(.el-select) {
+    min-width: 100px !important;
+}
 </style>

src/views/pqs/runManage/assessment/components/uese/form.vue

@@ -1,9 +1,10 @@
 <template>
     <div class="default-main">
         <div class="actionButtons">
-            <el-button type="primary" icon="el-icon-Check" class="md8" @click="onsubmit" v-if="showSaveButton">保存</el-button>
+            <el-button type="primary" icon="el-icon-Check" class="md8" @click="onsubmit" v-if="showSaveButton">
+                保存
+            </el-button>
             <back-component style="margin: 8px" />
-            
         </div>
         <div :style="pageHeight" style="overflow-y: auto">
             <el-collapse v-model="activeNames" class="pl10 pr10">
@@ -29,7 +30,13 @@
                             <Area ref="areaRef" v-model="form.deptId" style="width: 100%" @changeValue="changeArea" />
                         </el-form-item>
                         <el-form-item label="用户名称" prop="assessName">
-                            <el-input v-model="form.assessName" placeholder="用户名称" clearable show-word-limit maxlength="32"/>
+                            <el-input
+                                v-model="form.assessName"
+                                placeholder="用户名称"
+                                clearable
+                                show-word-limit
+                                maxlength="32"
+                            />
                         </el-form-item>
                         <el-form-item label="用户电压等级" prop="userScale">
                             <el-select v-model="form.userScale" clearable placeholder="请选择电压等级">
@@ -47,8 +54,8 @@
                                 v-model.trim="form.agreedCapacity"
                                 show-word-limit
                                 placeholder="请输入值"
-                                max="9999"
-                                min="0"
+                                :max="9999"
+                                :min="0"
                             ></el-input-number>
                         </el-form-item>
                         <el-form-item label="是否包含电容器" prop="withCapacitor">
@@ -78,6 +85,19 @@
                                 <el-option label="否" value="01"></el-option>
                             </el-select>
                         </el-form-item>
+                        <el-form-item label="预测评估关联">
+                            <el-select v-model="assessMentId" filterable clearable placeholder="请选择预测评估关联">
+                                <el-option
+                                    v-for="option in userList.filter(
+                                        item =>
+                                            item.secondAssessmentId == null || item.secondAssessmentId == form.assessId
+                                    )"
+                                    :key="option.id"
+                                    :label="option.projectName"
+                                    :value="option.id"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
                     </el-form>
                 </el-collapse-item>
                 <el-collapse-item title="系统参数维护" :name="2">
@@ -143,8 +163,8 @@
                                 v-model.trim="form.powersupplyCapacity"
                                 show-word-limit
                                 placeholder="请输入值"
-                                min="0"
-                                max="9999"
+                                :min="0"
+                                :max="9999"
                             ></el-input-number>
                         </el-form-item>
                         <el-form-item label="最小短路容量(MVA)" prop="minshortcircuitCapacity">
@@ -153,8 +173,8 @@
                                 v-model.trim="form.minshortcircuitCapacity"
                                 show-word-limit
                                 placeholder="请输入值"
-                                 min="0"
-                                max="9999"
+                                :min="0"
+                                :max="9999"
                             ></el-input-number>
                         </el-form-item>
                         <el-form-item label="PCC点名称" prop="lineId">
@@ -184,8 +204,8 @@
                                 v-model.trim="form.lineLen"
                                 show-word-limit
                                 placeholder="请输入值"
-                                max="9999"
-                                min="0"
+                                :max="9999"
+                                :min="0"
                             ></el-input-number>
                         </el-form-item>
                         <el-form-item label="回路数" prop="lineNum">
@@ -194,8 +214,8 @@
                                 v-model.trim="form.lineNum"
                                 show-word-limit
                                 placeholder="请输入值"
-                                max="9999"
-                                min="0"
+                                :max="9999"
+                                :min="0"
                             ></el-input-number>
                         </el-form-item>
                         <el-form-item label="PCC点电网电阻" prop="lineGridreactance">
@@ -204,8 +224,8 @@
                                 v-model.trim="form.lineGridreactance"
                                 show-word-limit
                                 placeholder="请输入值"
-                                max="9999"
-                                min="0"
+                                :max="9999"
+                                :min="0"
                             ></el-input-number>
                         </el-form-item>
                         <el-form-item label="PCC电电网电抗" prop="lineGridresistance">
@@ -214,14 +234,19 @@
                                 v-model.trim="form.lineGridresistance"
                                 show-word-limit
                                 placeholder="请输入值"
-                                max="9999"
-                                min="0"
+                                :max="9999"
+                                :min="0"
                             ></el-input-number>
                         </el-form-item>
                     </el-form>
                 </el-collapse-item>
                 <div v-if="form.assessId">
-                    <tabFrom :assessId="form.assessId" :isWindfarm="form.isWindfarm" :isWithCapacitor="form.withCapacitor"  :disabled="formDisabled"/>
+                    <tabFrom
+                        :assessId="form.assessId"
+                        :isWindfarm="form.isWindfarm"
+                        :isWithCapacitor="form.withCapacitor"
+                        :disabled="formDisabled"
+                    />
                 </div>
             </el-collapse>
         </div>
@@ -238,30 +263,29 @@ import { ElMessage, ElMessageBox, ElDatePicker } from 'element-plus'
 import { useRoute } from 'vue-router'
 import { getSubstationSelect } from '@/api/device-boot/line'
 import tabFrom from './tabFrom.vue'
-import { cableList, getBusBarSelect, getMonitorSelect, userAdd, userGetInfo ,userEdit} from '@/api/advance-boot/assess'
+import { cableList, getBusBarSelect, getMonitorSelect, userAdd, userGetInfo, userEdit } from '@/api/advance-boot/assess'
+import { selectUserAssessMentList, bindAssessmentId } from '@/api/device-boot/Business'
 const activeNames = ref([1, 2, 3, 4, 5, 6, 7])
 const dictData = useDictData()
 const pageHeight = mainHeight(70)
 const areaOptionList = dictData.getBasicData('jibei_area')
-const { query} = useRoute() // 查询参数
+const { query } = useRoute() // 查询参数
 //字典获取电压等级
 const voltageleveloption = dictData.getBasicData('Dev_Voltage_Stand')
 const powerstationList: any = ref([]) //变电站列表
 const busList: any = ref([]) //generatrix列表
 const linetypeList: any = ref([]) //线路类型
 const pccList: any = ref([]) //pcc列表
-
-
+const userList: any = ref([]) //用户列表
 const route = useRoute()
 const isViewMode = ref(route.query.mode === 'view')
-
+const assessMentId = ref('')
 // 根据 isViewMode 控制表单的禁用状态
 const formDisabled = ref(isViewMode.value)
 
 // 或者在保存按钮上根据模式控制显示
 const showSaveButton = !isViewMode.value
 
-
 const form: any = ref({
     assessId: '',
     deptId: dictData.state.area[0].id,
@@ -313,11 +337,11 @@ const rules = {
 }
 
 const windfarmCapacityLabel = computed(() => {
-  if (form.value.isWindfarm === '01') {
-    return '风电场装机容量(MW)'
-  } else {
-    return '用户有功容量(MW)'
-  }
+    if (form.value.isWindfarm === '01') {
+        return '风电场装机容量(MW)'
+    } else {
+        return '用户有功容量(MW)'
+    }
 })
 
 const form1 = ref()
@@ -327,27 +351,31 @@ const form2 = ref()
 const onsubmit = () => {
     form1.value.validate((valid: any) => {
         if (valid) {
-            form2.value.validate((valid2: any) => {
+            form2.value.validate(async (valid2: any) => {
                 if (valid2) {
-                    if(form.value.assessId){
-                        userEdit(form.value).then((res: any) => {
+                    if (form.value.assessId) {
+                        await userEdit(form.value).then((res: any) => {
                             //form.value.assessId = res.data
                             ElMessage({
                                 type: 'success',
                                 message: '编辑成功!'
                             })
                         })
-                    }else{
-                        userAdd(form.value).then((res: any) => {
-                        form.value.assessId = res.data
-                       
-                        ElMessage({
+                    } else {
+                        await userAdd(form.value).then((res: any) => {
+                            form.value.assessId = res.data
+
+                            ElMessage({
                                 type: 'success',
                                 message: '新增成功!'
                             })
                         })
                     }
-                  
+
+                    await bindAssessmentId({
+                        userReportId: form.value.assessId,
+                        assessMentId: assessMentId.value || 'null'
+                    })
                 }
             })
         }
@@ -355,6 +383,8 @@ const onsubmit = () => {
 }
 
 const info = async (id?: string) => {
+    // 获取关联用户
+
     // 获取电站
     await getSubstationSelect().then(res => {
         powerstationList.value = res.data
@@ -364,15 +394,28 @@ const info = async (id?: string) => {
         linetypeList.value = res.data
     })
     if (id) {
-        userGetInfo({ assessId: id }).then(async (res: any) => {
+        await userGetInfo({ assessId: id }).then(async (res: any) => {
             form.value = res.data
             await changePowerstation(res.data.powerstationId, false)
         })
     }
+    getUserList(true)
+}
+const getUserList = async (e?: any) => {
+    selectUserAssessMentList({ orgId: form.value.deptId, secondAssessmentId: form.value.assessId || '' }).then(res => {
+        userList.value = res.data
+        console.log('🚀 ~ getUserList ~ e:', e)
+        if (e) {
+            assessMentId.value = res.data.filter(item => item.secondAssessmentId == form.value.assessId)[0]?.id || ''
+        } else {
+            assessMentId.value = ''
+        }
+    })
 }
 // 地市切换
 const changeArea = (e: any) => {
     form.value.deptName = e.label
+    getUserList()
 }
 // 点击变电站
 const changePowerstation = (e: any, flag: boolean = true) => {
@@ -404,12 +447,9 @@ const LineChange = (e: any) => {
     form.value.lineName = data.name
 }
 
-
-
 onMounted(() => {
     info(query?.id)
 })
-
 </script>
 <style lang="scss" scoped>
 .actionButtons {
@@ -450,5 +490,3 @@ onMounted(() => {
     min-width: 120px;
 }
 </style>
-
-

src/views/pqs/runManage/assessment/components/uese/index.vue

@@ -102,7 +102,8 @@ import { ElMessage, ElMessageBox, ElDatePicker } from 'element-plus'
 import { cableList, batchDel } from '@/api/advance-boot/assess'
 import { useRouter } from 'vue-router'
 import Form from './form.vue'
-
+import { selectUserList, bindAssessmentId } from '@/api/device-boot/Business'
+import { forEach } from 'min-dash'
 defineOptions({
     name: 'runManage/addUser'
 })
@@ -223,11 +224,10 @@ const tableStore: any = new TableStore({
         }
     ],
     beforeSearchFun: () => {
-         tableStore.table.params.deptId = tableStore.table.params.deptIndex
-       
+        tableStore.table.params.deptId = tableStore.table.params.deptIndex
     },
 
-    loadCallback: () => { }
+    loadCallback: () => {}
 })
 tableStore.table.params.assessName = ''
 tableStore.table.params.deptId = ''
@@ -242,9 +242,9 @@ const route = useRoute()
 // 监听路由变化
 watch(
     () => route.query,
-    (newQuery) => {
+    newQuery => {
         tableStore.index()
-    },
+    }
     // { immediate: true }
 )
 
@@ -272,11 +272,19 @@ const del = () => {
             cancelButtonText: '取消',
             type: 'warning'
         }).then(() => {
-            batchDel(tableStore.table.selection.map(item => item.assessId)).then(res => {
+            let ids = tableStore.table.selection.map(item => item.assessId)
+            batchDel(ids).then(res => {
                 ElMessage({
                     type: 'success',
                     message: '删除成功!'
                 })
+                ids.forEach(item => {
+                    bindAssessmentId({
+                        userReportId: item,
+                        assessMentId: null
+                    })
+                })
+
                 tableStore.index()
             })
         })
@@ -286,7 +294,4 @@ onMounted(() => {
     tableStore.index()
     Info()
 })
-
-
-
 </script>

src/views/pqs/runManage/cleaning/components/anomalyDetails.vue

@@ -1,7 +1,7 @@
 <template>
     <el-dialog draggable width="1550px" class="cn-operate-dialog" v-model="dialogVisible" :title="title">
         <div style="display: flex" v-loading="loading">
-            <div :style="height1" class="mr10 box" style="width: 600px">
+            <div :style="height1" class="mr10 box" style="width: 550px">
                 <vxe-table
                     height="auto"
                     :data="TableData"
@@ -16,14 +16,14 @@
                     <vxe-column field="monitorName" title="监测点名称"></vxe-column>
                     <vxe-column field="timeSum" title="异常天数" width="80px">
                         <template v-slot="{ row }">
-                            {{ row.dateList?.length }}
+                            {{ row.dateTargetList?.length }}
                         </template>
                     </vxe-column>
                     <!-- <vxe-column field="errCount" title="异常次数" width="80px"></vxe-column> -->
                 </vxe-table>
             </div>
 
-            <div style="width: 920px" v-loading="loading1">
+            <div style="width: 970px" v-loading="loading1">
                 <el-form :inline="true" class="form">
                     <el-form-item label="统计日期">
                         <el-select
@@ -32,15 +32,45 @@
                             collapse-tags
                             clearable
                             placeholder="请选择异常天数"
-                            style="width: 200px"
+                            style="width: 180px"
+                            @change="change"
                         >
-                            <el-option v-for="item in dateList" :key="item" :label="item" :value="item" />
+                            <el-option
+                                v-for="item in dateList"
+                                :key="item.date"
+                                :label="item.date"
+                                :value="item.date"
+                            />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="统计指标" v-if="numKey != 0">
+                        <el-select
+                            v-model="targetKey"
+                            filterable
+                            clearable
+                            placeholder="请选择指标"
+                            style="width: 150px"
+                        >
+                            <el-option
+                                v-for="item in targetList"
+                                :key="item.key"
+                                :label="item.targetName"
+                                :value="item.key"
+                            />
                         </el-select>
                     </el-form-item>
 
                     <el-form-item class="form_but">
-                        <span class="mr20">异常时间：<span class="title">{{ timeSum }}</span>分钟</span>
-                        <span class="mr10">异常次数：<span class="title">{{ errCount }}</span>次</span>
+                        <span class="mr20">
+                            异常时间：
+                            <span class="title">{{ timeSum }}</span>
+                            分钟
+                        </span>
+                        <span class="mr10">
+                            异常次数：
+                            <span class="title">{{ errCount }}</span>
+                            次
+                        </span>
 
                         <el-button type="primary" @click="init" icon="el-icon-Search">查询</el-button>
                     </el-form-item>
@@ -136,17 +166,19 @@ const pageNum = ref(1)
 const pageSize = ref(20)
 const numKey = ref(0)
 const targetKey = ref('')
+const targetList: any = ref([])
 const errCount = ref('')
 const timeSum = ref('')
 const timeList = ref([])
 const showColumn = ref(true)
+
 const open = (data: anyObj, time: string[], num: number) => {
     // title.value = (num == 0 ? data.targetName : data.monitorName) + '_异常监测点详情'
     loading.value = true
     title.value = '异常监测点详情'
     TableData.value = []
     numKey.value = num
-    targetKey.value = data.key
+    targetKey.value = data.key || ''
     monitorAbnormalTable({
         monitorIds: num == 0 ? data.ids : [data.monitorId],
         targetKey: num == 0 ? data.key : '',
@@ -167,13 +199,14 @@ const open = (data: anyObj, time: string[], num: number) => {
 const currentChangeEvent = () => {
     let data = tableRef.value.getCurrentRecord()
 
-    dateList.value = data.dateList
-    console.log('🚀 ~ currentChangeEvent ~ dateList.value:', dateList.value)
-    timeList.value = [data.dateList[0]]
+    dateList.value = data.dateTargetList
+    targetList.value = dateList.value[0].targetKeys
+    timeList.value = [data.dateTargetList[0].date]
+
     init()
 }
 const init = () => {
-    if(timeList.value.length == 0) return ElMessage.warning('请选择异常天数！')
+    if (timeList.value.length == 0) return ElMessage.warning('请选择异常天数！')
     loading1.value = true
     TableData1.value = []
     let data = tableRef.value.getCurrentRecord()
@@ -181,7 +214,7 @@ const init = () => {
         monitorIds: [data.monitorId],
         time: timeList.value,
         searchBeginTime: data.date,
-        targetKey: numKey.value == 0 ? targetKey.value : ''
+        targetKey: targetKey.value || '' //numKey.value == 0 ? targetKey.value : ''
     })
         .then(res => {
             errCount.value = res.data.errCount
@@ -195,6 +228,33 @@ const init = () => {
             loading1.value = false
         })
 }
+const change = () => {
+    if (timeList.value.length == 0) targetKey.value = ''
+    let list = dateList.value
+        .filter(item => timeList.value.includes(item.date))
+        ?.map(item => {
+            return item.targetKeys
+        })
+        .flat()
+    targetList.value = deduplicateByKey(list)
+    if (!targetList.value.some(item => item.key == targetKey.value)) {
+        targetKey.value = ''
+    }
+}
+// 核心去重逻辑
+function deduplicateByKey(data) {
+    // 使用Map存储唯一key，保证顺序且去重
+    const uniqueMap = new Map()
+    data.forEach(item => {
+        if (!uniqueMap.has(item.key)) {
+            uniqueMap.set(item.key, item)
+        }
+    })
+
+    // 转换为数组并按sort排序
+    const deduplicatedData = Array.from(uniqueMap.values())
+    return deduplicatedData
+}
 const formatter = (row: any) => {
     return row.cellValue == null ? '/' : (row.cellValue - 0).toFixed(2)
 }
@@ -224,8 +284,11 @@ defineExpose({ open })
         right: -22px;
     }
 }
-.title{
+.title {
     font-weight: 600;
     font-size: 16px;
 }
+:deep(.el-select) {
+    min-width: 100px !important;
+}
 </style>

src/views/pqs/supervise/electricalEnergy/components1/complaintsDetail.vue

@@ -41,7 +41,7 @@
                     {{ list.takeStep }}
                 </el-descriptions-item>
                 <el-descriptions-item :span="1" label="处理成效报告">
-                <el-icon class="elView " v-if="list?.reportName && VITE_FLAG" >
+                <el-icon class="elView " v-if="list?.reportName " >
                     <View @click="openFile(list?.reportPath)" />
                 </el-icon>
                 <a class="aLoad" @click="download(list.keyName)" target="_blank">{{ list.reportName }}</a>
@@ -63,7 +63,7 @@ const dialogVisible = ref(false)
 const title = ref('')
 const dictData = useDictData()
 const list: any = ref({})
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+
 const open = (row: any) => {
     list.value={}
     title.value = row.title

src/views/pqs/supervise/electricalEnergy/components1/form/abnormal.vue

@@ -12,7 +12,7 @@
                 >
                     <vxe-column type="seq" title="序号" width="60px"></vxe-column>
                     <!-- <vxe-column field="date" title="日期"></vxe-column> -->
-                    <vxe-column field="name" title="统计日期"></vxe-column>
+                    <vxe-column field="date" title="统计日期"></vxe-column>
                     <!-- <vxe-column field="monitorName" title="监测点名称"></vxe-column>
                     <vxe-column field="timeSum" title="异常天数" width="80px">
                         <template v-slot="{ row }">
@@ -25,19 +25,23 @@
 
             <div style="width: 920px" v-loading="loading1">
                 <el-form :inline="true" class="form">
-                    <!-- <el-form-item label="统计日期">
+                    <el-form-item label="统计指标">
                         <el-select
-                            v-model="timeList"
-                            multiple
-                            collapse-tags
+                            v-model="targetKey"
+                            filterable
                             clearable
-                            placeholder="请选择异常天数"
-                            style="width: 200px"
+                            placeholder="请选择指标"
+                            style="width: 150px"
+                            @change="init"
                         >
-                            <el-option v-for="item in dateList" :key="item" :label="item" :value="item" />
+                            <el-option
+                                v-for="item in targetList"
+                                :key="item.key"
+                                :label="item.targetName"
+                                :value="item.key"
+                            />
                         </el-select>
-                    </el-form-item> -->
-
+                    </el-form-item>
                     <el-form-item class="form_but">
                         <span class="mr20">
                             异常时间：
@@ -58,7 +62,6 @@
                         height="auto"
                         :data="TableData1.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
                         v-bind="defaultAttribute"
-                       
                     >
                         <vxe-column type="seq" title="序号" width="80px">
                             <template #default="{ rowIndex }">
@@ -147,6 +150,7 @@ const targetKey = ref('')
 const errCount = ref('')
 const timeSum = ref('')
 const timeList = ref([])
+const targetList = ref([])
 const showColumn = ref(true)
 const open = (data: anyObj, time: string[]) => {
     // title.value = (num == 0 ? data.targetName : data.monitorName) + '_异常监测点详情'
@@ -157,18 +161,15 @@ const open = (data: anyObj, time: string[]) => {
     timeList.value = []
     targetKey.value = data.key
     monitorAbnormalTable({
-        monitorIds:[data.lineId],
+        monitorIds:  [data.lineId],
         targetKey: '',
         searchBeginTime: time[0],
         searchEndTime: time[1]
     })
         .then(async res => {
             TableData.value = res.data
-            timeList.value = TableData.value[0]?.dateList.map((item: any) => {
-                return {
-                    name: item
-                }
-            })
+            timeList.value = TableData.value[0]?.dateTargetList
+            targetList.value = timeList.value[0].targetKeys
             await tableRef.value.setCurrentRow(timeList.value[0])
             await currentChangeEvent()
             loading.value = false
@@ -180,7 +181,10 @@ const open = (data: anyObj, time: string[]) => {
 }
 const currentChangeEvent = () => {
     let data = tableRef.value.getCurrentRecord()
-
+    targetList.value = data.targetKeys
+        if (!targetList.value.some(item => item.key == targetKey.value)) {
+        targetKey.value = ''
+    }
     // dateList.value = data.dateList
     //[data.dateList[0]]
     init()
@@ -191,9 +195,9 @@ const init = () => {
     let data = tableRef.value.getCurrentRecord()
     monitorAbnormalTableDetail({
         monitorIds: [TableData.value[0]?.monitorId],
-        time: [data.name],
+        time: [data.date],
         searchBeginTime: TableData.value[0].date,
-        targetKey: ''
+        targetKey: targetKey.value
     })
         .then(res => {
             errCount.value = res.data.errCount
@@ -234,7 +238,7 @@ defineExpose({ open })
     // justify-content: end;
     // position: relative;
     // .form_but {
-      
+
     //     right: -22px;
     // }
 }

src/views/pqs/supervise/electricalEnergy/components1/online.vue

@@ -133,6 +133,7 @@ const list: any = ref({
     alarmThreshold: ''
 })
 const level: any = ref(dictData.state.area[0]?.level)
+console.log('level', level)
 const flag: any = ref('')
 const tableStore = new TableStore({
     url: '/supervision-boot/onlineMonitor/list',
@@ -364,7 +365,7 @@ tableStore.table.params.dataType = '1'
 tableStore.table.params.deptId = dictData.state.area[0].id
 provide('tableStore', tableStore)
 onMounted(() => {
-    TableHeaderRef.value.setDatePicker([{ label: '月', value: 3 }])
+    TableHeaderRef.value.setDatePicker([{ label: '月份', value: 3 }])
 
     tableStore.index()
     setTimeout(() => {

src/views/pqs/supervise/electricalEnergy/components1/testRunDetail.vue

@@ -44,7 +44,7 @@
                     {{ list.takeStep }}
                 </el-descriptions-item>
                 <el-descriptions-item :span="2" label="处理成效报告">
-                    <el-icon class="elView " v-if="list?.reportName && VITE_FLAG">
+                    <el-icon class="elView " v-if="list?.reportName ">
                         <View @click="openFile(list?.reportPath)" />
                     </el-icon>
                     <a class="aLoad" @click="download(list.keyName)" target="_blank">{{ list.reportName }}</a>
@@ -66,7 +66,7 @@ const dialogVisible = ref(false)
 const title = ref('')
 const list: any = ref({})
 const dictData = useDictData()
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+
 const open = (row: any) => {
     list.value = {}
     title.value = row.title

src/views/pqs/supervise/electricalEnergy/index.vue

@@ -10,7 +10,7 @@
             <el-tab-pane :label="VITE_FLAG ? '现场测试' : '计划实施问题'"  name="3" v-if="tabList.includes('3')">
                 <testQuestions v-if="activeName == '3'" />
             </el-tab-pane>
-            <el-tab-pane label="试运行评估" name="4" v-if="tabList.includes('4')">
+            <el-tab-pane label="试运行评估问题" name="4" v-if="tabList.includes('4')">
                 <testRun v-if="activeName == '4'" />
             </el-tab-pane>
             <!-- <el-tabs v-model="activeName" type="border-card">

src/views/pqs/supervise/harmonicSurvey/detail.vue

@@ -1,5 +1,9 @@
 <template>
     <div class="default-main">
+         <div v-if="detailLoading" class="loading">
+            <el-spin description="加载中..." />
+        </div>
+        <div v-else>
         <!--        <h1>详细信息回显</h1>-->
         <el-descriptions :column="2" border>
             <el-descriptions-item label="普测计划名称">
@@ -49,6 +53,7 @@
                 </vxe-column>
             </vxe-table>
         </div>
+        </div>
     </div>
 </template>
 <script setup lang="ts">

src/views/pqs/supervise/harmonicSurvey/plan/detail.vue

@@ -1,5 +1,9 @@
 <template>
   <div class='default-main'>
+     <div v-if="detailLoading" class="loading">
+            <el-spin description="加载中..." />
+        </div>
+        <div v-else>
     <el-descriptions :column='2' label-width="140px" border>
       <el-descriptions-item label='技术监督计划名称'>
         {{ detailData?.planName }}
@@ -43,6 +47,7 @@
         <vxe-column field='dataSource' title='变电站来源' :formatter='formatterSource'></vxe-column>
       </vxe-table>
     </div>
+    </div>
   </div>
 </template>
 <script setup lang='ts'>

src/views/pqs/supervise/harmonicSurvey/test/detail.vue

@@ -1,5 +1,9 @@
 <template>
     <div class="default-main">
+         <div v-if="detailLoading" class="loading">
+            <el-spin description="加载中..." />
+        </div>
+        <div v-else>
         <el-descriptions :column="2" border>
             <el-descriptions-item label="技术监督计划名称">
                 {{ detailData?.planName }}
@@ -56,27 +60,27 @@
 
 
             <el-descriptions-item :span="2" label="技术监督报告">
-                <el-icon class="elView" v-if="detailData?.supervisionReportName && VITE_FLAG">
+                <el-icon class="elView" v-if="detailData?.supervisionReportName ">
                     <View @click="openFile(detailData?.supervisionReportName)" />
                 </el-icon>
                <span  class="aLoad" @click="download(detailData.keyName)" target="_blank">{{ detailData.supervisionReportName }}</span >
             </el-descriptions-item>
             <el-descriptions-item :span="2" label="测试报告">
-                <el-icon class="elView" v-if="detailData?.testReportName && VITE_FLAG">
+                <el-icon class="elView" v-if="detailData?.testReportName ">
                     <View @click="openFile(detailData?.testReportName)" />
                 </el-icon>
                <span  class="aLoad" @click="download(detailData.keyName)" target="_blank">{{ detailData.testReportName }}</span >
             </el-descriptions-item>
             <el-descriptions-item :span="2" label="其他报告">
                 <div v-for="item in detailData.otherReports">
-                    <el-icon class="elView" v-if="item.fileName && VITE_FLAG">
+                    <el-icon class="elView" v-if="item.fileName ">
                         <View @click="openFile(item.fileName)" />
                     </el-icon>
                    <span  class="aLoad" @click="download(item.keyName)" target="_blank">{{ item.fileName }}</span >
                 </div>
             </el-descriptions-item>
             <el-descriptions-item :span="2" label="处理成效报告" v-if="props.flag">
-                <el-icon class="elView " v-if="detailData?.reportName && VITE_FLAG">
+                <el-icon class="elView " v-if="detailData?.reportName ">
                     <View @click="openFile(detailData?.reportName)" />
                 </el-icon>
                <span  class="aLoad" @click="download(detailData.keyName)" target="_blank">{{ detailData.reportName }}</span >
@@ -87,6 +91,8 @@
                 </el-tag>
             </el-descriptions-item> -->
         </el-descriptions>
+        </div>
+        
     </div>
 </template>
 <script setup lang="ts">
@@ -105,7 +111,7 @@ const openFile = (name: any) => {
     window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
 }
 
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+
 const { query } = useRoute() // 查询参数
 const props = defineProps({
     id: propTypes.string.def(undefined),

src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue

@@ -161,13 +161,35 @@
                     </template>
                 </el-upload>
             </el-form-item>
+            <el-form-item
+                class="uploadFile"
+                v-if="bussType != 0"
+                label="治理方案仿真校验评估报告"
+                prop="simulationReportUrl"
+            >
+                <el-upload
+                    v-model:file-list="form.simulationReportUrl"
+                    ref="simulationReportRef"
+                    action=""
+                    accept=".doc,.docx,.xlsx,.xls,.pdf"
+                    :limit="1"
+                    :on-exceed="handleExceed1"
+                    :on-change="choose1"
+                    :auto-upload="false"
+                    :on-remove="removeFile1"
+                >
+                    <template #trigger>
+                        <el-button type="primary">上传文件</el-button>
+                    </template>
+                </el-upload>
+            </el-form-item>
         </el-form>
         <template #footer>
             <div class="dialog-footer">
                 <el-button @click="close()">取消</el-button>
                 <!-- <el-button type="primary" @click="confirmForm()">确定</el-button> -->
-                <el-button type="primary" @click="confirmForm(true)" :loading="loading" >保存</el-button>
-                <el-button type="primary" @click="confirmForm(false)" :loading="loading" >提交审批</el-button>
+                <el-button type="primary" @click="confirmForm(true)" :loading="loading">保存</el-button>
+                <el-button type="primary" @click="confirmForm(false)" :loading="loading">提交审批</el-button>
             </div>
         </template>
     </el-dialog>
@@ -179,9 +201,8 @@ import { genFileId, ElMessage } from 'element-plus'
 import { useDictData } from '@/stores/dictData'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { uploadFile } from '@/api/system-boot/file'
-import { submitGoNet } from '@/api/supervision-boot/interfere/index'
+import { submitGoNet, getFileById, addOrUpdateFile } from '@/api/supervision-boot/interfere/index'
 import { getUserReportById } from '@/api/supervision-boot/userReport/form'
-import { lo } from 'element-plus/es/locale'
 
 const props = defineProps({
     openType: {
@@ -199,7 +220,8 @@ const props = defineProps({
     }
 })
 const rules = {
-    goToNetReport: [{ required: true, message: '请上传报告', trigger: 'blur' }]
+    goToNetReport: [{ required: true, message: '请上传报告', trigger: 'blur' }],
+    simulationReportUrl: [{ required: true, message: '请上传报告', trigger: 'blur' }]
 }
 const loading = ref(false)
 const emits = defineEmits(['onSubmit'])
@@ -208,6 +230,7 @@ const dialogFormVisible = ref(false)
 
 const form: any = ref({})
 const ruleFormRef: any = ref(null)
+const simulationReportRef: any = ref(null)
 //字典获取所在地市
 const areaOptionList = dictData.getBasicData('jibei_area')
 //字典电压等级
@@ -273,6 +296,7 @@ const resetForm = () => {
         reportDate: new Date(), //填报日期
         orgId: '', //填报部门
         goToNetReport: [], //报告
+        simulationReportUrl: [], //报告
         userType: 0, //用户性质
         city: areaOptionList[0].name, //所在地市
         responsibleDepartment: '', //归口管理部门
@@ -301,6 +325,7 @@ const getInfo = async (row?: any) => {
             form.value.reportDate = new Date()
             if (row) {
                 goToNetReport.value = row.otherReport
+                simulationReportUrl.value = row.simulationReport
                 form.value.id = row.id
                 form.value.goToNetReport =
                     row.otherReport == null || row.otherReport == ''
@@ -310,6 +335,14 @@ const getInfo = async (row?: any) => {
                                   name: row.otherReport.split('/')[2]
                               }
                           ]
+                form.value.simulationReportUrl =
+                    row.simulationReport == null || row.simulationReport == ''
+                        ? []
+                        : [
+                              {
+                                  name: row.simulationReport.split('/')[2]
+                              }
+                          ]
             }
         })
     } finally {
@@ -337,6 +370,12 @@ const handleExceed: UploadProps['onExceed'] = files => {
     file.uid = genFileId()
     uploadRef.value!.handleStart(file)
 }
+const handleExceed1: UploadProps['onExceed'] = files => {
+    simulationReportRef.value!.clearFiles()
+    const file = files[0] as UploadRawFile
+    file.uid = genFileId()
+    simulationReportRef.value!.handleStart(file)
+}
 
 //移除文件上传
 const removeFile = (file: any, uploadFiles: any) => {
@@ -344,9 +383,15 @@ const removeFile = (file: any, uploadFiles: any) => {
     goToNetReport.value = ''
     form.value.goToNetReport = uploadFiles
 }
+const removeFile1 = (file: any, uploadFiles: any) => {
+    console.log(file, uploadFiles)
+    simulationReportUrl.value = ''
+    form.value.simulationReportUrl = uploadFiles
+}
 
 // 治理工程验收报告数组
 const goToNetReport = ref('')
+const simulationReportUrl = ref('')
 
 const choose = (e: any) => {
     uploadFile(e.raw, '/supervision/').then(res => {
@@ -354,6 +399,12 @@ const choose = (e: any) => {
         goToNetReport.value = res.data.name
     })
 }
+const choose1 = (e: any) => {
+    uploadFile(e.raw, '/supervision/').then(res => {
+        //治理工程验收报告
+        simulationReportUrl.value = res.data.name
+    })
+}
 
 //提交
 const confirmForm = (flag: boolean) => {
@@ -363,6 +414,7 @@ const confirmForm = (flag: boolean) => {
             type: props.bussType,
             userReportId: props.id,
             reportUrl: goToNetReport.value,
+            simulationReportUrl: simulationReportUrl.value,
             id: form.value.id || null,
             saveOrCheckflag: '1'
         }
@@ -386,6 +438,7 @@ const confirmForm = (flag: boolean) => {
             type: props.bussType,
             userReportId: props.id,
             reportUrl: goToNetReport.value,
+            simulationReportUrl: simulationReportUrl.value,
             id: form.value.id || null,
             saveOrCheckflag: '2'
         }
@@ -404,5 +457,6 @@ const confirmForm = (flag: boolean) => {
         loading.value = false
     }, 0)
 }
+
 defineExpose({ open })
 </script>

src/views/pqs/supervise/interfere/components/normalizationManager/detail.vue

@@ -1,317 +1,340 @@
 <template>
     <div class="details">
-        <el-divider content-position="left">干扰源用户信息</el-divider>
-        <el-descriptions :column="2" border>
-            <el-descriptions-item label="工程预期投产日期">
-                {{ formatDate(detailData.expectedProductionDate, 'YYYY-MM-DD') }}
-            </el-descriptions-item>
-            <el-descriptions-item label="用户性质">
-                {{
-                    userTypeList.find(item => {
-                        return item.value == detailData.userType
-                    })?.label
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="所在地市">
-                {{ detailData.city }}
-            </el-descriptions-item>
-            <el-descriptions-item label="归口管理部门">
-                {{ detailData.responsibleDepartment }}
-            </el-descriptions-item>
-            <el-descriptions-item label="用户状态">
-                {{
-                    userStateList.find(item => {
-                        return item.value == detailData.userStatus
-                    })?.label
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="变电站">
-                {{ detailData.substation }}
-            </el-descriptions-item>
-            <el-descriptions-item label="项目名称">
-                {{ detailData.projectName }}
-            </el-descriptions-item>
-            <el-descriptions-item label="用户协议容量" v-if="detailData.userType == 0 || detailData.userType == 1">
-                {{ proviteData.agreementCapacity }}
-            </el-descriptions-item>
-            <el-descriptions-item label="电压等级">
-                {{
-                    voltageLevelList.find(item => {
-                        return item.id == detailData.voltageLevel
-                    })?.name
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="非线性终端类型" v-if="detailData.userType == 0 || detailData.userType == 1">
-                {{ proviteData.nonlinearDeviceType ? proviteData.nonlinearDeviceType : '-' }}
-            </el-descriptions-item>
-            <el-descriptions-item label="预测评估单位">
-                {{ detailData.evaluationDept }}
-            </el-descriptions-item>
-            <el-descriptions-item label="预测评估结论">
-                {{ detailData.evaluationConclusion }}
-            </el-descriptions-item>
-            <el-descriptions-item
-                :label="
-                    detailData.userType == '4' || detailData.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'
-                "
-                v-if="
-                    detailData.userType == '2' ||
-                    detailData.userType == '3' ||
-                    detailData.userType == '4' ||
-                    detailData.userType == '5'
-                "
-            >
-                {{ proviteData.nonlinearLoadType }}
-            </el-descriptions-item>
-            <el-descriptions-item label="是否需要治理">
-                <span v-if="detailData.userType == 0 || detailData.userType == 1">
-                    {{ proviteData.needGovernance == 0 ? '否' : '是' }}
-                </span>
-                <span
+        <div v-if="detailLoading" class="loading">
+            <el-spin description="加载中..." />
+        </div>
+        <div v-else>
+            <el-divider content-position="left">干扰源用户信息</el-divider>
+            <el-descriptions :column="2" border>
+                <el-descriptions-item label="工程预期投产日期">
+                    {{ formatDate(detailData.expectedProductionDate, 'YYYY-MM-DD') }}
+                </el-descriptions-item>
+                <el-descriptions-item label="用户性质">
+                    {{
+                        userTypeList.find(item => {
+                            return item.value == detailData.userType
+                        })?.label
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item label="所在地市">
+                    {{ detailData.city }}
+                </el-descriptions-item>
+                <el-descriptions-item label="归口管理部门">
+                    {{ detailData.responsibleDepartment }}
+                </el-descriptions-item>
+                <el-descriptions-item label="用户状态">
+                    {{
+                        userStateList.find(item => {
+                            return item.value == detailData.userStatus
+                        })?.label
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item label="变电站">
+                    {{ detailData.substation }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目名称">
+                    {{ detailData.projectName }}
+                </el-descriptions-item>
+                <el-descriptions-item label="用户协议容量" v-if="detailData.userType == 0 || detailData.userType == 1">
+                    {{ proviteData.agreementCapacity }}
+                </el-descriptions-item>
+                <el-descriptions-item label="电压等级">
+                    {{
+                        voltageLevelList.find(item => {
+                            return item.id == detailData.voltageLevel
+                        })?.name
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="非线性终端类型"
+                    v-if="detailData.userType == 0 || detailData.userType == 1"
+                >
+                    {{ proviteData.nonlinearDeviceType ? proviteData.nonlinearDeviceType : '-' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="预测评估单位">
+                    {{ detailData.evaluationDept }}
+                </el-descriptions-item>
+                <el-descriptions-item label="预测评估结论">
+                    {{ detailData.evaluationConclusion }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    :label="
+                        detailData.userType == '4' || detailData.userType == '5'
+                            ? '非线性设备类型: '
+                            : '非线性负荷类型：'
+                    "
                     v-if="
-                        detailData.userType == 2 ||
-                        detailData.userType == 3 ||
-                        detailData.userType == 4 ||
-                        detailData.userType == 5
+                        detailData.userType == '2' ||
+                        detailData.userType == '3' ||
+                        detailData.userType == '4' ||
+                        detailData.userType == '5'
                     "
                 >
-                    {{ proviteData.needGovernance == 0 ? '否' : '是' }}
-                </span>
-                <span v-if="detailData.userType == 6">{{ proviteData.needGovernance == 0 ? '否' : '是' }}</span>
-            </el-descriptions-item>
-            <el-descriptions-item label="是否开展背景测试">
-                <span v-if="detailData.userType == 0 || detailData.userType == 1">
-                    {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
-                </span>
-                <span
+                    {{ proviteData.nonlinearLoadType }}
+                </el-descriptions-item>
+                <el-descriptions-item label="是否需要治理">
+                    <span v-if="detailData.userType == 0 || detailData.userType == 1">
+                        {{ proviteData.needGovernance == 0 ? '否' : '是' }}
+                    </span>
+                    <span
+                        v-if="
+                            detailData.userType == 2 ||
+                            detailData.userType == 3 ||
+                            detailData.userType == 4 ||
+                            detailData.userType == 5
+                        "
+                    >
+                        {{ proviteData.needGovernance == 0 ? '否' : '是' }}
+                    </span>
+                    <span v-if="detailData.userType == 6">{{ proviteData.needGovernance == 0 ? '否' : '是' }}</span>
+                </el-descriptions-item>
+                <el-descriptions-item label="是否开展背景测试">
+                    <span v-if="detailData.userType == 0 || detailData.userType == 1">
+                        {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
+                    </span>
+                    <span
+                        v-if="
+                            detailData.userType == 2 ||
+                            detailData.userType == 3 ||
+                            detailData.userType == 4 ||
+                            detailData.userType == 5
+                        "
+                    >
+                        {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
+                    </span>
+                    <span v-if="detailData.userType == 6">
+                        {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="是否开展抗扰度测试" v-if="detailData.userType == 6">
+                    {{ proviteData.antiInterferenceTest == 0 ? '否' : '是' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="PCC点" v-if="detailData.userType != 0 && detailData.userType != 1">
+                    {{ proviteData?.pccPoint }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="PCC供电设备容量"
                     v-if="
-                        detailData.userType == 2 ||
-                        detailData.userType == 3 ||
-                        detailData.userType == 4 ||
-                        detailData.userType == 5
+                        detailData.userType == '2' ||
+                        detailData.userType == '3' ||
+                        detailData.userType == '4' ||
+                        detailData.userType == '5'
                     "
                 >
-                    {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
-                </span>
-                <span v-if="detailData.userType == 6">
-                    {{ proviteData.backgroundTestPerformed == 0 ? '否' : '是' }}
-                </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="是否开展抗扰度测试" v-if="detailData.userType == 6">
-                {{ proviteData.antiInterferenceTest == 0 ? '否' : '是' }}
-            </el-descriptions-item>
-            <el-descriptions-item label="PCC点" v-if="detailData.userType != 0 && detailData.userType != 1">
-                {{ proviteData?.pccPoint }}
-            </el-descriptions-item>
-            <el-descriptions-item
-                label="PCC供电设备容量"
-                v-if="
-                    detailData.userType == '2' ||
-                    detailData.userType == '3' ||
-                    detailData.userType == '4' ||
-                    detailData.userType == '5'
-                "
-            >
-                {{ proviteData.pccEquipmentCapacity }}
-            </el-descriptions-item>
-            <el-descriptions-item
-                label="基准短路容量"
-                v-if="
-                    detailData.userType == '2' ||
-                    detailData.userType == '3' ||
-                    detailData.userType == '4' ||
-                    detailData.userType == '5'
-                "
-            >
-                {{ proviteData.baseShortCircuitCapacity }}
-            </el-descriptions-item>
-            <el-descriptions-item label="评估类型" v-if="detailData.userType != 0 && detailData.userType != 1">
-                {{
-                    evaluationTypeList.find(item => {
-                        return item.id == proviteData?.evaluationType
-                    })?.name
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="预测评估评审单位" v-if="detailData.userType != 0 && detailData.userType != 1">
-                {{ proviteData?.evaluationChekDept }}
-            </el-descriptions-item>
-            <el-descriptions-item
-                label="系统最小短路容量"
-                v-if="
-                    detailData.userType == '2' ||
-                    detailData.userType == '3' ||
-                    detailData.userType == '4' ||
-                    detailData.userType == '5'
-                "
-            >
-                {{ proviteData?.minShortCircuitCapacity }}
-            </el-descriptions-item>
-            <el-descriptions-item
-                label="用户用电协议容量"
-                v-if="
-                    detailData.userType == '2' ||
-                    detailData.userType == '3' ||
-                    detailData.userType == '4' ||
-                    detailData.userType == '5'
-                "
-            >
-                {{ proviteData?.userAgreementCapacity }}
-            </el-descriptions-item>
-            <el-descriptions-item label="行业" v-if="detailData.userType == 6">
-                {{
-                    industryList.find(item => {
-                        return item.id == proviteData.industry
-                    })?.name
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="敏感终端名称" v-if="detailData.userType == 6">
-                {{ proviteData.deviceName }}
-            </el-descriptions-item>
-            <el-descriptions-item label="供电电源数量" v-if="detailData.userType == 6">
-                {{ proviteData.powerSupplyCount }}
-            </el-descriptions-item>
-            <el-descriptions-item label="敏感电能质量指标" v-if="detailData.userType == 6">
-                {{
-                    energyQualityIndexList.find(item => {
-                        return item.id == proviteData.energyQualityIndex
-                    })?.name
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="可研报告11">
-                <span v-if="detailData.userType == 0 || detailData.userType == 1">
-                    <el-icon class="elView" v-if="proviteData?.feasibilityReport.name && VITE_FLAG">
-                        <View @click="openFile(proviteData.feasibilityReport.key)" />
-                    </el-icon>
-                    <span class="aLoad" @click="download(proviteData.feasibilityReport.keyName)">
-                        {{ proviteData.feasibilityReport.name }}
-                    </span>
-                </span>
-                <span
+                    {{ proviteData.pccEquipmentCapacity }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="基准短路容量"
                     v-if="
-                        detailData.userType == 2 ||
-                        detailData.userType == 3 ||
-                        detailData.userType == 4 ||
-                        detailData.userType == 5
+                        detailData.userType == '2' ||
+                        detailData.userType == '3' ||
+                        detailData.userType == '4' ||
+                        detailData.userType == '5'
                     "
                 >
-                    <el-icon class="elView" v-if="proviteData?.feasibilityReport.name && VITE_FLAG">
-                        <View @click="openFile(proviteData.feasibilityReport.key)" />
-                    </el-icon>
-                    <span class="aLoad" @click="download(proviteData.feasibilityReport.keyName)">
-                        {{ proviteData.feasibilityReport.name }}
+                    {{ proviteData.baseShortCircuitCapacity }}
+                </el-descriptions-item>
+                <el-descriptions-item label="评估类型" v-if="detailData.userType != 0 && detailData.userType != 1">
+                    {{
+                        evaluationTypeList.find(item => {
+                            return item.id == proviteData?.evaluationType
+                        })?.name
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="预测评估评审单位"
+                    v-if="detailData.userType != 0 && detailData.userType != 1"
+                >
+                    {{ proviteData?.evaluationChekDept }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="系统最小短路容量"
+                    v-if="
+                        detailData.userType == '2' ||
+                        detailData.userType == '3' ||
+                        detailData.userType == '4' ||
+                        detailData.userType == '5'
+                    "
+                >
+                    {{ proviteData?.minShortCircuitCapacity }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="用户用电协议容量"
+                    v-if="
+                        detailData.userType == '2' ||
+                        detailData.userType == '3' ||
+                        detailData.userType == '4' ||
+                        detailData.userType == '5'
+                    "
+                >
+                    {{ proviteData?.userAgreementCapacity }}
+                </el-descriptions-item>
+                <el-descriptions-item label="行业" v-if="detailData.userType == 6">
+                    {{
+                        industryList.find(item => {
+                            return item.id == proviteData.industry
+                        })?.name
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item label="敏感终端名称" v-if="detailData.userType == 6">
+                    {{ proviteData.deviceName }}
+                </el-descriptions-item>
+                <el-descriptions-item label="供电电源数量" v-if="detailData.userType == 6">
+                    {{ proviteData.powerSupplyCount }}
+                </el-descriptions-item>
+                <el-descriptions-item label="敏感电能质量指标" v-if="detailData.userType == 6">
+                    {{
+                        energyQualityIndexList.find(item => {
+                            return item.id == proviteData.energyQualityIndex
+                        })?.name
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item label="可研报告11">
+                    <span v-if="detailData.userType == 0 || detailData.userType == 1">
+                        <el-icon class="elView" v-if="proviteData?.feasibilityReport.name">
+                            <View @click="openFile(proviteData.feasibilityReport.key)" />
+                        </el-icon>
+                        <span class="aLoad" @click="download(proviteData.feasibilityReport.keyName)">
+                            {{ proviteData.feasibilityReport.name }}
+                        </span>
                     </span>
-                </span>
-                <span v-if="detailData.userType == 6">
-                    <el-icon class="elView" v-if="proviteData?.feasibilityReport.name && VITE_FLAG">
-                        <View @click="openFile(proviteData.feasibilityReport.key)" />
-                    </el-icon>
-                    <span class="aLoad" @click="download(proviteData.feasibilityReport.keyName)">
-                        {{ proviteData.feasibilityReport.name }}
+                    <span
+                        v-if="
+                            detailData.userType == 2 ||
+                            detailData.userType == 3 ||
+                            detailData.userType == 4 ||
+                            detailData.userType == 5
+                        "
+                    >
+                        <el-icon class="elView" v-if="proviteData?.feasibilityReport.name">
+                            <View @click="openFile(proviteData.feasibilityReport.key)" />
+                        </el-icon>
+                        <span class="aLoad" @click="download(proviteData.feasibilityReport.keyName)">
+                            {{ proviteData.feasibilityReport.name }}
+                        </span>
                     </span>
-                </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="项目初步设计说明书">
-                <el-icon class="elView" v-if="proviteData?.preliminaryDesignDescription.name && VITE_FLAG">
-                    <View @click="openFile(proviteData?.preliminaryDesignDescription.key)" />
-                </el-icon>
-                <span class="aLoad" @click="download(proviteData.preliminaryDesignDescription.keyName)">
-                    {{ proviteData?.preliminaryDesignDescription.name }}
-                </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="预测评估报告">
-                <el-icon class="elView" v-if="proviteData?.predictionEvaluationReport.name && VITE_FLAG">
-                    <View @click="openFile(proviteData?.predictionEvaluationReport.key)" />
-                </el-icon>
-                <span class="aLoad" @click="download(proviteData.predictionEvaluationReport.keyName)">
-                    {{ proviteData?.predictionEvaluationReport.name }}
-                </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="预测评估评审意见报告">
-                <el-icon class="elView" v-if="proviteData?.predictionEvaluationReviewOpinions.name && VITE_FLAG">
-                    <View @click="openFile(proviteData?.predictionEvaluationReviewOpinions.key)" />
-                </el-icon>
-                <span class="aLoad" @click="download(proviteData.predictionEvaluationReviewOpinions.keyName)">
-                    {{ proviteData?.predictionEvaluationReviewOpinions.name }}
-                </span>
-            </el-descriptions-item>
-            <el-descriptions-item
-                label="用户接入变电站主接线示意图"
-                v-if="detailData.userType != 0 && detailData.userType != 1"
-            >
-                <el-icon class="elView" v-if="proviteData?.substationMainWiringDiagram.name && VITE_FLAG">
-                    <View @click="openFile(proviteData?.substationMainWiringDiagram.key)" />
-                </el-icon>
-                <span class="aLoad" @click="download(proviteData.substationMainWiringDiagram.keyName)">
-                    {{ proviteData?.substationMainWiringDiagram.name }}
-                </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="主要敏感终端清单" v-if="detailData.userType == 6">
-                <el-icon class="elView" v-if="proviteData?.sensitiveDevices.name && VITE_FLAG">
-                    <View @click="openFile(proviteData?.sensitiveDevices.key)" />
-                </el-icon>
-                <span class="aLoad" @click="download(proviteData.sensitiveDevices.keyName)">
-                    {{ proviteData?.sensitiveDevices.name }}
-                </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="抗扰度测试报告" v-if="detailData.userType == 6">
-                <el-icon class="elView" v-if="proviteData?.antiInterferenceReport.name && VITE_FLAG">
-                    <View @click="openFile(proviteData?.antiInterferenceReport.key)" />
-                </el-icon>
-                <span class="aLoad" @click="download(proviteData.antiInterferenceReport.keyName)">
-                    {{ proviteData?.antiInterferenceReport.name }}
-                </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="背景电能质量测试报告" v-if="detailData.userType == 6">
-                <el-icon class="elView" v-if="proviteData?.powerQualityReport.name && VITE_FLAG">
-                    <View @click="openFile(proviteData?.powerQualityReport.key)" />
-                </el-icon>
-                <span class="aLoad" @click="download(proviteData.powerQualityReport.keyName)">
-                    {{ proviteData?.powerQualityReport.name }}
-                </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="系统接入方案" v-if="applyTitle == '干扰源用户治理工程验收'">
-                <div v-for="item in netInReportList">
-                    <el-icon class="elView" v-if="item.name && VITE_FLAG">
-                        <View @click="openFile(item.key)" />
-                    </el-icon>
-                    <span class="aLoad" @click="download(item.keyName)">
-                        {{ item.name }}
+                    <span v-if="detailData.userType == 6">
+                        <el-icon class="elView" v-if="proviteData?.feasibilityReport.name">
+                            <View @click="openFile(proviteData.feasibilityReport.key)" />
+                        </el-icon>
+                        <span class="aLoad" @click="download(proviteData.feasibilityReport.keyName)">
+                            {{ proviteData.feasibilityReport.name }}
+                        </span>
                     </span>
-                </div>
-            </el-descriptions-item>
+                </el-descriptions-item>
+                <el-descriptions-item label="项目初步设计说明书">
+                    <el-icon class="elView" v-if="proviteData?.preliminaryDesignDescription.name">
+                        <View @click="openFile(proviteData?.preliminaryDesignDescription.key)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(proviteData.preliminaryDesignDescription.keyName)">
+                        {{ proviteData?.preliminaryDesignDescription.name }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="预测评估报告">
+                    <el-icon class="elView" v-if="proviteData?.predictionEvaluationReport.name">
+                        <View @click="openFile(proviteData?.predictionEvaluationReport.key)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(proviteData.predictionEvaluationReport.keyName)">
+                        {{ proviteData?.predictionEvaluationReport.name }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="预测评估评审意见报告">
+                    <el-icon class="elView" v-if="proviteData?.predictionEvaluationReviewOpinions.name">
+                        <View @click="openFile(proviteData?.predictionEvaluationReviewOpinions.key)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(proviteData.predictionEvaluationReviewOpinions.keyName)">
+                        {{ proviteData?.predictionEvaluationReviewOpinions.name }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="用户接入变电站主接线示意图"
+                    v-if="detailData.userType != 0 && detailData.userType != 1"
+                >
+                    <el-icon class="elView" v-if="proviteData?.substationMainWiringDiagram.name">
+                        <View @click="openFile(proviteData?.substationMainWiringDiagram.key)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(proviteData.substationMainWiringDiagram.keyName)">
+                        {{ proviteData?.substationMainWiringDiagram.name }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="主要敏感终端清单" v-if="detailData.userType == 6">
+                    <el-icon class="elView" v-if="proviteData?.sensitiveDevices.name">
+                        <View @click="openFile(proviteData?.sensitiveDevices.key)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(proviteData.sensitiveDevices.keyName)">
+                        {{ proviteData?.sensitiveDevices.name }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="抗扰度测试报告" v-if="detailData.userType == 6">
+                    <el-icon class="elView" v-if="proviteData?.antiInterferenceReport.name">
+                        <View @click="openFile(proviteData?.antiInterferenceReport.key)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(proviteData.antiInterferenceReport.keyName)">
+                        {{ proviteData?.antiInterferenceReport.name }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="背景电能质量测试报告" v-if="detailData.userType == 6">
+                    <el-icon class="elView" v-if="proviteData?.powerQualityReport.name">
+                        <View @click="openFile(proviteData?.powerQualityReport.key)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(proviteData.powerQualityReport.keyName)">
+                        {{ proviteData?.powerQualityReport.name }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="系统接入方案" v-if="applyTitle == '干扰源用户治理工程验收'">
+                    <div v-for="item in netInReportList">
+                        <el-icon class="elView" v-if="item.name">
+                            <View @click="openFile(item.key)" />
+                        </el-icon>
+                        <span class="aLoad" @click="download(item.keyName)">
+                            {{ item.name }}
+                        </span>
+                    </div>
+                </el-descriptions-item>
 
-            <el-descriptions-item label="其他附件" v-if="proviteData?.additionalAttachments.url">
-                <el-icon class="elView" v-if="proviteData?.additionalAttachments.name && VITE_FLAG">
-                    <View @click="openFile(proviteData?.additionalAttachments.key)" />
-                </el-icon>
-                <span class="aLoad" @click="download(proviteData.additionalAttachments.keyName)">
-                    {{ proviteData?.additionalAttachments.name }}
-                </span>
-            </el-descriptions-item>
-        </el-descriptions>
-        <el-divider content-position="left">{{ applyTitle + '填报信息' }}</el-divider>
-        <el-descriptions :column="2" border>
-            <el-descriptions-item label="填报人">
-                {{ detailData.reporter }}
-            </el-descriptions-item>
-            <el-descriptions-item label="填报日期">
-                {{ formatDate(detailData.reportDate, 'YYYY-MM-DD') }}
-            </el-descriptions-item>
-            <el-descriptions-item label="填报部门">
-                {{ detailData.orgName }}
-            </el-descriptions-item>
-            <el-descriptions-item
-                :label="applyTitle + '报告'"
-                v-if="proviteData?.otherReport && proviteData?.otherReport.url"
-            >
-                <el-icon class="elView" v-if="proviteData?.otherReport.name && VITE_FLAG">
-                    <View @click="openFile(proviteData?.otherReport.key)" />
-                </el-icon>
-                <span class="aLoad" @click="download(proviteData.otherReport.keyName)">
-                    {{ proviteData?.otherReport.name }}
-                </span>
-            </el-descriptions-item>
-        </el-descriptions>
+                <el-descriptions-item label="其他附件" v-if="proviteData?.additionalAttachments.url">
+                    <el-icon class="elView" v-if="proviteData?.additionalAttachments.name">
+                        <View @click="openFile(proviteData?.additionalAttachments.key)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(proviteData.additionalAttachments.keyName)">
+                        {{ proviteData?.additionalAttachments.name }}
+                    </span>
+                </el-descriptions-item>
+            </el-descriptions>
+            <el-divider content-position="left">{{ applyTitle + '填报信息' }}</el-divider>
+            <el-descriptions :column="2" border>
+                <el-descriptions-item label="填报人">
+                    {{ detailData.reporter }}
+                </el-descriptions-item>
+                <el-descriptions-item label="填报日期">
+                    {{ formatDate(detailData.reportDate, 'YYYY-MM-DD') }}
+                </el-descriptions-item>
+                <el-descriptions-item label="填报部门">
+                    {{ detailData.orgName }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    :label="applyTitle + '报告'"
+                    v-if="proviteData?.otherReport && proviteData?.otherReport.url"
+                >
+                    <el-icon class="elView" v-if="proviteData?.otherReport.name">
+                        <View @click="openFile(proviteData?.otherReport.key)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(proviteData.otherReport.keyName)">
+                        {{ proviteData?.otherReport.name }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="治理方案仿真校验评估报告" v-if="applyTitle == '干扰源用户治理工程验收'">
+                  
+                        <el-icon class="elView" v-if="detailData?.simulationReport">
+                            <View @click="openFile(detailData?.simulationReport)" />
+                        </el-icon>
+                        <span class="aLoad" @click="download(detailData?.simulationReport)">
+                            {{ detailData?.simulationReport?.split('/')[2] }}
+                        </span>
+                  
+                </el-descriptions-item>
+            </el-descriptions>
+        </div>
     </div>
 </template>
 <script lang="ts" setup>
@@ -324,11 +347,11 @@ import { getDictTreeById } from '@/api/system-boot/dictTree'
 import { useDictData } from '@/stores/dictData'
 import { getFileNameAndFilePath } from '@/api/system-boot/file'
 import { Key, Link, View } from '@element-plus/icons-vue'
-import { userReportGoNetById } from '@/api/supervision-boot/interfere'
+import { userReportGoNetById, getFileById } from '@/api/supervision-boot/interfere'
 import { download } from '@/utils/fileDownLoad'
 // import el-descriptions-item from './components/detailsItem.vue'
 defineOptions({ name: 'BpmUserReportDetail' })
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+
 const openFile = (name: any) => {
     window.open(window.location.origin + '/#/previewFile?' + name)
 }
@@ -339,6 +362,7 @@ const props = defineProps({
     applyTitle: propTypes.string.def(undefined)
 })
 const netInReportList: any = ref([])
+const governanceList: any = ref([])
 const detailLoading = ref(false) // 表单的加载中
 const detailData = ref<any>({}) // 详情数据
 const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
@@ -408,8 +432,10 @@ const getInfo = async () => {
     try {
         userReportGoNetById({ id: props.id }).then(r => {
             getUserReportById(r.data.userReportId).then(res => {
+                console.log("🚀 ~ getInfo ~ res:", res)
                 detailData.value = res.data
                 detailData.value.otherReport = r.data.otherReport
+                detailData.value.simulationReport = r.data.simulationReport
                 getProviteData()
             })
         })

src/views/pqs/supervise/interfere/components/normalizationManager/normalization/detail.vue

@@ -1,5 +1,9 @@
 <template>
     <div class="default-main">
+         <div v-if="detailLoading" class="loading">
+            <el-spin description="加载中..." />
+        </div>
+        <div v-else>
         <div style="display: flex; justify-content: space-between">
             <el-descriptions :column="1" border style="flex: 1" class="mr20" title="变更前">
                 <el-descriptions-item label="填报人">
@@ -189,7 +193,7 @@
                 </el-descriptions-item>
                 <el-descriptions-item label="可研报告">
                     <span v-if="detailData.userType == 0 || detailData.userType == 1">
-                        <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name && VITE_FLAG">
+                        <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name ">
                             <View @click="openFile(proviteData?.feasibilityReport?.name)" />
                         </el-icon>
                         <span  class="aLoad" @click="download(proviteData.feasibilityReport.keyName)" rel="nofollow">
@@ -202,7 +206,7 @@
                         detailData.userType == 4 ||
                         detailData.userType == 5
                     ">
-                        <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name && VITE_FLAG">
+                        <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name ">
                             <View @click="openFile(proviteData?.feasibilityReport?.name)" />
                         </el-icon>
                         <span   class="aLoad" @click="download(proviteData.feasibilityReport.keyName)">
@@ -210,7 +214,7 @@
                         </span >
                     </span>
                     <span v-if="detailData.userType == 6">
-                        <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name && VITE_FLAG">
+                        <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name ">
                             <View @click="openFile(proviteData?.feasibilityReport?.name)" />
                         </el-icon>
                         <span  class="aLoad" @click="download(proviteData.feasibilityReport.keyName)">
@@ -219,7 +223,7 @@
                     </span>
                 </el-descriptions-item>
                 <el-descriptions-item label="项目初步设计说明书">
-                    <el-icon class="elView" v-if="proviteData?.preliminaryDesignDescription?.name && VITE_FLAG">
+                    <el-icon class="elView" v-if="proviteData?.preliminaryDesignDescription?.name ">
                         <View @click="openFile(proviteData?.preliminaryDesignDescription?.name)" />
                     </el-icon>
 
@@ -228,7 +232,7 @@
                     </span >
                 </el-descriptions-item>
                 <el-descriptions-item label="预测评估报告">
-                    <el-icon class="elView" v-if="proviteData?.predictionEvaluationReport?.name && VITE_FLAG">
+                    <el-icon class="elView" v-if="proviteData?.predictionEvaluationReport?.name ">
                         <View @click="openFile(proviteData?.predictionEvaluationReport?.name)" />
                     </el-icon>
                     <span   class="aLoad" @click="download(proviteData.predictionEvaluationReport.keyName)">
@@ -236,7 +240,7 @@
                     </span >
                 </el-descriptions-item>
                 <el-descriptions-item label="预测评估评审意见报告">
-                    <el-icon class="elView" v-if="proviteData?.predictionEvaluationReviewOpinions?.name && VITE_FLAG">
+                    <el-icon class="elView" v-if="proviteData?.predictionEvaluationReviewOpinions?.name ">
                         <View @click="openFile(proviteData?.predictionEvaluationReviewOpinions?.name)" />
                     </el-icon>
                     <span  class="aLoad" @click="download(proviteData.predictionEvaluationReviewOpinions.keyName)">
@@ -244,7 +248,7 @@
                     </span >
                 </el-descriptions-item>
                 <el-descriptions-item label="用户接入变电站主接线示意图" v-if="detailData.userType != 0 && detailData.userType != 1">
-                    <el-icon class="elView" v-if="proviteData?.substationMainWiringDiagram?.name && VITE_FLAG">
+                    <el-icon class="elView" v-if="proviteData?.substationMainWiringDiagram?.name ">
                         <View @click="openFile(proviteData?.substationMainWiringDiagram?.name)" />
                     </el-icon>
                     <span  class="aLoad" @click="download(proviteData.substationMainWiringDiagram.keyName)">
@@ -252,7 +256,7 @@
                     </span >
                 </el-descriptions-item>
                 <el-descriptions-item label="主要敏感终端清单" v-if="detailData.userType == 6">
-                    <el-icon class="elView" v-if="proviteData?.sensitiveDevices?.name && VITE_FLAG">
+                    <el-icon class="elView" v-if="proviteData?.sensitiveDevices?.name ">
                         <View @click="openFile(proviteData?.sensitiveDevices?.name)" />
                     </el-icon>
                     <span  class="aLoad" @click="download(proviteData.sensitiveDevices.keyName)">
@@ -260,7 +264,7 @@
                     </span >
                 </el-descriptions-item>
                 <el-descriptions-item label="抗扰度测试报告" v-if="detailData.userType == 6">
-                    <el-icon class="elView" v-if="proviteData?.antiInterferenceReport?.name && VITE_FLAG">
+                    <el-icon class="elView" v-if="proviteData?.antiInterferenceReport?.name">
                         <View @click="openFile(proviteData?.antiInterferenceReport?.name)" />
                     </el-icon>
                     <span  class="aLoad" @click="download(proviteData.antiInterferenceReport.keyName)">
@@ -268,7 +272,7 @@
                     </span >
                 </el-descriptions-item>
                 <el-descriptions-item label="背景电能质量测试报告" v-if="detailData.userType == 6">
-                    <el-icon class="elView" v-if="proviteData?.powerQualityReport?.name && VITE_FLAG">
+                    <el-icon class="elView" v-if="proviteData?.powerQualityReport?.name ">
                         <View @click="openFile(proviteData?.powerQualityReport?.name)" />
                     </el-icon>
                     <span  class="aLoad" @click="download(proviteData.powerQualityReport.keyName)">
@@ -277,7 +281,7 @@
                 </el-descriptions-item>
                 <el-descriptions-item label="其他附件"
                     v-if="proviteData?.additionalAttachments && proviteData?.additionalAttachments?.url">
-                    <el-icon class="elView" v-if="proviteData?.additionalAttachments?.name && VITE_FLAG">
+                    <el-icon class="elView" v-if="proviteData?.additionalAttachments?.name ">
                         <View @click="openFile(proviteData?.additionalAttachments?.name)" />
                     </el-icon>
                     <span  class="aLoad" @click="download(proviteData.additionalAttachments.keyName)">
@@ -527,7 +531,7 @@
                     <span v-if="detailData1.userType == 0 || detailData1.userType == 1"
                         :label-class-name="changeTheField?.feasibilityReport ? 'my-content' : ''"
                         :class-name="changeTheField?.feasibilityReport ? 'my-content' : ''">
-                        <el-icon class="elView" v-if="proviteData1?.feasibilityReport?.name && VITE_FLAG">
+                        <el-icon class="elView" v-if="proviteData1?.feasibilityReport?.name ">
                             <View @click="openFile(proviteData1?.feasibilityReport?.name)" />
                         </el-icon>
                         <span  class="aLoad" @click="download(proviteData.feasibilityReport.keyName)" rel="nofollow">
@@ -540,7 +544,7 @@
                         detailData1.userType == 4 ||
                         detailData1.userType == 5
                     ">
-                        <el-icon class="elView" v-if="proviteData1?.feasibilityReport?.name && VITE_FLAG">
+                        <el-icon class="elView" v-if="proviteData1?.feasibilityReport?.name ">
                             <View @click="openFile(proviteData1?.feasibilityReport?.name)" />
                         </el-icon>
                         <span  class="aLoad" @click="download(proviteData.feasibilityReport.keyName)">
@@ -550,7 +554,7 @@
                     <span v-if="detailData1.userType == 6"
                         :label-class-name="changeTheField?.feasibilityReport ? 'my-content' : ''"
                         :class-name="changeTheField?.feasibilityReport ? 'my-content' : ''">
-                        <el-icon class="elView" v-if="proviteData1?.feasibilityReport?.name && VITE_FLAG">
+                        <el-icon class="elView" v-if="proviteData1?.feasibilityReport?.name ">
                             <View @click="openFile(proviteData1?.feasibilityReport?.name)" />
                         </el-icon>
                         <span  class="aLoad" @click="download(proviteData.feasibilityReport.keyName)">
@@ -561,7 +565,7 @@
                 <el-descriptions-item label="项目初步设计说明书"
                     :label-class-name="changeTheField?.preliminaryDesignDescription ? 'my-content' : ''"
                     :class-name="changeTheField?.preliminaryDesignDescription ? 'my-content' : ''">
-                    <el-icon class="elView" v-if="proviteData1?.preliminaryDesignDescription?.name && VITE_FLAG">
+                    <el-icon class="elView" v-if="proviteData1?.preliminaryDesignDescription?.name ">
                         <View @click="openFile(proviteData1?.preliminaryDesignDescription?.name)" />
                     </el-icon>
 
@@ -572,7 +576,7 @@
                 <el-descriptions-item label="预测评估报告"
                     :label-class-name="changeTheField?.predictionEvaluationReport ? 'my-content' : ''"
                     :class-name="changeTheField?.predictionEvaluationReport ? 'my-content' : ''">
-                    <el-icon class="elView" v-if="proviteData1?.predictionEvaluationReport?.name && VITE_FLAG">
+                    <el-icon class="elView" v-if="proviteData1?.predictionEvaluationReport?.name ">
                         <View @click="openFile(proviteData1?.predictionEvaluationReport?.name)" />
                     </el-icon>
                     <span  class="aLoad" @click="download(proviteData.predictionEvaluationReport.keyName)">
@@ -582,7 +586,7 @@
                 <el-descriptions-item label="预测评估评审意见报告"
                     :label-class-name="changeTheField?.predictionEvaluationReviewOpinions ? 'my-content' : ''"
                     :class-name="changeTheField?.predictionEvaluationReviewOpinions ? 'my-content' : ''">
-                    <el-icon class="elView" v-if="proviteData1?.predictionEvaluationReviewOpinions?.name && VITE_FLAG">
+                    <el-icon class="elView" v-if="proviteData1?.predictionEvaluationReviewOpinions?.name ">
                         <View @click="openFile(proviteData1?.predictionEvaluationReviewOpinions?.name)" />
                     </el-icon>
                     <span  class="aLoad" @click="download(proviteData.predictionEvaluationReviewOpinions.keyName)">
@@ -592,7 +596,7 @@
                 <el-descriptions-item label="用户接入变电站主接线示意图" v-if="detailData.userType != 0 && detailData.userType != 1"
                     :label-class-name="changeTheField?.substationMainWiringDiagram ? 'my-content' : ''"
                     :class-name="changeTheField?.substationMainWiringDiagram ? 'my-content' : ''">
-                    <el-icon class="elView" v-if="proviteData1?.substationMainWiringDiagram?.name && VITE_FLAG">
+                    <el-icon class="elView" v-if="proviteData1?.substationMainWiringDiagram?.name ">
                         <View @click="openFile(proviteData1?.substationMainWiringDiagram?.name)" />
                     </el-icon>
                     <span  class="aLoad" @click="download(proviteData.substationMainWiringDiagram.keyName)">
@@ -602,7 +606,7 @@
                 <el-descriptions-item label="主要敏感终端清单" v-if="detailData.userType == 6"
                     :label-class-name="changeTheField?.sensitiveDevices ? 'my-content' : ''"
                     :class-name="changeTheField?.sensitiveDevices ? 'my-content' : ''">
-                    <el-icon class="elView" v-if="proviteData1?.sensitiveDevices?.name && VITE_FLAG">
+                    <el-icon class="elView" v-if="proviteData1?.sensitiveDevices?.name ">
                         <View @click="openFile(proviteData1?.sensitiveDevices?.name)" />
                     </el-icon>
                     <span  class="aLoad" @click="download(proviteData.sensitiveDevices.keyName)">
@@ -612,7 +616,7 @@
                 <el-descriptions-item label="抗扰度测试报告" v-if="detailData.userType == 6"
                     :label-class-name="changeTheField?.antiInterferenceReport ? 'my-content' : ''"
                     :class-name="changeTheField?.antiInterferenceReport ? 'my-content' : ''">
-                    <el-icon class="elView" v-if="proviteData1?.antiInterferenceReport?.name && VITE_FLAG">
+                    <el-icon class="elView" v-if="proviteData1?.antiInterferenceReport?.name ">
                         <View @click="openFile(proviteData1?.antiInterferenceReport?.name)" />
                     </el-icon>
                     <span   class="aLoad" @click="download(proviteData.antiInterferenceReport.keyName)">
@@ -622,7 +626,7 @@
                 <el-descriptions-item label="背景电能质量测试报告" v-if="detailData.userType == 6"
                     :label-class-name="changeTheField?.powerQualityReport ? 'my-content' : ''"
                     :class-name="changeTheField?.powerQualityReport ? 'my-content' : ''">
-                    <el-icon class="elView" v-if="proviteData1?.powerQualityReport?.name && VITE_FLAG">
+                    <el-icon class="elView" v-if="proviteData1?.powerQualityReport?.name ">
                         <View @click="openFile(proviteData1?.powerQualityReport?.name)" />
                     </el-icon>
                     <span  class="aLoad" @click="download(proviteData.powerQualityReport.keyName)">
@@ -633,7 +637,7 @@
                     v-if="proviteData1?.additionalAttachments && proviteData1?.additionalAttachments?.url"
                     :label-class-name="changeTheField?.additionalAttachments ? 'my-content' : ''"
                     :class-name="changeTheField?.additionalAttachments ? 'my-content' : ''">
-                    <el-icon class="elView" v-if="proviteData1?.additionalAttachments?.name && VITE_FLAG">
+                    <el-icon class="elView" v-if="proviteData1?.additionalAttachments?.name ">
                         <View @click="openFile(proviteData1?.additionalAttachments?.name)" />
                     </el-icon>
                     <span  class="aLoad" @click="download(proviteData.additionalAttachments.keyName)">
@@ -642,6 +646,7 @@
                 </el-descriptions-item>
             </el-descriptions>
         </div>
+        </div>
     </div>
 </template>
 <script lang="ts" setup>
@@ -657,7 +662,7 @@ import { Link, View } from '@element-plus/icons-vue'
 import PreviewFile from '@/components/PreviewFile/index.vue'
 import { download} from '@/utils/fileDownLoad'
 defineOptions({ name: 'BpmUserReportDetail' })
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+
 const { query } = useRoute() // 查询参数
 
 const props = defineProps({

src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue

@@ -1,367 +1,370 @@
-<template>
-  <div class="default-main">
-    <!-- <TableHeader ref='TableHeaderRef'>
-        <template #select>
-            <el-form-item label='用户名称'>
-                <el-input v-model='tableStore.table.params.projectName' clearable></el-input>
-            </el-form-item>
-            <el-form-item label='所在地市'>
-                <el-select v-model='tableStore.table.params.city' clearable placeholder='请选择所在地市'>
-                    <el-option
-                        v-for='item in areaOptionList'
-                        :key='item.id'
-                        :label='item.name'
-                        :value='item.name'
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-        </template>
-        <template #operation>
-            <el-button icon='' type='primary' @click='toGoNet()'>{{ titleButton }}</el-button>
-
-            <el-button style='margin-left: 50px' :icon='Back'  @click='go(-1)'>返回</el-button>
-        </template>
-    </TableHeader> -->
-    <div class="header_btn">
-      <el-button v-if="bussType == 0 && !(jb_pl || jb_dky)" icon="" type="primary" @click="toGoNet()">
-        {{ titleButton }}
-      </el-button>
-      <el-button
-          v-if="bussType == 1 && needGovernance != '0' && !(jb_pl || jb_dky)"
-          icon=""
-          type="primary"
-          @click="toGoNet()"
-      >
-        {{ titleButton }}
-      </el-button>
-      <el-button style="margin-left: 50px" :icon="Back" @click="go(-1)">返回</el-button>
-    </div>
-    <Table ref="tableRef"/>
-
-    <addForm
-        v-if="dialogVisible"
-        ref="addForms"
-        :id="bussId"
-        :bussType="bussType"
-        :title="titleButton1"
-        openType="detail"
-        @onSubmit="tableStore.index()"
-    ></addForm>
-  </div>
-</template>
-
-<script setup lang="ts">
-defineOptions({
-  name: 'ProgramReview'
-})
-
-import {ref, onMounted, provide, nextTick, onUnmounted} from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import {cancel, userReportGoNetById} from '@/api/supervision-boot/interfere/index'
-import {useDictData} from '@/stores/dictData'
-import addForm from './addForm.vue'
-import {useRouter, useRoute} from 'vue-router'
-import {Back} from '@element-plus/icons-vue'
-import {useAdminInfo} from '@/stores/adminInfo'
-
-const {go, currentRoute, push} = useRouter()
-const {query} = useRoute() // 查询参数
-import {ElMessage} from 'element-plus'
-import {ElMessageBox} from 'element-plus/es'
-
-const needGovernance = query.needGovernance as unknown as string // 从 URL 传递过来的 是否需要治理
-const dictData = useDictData()
-const areaOptionList = dictData.getBasicData('jibei_area')
-const adminInfo = useAdminInfo()
-const jb_pl = ref(false)
-const jb_dky = ref(false)
-jb_pl.value =
-    adminInfo.$state.roleCode.filter(item => {
-      return item == 'jb_pl'
-    }).length != 0
-        ? true
-        : false
-jb_dky.value =
-    adminInfo.$state.roleCode.filter(item => {
-      return item == 'jb_dky'
-    }).length != 0
-        ? true
-        : false
-const tableStore = new TableStore({
-  url: '/supervision-boot/userReportNormal/userReportGoNetPage',
-
-  method: 'POST',
-  column: [
-    {title: '序号', width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      }},
-    {field: 'projectName', title: '用户名称', minWidth: 170},
-    {
-      field: 'userType',
-      title: '用户性质',
-      minWidth: 150,
-      formatter: (obj: any) => {
-        const userType = obj.row.userType
-        return getUserTypeName(userType)
-      }
-    },
-    {field: 'city', title: '所在地市', minWidth: 80},
-    {field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130},
-    {
-      field: 'userStatus',
-      title: '用户状态',
-      minWidth: 100,
-      render: 'tag',
-      custom: {
-        0: 'primary',
-        1: 'primary',
-        2: 'success',
-        3: 'warning'
-      },
-      replaceValue: {
-        0: '可研',
-        1: '建设',
-        2: '运行',
-        3: '退运'
-      }
-    },
-    {field: 'substation', title: '厂站名称', minWidth: 100},
-    {
-      field: 'status',
-      title: '流程状态',
-      minWidth: 100,
-      render: 'tag',
-      custom: {
-        0: 'warning',
-        1: 'primary',
-        2: 'success',
-        3: 'danger',
-        4: 'warning'
-      },
-      replaceValue: {
-        0: '待提交审批',
-        1: '审批中',
-        2: '审批通过',
-        3: '审批不通过',
-        4: '已取消'
-      }
-    },
-    {
-      field: 'createBy',
-      title: '填报人',
-      minWidth: 80,
-      formatter: (row: any) => {
-        return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-      }
-    },
-    {field: 'createTime', title: '创建时间', minWidth: 100},
-    {
-      title: '操作',
-      minWidth: 180,
-      fixed: 'right',
-      render: 'buttons',
-      buttons: [
-        {
-          name: 'productSetting',
-          title: '流程详情',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          disabled: row => {
-            return !row.processInstanceId
-          },
-          click: row => {
-            handleAudit(row.processInstanceId)
-          }
-        },
-        {
-          name: 'edit',
-          title: '编辑',
-          type: 'primary',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          showDisabled: row => {
-            return !(row.status == 0 || row.status == 3)
-          },
-          disabled: row => {
-            return !(row.status == 0 || row.status == 3)
-          },
-          click: row => {
-            dialogVisible.value = true
-            titleButton1.value = '编辑'
-            setTimeout(() => {
-              addForms.value.open(row)
-            }, 0)
-          }
-        },
-        {
-          name: 'edit',
-          title: '重新发起',
-          type: 'warning',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.createBy != adminInfo.$state.id || !(row.status == 4)
-          },
-          click: row => {
-            dialogVisible.value = true
-            titleButton1.value = '重新发起'
-            setTimeout(() => {
-              addForms.value.open(row)
-            }, 0)
-          }
-        },
-        {
-          name: 'cancel',
-          title: '取消',
-          type: 'danger',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.createBy != adminInfo.$state.id || row.status !== 1
-          },
-          click: row => {
-            cancelLeave(row)
-          }
-        }
-      ]
-    }
-  ],
-
-  beforeSearchFun: () => {
-    tableStore.table.params.userReportId = bussId.value
-    tableStore.table.params.type = bussType.value
-    tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-    tableStore.table.params.relationUserName = tableStore.table.params.userName
-  }
-})
-tableStore.table.params.city = ''
-tableStore.table.params.projectName = ''
-
-const dialogVisible = ref(false)
-const bussId = ref()
-bussId.value = currentRoute.value.query.id
-
-const bussType = ref()
-bussType.value = Number(currentRoute.value.query.type)
-
-const titleButton = ref()
-const titleButton1 = ref()
-
-provide('tableStore', tableStore)
-const handleVisibilityChange = async () => {
-  if (document.visibilityState === 'visible') {
-    // 在这里执行页面回到回到当前页签需要做的事情
-    await tableStore.index()
-  } else if (document.visibilityState === 'hidden') {
-    // 在这里执行页面离开时需要做的事情
-  }
-}
-onMounted(async () => {
-  tableStore.index()
-  document.addEventListener('visibilitychange', handleVisibilityChange)
-  if (query.fangAnId) {
-    //根据id查询待编辑的数据
-    await userReportGoNetById({id: query.fangAnId}).then(res => {
-      if (res && res.code == 'A0000') {
-        dialogVisible.value = true
-        titleButton1.value = '重新发起'
-        setTimeout(() => {
-          res.data.id = query.fangAnId
-          addForms.value.open(res.data)
-        }, 0)
-      }
-    })
-
-  }
-
-})
-onUnmounted(() => {
-  document.removeEventListener('visibilitychange', handleVisibilityChange)
-})
-/**取消流程操作*/
-const cancelLeave = async (row: any) => {
-  // 二次确认
-  const {value} = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    inputType: 'textarea',
-    inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-    inputErrorMessage: '取消原因不能为空'
-  })
-  // 发起取消
-  let data = {
-    id: row.id,
-    processInstanceId: row.processInstanceId,
-    reason: value
-  }
-  await cancel(data)
-  ElMessage.success('取消成功')
-  // 加载数据
-  tableStore.index()
-}
-/** 处理审批按钮 */
-const handleAudit = (instanceId: any) => {
-  push({
-    name: 'BpmProcessInstanceDetail',
-    query: {
-      id: instanceId
-    }
-  })
-}
-if (bussType.value === 0) {
-  titleButton.value = '入网设计方案申请'
-} else {
-  titleButton.value = '治理工程申请'
-}
-const addForms = ref()
-const toGoNet = () => {
-  dialogVisible.value = true
-  if (bussType.value === 0) {
-    titleButton1.value = '入网设计方案申请'
-  } else {
-    titleButton1.value = '治理工程申请'
-  }
-  setTimeout(() => {
-    addForms.value.open()
-  }, 0)
-}
-
-/**获取用户性质*/
-const getUserTypeName = (userType: any) => {
-  if (userType === 0) {
-    return '新建电网工程'
-  }
-  if (userType === 1) {
-    return '扩建电网工程'
-  }
-  if (userType === 2) {
-    return '新建非线性负荷用户'
-  }
-  if (userType === 3) {
-    return '扩建非线性负荷用户'
-  }
-  if (userType === 4) {
-    return '新建新能源发电站'
-  }
-  if (userType === 5) {
-    return '扩建新能源发电站'
-  }
-  if (userType === 6) {
-    return '敏感及重要用户'
-  }
-  return '新建电网工程'
-}
-</script>
-<style scoped lang="scss">
-.header_btn {
-  width: 100%;
-  height: 60px;
-  display: flex;
-  padding: 13px 15px;
-  justify-content: flex-end;
-  align-items: center;
-  border: 1px solid #dddfe6;
-}
-</style>
+<template>
+    <div class="default-main">
+        <!-- <TableHeader ref='TableHeaderRef'>
+        <template #select>
+            <el-form-item label='用户名称'>
+                <el-input v-model='tableStore.table.params.projectName' clearable></el-input>
+            </el-form-item>
+            <el-form-item label='所在地市'>
+                <el-select v-model='tableStore.table.params.city' clearable placeholder='请选择所在地市'>
+                    <el-option
+                        v-for='item in areaOptionList'
+                        :key='item.id'
+                        :label='item.name'
+                        :value='item.name'
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+        </template>
+        <template #operation>
+            <el-button icon='' type='primary' @click='toGoNet()'>{{ titleButton }}</el-button>
+
+            <el-button style='margin-left: 50px' :icon='Back'  @click='go(-1)'>返回</el-button>
+        </template>
+    </TableHeader> -->
+        <div class="header_btn">
+            <el-button v-if="bussType == 0 && !(jb_pl || jb_dky)" icon="" type="primary" @click="toGoNet()">
+                {{ titleButton }}
+            </el-button>
+            <el-button
+                v-if="bussType == 1 && needGovernance != '0' && !(jb_pl || jb_dky)"
+                icon=""
+                type="primary"
+                @click="toGoNet()"
+            >
+                {{ titleButton }}
+            </el-button>
+            <el-button style="margin-left: 50px" :icon="Back" @click="go(-1)">返回</el-button>
+        </div>
+        <Table ref="tableRef" />
+
+        <addForm
+            v-if="dialogVisible"
+            ref="addForms"
+            :id="bussId"
+            :bussType="bussType"
+            :title="titleButton1"
+            openType="detail"
+            @onSubmit="tableStore.index()"
+        ></addForm>
+    </div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+    name: 'ProgramReview'
+})
+
+import { ref, onMounted, provide, nextTick, onUnmounted } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import { cancel, userReportGoNetById } from '@/api/supervision-boot/interfere/index'
+import { useDictData } from '@/stores/dictData'
+import addForm from './addForm.vue'
+import { useRouter, useRoute } from 'vue-router'
+import { Back } from '@element-plus/icons-vue'
+import { useAdminInfo } from '@/stores/adminInfo'
+
+const { go, currentRoute, push } = useRouter()
+const { query } = useRoute() // 查询参数
+import { ElMessage } from 'element-plus'
+import { ElMessageBox } from 'element-plus/es'
+
+const needGovernance = query.needGovernance as unknown as string // 从 URL 传递过来的 是否需要治理
+const dictData = useDictData()
+const areaOptionList = dictData.getBasicData('jibei_area')
+const adminInfo = useAdminInfo()
+const jb_pl = ref(false)
+const jb_dky = ref(false)
+jb_pl.value =
+    adminInfo.$state.roleCode.filter(item => {
+        return item == 'jb_pl'
+    }).length != 0
+        ? true
+        : false
+jb_dky.value =
+    adminInfo.$state.roleCode.filter(item => {
+        return item == 'jb_dky'
+    }).length != 0
+        ? true
+        : false
+const tableStore = new TableStore({
+    url: '/supervision-boot/userReportNormal/userReportGoNetPage',
+
+    method: 'POST',
+    column: [
+        {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'projectName', title: '用户名称', minWidth: 170 },
+        {
+            field: 'userType',
+            title: '用户性质',
+            minWidth: 150,
+            formatter: (obj: any) => {
+                const userType = obj.row.userType
+                return getUserTypeName(userType)
+            }
+        },
+        { field: 'city', title: '所在地市', minWidth: 80 },
+        { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
+        {
+            field: 'userStatus',
+            title: '用户状态',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                0: 'primary',
+                1: 'primary',
+                2: 'success',
+                3: 'warning'
+            },
+            replaceValue: {
+                0: '可研',
+                1: '建设',
+                2: '运行',
+                3: '退运'
+            }
+        },
+        { field: 'substation', title: '厂站名称', minWidth: 100 },
+        {
+            field: 'status',
+            title: '流程状态',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning'
+            },
+            replaceValue: {
+                0: '待提交审批',
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消'
+            }
+        },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        { field: 'createTime', title: '创建时间', minWidth: 100 },
+        {
+            title: '操作',
+            minWidth: 180,
+            fixed: 'right',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !row.processInstanceId
+                    },
+                    click: row => {
+                        handleAudit(row.processInstanceId, row.id)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    showDisabled: row => {
+                        return !(row.status == 0 || row.status == 3)
+                    },
+                    disabled: row => {
+                        return !(row.status == 0 || row.status == 3)
+                    },
+                    click: row => {
+                        dialogVisible.value = true
+                        titleButton1.value = '编辑'
+                        setTimeout(() => {
+                            addForms.value.open(row)
+                        }, 0)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || !(row.status == 4)
+                    },
+                    click: row => {
+                        dialogVisible.value = true
+                        titleButton1.value = '重新发起'
+                        setTimeout(() => {
+                            addForms.value.open(row)
+                        }, 0)
+                    }
+                },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || row.status !== 1
+                    },
+                    click: row => {
+                        cancelLeave(row)
+                    }
+                }
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.userReportId = bussId.value
+        tableStore.table.params.type = bussType.value
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        tableStore.table.params.relationUserName = tableStore.table.params.userName
+    }
+})
+tableStore.table.params.city = ''
+tableStore.table.params.projectName = ''
+
+const dialogVisible = ref(false)
+const bussId = ref()
+bussId.value = currentRoute.value.query.id
+
+const bussType = ref()
+bussType.value = Number(currentRoute.value.query.type)
+
+const titleButton = ref()
+const titleButton1 = ref()
+
+provide('tableStore', tableStore)
+const handleVisibilityChange = async () => {
+    if (document.visibilityState === 'visible') {
+        // 在这里执行页面回到回到当前页签需要做的事情
+        await tableStore.index()
+    } else if (document.visibilityState === 'hidden') {
+        // 在这里执行页面离开时需要做的事情
+    }
+}
+onMounted(async () => {
+    tableStore.index()
+    document.addEventListener('visibilitychange', handleVisibilityChange)
+    if (query.fangAnId) {
+        //根据id查询待编辑的数据
+        await userReportGoNetById({ id: query.fangAnId }).then(res => {
+            if (res && res.code == 'A0000') {
+                dialogVisible.value = true
+                titleButton1.value = '重新发起'
+                setTimeout(() => {
+                    res.data.id = query.fangAnId
+                    addForms.value.open(res.data)
+                }, 0)
+            }
+        })
+    }
+})
+onUnmounted(() => {
+    document.removeEventListener('visibilitychange', handleVisibilityChange)
+})
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputType: 'textarea',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.id,
+        processInstanceId: row.processInstanceId,
+        reason: value
+    }
+    await cancel(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
+/** 处理审批按钮 */
+const handleAudit = (instanceId: any, keyID: any) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        query: {
+            id: instanceId,
+            keyID: keyID
+        }
+    })
+}
+if (bussType.value === 0) {
+    titleButton.value = '入网设计方案申请'
+} else {
+    titleButton.value = '治理工程申请'
+}
+const addForms = ref()
+const toGoNet = () => {
+    dialogVisible.value = true
+    if (bussType.value === 0) {
+        titleButton1.value = '入网设计方案申请'
+    } else {
+        titleButton1.value = '治理工程申请'
+    }
+    setTimeout(() => {
+        addForms.value.open()
+    }, 0)
+}
+
+/**获取用户性质*/
+const getUserTypeName = (userType: any) => {
+    if (userType === 0) {
+        return '新建电网工程'
+    }
+    if (userType === 1) {
+        return '扩建电网工程'
+    }
+    if (userType === 2) {
+        return '新建非线性负荷用户'
+    }
+    if (userType === 3) {
+        return '扩建非线性负荷用户'
+    }
+    if (userType === 4) {
+        return '新建新能源发电站'
+    }
+    if (userType === 5) {
+        return '扩建新能源发电站'
+    }
+    if (userType === 6) {
+        return '敏感及重要用户'
+    }
+    return '新建电网工程'
+}
+</script>
+<style scoped lang="scss">
+.header_btn {
+    width: 100%;
+    height: 60px;
+    display: flex;
+    padding: 13px 15px;
+    justify-content: flex-end;
+    align-items: center;
+    border: 1px solid #dddfe6;
+}
+</style>

src/views/pqs/supervise/interfere/components/undocumented/detail.vue

@@ -1,450 +1,476 @@
 <template>
     <div class="default-main">
-        <el-descriptions :column="2" border>
-            <el-descriptions-item label="填报人">
-                {{ detailData.reporter }}
-            </el-descriptions-item>
-            <el-descriptions-item label="填报日期">
-                {{ formatDate(detailData.reportDate, 'YYYY-MM-DD') }}
-            </el-descriptions-item>
-            <el-descriptions-item label="填报部门">
-                {{ detailData.orgName }}
-            </el-descriptions-item>
-            <el-descriptions-item label="工程预期投产日期">
-                {{ formatDate(detailData.expectedProductionDate, 'YYYY-MM-DD') }}
-            </el-descriptions-item>
-            <el-descriptions-item label="用户性质">
-                {{
-                    userTypeList.find(item => {
-                        return item.value == detailData.userType
-                    })?.label
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="所在地市">
-                {{ detailData.city }}
-            </el-descriptions-item>
-            <el-descriptions-item label="归口管理部门">
-                {{ detailData.responsibleDepartment }}
-            </el-descriptions-item>
-            <el-descriptions-item label="用户状态">
-                {{
-                    userStateList.find(item => {
-                        return item.value == detailData.userStatus
-                    })?.label
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="厂站名称">
-                {{ detailData.substation }}
-            </el-descriptions-item>
-            <el-descriptions-item label="项目名称">
-                {{ detailData.projectName }}
-            </el-descriptions-item>
-            <el-descriptions-item label="电压等级">
-                {{
-                    voltageLevelList.find(item => {
-                        return item.id == detailData.voltageLevel
-                    })?.name
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="非线性终端类型" v-if="detailData.userType == 0 || detailData.userType == 1">
-                {{ proviteData.nonlinearDeviceType ? proviteData.nonlinearDeviceType : '-' }}
-            </el-descriptions-item>
-            <el-descriptions-item label="预测评估单位">
-                {{ detailData.evaluationDept }}
-            </el-descriptions-item>
-            <el-descriptions-item label="预测评估结论" :span="2">
-                {{ detailData.evaluationConclusion }}
-            </el-descriptions-item>
-            <el-descriptions-item
-                :label="
-                    detailData.userType == '4' || detailData.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'
-                "
-                v-if="
-                    detailData.userType == '2' ||
-                    detailData.userType == '3' ||
-                    detailData.userType == '4' ||
-                    detailData.userType == '5'
-                "
-            >
-                {{ proviteData?.nonlinearLoadType || '' }}
-            </el-descriptions-item>
-            <el-descriptions-item label="是否需要治理">
-                <span v-if="detailData.userType == 0 || detailData.userType == 1">
-                    {{ proviteData?.needGovernance == 1 ? '是' : '否' }}
-                </span>
-                <span
-                    v-if="
-                        detailData.userType == 2 ||
-                        detailData.userType == 3 ||
-                        detailData.userType == 4 ||
-                        detailData.userType == 5
-                    "
-                >
-                    {{ proviteData?.needGovernance == 1 ? '是' : '否' }}
-                </span>
-                <span v-if="detailData.userType == 6">{{ proviteData?.needGovernance == 1 ? '是' : '否' }}</span>
-            </el-descriptions-item>
-            <el-descriptions-item label="是否开展背景测试">
-                <span v-if="detailData.userType == 0 || detailData.userType == 1">
-                    {{ proviteData?.backgroundTestPerformed == 1 ? '是' : '否' }}
-                </span>
-                <span
-                    v-if="
-                        detailData.userType == 2 ||
-                        detailData.userType == 3 ||
-                        detailData.userType == 4 ||
-                        detailData.userType == 5
-                    "
-                >
-                    {{ proviteData?.backgroundTestPerformed == 1 ? '是' : '否' }}
-                </span>
-                <span v-if="detailData.userType == 6">
-                    {{ proviteData?.backgroundTestPerformed == 1 ? '是' : '否' }}
-                </span>
-            </el-descriptions-item>
-
-            <el-descriptions-item label="关联终端" v-if="props.openType != 'create'">
-                <span>
-                    {{ devIdList[0]?.devName }}
-                </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="关联监测点" v-if="props.openType != 'create'">
-                <span>
-                    <!-- {{      detailData?.lineId }} -->
-                    {{ devIdList[0]?.lineList.filter(item => item.lineId == detailData?.lineId)[0].lineName }}
-                </span>
-            </el-descriptions-item>
-
-            <el-descriptions-item label="是否开展抗扰度测试" v-if="detailData.userType == 6">
-                <span>
-                    {{ proviteData.antiInterferenceTest == 1 ? '是' : '否' }}
-                </span>
-            </el-descriptions-item>
-            <el-descriptions-item
-                label="用户协议容量（MVA）"
-                v-if="detailData.userType == 0 || detailData.userType == 1"
-            >
-                {{ proviteData?.agreementCapacity }}
-            </el-descriptions-item>
-            <el-descriptions-item
-                label="PCC供电设备容量（MVA）"
-                v-if="
-                    detailData.userType == '2' ||
-                    detailData.userType == '3' ||
-                    detailData.userType == '4' ||
-                    detailData.userType == '5'
-                "
-            >
-                {{ proviteData?.pccEquipmentCapacity }}
-            </el-descriptions-item>
-            <el-descriptions-item
-                label="基准短路容量（MVA）"
-                v-if="
-                    detailData.userType == '2' ||
-                    detailData.userType == '3' ||
-                    detailData.userType == '4' ||
-                    detailData.userType == '5'
-                "
-            >
-                {{ proviteData?.baseShortCircuitCapacity }}
-            </el-descriptions-item>
-            <el-descriptions-item
-                label="系统最小短路容量（MVA）"
-                v-if="
-                    detailData.userType == '2' ||
-                    detailData.userType == '3' ||
-                    detailData.userType == '4' ||
-                    detailData.userType == '5'
-                "
-            >
-                {{ proviteData?.minShortCircuitCapacity }}
-            </el-descriptions-item>
-            <el-descriptions-item
-                label="用户用电协议容量（MVA）"
-                v-if="
-                    detailData.userType == '2' ||
-                    detailData.userType == '3' ||
-                    detailData.userType == '4' ||
-                    detailData.userType == '5'
-                "
-            >
-                {{ proviteData?.userAgreementCapacity }}
-            </el-descriptions-item>
-            <el-descriptions-item label="PCC点" v-if="detailData.userType != 0 && detailData.userType != 1">
-                {{ proviteData?.pccPoint }}
-            </el-descriptions-item>
-            <el-descriptions-item label="评估类型" v-if="detailData.userType != 0 && detailData.userType != 1">
-                {{
-                    evaluationTypeList.find(item => {
-                        return item.id == proviteData?.evaluationType
-                    })?.name
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="预测评估评审单位" v-if="detailData.userType != 0 && detailData.userType != 1">
-                {{ proviteData?.evaluationChekDept }}
-            </el-descriptions-item>
-            <el-descriptions-item label="行业" v-if="detailData.userType == 6">
-                {{
-                    industryList.find(item => {
-                        return item.id == proviteData.industry
-                    })?.name
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="敏感终端名称" v-if="detailData.userType == 6">
-                {{ proviteData.deviceName }}
-            </el-descriptions-item>
-            <!--            <el-descriptions-item label="供电电源数量" v-if="detailData.userType == 6">-->
-            <!--                {{ proviteData.powerSupplyCount }}-->
-            <!--            </el-descriptions-item>-->
-            <el-descriptions-item label="供电电源情况" v-if="detailData.userType == 6">
-                {{
-                    powerSupplyInfoOptionList.find(item => {
-                        return item.id == proviteData.powerSupplyInfo
-                    })?.name
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="供电电源" :span="2" v-if="detailData.userType == 6">
-                {{ proviteData.powerSupply }}
-            </el-descriptions-item>
-            <el-descriptions-item label="负荷级别" v-if="detailData.userType == 6">
-                {{
-                    loadLevelOptionList.find(item => {
-                        return item.id == proviteData.loadLevel
-                    })?.name
-                }}
-            </el-descriptions-item>
-            <el-descriptions-item label="敏感电能质量指标" v-if="detailData.userType == 6">
-                <span v-if="proviteData.energyQualityIndex">
+        <!-- 加载状态显示 -->
+        <div v-if="detailLoading" class="loading">
+            <el-spin description="加载中..." />
+        </div>
+        <div v-else>
+            <el-descriptions :column="2" border>
+                <el-descriptions-item label="填报人">
+                    {{ detailData.reporter }}
+                </el-descriptions-item>
+                <el-descriptions-item label="填报日期">
+                    {{ formatDate(detailData.reportDate, 'YYYY-MM-DD') }}
+                </el-descriptions-item>
+                <el-descriptions-item label="填报部门">
+                    {{ detailData.orgName }}
+                </el-descriptions-item>
+                <el-descriptions-item label="工程预期投产日期">
+                    {{ formatDate(detailData.expectedProductionDate, 'YYYY-MM-DD') }}
+                </el-descriptions-item>
+                <el-descriptions-item label="用户性质">
                     {{
-                        Array.isArray(proviteData.energyQualityIndex)
-                            ? proviteData.energyQualityIndex
-                                  .map(id => energyQualityIndexList.find(item => item.id == id)?.name)
-                                  .filter(name => name)
-                                  .join(', ')
-                            : typeof proviteData.energyQualityIndex === 'string'
-                            ? proviteData.energyQualityIndex
-                                  .split(', ')
-                                  .map(id => energyQualityIndexList.find(item => item.id == id)?.name)
-                                  .filter(name => name)
-                                  .join(', ')
-                            : energyQualityIndexList.find(item => item.id == proviteData.energyQualityIndex)?.name
+                        userTypeList.find(item => {
+                            return item.value == detailData.userType
+                        })?.label
                     }}
-                </span>
-                <span v-else>-</span>
-            </el-descriptions-item>
-            <el-descriptions-item label="可研报告">
-                <span v-if="detailData.userType == 0 || detailData.userType == 1">
-                    <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name && VITE_FLAG">
-                        <View @click="openFile(proviteData?.feasibilityReport?.name)" />
-                    </el-icon>
-                    <span  class="aLoad" @click="download(proviteData.feasibilityReport.keyName)" rel="nofollow">
-                        {{ proviteData?.feasibilityReport?.name }}
-                    </span >
-                </span>
-                <span
+                </el-descriptions-item>
+                <el-descriptions-item label="所在地市">
+                    {{ detailData.city }}
+                </el-descriptions-item>
+                <el-descriptions-item label="归口管理部门">
+                    {{ detailData.responsibleDepartment }}
+                </el-descriptions-item>
+                <el-descriptions-item label="用户状态">
+                    {{
+                        userStateList.find(item => {
+                            return item.value == detailData.userStatus
+                        })?.label
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item label="厂站名称">
+                    {{ detailData.substation }}
+                </el-descriptions-item>
+                <el-descriptions-item label="项目名称">
+                    {{ detailData.projectName }}
+                </el-descriptions-item>
+                <el-descriptions-item label="电压等级">
+                    {{
+                        voltageLevelList.find(item => {
+                            return item.id == detailData.voltageLevel
+                        })?.name
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="非线性终端类型"
+                    v-if="detailData.userType == 0 || detailData.userType == 1"
+                >
+                    {{ proviteData.nonlinearDeviceType ? proviteData.nonlinearDeviceType : '-' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="预测评估单位">
+                    {{ detailData.evaluationDept }}
+                </el-descriptions-item>
+                <el-descriptions-item label="预测评估结论" :span="2">
+                    {{ detailData.evaluationConclusion }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    :label="
+                        detailData.userType == '4' || detailData.userType == '5'
+                            ? '非线性设备类型: '
+                            : '非线性负荷类型：'
+                    "
                     v-if="
-                        detailData.userType == 2 ||
-                        detailData.userType == 3 ||
-                        detailData.userType == 4 ||
-                        detailData.userType == 5
+                        detailData.userType == '2' ||
+                        detailData.userType == '3' ||
+                        detailData.userType == '4' ||
+                        detailData.userType == '5'
                     "
                 >
-                    <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name && VITE_FLAG">
-                        <View @click="openFile(proviteData?.feasibilityReport?.name)" />
-                    </el-icon>
-                    <span  class="aLoad" @click="download(proviteData.feasibilityReport.keyName)">
-                        {{ proviteData?.feasibilityReport?.name }}
-                    </span >
-                </span>
-                <span v-if="detailData.userType == 6">
-                    <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name && VITE_FLAG">
-                        <View @click="openFile(proviteData?.feasibilityReport?.name)" />
-                    </el-icon>
-                    <span  class="aLoad"  @click="download(proviteData.feasibilityReport.keyName)">
-                        {{ proviteData?.feasibilityReport?.name }}
-                    </span >
-                </span>
-            </el-descriptions-item>
-            <el-descriptions-item label="项目初步设计说明书">
-                <el-icon class="elView" v-if="proviteData?.preliminaryDesignDescription?.name && VITE_FLAG">
-                    <View @click="openFile(proviteData?.preliminaryDesignDescription?.name)" />
-                </el-icon>
+                    {{ proviteData?.nonlinearLoadType || '' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="是否需要治理">
+                    <span v-if="detailData.userType == 0 || detailData.userType == 1">
+                        {{ proviteData?.needGovernance == 1 ? '是' : '否' }}
+                    </span>
+                    <span
+                        v-if="
+                            detailData.userType == 2 ||
+                            detailData.userType == 3 ||
+                            detailData.userType == 4 ||
+                            detailData.userType == 5
+                        "
+                    >
+                        {{ proviteData?.needGovernance == 1 ? '是' : '否' }}
+                    </span>
+                    <span v-if="detailData.userType == 6">{{ proviteData?.needGovernance == 1 ? '是' : '否' }}</span>
+                </el-descriptions-item>
+                <el-descriptions-item label="是否开展背景测试">
+                    <span v-if="detailData.userType == 0 || detailData.userType == 1">
+                        {{ proviteData?.backgroundTestPerformed == 1 ? '是' : '否' }}
+                    </span>
+                    <span
+                        v-if="
+                            detailData.userType == 2 ||
+                            detailData.userType == 3 ||
+                            detailData.userType == 4 ||
+                            detailData.userType == 5
+                        "
+                    >
+                        {{ proviteData?.backgroundTestPerformed == 1 ? '是' : '否' }}
+                    </span>
+                    <span v-if="detailData.userType == 6">
+                        {{ proviteData?.backgroundTestPerformed == 1 ? '是' : '否' }}
+                    </span>
+                </el-descriptions-item>
 
-                <span  class="aLoad"  @click="download(proviteData.preliminaryDesignDescription.keyName)">
-                    {{ proviteData?.preliminaryDesignDescription?.name }}
-                </span >
-            </el-descriptions-item>
-            <el-descriptions-item label="预测评估报告">
-                <el-icon class="elView" v-if="proviteData?.predictionEvaluationReport?.name && VITE_FLAG">
-                    <View @click="openFile(proviteData?.predictionEvaluationReport?.name)" />
-                </el-icon>
-                <span  class="aLoad"  @click="download(proviteData.predictionEvaluationReport.keyName)">
-                    {{ proviteData?.predictionEvaluationReport?.name }}
-                </span >
-            </el-descriptions-item>
-            <el-descriptions-item label="预测评估评审意见报告">
-                <el-icon class="elView" v-if="proviteData?.predictionEvaluationReviewOpinions?.name && VITE_FLAG">
-                    <View @click="openFile(proviteData?.predictionEvaluationReviewOpinions?.name)" />
-                </el-icon>
-                <span  class="aLoad"  @click="download(proviteData.predictionEvaluationReviewOpinions.keyName)">
-                    {{ proviteData?.predictionEvaluationReviewOpinions?.name }}
-                </span >
-            </el-descriptions-item>
-            <el-descriptions-item
-                label="用户接入变电站主接线示意图"
-                v-if="detailData.userType != 0 && detailData.userType != 1"
-            >
-                <el-icon class="elView" v-if="proviteData?.substationMainWiringDiagram?.name && VITE_FLAG">
-                    <View @click="openFile(proviteData?.substationMainWiringDiagram?.name)" />
-                </el-icon>
-                <span  class="aLoad"  @click="download(proviteData.substationMainWiringDiagram.keyName)">
-                    {{ proviteData?.substationMainWiringDiagram?.name }}
-                </span >
-            </el-descriptions-item>
-            <el-descriptions-item label="主要敏感终端清单" v-if="detailData.userType == 6 && VITE_FLAG">
-                <el-icon class="elView" v-if="proviteData?.sensitiveDevices?.name">
-                    <View @click="openFile(proviteData?.sensitiveDevices?.name)" />
-                </el-icon>
-                <span  class="aLoad" @click="download(proviteData.sensitiveDevices.keyName)">
-                    {{ proviteData?.sensitiveDevices?.name }}
-                </span >
-            </el-descriptions-item>
-            <el-descriptions-item label="抗扰度测试报告" v-if="detailData.userType == 6">
-                <el-icon class="elView" v-if="proviteData?.antiInterferenceReport?.name && VITE_FLAG">
-                    <View @click="openFile(proviteData?.antiInterferenceReport?.name)" />
-                </el-icon>
-                <span  class="aLoad"  @click="download(proviteData.antiInterferenceReport.keyName)">
-                    {{ proviteData?.antiInterferenceReport?.name }}
-                </span >
-            </el-descriptions-item>
-            <el-descriptions-item label="背景电能质量测试报告" v-if="detailData.userType == 6">
-                <el-icon class="elView" v-if="proviteData?.powerQualityReport?.name && VITE_FLAG">
-                    <View @click="openFile(proviteData?.powerQualityReport?.name)" />
-                </el-icon>
-                <span  class="aLoad" @click="download(proviteData.powerQualityReport.keyName)">
-                    {{ proviteData?.powerQualityReport?.name }}
-                </span >
-            </el-descriptions-item>
-            <el-descriptions-item
-                label="其他附件"
-                v-if="proviteData?.additionalAttachments && proviteData?.additionalAttachments?.url"
-            >
-                <el-icon class="elView" v-if="proviteData?.additionalAttachments?.name && VITE_FLAG">
-                    <View @click="openFile(proviteData?.additionalAttachments?.name)" />
-                </el-icon>
-                <span  class="aLoad" @click="download(proviteData.additionalAttachments.keyName)" >
-                    {{ proviteData?.additionalAttachments?.name }}
-                </span >
-            </el-descriptions-item>
+                <el-descriptions-item label="关联终端" v-if="props.openType != 'create'">
+                    <span>
+                        {{ devIdList[0]?.devName }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="关联监测点" v-if="props.openType != 'create'">
+                    <span>
+                        <!-- {{      detailData?.lineId }} -->
+                        {{ devIdList[0]?.lineList.filter(item => item.lineId == detailData?.lineId)[0].lineName }}
+                    </span>
+                </el-descriptions-item>
 
-            <el-descriptions-item label="系统接入方案">
-                <div v-for="item in netInReportList">
-                    <el-icon class="elView" v-if="item.name && VITE_FLAG">
-                        <View @click="openFile(item.name)" />
+                <el-descriptions-item label="是否开展抗扰度测试" v-if="detailData.userType == 6">
+                    <span>
+                        {{ proviteData.antiInterferenceTest == 1 ? '是' : '否' }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="用户协议容量（MVA）"
+                    v-if="detailData.userType == 0 || detailData.userType == 1"
+                >
+                    {{ proviteData?.agreementCapacity }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="PCC供电设备容量（MVA）"
+                    v-if="
+                        detailData.userType == '2' ||
+                        detailData.userType == '3' ||
+                        detailData.userType == '4' ||
+                        detailData.userType == '5'
+                    "
+                >
+                    {{ proviteData?.pccEquipmentCapacity }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="基准短路容量（MVA）"
+                    v-if="
+                        detailData.userType == '2' ||
+                        detailData.userType == '3' ||
+                        detailData.userType == '4' ||
+                        detailData.userType == '5'
+                    "
+                >
+                    {{ proviteData?.baseShortCircuitCapacity }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="系统最小短路容量（MVA）"
+                    v-if="
+                        detailData.userType == '2' ||
+                        detailData.userType == '3' ||
+                        detailData.userType == '4' ||
+                        detailData.userType == '5'
+                    "
+                >
+                    {{ proviteData?.minShortCircuitCapacity }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="用户用电协议容量（MVA）"
+                    v-if="
+                        detailData.userType == '2' ||
+                        detailData.userType == '3' ||
+                        detailData.userType == '4' ||
+                        detailData.userType == '5'
+                    "
+                >
+                    {{ proviteData?.userAgreementCapacity }}
+                </el-descriptions-item>
+                <el-descriptions-item label="PCC点" v-if="detailData.userType != 0 && detailData.userType != 1">
+                    {{ proviteData?.pccPoint }}
+                </el-descriptions-item>
+                <el-descriptions-item label="评估类型" v-if="detailData.userType != 0 && detailData.userType != 1">
+                    {{
+                        evaluationTypeList.find(item => {
+                            return item.id == proviteData?.evaluationType
+                        })?.name
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="预测评估评审单位"
+                    v-if="detailData.userType != 0 && detailData.userType != 1"
+                >
+                    {{ proviteData?.evaluationChekDept }}
+                </el-descriptions-item>
+                <el-descriptions-item label="行业" v-if="detailData.userType == 6">
+                    {{
+                        industryList.find(item => {
+                            return item.id == proviteData.industry
+                        })?.name
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item label="敏感终端名称" v-if="detailData.userType == 6">
+                    {{ proviteData.deviceName }}
+                </el-descriptions-item>
+                <!--            <el-descriptions-item label="供电电源数量" v-if="detailData.userType == 6">-->
+                <!--                {{ proviteData.powerSupplyCount }}-->
+                <!--            </el-descriptions-item>-->
+                <el-descriptions-item label="供电电源情况" v-if="detailData.userType == 6">
+                    {{
+                        powerSupplyInfoOptionList.find(item => {
+                            return item.id == proviteData.powerSupplyInfo
+                        })?.name
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item label="供电电源" :span="2" v-if="detailData.userType == 6">
+                    {{ proviteData.powerSupply }}
+                </el-descriptions-item>
+                <el-descriptions-item label="负荷级别" v-if="detailData.userType == 6">
+                    {{
+                        loadLevelOptionList.find(item => {
+                            return item.id == proviteData.loadLevel
+                        })?.name
+                    }}
+                </el-descriptions-item>
+                <el-descriptions-item label="敏感电能质量指标" v-if="detailData.userType == 6">
+                    <span v-if="proviteData.energyQualityIndex">
+                        {{
+                            Array.isArray(proviteData.energyQualityIndex)
+                                ? proviteData.energyQualityIndex
+                                      .map(id => energyQualityIndexList.find(item => item.id == id)?.name)
+                                      .filter(name => name)
+                                      .join(', ')
+                                : typeof proviteData.energyQualityIndex === 'string'
+                                ? proviteData.energyQualityIndex
+                                      .split(', ')
+                                      .map(id => energyQualityIndexList.find(item => item.id == id)?.name)
+                                      .filter(name => name)
+                                      .join(', ')
+                                : energyQualityIndexList.find(item => item.id == proviteData.energyQualityIndex)?.name
+                        }}
+                    </span>
+                    <span v-else>-</span>
+                </el-descriptions-item>
+                <el-descriptions-item label="可研报告">
+                    <span v-if="detailData.userType == 0 || detailData.userType == 1">
+                        <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name">
+                            <View @click="openFile(proviteData?.feasibilityReport?.name)" />
+                        </el-icon>
+                        <span class="aLoad" @click="download(proviteData.feasibilityReport.keyName)" rel="nofollow">
+                            {{ proviteData?.feasibilityReport?.name }}
+                        </span>
+                    </span>
+                    <span
+                        v-if="
+                            detailData.userType == 2 ||
+                            detailData.userType == 3 ||
+                            detailData.userType == 4 ||
+                            detailData.userType == 5
+                        "
+                    >
+                        <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name">
+                            <View @click="openFile(proviteData?.feasibilityReport?.name)" />
+                        </el-icon>
+                        <span class="aLoad" @click="download(proviteData.feasibilityReport.keyName)">
+                            {{ proviteData?.feasibilityReport?.name }}
+                        </span>
+                    </span>
+                    <span v-if="detailData.userType == 6">
+                        <el-icon class="elView" v-if="proviteData?.feasibilityReport?.name">
+                            <View @click="openFile(proviteData?.feasibilityReport?.name)" />
+                        </el-icon>
+                        <span class="aLoad" @click="download(proviteData.feasibilityReport.keyName)">
+                            {{ proviteData?.feasibilityReport?.name }}
+                        </span>
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="项目初步设计说明书">
+                    <el-icon class="elView" v-if="proviteData?.preliminaryDesignDescription?.name">
+                        <View @click="openFile(proviteData?.preliminaryDesignDescription?.name)" />
                     </el-icon>
-                    <span  class="aLoad" @click="download(item.keyName)">
-                        {{ item.name }}
-                    </span >
-                </div>
-            </el-descriptions-item>
-            <el-descriptions-item label="治理验收报告">
-                <div v-for="item in governReportList">
-                    <el-icon class="elView" v-if="item.name && VITE_FLAG">
-                        <View @click="openFile(item.name)" />
-                    </el-icon>
-                    <span  class="aLoad" @click="download(item.keyName)" >
-                        {{ item.name }}
-                    </span >
-                </div>
-            </el-descriptions-item>
-            <el-descriptions-item label="信息安全检测报告" v-if="props.openType == 'sourcesOfInterference'">
-                <el-icon class="elView" v-if="form.informationSecurityTestReport[0]?.name && VITE_FLAG">
-                    <View @click="openFile(form.informationSecurityTestReport[0]?.name)" />
-                </el-icon>
-                <span  class="aLoad" @click="download(proviteData.predictionEvaluationReviewOpinions.keyName)" >
-                    {{ form.informationSecurityTestReport[0]?.name }}
-                </span >
-            </el-descriptions-item>
-            <el-descriptions-item label="入网设计方案审查报告" v-if="props.openType == 'sourcesOfInterference'">
-                <div v-for="item in form.NetReport">
-                    <el-icon class="elView" v-if="item.name && VITE_FLAG">
-                        <View @click="openFile(item.name)" />
-                    </el-icon>
-                    <span  class="aLoad" @click="download(item.keyName)" >
-                        {{ item.name }}
-                    </span >
-                </div>
-            </el-descriptions-item>
-            <el-descriptions-item label="治理工程验收报告" v-if="props.openType == 'sourcesOfInterference'">
-                <div v-for="item in form.governReport">
-                    <el-icon class="elView" v-if="item.name && VITE_FLAG">
-                        <View @click="openFile(item.name)" />
-                    </el-icon>
-                    <span  class="aLoad" @click="download(item.keyName)">
-                        {{ item.name }}
-                    </span >
-                </div>
-            </el-descriptions-item>
 
-            <el-descriptions-item label="验收检验报告单" v-if="props.openType == 'sourcesOfInterference'">
-                <el-icon class="elView" v-if="form.acceptanceInspectionReportSingle[0]?.name && VITE_FLAG">
-                    <View @click="openFile(form.acceptanceInspectionReportSingle[0]?.name)" />
-                </el-icon>
-                <span  class="aLoad" @click="download(form.acceptanceInspectionReportSingle[0]?.keyName)">
-                    {{ form.acceptanceInspectionReportSingle[0]?.name }}
-                </span >
-            </el-descriptions-item>
+                    <span class="aLoad" @click="download(proviteData.preliminaryDesignDescription.keyName)">
+                        {{ proviteData?.preliminaryDesignDescription?.name }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="预测评估报告">
+                    <el-icon class="elView" v-if="proviteData?.predictionEvaluationReport?.name">
+                        <View @click="openFile(proviteData?.predictionEvaluationReport?.name)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(proviteData.predictionEvaluationReport.keyName)">
+                        {{ proviteData?.predictionEvaluationReport?.name }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="预测评估评审意见报告">
+                    <el-icon class="elView" v-if="proviteData?.predictionEvaluationReviewOpinions?.name">
+                        <View @click="openFile(proviteData?.predictionEvaluationReviewOpinions?.name)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(proviteData.predictionEvaluationReviewOpinions.keyName)">
+                        {{ proviteData?.predictionEvaluationReviewOpinions?.name }}
+                    </span>
+                </el-descriptions-item>
 
-            <el-descriptions-item label="验收检验报告" v-if="props.openType == 'sourcesOfInterference'">
-                <el-icon class="elView" v-if="form.acceptanceInspectionReport[0]?.name && VITE_FLAG">
-                    <View @click="openFile(form.acceptanceInspectionReport[0]?.name)" />
-                </el-icon>
-                <span  class="aLoad" @click="download(form.acceptanceInspectionReport[0]?.keyName )">
-                    {{ form.acceptanceInspectionReport[0]?.name }}
-                </span >
-            </el-descriptions-item>
-            <el-descriptions-item label="型式实验报告" v-if="props.openType == 'sourcesOfInterference'">
-                <el-icon class="elView" v-if="form.typeExperimentReport[0]?.name && VITE_FLAG">
-                    <View @click="openFile(form.typeExperimentReport[0]?.name)" />
-                </el-icon>
-                <span  class="aLoad" @click="download(form.typeExperimentReport[0]?.keyName)">
-                    {{ form.typeExperimentReport[0]?.name }}
-                </span >
-            </el-descriptions-item>
+                <el-descriptions-item
+                    label="用户接入变电站主接线示意图"
+                    v-if="detailData.userType != 0 && detailData.userType != 1"
+                >
+                    <el-icon class="elView" v-if="proviteData?.substationMainWiringDiagram?.name">
+                        <View @click="openFile(proviteData?.substationMainWiringDiagram?.name)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(proviteData.substationMainWiringDiagram.keyName)">
+                        {{ proviteData?.substationMainWiringDiagram?.name }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="主要敏感终端清单" v-if="detailData.userType == 6">
+                    <el-icon class="elView" v-if="proviteData?.sensitiveDevices?.name">
+                        <View @click="openFile(proviteData?.sensitiveDevices?.name)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(proviteData.sensitiveDevices.keyName)">
+                        {{ proviteData?.sensitiveDevices?.name }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="抗扰度测试报告" v-if="detailData.userType == 6">
+                    <el-icon class="elView" v-if="proviteData?.antiInterferenceReport?.name">
+                        <View @click="openFile(proviteData?.antiInterferenceReport?.name)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(proviteData.antiInterferenceReport.keyName)">
+                        {{ proviteData?.antiInterferenceReport?.name }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="背景电能质量测试报告" v-if="detailData.userType == 6">
+                    <el-icon class="elView" v-if="proviteData?.powerQualityReport?.name">
+                        <View @click="openFile(proviteData?.powerQualityReport?.name)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(proviteData.powerQualityReport.keyName)">
+                        {{ proviteData?.powerQualityReport?.name }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item
+                    label="其他附件"
+                    v-if="proviteData?.additionalAttachments && proviteData?.additionalAttachments?.url"
+                >
+                    <el-icon class="elView" v-if="proviteData?.additionalAttachments?.name">
+                        <View @click="openFile(proviteData?.additionalAttachments?.name)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(proviteData.additionalAttachments.keyName)">
+                        {{ proviteData?.additionalAttachments?.name }}
+                    </span>
+                </el-descriptions-item>
 
-            <el-descriptions-item label="出厂检验报告" v-if="props.openType == 'sourcesOfInterference'">
-                <el-icon class="elView" v-if="form.factoryInspectionReport[0]?.name && VITE_FLAG">
-                    <View @click="openFile(form.factoryInspectionReport[0]?.name)" />
-                </el-icon>
-                <span  class="aLoad" @click="download(form.factoryInspectionReport[0]?.keyName)">
-                    {{ form.factoryInspectionReport[0]?.name }}
-                </span >
-            </el-descriptions-item>
-            <el-descriptions-item label="性能检测报告" v-if="props.openType == 'sourcesOfInterference'">
-                <el-icon class="elView" v-if="form.performanceTestReport[0]?.name && VITE_FLAG">
-                    <View @click="openFile(form.performanceTestReport[0]?.name)" />
-                </el-icon>
-                <span  class="aLoad" @click="download(form.performanceTestReport[0]?.keyName)">
-                    {{ form.performanceTestReport[0]?.name }}
-                </span >
-            </el-descriptions-item>
-            <el-descriptions-item label="主接线图" v-if="props.openType == 'sourcesOfInterference'">
-                <el-icon class="elView" v-if="form.mainWiringDiagram[0]?.name && VITE_FLAG">
-                    <View @click="openFile(form.mainWiringDiagram[0]?.name)" />
-                </el-icon>
-                <span  class="aLoad" @click="download(form.mainWiringDiagram[0]?.keyName)">
-                    {{ form.mainWiringDiagram[0]?.name }}
-                </span >
-            </el-descriptions-item>
-            <el-descriptions-item label="试运行报告" v-if="props.openType == 'sourcesOfInterference'">
-                <el-icon class="elView" v-if="form.runTheReport[0]?.name && VITE_FLAG" >
-                    <View @click="openFile(form.runTheReport[0]?.name)" />
-                </el-icon>
-                <span  class="aLoad"  @click="download(form.runTheReport[0]?.keyName)">
-                    {{ form.runTheReport[0]?.name }}
-                </span >
-            </el-descriptions-item>
-        </el-descriptions>
+                <el-descriptions-item label="系统接入方案">
+                    <div v-for="item in netInReportList">
+                        <el-icon class="elView" v-if="item.name">
+                            <View @click="openFile(item.name)" />
+                        </el-icon>
+                        <span class="aLoad" @click="download(item.keyName)">
+                            {{ item.name }}
+                        </span>
+                    </div>
+                </el-descriptions-item>
+                <el-descriptions-item label="治理验收报告">
+                    <div v-for="item in governReportList">
+                        <el-icon class="elView" v-if="item.name">
+                            <View @click="openFile(item.name)" />
+                        </el-icon>
+                        <span class="aLoad" @click="download(item.keyName)">
+                            {{ item.name }}
+                        </span>
+                    </div>
+                </el-descriptions-item>
+                <el-descriptions-item label="治理方案仿真校验评估报告">
+                    <div v-for="item in simulationReportList">
+                        <el-icon class="elView" v-if="item.name">
+                            <View @click="openFile(item.name)" />
+                        </el-icon>
+                        <span class="aLoad" @click="download(item.keyName)">
+                            {{ item.name }}
+                        </span>
+                    </div>
+                </el-descriptions-item>
+
+                <el-descriptions-item label="信息安全检测报告" v-if="props.openType == 'sourcesOfInterference'">
+                    <el-icon class="elView" v-if="form.informationSecurityTestReport[0]?.name">
+                        <View @click="openFile(form.informationSecurityTestReport[0]?.name)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(proviteData.predictionEvaluationReviewOpinions.keyName)">
+                        {{ form.informationSecurityTestReport[0]?.name }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="入网设计方案审查报告" v-if="props.openType == 'sourcesOfInterference'">
+                    <div v-for="item in form.NetReport">
+                        <el-icon class="elView" v-if="item.name">
+                            <View @click="openFile(item.name)" />
+                        </el-icon>
+                        <span class="aLoad" @click="download(item.keyName)">
+                            {{ item.name }}
+                        </span>
+                    </div>
+                </el-descriptions-item>
+                <el-descriptions-item label="治理工程验收报告" v-if="props.openType == 'sourcesOfInterference'">
+                    <div v-for="item in form.governReport">
+                        <el-icon class="elView" v-if="item.name">
+                            <View @click="openFile(item.name)" />
+                        </el-icon>
+                        <span class="aLoad" @click="download(item.keyName)">
+                            {{ item.name }}
+                        </span>
+                    </div>
+                </el-descriptions-item>
+
+                <el-descriptions-item label="验收检验报告单" v-if="props.openType == 'sourcesOfInterference'">
+                    <el-icon class="elView" v-if="form.acceptanceInspectionReportSingle[0]?.name">
+                        <View @click="openFile(form.acceptanceInspectionReportSingle[0]?.name)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(form.acceptanceInspectionReportSingle[0]?.keyName)">
+                        {{ form.acceptanceInspectionReportSingle[0]?.name }}
+                    </span>
+                </el-descriptions-item>
+
+                <el-descriptions-item label="验收检验报告" v-if="props.openType == 'sourcesOfInterference'">
+                    <el-icon class="elView" v-if="form.acceptanceInspectionReport[0]?.name">
+                        <View @click="openFile(form.acceptanceInspectionReport[0]?.name)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(form.acceptanceInspectionReport[0]?.keyName)">
+                        {{ form.acceptanceInspectionReport[0]?.name }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="型式实验报告" v-if="props.openType == 'sourcesOfInterference'">
+                    <el-icon class="elView" v-if="form.typeExperimentReport[0]?.name">
+                        <View @click="openFile(form.typeExperimentReport[0]?.name)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(form.typeExperimentReport[0]?.keyName)">
+                        {{ form.typeExperimentReport[0]?.name }}
+                    </span>
+                </el-descriptions-item>
+
+                <el-descriptions-item label="出厂检验报告" v-if="props.openType == 'sourcesOfInterference'">
+                    <el-icon class="elView" v-if="form.factoryInspectionReport[0]?.name">
+                        <View @click="openFile(form.factoryInspectionReport[0]?.name)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(form.factoryInspectionReport[0]?.keyName)">
+                        {{ form.factoryInspectionReport[0]?.name }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="性能检测报告" v-if="props.openType == 'sourcesOfInterference'">
+                    <el-icon class="elView" v-if="form.performanceTestReport[0]?.name">
+                        <View @click="openFile(form.performanceTestReport[0]?.name)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(form.performanceTestReport[0]?.keyName)">
+                        {{ form.performanceTestReport[0]?.name }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="主接线图" v-if="props.openType == 'sourcesOfInterference'">
+                    <el-icon class="elView" v-if="form.mainWiringDiagram[0]?.name">
+                        <View @click="openFile(form.mainWiringDiagram[0]?.name)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(form.mainWiringDiagram[0]?.keyName)">
+                        {{ form.mainWiringDiagram[0]?.name }}
+                    </span>
+                </el-descriptions-item>
+                <el-descriptions-item label="试运行报告" v-if="props.openType == 'sourcesOfInterference'">
+                    <el-icon class="elView" v-if="form.runTheReport[0]?.name">
+                        <View @click="openFile(form.runTheReport[0]?.name)" />
+                    </el-icon>
+                    <span class="aLoad" @click="download(form.runTheReport[0]?.keyName)">
+                        {{ form.runTheReport[0]?.name }}
+                    </span>
+                </el-descriptions-item>
+            </el-descriptions>
+        </div>
     </div>
 </template>
 <script lang="ts" setup>
@@ -460,9 +486,9 @@ import { Link, View } from '@element-plus/icons-vue'
 import PreviewFile from '@/components/PreviewFile/index.vue'
 import { getByDeptDevLine } from '@/api/supervision-boot/interfere/index'
 import { addOrUpdateFile, getFileById } from '@/api/supervision-boot/interfere/index'
-import {download} from '@/utils/fileDownLoad'
+import { download } from '@/utils/fileDownLoad'
 defineOptions({ name: 'BpmUserReportDetail' })
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+
 const { query } = useRoute() // 查询参数
 
 const props = defineProps({
@@ -485,6 +511,7 @@ const openFile = (name: any) => {
 }
 const netInReportList: any = ref([])
 const governReportList: any = ref([])
+const simulationReportList: any = ref([])
 //用户性质数组
 const userTypeList = reactive([
     {
@@ -581,7 +608,6 @@ const getInfo = async () => {
         detailLoading.value = false
     }
 
-    console.log(form.value)
     if (props.openType == 'sourcesOfInterference') {
         queryFiles()
     }
@@ -656,7 +682,6 @@ const queryFiles = () => {
 }
 //判断userType选择取用的对象
 const getProviteData = async () => {
-    console.log('energyQualityIndexList', energyQualityIndexList)
     if (detailData.value.userType == '0' || detailData.value.userType == '1') {
         proviteData.value = detailData.value.userReportProjectPO
         //查询非线性终端类型
@@ -679,7 +704,7 @@ const getProviteData = async () => {
         }
     } else {
         proviteData.value = detailData.value.userReportSensitivePO
-        console.log(proviteData.value.energyQualityIndex)
+
         console.log(
             'proviteData.value.nonlinearLoadType',
             energyQualityIndexList.find(item => {
@@ -757,6 +782,7 @@ const getProviteData = async () => {
         })
     }
     // 治理评估告"
+
     if (detailData.value.governReport.length > 0) {
         governReportList.value = []
         detailData.value.governReport.forEach((item: any) => {
@@ -765,6 +791,14 @@ const getProviteData = async () => {
             }
         })
     }
+    if (detailData.value.simulationReport.length > 0) {
+        simulationReportList.value = []
+        detailData.value.simulationReport.forEach((item: any) => {
+            if (item != null) {
+                getFileNamePath(item, 'simulationReport')
+            }
+        })
+    }
 
     // 调用关联终端接口
     getByDeptDevLine({ id: detailData.value.orgId }).then(res => {
@@ -782,7 +816,6 @@ const getFileNamePath = async (val: any, pathName: any) => {
                     keyName: res.data.name,
                     url: res.data.url
                 }
-                   
             }
             //项目初步设计说明书
             else if (pathName == 'preliminaryDesignDescription' && proviteData.value.preliminaryDesignDescription) {
@@ -807,7 +840,7 @@ const getFileNamePath = async (val: any, pathName: any) => {
             ) {
                 proviteData.value.predictionEvaluationReviewOpinions = {
                     name: res.data.fileName,
-                    keyName: res.data.name,
+                    keyName: val,
                     url: res.data.url
                 }
             }
@@ -864,6 +897,12 @@ const getFileNamePath = async (val: any, pathName: any) => {
                     keyName: res.data.name,
                     url: res.data.url
                 })
+            } else if (pathName == 'simulationReport') {
+                simulationReportList.value.push({
+                    name: res.data.fileName,
+                    keyName: res.data.name,
+                    url: res.data.url
+                })
             }
         }
     })

src/views/pqs/supervise/plan/components/detail.vue

@@ -1,4 +1,8 @@
 <template>
+     <div v-if="detailLoading" class="loading">
+            <el-spin description="加载中..." />
+        </div>
+        <div v-else>
     <el-descriptions :column="2" border>
         <el-descriptions-item label="计划名称">
             {{ detailData.workPlanName }}
@@ -104,7 +108,7 @@
             {{ detailData.otherRemark }}
         </el-descriptions-item>
         <el-descriptions-item label="盖章报告" v-if="detailData.factoryInspectionReport">
-            <el-icon class="elView" v-if="detailData?.factoryInspectionReport.name && VITE_FLAG">
+            <el-icon class="elView" v-if="detailData?.factoryInspectionReport.name ">
                 <View @click="openFile(detailData?.factoryInspectionReport.name)" />
             </el-icon>
           <span  class="aLoad" @click="download(detailData?.factoryInspectionReport.keyName)">
@@ -112,7 +116,7 @@
             </span >
         </el-descriptions-item>
         <el-descriptions-item label="佐证材料" v-if="detailData?.informationSecurityTestReport">
-            <el-icon class="elView" v-if="detailData?.informationSecurityTestReport.name && VITE_FLAG">
+            <el-icon class="elView" v-if="detailData?.informationSecurityTestReport.name ">
                 <View @click="openFile(detailData?.informationSecurityTestReport.name)" />
             </el-icon>
           <span  class="aLoad" @click="download(detailData?.informationSecurityTestReport.keyName)">
@@ -120,30 +124,31 @@
             </span >
         </el-descriptions-item>
         <el-descriptions-item label="计划变更材料" v-if="detailData?.otherAttachments">
-            <el-icon class="elView" v-if="detailData?.otherAttachments.name && VITE_FLAG">
+            <el-icon class="elView" v-if="detailData?.otherAttachments.name ">
                 <View @click="openFile(detailData?.otherAttachments.name)" />
             </el-icon>
           <span  class="aLoad" @click="download(detailData?.otherAttachments.keyName)">{{ detailData?.otherAttachments.name }}</span >
         </el-descriptions-item>
         <el-descriptions-item label="告预警单材料" v-if="detailData?.performanceTestReport">
-            <el-icon class="elView" v-if="detailData?.performanceTestReport.name && VITE_FLAG">
+            <el-icon class="elView" v-if="detailData?.performanceTestReport.name ">
                 <View @click="openFile(detailData?.performanceTestReport.name)" />
             </el-icon>
           <span  class="aLoad" @click="download(detailData?.performanceTestReport.keyName)">{{ detailData?.performanceTestReport.name }}</span >
         </el-descriptions-item>
         <el-descriptions-item label="告预警单反馈材料" v-if="detailData?.typeExperimentReport">
-            <el-icon class="elView" v-if="detailData?.typeExperimentReport.name && VITE_FLAG">
+            <el-icon class="elView" v-if="detailData?.typeExperimentReport.name ">
                 <View @click="openFile(detailData?.typeExperimentReport.name)" />
             </el-icon>
           <span  class="aLoad" @click="download(detailData?.typeExperimentReport.keyName)">{{ detailData?.typeExperimentReport.name }}</span >
         </el-descriptions-item>
         <el-descriptions-item label="评估报告" v-if="detailData?.performanceTestReport">
-            <el-icon class="elView" v-if="detailData?.performanceTestReport.name && VITE_FLAG">
+            <el-icon class="elView" v-if="detailData?.performanceTestReport.name ">
                 <View @click="openFile(detailData?.performanceTestReport.name)" />
             </el-icon>
           <span  class="aLoad" @click="download(detailData?.performanceTestReport.keyName)">{{ detailData?.performanceTestReport.name }}</span >
         </el-descriptions-item>
     </el-descriptions>
+    </div>
 </template>
 <script lang="ts" setup>
 import { onMounted, ref, reactive } from 'vue'
@@ -161,8 +166,7 @@ const { query } = useRoute() // 查询参数
 const props = defineProps({
     id: propTypes.string.def(undefined)
 })
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
-console.log(propTypes.string.def(undefined), '999999999999传参')
+
 const detailLoading = ref(false) // 表单的加载中
 const detailData = ref<any>({}) // 详情数据
 const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号

src/views/pqs/supervise/retire/detail.vue

@@ -1,6 +1,10 @@
 <template>
     <!--工作流view的路径：/pqs/supervise/retire/detail-->
     <div class='default-main'>
+         <div v-if="detailLoading" class="loading">
+            <el-spin description="加载中..." />
+        </div>
+        <div v-else>
         <!--        <h1>详细信息回显</h1>-->
         <el-descriptions :column='2' border>
             <el-descriptions-item label='供电公司'>
@@ -41,6 +45,7 @@
                 {{ detailData.propertyNo }}
             </el-descriptions-item>
         </el-descriptions>
+        </div>
     </div>
 </template>
 <script setup lang='ts'>

src/views/pqs/supervise/technology/components/alarm.vue

@@ -46,6 +46,7 @@ import { useDictData } from '@/stores/dictData'
 import { getFileNameAndFilePath } from '@/api/system-boot/file'
 import { deleteWarningLeaflet } from '@/api/supervision-boot/delete/index'
 import detail from '@/views/pqs/supervise/harmonicSurvey/test/detail.vue'
+import {download} from '@/utils/fileDownLoad'
 const dictData = useDictData()
 
 const statusSelect = [
@@ -233,18 +234,18 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     disabled: row => {
-                            if (VITE_FLAG) {
-                                 return !(row.problemType == 2 || row.problemType == 4)
-                            }
-                            return true;
-                  
-                       
+                            // if (VITE_FLAG) {
+                                return !(row.problemType == 2 || row.problemType == 4)
+                            // }
+                            // return true;
                     },
                     click: row => {
+                         
                         if (row.problemType == 2) {
-                            const match = row.filePath.match(/excelreport(\/[^?#]*)/)
-
-                            window.open(window.location.origin + '/#/previewFile?' + match[1])
+                            // const match = row.filePath.match(/excelreport(\/[^?#]*)/)
+                           
+                            // window.open(window.location.origin + '/#/previewFile?' + match[1])
+                             window.open(window.location.origin + '/#/previewFile?/' + row.absFilePath)
                         } else {
                             if (row.problemPath == null) {
                                 ElMessage({
@@ -252,7 +253,8 @@ const tableStore = new TableStore({
                                     type: 'warning'
                                 })
                             } else {
-                                window.open(window.location.origin + '/#/previewFile?/' + row.problemPath)
+                                //window.open(window.location.origin + '/#/previewFile?/' + row.problemPath)
+                                window.open(window.location.origin + '/#/previewFile?/' + row.absFilePath)
                                 // getFileNameAndFilePath({ filePath: '/' + row.problemPath }).then(res => {
                                 //     // window.open(res.data.url)
                                 // })
@@ -271,7 +273,9 @@ const tableStore = new TableStore({
                     },
                     click: row => {
                         if (row.problemType == 2) {
-                            window.open(row.filePath)
+                           
+                            //window.open(row.filePath)
+                            download('/' + row.absFilePath)
                         } else {
                             if (row.problemPath == null) {
                                 ElMessage({
@@ -279,9 +283,11 @@ const tableStore = new TableStore({
                                     type: 'warning'
                                 })
                             } else {
-                                getFileNameAndFilePath({ filePath: '/' + row.problemPath }).then(res => {
-                                    window.open(res.data.url)
-                                })
+                                // getFileNameAndFilePath({ filePath: '/' + row.problemPath }).then(res => {
+                                    
+                                //     window.open(res.data.url)
+                                // })
+                                download('/' + row.absFilePath)
                             }
                         }
                     }

src/views/pqs/supervise/technology/components/earlyWarn.vue

@@ -32,6 +32,10 @@ import { cancelFeedback, getById } from '@/api/supervision-boot/leaflet'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { useDictData } from '@/stores/dictData'
 import { deleteWarningLeaflet } from '@/api/supervision-boot/delete/index'
+import {download} from '@/utils/fileDownLoad'
+
+import { getFileNameAndFilePath, downloadFile } from '@/api/system-boot/file'
+
 const dictData = useDictData()
 //获取登陆用户姓名和部门
 const adminInfo = useAdminInfo()
@@ -147,16 +151,17 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     disabled: row => {
-                            if (VITE_FLAG) {
+                            // if (VITE_FLAG) {
                                 return row.problemType != 2;
-                            }
-                            return true;
+                            // }
+                            // return true;
                     },
                   
                     click: row => {
-                        const match = row.filePath.match(/excelreport(\/[^?#]*)/)
-
-                        window.open(window.location.origin + '/#/previewFile?' + match[1])
+                        // const match = row.filePath.match(/excelreport(\/[^?#]*)/)
+             
+                        // window.open(window.location.origin + '/#/previewFile?' + match[1])
+                        window.open(window.location.origin + '/#/previewFile?/' + row.absFilePath)
                     }
                 },
                 {
@@ -169,7 +174,16 @@ const tableStore = new TableStore({
                         return row.problemType != 2
                     },
                     click: row => {
-                        window.open(row.filePath)
+                       
+                        //window.open(row.filePath)
+                        //  const match = row.filePath.match(/excelreport(\/[^?#]*)/)
+                        //  const decodedPath = decodeURI(match[1]) // 解码URL中的中文字符
+                        download('/' + row.absFilePath)
+                        
+                        //download('/supervision/微服务系统测试页面功能-20251224合并版本.docx')
+                        
+                        //download('/onlineReport/电能[预]2025年18号-张家口地市 电能质量技术监督预警单.docx')
+                       
                     }
                 },
                 // {
@@ -315,6 +329,11 @@ const tableStore = new TableStore({
         })
     }
 })
+
+
+
+
+
 tableStore.table.params.status = ''
 provide('tableStore', tableStore)
 

src/views/pqs/supervise/technology/detail.vue

@@ -1,6 +1,10 @@
 <template>
     <!--工作流view的路径：/pqs/supervise/technology/detail-->
     <div class="default-main">
+         <div v-if="detailLoading" class="loading">
+            <el-spin description="加载中..." />
+        </div>
+        <div v-else>
         <!--        <h1>详细信息回显</h1>-->
         <el-descriptions :column="2" border>
             <el-descriptions-item :label="detailData.leafletType == 1 ? '预警单名称' : '告警单名称'">
@@ -14,7 +18,7 @@
             </el-descriptions-item>
             <template v-if="detailData.problemType == 4">
                 <el-descriptions-item :span="2" label="附件">
-                    <el-icon class="elView" v-if="detailData?.problemName && VITE_FLAG">
+                    <el-icon class="elView" v-if="detailData?.problemName ">
                         <View @click="openFile(detailData?.problemName)" />
                     </el-icon>
                     <span  class="aLoad" @click="download(detailData.keyName)" target="_blank">{{ detailData.problemName }}</span >
@@ -26,13 +30,14 @@
             <el-descriptions-item :span="2" label="采取措施">
                 {{ detailData.takeStep }}
             </el-descriptions-item>
-            <el-descriptions-item :span="2" label="处理成效报告">
-                <el-icon class="elView" v-if="detailData?.reportName && VITE_FLAG">
+            <el-descriptions-item :span="2" label="反馈报告">
+                <el-icon class="elView" v-if="detailData?.reportName ">
                     <View @click="openFile(detailData?.reportName)" />
                 </el-icon>
                 <span  class="aLoad" @click="download(detailData.keyName)" target="_blank">{{ detailData.reportName }}</span >
             </el-descriptions-item>
         </el-descriptions>
+        </div>
     </div>
 </template>
 <script lang="ts" setup>
@@ -43,9 +48,10 @@ import { getById } from '@/api/supervision-boot/leaflet'
 import { getFileNameAndFilePath } from '@/api/system-boot/file'
 import {download} from '@/utils/fileDownLoad'
 import { Link, View } from '@element-plus/icons-vue'
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+
 defineOptions({ name: 'technology/detail' })
 const openFile = (name: any) => {
+ 
     window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
 }
 const { query } = useRoute() // 查询参数
@@ -87,8 +93,10 @@ const getInfo = async () => {
 
 const getFileData = async () => {
     //如果有问题附件
+    //console.log('000',detailData.value)
     if (detailData.value.problemPath) {
         await getFileNameAndFilePath({ filePath: detailData.value.problemPath }).then(res => {
+            console.log(res.data)
             detailData.value.keyName = res.data.name
             detailData.value.problemPath = res.data.url
             detailData.value.problemName = res.data.fileName

src/views/pqs/supervise/technology/feedbackPopup.vue

@@ -11,8 +11,9 @@
                         :autosize="{ minRows: 2, maxRows: 6 }" readonly />
                 </el-form-item>
 
-                <el-form-item label="技术监督报告：" v-if="showFile1">
-                    <el-icon class="elView" v-if="supervisionReportDetail?.supervisionReportName && VITE_FLAG">
+                <!-- <el-form-item label="技术监督报告：" v-if="showFile1"> -->
+                <el-form-item label="技术监督报告：" v-if="false">
+                    <el-icon class="elView" v-if="supervisionReportDetail?.supervisionReportName ">
                         <View @click="openFile(supervisionReportDetail?.supervisionReportName)" />
                     </el-icon>
                    <span class="aLoad" @click="download(supervisionReportDetail.keyName)" target="_blank">
@@ -21,10 +22,10 @@
                 </el-form-item>
 
                 <el-form-item label="问题附件：" v-if="showFile">
-                    <el-icon class="elView" v-if="problemDetail?.problemName && VITE_FLAG">
+                    <el-icon class="elView" v-if="problemDetail?.problemName ">
                         <View @click="openFile(problemDetail?.problemName)" />
                     </el-icon>
-                   <span class="aLoad" @click="download(supervisionReportDetail.keyName)" target="_blank">{{ problemDetail.problemName }}</span>
+                   <span class="aLoad" @click="download(supervisionReportDetail.keyName)" target="_blank">{{ problemDetail.problemName }}</span >
                 </el-form-item>
 
                 <el-form-item label="采取的措施：" prop="takeStep">
@@ -63,7 +64,7 @@ import { Link, View } from '@element-plus/icons-vue'
 const openFile = (name: any) => {
     window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
 }
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+
 //.doc,.docx,.xlsx,.xls,.pdf
 const acceptType = ref('')
 //下拉数据源
@@ -104,7 +105,7 @@ const reportFilePath: any = ref('')
 //form表单校验规则
 const rules = {
     takeStep: [{ required: true, message: '请输入采取的措施', trigger: 'blur' }],
-    reportPath: [{ required: true, message: '请上传处理成效报告', trigger: 'blur' }]
+    reportPath: [{ required: true, message: '请上传反馈报告', trigger: 'blur' }]
 }
 const resetForm = () => {
     if (formRef.value) {

src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue

@@ -15,11 +15,65 @@
                 <el-form-item label="数据筛选">
                     <el-input
                         style="width: 240px"
-                        placeholder="电站名称，终端编号，监测点名称"
+                        placeholder="电站名称，终端编号，监测点名称、电压等级、终端厂家、干扰源类型"
                         v-model="tableStore.table.params.searchValue"
                         clearable
                     ></el-input>
                 </el-form-item>
+                <el-form-item label="电压等级:">
+                    <el-select
+                        v-model="tableStore.table.params.scale"
+                        filterable
+                        multiple
+                        collapse-tags
+                        clearable
+                        placeholder="请选择电压等级"
+                        value-key="id"
+                    >
+                        <el-option
+                            v-for="item in voltageleveloption"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="终端厂家:">
+                    <el-select
+                        v-model="tableStore.table.params.manufacturer"
+                        filterable
+                        multiple
+                        collapse-tags
+                        clearable
+                        placeholder="请选择终端厂家"
+                        value-key="id"
+                    >
+                        <el-option
+                            v-for="item in terminaloption"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="干扰源类型:">
+                    <el-select
+                        v-model="tableStore.table.params.loadType"
+                        filterable
+                        multiple
+                        collapse-tags
+                        clearable
+                        placeholder="请选择干扰源类型"
+                        value-key="id"
+                    >
+                        <el-option
+                            v-for="item in interfereoption"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
             </template>
 
             <template #operation>
@@ -44,7 +98,9 @@ const interferenceType = dictData.getBasicData('Interference_Source')
 const istatusList = dictData.getBasicData('On-network_Status')
 const TableHeaderRef = ref()
 const areaOptionList = dictData.getBasicData('jibei_area')
-
+const interfereoption = dictData.getBasicData('Interference_Source')
+const terminaloption = dictData.getBasicData('Dev_Manufacturers')
+const voltageleveloption = dictData.getBasicData('Dev_Voltage_Stand')
 const tableStore = new TableStore({
     url: '/device-boot/runManage/getLineLedger',
     publicHeight: 65,
@@ -84,6 +140,14 @@ const tableStore = new TableStore({
                 return row.cellValue ? row.cellValue : '/'
             }
         },
+        {
+            field: 'manufacturer',
+            title: '终端厂家',
+            minWidth: 100,
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
         {
             field: 'shortCapacity',
             title: '最小短路容量(MVA)',
@@ -91,7 +155,7 @@ const tableStore = new TableStore({
         },
         {
             field: 'devCapacity',
-            title: '供电终端容量(MVA )',
+            title: '供电设备容量(MVA )',
             minWidth: 160
         },
         {
@@ -165,9 +229,11 @@ const tableStore = new TableStore({
 tableStore.table.params.runF = 0
 tableStore.table.params.runFlag = []
 tableStore.table.params.searchValue = ''
-
+tableStore.table.params.scale = []
+tableStore.table.params.manufacturer = []
+tableStore.table.params.loadType = []
 const runFlagList = [
-    { id: 0, name: '运行' },
+    { id: 0, name: '投运' },
     { id: 1, name: '检修' },
     { id: 2, name: '停运' },
     { id: 3, name: '调试' },
@@ -182,8 +248,47 @@ const setSearchValue = (val: string) => {
     tableStore.table.params.searchValue = val
     tableStore.index()
 }
+const setSearchType = async (val: string, key: string) => {
+    tableStore.table.params.searchValue = ''
+    tableStore.table.params.scale = []
+    tableStore.table.params.manufacturer = []
+    tableStore.table.params.loadType = []
+    if (key == 'Voltage_Level') {
+        // 电压等级
+        tableStore.table.params.scale = await getType(voltageleveloption, val)
+    } else if (key == 'Manufacturer') {
+        // 终端厂家
+        tableStore.table.params.manufacturer = await getType(terminaloption, val)
+    } else if (key == 'Load_Type') {
+        // 干扰源类型
+        tableStore.table.params.loadType = await getType(interfereoption, val)
+    }
 
+    await tableStore.index()
+}
+const getType = (list: any, str: string) => {
+    if (str == '其他') {
+        return list.filter(
+            (item: any) =>
+                item.name != '风电场' &&
+                item.name != '光伏电站' &&
+                item.name != '电气化铁路' &&
+                item.name != '一类变电站' &&
+                item.name != '安徽振兴' &&
+                item.name != '南京灿能' &&
+                item.name != '深圳中电' &&
+                item.name != '东方威思顿' &&
+                item.name != '220kV' &&
+                item.name != '110kV' &&
+                item.name != '35kV' &&
+                item.name != '500kV'
+        )
+    } else {
+        return list.filter((item: any) => item.name == str)
+    }
+}
 defineExpose({
-    setSearchValue
+    setSearchValue,
+    setSearchType
 })
 </script>

src/views/pqs/supervise/terminal/components/sensitiveUserPopup.vue

@@ -89,105 +89,140 @@ const handleExceed: UploadProps['onExceed'] = files => {
 /**
  * 提交用户表单数据
  */
+// const submit = async () => {
+//     if (form.file) {
+//         formRef.value.validate(async (valid: any) => {
+//             if (valid) {
+//                 let data = new FormData()
+//                 data.append('file', form.file)
+//                 console.log(title.value)
+//                 if (title.value === '导入干扰源用户') {
+//                     await importSensitiveReportData(data)
+//                         .then(res => handleImportResponse(title.value, res))
+//                         .finally(() => {
+//                             tableStore.index()
+//                             eventDataUploadVisible.value = false
+//                         })
+//                 } else {
+//                     await importSensitiveUserData(data)
+//                         .then(res => handleImportResponse(title.value, res))
+//                         .finally(() => {
+//                             tableStore.index()
+//                             eventDataUploadVisible.value = false
+//                         })
+//                 }
+//                 // if (title.value == '导入干扰源用户') {
+//                 //     await importSensitiveReportData(data)
+//                 //         .then((res: any) => {
+//                 //             if (res.type === 'application/json') {
+//                 //                 // 说明是普通对象数据，读取信息
+//                 //                 const fileReader = new FileReader()
+//                 //                 fileReader.onloadend = () => {
+//                 //                     try {
+//                 //                         const jsonData = JSON.parse(fileReader.result)
+//                 //                         // 后台信息
+//                 //                         if (jsonData.code === 'A0000') {
+//                 //                             ElMessage.success('导入成功')
+//                 //                         } else {
+//                 //                             ElMessage.error('导入失败，请查看下载附件！')
+//                 //                         }
+//                 //                     } catch (err) {
+//                 //                         console.log(err)
+//                 //                     }
+//                 //                 }
+//                 //                 fileReader.readAsText(res)
+//                 //             } else {
+//                 //                 ElMessage.error('导入失败，请查看下载附件！')
+//                 //                 let blob = new Blob([res], {
+//                 //                     type: 'application/vnd.ms-excel'
+//                 //                 })
+//                 //                 const url = window.URL.createObjectURL(blob)
+//                 //                 const link = document.createElement('a')
+//                 //                 link.href = url
+//                 //                 link.download = '干扰源用户失败列表'
+//                 //                 document.body.appendChild(link)
+//                 //                 link.click()
+//                 //                 link.remove()
+//                 //             }
+//                 //         })
+//                 //         .finally(() => {
+//                 //             tableStore.index()
+//                 //             eventDataUploadVisible.value = false
+//                 //         })
+//                 // } else {
+//                 //     await importSensitiveUserData(data)
+//                 //         .then((res: any) => {
+//                 //             if (res.type === 'application/json') {
+//                 //                 // 说明是普通对象数据，读取信息
+//                 //                 const fileReader = new FileReader()
+//                 //                 fileReader.onloadend = () => {
+//                 //                     try {
+//                 //                         const jsonData = JSON.parse(fileReader.result)
+//                 //                         // 后台信息
+//                 //                         if (jsonData.code === 'A0000') {
+//                 //                             ElMessage.success('导入成功')
+//                 //                         } else {
+//                 //                             ElMessage.error('导入失败，请查看下载附件！')
+//                 //                         }
+//                 //                     } catch (err) {
+//                 //                         console.log(err)
+//                 //                     }
+//                 //                 }
+//                 //                 fileReader.readAsText(res)
+//                 //             } else {
+//                 //                 ElMessage.error('导入失败，请查看下载附件！')
+//                 //                 let blob = new Blob([res], {
+//                 //                     type: 'application/vnd.ms-excel'
+//                 //                 })
+//                 //                 const url = window.URL.createObjectURL(blob)
+//                 //                 const link = document.createElement('a')
+//                 //                 link.href = url
+//                 //                 link.download = '敏感及重要用户失败列表'
+//                 //                 document.body.appendChild(link)
+//                 //                 link.click()
+//                 //                 link.remove()
+//                 //             }
+//                 //         })
+//                 //         .finally(() => {
+//                 //             tableStore.index()
+//                 //             eventDataUploadVisible.value = false
+//                 //         })
+//                 // }
+//             }
+//         })
+//     } else {
+//         ElMessage.error('请选择数据文件')
+//     }
+// }
 const submit = async () => {
     if (form.file) {
         formRef.value.validate(async (valid: any) => {
             if (valid) {
                 let data = new FormData()
                 data.append('file', form.file)
-                if (title.value === '导入干扰源用户') {
-                    await importSensitiveReportData(data)
-                        .then(res => handleImportResponse(title.value, res))
-                        .finally(() => {
-                            tableStore.index()
-                            eventDataUploadVisible.value = false
-                        })
-                } else {
-                    await importSensitiveUserData(data)
-                        .then(res => handleImportResponse(title.value, res))
-                        .finally(() => {
-                            tableStore.index()
-                            eventDataUploadVisible.value = false
-                        })
+
+                try {
+                    if (title.value === '导入干扰源用户') {
+                        await importSensitiveReportData(data)
+                            .then(res => handleImportResponse(title.value, res))
+                            .catch(() => {
+                                // 处理请求失败的情况
+                                ElMessage.error('导入失败，请查看下载附件！')
+                            })
+                    } else {
+                        await importSensitiveUserData(data)
+                            .then(res => handleImportResponse(title.value, res))
+                            .catch(() => {
+                                // 处理请求失败的情况
+                                ElMessage.error('导入失败，请查看下载附件！')
+                            })
+                    }
+                } finally {
+                    // 无论成功失败都重新启用按钮并关闭窗口
+                    tableStore.index()
+                    eventDataUploadVisible.value = false
                 }
-                // if (title.value == '导入干扰源用户') {
-                //     await importSensitiveReportData(data)
-                //         .then((res: any) => {
-                //             if (res.type === 'application/json') {
-                //                 // 说明是普通对象数据，读取信息
-                //                 const fileReader = new FileReader()
-                //                 fileReader.onloadend = () => {
-                //                     try {
-                //                         const jsonData = JSON.parse(fileReader.result)
-                //                         // 后台信息
-                //                         if (jsonData.code === 'A0000') {
-                //                             ElMessage.success('导入成功')
-                //                         } else {
-                //                             ElMessage.error('导入失败，请查看下载附件！')
-                //                         }
-                //                     } catch (err) {
-                //                         console.log(err)
-                //                     }
-                //                 }
-                //                 fileReader.readAsText(res)
-                //             } else {
-                //                 ElMessage.error('导入失败，请查看下载附件！')
-                //                 let blob = new Blob([res], {
-                //                     type: 'application/vnd.ms-excel'
-                //                 })
-                //                 const url = window.URL.createObjectURL(blob)
-                //                 const link = document.createElement('a')
-                //                 link.href = url
-                //                 link.download = '干扰源用户失败列表'
-                //                 document.body.appendChild(link)
-                //                 link.click()
-                //                 link.remove()
-                //             }
-                //         })
-                //         .finally(() => {
-                //             tableStore.index()
-                //             eventDataUploadVisible.value = false
-                //         })
-                // } else {
-                //     await importSensitiveUserData(data)
-                //         .then((res: any) => {
-                //             if (res.type === 'application/json') {
-                //                 // 说明是普通对象数据，读取信息
-                //                 const fileReader = new FileReader()
-                //                 fileReader.onloadend = () => {
-                //                     try {
-                //                         const jsonData = JSON.parse(fileReader.result)
-                //                         // 后台信息
-                //                         if (jsonData.code === 'A0000') {
-                //                             ElMessage.success('导入成功')
-                //                         } else {
-                //                             ElMessage.error('导入失败，请查看下载附件！')
-                //                         }
-                //                     } catch (err) {
-                //                         console.log(err)
-                //                     }
-                //                 }
-                //                 fileReader.readAsText(res)
-                //             } else {
-                //                 ElMessage.error('导入失败，请查看下载附件！')
-                //                 let blob = new Blob([res], {
-                //                     type: 'application/vnd.ms-excel'
-                //                 })
-                //                 const url = window.URL.createObjectURL(blob)
-                //                 const link = document.createElement('a')
-                //                 link.href = url
-                //                 link.download = '敏感及重要用户失败列表'
-                //                 document.body.appendChild(link)
-                //                 link.click()
-                //                 link.remove()
-                //             }
-                //         })
-                //         .finally(() => {
-                //             tableStore.index()
-                //             eventDataUploadVisible.value = false
-                //         })
-                // }
-            }
+            } 
         })
     } else {
         ElMessage.error('请选择数据文件')

src/views/pqs/supervise/terminal/components/substationLedger.vue

@@ -62,7 +62,13 @@ const tableStore = new TableStore({
 tableStore.table.params.searchValue = ''
 
 provide('tableStore', tableStore)
-onMounted(() => {
+onMounted(() => { 
+     TableHeaderRef.value.setDatePicker([
+        { label: '月份', value: 3 },
+        { label: '周', value: 4 },
+        { label: '自定义', value: 5 }
+    ])
     tableStore.index()
+   
 })
 </script>

src/views/pqs/supervise/terminal/index.vue

@@ -67,6 +67,15 @@ watch(
                 activeName.value = '5'
                 setTimeout(() => {
                     monitorLedgerRef.value.setSearchValue((route.query.name as string) || '')
+                    console.log('🚀 ~ route.query.:', route.query)
+                }, 500)
+            } else if (type == 'lodType') {
+                activeName.value = '5'
+                setTimeout(() => {
+                    monitorLedgerRef.value.setSearchType(
+                        (route.query.name as string) || '',
+                        route.query.statisticalType
+                    )
                 }, 500)
             }
             id.value = (route.query.name as string) || ''

src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/detail.vue

@@ -1,5 +1,9 @@
 <template>
     <div class="default-main">
+         <div v-if="detailLoading" class="loading">
+            <el-spin description="加载中..." />
+        </div>
+        <div v-else>
         <!--        <h1>详细信息回显</h1>-->
         <el-descriptions :column="2" border>
             <el-descriptions-item label="变电站">
@@ -35,6 +39,7 @@
                 {{ detailData?.description }}
             </el-descriptions-item>
         </el-descriptions>
+        </div>
     </div>
 </template>
 <script setup lang="ts">

src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/detail.vue

@@ -1,4 +1,8 @@
 <template>
+     <div v-if="detailLoading" class="loading">
+            <el-spin description="加载中..." />
+        </div>
+        <div v-else>
     <el-descriptions :column="2" border>
         <el-descriptions-item label="监测点名称">
             {{ detailData.lineName }}
@@ -19,6 +23,7 @@
             {{ detailData.powerSubstationName }}
         </el-descriptions-item>
     </el-descriptions>
+    </div>
 </template>
 <script lang="ts" setup>
 import { onMounted, ref, reactive } from 'vue'

src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue

@@ -1,10 +1,14 @@
 <template>
+     <div v-if="detailLoading" class="loading">
+            <el-spin description="加载中..." />
+        </div>
+        <div v-else>
     <el-descriptions :column="2" border>
         <el-descriptions-item label="监测点台账信息" v-if="detailData.lineFilePath">
             <el-icon>
                 <Link />
             </el-icon>
-            <a :href="detailData?.lineFilePath.url">
+            <span :href="detailData?.lineFilePath.url">
                 {{ detailData?.lineFilePath.name }}
            </span >
         </el-descriptions-item>
@@ -113,7 +117,7 @@
         </el-descriptions-item>
         <!--文件地址-->
         <el-descriptions-item label="主接线图" v-if="detailData?.mainWiringDiagram">
-            <el-icon class="elView" v-if="detailData?.mainWiringDiagram.name && VITE_FLAG">
+            <el-icon class="elView" v-if="detailData?.mainWiringDiagram.name ">
                 <View @click="openFile(detailData?.mainWiringDiagram.name)" />
             </el-icon>
             <span  class="aLoad" @click="download(detailData?.mainWiringDiagram.keyName)">
@@ -121,6 +125,7 @@
            </span >
         </el-descriptions-item>
     </el-descriptions>
+    </div>
 </template>
 <script lang="ts" setup>
 import { onMounted, ref, reactive } from 'vue'
@@ -136,7 +141,7 @@ const openFile = (name: any) => {
     window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
 }
 defineOptions({ name: 'BpmUserReportDetail' })
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+
 const { query } = useRoute() // 查询参数
 
 const props = defineProps({

src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue

@@ -1,4 +1,8 @@
 <template>
+     <div v-if="detailLoading" class="loading">
+            <el-spin description="加载中..." />
+        </div>
+        <div v-else>
     <el-descriptions :column="2" border>
         <el-descriptions-item label="填报人">
             {{ detailData.reporter }}
@@ -198,7 +202,7 @@
             {{ detailData.supervisionTempDeviceReport?.contractNumber }}
         </el-descriptions-item>
         <el-descriptions-item label="信息安全检测报告">
-            <el-icon class="elView" v-if="detailData?.informationSecurityTestReport?.name && VITE_FLAG">
+            <el-icon class="elView" v-if="detailData?.informationSecurityTestReport?.name ">
                 <View @click="openFile(detailData?.informationSecurityTestReport?.name)" />
             </el-icon>
             <span
@@ -210,7 +214,7 @@
             </span>
         </el-descriptions-item>
         <el-descriptions-item label="验收检验报告单">
-            <el-icon class="elView" v-if="detailData?.acceptanceInspectionReportSingle?.name && VITE_FLAG">
+            <el-icon class="elView" v-if="detailData?.acceptanceInspectionReportSingle?.name ">
                 <View @click="openFile(detailData?.acceptanceInspectionReportSingle?.name)" />
             </el-icon>
             <span
@@ -222,7 +226,7 @@
             </span>
         </el-descriptions-item>
         <el-descriptions-item label="验收检验报告">
-            <el-icon class="elView" v-if="detailData?.acceptanceInspectionReport?.name && VITE_FLAG">
+            <el-icon class="elView" v-if="detailData?.acceptanceInspectionReport?.name ">
                 <View @click="openFile(detailData?.acceptanceInspectionReport?.name)" />
             </el-icon>
             <span
@@ -234,7 +238,7 @@
             </span>
         </el-descriptions-item>
         <el-descriptions-item label="型式实验报告">
-            <el-icon class="elView" v-if="detailData?.typeExperimentReport?.name && VITE_FLAG">
+            <el-icon class="elView" v-if="detailData?.typeExperimentReport?.name ">
                 <View @click="openFile(detailData?.typeExperimentReport?.name)" />
             </el-icon>
             <span
@@ -246,7 +250,7 @@
             </span>
         </el-descriptions-item>
         <el-descriptions-item label="出厂检验报告">
-            <el-icon class="elView" v-if="detailData?.factoryInspectionReport?.name && VITE_FLAG">
+            <el-icon class="elView" v-if="detailData?.factoryInspectionReport?.name ">
                 <View @click="openFile(detailData?.factoryInspectionReport?.name)" />
             </el-icon>
             <span
@@ -258,7 +262,7 @@
             </span>
         </el-descriptions-item>
         <el-descriptions-item label="性能检测报告">
-            <el-icon class="elView" v-if="detailData?.performanceTestReport?.name && VITE_FLAG">
+            <el-icon class="elView" v-if="detailData?.performanceTestReport?.name ">
                 <View @click="openFile(detailData?.performanceTestReport?.name)" />
             </el-icon>
             <span
@@ -270,7 +274,7 @@
             </span>
         </el-descriptions-item>
         <el-descriptions-item label="其他附件">
-            <el-icon class="elView" v-if="detailData?.otherAttachments?.name && VITE_FLAG">
+            <el-icon class="elView" v-if="detailData?.otherAttachments?.name ">
                 <View @click="openFile(detailData?.otherAttachments?.name)" />
             </el-icon>
             <span
@@ -282,6 +286,7 @@
             </span>
         </el-descriptions-item>
     </el-descriptions>
+    </div>
 </template>
 <script lang="ts" setup>
 import { onMounted, ref, reactive } from 'vue'
@@ -304,7 +309,7 @@ const { query } = useRoute() // 查询参数
 const props = defineProps({
     id: propTypes.string.def(undefined)
 })
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+
 const detailLoading = ref(false) // 表单的加载中
 const detailData = ref<any>({}) // 详情数据
 const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
@@ -362,11 +367,11 @@ const terminalModelList = [
     },
     {
         id: '1',
-        name: '虚拟终端'
+        name: '实际终端'
     },
     {
         id: '2',
-        name: '虚拟终端'
+        name: '离线'
     }
 ]
 //定义通讯状态下拉框数据
@@ -510,6 +515,7 @@ const getFileNamePath = async (val: any, pathName: any) => {
             else if (pathName == 'performanceTestReport' && detailData.value.performanceTestReport) {
                 detailData.value.performanceTestReport = {
                     name: res.data.fileName,
+                     keyName: res.data.name,
                     url: res.data.url
                 }
             }

src/views/pqs/supervise/testRun/components/detail.vue

@@ -1,5 +1,9 @@
 <template>
     <div class="default-main">
+         <div v-if="detailLoading" class="loading">
+            <el-spin description="加载中..." />
+        </div>
+        <div v-else>
         <el-descriptions :column="2" border>
             <el-descriptions-item label="监测点名称">
                 {{ detailData.lineName }}
@@ -26,7 +30,7 @@
                 {{ detailData.integrityRate ? detailData.integrityRate * 100 + '%' : '/' }}
             </el-descriptions-item>
             <el-descriptions-item label="试运行报告">
-                <el-icon class="elView" v-if="detailData?.reportName && VITE_FLAG">
+                <el-icon class="elView" v-if="detailData?.reportName ">
                     <View @click="openFile(detailData?.testRunReport)" />
                 </el-icon>
                 <span  class="aLoad" @click="download(detailData?.keyName)">
@@ -34,6 +38,7 @@
                 </span>
             </el-descriptions-item>
         </el-descriptions>
+        </div>
     </div>
 </template>
 <script lang="ts" setup>
@@ -53,7 +58,7 @@ const props = defineProps({
 const detailLoading = ref(false) // 表单的加载中
 const detailData = ref<any>({}) // 详情数据
 const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'/** 获得数据 */
+
 const getInfo = async () => {
     detailLoading.value = true
     try {

src/views/pqs/supervise_hn/terminalNetworkDetection/components/terminainal/detail.vue

@@ -351,17 +351,17 @@ const summonFlagList = [
 ]
 //定义终端模型下拉框数据
 const terminalModelList = [
-    {
+   {
         id: '0',
         name: '虚拟终端'
     },
     {
         id: '1',
-        name: '虚拟终端'
+        name: '实际终端'
     },
     {
         id: '2',
-        name: '虚拟终端'
+        name: '离线'
     }
 ]
 //定义通讯状态下拉框数据

src/views/pqs/voltageSags/Region/thermodynamicDiagram/index.vue

@@ -36,6 +36,7 @@ import TableStore from '@/utils/tableStore'
 import { ref, onMounted, provide } from 'vue'
 import { mainHeight } from '@/utils/layout'
 import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { color } from 'echarts'
 defineOptions({
     name: 'Region/thermodynamicDiagram'
 })
@@ -157,6 +158,7 @@ const map = (res: any) => {
 // 柱状图数据处理
 const histogram = (res: any) => {
     echartMapList.value.visualMap.max = Math.max(...res.map((item: any) => item.count)) || 1
+    
     echartList.value = {
         title: {
             text: '区域暂降次数'
@@ -168,6 +170,7 @@ const histogram = (res: any) => {
         yAxis: {
             name: '暂降次数'
         },
+
         options: {
             series: [
                 {

src/views/pqs/voltageSags/Region/transientList/index.vue

@@ -51,15 +51,15 @@
                                 :value="item.id"></el-option>
                         </el-select>
                     </el-form-item> -->
-                    <el-form-item label="暂降原因:">
-                        <el-select v-model="tableStore.table.params.eventReason" placeholder="请选择暂降原因" clearable
+                    <el-form-item label="暂态原因:">
+                        <el-select v-model="tableStore.table.params.eventReason" placeholder="请选择暂态原因" clearable
                             multiple collapse-tags style="width: 100%">
                             <el-option v-for="item in reasonoptions" :key="item.id" :label="item.name"
                                 :value="item.id"></el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="暂降核实原因:">
-                        <el-select v-model="tableStore.table.params.verifyReason" placeholder="请选择暂降核实原因" clearable
+                    <el-form-item label="暂态核实原因:">
+                        <el-select v-model="tableStore.table.params.verifyReason" placeholder="请选择暂态核实原因" clearable
                             multiple collapse-tags collapse-tags-tooltip>
                             <el-option v-for="item in verifyReasonList" :key="item.id" :label="item.name"
                                 :value="item.id"></el-option>
@@ -68,7 +68,7 @@
                     <el-form-item label="变电站(监测点):">
                         <el-cascader v-model="tableStore.table.params.lineIds" :options="options" :props="defaultProps"
                             collapse-tags-tooltip style="width: 257px;" filterable clearable collapse-tags
-                            placeholder="请选择变电站(监测点)" :show-all-levels="false" />
+                            placeholder="请选择变电站(监测点)" :show-all-levels="true" />
                     </el-form-item>
                 </template>
                 <template #operation>
@@ -151,11 +151,11 @@ const tableStore = new TableStore({
         { field: 'ip', title: '网络参数' ,width:'120px' },
         { field: 'lineName', title: '监测点', minWidth: '100' },
         { field: 'scale', title: '电压等级(kV)', minWidth: '120', },
-        // {
-        //     field: 'verifyReason', title: '暂降核实原因', minWidth: '120', formatter: function (row) {
-        //         return verifyReasonList.filter(item => item.id == row.cellValue)[0]?.name || '/'  //row.cellValue ? row.cellValue : '/'
-        //     }
-        // },
+        {
+            field: 'verifyReason', title: '暂态核实原因', minWidth: '120', formatter: function (row) {
+                return verifyReasonList.filter(item => item.id == row.cellValue)[0]?.name || '/'  //row.cellValue ? row.cellValue : '/'
+            }
+        },
         // {
         //     field: 'verifyReasonDetail', title: '暂降核实原因详情', minWidth: '200', formatter: function (row) {
         //         return row.cellValue ? row.cellValue : '/'
@@ -177,7 +177,7 @@ const tableStore = new TableStore({
             }
         },
         // { field: 'advanceType', title: '暂降类型', minWidth: '100', },
-        { field: 'advanceReason', title: '暂降原因', minWidth: '100' },
+        { field: 'advanceReason', title: '暂态原因', minWidth: '100' },
         {
             field: 'depth',
             title: '暂降深度(%)',
@@ -187,7 +187,7 @@ const tableStore = new TableStore({
         },
 
         { field: 'duration', title: '持续时间(s)', minWidth: '100' },
-        // { field: 'severity', title: '严重度', minWidth: '100', formatter: ({ row }: any) => (row.severity < 0 ? '/' : row.severity) },
+         { field: 'severity', title: '严重度', minWidth: '100', formatter: ({ row }: any) => (row.severity < 0 ? '/' : row.severity) },
 
         {
             title: '操作',
@@ -301,7 +301,7 @@ onMounted(() => {
         list.forEach((item: any) => {
             options.value.push(...item)
         })
-
+       
     })
 })
 const backbxlb = () => {

src/views/pqs/voltageSags/analyse/eventwaveform/index.vue

@@ -12,7 +12,7 @@
         </TableHeader>
         <Table ref="tableRef" />
         <!-- 波形分析 -->
-        <el-dialog draggable v-model="dialogAnalysis" title="波形分析" width="70%">
+        <el-dialog draggable v-model="dialogAnalysis" title="事件查看" width="70%">
             <div class="mb10" style="display: flex; justify-content: space-between">
                 <span>事件关联编号为：{{ AssociationNumber }}</span>
                 <div>
@@ -48,7 +48,7 @@
                 ></vxe-table-column>
                 <vxe-table-column field="lineName" title="监测点" align="center"></vxe-table-column>
                 <vxe-table-column field="voltageId" title="电压等级(kV)" align="center"></vxe-table-column>
-                <vxe-table-column field="featureAmplitude" title="暂降幅值(%)" align="center" width="140">
+                <vxe-table-column field="featureAmplitude" title="暂降(骤升)幅值(%)" align="center" width="140">
                     <template #default="{ row }">
                         <span>{{ (row.featureAmplitude * 100).toFixed(2) }}</span>
                     </template>
@@ -175,6 +175,8 @@ const bxcontrast = () => {
     } else {
     }
 }
+
+
 // 波形分析
 const source = () => {
     queryEventDetailByAssId(form.value).then(res => {
@@ -230,25 +232,35 @@ const exportEvent = () => {
         pageSize: tableStore.table.total
     }).then(res => {
         tableRef.value.getRef().exportData({
-            filename: '影响范围分析', // 文件名字
+            filename: '事件波形分析', // 文件名字
             sheetName: 'Sheet1',
             type: 'xlsx', //导出文件类型 xlsx 和 csv
             useStyle: true,
             data: res.data.records, // 数据源 // 过滤那个字段导出
             columnFilterMethod: function (column, $columnIndex) {
-                return !(column.$columnIndex === 0)
+                return !(column.$columnIndex === 0 || column.$columnIndex === 4)
             }
         })
     })
 }
 // 导出波形分析
 const positioningexport = () => {
+     const selectedRecords = positioningtableRef.value.getCheckboxRecords();
+    
+    if (selectedRecords.length === 0) {
+        ElMessage({
+            message: '请先选择要导出的数据!',
+            type: 'warning'
+        });
+        return;
+    }
+
     positioningtableRef.value.exportData({
-        filename: '事件波形分析', // 文件名字
+        filename: '事件查看', // 文件名字
         sheetName: 'Sheet1',
         type: 'xlsx', //导出文件类型 xlsx 和 csv
         useStyle: true,
-        data: dialogAnalysis.value, // 数据源 // 过滤那个字段导出
+        data: selectedRecords, // 数据源 // 过滤那个字段导出
         columnFilterMethod: function (column, $columnIndex) {
             return !(column.$columnIndex === 0)
         }

src/views/pqs/voltageSags/analyse/impactscope/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="default-main">
         <div v-show="view">
-            <TableHeader datePicker ref="TableHeaderRef" showExport>
+            <TableHeader datePicker ref="TableHeaderRef" >
                 <template #select>
                     <el-form-item label="关键字">
                         <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="输入事件关联分析描述"
@@ -33,7 +33,7 @@
                 <vxe-table-column field="subName" :show-overflow="true" title="变电站" align="center"></vxe-table-column>
                 <vxe-table-column field="lineName" title="监测点" align="center"></vxe-table-column>
                 <vxe-table-column field="voltageId" title="电压等级(kV)" align="center"></vxe-table-column>
-                <vxe-table-column field="featureAmplitude" title="暂降幅值(%)" align="center" width="140">
+                <vxe-table-column field="featureAmplitude" title="暂降(骤升)幅值(%)" align="center" width="140">
                     <template #default="{ row }">
                         <span>{{ (row.featureAmplitude * 100).toFixed(2) }}</span>
                     </template>
@@ -236,7 +236,7 @@ const exportEvent = () => {
         pageSize: tableStore.table.total
     }).then(res => {
         tableRef.value.getRef().exportData({
-            filename: '暂降聚合展示', // 文件名字
+            filename: '暂态聚合展示', // 文件名字
             sheetName: 'Sheet1',
             type: 'xlsx', //导出文件类型 xlsx 和 csv
             useStyle: true,

src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue

@@ -46,6 +46,7 @@ const tableStore = new TableStore({
     publicHeight: 60 + props.externalHeight,
     url: '/event-boot/monitor/getMonitorEventAnalyseQuery',
     method: 'POST',
+    filename: '暂态事件列表',
     column: [
         { width: '60', type: 'checkbox' },
         {

src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue

@@ -166,6 +166,7 @@ const handler = async ({ BMap, map }: any) => {
     let data = props.mapList
     let r = 0.0035
     let list = data.filter((item: any) => item.lng != 0)
+
     list.forEach((item: any) => {
         // 变电站图标
         item.icon = {

src/views/pqs/voltageSags/report/eventReports/index.vue

@@ -27,7 +27,7 @@
                 <el-form-item label="筛选数据">
                     <el-input
                         v-model="tableStore.table.params.searchValue"
-                        placeholder="根据变电站,终端编号,型号或网络参数查询"
+                        placeholder="根据供电公司,变电站或监测点查询"
                     />
                 </el-form-item>
             </template>

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()
 //区域联级选择

src/views/system/bpm/processInstance/detail/index.vue

@@ -97,7 +97,7 @@
                     </el-col>
                     <!-- 情况二：业务表单 -->
                     <div v-if="processInstance?.processDefinition?.formType === 20">
-                        <BusinessFormComponent :id="processInstance.businessKey" :applyTitle="processInstance.name" />
+                        <BusinessFormComponent  :id="processInstance.businessKey" :applyTitle="processInstance.name" />
                     </div>
                 </el-card>
             </el-tab-pane>

src/views/system/reportForms/luckysheet.vue

@@ -4,7 +4,7 @@
             <el-upload
                 ref="upload"
                 action=""
-                :auto-upload="false"
+                :auto-upload="false"    
                 :show-file-list="false"
                 :limit="1"
                 :on-change="beforeUpload"

vite.config.ts

@@ -21,11 +21,12 @@ export default defineConfig({
     server: {
         host: '0.0.0.0',
         open: true,
+        port:5174,
         proxy: {
             '/api': {
                 // target: 'http://10.95.53.49:10215', //海南服务器ip
                 // target: 'http://10.118.135.128:10215', ///hsw
-                target: 'http://192.168.1.67:10215', ///hsw
+                target: 'http://192.168.1.29:10215', ///hsw
                 // target: 'http://192.168.1.68:10215', ///hsw
                 //  target: 'http://10.119.65.152:10215', //数据中心
                 changeOrigin: true,
@@ -33,7 +34,7 @@ export default defineConfig({
             },
             '/api-docx': {
                 // 文件服务器地址
-                target: 'http://192.168.1.68:9009',
+                target: 'http://192.168.1.29:9009',
                 changeOrigin: true,
                 rewrite: path => path.replace(/^\/api-docx/, '')
             },