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

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

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="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-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="urlKey.includes('.pdf')" :src="url" style="width: 100%; height: 99%"></iframe>
+        <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')"
+        <img
-            :src="url" />
+            v-if="
+                urlKey.includes('.png') || urlKey.includes('.jpg') || urlKey.includes('.gif') || urlKey.includes('.bmp')
+            "
+            :src="url"
+        />
     </div>
 </template>
 <script lang="ts" setup>
@@ -19,7 +27,7 @@ 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'
+import { previewFile } from '@/utils/fileDownLoad'
 
 const { push, options, currentRoute } = useRouter()
 const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
@@ -27,16 +35,22 @@ const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const url = ref('')
 const excelOptions = ref({})
 const urlKey = currentRoute.value?.href?.split('?')[1]
-if(VITE_FLAG){
+
+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(() => {
     // 从路由参数获取文件路径

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]

src/components/tree/pqs/algorithmTree.vue

@@ -8,7 +8,6 @@
                 style="width: 100%; height: 100%"
                 v-bind="$attrs"
                 default-expand-all
-                
                 @onAddTree="onAddTree"
             />
         </div>
@@ -72,8 +71,28 @@ const loadData = (id?: any) => {
 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 })
+defineExpose({ loadData, setKey })
 </script>
 <style lang="scss">
 .point-tree {
@@ -85,4 +104,3 @@ defineExpose({ loadData })
     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(() => {
+    if(!VITE_FLAG){
          getLastData({ versionType: 'WEB' }).then(res => {
             Version.value = res.data.versionName
         })
-    document.title = getTheme.name
+    }
+   
+    document.title = getTheme?.name || ''
 })
 </script>
 

src/utils/fileDownLoad.ts

@@ -1,37 +1,47 @@
 import { downloadFile } from '@/api/system-boot/file'
 // 下载文件
-export const download = (urls: any) => {
+export const download = (urls: string) => {
-    console.log('下载',urls)
+    //console.log('下载', urls)
-    downloadFile({ filePath: urls }).then((res: any) => {
+
-        let blob = new Blob([res], {
+    downloadFile({ filePath: urls })
-            type: urls.includes('.pdf')
+        .then((res: any) => {
-                ? 'application/pdf'
+            // 1. 确定文件MIME类型（优化：用更简洁的方式）
-                : urls.includes('.zip')
+            const getFileType = (url: string) => {
-                ? 'application/zip'
+                const ext = url.split('.').pop()?.toLowerCase() || ''
-                : urls.includes('.doc')
+                const mimeMap: Record<string, string> = {
-                ? 'application/msword'
+                    pdf: 'application/pdf',
-                : urls.includes('.docx')
+                    zip: 'application/zip',
-                ? 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+                    doc: 'application/msword',
-                : urls.includes('.xls')
+                    docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-                ? 'application/vnd.ms-excel'
+                    xls: 'application/vnd.ms-excel',
-                : urls.includes('.xlsx')
+                    xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-                ? 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+                    png: 'image/png',
-                : urls.includes('.png')
+                    jpeg: 'image/jpeg',
-                ? 'image/png'
+                    jpg: 'image/jpg'
-                : urls.includes('.jpeg')
+                }
-                ? 'image/jpeg'
+                return mimeMap[ext] || ''
-                : urls.includes('.jpg')
+            }
-                ? 'image/jpg'
+          
-                : ''
+            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')
-        let name = removeLastDotSuffix(urls.split('/')[2])
             link.href = url
-        link.download = name
+            link.download = fileName // 直接使用原文件名（保留后缀）
             document.body.appendChild(link)
             link.click()
+
+            // 4. 清理资源（优化）
             link.remove()
+            window.URL.revokeObjectURL(url) // 释放blob URL
+        })
+        .catch(err => {
+            console.error('下载失败：', err)
+            // 可添加错误提示（如Toast）
         })
 }
 function removeLastDotSuffix(str: string) {
@@ -41,35 +51,41 @@ function removeLastDotSuffix(str: string) {
     return lastDotIndex !== -1 ? str.slice(0, lastDotIndex) : str
 }
 
-
 // 预览文件
 export const previewFile = async (urls: any) => {
-    console.log('预览',urls)
+    //console.log('预览', urls)
     let url = ''
-    await downloadFile({ filePath: urls }).then((res: any) => {
+    //console.log('urls', decodeURI(urls))
-        let blob = new Blob([res], {
+    await downloadFile({ filePath: decodeURI(urls) })
-            type: urls.includes('.pdf')
+        .then((res: any) => {
-                ? 'application/pdf'
+            
-                : urls.includes('.zip')
+            // 1. 确定文件MIME类型（优化：用更简洁的方式）
-                ? 'application/zip'
+            const getFileType = (url: string) => {
-                : urls.includes('.doc')
+                const ext = url.split('.').pop()?.toLowerCase() || ''
-                ? 'application/msword'
+                const mimeMap: Record<string, string> = {
-                : urls.includes('.docx')
+                    pdf: 'application/pdf',
-                ? 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+                    zip: 'application/zip',
-                : urls.includes('.xls')
+                    doc: 'application/msword',
-                ? 'application/vnd.ms-excel'
+                    docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-                : urls.includes('.xlsx')
+                    xls: 'application/vnd.ms-excel',
-                ? 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+                    xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-                : urls.includes('.png')
+                    png: 'image/png',
-                ? 'image/png'
+                    jpeg: 'image/jpeg',
-                : urls.includes('.jpeg')
+                    jpg: 'image/jpg'
-                ? 'image/jpeg'
+                }
-                : urls.includes('.jpg')
+                return mimeMap[ext] || ''
-                ? 'image/jpg'
+            }
-                : ''
+            
-        })
+            const blob = new Blob([res], { type: getFileType(decodeURI(urls)) })
+
+
+            // 3. 创建下载链接
             url = window.URL.createObjectURL(blob)
         })
-    console.log('url',url)
+        .catch(err => {
+            console.error('下载失败：', err)
+            // 可添加错误提示（如Toast）
+        })
+    //console.log('url', url)
     return url
 }

src/utils/request.ts

@@ -4,8 +4,8 @@ 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';
+import { debounce } from 'lodash-es'
-let loginExpireTimer:any = null
+let loginExpireTimer: any = null
 window.requests = []
 window.tokenRefreshing = false
 const pendingMap = new Map()
@@ -84,7 +84,8 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                     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 == '/harmonic-boot/gridDiagram/getGridDiagramAreaData' ||
+                    config.url == '/supervision-boot/userReport/bindAssessmentId'
                 )
             )
                 removePending(config)

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',
+                    name: 'edit',
-                //     title: '重启',
+                    title: '重启',
-                //     type: 'warning',
+                    type: 'warning',
-                //     icon: 'el-icon-Delete',
+                    icon: 'el-icon-Delete',
-                //     render: 'confirmButton',
+                    render: 'confirmButton',
-                //     popconfirm: {
+                    disabled: row => {
-                //         confirmButtonText: '确认',
+                        return VITE_FLAG
-                //         cancelButtonText: '取消',
+                    },
-                //         confirmButtonType: 'warning',
+                    popconfirm: {
-                //         title: '确定重启吗？'
+                        confirmButtonText: '确认',
-                //     },
+                        cancelButtonText: '取消',
-                //     click: row => {
+                        confirmButtonType: 'warning',
-                //         askRestartProcess({
+                        title: '确定重启吗？'
-                //             deviceRebootType: null,
+                    },
-                //             nodeId: row.id,
+                    click: row => {
-                //             processNo: 1
+                        askRestartProcess({
-                //         }).then(res => {
+                            deviceRebootType: null,
-                //             ElMessage.success('重启成功')
+                            nodeId: row.id,
-                //             tableStore.index()
+                            processNo: 1
-                //         })
+                        }).then(res => {
-                //     }
+                            ElMessage.success('重启成功')
-                // },
+                            tableStore.index()
+                        })
+                    }
+                },
 
                 {
                     name: 'del',

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

@@ -1,346 +1,59 @@
 <template>
-    <div class="default-main" :style="height">
+    <div class="default-main">
-        <!-- 算法库 -->
+        <el-tabs v-model="activeName" type="border-card">
-        <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
+            <el-tab-pane label="总览" name="1" v-if="tabList.includes('1')">
-            <pane :size="size">
+                <overview v-if="activeName == '1'" @algorithm="algorithm" />
-                <algorithmTree
+            </el-tab-pane>
-                    ref="treeRef"
+            <el-tab-pane label="算法库" name="2" v-if="tabList.includes('2')">
-                    :default-expand-all="false"
+                <list v-if="activeName == '2'" ref="listRef" />
-                    :default-expanded-keys="monitoringPoint.state.lineId ? [monitoringPoint.state.lineId] : []"
+            </el-tab-pane>
-                    :current-node-key="monitoringPoint.state.lineId"
+        </el-tabs>
-                    @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>
 </template>
+
 <script setup lang="ts">
-import { onMounted, ref, provide } from 'vue'
+import { nextTick, ref, provide, onMounted } 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 overview from './overview.vue'
-import { getLineExport, getList, selectReleation } from '@/api/event-boot/report'
+import list from './list.vue'
-import addTree from './components/addTree.vue'
+import { useRoute } from 'vue-router'
-import PopupEdit from './components/form.vue'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
-import { useMonitoringPoint } from '@/stores/monitoringPoint'
+const route = useRoute()
-import { ElMessage, ElMessageBox } from 'element-plus'
+const Undocumented = ref()
-import { deleteyById } from '@/api/supervision-boot/database/index'
+const InterferenceUserTable = ref()
-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'
+    name: 'supervision/interferencemanagement  '
 })
-const monitoringPoint = useMonitoringPoint()
+const activeName = ref('1')
-const height = mainHeight(20)
+const id = ref('')
-const heightTab = mainHeight(82)
+const key = ref('')
-const size = ref(23)
+const listRef = ref()
-const addTreeRef = ref()
+const tabList = ref(['1', '2'])
-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')
+    let key = window.location.href.split('?')[0].slice(-1)
-    if (dom) {
+    const isNumber = /^\d$/.test(key)
-        size.value = Math.round((180 / dom.offsetHeight) * 120)
+    if (isNumber) {
+        tabList.value = [key]
+        activeName.value = key
     }
-    // tableStore.index()
 })
-
+const algorithm = (val: any) => {
-const view = (row: any) => {
+    activeName.value = '2'
-    viewFlag.value = true
-    summary.value = row.definition
     setTimeout(() => {
-        const spans = document.querySelectorAll('span[data-value]')
+        listRef.value.getList(val)
-        // 遍历每个 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 layout = mainHeight(63) as any
 </script>
-<style lang="scss">
-.splitpanes.default-theme .splitpanes__pane {
-    background: #eaeef1;
-}
 
-.grid-content {
+<style lang="scss" scoped>
-    text-align: center;
+.bars_w {
-}
-
-.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;
+    height: 500px;
-    }
+}
 
-    th,
+:deep(.el-tabs__content) {
-    td {
+    height: v-bind('layout.height');
-        border: 1px solid black;
+    overflow-y: auto;
-        padding: 8px;
-        text-align: center;
-    }
-
-    th {
-        background-color: #f2f2f2;
-        font-weight: bold;
-    }
-
-    td {
-        background-color: #ffffff;
-    }
 }
 </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/stencil/index.vue

@@ -59,9 +59,9 @@ const tableStore = new TableStore({
                     type: 'primary',
                     icon: 'el-icon-Plus',
                     render: 'basicButton',
-                    disabled: row => {
+                    // disabled: row => {
-                        return !VITE_FLAG
+                    //     return !VITE_FLAG
-                    },
+                    // },
                     click: row => {
                         window.open(window.location.origin + '/#/previewFile?' + row.url)
                     }

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])
@@ -1490,8 +1490,12 @@ const getEcharts = () => {
                     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/>'
+                                
+                            
                         }
                     }
 

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 + ': 暂无数据<br/>'
+                            msg += '（' + params[i].seriesName + '）' + '<br/>' + params[i].marker +  ': 暂无数据<br/>'
                         } else {
-                            msg += params[i].marker + ': ' + params[i].data + '<br/>'
+                            msg += '（' +  params[i].seriesName + '）' + '<br/>' + params[i].marker +  ': ' + params[i].data + '<br/>'
                         }
                     }
                     return msg

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/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"
+                                :max="9999"
-                                min="0"
+                                :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"
+                                :min="0"
-                                max="9999"
+                                :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"
+                                :min="0"
-                                max="9999"
+                                :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"
+                                :max="9999"
-                                min="0"
+                                :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"
+                                :max="9999"
-                                min="0"
+                                :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"
+                                :max="9999"
-                                min="0"
+                                :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"
+                                :max="9999"
-                                min="0"
+                                :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,
@@ -327,18 +351,18 @@ 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){
+                    if (form.value.assessId) {
-                        userEdit(form.value).then((res: any) => {
+                        await userEdit(form.value).then((res: any) => {
                             //form.value.assessId = res.data
                             ElMessage({
                                 type: 'success',
                                 message: '编辑成功!'
                             })
                         })
-                    }else{
+                    } else {
-                        userAdd(form.value).then((res: any) => {
+                        await userAdd(form.value).then((res: any) => {
                             form.value.assessId = res.data
 
                             ElMessage({
@@ -348,6 +372,10 @@ const onsubmit = () => {
                         })
                     }
 
+                    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'
 })
@@ -224,10 +225,9 @@ const tableStore: any = new TableStore({
     ],
     beforeSearchFun: () => {
         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/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"
+                            v-model="targetKey"
-                            multiple
+                            filterable
-                            collapse-tags
                             clearable
-                            placeholder="请选择异常天数"
+                            placeholder="请选择指标"
-                            style="width: 200px"
+                            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) => {
+            timeList.value = TableData.value[0]?.dateTargetList
-                return {
+            targetList.value = timeList.value[0].targetKeys
-                    name: item
-                }
-            })
             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

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/test/detail.vue

@@ -60,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 >
@@ -111,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(true)" :loading="loading">保存</el-button>
-                <el-button type="primary" @click="confirmForm(false)" :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

@@ -45,7 +45,10 @@
                         })?.name
                     }}
                 </el-descriptions-item>
-            <el-descriptions-item label="非线性终端类型" v-if="detailData.userType == 0 || detailData.userType == 1">
+                <el-descriptions-item
+                    label="非线性终端类型"
+                    v-if="detailData.userType == 0 || detailData.userType == 1"
+                >
                     {{ proviteData.nonlinearDeviceType ? proviteData.nonlinearDeviceType : '-' }}
                 </el-descriptions-item>
                 <el-descriptions-item label="预测评估单位">
@@ -56,7 +59,9 @@
                 </el-descriptions-item>
                 <el-descriptions-item
                     :label="
-                    detailData.userType == '4' || detailData.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'
+                        detailData.userType == '4' || detailData.userType == '5'
+                            ? '非线性设备类型: '
+                            : '非线性负荷类型：'
                     "
                     v-if="
                         detailData.userType == '2' ||
@@ -136,7 +141,10 @@
                         })?.name
                     }}
                 </el-descriptions-item>
-            <el-descriptions-item label="预测评估评审单位" v-if="detailData.userType != 0 && detailData.userType != 1">
+                <el-descriptions-item
+                    label="预测评估评审单位"
+                    v-if="detailData.userType != 0 && detailData.userType != 1"
+                >
                     {{ proviteData?.evaluationChekDept }}
                 </el-descriptions-item>
                 <el-descriptions-item
@@ -183,7 +191,7 @@
                 </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">
+                        <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)">
@@ -198,7 +206,7 @@
                             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.key)" />
                         </el-icon>
                         <span class="aLoad" @click="download(proviteData.feasibilityReport.keyName)">
