From 0645462ab833311dcc18b24edc2dc51ab657b7ae Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Thu, 31 Oct 2024 15:47:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=9F=A5=E7=9C=8B=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   4 +
 src/components/PreviewFile/index.vue          |   3 +-
 src/components/wangEditor/index.vue           |  43 ++-
 src/styles/app.scss                           |   3 +
 src/styles/element.scss                       |   7 +-
 .../database/algorithm/components/form.vue    |  39 +-
 src/views/pqs/database/algorithm/index.vue    |  27 +-
 src/views/pqs/database/case/index.vue         |  27 +-
 .../detailed/dirtyAreas/index.vue             | 341 ++++++++++++++++++
 .../components1/complaints.vue                | 116 ++++--
 .../components1/complaintsDetail.vue          |  85 +++++
 .../components1/testQuestions.vue             |  81 +++--
 .../electricalEnergy/components1/testRun.vue  | 111 ++++--
 .../components1/testRunDetail.vue             |  89 +++++
 .../supervise/harmonicSurvey/test/detail.vue  |  24 +-
 .../supervise/technology/components/alarm.vue |  22 +-
 .../technology/components/earlyWarn.vue       |  22 +-
 src/views/pqs/supervise/technology/detail.vue |   3 +
 src/views/system/bpm/task/alarmTask/index.vue |  22 +-
 19 files changed, 921 insertions(+), 148 deletions(-)
 create mode 100644 src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue
 create mode 100644 src/views/pqs/supervise/electricalEnergy/components1/complaintsDetail.vue
 create mode 100644 src/views/pqs/supervise/electricalEnergy/components1/testRunDetail.vue

diff --git a/package.json b/package.json
index 514f7374..c9791300 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "@vueuse/core": "^10.7.0",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
+    "@wangeditor/plugin-formula": "^1.0.11",
     "axios": "^1.6.2",
     "bpmn-js": "8.9.0",
     "bpmn-js-properties-panel": "0.46.0",
@@ -43,10 +44,12 @@
     "jquery": "^3.7.1",
     "js-pinyin": "^0.2.5",
     "jsencrypt": "^3.3.2",
+    "katex": "^0.16.11",
     "less": "^4.2.0",
     "lodash-es": "^4.17.21",
     "luckyexcel": "^1.0.1",
     "luckysheet": "^2.1.13",
+    "mathjax": "^3.2.2",
     "min-dash": "^4.2.1",
     "mitt": "^3.0.1",
     "nprogress": "^0.2.0",
@@ -63,6 +66,7 @@
     "vue-demi": "^0.14.8",
     "vue-draggable-resizable": "3.0.0-beta.2",
     "vue-i18n": "9.10.2",
+    "vue-katex": "^0.5.0",
     "vue-router": "4",
     "vue-types": "^5.1.1",
     "vxe-table": "^4.5.17",
diff --git a/src/components/PreviewFile/index.vue b/src/components/PreviewFile/index.vue
index 3e254b2c..60ad2726 100644
--- a/src/components/PreviewFile/index.vue
+++ b/src/components/PreviewFile/index.vue
@@ -22,8 +22,9 @@ const { push, options, currentRoute } = useRouter()
 // const url = 'http://192.168.1.22:9009/excelreport' + currentRoute.value.href?.split('?')[1]
 
 const url = '/api-docx/excelreport' + currentRoute.value?.href?.split('?')[1]
+console.log("🚀 ~ url:", url)
 const excelOptions = ref({
-    xls: currentRoute.value.href?.split('?')[1].split('.')[1] == 'xls' ? true : false
+    xls: currentRoute.value.href?.split('?')[1].split('.')[1] == 'xls' ? true : true
 })
 onMounted(() => {
     console.log()
diff --git a/src/components/wangEditor/index.vue b/src/components/wangEditor/index.vue
index de8af089..e2a75e32 100644
--- a/src/components/wangEditor/index.vue
+++ b/src/components/wangEditor/index.vue
@@ -12,8 +12,24 @@ import { getAccessToken, getTenantId } from '@/utils/auth'
 import { onBeforeUnmount, ref, shallowRef, onMounted } from 'vue'
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 import { useAdminInfo } from '@/stores/adminInfo'
+import { Boot, IEditorConfig, IToolbarConfig } from '@wangeditor/editor'
+import formulaModule from '@wangeditor/plugin-formula'
+
+let isFormulaModuleLoaded = false;
+// 注册。要在创建编辑器之前注册，且只能注册一次，不可重复注册。
+if (!isFormulaModuleLoaded) {
+    isFormulaModuleLoaded = true;
+
+}
+try {
+    Boot.registerModule(formulaModule)
+} catch (error) {
+
+}
+
 // 编辑器实例，必须用 shallowRef
 const editorRef = shallowRef()
+
 const adminInfo = useAdminInfo()
 // 内容 HTML
 const valueHtml = ref('<p>hello</p>')
@@ -25,8 +41,16 @@ onMounted(() => {
     }, 1500)
 })
 
-const toolbarConfig = {
-    excludeKeys: ['fullScreen', 'emotion','insertFormula']
+
+const toolbarConfig: Partial<IToolbarConfig> = {
+    // excludeKeys: ['fullScreen', 'emotion']
+    insertKeys: {
+        index: 0,
+        keys: [
+            'insertFormula', // “插入公式”菜单
+            // 'editFormula' // “编辑公式”菜单
+        ],
+    },
 }
 let sever = '/api/system-boot/file/upload'
 // 本地加api
@@ -34,7 +58,7 @@ let sever = '/api/system-boot/file/upload'
 //     sever = '/api' + sever
 // }
 type InsertFnType = (url: string, alt: string, href: string) => void
-const editorConfig = {
+const editorConfig: Partial<IEditorConfig> = {
     placeholder: '请输入内容...',
     MENU_CONF: {
         uploadImage: {
@@ -44,11 +68,11 @@ const editorConfig = {
             compress: true,
             uploadFileName: 'file',
             withCredentials: true,
-            
+
             headers: {
                 Accept: '*',
-                Authorization:  adminInfo.getToken(),
-             
+                Authorization: adminInfo.getToken(),
+
             },
             meta: { path: '/supervision/' },
             timeout: 0,
@@ -58,16 +82,17 @@ const editorConfig = {
         }
     },
     hoverbarKeys: {
-    formula: {
-      menuKeys: ['editFormula'], // “编辑公式”菜单
+        formula: {
+            menuKeys: ['editFormula'], // “编辑公式”菜单
+        },
     },
-  },
 }
 
 // 组件销毁时，也及时销毁编辑器
 onBeforeUnmount(() => {
     const editor = editorRef.value
     if (editor == null) return
+
     editor.destroy()
 })
 
diff --git a/src/styles/app.scss b/src/styles/app.scss
index fcfadf48..736d4596 100644
--- a/src/styles/app.scss
+++ b/src/styles/app.scss
@@ -413,3 +413,6 @@ body,
     font-weight: normal;
     font-style: normal;
 }
+.w-e-scroll{
+    min-height: 200px !important;
+}
\ No newline at end of file
diff --git a/src/styles/element.scss b/src/styles/element.scss
index 0f2121e4..33775bd7 100644
--- a/src/styles/element.scss
+++ b/src/styles/element.scss
@@ -29,6 +29,12 @@
         }
     }
 }
