修改冀北现场问题

src/components/PreviewFile/index.vue

@@ -20,9 +20,9 @@ import VueOfficeExcel from '@vue-office/excel'
 //引入VueOfficePdf组件
 import VueOfficePdf from '@vue-office/pdf'
 const { push, options, currentRoute } = useRouter()
-// const url = 'http://192.168.1.22:9009/excelreport/supervision/' + currentRoute.value.href?.split('?')[1]
+const url = 'http://192.168.1.22:9009/excelreport' + currentRoute.value.href?.split('?')[1]
-
+// http://192.168.1.22:9009/excelreport/onlineReport/%E7%94%B5%E8%83%BD%5B%E5%91%8A%5D2024%E5%B9%B41%E5%8F%B7-%E5%BC%A0%E5%AE%B6%E5%8F%A3%E5%9C%B0%E5%B8%82%20%E7%94%B5%E8%83%BD%E8%B4%A8%E9%87%8F%E6%8A%80%E6%9C%AF%E7%9B%91%E7%9D%A3%E5%91%8A%E8%AD%A6%E5%8D%95.docx?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minio%2F20240807%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20240807T021320Z&X-Amz-Expires=604800&X-Amz-SignedHeaders=host&X-Amz-Signature=0173318ad09fa6cc9067123b6997f423c692c820ef9e185ca7dda300e5f7853c
-const url = '/api-docx/excelreport/supervision/' + currentRoute.value.href?.split('?')[1]
+// const url = '/api-docx/excelreport' + currentRoute.value.href?.split('?')[1]
 onMounted(() => {
     console.log()
 })

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