@@ -206,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.key)" />
                         </el-icon>
                         <span class="aLoad" @click="download(proviteData.feasibilityReport.keyName)">
@@ -215,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.key)" />
                     </el-icon>
                     <span class="aLoad" @click="download(proviteData.preliminaryDesignDescription.keyName)">
@@ -223,7 +231,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.key)" />
                     </el-icon>
                     <span class="aLoad" @click="download(proviteData.predictionEvaluationReport.keyName)">
@@ -231,7 +239,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.key)" />
                     </el-icon>
                     <span class="aLoad" @click="download(proviteData.predictionEvaluationReviewOpinions.keyName)">
@@ -242,7 +250,7 @@
                     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.key)" />
                     </el-icon>
                     <span class="aLoad" @click="download(proviteData.substationMainWiringDiagram.keyName)">
@@ -250,7 +258,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.key)" />
                     </el-icon>
                     <span class="aLoad" @click="download(proviteData.sensitiveDevices.keyName)">
@@ -258,7 +266,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.key)" />
                     </el-icon>
                     <span class="aLoad" @click="download(proviteData.antiInterferenceReport.keyName)">
@@ -266,7 +274,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.key)" />
                     </el-icon>
                     <span class="aLoad" @click="download(proviteData.powerQualityReport.keyName)">