+
+.atooltip {
+    margin-top: 0px !important;
+    padding: 0 !important;
+
+}
 .el-dialog {
     padding: 0px !important;
 
@@ -212,4 +218,3 @@
 .el-drawer__header {
     margin-bottom: 0 !important;
 }
-
diff --git a/src/views/pqs/database/algorithm/components/form.vue b/src/views/pqs/database/algorithm/components/form.vue
index 50c8d756..643742f2 100644
--- a/src/views/pqs/database/algorithm/components/form.vue
+++ b/src/views/pqs/database/algorithm/components/form.vue
@@ -42,7 +42,7 @@
     </el-dialog>
 </template>
 <script lang="ts" setup>
-import { ref, inject } from 'vue'
+import { ref, nextTick } from 'vue'
 import { reactive } from 'vue'
 import { ElMessage } from 'element-plus'
 import { queryAllAlgorithmLibrary, addAlgorithm, updateAlgorithmLibrary } from '@/api/supervision-boot/database/index'
@@ -53,6 +53,7 @@ const title = ref('')
 const formRef = ref()
 const loading = ref(false)
 const dataTree = ref([])
+const key = ref(0)
 const TreeList: any = ref({})
 const List = ref({})
 const defaultProps = {
@@ -82,16 +83,20 @@ const cycle = [
     { value: '3', label: '年' }
 ]
 const changeTree = (row: any) => {
+    console.log("🚀 ~ changeTree ~ row:", row)
     TreeList.value = row
     if (title.value == '修改算法') {
         if (row.level != 4) {
             form.name = row.name
+
         } else {
             for (let key in form) {
                 form[key] = row[key]
             }
         }
+
         form.id = row.id
+        key.value += 1
     }
 }
 
@@ -101,15 +106,20 @@ const open = (row: any) => {
     List.value = row.row
     getTheTree()
     // 在此处恢复默认表单
-    for (let key in form) {
-        form[key] = ''
-    }
-    if (row.title == '修改算法') {
-        form.pid = row.row.id
-        TreeList.value = row.row
-        changeTree(row.row)
-        // row.row
-    }
+    nextTick(() => {
+        for (let key in form) {
+            form[key] = ''
+        }
+        if (row.title == '修改算法') {
+
+            form.pid = row.row.id
+            TreeList.value = row.row
+            changeTree(row.row)
+
+            // row.row
+        }
+    })
+    formRef.value?.resetFields()
 }
 const submit = async () => {
     loading.value = true
@@ -123,7 +133,7 @@ const submit = async () => {
                     forms.name = form.name
                     forms.pid = form.pid
                 }
-                await  addAlgorithm(forms).then(res => {
+                await addAlgorithm(forms).then(res => {
                     ElMessage.success('新增成功')
                     dialogVisible.value = false
                     emit('getTree')
@@ -131,7 +141,7 @@ const submit = async () => {
             } else {
                 let forms: any = {}
                 if (TreeList.value.level == 4) {
-                    forms = form
+                    forms = JSON.parse(JSON.stringify(form))
                 } else {
                     forms.name = form.name
                     forms.id = form.id
@@ -146,8 +156,9 @@ const submit = async () => {
         }
     })
     await setTimeout(() => {
-        loading.value=false 
-    },0)
+
+        loading.value = false
+    }, 0)
 }
 const getTheTree = () => {
     queryAllAlgorithmLibrary().then(res => {
diff --git a/src/views/pqs/database/algorithm/index.vue b/src/views/pqs/database/algorithm/index.vue
index a47037ed..a18299bd 100644
--- a/src/views/pqs/database/algorithm/index.vue
+++ b/src/views/pqs/database/algorithm/index.vue
@@ -82,7 +82,7 @@
             @getTree="treeRef.loadData(dotList.id), (popupEditFlag = false)" />
         <!-- 定义 -->
         <el-dialog v-model="viewFlag" title="定义" width="60%">
-            <div class="editor" v-html="summary" style="min-height: 300px;" />
+            <div class="editor" ref="editorRef" v-html="summary" style="min-height: 300px;" />
         </el-dialog>
         <!-- 删除 -->
         <el-dialog v-model="dialogVisible" title="请选择需要删除的数据" width="400">
@@ -112,6 +112,8 @@ 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'
@@ -121,6 +123,7 @@ const height = mainHeight(20)
 const heightTab = mainHeight(82)
 const size = ref(0)
 const addTreeRef = ref()
+const editorRef = ref()
 const dialogVisible = ref(false)
 const viewFlag = ref(false)
 const popupEditFlag = ref(false)
@@ -207,9 +210,31 @@ onMounted(() => {
 })
 
 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
diff --git a/src/views/pqs/database/case/index.vue b/src/views/pqs/database/case/index.vue
index eefd956d..66fe0838 100644
--- a/src/views/pqs/database/case/index.vue
+++ b/src/views/pqs/database/case/index.vue
@@ -1,12 +1,11 @@
 <template>
     <div class="default-main">
         <!-- 案例库 -->
-        <TableHeader ref="TableHeaderRef" >
+        <TableHeader ref="TableHeaderRef">
             <template #select>
                 <el-form-item label="名称">
-                    <el-input v-model="tableStore.table.params.searchValue" clearable
-                        placeholder="请输入搜索名称" />
-                    </el-form-item>
+                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入搜索名称" />
+                </el-form-item>
 
 
             </template>
@@ -50,6 +49,8 @@ import { ElMessage } from 'element-plus'
 import { uploadFile, getFileNameAndFilePath, downloadFile } from '@/api/system-boot/file'
 import { addStandardCase, queryStandardCase } 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/case'
@@ -101,6 +102,22 @@ const tableStore = new TableStore({
                     click: row => {
                         dialogVisible.value = true
                         summary.value = row.summary
+                        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 = span;
+                                newDiv.innerHTML = val;
+
+                                span.parentNode.replaceChild(newDiv, span);
+                            });
+
+                        }, 100)
                     }
                 }
             ]
@@ -170,7 +187,7 @@ const tableStore = new TableStore({
     ],
     loadCallback: () => { }
 })
-tableStore.table.params.searchValue=''
+tableStore.table.params.searchValue = ''
 // 弹框
 const addUser = () => {
     popupEditRef.value.open('新增案例')
diff --git a/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue b/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue
new file mode 100644
index 00000000..1a455c14
--- /dev/null
+++ b/src/views/pqs/harmonicMonitoring/detailed/dirtyAreas/index.vue
@@ -0,0 +1,341 @@
+<template>
+    <div class="default-main">
+        <TableHeader datePicker ref="header">
+            <template v-slot:select>
+                <el-form-item label="统计类型">
+                    <el-select v-model="tableStore.table.params.statisticalType" value-key="id" placeholder="请选择统计类型">
+                        <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
+                    </el-select>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-DataAnalysis">排名前10监测点</el-button>
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <div v-loading="tableStore.table.loading" class="pr10">
+            <el-row>
+                <el-col :span="12" class="pd10">
+                    <el-tag style="background: #339966;" class="tag" size="small">1级</el-tag>
+                    <span style="color: #339966;" class="text">:无污染(0,1]</span>
+                    <el-tag style="background: #3399ff;" class="tag" size="small">2级</el-tag>
+                    <span style="color: #3399ff;" class="text">:轻微污染(1,1.2]</span>
+                    <el-tag style="background: #ffcc33;" class="tag" size="small">3级</el-tag>
+                    <span style="color: #ffcc33;" class="text">:轻度污染(1.2,1.6]</span>
+                    <el-tag style="background: #ff9900;" class="tag" size="small">4级</el-tag>
+                    <span style="color: #ff9900;" class="text">:中度污染(1.6,2]</span>
+                    <el-tag style="background: #cc0000;" class="tag" size="small">5级</el-tag>
+                    <span style="color: #cc0000;" class="text">:重度污染(2,+∞)</span>
+                    <div :style="{ height: layout.height }" style="overflow-y: auto">
+                        <div class="mt10 cardBox">
+                            <el-card v-for="(item, index) in tableStore.table.data" :key="index">
+                                <template #header>
+                                    <el-tag v-if="item.data == 3.14159 || item.data == 0"
+                                        style="background: #ccc; color: #fff" size="small">
+                                        无
+                                    </el-tag>
+                                    <el-tag v-if="0 < item.data && item.data < 1 && item.data !== 3.14159"
+                                        style="background: #339966; color: #fff" size="small">
+                                        1级
+                                    </el-tag>
+                                    <el-tag v-if="1 <= item.data && item.data < 1.2 && item.data !== 3.14159"
+                                        style="background: #3399ff; color: #fff" size="small">
+                                        2级
+                                    </el-tag>
+                                    <el-tag v-if="1.2 <= item.data && item.data < 1.6 && item.data !== 3.14159"
+                                        style="background: #ffcc33; color: #fff" size="small">
+                                        3级
+                                    </el-tag>
+                                    <el-tag v-if="1.6 <= item.data && item.data < 2 && item.data !== 3.14159"
+                                        style="background: #ff9900; color: #fff" size="small">
+                                        4级
+                                    </el-tag>
+                                    <el-tag v-if="2 <= item.data && item.data && item.data !== 3.14159"
+                                        style="background: #cc0000; color: #fff" size="small">
+                                        5级
+                                    </el-tag>
+                                    <span>{{ item.name }}</span>
+
+                                </template>
+                                <div class="card-content">
+                                    <div class="card-item" v-for="(item1, index1) in item.children" :key="index1"
+                                        @click="queryline(item1.id, item1.pid, item1.name)">
+                                        <el-tag v-if="item1.data == 3.14159 || item1.data == 0"
+                                            style="background: #ccc; color: #fff" size="small">
+                                            无
+                                        </el-tag>
+                                        <el-tag v-if="0 < item1.data && item1.data < 1 && item1.data !== 3.14159"
+                                            style="background: #339966; color: #fff" size="small">
+                                            1级
+                                        </el-tag>
+                                        <el-tag v-if="1 <= item1.data && item1.data < 1.2 && item1.data !== 3.14159"
+                                            style="background: #3399ff; color: #fff" size="small">
+                                            2级
+                                        </el-tag>
+                                        <el-tag v-if="1.2 <= item1.data && item1.data < 1.6 && item1.data !== 3.14159"
+                                            style="background: #ffcc33; color: #fff" size="small">
+                                            3级
+                                        </el-tag>
+                                        <el-tag v-if="1.6 <= item1.data && item1.data < 2 && item1.data !== 3.14159"
+                                            style="background: #ff9900; color: #fff" size="small">
+                                            4级
+                                        </el-tag>
+                                        <el-tag v-if="2 <= item1.data && item1.data && item1.data !== 3.14159"
+                                            style="background: #cc0000; color: #fff" size="small">
+                                            5级
+                                        </el-tag>
+                                        <span class="xdf">
+                                            <el-tooltip  :open-delay="3000" effect="light"  show-arrow
+                                                :content="item1.name" popper-class="atooltip" placement="bottom-start">
+                                             
+                                                <div class="tooltipText">
+                                                    {{ item1.name }}
+                                                </div>
+                                            </el-tooltip>
+                                        </span>
+                                    </div>
+
+                                </div>
+
+                            </el-card>
+
+
+                        </div>
+                    </div>
+                </el-col>
+                <el-col :span="12">
+                    <my-echart class="tall" :options="echartList" />
+                    <div class="tall">
+                        <vxe-table height="auto" auto-resize :data="distributionData" v-bind="defaultAttribute">
+                            >
+                            <vxe-column field="qy" :title="titleA == '电压等级'
+                                ? '电压等级'
+                                : titleA == '终端厂家'
+                                    ? '终端厂家'
+                                    : titleA == '干扰源类型'
+                                        ? '干扰源类型'
+                                        : titleA == '电网拓扑'
+                                            ? '区域'
+                                            : ''
+                                " show-overflow-tooltip></vxe-column>
+                            <vxe-column field="jcd" title="监测点数(个数)"></vxe-column>
+                            <vxe-column field="zc" title="通讯正常(个数)" sortable></vxe-column>
+                            <vxe-column field="zd" title="通讯中断(个数)" sortable></vxe-column>
+                        </vxe-table>
+                    </div>
+                </el-col>
+            </el-row>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import TableHeader from '@/components/table/header/index.vue'
+
+import { useDictData } from '@/stores/dictData'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import TableStore from '@/utils/tableStore'
+import { ref, onMounted, provide } from 'vue'
+import { mainHeight } from '@/utils/layout'
+defineOptions({
+    name: 'Region/distribution'
+})
+
+const dictData = useDictData()
+const echartList = ref({})
+const titleA = ref('')
+const header = ref()
+const distributionData: any = ref([])
+const options = dictData.getBasicData('Pollution_Statis', ['I_Neg', 'V_Inharm', 'V_Dev', 'V_Unbalance', 'Plt', 'Freq_Dev'])
+const tableStore = new TableStore({
+    url: '/harmonic-boot/PollutionSubstation/deptSubstationRelations',
+    method: 'POST',
+    column: [],
+    loadCallback: () => {
+        titleA.value = tableStore.table.params.statisticalType.name
+        header.value.areaRef.change()
+        // 处理地图数据
+        map(tableStore.table.data)
+
+        histogram(tableStore.table.data)
+
+    }
+})
+provide('tableStore', tableStore)
+
+tableStore.table.params.deptIndex = dictData.state.area[0].id
+tableStore.table.params.statisticalType = options[0]
+tableStore.table.params.monitorFlag = 2
+tableStore.table.params.powerFlag = 2
+tableStore.table.params.reportFlag = 2
+tableStore.table.params.serverName = 'event-boot'
+
+
+
+
+// 地图数处理
+const map = (res: any) => {
+
+}
+const queryline = (id: any, pid: any, name: any) => {
+
+}
+
+// 表格数据处理
+// 柱状图数据处理
+const histogram = (res: any) => {
+    echartList.value = {
+        title: {
+            text:
+                titleA.value == '电压等级'
+                    ? '电压等级'
+                    : titleA.value == '终端厂家'
+                        ? '终端厂家'
+                        : titleA.value == '干扰源类型'
+                            ? '干扰源类型'
+                            : titleA.value == '电网拓扑'
+                                ? header.value.areaRef.areaName
+                                : '' // 给X轴加单位
+        },
+        tooltip: {
+            formatter: function (params: any) {
+                // console.log(params);
+                var tips = ''
+                for (var i = 0; i < params.length; i++) {
+                    tips += params[i].name + '</br/>'
+                    tips += '监测点数' + ':' + '&nbsp' + '&nbsp' + params[i].value + '</br/>'
+                }
+                return tips
+            }
+        },
+
+        xAxis: {
+            name:
+                titleA.value == '电压等级'
+                    ? '(电压\n等级)'
+                    : titleA.value == '终端厂家'
+                        ? '(终端\n厂家)'
+                        : titleA.value == '干扰源类型'
+                            ? '(干扰\n源类型)'
+                            : titleA.value == '电网拓扑'
+                                ? '(区域)'
+                                : '', // 给X轴加单位
+            data: distributionData.value.map((item: any) => item.qy)
+        },
+        yAxis: {
+            name: '监测点数（个）' // 给X轴加单位
+        },
+        options: {
+            series: [
+                {
+                    //   name: '暂降次数',
+                    type: 'bar',
+                    data: distributionData.value.map((item: any) => item.jcd),
+                    barMaxWidth: 30,
+                    itemStyle: {
+                        normal: {
+                            color: '#07CCCA'
+                        }
+                    },
+                    label: {
+                        show: true,
+                        position: 'top',
+                        textStyle: {
+                            //数值样式
+                            color: '#000'
+                        },
+                        fontSize: 12
+                    }
+                }
+            ]
+        }
+    }
+}
+
+onMounted(() => {
+    tableStore.index()
+})
+const layout = mainHeight(123) as any
+const layout1 = mainHeight(93) as any
+</script>
+<style lang="scss" scoped>
+.tall {
+    height: calc(v-bind('layout1.height') / 2);
+}
+
+.tag {
+    color: #fff;
+    border: #fff;
+    margin-left: 5px;
+    width: 28px;
+}
+
+.text {
+    font-weight: bold;
+    font-size: 12px;
+}
+
+:deep(.cardBox) {
+
+    box-sizing: border-box;
+    overflow: auto;
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+    grid-template-rows: max-content;
+    grid-gap: 10px;
+    justify-content: center;
+
+    .el-card {
+        background-image: linear-gradient(var(--el-color-primary), var(--el-color-primary-light-3));
+        font-weight: bold;
+
+
+
+        .el-card__header {
+            padding: 10px !important;
+            color: #fff;
+            display: flex;
+            justify-content: space-between;
+        }
+
+        .el-card__body {
+            padding: 10px !important;
+        }
+
+        .card-content {
+            height: 200px;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: space-between;
+            overflow-y: auto;
+            color: #000;
+
+            .card-item {
+                margin-bottom: 20px;
+                width: 50%;
+                display: flex;
+
+            }
+
+            .xdf {
+                width: 70%;
+            }
+
+            .tooltipText {
+                font-weight: 500;
+                font-size: 12px;
+                color: #fff;
+                // width: 50%;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                margin-left: 5px;
+
+            }
+
+        }
+    }
+
+}
+
+</style>
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue b/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue
index 933e1921..3c2814f1 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue
@@ -3,24 +3,35 @@
   <!-- 2 有新增 发起 预警单 -->
 
   <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+    <template v-slot:select>
+      <el-form-item label="是否解决">
+        <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
+          <el-option v-for="item in dealStateList" :key="item.value" :label="item.label"
+            :value="item.value"></el-option>
+        </el-select>
+      </el-form-item>
+    </template>
     <template v-slot:operation>
       <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
     </template>
   </TableHeader>
-  <Table ref="tableRef"/>
+  <Table ref="tableRef" />
   <!-- 新增 -->
-  <complaintsForm ref="formRef" @onSubmit="tableStore.index()"/>
+  <complaintsForm ref="formRef" @onSubmit="tableStore.index()" />
+  <!-- 详情 -->
+   <detail ref="detailRef"/>
 </template>
 <script setup lang="ts">
-import {ref, onMounted, provide, nextTick} from 'vue'
+import { ref, onMounted, provide, nextTick } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import {ElMessage, ElMessageBox} from 'element-plus'
-import {useDictData} from '@/stores/dictData'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useDictData } from '@/stores/dictData'
 import complaintsForm from './form/complaintsForm.vue'
-import {useRouter} from 'vue-router'
-import {sureInitiateWarningLeaflet} from '@/api/process-boot/electricitymanagement'
+import { useRouter } from 'vue-router'
+import { sureInitiateWarningLeaflet } from '@/api/process-boot/electricitymanagement'
+import detail from './complaintsDetail.vue';
 // Steady_Statis
 const dictData = useDictData()
 const exceeded = dictData.getBasicData('Steady_Statis')
@@ -28,7 +39,18 @@ const tableRef = ref()
 const planAddRef = ref()
 const formRef = ref()
 const TableHeaderRef = ref()
+const detailRef = ref()
 const router = useRouter() // 路由对象
+const dealStateList = ref([
+  {
+    label: '未解决',
+    value: '0'
+  },
+  {
+    label: '全部',
+    value: '1'
+  }
+])
 const tableStore = new TableStore({
   url: '/supervision-boot/SupervisionUserComplaint/list',
   publicHeight: 65,
@@ -43,14 +65,14 @@ const tableStore = new TableStore({
         return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
       }
     },
-    {field: 'userName', title: '用户名称'},
-    {field: 'userNumber', title: '用户编号'},
-    {field: 'dutyOrgName', title: '负责单位', minWidth: '150'},
+    { field: 'userName', title: '用户名称' },
+    { field: 'userNumber', title: '用户编号' },
+    { field: 'dutyOrgName', title: '负责单位', minWidth: '80' },
     // { field: 'userCategory', title: '用户类别' },
 
-    {field: 'complaintText', title: '投诉内容'},
-    {field: 'steadyIndicator', title: '稳态指标'},
-    {field: 'transientIndicators', title: '暂态指标'},
+    { field: 'complaintText', title: '投诉内容' },
+    { field: 'steadyIndicator', title: '稳态指标' },
+    { field: 'transientIndicators', title: '暂态指标' },
     {
       field: 'monitorName',
       title: '监测点名称',
@@ -58,20 +80,23 @@ const tableStore = new TableStore({
         return row.cellValue ? row.cellValue : '/'
       }
     },
-    // {
-    //     field: 'monitorNumber',
-    //     title: '监测点编号',
-    //     formatter: (row: any) => {
-    //         return row.cellValue ? row.cellValue : '/'
-    //     }
-    // },
     {
       field: 'detectionFlag',
       title: '是否实现监测',
-      formatter: (row: any) => {
-        return row.cellValue == '0' ? '否' : '是'
+    
+      render: 'tag',
+      custom: {
+        0: 'warning',
+        1: 'primary',
+
+      },
+      replaceValue: {
+        0: '否',
+        1: '是',
+
       }
     },
+
     {
       field: 'createBy',
       title: '填报人',
@@ -80,9 +105,25 @@ const tableStore = new TableStore({
         return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
       }
     },
+    {
+      field: 'dealState',
+      title: '是否解决',
+ 
+      render: 'tag',
+      custom: {
+        0: 'warning',
+        1: 'primary',
+
+      },
+      replaceValue: {
+        0: '未解决',
+        1: '已解决',
+
+      }
+    },
     {
       title: '操作',
-      width: '180',
+      minWidth: 120,
       align: 'center',
       render: 'buttons',
       buttons: [
@@ -93,7 +134,7 @@ const tableStore = new TableStore({
           icon: 'el-icon-Open',
           render: 'basicButton',
           disabled: row => {
-            return row.initiateWarningFlag == 1
+            return row.dealState != 0
           },
           // popconfirm: {
           //     confirmButtonText: '确认',
@@ -102,7 +143,7 @@ const tableStore = new TableStore({
           //     title: '请确认发起告警单!'
           // },
           click: async row => {
-            const {value} = await ElMessageBox.prompt('', '整改意见', {
+            const { value } = await ElMessageBox.prompt('', '整改意见', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
 
@@ -110,13 +151,32 @@ const tableStore = new TableStore({
               inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
               inputErrorMessage: '请输入整改意见'
             })
-            sureInitiateWarningLeaflet({id: row.id, reformAdvice: value}).then(res => {
+            sureInitiateWarningLeaflet({ id: row.id, reformAdvice: value }).then(res => {
               ElMessage.success('发起告警单成功！')
               tableStore.index()
             })
 
           }
         },
+        {
+          name: 'edit',
+          title: '告警单详情',
+          type: 'primary',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.dealState == 0
+          },
+       
+          click:  row => {
+            detailRef.value.open({
+              row: row,
+              title: '告警单详情',
+           
+            })
+
+          }
+        },
         {
           name: 'edit',
           title: '查看告警单',
@@ -155,13 +215,13 @@ const tableStore = new TableStore({
 })
 
 provide('tableStore', tableStore)
-
+tableStore.table.params.dealState = ''
 onMounted(() => {
   tableStore.index()
 })
 // 新增
 const add = () => {
-  formRef.value.open({text: '新增投诉'})
+  formRef.value.open({ text: '新增投诉' })
 }
 </script>
 
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/complaintsDetail.vue b/src/views/pqs/supervise/electricalEnergy/components1/complaintsDetail.vue
new file mode 100644
index 00000000..030c4378
--- /dev/null
+++ b/src/views/pqs/supervise/electricalEnergy/components1/complaintsDetail.vue
@@ -0,0 +1,85 @@
+<template>
+    <div>
+        <el-dialog v-model="dialogVisible" draggable :title="title" width="1000">
+            <el-descriptions :column="2" border>
+                <el-descriptions-item label="用户名称">
+                    {{ list.userName }}
+                </el-descriptions-item>
+                <el-descriptions-item label="用户编号">
+                    {{ list.userNumber }}
+                </el-descriptions-item>
+                <el-descriptions-item label="负责单位">
+                    {{ list.dutyOrgName }}
+                </el-descriptions-item>
+                <el-descriptions-item label="稳态指标">
+                    {{ list.steadyIndicator }}
+                </el-descriptions-item>
+                <el-descriptions-item label="暂态指标">
+                    {{ list.transientIndicators }}
+                </el-descriptions-item>
+                <el-descriptions-item label="监测点名称">
+                    {{ list.monitorName || '/' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="是否实现监测">
+                    <el-tag :type='list.detectionFlag == 0 ? "warning" : "primary"'>{{ list.detectionFlag == 0 ? "否" :
+                        "是" }}</el-tag>
+
+
+
+
+                </el-descriptions-item>
+                <el-descriptions-item label="填报人">
+                    {{ dictData.state.userList.filter(item => item.id == list.createBy)[0]?.name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="投诉内容">
+                    {{ list.complaintText }}
+                </el-descriptions-item>
+                <el-descriptions-item label="整改意见">
+                    {{ list.reformAdvice }}
+                </el-descriptions-item>
+                <el-descriptions-item label="采取的措施">
+                    {{ list.takeStep }}
+                </el-descriptions-item>
+                <el-descriptions-item :span="1" label="处理成效报告">
+                <el-icon class="elView " v-if="list?.reportName" >
+                    <View @click="openFile(list?.reportName)" />
+                </el-icon>
+                <a :href="list.reportPath" target="_blank">{{ list.reportName }}</a>
+            </el-descriptions-item>
+
+
+            </el-descriptions>
+
+        </el-dialog>
+    </div>
+</template>
+<script setup lang='ts'>
+import { ref, reactive } from 'vue'
+import {  View } from '@element-plus/icons-vue'
+import { useDictData } from '@/stores/dictData'
+import { getFileNameAndFilePath } from '@/api/system-boot/file'
+const dialogVisible = ref(false)
+const title = ref('')
+const dictData = useDictData()
+const list: any = ref({})
+const open = (row: any) => {
+    list.value={}
+    title.value = row.title
+    dialogVisible.value = true
+    list.value = JSON.parse(JSON.stringify(row.row))
+     getFileNameAndFilePath({ filePath: row.row.reportPath }).then(res => {
+        list.value.reportPath = res.data.url
+        list.value.reportName = res.data.fileName
+    })
+}
+const openFile = (name: any) => {
+    window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+.elView {
+    cursor: pointer;
+    margin-right: 10px;
+}</style>
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue b/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue
index 571aaa05..d0816c56 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue
@@ -3,42 +3,55 @@
   <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
     <template v-slot:select>
       <el-form-item label="计划名称">
-        <el-input
-            style="width: 200px"
-            v-model="tableStore.table.params.searchValue"
-            clearable
-            placeholder="请输入计划名称"
-        ></el-input>
+        <el-input style="width: 200px" v-model="tableStore.table.params.searchValue" clearable
+          placeholder="请输入计划名称"></el-input>
+      </el-form-item>
+      <el-form-item label="是否解决">
+        <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
+          <el-option v-for="item in dealStateList" :key="item.value" :label="item.label"
+            :value="item.value"></el-option>
+        </el-select>
       </el-form-item>
     </template>
   </TableHeader>
-  <Table ref="tableRef"/>
-  <testQuestionsForm ref="testQuestionsFormRef"/>
+  <Table ref="tableRef" />
+  <testQuestionsForm ref="testQuestionsFormRef" />
   <!-- 详情 -->
   <el-dialog draggable v-model="dialogVisible" v-if="dialogVisible" title="详情" width="1000">
-    <detail :id="detailId" :flag="false"/>
+    <detail :id="detailId" :flag="flag" />
   </el-dialog>
 </template>
 <script setup lang="ts">
-import {ref, onMounted, provide, nextTick} from 'vue'
+import { ref, onMounted, provide, nextTick } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import testQuestionsForm from './form/testQuestionsForm.vue'
-import {initiateWarningLeaflet} from '@/api/supervision-boot/survey/test'
-import {ElMessage, ElMessageBox} from 'element-plus'
-import {useRouter} from 'vue-router'
-import {useDictData} from '@/stores/dictData'
+import { initiateWarningLeaflet } from '@/api/supervision-boot/survey/test'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { useDictData } from '@/stores/dictData'
 import detail from '@/views/pqs/supervise/harmonicSurvey/test/detail.vue'
 
 const dictData = useDictData()
-const {push} = useRouter()
+const { push } = useRouter()
 const router = useRouter() // 路由对象
 const tableRef = ref()
+const flag = ref(false)
 const TableHeaderRef = ref()
 const dialogVisible = ref(false)
 const detailId = ref('')
 const testQuestionsFormRef = ref()
+const dealStateList = ref([
+  {
+    label: '未解决',
+    value: '0'
+  },
+  {
+    label: '全部',
+    value: '1'
+  }
+])
 const tableStore = new TableStore({
   url: '/supervision-boot/surveyTest/pageProblemSurvey',
   publicHeight: 65,
@@ -53,13 +66,13 @@ const tableStore = new TableStore({
         return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
       }
     },
-    {field: 'planName', title: '计划名称', minWidth: 120},
-    {field: 'deptName', title: '负责单位', minWidth: 120},
-    {field: 'substationName', title: '变电站', minWidth: 120},
-    {field: 'planStartTime', title: '计划开始时间', minWidth: 100},
-    {field: 'planEndTime', title: '计划结束时间', minWidth: 100},
-    {field: 'completeTime', title: '实际完成时间', minWidth: 100},
-    {field: 'completeBy', title: '测试负责人', minWidth: 120},
+    { field: 'planName', title: '计划名称', minWidth: 120 },
+    { field: 'deptName', title: '负责单位', minWidth: 120 },
+    { field: 'substationName', title: '变电站', minWidth: 120 },
+    { field: 'planStartTime', title: '计划开始时间', minWidth: 100 },
+    { field: 'planEndTime', title: '计划结束时间', minWidth: 100 },
+    { field: 'completeTime', title: '实际完成时间', minWidth: 100 },
+    { field: 'completeBy', title: '测试负责人', minWidth: 120 },
     {
       field: 'createBy',
       title: '填报人',
@@ -68,6 +81,22 @@ const tableStore = new TableStore({
         return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
       }
     },
+    {
+      field: 'dealState',
+      title: '是否解决',
+      minWidth: 100,
+      render: 'tag',
+      custom: {
+        0: 'warning',
+        1: 'primary',
+
+      },
+      replaceValue: {
+        0: '未解决',
+        1: '已解决',
+
+      }
+    },
     {
       title: '操作',
       minWidth: '180',
@@ -83,6 +112,7 @@ const tableStore = new TableStore({
           render: 'basicButton',
 
           click: async row => {
+            flag.value = row.dealState == 1 ? true : false
             dialogVisible.value = true
             detailId.value = row.id
           }
@@ -94,11 +124,11 @@ const tableStore = new TableStore({
           icon: 'el-icon-Open',
           render: 'basicButton',
           disabled: row => {
-            return row.initiateWarningFlag == 1
+            return row.dealState != 0
           },
 
           click: async row => {
-            const {value} = await ElMessageBox.prompt('', '整改意见', {
+            const { value } = await ElMessageBox.prompt('', '整改意见', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
 
@@ -106,7 +136,7 @@ const tableStore = new TableStore({
               inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
               inputErrorMessage: '请输入整改意见'
             })
-            initiateWarningLeaflet({id: row.id, reformAdvice: value}).then(res => {
+            initiateWarningLeaflet({ id: row.id, reformAdvice: value }).then(res => {
               ElMessage.success('发起告警成功！')
               tableStore.index()
             })
@@ -138,6 +168,7 @@ const tableStore = new TableStore({
     tableStore.table.params.currentPage = tableStore.table.params.pageNum
   }
 })
+tableStore.table.params.dealState = ''
 tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
 
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue b/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue
index f6d4474e..1a7082b9 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue
@@ -5,51 +5,69 @@
       <template #select>
         <el-form-item label="流程状态">
           <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
-            <el-option
-                v-for="item in statusSelect"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-            ></el-option>
+            <el-option v-for="item in statusSelect" :key="item.id" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否解决">
+          <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
+            <el-option v-for="item in dealStateList" :key="item.value" :label="item.label"
+              :value="item.value"></el-option>
           </el-select>
         </el-form-item>
       </template>
     </TableHeader>
-    <Table ref="tableRef" :checkbox-config="checkboxConfig"/>
+    <Table ref="tableRef" :checkbox-config="checkboxConfig" />
+    <!-- 详情 -->
+    <detail ref="detailRef" />
   </div>
 </template>
 <script setup lang="ts">
-import {ref, onMounted, provide, reactive} from 'vue'
+import { ref, onMounted, provide, reactive } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
-import {useRouter} from 'vue-router'
-import {useDictData} from '@/stores/dictData'
-import {ElMessage, ElMessageBox} from 'element-plus'
-import {addRunTest, initiateWarningLeaflet} from '@/api/supervision-boot/lineRunTest'
-import {formatDate} from '@/utils/formatTime'
-import {VxeTablePropTypes} from 'vxe-table'
-import {useAdminInfo} from '@/stores/adminInfo'
-import {getFileNameAndFilePath} from '@/api/system-boot/file'
+import { useRouter } from 'vue-router'
+import { useDictData } from '@/stores/dictData'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { addRunTest, initiateWarningLeaflet } from '@/api/supervision-boot/lineRunTest'
+import { formatDate } from '@/utils/formatTime'
+import { VxeTablePropTypes } from 'vxe-table'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { getFileNameAndFilePath } from '@/api/system-boot/file'
+import detail from './testRunDetail.vue'
 
 const dictData = useDictData()
 const statusSelect = dictData.statusSelect()
-const {push} = useRouter()
+const { push } = useRouter()
 const adminInfo = useAdminInfo()
 const TableHeaderRef = ref()
 const tableRef = ref()
-
+const detailRef = ref()
+const dealStateList = ref([
+  {
+    label: '未解决',
+    value: '0'
+  },
+  {
+    label: '全部',
+    value: '1'
+  }
+])
 const tableStore = new TableStore({
   url: '/supervision-boot/lineRunTestProblem/pageProblem',
   method: 'POST',
   publicHeight: 65,
   column: [
-    {field: 'lineName', title: '监测点名称', minWidth: 160},
-    {field: 'connectedBus', title: '接入母线', minWidth: 160},
+    { field: 'lineName', title: '监测点名称', minWidth: 160 },
+    { field: 'connectedBus', title: '接入母线', minWidth: 160 },
     // { field: 'monitoringTerminalCode', title: '终端编号', minWidth: 140 },
-    {field: 'monitoringTerminalName', title: '终端名称', minWidth: 140},
-    {field: 'powerSubstationName', title: '变电站', minWidth: 160},
-    {field: 'reason', title: '调试原因', minWidth: 160},
+    { field: 'monitoringTerminalName', title: '终端名称', minWidth: 140, },
+    {
+      field: 'powerSubstationName', title: '变电站', minWidth: 160, formatter: row => {
+        return row.cellValue ? row.cellValue : '/'
+      }
+    },
+    { field: 'reason', title: '调试原因', minWidth: 160 },
 
     {
       field: 'testRunState',
@@ -78,7 +96,7 @@ const tableStore = new TableStore({
         return row.cellValue ? row.cellValue : '/'
       }
     },
-    {field: 'problemReason', title: '试运行评估问题', minWidth: 200},
+    { field: 'problemReason', title: '试运行评估问题', minWidth: 200 },
     {
       field: 'createBy',
       title: '填报人',
@@ -87,6 +105,22 @@ const tableStore = new TableStore({
         return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
       }
     },
+    {
+      field: 'dealState',
+      title: '是否解决',
+      minWidth: 100,
+      render: 'tag',
+      custom: {
+        0: 'warning',
+        1: 'primary',
+
+      },
+      replaceValue: {
+        0: '未解决',
+        1: '已解决',
+
+      }
+    },
     {
       title: '操作',
       minWidth: 230,
@@ -127,11 +161,11 @@ const tableStore = new TableStore({
           icon: 'el-icon-Open',
           render: 'basicButton',
           disabled: row => {
-            return row.problemType != null
+            return row.dealState != 0
           },
 
           click: async row => {
-            const {value} = await ElMessageBox.prompt('', '整改意见', {
+            const { value } = await ElMessageBox.prompt('', '整改意见', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
 
@@ -151,6 +185,25 @@ const tableStore = new TableStore({
             })
           }
         },
+        {
+          name: 'edit',
+          title: '告警单详情',
+          type: 'primary',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.dealState == 0
+          },
+
+          click: row => {
+            detailRef.value.open({
+              row: row,
+              title: '告警单详情',
+
+            })
+
+          }
+        },
         {
           name: 'edit',
           title: '查看告警单',
@@ -181,7 +234,7 @@ const tableStore = new TableStore({
   }
 })
 tableStore.table.params.status = ''
-
+tableStore.table.params.dealState = ''
 provide('tableStore', tableStore)
 
 onMounted(() => {
@@ -189,7 +242,7 @@ onMounted(() => {
 })
 const checkboxConfig = reactive<VxeTablePropTypes.CheckboxConfig>({
   labelField: '',
-  checkMethod: ({row}) => {
+  checkMethod: ({ row }) => {
     return !(row.testRunState == 1 || row.testRunState == 2)
   }
 })
@@ -206,7 +259,7 @@ const handleAudit = (instanceId: any, historyInstanceId: any) => {
 
 // 下载报告
 const downloadTheReport = (url: string) => {
-  getFileNameAndFilePath({filePath: url}).then((res: any) => {
+  getFileNameAndFilePath({ filePath: url }).then((res: any) => {
     const link = document.createElement('a')
     link.href = res.data.url
     link.download = res.data.name
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/testRunDetail.vue b/src/views/pqs/supervise/electricalEnergy/components1/testRunDetail.vue
new file mode 100644
index 00000000..937f4c88
--- /dev/null
+++ b/src/views/pqs/supervise/electricalEnergy/components1/testRunDetail.vue
@@ -0,0 +1,89 @@
+<template>
+    <div>
+        <el-dialog v-model="dialogVisible" draggable :title="title" width="1000">
+            <el-descriptions :column="2" border>
+                <el-descriptions-item label="监测点名称">
+                    {{ list.lineName }}
+                </el-descriptions-item>
+                <el-descriptions-item label="接入母线">
+                    {{ list.connectedBus }}
+                </el-descriptions-item>
+                <el-descriptions-item label="终端名称">
+                    {{ list.monitoringTerminalName }}
+                </el-descriptions-item>
+                <el-descriptions-item label="变电站">
+                    {{ list.powerSubstationName ||'/'}}
+                </el-descriptions-item>
+                <el-descriptions-item label="调试原因">
+                    {{ list.reason }}
+                </el-descriptions-item>
+
+                <el-descriptions-item label="试运行状态">
+                    <el-tag
+                        :type='list.testRunState == 0 ? "primary" : list.testRunState == 1 ? "warning" : list.testRunState == 2 ? "success" : list.testRunState == 3 ? "danger" : "primary"'>{{
+                            list.testRunState == 0 ? "待试运行" : list.testRunState == 1 ? "试运行中" : list.testRunState == 2
+                                ? "试运行成功" : list.testRunState == 3 ? "试运行失败" : "待试运行" }}</el-tag>
+
+
+
+
+                </el-descriptions-item>
+                <el-descriptions-item label="试运行时间范围">
+                    {{ list.testRunTime ||'/' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="试运行评估问题">
+                    {{ list.problemReason ||'/' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="填报人">
+                    {{ dictData.state.userList.filter(item => item.id == list.createBy)[0]?.name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="整改意见">
+                    {{ list.reformAdvice }}
+                </el-descriptions-item>
+                <el-descriptions-item label="采取的措施">
+                    {{ list.takeStep }}
+                </el-descriptions-item>
+                <el-descriptions-item :span="2" label="处理成效报告">
+                    <el-icon class="elView " v-if="list?.reportName">
+                        <View @click="openFile(list?.reportName)" />
+                    </el-icon>
+                    <a :href="list.reportPath" target="_blank">{{ list.reportName }}</a>
+                </el-descriptions-item>
+
+
+            </el-descriptions>
+
+        </el-dialog>
+    </div>
+</template>
+<script setup lang='ts'>
+import { ref, reactive } from 'vue'
+import { View } from '@element-plus/icons-vue'
+import { getFileNameAndFilePath } from '@/api/system-boot/file'
+import { useDictData } from '@/stores/dictData'
+const dialogVisible = ref(false)
+const title = ref('')
+const list: any = ref({})
+const dictData = useDictData()
+const open = (row: any) => {
+    list.value = {}
+    title.value = row.title
+    dialogVisible.value = true
+    list.value = JSON.parse(JSON.stringify(row.row))
+    getFileNameAndFilePath({ filePath: row.row.reportPath }).then(res => {
+        list.value.reportPath = res.data.url
+        list.value.reportName = res.data.fileName
+    })
+}
+const openFile = (name: any) => {
+    window.open(window.location.origin + '/#/previewFile?/supervision/' + name)
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+.elView {
+    cursor: pointer;
+    margin-right: 10px;
+}
+</style>
diff --git a/src/views/pqs/supervise/harmonicSurvey/test/detail.vue b/src/views/pqs/supervise/harmonicSurvey/test/detail.vue
index 922ec3be..967126a4 100644
--- a/src/views/pqs/supervise/harmonicSurvey/test/detail.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/test/detail.vue
@@ -46,6 +46,14 @@
             <el-descriptions-item v-if="detailData?.problemFlag == 1" :span="2" label="问题描述">
                 {{ detailData?.problemDetail }}
             </el-descriptions-item>
+            <el-descriptions-item :span="2" label="整改意见" v-if="props.flag">
+                {{ detailData.reformAdvice }}
+            </el-descriptions-item>
+            <el-descriptions-item :span="2" label="采取的措施" v-if="props.flag">
+                {{ detailData.takeStep }}
+            </el-descriptions-item>
+
+
 
             <el-descriptions-item :span="2" label="技术监督报告">
                 <el-icon class="elView" v-if="detailData?.supervisionReportName">
@@ -67,7 +75,12 @@
                     <a :href="item.url" target="_blank">{{ item.fileName }}</a>
                 </div>
             </el-descriptions-item>
-
+            <el-descriptions-item :span="2" label="处理成效报告" v-if="props.flag">
+                <el-icon class="elView " v-if="detailData?.reportName">
+                    <View @click="openFile(detailData?.reportName)" />
+                </el-icon>
+                <a :href="detailData.reportPath" target="_blank">{{ detailData.reportName }}</a>
+            </el-descriptions-item>
             <!-- <el-descriptions-item label="流程状态" >
                 <el-tag :type="getDeviceStatusType(detailData?.status)">
                     {{ getDeviceStatus(detailData?.status) }}
@@ -92,7 +105,8 @@ const openFile = (name: any) => {
 }
 const { query } = useRoute() // 查询参数
 const props = defineProps({
-    id: propTypes.string.def(undefined)
+    id: propTypes.string.def(undefined),
+    flag: propTypes.bool.def(false)
 })
 const detailLoading = ref(false) // 表单的加载中
 const detailData: any = ref({}) // 详情数据
@@ -132,6 +146,12 @@ const getFileData = async () => {
         detailData.value.supervisionReport = res.data.url
         detailData.value.supervisionReportName = res.data.fileName
     })
+    if (props.flag) {
+        getFileNameAndFilePath({ filePath: detailData.value.reportPath }).then(res => {
+            detailData.value.reportPath = res.data.url
+            detailData.value.reportName = res.data.fileName
+        })
+    }
 }
 
 const getProblemFlagDetail = (status: number) => {
diff --git a/src/views/pqs/supervise/technology/components/alarm.vue b/src/views/pqs/supervise/technology/components/alarm.vue
index 5f97cd2b..f0cd7628 100644
--- a/src/views/pqs/supervise/technology/components/alarm.vue
+++ b/src/views/pqs/supervise/technology/components/alarm.vue
@@ -260,17 +260,17 @@ const tableStore = new TableStore({
                         detailId.value = row.problemId
                     }
                 },
-                {
-                    name: 'productSetting',
-                    title: '发送督办单',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        // handleAudit(row.processInstanceId)
-                        ElMessage.warning('待打通生成管理系统接口！')
-                    }
-                },
+                // {
+                //     name: 'productSetting',
+                //     title: '发送督办单',
+                //     type: 'primary',
+                //     icon: 'el-icon-EditPen',
+                //     render: 'basicButton',
+                //     click: row => {
+                //         // handleAudit(row.processInstanceId)
+                //         ElMessage.warning('待打通生成管理系统接口！')
+                //     }
+                // },
                 {
                     name: 'productSetting',
                     title: '问题反馈',
diff --git a/src/views/pqs/supervise/technology/components/earlyWarn.vue b/src/views/pqs/supervise/technology/components/earlyWarn.vue
index aa0f73ca..323f9cfb 100644
--- a/src/views/pqs/supervise/technology/components/earlyWarn.vue
+++ b/src/views/pqs/supervise/technology/components/earlyWarn.vue
@@ -144,17 +144,17 @@ const tableStore = new TableStore({
                         window.open(row.filePath)
                     }
                 },
-                {
-                    name: 'productSetting',
-                    title: '发送督办单',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        // handleAudit(row.processInstanceId)
-                        ElMessage.warning('待打通生成管理系统接口！')
-                    }
-                },
+                // {
+                //     name: 'productSetting',
+                //     title: '发送督办单',
+                //     type: 'primary',
+                //     icon: 'el-icon-EditPen',
+                //     render: 'basicButton',
+                //     click: row => {
+                //         // handleAudit(row.processInstanceId)
+                //         ElMessage.warning('待打通生成管理系统接口！')
+                //     }
+                // },
                 {
                     name: 'productSetting',
                     title: '问题反馈',
diff --git a/src/views/pqs/supervise/technology/detail.vue b/src/views/pqs/supervise/technology/detail.vue
index f90fab94..34860ace 100644
--- a/src/views/pqs/supervise/technology/detail.vue
+++ b/src/views/pqs/supervise/technology/detail.vue
@@ -20,6 +20,9 @@
                     <a :href="detailData.problemPath" target="_blank">{{ detailData.problemName }}</a>
                 </el-descriptions-item>
             </template>
+            <el-descriptions-item :span="2" label="整改意见">
+                {{ detailData.reformAdvice }}
+            </el-descriptions-item>
             <el-descriptions-item :span="2" label="采取措施">
                 {{ detailData.takeStep }}
             </el-descriptions-item>
diff --git a/src/views/system/bpm/task/alarmTask/index.vue b/src/views/system/bpm/task/alarmTask/index.vue
index c2dfc7c5..5cb2eb3a 100644
--- a/src/views/system/bpm/task/alarmTask/index.vue
+++ b/src/views/system/bpm/task/alarmTask/index.vue
@@ -120,17 +120,17 @@ const tableStore = new TableStore({
             render: 'buttons',
             fixed: 'right',
             buttons: [
-                {
-                    name: 'productSetting',
-                    title: '发送督办单',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        // handleAudit(row.processInstanceId)
-                        ElMessage.warning('待打通生成管理系统接口！')
-                    }
-                },
+                // {
+                //     name: 'productSetting',
+                //     title: '发送督办单',
+                //     type: 'primary',
+                //     icon: 'el-icon-EditPen',
+                //     render: 'basicButton',
+                //     click: row => {
+                //         // handleAudit(row.processInstanceId)
+                //         ElMessage.warning('待打通生成管理系统接口！')
+                //     }
+                // },
                 {
                     name: 'productSetting',
                     title: '问题反馈',