@@ -63,7 +63,7 @@ import { useDictData } from '@/stores/dictData'
 import { Link, View } from '@element-plus/icons-vue'
 const { query } = useRoute() // 查询参数
 const openFile = (name: any) => {
-    window.open(window.location.origin + '/#/previewFile?' + name)
+    window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
 }
 const props = defineProps({
     id: propTypes.string.def(undefined)

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

@@ -80,7 +80,7 @@ import { getTestById } from '@/api/supervision-boot/survey/test'
 import { getFileNameAndFilePath } from '@/api/system-boot/file'
 import { Link, View } from '@element-plus/icons-vue'
 const openFile = (name: any) => {
-    window.open(window.location.origin + '/#/previewFile?' + name)
+    window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
 }
 const { query } = useRoute() // 查询参数
 const props = defineProps({

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

@@ -326,7 +326,7 @@ import { userReportGoNetById } from '@/api/supervision-boot/interfere'
 // import el-descriptions-item from './components/detailsItem.vue'
 defineOptions({ name: 'BpmUserReportDetail' })
 const openFile = (name: any) => {
-    window.open(window.location.origin + '/#/previewFile?' + name)
+    window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
 }
 const { query } = useRoute() // 查询参数
 

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

@@ -60,7 +60,11 @@
                     {{ detailData.evaluationConclusion }}
                 </el-descriptions-item>
                 <el-descriptions-item
-                    :label="detailData.userType == '4'||detailData.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'"
+                    :label="
+                        detailData.userType == '4' || detailData.userType == '5'
+                            ? '非线性设备类型: '
+                            : '非线性负荷类型：'
+                    "
                     v-if="
                         detailData.userType == '2' ||
                         detailData.userType == '3' ||
@@ -376,7 +380,11 @@
                     {{ detailData1.evaluationConclusion }}
                 </el-descriptions-item>
                 <el-descriptions-item
-                    :label="detailData1.userType == '4'||detailData1.userType == '5' ? '非线性设备类型: ' : '非线性负荷类型：'"
+                    :label="
+                        detailData1.userType == '4' || detailData1.userType == '5'
+                            ? '非线性设备类型: '
+                            : '非线性负荷类型：'
+                    "
                     v-if="
                         detailData1.userType == '2' ||
                         detailData1.userType == '3' ||
@@ -664,7 +672,7 @@ const detailData = ref<any>({}) // 详情数据
 const detailData1 = ref<any>({}) // 详情数据
 const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
 const openFile = (name: any) => {
-    window.open(window.location.origin + '/#/previewFile?' + name)
+    window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
 }
 //用户性质数组
 const userTypeList = reactive([

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

@@ -361,7 +361,7 @@ const detailLoading = ref(false) // 表单的加载中
 const detailData = ref<any>({}) // 详情数据
 const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
 const openFile = (name: any) => {
-    window.open(window.location.origin + '/#/previewFile?' + name)
+    window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
 }
 const netInReportList: any = ref([])
 const governReportList: any = ref([])

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

@@ -289,7 +289,7 @@ const getFileNamePath = async (val: any, pathName: any) => {
 }
 
 const openFile = (name: any) => {
-    window.open(window.location.origin + '/#/previewFile?' + name)
+    window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
 }
 defineExpose({ open: getInfo }) // 提供 open 方法，用于打开弹窗
 /** 初始化 **/

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

@@ -121,6 +121,69 @@ const tableStore = new TableStore({
                 return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
             }
         },
+        {
+            title: '报告',
+            minWidth: '150',
+            align: 'center',
+            render: 'buttons',
+            fixed: 'right',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '查看报告',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !(row.problemType == 2 || row.problemType == 4)
+                    },
+                    click: row => {
+                        if (row.problemType == 2) {
+                            const match = row.filePath.match(/excelreport(\/[^?#]*)/)
+
+                            window.open(window.location.origin + '/#/previewFile?' + match[1])
+                        } else {
+                            if (row.problemPath == null) {
+                                ElMessage({
+                                    message: '暂无报告!',
+                                    type: 'warning'
+                                })
+                            } else {
+                                getFileNameAndFilePath({ filePath: '/' + row.problemPath }).then(res => {
+                                    // window.open(res.data.url)
+                                })
+                            }
+                        }
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '报告下载',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !(row.problemType == 2 || row.problemType == 4)
+                    },
+                    click: row => {
+                        if (row.problemType == 2) {
+                            window.open(row.filePath)
+                        } else {
+                            if (row.problemPath == null) {
+                                ElMessage({
+                                    message: '暂无报告!',
+                                    type: 'warning'
+                                })
+                            } else {
+                                getFileNameAndFilePath({ filePath: '/' + row.problemPath }).then(res => {
+                                    window.open(res.data.url)
+                                })
+                            }
+                        }
+                    }
+                }
+            ]
+        },
 
         {
             title: '操作',
@@ -241,32 +304,7 @@ const tableStore = new TableStore({
                         )
                     }
                 },
-                {
+
-                    name: 'productSetting',
-                    title: '报告下载',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return !(row.problemType == 2 || row.problemType == 4)
-                    },
-                    click: row => {
-                        if (row.problemType == 2) {
-                            window.open(row.filePath)
-                        } else {
-                            if (row.problemPath == null) {
-                                ElMessage({
-                                    message: '暂无报告!',
-                                    type: 'warning'
-                                })
-                            } else {
-                                getFileNameAndFilePath({ filePath: '/' + row.problemPath }).then(res => {
-                                    window.open(res.data.url)
-                                })
-                            }
-                        }
-                    }
-                },
                 {
                     name: 'cancel',
                     title: '取消',

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

@@ -96,6 +96,43 @@ const tableStore = new TableStore({
                 return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
             }
         },
+        {
+            title: '报告',
+            minWidth: '150',
+            align: 'center',
+            render: 'buttons',
+            fixed: 'right',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '查看报告',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.problemType != 2
+                    },
+                    click: row => {
+                        const match = row.filePath.match(/excelreport(\/[^?#]*)/)
+
+                        window.open(window.location.origin + '/#/previewFile?' + match[1])
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '报告下载',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.problemType != 2
+                    },
+                    click: row => {
+                        window.open(row.filePath)
+                    }
+                }
+            ]
+        },
         {
             title: '操作',
             minWidth: '220',
@@ -198,19 +235,7 @@ const tableStore = new TableStore({
                         )
                     }
                 },
-                {
+
-                    name: 'productSetting',
-                    title: '报告下载',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.problemType != 2
-                    },
-                    click: row => {
-                        window.open(row.filePath)
-                    }
-                },
                 {
                     name: 'cancel',
                     title: '取消',

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

@@ -42,7 +42,7 @@ import { Link, View } from '@element-plus/icons-vue'
 
 defineOptions({ name: 'technology/detail' })
 const openFile = (name: any) => {
-    window.open(window.location.origin + '/#/previewFile?' + name)
+    window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
 }
 const { query } = useRoute() // 查询参数
 

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

@@ -84,7 +84,7 @@ import { getFileNameAndFilePath, uploadFile } from '@/api/system-boot/file'
 import { addFeedback, updateFeedback } from '@/api/supervision-boot/leaflet'
 import { Link, View } from '@element-plus/icons-vue'
 const openFile = (name: any) => {
-    window.open(window.location.origin + '/#/previewFile?' + name)
+    window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
 }
 //.doc,.docx,.xlsx,.xls,.pdf
 const acceptType = ref('')
@@ -175,7 +175,7 @@ const open = async (
     }
     if (supervisionReport) {
         let arrPath = supervisionReport.split(',')
-        console.log("🚀 ~ arrPath:", arrPath)
+        console.log('🚀 ~ arrPath:', arrPath)
         await getFileNameAndFilePath({ filePath: arrPath[0] }).then(res => {
             supervisionReportDetail.supervisionReportPath = res.data.url
             supervisionReportDetail.supervisionReportName = res.data.fileName

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

@@ -30,7 +30,7 @@
                 <a :href="detailData.reportPaths?.url">
                     {{ detailData.reportPaths?.fileName }}
                 </a>
-                </el-descriptions-item>
+            </el-descriptions-item>
             <el-descriptions-item label="描述">
                 {{ detailData?.description }}
             </el-descriptions-item>
@@ -46,10 +46,10 @@ import { propTypes } from '@/utils/propTypes'
 import { getInfoById } from '@/api/supervision-boot/cycleDetection/index'
 import { getFileNameAndFilePath } from '@/api/system-boot/file'
 import { useDictData } from '@/stores/dictData'
-import { Link,View } from '@element-plus/icons-vue'
+import { Link, View } from '@element-plus/icons-vue'
 const { query } = useRoute() // 查询参数
 const openFile = (name: any) => {
-    window.open(window.location.origin + '/#/previewFile?' + name)
+    window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
 }
 const props = defineProps({
     id: propTypes.string.def(undefined)

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

@@ -114,8 +114,8 @@
         <!--文件地址-->
         <el-descriptions-item label="主接线图" v-if="detailData?.mainWiringDiagram">
             <el-icon class="elView" v-if="detailData?.mainWiringDiagram.name">
-                    <View @click="openFile(detailData?.mainWiringDiagram.name)" />
+                <View @click="openFile(detailData?.mainWiringDiagram.name)" />
-                </el-icon>
+            </el-icon>
             <a target="_blank" :href="detailData?.mainWiringDiagram.url">
                 {{ detailData?.mainWiringDiagram.name }}
             </a>
@@ -130,9 +130,9 @@ import { propTypes } from '@/utils/propTypes'
 import { getTempLineDetailsById } from '@/api/supervision-boot/monitorpoint/index'
 import { useDictData } from '@/stores/dictData'
 import { getFileNameAndFilePath } from '@/api/system-boot/file'
-import { Link,View } from '@element-plus/icons-vue'
+import { Link, View } from '@element-plus/icons-vue'
 const openFile = (name: any) => {
-    window.open(window.location.origin + '/#/previewFile?' + name)
+    window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
 }
 defineOptions({ name: 'BpmUserReportDetail' })
 

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

@@ -903,7 +903,7 @@ const resetForm: any = async () => {
     changeSubstationFlag()
 }
 //初始化数据
-resetForm()
+// resetForm()
 //终端信息表单格式
 const devReportForm: any = ref({
     reporter: '', //填报人

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

@@ -260,7 +260,7 @@ import { Link, View } from '@element-plus/icons-vue'
 import { nodeAllList } from '@/api/device-boot/Business'
 defineOptions({ name: 'BpmUserReportDetail' })
 const openFile = (name: any) => {
-    window.open(window.location.origin + '/#/previewFile?' + name)
+    window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
 }
 const { query } = useRoute() // 查询参数
 

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

@@ -73,7 +73,7 @@ const getInfo = async () => {
 }
 defineExpose({ open: getInfo }) // 提供 open 方法，用于打开弹窗
 const openFile = (name: any) => {
-    window.open(window.location.origin + '/#/previewFile?' + name)
+    window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
 }
 /** 初始化 **/
 onMounted(() => {