@@ -275,7 +283,7 @@
                 </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">
+                        <el-icon class="elView" v-if="item.name">
                             <View @click="openFile(item.key)" />
                         </el-icon>
                         <span class="aLoad" @click="download(item.keyName)">
@@ -285,7 +293,7 @@
                 </el-descriptions-item>
 
                 <el-descriptions-item label="其他附件" v-if="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.key)" />
                     </el-icon>
                     <span class="aLoad" @click="download(proviteData.additionalAttachments.keyName)">
@@ -308,13 +316,23 @@
                     :label="applyTitle + '报告'"
                     v-if="proviteData?.otherReport && proviteData?.otherReport.url"
                 >
-                <el-icon class="elView" v-if="proviteData?.otherReport.name && VITE_FLAG">
+                    <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>
@@ -329,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)
 }
@@ -344,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 编号
@@ -413,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

@@ -193,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">
@@ -206,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)">
@@ -214,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)">
@@ -223,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>
 
@@ -232,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)">
@@ -240,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)">
@@ -248,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)">
@@ -256,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)">
@@ -264,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)">
@@ -272,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)">
@@ -281,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)">
@@ -531,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">
@@ -544,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)">
@@ -554,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)">
@@ -565,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>
 
@@ -576,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)">
@@ -586,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)">
@@ -596,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)">
@@ -606,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)">
@@ -616,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)">
@@ -626,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)">
@@ -637,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)">
@@ -662,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

@@ -36,7 +36,7 @@
             </el-button>
             <el-button style="margin-left: 50px" :icon="Back" @click="go(-1)">返回</el-button>
         </div>
-    <Table ref="tableRef"/>
+        <Table ref="tableRef" />
 
         <addForm
             v-if="dialogVisible"
@@ -55,20 +55,20 @@ defineOptions({
     name: 'ProgramReview'
 })
 
-import {ref, onMounted, provide, nextTick, onUnmounted} from 'vue'
+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 { cancel, userReportGoNetById } from '@/api/supervision-boot/interfere/index'
-import {useDictData} from '@/stores/dictData'
+import { useDictData } from '@/stores/dictData'
 import addForm from './addForm.vue'
-import {useRouter, useRoute} from 'vue-router'
+import { useRouter, useRoute } from 'vue-router'
-import {Back} from '@element-plus/icons-vue'
+import { Back } from '@element-plus/icons-vue'
-import {useAdminInfo} from '@/stores/adminInfo'
+import { useAdminInfo } from '@/stores/adminInfo'
 
-const {go, currentRoute, push} = useRouter()
+const { go, currentRoute, push } = useRouter()
-const {query} = useRoute() // 查询参数
+const { query } = useRoute() // 查询参数
-import {ElMessage} from 'element-plus'
+import { ElMessage } from 'element-plus'
-import {ElMessageBox} from 'element-plus/es'
+import { ElMessageBox } from 'element-plus/es'
 
 const needGovernance = query.needGovernance as unknown as string // 从 URL 传递过来的 是否需要治理
 const dictData = useDictData()
@@ -93,10 +93,14 @@ const tableStore = new TableStore({
 
     method: 'POST',
     column: [
-    {title: '序号', width: 80,formatter: (row: any) => {
+        {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      }},
+            }
-    {field: 'projectName', title: '用户名称', minWidth: 170},
+        },
+        { field: 'projectName', title: '用户名称', minWidth: 170 },
         {
             field: 'userType',
             title: '用户性质',
@@ -106,8 +110,8 @@ const tableStore = new TableStore({
                 return getUserTypeName(userType)
             }
         },
-    {field: 'city', title: '所在地市', minWidth: 80},
+        { field: 'city', title: '所在地市', minWidth: 80 },
-    {field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130},
+        { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
         {
             field: 'userStatus',
             title: '用户状态',
@@ -126,7 +130,7 @@ const tableStore = new TableStore({
                 3: '退运'
             }
         },
-    {field: 'substation', title: '厂站名称', minWidth: 100},
+        { field: 'substation', title: '厂站名称', minWidth: 100 },
         {
             field: 'status',
             title: '流程状态',
@@ -155,7 +159,7 @@ const tableStore = new TableStore({
                 return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
             }
         },
-    {field: 'createTime', title: '创建时间', minWidth: 100},
+        { field: 'createTime', title: '创建时间', minWidth: 100 },
         {
             title: '操作',
             minWidth: 180,
@@ -172,7 +176,7 @@ const tableStore = new TableStore({
                         return !row.processInstanceId
                     },
                     click: row => {
-            handleAudit(row.processInstanceId)
+                        handleAudit(row.processInstanceId, row.id)
                     }
                 },
                 {
@@ -263,7 +267,7 @@ onMounted(async () => {
     document.addEventListener('visibilitychange', handleVisibilityChange)
     if (query.fangAnId) {
         //根据id查询待编辑的数据
-    await userReportGoNetById({id: query.fangAnId}).then(res => {
+        await userReportGoNetById({ id: query.fangAnId }).then(res => {
             if (res && res.code == 'A0000') {
                 dialogVisible.value = true
                 titleButton1.value = '重新发起'
@@ -273,9 +277,7 @@ onMounted(async () => {
                 }, 0)
             }
         })
-
     }
-
 })
 onUnmounted(() => {
     document.removeEventListener('visibilitychange', handleVisibilityChange)
@@ -283,7 +285,7 @@ onUnmounted(() => {
 /**取消流程操作*/
 const cancelLeave = async (row: any) => {
     // 二次确认
-  const {value} = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         inputType: 'textarea',
@@ -302,11 +304,12 @@ const cancelLeave = async (row: any) => {
     tableStore.index()
 }
 /** 处理审批按钮 */
-const handleAudit = (instanceId: any) => {
+const handleAudit = (instanceId: any, keyID: any) => {
     push({
         name: 'BpmProcessInstanceDetail',
         query: {
-      id: instanceId
+            id: instanceId,
+            keyID: keyID
         }
     })
 }

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

@@ -51,7 +51,10 @@
                         })?.name
                     }}
                 </el-descriptions-item>
-                <el-descriptions-item label="非线性终端类型" v-if="detailData.userType == 0 || detailData.userType == 1">
+                <el-descriptions-item
+                    label="非线性终端类型"
+                    v-if="detailData.userType == 0 || detailData.userType == 1"
+                >
                     {{ proviteData.nonlinearDeviceType ? proviteData.nonlinearDeviceType : '-' }}
                 </el-descriptions-item>
                 <el-descriptions-item label="预测评估单位">
@@ -62,7 +65,9 @@
                 </el-descriptions-item>
                 <el-descriptions-item
                     :label="
-                        detailData.userType == '4' || detailData.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'
+                        detailData.userType == '4' || detailData.userType == '5'
+                            ? '非线性设备类型: '
+                            : '非线性负荷类型：'
                     "
                     v-if="
                         detailData.userType == '2' ||
@@ -185,7 +190,10 @@
                         })?.name
                     }}
                 </el-descriptions-item>
-                <el-descriptions-item label="预测评估评审单位" v-if="detailData.userType != 0 && detailData.userType != 1">
+                <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">
@@ -239,12 +247,12 @@
                 </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">
                             {{ proviteData?.feasibilityReport?.name }}
-                        </span >
+                        </span>
                     </span>
                     <span
                         v-if="
@@ -254,202 +262,212 @@
                             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)">
                             {{ proviteData?.feasibilityReport?.name }}
-                        </span >
+                        </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)">
                             {{ proviteData?.feasibilityReport?.name }}
-                        </span >
+                        </span>
                     </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>
 
                     <span class="aLoad" @click="download(proviteData.preliminaryDesignDescription.keyName)">
                         {{ proviteData?.preliminaryDesignDescription?.name }}
-                    </span >
+                    </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)">
                         {{ proviteData?.predictionEvaluationReport?.name }}
-                    </span >
+                    </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)">
                         {{ proviteData?.predictionEvaluationReviewOpinions?.name }}
-                    </span >
+                    </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)">
                         {{ proviteData?.substationMainWiringDiagram?.name }}
-                    </span >
+                    </span>
                 </el-descriptions-item>
-                <el-descriptions-item label="主要敏感终端清单" v-if="detailData.userType == 6 && VITE_FLAG">
+                <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 >
+                    </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)">
                         {{ proviteData?.antiInterferenceReport?.name }}
-                    </span >
+                    </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)">
                         {{ proviteData?.powerQualityReport?.name }}
-                    </span >
+                    </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">
+                    <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)" >
+                    <span class="aLoad" @click="download(proviteData.additionalAttachments.keyName)">
                         {{ proviteData?.additionalAttachments?.name }}
-                    </span >
+                    </span>
                 </el-descriptions-item>
 
                 <el-descriptions-item label="系统接入方案">
                     <div v-for="item in netInReportList">
-                        <el-icon class="elView" v-if="item.name && VITE_FLAG">
+                        <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 >
+                        </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">
+                        <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 && 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 >
+                        </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 && VITE_FLAG">
+                    <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 >
+                    </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">
+                    <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 )">
+                    <span class="aLoad" @click="download(form.acceptanceInspectionReport[0]?.keyName)">
                         {{ form.acceptanceInspectionReport[0]?.name }}
-                    </span >
+                    </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">
+                    <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 >
+                    </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">
+                    <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 >
+                    </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">
+                    <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 >
+                    </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">
+                    <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 >
+                    </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" >
+                    <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 >
+                    </span>
                 </el-descriptions-item>
             </el-descriptions>
         </div>
@@ -468,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({
@@ -489,11 +507,11 @@ const detailData = ref<any>({}) // 详情数据
 const devIdList = ref([])
 const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
 const openFile = (name: any) => {
- 
     window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
 }
 const netInReportList: any = ref([])
 const governReportList: any = ref([])
+const simulationReportList: any = ref([])
 //用户性质数组
 const userTypeList = reactive([
     {
@@ -590,7 +608,6 @@ const getInfo = async () => {
         detailLoading.value = false
     }
 
-
     if (props.openType == 'sourcesOfInterference') {
         queryFiles()
     }
@@ -665,7 +682,6 @@ const queryFiles = () => {
 }
 //判断userType选择取用的对象
 const getProviteData = async () => {
-
     if (detailData.value.userType == '0' || detailData.value.userType == '1') {
         proviteData.value = detailData.value.userReportProjectPO
         //查询非线性终端类型
@@ -724,8 +740,6 @@ const getProviteData = async () => {
             proviteData.value.predictionEvaluationReviewOpinions,
             'predictionEvaluationReviewOpinions'
         )
-
-
     }
     //用户接入变电站主接线示意图
     if (
@@ -768,6 +782,7 @@ const getProviteData = async () => {
         })
     }
     // 治理评估告"
+
     if (detailData.value.governReport.length > 0) {
         governReportList.value = []
         detailData.value.governReport.forEach((item: any) => {
@@ -776,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 => {
@@ -793,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) {
@@ -821,7 +843,6 @@ const getFileNamePath = async (val: any, pathName: any) => {
                     keyName: val,
                     url: res.data.url
                 }
-
             }
             //用户接入变电站主接线示意图
             else if (pathName == 'substationMainWiringDiagram' && proviteData.value.substationMainWiringDiagram) {
@@ -876,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

@@ -108,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)">
@@ -116,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)">
@@ -124,25 +124,25 @@
             </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 >
@@ -166,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/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) {
+                            // if (VITE_FLAG) {
                                 return !(row.problemType == 2 || row.problemType == 4)
-                            }
+                            // }
-                            return true;
+                            // return true;
-                  
-                       
                     },
                     click: row => {
-                        if (row.problemType == 2) {
-                            const match = row.filePath.match(/excelreport(\/[^?#]*)/)
                          
-                            window.open(window.location.origin + '/#/previewFile?' + match[1])
+                        if (row.problemType == 2) {
+                            // 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 => {
+                                // getFileNameAndFilePath({ filePath: '/' + row.problemPath }).then(res => {
-                                    window.open(res.data.url)
+                                    
-                                })
+                                //     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(\/[^?#]*)/)
+                        // const match = row.filePath.match(/excelreport(\/[^?#]*)/)
              
-                        window.open(window.location.origin + '/#/previewFile?' + match[1])
+                        // 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

@@ -18,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 >
@@ -30,8 +30,8 @@
             <el-descriptions-item :span="2" label="采取措施">
                 {{ detailData.takeStep }}
             </el-descriptions-item>
-            <el-descriptions-item :span="2" label="处理成效报告">
+            <el-descriptions-item :span="2" label="反馈报告">
-                <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 >
@@ -48,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() // 查询参数
@@ -92,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-form-item label="技术监督报告：" v-if="showFile1"> -->
-                    <el-icon class="elView" v-if="supervisionReportDetail?.supervisionReportName && VITE_FLAG">
+                <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,7 +22,7 @@
                 </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 >
@@ -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/detail.vue

@@ -50,7 +50,10 @@
                         })?.name
                     }}
                 </el-descriptions-item>
-            <el-descriptions-item label="非线性终端类型" v-if="detailData.userType == 0 || detailData.userType == 1">
+                <el-descriptions-item
+                    label="非线性终端类型"
+                    v-if="detailData.userType == 0 || detailData.userType == 1"
+                >
                     {{ proviteData.nonlinearDeviceType ? proviteData.nonlinearDeviceType : '-' }}
                 </el-descriptions-item>
                 <el-descriptions-item label="预测评估单位">
@@ -61,7 +64,9 @@
                 </el-descriptions-item>
                 <el-descriptions-item
                     :label="
-                    detailData.userType == '4' || detailData.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'
+                        detailData.userType == '4' || detailData.userType == '5'
+                            ? '非线性设备类型: '
+                            : '非线性负荷类型：'
                     "
                     v-if="
                         detailData.userType == '2' ||
@@ -184,7 +189,10 @@
                         })?.name
                     }}
                 </el-descriptions-item>
-            <el-descriptions-item label="预测评估评审单位" v-if="detailData.userType != 0 && detailData.userType != 1">
+                <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">
@@ -226,12 +234,12 @@
                 </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">
+                        <span class="aLoad" @click="download(proviteData.feasibilityReport?.keyName)" rel="nofollow">
                             {{ proviteData.feasibilityReport?.name }}
-                   </span >
+                        </span>
                     </span>
                     <span
                         v-if="
@@ -241,200 +249,210 @@
                             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)">
                             {{ proviteData.feasibilityReport?.name }}
-                   </span >
+                        </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)">
                             {{ proviteData.feasibilityReport?.name }}
-                   </span >
+                        </span>
                     </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>
 
                     <span class="aLoad" @click="download(proviteData?.preliminaryDesignDescription?.keyName)">
                         {{ proviteData?.preliminaryDesignDescription?.name }}
-               </span >
+                    </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)">
                         {{ proviteData?.predictionEvaluationReport?.name }}
-               </span >
+                    </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)">
                         {{ proviteData?.predictionEvaluationReviewOpinions?.name }}
-               </span >
+                    </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)">
                         {{ proviteData?.substationMainWiringDiagram?.name }}
-               </span >
+                    </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)">
                         {{ proviteData?.sensitiveDevices?.name }}
-               </span >
+                    </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)">
                         {{ proviteData?.antiInterferenceReport?.name }}
-               </span >
+                    </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)">
                         {{ proviteData?.powerQualityReport?.name }}
-               </span >
+                    </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">
+                    <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 >
+                    </span>
                 </el-descriptions-item>
 
                 <el-descriptions-item label="入网方案报告">
                     <div v-for="item in netInReportList">
-                    <el-icon class="elView" v-if="item.name && VITE_FLAG">
+                        <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 >
+                        </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">
+                        <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 >
+                        </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="信息安全检测报告">
-                <el-icon class="elView" v-if="form.informationSecurityTestReport[0]?.name && VITE_FLAG">
+                    <el-icon class="elView" v-if="form.informationSecurityTestReport[0]?.name">
                         <View @click="openFile(form.informationSecurityTestReport[0]?.name)" />
                     </el-icon>
                     <span class="aLoad" @click="download(form.informationSecurityTestReport[0]?.keyName)">
                         {{ form.informationSecurityTestReport[0]?.name }}
-               </span >
+                    </span>
                 </el-descriptions-item>
                 <el-descriptions-item label="入网设计方案审查报告">
                     <div v-for="item in form.NetReport">
-                    <el-icon class="elView" v-if="item.name && VITE_FLAG">
+                        <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 >
+                        </span>
                     </div>
                 </el-descriptions-item>
                 <el-descriptions-item label="治理工程验收报告">
                     <div v-for="item in form.governReport">
-                    <el-icon class="elView" v-if="item.name && VITE_FLAG">
+                        <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 >
+                        </span>
                     </div>
                 </el-descriptions-item>
 
                 <el-descriptions-item label="验收检验报告单">
-                <el-icon class="elView" v-if="form.acceptanceInspectionReportSingle[0]?.name && VITE_FLAG">
+                    <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 >
+                    </span>
                 </el-descriptions-item>
 
                 <el-descriptions-item label="验收检验报告">
-                <el-icon class="elView" v-if="form.acceptanceInspectionReport[0]?.name && VITE_FLAG">
+                    <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 >
+                    </span>
                 </el-descriptions-item>
                 <el-descriptions-item label="型式实验报告">
-                <el-icon class="elView" v-if="form.typeExperimentReport[0]?.name && VITE_FLAG">
+                    <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 >
+                    </span>
                 </el-descriptions-item>
 
                 <el-descriptions-item label="出厂检验报告">
-                <el-icon class="elView" v-if="form.factoryInspectionReport[0]?.name && VITE_FLAG">
+                    <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 >
+                    </span>
                 </el-descriptions-item>
                 <el-descriptions-item label="性能检测报告">
-                <el-icon class="elView" v-if="form.performanceTestReport[0]?.name && VITE_FLAG">
+                    <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 >
+                    </span>
                 </el-descriptions-item>
                 <el-descriptions-item label="主接线图">
-                <el-icon class="elView" v-if="form.mainWiringDiagram[0]?.name && VITE_FLAG">
+                    <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 >
+                    </span>
                 </el-descriptions-item>
                 <el-descriptions-item label="试运行报告">
-                <el-icon class="elView" v-if="form.runTheReport[0]?.name && VITE_FLAG">
+                    <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 >
+                    </span>
                 </el-descriptions-item>
             </el-descriptions>
         </div>
@@ -453,9 +471,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({
@@ -478,6 +496,7 @@ const openFile = (name: any) => {
 }
 const netInReportList: any = ref([])
 const governReportList: any = ref([])
+const simulationReportList: any = ref([])
 //用户性质数组
 const userTypeList = reactive([
     {
@@ -730,7 +749,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 => {
         devIdList.value = res.data.filter((item: any) => item.devId == detailData.value.devId)
@@ -828,6 +854,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/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)',
@@ -165,7 +229,9 @@ 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: 1, 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,104 +89,139 @@ 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)
+
+                try {
                     if (title.value === '导入干扰源用户') {
                         await importSensitiveReportData(data)
                             .then(res => handleImportResponse(title.value, res))
-                        .finally(() => {
+                            .catch(() => {
-                            tableStore.index()
+                                // 处理请求失败的情况
-                            eventDataUploadVisible.value = false
+                                ElMessage.error('导入失败，请查看下载附件！')
                             })
                     } else {
                         await importSensitiveUserData(data)
                             .then(res => handleImportResponse(title.value, res))
-                        .finally(() => {
+                            .catch(() => {
-                            tableStore.index()
+                                // 处理请求失败的情况
-                            eventDataUploadVisible.value = false
+                                ElMessage.error('导入失败，请查看下载附件！')
                             })
                     }
-                // if (title.value == '导入干扰源用户') {
+                } finally {
-                //     await importSensitiveReportData(data)
+                    // 无论成功失败都重新启用按钮并关闭窗口
-                //         .then((res: any) => {
+                    tableStore.index()
-                //             if (res.type === 'application/json') {
+                    eventDataUploadVisible.value = false
-                //                 // 说明是普通对象数据，读取信息
+                }
-                //                 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 {

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/monitorpoint/detail.vue

@@ -117,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)">
@@ -141,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

@@ -202,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
@@ -214,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
@@ -226,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
@@ -238,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
@@ -250,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
@@ -262,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
@@ -274,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
@@ -309,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 编号
@@ -367,11 +367,11 @@ const terminalModelList = [
     },
     {
         id: '1',
-        name: '虚拟终端'
+        name: '实际终端'
     },
     {
         id: '2',
-        name: '虚拟终端'
+        name: '离线'
     }
 ]
 //定义通讯状态下拉框数据

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

@@ -30,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)">
@@ -58,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/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/analyse/eventwaveform/index.vue

@@ -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>
@@ -256,7 +256,7 @@ const positioningexport = () => {
     }
 
     positioningtableRef.value.exportData({
-        filename: '事件分析', // 文件名字
+        filename: '事件查看', // 文件名字
         sheetName: 'Sheet1',
         type: 'xlsx', //导出文件类型 xlsx 和 csv
         useStyle: true,

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

@@ -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>