冀北需求变更整改

src/components/echarts/rmsboxi.vue

@@ -850,7 +850,7 @@ export default {
           unit = "A";
         }
         //把剩余的DIV先拼接好
-        for (let step = 1; step < waveDatas.length; step++) {
+        for (var step = waveDatas.length - 1; 0 < step && step < waveDatas.length; step--) {
           let rmsId = "rms" + step;
           let newDivRms = $(
             ` <div style="height:${this.vh

src/components/echarts/shushiboxi.vue

@@ -518,7 +518,7 @@ export default {
                     unit = 'A'
                 }
                 //把剩余的DIV先拼接好
-                for (let step = 1; step < waveDatas.length; step++) {
+                for (var step = waveDatas.length - 1; 0 < step && step < waveDatas.length; step--) {
                     let waveId = 'wave' + step
                     let newDivShunshi = $(` <div style="height:${this.vh};overflow: hidden;">
                                         <div class='bx1' id='${waveId}'>

src/components/form/area/index.vue

@@ -22,7 +22,6 @@ const options:any = dictData.state.area
 const areaName = ref(dictData.state.area[0].name)
 const jbName = ref(dictData.state.area[0].name)
 const change = (e: any) => {
-    console.log("🚀 ~ change ~ cascader.value.getCheckedNodes()[0]?.pathLabels.length:", cascader.value.getCheckedNodes()[0]?.pathLabels.length)
 
     if (cascader.value.getCheckedNodes()[0]?.pathLabels.length == 1) {
         areaName.value = cascader.value.getCheckedNodes()[0].pathLabels[0]

src/components/table/header/index.vue

@@ -3,8 +3,14 @@
         <div class="table-header ba-scroll-style">
             <el-form style="flex: 1; height: 34px; margin-right: 20px; display: flex; flex-wrap: wrap" ref="headerForm"
                 @submit.prevent="" @keyup.enter="onComSearch" label-position="left" :inline="true">
-                <el-form-item label="日期" v-if="datePicker" style="grid-column: span 2; max-width: 570px">
+
-                    <DatePicker ref="datePickerRef" :nextFlag="nextFlag" :theCurrentTime="theCurrentTime"></DatePicker>
+                <el-form-item v-if="datePicker" style="grid-column: span 2; max-width: 590px">
+                    <template #label>
+                        <el-checkbox v-if="showTimeAll" v-model="timeAll" label="时间" />
+                        <span v-else>时间</span>
+                    </template>
+                    <DatePicker ref="datePickerRef" v-if="timeAll" :nextFlag="nextFlag"
+                        :theCurrentTime="theCurrentTime"></DatePicker>
                 </el-form-item>
 
                 <el-form-item label="区域" v-if="area">
@@ -19,11 +25,11 @@
                 </el-button>
                 <el-button @click="onComSearch" v-if="showSearch" :loading="tableStore.table.loading" type="primary"
                     :icon="Search">查询</el-button>
-                <el-button @click="onResetForm" v-if="showSearch  && showReset" :loading="tableStore.table.loading"
+                <el-button @click="onResetForm" v-if="showSearch && showReset" :loading="tableStore.table.loading"
                     :icon="RefreshLeft">重置</el-button>
-                    <el-button @click="onExport" v-if="showExport" :loading="tableStore.table.loading" type="primary"
+                <el-button @click="onExport" v-if="showExport" :loading="tableStore.table.loading" type="primary"
                     icon="el-icon-Download">导出</el-button>
-               
+
             </template>
             <slot name="operation"></slot>
         </div>
@@ -34,7 +40,7 @@
 </template>
 
 <script setup lang="ts">
-import { inject, ref, onMounted, nextTick, onUnmounted,watch } from 'vue'
+import { inject, ref, onMounted, nextTick, onUnmounted, watch } from 'vue'
 import type TableStore from '@/utils/tableStore'
 import DatePicker from '@/components/form/datePicker/index.vue'
 import Area from '@/components/form/area/index.vue'
@@ -50,7 +56,7 @@ const dictData = useDictData()
 const areaRef = ref()
 const headerForm = ref()
 const headerFormSecond = ref()
-
+const timeAll = ref(true)
 interface Props {
     datePicker?: boolean
     area?: boolean
@@ -59,6 +65,7 @@ interface Props {
     theCurrentTime?: boolean //控制时间前3天展示上个月时间
     showReset?: boolean //控制时间前3天展示上个月时间
     showExport?: boolean //导出控制
+    showTimeAll?: boolean //控制时间是否显示
 
 }
 
@@ -69,7 +76,9 @@ const props = withDefaults(defineProps<Props>(), {
     nextFlag: false,
     theCurrentTime: false,
     showReset: true,
-    showExport:false
+    showExport: false,
+    showTimeAll: false
+
 })
 // 动态计算table高度
 const resizeObserver = new ResizeObserver(entries => {
@@ -89,6 +98,7 @@ const headerFormSecondStyleClose = {
     height: '0',
     padding: '0'
 }
+
 watch(
     () => tableStore.table.params.deptIndex,
     (newVal) => {
@@ -97,8 +107,19 @@ watch(
         }, 0);
     }
 )
+watch(
+    () => timeAll.value,
+    (newVal) => {
+        tableStore.timeAll = newVal
+     setTimeout(() => {
+        computedSearchRow()
+     },500)
+
+    }
+)
 onMounted(() => {
-    if (props.datePicker) {
+    timeAll.value = props.showTimeAll ? false : true
+    if (props.datePicker && timeAll.value) {
         tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0]
         tableStore.table.params.searchEndTime = datePickerRef.value.timeValue[1]
         tableStore.table.params.startTime = datePickerRef.value.timeValue[0]
@@ -123,30 +144,34 @@ const handlerHeight = () => {
     ).height as string
 }
 const computedSearchRow = () => {
-    if (!headerForm.value.$el) return
 
-    // 清空headerFormSecond.value.$el下的元素
+if (!headerForm.value.$el) return
-    while (headerFormSecond.value.$el.firstChild) {
-        headerForm.value.$el.appendChild(headerFormSecond.value.$el.firstChild)
-    }
 
-    // 获取第一行放了几个表单
-    const elFormItem = headerForm.value.$el.querySelectorAll('.el-form-item')
-    //  把第一行放不下的复制一份放到headerFormSecond.value.$el
-    let width = 0
-    for (let i = 0; i < elFormItem.length; i++) {
-        width += elFormItem[i].offsetWidth + 32
-        if (width > headerForm.value.$el.offsetWidth) {
-            headerFormSecond.value.$el.appendChild(elFormItem[i])
-        }
-    }
 
-    // 判断是否需要折叠
+// 清空headerFormSecond.value.$el下的元素
-    if (headerFormSecond.value.$el.scrollHeight > 0) {
+while (headerFormSecond.value.$el.firstChild) {
-        showUnfoldButton.value = true
+    headerForm.value.$el.appendChild(headerFormSecond.value.$el.firstChild)
-    } else {
+}
-        showUnfoldButton.value = false
+
+// 获取第一行放了几个表单
+const elFormItem = headerForm.value.$el.querySelectorAll('.el-form-item')
+
+//  把第一行放不下的复制一份放到headerFormSecond.value.$el
+let width = 0
+for (let i = 0; i < elFormItem.length; i++) {
+    width += elFormItem[i].offsetWidth + 32
+    if (width > headerForm.value.$el.offsetWidth) {
+        headerFormSecond.value.$el.appendChild(elFormItem[i])
     }
+      
+}
+
+// 判断是否需要折叠
+if (headerFormSecond.value.$el.scrollHeight > 0) {
+    showUnfoldButton.value = true
+} else {
+    showUnfoldButton.value = false
+}
 }
 
 const showSelect = ref(false)
@@ -154,7 +179,7 @@ const showSelectChange = () => {
     showSelect.value = !showSelect.value
 }
 const onComSearch = async () => {
-    if (props.datePicker) {
+    if (props.datePicker && timeAll.value) {
         tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0]
         tableStore.table.params.searchEndTime = datePickerRef.value.timeValue[1]
         tableStore.table.params.startTime = datePickerRef.value.timeValue[0]
@@ -177,7 +202,7 @@ const setTheDate = (val: any) => {
 }
 // 导出
 const onExport = () => {
-    tableStore.onTableAction('export', {showAllFlag:true})
+    tableStore.onTableAction('export', { showAllFlag: true })
 }
 
 defineExpose({ onComSearch, areaRef, setDatePicker, setTheDate, datePickerRef, showSelectChange })

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

@@ -12,7 +12,7 @@
             {{ item.meta.title }}
             <transition @after-leave="selectNavTab(tabsRefs[navTabs.state.activeIndex])" name="el-fade-in">
                 <Icon
-                    v-show="navTabs.state.tabsView.length > 1"
+                    v-if="navTabs.state.tabsView.length > 1"
                     class="close-icon"
                     @click.stop="closeTab(item)"
                     size="15"

src/layouts/common/components/loading.vue

@@ -5,8 +5,9 @@
             element-loading-background="var(--ba-bg-color-overlay)"
             element-loading-text="加载中"
             class="default-main ba-main-loading"
+                   :style="{ height:'calc(100vh - 170px)'}"
         ></div>
-        <div v-if="state.showReload" class="loading-footer">
+        <div v-if="state.showReload" class="loading-footer mt10">
             <el-button @click="refresh" type="warning">重新加载</el-button>
         </div>
     </div>

src/main.ts

@@ -35,10 +35,10 @@ const setupAll = async () => {
     const app = createApp(App)
 
     //开启离线地图
-    app.use(BaiduMapOffline, {
+    // app.use(BaiduMapOffline, {
-        offline: true,
+    //     offline: true,
-        // offlineUrl:'http://sjzx:8088/map/' //window.location.origin + '/map/'
+    //     // offlineUrl:'http://sjzx:8088/map/' //window.location.origin + '/map/'
-    })
+    // })
     app.use(BaiduMap, {
         // ak: 'Yp57V71dkOPiXjiN8VdcFRsVELzlVNKK',
         ak: 'RpQi6WNFZ9tseKzhdwOQsXwFsoVntnsN',

src/utils/request.ts

@@ -148,7 +148,7 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                         })
                     })
                 }
-            } else if (response.data.code == 'A0024') {
+            } else if (response.data.code == 'A0024'||response.data.code == 'null') {
                 // // 登录失效
                 ElNotification({
                     type: 'error',

src/utils/tableStore.ts

@@ -13,6 +13,7 @@ interface TableStoreParams {
     method?: Method // 请求方式
     isWebPaging?: boolean // 是否前端分页
     showPage?: boolean //是否需要分页
+    timeAll?: boolean //是否需要时间全部显示
     paramsPOST?: boolean // post请求 params传参
     publicHeight?: number //计算高度
     resetCallback?: () => void // 重置
@@ -28,6 +29,7 @@ export default class TableStore {
     public isWebPaging = false
     public paramsPOST = true
     public showPage = true
+    public timeAll = true
     public table: CnTable = reactive({
         ref: null,
         selection: [],
@@ -57,6 +59,7 @@ export default class TableStore {
         this.method = options.method || 'GET'
         this.table.column = options.column
         this.showPage = options.showPage !== false
+       
         this.table.publicHeight = options.publicHeight || 0
         this.table.resetCallback = options.resetCallback || null
         this.table.loadCallback = options.loadCallback || null
@@ -72,6 +75,15 @@ export default class TableStore {
         // 重置用的数据数据
         if (!this.initData) {
             this.initData = JSON.parse(JSON.stringify(this.table.params))
+        }
+        if (!this.timeAll) {
+            delete this.table.params.startTime;
+            delete this.table.params.endTime;
+            delete this.table.params.searchBeginTime;
+            delete this.table.params.searchEndTime;
+            delete this.table.params.timeFlag;
+
+      
         }
         createAxios(
             Object.assign(

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

@@ -1,26 +1,28 @@
 <template>
-    <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" :title="title" width="700px">
+    <el-dialog draggable class="cn-operate-dialog" v-model="dialogVisible" :title="title" width="500px">
         <el-scrollbar>
-            <el-form :inline="false" :model="form" label-width="auto" :rules="rules" ref="formRef">
+            <el-form :inline="false" :model="form" label-width="auto" class="form-one" :rules="rules" ref="formRef">
-                <el-form-item label="上级名称">
+                <el-form-item label="上级名称" v-if="title == '新增'">
-                    <!-- <el-input v-model="form.pid" placeholder="上级名称" /> -->
+
-                    <!-- <el-tree-select
-                        v-model="form.pid"
-                        :data="dataTree"
-                        check-strictly
-                        clearable
-                        :render-after-expand="false"
-                        :props="defaultProps"
-                    /> -->
                     <el-select v-model="form.pid" placeholder="请选择上级名称" clearable>
                         <el-option v-for="item in dataTree" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
+                <el-form-item label="选择修改" v-if="title == '修改'">
+                    <el-cascader v-model="cascaderId" :options="dataTree" placeholder="请选择需要修改的内容" filterable
+                        checkStrictly :props="cascaderProps" @change="change" />
+                </el-form-item>
                 <el-form-item label="名称" prop="name">
                     <el-input v-model="form.name" placeholder="名称" />
                 </el-form-item>
 
-                <el-form-item label="标准" v-if="form.pid?.length > 0">
+                <el-form-item label="标准" v-if="title == '新增' && form.pid?.length > 0">
+                    <el-upload v-model:file-list="urlList" ref="upload" action="" :limit="1" :auto-upload="false"
+                        :on-exceed="handleExceed">
+                        <el-button type="primary">上传</el-button>
+                    </el-upload>
+                </el-form-item>
+                <el-form-item label="标准" v-if="title == '修改' && cascaderId.length > 1">
                     <el-upload v-model:file-list="urlList" ref="upload" action="" :limit="1" :auto-upload="false"
                         :on-exceed="handleExceed">
                         <el-button type="primary">上传</el-button>
@@ -51,17 +53,21 @@ const title = ref('')
 const emit = defineEmits(['getTree', 'onSubmit'])
 const formRef = ref()
 // 注意不要和表单ref的命名冲突
-const form = reactive<anyObj>({
+const form: any = reactive<anyObj>({
     name: '',
     pid: '',
     url: ''
 })
+const cascaderId = ref([])
 const urlList: any = ref([])
-const loading=ref(false)
+const loading = ref(false)
-const defaultProps = {
+const cascaderProps = {
     children: 'children',
     label: 'name',
-    value: 'id'
+    value: 'id',
+    checkStrictly: true,
+
+
 }
 const rules = {
     name: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }]
@@ -69,32 +75,33 @@ const rules = {
 const dataTree: any = ref([])
 const open = (text: string, data?: anyObj) => {
     getTheTree()
+    cascaderId.value = []
     title.value = text
     urlList.value = []
     dialogVisible.value = true
-    if (data) {
+    // if (data) {
-        // 表单赋值
+    //     // 表单赋值
-        for (let key in form) {
+    //     for (let key in form) {
-            form[key] = data[key]
+    //         form[key] = data[key]
-        }
+    //     }
-        form.id = data.id
+    //     form.id = data.id
-        if (form.pid == 0) {
+    //     if (form.pid == 0) {
-            form.pid = ''
+    //         form.pid = ''
-        }
+    //     }
-        if (data.url?.length > 0) {
+    //     if (data.url?.length > 0) {
-            getFileNameAndFilePath({ filePath: data.url }).then(res => {
+    //         getFileNameAndFilePath({ filePath: data.url }).then(res => {
-                urlList.value.push({
+    //             urlList.value.push({
-                    name: res.data.fileName,
+    //                 name: res.data.fileName,
-                    url: res.data.name
+    //                 url: res.data.name
-                })
+    //             })
-            })
+    //         })
-        }
+    //     }
-    } else {
+    // } else {
-        // 在此处恢复默认表单
+    // 在此处恢复默认表单
-        for (let key in form) {
+    for (let key in form) {
-            form[key] = ''
+        form[key] = ''
-        }
     }
+    // }
 }
 const handleExceed: UploadProps['onExceed'] = (files) => {
     upload.value!.clearFiles()
@@ -108,8 +115,45 @@ const getTheTree = () => {
         dataTree.value = res.data
     })
 }
-const submit = async() => {
+const change = (val: any) => {
-    loading.value=true
+    const selectedNode = findNodeById(dataTree.value, val[val.length - 1]);
+    urlList.value = []
+    if (val.length > 0) {
+
+        form.name = selectedNode.name
+        form.id = selectedNode.id
+        form.pid = selectedNode.pid
+        if (selectedNode.url?.length > 0) {
+            getFileNameAndFilePath({ filePath: selectedNode.url }).then(res => {
+                urlList.value.push({
+                    name: res.data.fileName,
+                    url: res.data.name
+                })
+            })
+        }
+    } else {
+        form.name = ''
+        form.id = ''
+        form.pid = ''
+        form.url = ''
+    }
+}
+const findNodeById = (tree: any[], id: any) => {
+    for (const node of tree) {
+        if (node.id === id) {
+            return node;
+        }
+        if (node.children) {
+            const found: any = findNodeById(node.children, id);
+            if (found) {
+                return found;
+            }
+        }
+    }
+    return null;
+};
+const submit = async () => {
+    loading.value = true
     formRef.value.validate(async (valid: boolean) => {
         if (valid) {
             if (urlList.value.length > 0 && form.pid != '') {
@@ -141,7 +185,7 @@ const submit = async() => {
             setTimeout(() => {
                 if (title.value == '新增') {
                     libstandardAdd({
-                        pid: form.pid == '' ? '' : form.pid,
+                        pid: form.pid == '' ? null : form.pid,
                         name: form.name,
                         url: form.url
                     }).then(res => {
@@ -151,7 +195,7 @@ const submit = async() => {
                     })
                 } else {
                     updateStandardLibrary({
-                        pid: form.pid == '' ? '' : form.pid,
+                        pid: form.pid == '' ? null : form.pid,
                         name: form.name,
                         url: form.url,
                         id: form.id
@@ -165,7 +209,7 @@ const submit = async() => {
         }
     })
     setTimeout(() => {
-        loading.value=false
+        loading.value = false
     }, 1000);
 }
 const handleClose = () => {

src/views/pqs/panorama/components/cityMapR.vue

@@ -262,6 +262,7 @@ const info = (row: any) => {
             },
 
             options: {
+                toolbox:null,
                 dataZoom: null,
                 series: optionData.series
             }
@@ -366,7 +367,7 @@ const info = (row: any) => {
             },
 
             options: {
-                // dataZoom: null,
+                toolbox:null,
                 series: [
                     {
                         name: '超标监测点数',
@@ -450,6 +451,7 @@ const info = (row: any) => {
             },
             color: [config.layout.elementUiPrimary[0], '#FFBF00', '#FF9100'],
             options: {
+                toolbox:null,
                 dataZoom: null,
                 series: [
                     {

src/views/pqs/panorama/components/details/stand.vue

@@ -40,23 +40,15 @@
                     <!-- <el-select v-model="contaminate" style="width: 120px; margin-right: 80px" @change="contaminateC">
                         <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select> -->
-                    <el-radio-group
+                    <el-radio-group v-model="contaminate" style="margin-right: 50px" @change="contaminateC"
-                        v-model="contaminate"
+                        size="small">
-                        style="margin-right: 50px"
-                        @change="contaminateC"
-                        size="small"
-                    >
                         <el-radio-button v-for="item in options" :label="item.id">{{ item.name }}</el-radio-button>
                     </el-radio-group>
                 </div>
 
                 <div class="pie">
-                    <MyEChart
+                    <MyEChart v-for="(item, i) in picEChart" :style="i == 3 ? `margin-left: 20%;` : ``" class="MyEChart"
-                        v-for="(item, i) in picEChart"
+                        :options="item" />
-                        :style="i == 3 ? `margin-left: 20%;` : ``"
-                        class="MyEChart"
-                        :options="item"
-                    />
                 </div>
             </el-col>
         </el-row>
@@ -185,7 +177,9 @@ const contaminateC = () => {
                 yAxis: {
                     show: false
                 },
+              
                 options: {
+                    toolbox:null,
                     dataZoom: null,
                     series: [
                         {
@@ -308,6 +302,7 @@ const analysis = (e: any) => {
             yAxis: {
                 name: '座'
             },
+     
 
             options: {
                 dataZoom: null,
@@ -350,28 +345,34 @@ defineExpose({ open })
 :deep(.el-select) {
     min-width: 80px;
 }
+
 .title {
     display: flex;
     justify-content: space-between;
     position: relative;
+
     span {
         font-weight: 550;
         font-size: 18px;
     }
+
     .WarningFilled {
         width: 16px;
         cursor: pointer;
     }
 }
+
 .pie {
     display: flex;
     flex-wrap: wrap;
+
     .MyEChart {
         height: 130px;
         width: 30%;
         margin-right: 3%;
     }
 }
+
 :deep(.el-dialog__body) {
     max-height: none !important;
 }

src/views/pqs/panorama/components/map.vue

@@ -35,10 +35,12 @@
                     </div>
                 </el-collapse-item>
             </el-collapse>
+
             <div v-if="QueryList.length > 0 && !showCollapse" class="collapse_none" style="color: #009ea8"
                 @click="showCollapse = true">
                 展开搜索结果
             </div>
+            <div class="collapse_none" style="color: red;cursor: pointer" @click="showWrap = false">关闭</div>
         </div>
         <baidu-map class="map" :style="height" @ready="initMap" @zoomend='syncCenterAndZoom' :center="center"
             :zoom="zoomMap" :scroll-wheel-zoom='true'>
@@ -53,7 +55,7 @@
                     @click='markerClick(path)'></bm-marker>
             </template>
             <!-- 点 -->
-            <BmlMarkerClusterer maxZoom='12'>
+            <BmlMarkerClusterer maxZoom='12' v-if='zoom > 9'>
                 <bm-marker :position='path' v-for='path in areaLineInfo' :key='path.lineId' :icon='path.icon'
                     @click='markerClick(path)' :zIndex="1">
 
@@ -111,7 +113,9 @@ import { ref, reactive, onMounted } from 'vue'
 import DatePicker from '@/components/form/datePicker/index.vue'
 import { useDictData } from '@/stores/dictData'
 import { Search } from '@element-plus/icons-vue'
+import { BaiduMap, BmBoundary, BmPolygon } from 'vue-baidu-map-3x'
 const emit = defineEmits(['changeValue', 'drop', 'show'])
+
 const datePickerRef = ref()
 const height = mainHeight(20)
 // 页面中直接引入就可以
@@ -124,7 +128,7 @@ const colorKey = ref('')
 const showCollapse: any = ref(true)
 const showWrap: any = ref(false)
 const deptIndex = ref(dictData.state.area[0].id)
-import { BaiduMap, BmBoundary, BmPolygon } from 'vue-baidu-map-3x'
+
 const boundaryList = ref([
     { name: '张家口市' },
     { name: '唐山市' },
@@ -263,7 +267,7 @@ const locatePositions = (e: any) => {
 }
 // 点击点
 const markerClick = (e: any) => {
-
+    showCollapse.value = false
     infoWindowPoint.value = e
     infoWindowPoint.value.show = true
 }
@@ -312,16 +316,21 @@ const flyTo = (e: any) => {
     center.value.lng = e.coordinate[0]
     center.value.lat = e.coordinate[1]
     zoomMap.value = 15
-    let data=areaLineInfo.value.filter((item: any) => regex.test(item.lineName))[0]
+    let data = areaLineInfo.value.filter((item: any) => regex.test(item.lineName))[0]
-    if(data){
+    if (data) {
         markerClick(data)
     }
-   
 
+
+}
+// 重置
+const reset = () => {
+    inputQuery.value = ''
+    showWrap.value = false
 }
 onMounted(() => {
 })
-defineExpose({ addMarkers, locatePositions })
+defineExpose({ addMarkers, locatePositions, reset })
 </script>
 <style lang="scss" scoped>
 @use '@/views/pqs/qualityInspeection/panorama/components/style/map.scss';
@@ -335,4 +344,8 @@ defineExpose({ addMarkers, locatePositions })
     z-index: 1;
 }
 
+:deep(.el-collapse-item__content) {
+    padding-bottom: 0px !important;
+}
+
 // @use '@/views/pqs/panorama/components/style/map.scss';</style>

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

@@ -2,9 +2,10 @@
     position: absolute;
     top: 10px;
     left: calc(50% - 305px);
+    width: 334px;
     border-radius: 8px;
     z-index: 1;
-    overflow: hidden;
+    // overflow: hidden;
     .Icon {
         width: 30px;
         height: 30px;
@@ -57,6 +58,7 @@
         }
     }
 }
+
 :deep(.el-collapse-item__header) {
     height: 32px;
     border-bottom: 1px solid #e4e7ed;
@@ -201,3 +203,4 @@
     width: 450px;
     z-index: 0;
 }
+

src/views/pqs/panorama/index.vue

@@ -37,7 +37,7 @@
             </div>
         </div>
 
-        <Info v-if="!lineInfo" style="    position: absolute;
+        <Info v-if="!lineInfo" style="position: absolute;z-index: 2;
     top: -10px;width: 100%;" ref="InfoRef" @back="lineInfo = true,infoShow(false)" />
     </div>
 </template>
@@ -195,6 +195,7 @@ const reset = () => {
         areaName: dictData.state.area[0]?.name,
         isUpToGrid: 0
     }
+    mapRef.value.reset()
     changeValue({ data: dictData.state.area[0] })
 }
 onMounted(() => {
@@ -203,6 +204,7 @@ onMounted(() => {
     // aaa()
 })
 </script>
+ 
 
 <style lang="scss" scoped>
 :deep(.mapBox) {

src/views/pqs/qualityInspeection/panorama/components/cityMapR.vue

@@ -262,6 +262,7 @@ const info = (row: any) => {
             },
 
             options: {
+                toolbox:null,
                 dataZoom: null,
                 series: optionData.series
             }
@@ -366,6 +367,7 @@ const info = (row: any) => {
             },
 
             options: {
+                toolbox:null,
                 // dataZoom: null,
                 series: [
                     {
@@ -450,6 +452,7 @@ const info = (row: any) => {
             },
             color: [config.layout.elementUiPrimary[0], '#FFBF00', '#FF9100'],
             options: {
+                toolbox:null,
                 dataZoom: null,
                 series: [
                     {

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

@@ -186,6 +186,7 @@ const contaminateC = () => {
                     show: false
                 },
                 options: {
+                    toolbox:null,
                     dataZoom: null,
                     series: [
                         {

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

@@ -19,7 +19,7 @@
   <!-- 新增 -->
   <complaintsForm ref="formRef" @onSubmit="tableStore.index()" />
   <!-- 详情 -->
-   <detail ref="detailRef"/>
+  <detail ref="detailRef" />
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide, nextTick } from 'vue'
@@ -80,7 +80,7 @@ const tableStore = new TableStore({
     {
       field: 'detectionFlag',
       title: '是否实现监测',
-    
+
       render: 'tag',
       custom: {
         0: 'warning',
@@ -105,17 +105,17 @@ const tableStore = new TableStore({
     {
       field: 'dealState',
       title: '是否解决',
- 
+
       render: 'tag',
       custom: {
         0: 'warning',
         1: 'primary',
-
+        null: 'info'
       },
       replaceValue: {
         0: '未解决',
         1: '已解决',
-
+        null: '/'
       }
     },
     {
@@ -164,12 +164,12 @@ const tableStore = new TableStore({
           disabled: row => {
             return row.dealState == 0
           },
-       
+
-          click:  row => {
+          click: row => {
             detailRef.value.open({
               row: row,
               title: '详情',
-           
+
             })
 
           }

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

@@ -7,7 +7,7 @@
         <Area ref="areaRef" v-model="tableStore.table.params.deptId" @changeValue="changeArea"/>
       </el-form-item>
       <el-form-item label="监测点性质">
-        <el-select v-model="tableStore.table.params.lineType" clearable>
+        <el-select v-model="tableStore.table.params.lineType" clearable placeholder="请选择监测点性质">
           <el-option label="电网侧" value="0"/>
           <el-option label="非电网侧" value="1"/>
         </el-select>

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

@@ -86,12 +86,12 @@ const tableStore = new TableStore({
       custom: {
         0: 'warning',
         1: 'primary',
-
+        null: 'info'
       },
       replaceValue: {
         0: '未解决',
         1: '已解决',
-
+        null: '/'
       }
     },
     {

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

@@ -55,11 +55,11 @@ const tableStore = new TableStore({
   method: 'POST',
   publicHeight: 65,
   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
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
+      }
-        },
+    },
     { field: 'lineName', title: '监测点名称', minWidth: 160 },
     { field: 'connectedBus', title: '接入母线', minWidth: 160 },
     // { field: 'monitoringTerminalCode', title: '终端编号', minWidth: 140 },
@@ -115,12 +115,12 @@ const tableStore = new TableStore({
       custom: {
         0: 'warning',
         1: 'primary',
-
+        null: 'info'
       },
       replaceValue: {
         0: '未解决',
         1: '已解决',
-
+        null: '/'
       }
     },
     {

src/views/pqs/supervise/harmonicSurvey/components/planManage.vue

@@ -2,7 +2,7 @@
   <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
     <template #select>
       <el-form-item label="监督类型">
-        <el-select v-model="tableStore.table.params.supvType" clearable placeholder="请选择流程状态">
+        <el-select v-model="tableStore.table.params.supvType" clearable placeholder="请选择监督类型">
           <el-option v-for="item in supvTypeOptionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>

src/views/pqs/supervise/harmonicSurvey/components/testManage.vue

@@ -2,7 +2,7 @@
     <TableHeader area datePicker nextFlag theCurrentTime ref='TableHeaderRef'>
         <template v-slot:select>
             <el-form-item label='监督类型'>
-                <el-select v-model='tableStore.table.params.supvType' clearable placeholder='请选择流程状态'>
+                <el-select v-model='tableStore.table.params.supvType' clearable placeholder='请选择监督类型'>
                     <el-option v-for='item in supvTypeOptionList' :key='item.id' :label='item.name'
                         :value='item.id'></el-option>
                 </el-select>

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

@@ -44,7 +44,14 @@ import { deleteWarningLeaflet } from '@/api/supervision-boot/delete/index'
 import detail from '@/views/pqs/supervise/harmonicSurvey/test/detail.vue'
 const dictData = useDictData()
 
-const statusSelect = dictData.statusSelect()
+const statusSelect = [
+    { name: '待提交审批', id: 0 },
+    { name: '审批中', id: 1 },
+    { name: '审批通过', id: 2 },
+    { name: '审批不通过', id: 3 },
+    { name: '已取消', id: 4 },
+    { name: '新增', id: 5 }
+]
 //获取登陆用户姓名和部门
 const adminInfo = useAdminInfo()
 const { push } = useRouter()
@@ -65,7 +72,7 @@ const tableStore = new TableStore({
         },
         {
             title: '序号',
-          
+
             align: 'center',
             width: 80,
             formatter: (row: any) => {
@@ -134,12 +141,12 @@ const tableStore = new TableStore({
             custom: {
                 0: 'warning',
                 1: 'primary',
-
+                null: 'info'
             },
             replaceValue: {
                 0: '未解决',
                 1: '已解决',
-
+                null: '/'
             }
         },
         // {

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

@@ -4,7 +4,7 @@
         <template #select>
             <el-form-item label="搜索">
                 <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端、监测点名称"
-                clearable maxlength="32"  show-word-limit></el-input>
+                clearable maxlength="32"  show-word-limit style="width: 230px"></el-input>
             </el-form-item>
             <el-form-item label="流程状态">
                 <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">

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

@@ -4,7 +4,7 @@
         <template #select>
             <el-form-item label="搜索">
                 <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端、监测点名称"
-                clearable maxlength="32"  show-word-limit></el-input>
+                clearable maxlength="32"  show-word-limit style="width: 230px"></el-input>
             </el-form-item>
             <el-form-item label="流程状态">
                 <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">

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

@@ -2,8 +2,8 @@
     <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
         <template #select>
             <el-form-item label="搜索">
-                <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端、监测点名称"
+                <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端名称"
-                clearable maxlength="32"  show-word-limit></el-input>
+                clearable maxlength="32"  show-word-limit style="width: 180px"></el-input>
             </el-form-item>
             <el-form-item label="流程状态">
                 <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">

src/views/pqs/supervise_jb/electricalEnergy/components1/complaints.vue

@@ -2,7 +2,7 @@
   <!-- 用户投诉 -->
   <!-- 2 有新增 发起 预警单 -->
 
-  <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+  <TableHeader area nextFlag theCurrentTime showTimeAll ref="TableHeaderRef">
     <template v-slot:select>
       <el-form-item label="是否解决">
         <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
@@ -19,7 +19,7 @@
   <!-- 新增 -->
   <complaintsForm ref="formRef" @onSubmit="tableStore.index()" />
   <!-- 详情 -->
-   <detail ref="detailRef"/>
+  <detail ref="detailRef" />
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide, nextTick } from 'vue'
@@ -46,7 +46,7 @@ const dealStateList = ref([
     label: '未解决',
     value: '0'
   },
- 
+
 ])
 const tableStore = new TableStore({
   url: '/supervision-boot/SupervisionUserComplaint/list',
@@ -80,7 +80,7 @@ const tableStore = new TableStore({
     {
       field: 'detectionFlag',
       title: '是否实现监测',
-    
+
       render: 'tag',
       custom: {
         0: 'warning',
@@ -105,17 +105,17 @@ const tableStore = new TableStore({
     {
       field: 'dealState',
       title: '是否解决',
- 
+
       render: 'tag',
       custom: {
         0: 'warning',
         1: 'primary',
-
+        null: 'info'
       },
       replaceValue: {
         0: '未解决',
         1: '已解决',
-
+        null: '/'
       }
     },
     {
@@ -164,12 +164,12 @@ const tableStore = new TableStore({
           disabled: row => {
             return row.dealState == 0
           },
-       
+
-          click:  row => {
+          click: row => {
             detailRef.value.open({
               row: row,
               title: '详情',
-           
+
             })
 
           }

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

@@ -1,13 +1,13 @@
 <template>
   <!-- <div>1 监测点信息  发起预告警单 </div> -->
 
-  <TableHeader datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+  <TableHeader datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef">
     <template v-slot:select>
       <el-form-item label="区域">
         <Area ref="areaRef" v-model="tableStore.table.params.deptId" @changeValue="changeArea"/>
       </el-form-item>
       <el-form-item label="监测点性质">
-        <el-select v-model="tableStore.table.params.lineType" clearable>
+        <el-select v-model="tableStore.table.params.lineType" clearable placeholder="请选择监测点性质">
           <el-option label="电网侧" value="0"/>
           <el-option label="非电网侧" value="1"/>
         </el-select>
@@ -328,7 +328,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_jb/electricalEnergy/components1/testQuestions.vue

@@ -1,6 +1,6 @@
 <template>
   <!--     <div> 普测结果 发起预告警单</div> -->
-  <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+  <TableHeader area nextFlag theCurrentTime showTimeAll ref="TableHeaderRef">
     <template v-slot:select>
       <el-form-item label="计划名称">
         <el-input style="width: 200px" v-model="tableStore.table.params.searchValue" clearable
@@ -86,12 +86,12 @@ const tableStore = new TableStore({
       custom: {
         0: 'warning',
         1: 'primary',
-
+        null: 'info'
       },
       replaceValue: {
         0: '未解决',
         1: '已解决',
-
+        null: '/'
       }
     },
     {

src/views/pqs/supervise_jb/electricalEnergy/components1/testRun.vue

@@ -1,7 +1,7 @@
 <!---试运行列表-->
 <template>
   <div>
-    <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+    <TableHeader area nextFlag theCurrentTime showTimeAll ref="TableHeaderRef">
       <template #select>
         <el-form-item label="流程状态">
           <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
@@ -55,11 +55,11 @@ const tableStore = new TableStore({
   method: 'POST',
   publicHeight: 65,
   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
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
+      }
-        },
+    },
     { field: 'lineName', title: '监测点名称', minWidth: 160 },
     { field: 'connectedBus', title: '接入母线', minWidth: 160 },
     // { field: 'monitoringTerminalCode', title: '终端编号', minWidth: 140 },
@@ -115,12 +115,12 @@ const tableStore = new TableStore({
       custom: {
         0: 'warning',
         1: 'primary',
-
+        null: 'info'
       },
       replaceValue: {
         0: '未解决',
         1: '已解决',
-
+        null: '/'
       }
     },
     {

src/views/pqs/supervise_jb/harmonicSurvey/components/planAdd.vue

@@ -246,7 +246,7 @@ const submitFn = async (flag: boolean) => {
             cancelFn()
             ElMessage.success('保存成功！')
             emit('onsubmit')
-        })
+        }).catch(() => {  loading.value = false})
     } else {
         formRef.value.validate(async (valid: any) => {
             if (valid) {
@@ -261,13 +261,13 @@ const submitFn = async (flag: boolean) => {
                         cancelFn()
                         ElMessage.success('计划新增成功！')
                         emit('onsubmit')
-                    })
+                    }).catch(() => {  loading.value = false})
                 } else {
                     await  updateSurveyPlan(addForm).then(res => {
                         cancelFn()
                         ElMessage.success('重新发起成功！')
                         emit('onsubmit')
-                    })
+                    }).catch(() => {  loading.value = false})
                 }
             }
         })

src/views/pqs/supervise_jb/harmonicSurvey/components/planManage.vue

@@ -1,8 +1,8 @@
 <template>
-  <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+  <TableHeader area datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef">
     <template #select>
       <el-form-item label="监督类型">
-        <el-select v-model="tableStore.table.params.supvType" clearable placeholder="请选择流程状态">
+        <el-select v-model="tableStore.table.params.supvType" clearable placeholder="请选择监督类型">
           <el-option v-for="item in supvTypeOptionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
         </el-select>
       </el-form-item>

src/views/pqs/supervise_jb/harmonicSurvey/components/testManage.vue

@@ -1,8 +1,8 @@
 <template>
-    <TableHeader area datePicker nextFlag theCurrentTime ref='TableHeaderRef'>
+    <TableHeader area datePicker nextFlag theCurrentTime showTimeAll ref='TableHeaderRef'>
         <template v-slot:select>
             <el-form-item label='监督类型'>
-                <el-select v-model='tableStore.table.params.supvType' clearable placeholder='请选择流程状态'>
+                <el-select v-model='tableStore.table.params.supvType' clearable placeholder='请选择监督类型'>
                     <el-option v-for='item in supvTypeOptionList' :key='item.id' :label='item.name'
                         :value='item.id'></el-option>
                 </el-select>

src/views/pqs/supervise_jb/interfere/components/normalizationManager/interferenceUserTable.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <TableHeader datePicker nextFlag theCurrentTime ref='TableHeaderRef'>
+    <TableHeader datePicker nextFlag theCurrentTime showTimeAll ref='TableHeaderRef'>
       <template #select>
         <el-form-item label='项目名称'>
           <el-input v-model='tableStore.table.params.projectName' placeholder='请输入项目名称'></el-input>

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

@@ -57,8 +57,8 @@
                     {{ detailData.evaluationConclusion }}
                 </el-descriptions-item>
                 <el-descriptions-item :label="detailData.userType == '4' || detailData.userType == '5'
-                        ? '非线性设备类型: '
+                    ? '非线性设备类型: '
-                        : '非线性负荷类型：'
+                    : '非线性负荷类型：'
                     " v-if="
                         detailData.userType == '2' ||
                         detailData.userType == '3' ||
@@ -286,72 +286,94 @@
                 </el-descriptions-item>
             </el-descriptions>
             <el-descriptions :column="1" border style="flex: 1" title="变更后">
-                <el-descriptions-item label="填报人">
+                <el-descriptions-item label="填报人" :label-class-name="changeTheField?.reporter ? 'my-content' : ''"
+                    :class-name="changeTheField?.reporter ? 'my-content' : ''">
                     {{ detailData1.reporter }}
                 </el-descriptions-item>
-                <el-descriptions-item label="填报日期">
+                <el-descriptions-item label="填报日期" :label-class-name="changeTheField?.reportDate ? 'my-content' : ''"
+                    :class-name="changeTheField?.reportDate ? 'my-content' : ''">
                     {{ formatDate(detailData1.reportDate, 'YYYY-MM-DD') }}
                 </el-descriptions-item>
-                <el-descriptions-item label="填报部门">
+                <el-descriptions-item label="填报部门" :label-class-name="changeTheField?.orgName ? 'my-content' : ''"
+                    :class-name="changeTheField?.orgName ? 'my-content' : ''">
                     {{ detailData1.orgName }}
                 </el-descriptions-item>
-                <el-descriptions-item label="工程预期投产日期">
+                <el-descriptions-item label="工程预期投产日期"
+                    :label-class-name="changeTheField?.expectedProductionDate ? 'my-content' : ''"
+                    :class-name="changeTheField?.expectedProductionDate ? 'my-content' : ''">
                     {{ formatDate(detailData1.expectedProductionDate, 'YYYY-MM-DD') }}
                 </el-descriptions-item>
-                <el-descriptions-item label="用户性质">
+                <el-descriptions-item label="用户性质" :label-class-name="changeTheField?.userType ? 'my-content' : ''"
+                    :class-name="changeTheField?.userType ? 'my-content' : ''">
                     {{
                         userTypeList.find(item => {
                             return item.value == detailData1.userType
                         })?.label
                     }}
                 </el-descriptions-item>
-                <el-descriptions-item label="所在地市">
+                <el-descriptions-item label="所在地市" :label-class-name="changeTheField?.city ? 'my-content' : ''"
+                    :class-name="changeTheField?.city ? 'my-content' : ''">
                     {{ detailData1.city }}
                 </el-descriptions-item>
-                <el-descriptions-item label="归口管理部门">
+                <el-descriptions-item label="归口管理部门"
+                    :label-class-name="changeTheField?.responsibleDepartment ? 'my-content' : ''"
+                    :class-name="changeTheField?.responsibleDepartment ? 'my-content' : ''">
                     {{ detailData1.responsibleDepartment }}
                 </el-descriptions-item>
-                <el-descriptions-item label="用户状态">
+                <el-descriptions-item label="用户状态" :label-class-name="changeTheField?.userStatus ? 'my-content' : ''"
+                    :class-name="changeTheField?.userStatus ? 'my-content' : ''">
                     {{
                         userStateList.find(item => {
                             return item.value == detailData1.userStatus
                         })?.label
                     }}
                 </el-descriptions-item>
-                <el-descriptions-item label="变电站">
+                <el-descriptions-item label="变电站" :label-class-name="changeTheField?.substation ? 'my-content' : ''"
+                    :class-name="changeTheField?.substation ? 'my-content' : ''">
                     {{ detailData1.substation }}
                 </el-descriptions-item>
-                <el-descriptions-item label="工程名">
+                <el-descriptions-item label="工程名" :label-class-name="changeTheField?.projectName ? 'my-content' : ''"
+                    :class-name="changeTheField?.projectName ? 'my-content' : ''">
                     {{ detailData1.projectName }}
                 </el-descriptions-item>
-                <el-descriptions-item label="电压等级">
+                <el-descriptions-item label="电压等级" :label-class-name="changeTheField?.voltageLevel ? 'my-content' : ''"
+                    :class-name="changeTheField?.voltageLevel ? 'my-content' : ''">
                     {{
                         voltageLevelList.find(item => {
                             return item.id == detailData1.voltageLevel
                         })?.name
                     }}
                 </el-descriptions-item>
-                <el-descriptions-item label="非线性终端类型" v-if="detailData1.userType == 0 || detailData1.userType == 1">
+                <el-descriptions-item label="非线性终端类型" v-if="detailData1.userType == 0 || detailData1.userType == 1"
+                    :label-class-name="changeTheField?.nonlinearDeviceType ? 'my-content' : ''"
+                    :class-name="changeTheField?.nonlinearDeviceType ? 'my-content' : ''">
                     {{ proviteData1.nonlinearDeviceType ? proviteData1.nonlinearDeviceType : '-' }}
                 </el-descriptions-item>
-                <el-descriptions-item label="预测评估单位">
+                <el-descriptions-item label="预测评估单位"
+                    :label-class-name="changeTheField?.evaluationDept ? 'my-content' : ''"
+                    :class-name="changeTheField?.evaluationDept ? 'my-content' : ''">
                     {{ detailData1.evaluationDept }}
                 </el-descriptions-item>
-                <el-descriptions-item label="预测评估结论" :span="2">
+                <el-descriptions-item label="预测评估结论" :span="2"
+                    :label-class-name="changeTheField?.evaluationConclusion ? 'my-content' : ''"
+                    :class-name="changeTheField?.evaluationConclusion ? 'my-content' : ''">
                     {{ detailData1.evaluationConclusion }}
                 </el-descriptions-item>
                 <el-descriptions-item :label="detailData1.userType == '4' || detailData1.userType == '5'
-                        ? '非线性设备类型: '
+                    ? '非线性设备类型: '
-                        : '非线性负荷类型：'
+                    : '非线性负荷类型：'
                     " v-if="
                         detailData1.userType == '2' ||
                         detailData1.userType == '3' ||
                         detailData1.userType == '4' ||
                         detailData1.userType == '5'
-                    ">
+                    " :label-class-name="changeTheField?.nonlinearLoadType ? 'my-content' : ''"
+                    :class-name="changeTheField?.nonlinearLoadType ? 'my-content' : ''">
                     {{ proviteData1.nonlinearLoadType }}
                 </el-descriptions-item>
-                <el-descriptions-item label="是否需要治理">
+                <el-descriptions-item label="是否需要治理"
+                    :label-class-name="changeTheField?.needGovernance ? 'my-content' : ''"
+                    :class-name="changeTheField?.needGovernance ? 'my-content' : ''">
                     <span v-if="detailData1.userType == 0 || detailData1.userType == 1">
                         {{ proviteData1.needGovernance == 0 ? '否' : '是' }}
                     </span>
@@ -365,7 +387,9 @@
                     </span>
                     <span v-if="detailData1.userType == 6">{{ proviteData1.needGovernance == 0 ? '否' : '是' }}</span>
                 </el-descriptions-item>
-                <el-descriptions-item label="是否开展背景测试">
+                <el-descriptions-item label="是否开展背景测试"
+                    :label-class-name="changeTheField?.backgroundTestPerformed ? 'my-content' : ''"
+                    :class-name="changeTheField?.backgroundTestPerformed ? 'my-content' : ''">
                     <span v-if="detailData1.userType == 0 || detailData1.userType == 1">
                         {{ proviteData1.backgroundTestPerformed == 0 ? '否' : '是' }}
                     </span>
@@ -381,12 +405,16 @@
                         {{ proviteData1.backgroundTestPerformed == 0 ? '否' : '是' }}
                     </span>
                 </el-descriptions-item>
-                <el-descriptions-item label="是否开展抗扰度测试" v-if="detailData1.userType == 6">
+                <el-descriptions-item label="是否开展抗扰度测试" v-if="detailData1.userType == 6"
+                    :label-class-name="changeTheField?.antiInterferenceTest ? 'my-content' : ''"
+                    :class-name="changeTheField?.antiInterferenceTest ? 'my-content' : ''">
                     <span>
                         {{ proviteData1.antiInterferenceTest == 0 ? '否' : '是' }}
                     </span>
                 </el-descriptions-item>
-                <el-descriptions-item label="用户协议容量（MVA）" v-if="detailData1.userType == 0 || detailData1.userType == 1">
+                <el-descriptions-item label="用户协议容量（MVA）" v-if="detailData1.userType == 0 || detailData1.userType == 1"
+                    :label-class-name="changeTheField?.agreementCapacity ? 'my-content' : ''"
+                    :class-name="changeTheField?.agreementCapacity ? 'my-content' : ''">
                     {{ proviteData1.agreementCapacity }}
                 </el-descriptions-item>
                 <el-descriptions-item label="PCC供电设备容量（MVA）" v-if="
@@ -394,7 +422,8 @@
                     detailData1.userType == '3' ||
                     detailData1.userType == '4' ||
                     detailData1.userType == '5'
-                ">
+                " :label-class-name="changeTheField?.pccEquipmentCapacity ? 'my-content' : ''"
+                    :class-name="changeTheField?.pccEquipmentCapacity ? 'my-content' : ''">
                     {{ proviteData1.pccEquipmentCapacity }}
                 </el-descriptions-item>
                 <el-descriptions-item label="基准短路容量（MVA）" v-if="
@@ -402,7 +431,8 @@
                     detailData1.userType == '3' ||
                     detailData1.userType == '4' ||
                     detailData1.userType == '5'
-                ">
+                " :label-class-name="changeTheField?.baseShortCircuitCapacity ? 'my-content' : ''"
+                    :class-name="changeTheField?.baseShortCircuitCapacity ? 'my-content' : ''">
                     {{ proviteData1.baseShortCircuitCapacity }}
                 </el-descriptions-item>
                 <el-descriptions-item label="系统最小短路容量（MVA）" v-if="
@@ -410,7 +440,8 @@
                     detailData1.userType == '3' ||
                     detailData1.userType == '4' ||
                     detailData1.userType == '5'
-                ">
+                " :label-class-name="changeTheField?.minShortCircuitCapacity ? 'my-content' : ''"
+                    :class-name="changeTheField?.minShortCircuitCapacity ? 'my-content' : ''">
                     {{ proviteData1?.minShortCircuitCapacity }}
                 </el-descriptions-item>
                 <el-descriptions-item label="用户用电协议容量（MVA）" v-if="
@@ -418,61 +449,84 @@
                     detailData1.userType == '3' ||
                     detailData1.userType == '4' ||
                     detailData1.userType == '5'
-                ">
+                " :label-class-name="changeTheField?.userAgreementCapacity ? 'my-content' : ''"
+                    :class-name="changeTheField?.userAgreementCapacity ? 'my-content' : ''">
                     {{ proviteData1?.userAgreementCapacity }}
                 </el-descriptions-item>
-                <el-descriptions-item label="PCC点" v-if="detailData1.userType != 0 && detailData1.userType != 1">
+                <el-descriptions-item label="PCC点" v-if="detailData1.userType != 0 && detailData1.userType != 1"
+                    :label-class-name="changeTheField?.pccPoint ? 'my-content' : ''"
+                    :class-name="changeTheField?.pccPoint ? 'my-content' : ''">
                     {{ proviteData1?.pccPoint }}
                 </el-descriptions-item>
-                <el-descriptions-item label="评估类型" v-if="detailData1.userType != 0 && detailData1.userType != 1">
+                <el-descriptions-item label="评估类型" v-if="detailData1.userType != 0 && detailData1.userType != 1"
+                    :label-class-name="changeTheField?.evaluationType ? 'my-content' : ''"
+                    :class-name="changeTheField?.evaluationType ? 'my-content' : ''">
                     {{
                         evaluationTypeList.find(item => {
                             return item.id == proviteData1?.evaluationType
                         })?.name
                     }}
                 </el-descriptions-item>
-                <el-descriptions-item label="预测评估评审单位" v-if="detailData1.userType != 0 && detailData1.userType != 1">
+                <el-descriptions-item label="预测评估评审单位" v-if="detailData1.userType != 0 && detailData1.userType != 1"
+                    :label-class-name="changeTheField?.evaluationChekDept ? 'my-content' : ''"
+                    :class-name="changeTheField?.evaluationChekDept ? 'my-content' : ''">
                     {{ proviteData1?.evaluationChekDept }}
                 </el-descriptions-item>
-                <el-descriptions-item label="行业" v-if="detailData1.userType == 6">
+                <el-descriptions-item label="行业" v-if="detailData1.userType == 6"
+                    :label-class-name="changeTheField?.industry ? 'my-content' : ''"
+                    :class-name="changeTheField?.industry ? 'my-content' : ''">
                     {{
                         industryList.find(item => {
                             return item.id == proviteData1.industry
                         })?.name
                     }}
                 </el-descriptions-item>
-                <el-descriptions-item label="敏感终端名称" v-if="detailData1.userType == 6">
+                <el-descriptions-item label="敏感终端名称" v-if="detailData1.userType == 6"
+                    :label-class-name="changeTheField?.deviceName ? 'my-content' : ''"
+                    :class-name="changeTheField?.deviceName ? 'my-content' : ''">
                     {{ proviteData1.deviceName }}
                 </el-descriptions-item>
                 <!--            <el-descriptions-item label="供电电源数量" v-if="detailData1.userType == 6">-->
                 <!--                {{ proviteData1.powerSupplyCount }}-->
                 <!--            </el-descriptions-item>-->
-                <el-descriptions-item label="供电电源情况" v-if="detailData1.userType == 6">
+                <el-descriptions-item label="供电电源情况" v-if="detailData1.userType == 6"
+                    :label-class-name="changeTheField?.powerSupplyInfo ? 'my-content' : ''"
+                    :class-name="changeTheField?.powerSupplyInfo ? 'my-content' : ''">
                     {{
                         powerSupplyInfoOptionList.find(item => {
                             return item.id == proviteData1.powerSupplyInfo
                         })?.name
                     }}
                 </el-descriptions-item>
-                <el-descriptions-item label="供电电源" :span="2" v-if="detailData1.userType == 6">
+                <el-descriptions-item label="供电电源" :span="2" v-if="detailData1.userType == 6"
+                    :label-class-name="changeTheField?.powerSupply ? 'my-content' : ''"
+                    :class-name="changeTheField?.powerSupply ? 'my-content' : ''">
                     {{ proviteData1.powerSupply }}
                 </el-descriptions-item>
-                <el-descriptions-item label="负荷级别" v-if="detailData1.userType == 6">
+                <el-descriptions-item label="负荷级别" v-if="detailData1.userType == 6"
+                    :label-class-name="changeTheField?.loadLevel ? 'my-content' : ''"
+                    :class-name="changeTheField?.loadLevel ? 'my-content' : ''">
                     {{
                         loadLevelOptionList.find(item => {
                             return item.id == proviteData1.loadLevel
                         })?.name
                     }}
                 </el-descriptions-item>
-                <el-descriptions-item label="敏感电能质量指标" v-if="detailData1.userType == 6">
+                <el-descriptions-item label="敏感电能质量指标" v-if="detailData1.userType == 6"
+                    :label-class-name="changeTheField?.energyQualityIndex ? 'my-content' : ''"
+                    :class-name="changeTheField?.energyQualityIndex ? 'my-content' : ''">
                     {{
                         energyQualityIndexList.find(item => {
                             return item.id == proviteData1.energyQualityIndex
                         })?.name
                     }}
                 </el-descriptions-item>
-                <el-descriptions-item label="可研报告">
+                <el-descriptions-item label="可研报告"
-                    <span v-if="detailData1.userType == 0 || detailData1.userType == 1">
+                    :label-class-name="changeTheField?.feasibilityReport ? 'my-content' : ''"
+                    :class-name="changeTheField?.feasibilityReport ? 'my-content' : ''">
+                    <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">
                             <View @click="openFile(proviteData1?.feasibilityReport?.name)" />
                         </el-icon>
@@ -493,7 +547,9 @@
                             {{ proviteData1.feasibilityReport?.name }}
                         </a>
                     </span>
-                    <span v-if="detailData1.userType == 6">
+                    <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">
                             <View @click="openFile(proviteData1?.feasibilityReport?.name)" />
                         </el-icon>
@@ -502,7 +558,9 @@
                         </a>
                     </span>
                 </el-descriptions-item>
-                <el-descriptions-item label="项目初步设计说明书">
+                <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">
                         <View @click="openFile(proviteData1?.preliminaryDesignDescription?.name)" />
                     </el-icon>
@@ -511,7 +569,9 @@
                         {{ proviteData1?.preliminaryDesignDescription?.name }}
                     </a>
                 </el-descriptions-item>
-                <el-descriptions-item label="预测评估报告">
+                <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">
                         <View @click="openFile(proviteData1?.predictionEvaluationReport?.name)" />
                     </el-icon>
@@ -519,7 +579,9 @@
                         {{ proviteData1?.predictionEvaluationReport?.name }}
                     </a>
                 </el-descriptions-item>
-                <el-descriptions-item label="预测评估评审意见报告">
+                <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">
                         <View @click="openFile(proviteData1?.predictionEvaluationReviewOpinions?.name)" />
                     </el-icon>
@@ -527,7 +589,9 @@
                         {{ proviteData1?.predictionEvaluationReviewOpinions?.name }}
                     </a>
                 </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"
+                    :label-class-name="changeTheField?.substationMainWiringDiagram ? 'my-content' : ''"
+                    :class-name="changeTheField?.substationMainWiringDiagram ? 'my-content' : ''">
                     <el-icon class="elView" v-if="proviteData1?.substationMainWiringDiagram?.name">
                         <View @click="openFile(proviteData1?.substationMainWiringDiagram?.name)" />
                     </el-icon>
@@ -535,7 +599,9 @@
                         {{ proviteData1?.substationMainWiringDiagram?.name }}
                     </a>
                 </el-descriptions-item>
-                <el-descriptions-item label="主要敏感终端清单" v-if="detailData.userType == 6">
+                <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">
                         <View @click="openFile(proviteData1?.sensitiveDevices?.name)" />
                     </el-icon>
@@ -543,7 +609,9 @@
                         {{ proviteData1?.sensitiveDevices?.name }}
                     </a>
                 </el-descriptions-item>
-                <el-descriptions-item label="抗扰度测试报告" v-if="detailData.userType == 6">
+                <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">
                         <View @click="openFile(proviteData1?.antiInterferenceReport?.name)" />
                     </el-icon>
@@ -551,7 +619,9 @@
                         {{ proviteData1?.antiInterferenceReport?.name }}
                     </a>
                 </el-descriptions-item>
-                <el-descriptions-item label="背景电能质量测试报告" v-if="detailData.userType == 6">
+                <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">
                         <View @click="openFile(proviteData1?.powerQualityReport?.name)" />
                     </el-icon>
@@ -560,7 +630,9 @@
                     </a>
                 </el-descriptions-item>
                 <el-descriptions-item label="其他附件"
-                    v-if="proviteData1?.additionalAttachments && proviteData1?.additionalAttachments?.url">
+                    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">
                         <View @click="openFile(proviteData1?.additionalAttachments?.name)" />
                     </el-icon>
@@ -652,6 +724,7 @@ const userStateList = reactive([
         value: '3'
     }
 ])
+
 const dictData = useDictData()
 //字典获取所在地市
 const areaOptionList = dictData.getBasicData('jibei_area')
@@ -667,23 +740,80 @@ const evaluationTypeList = dictData.getBasicData('Evaluation_Type')
 const evaluationDeptList = dictData.getBasicData('evaluation_dept')
 const loadLevelOptionList = dictData.getBasicData('load_level')
 const powerSupplyInfoOptionList = dictData.getBasicData('supply_condition')
+const changeTheField: any = ref({})
 /** 获得数据 */
 const getInfo = async () => {
     detailLoading.value = true
+    let obj1: any = {}
+    let obj2: any = {}
     try {
         await getUserReportUpdateById(props.id || queryId).then(res => {
-            detailData1.value = res.data.userReportMessageJson
+            obj1 = JSON.parse(JSON.stringify(res.data.userReportMessageJson))
+            detailData1.value = JSON.parse(JSON.stringify(res.data.userReportMessageJson))
             getProviteData1()
         })
 
         await getUserReportById(props.id || queryId).then(res => {
-            detailData.value = res.data
+            obj2 = JSON.parse(JSON.stringify(res.data))
+            detailData.value = JSON.parse(JSON.stringify(res.data))
             getProviteData()
         })
     } finally {
         detailLoading.value = false
+
+        changeTheField.value = compareObjects({
+            ...obj1, ...obj1.userReportProjectPO, ...obj1.userReportSensitivePO, ...obj1.userReportSubstationPO
+
+        }, { ...obj2, ...obj2.userReportProjectPO, ...obj2.userReportSensitivePO, ...obj2.userReportSubstationPO })
+
     }
 }
+const compareObjects = (obj1: any, obj2: any) => {
+
+    const differences: any = {};
+
+    for (const key in obj1) {
+        if (obj1.hasOwnProperty(key)) {
+            if (obj1[key] !== obj2[key]) {
+                differences[key] = { obj1: obj1[key], obj2: obj2[key] };
+            }
+        }
+    }
+
+    for (const key in obj2) {
+        if (obj2.hasOwnProperty(key) && !obj1.hasOwnProperty(key)) {
+            differences[key] = { obj1: undefined, obj2: obj2[key] };
+        }
+    }
+
+    return differences;
+}
+// const compareObjects = (obj1: any, obj2: any) => {
+//     const differences: any = {};
+
+//     function findDifferences(o1, o2, path = '') {
+//         for (const key in o1) {
+//             if (o1.hasOwnProperty(key)) {
+//                 const newPath = path ? `${path}.${key}` : key;
+//                 if (typeof o1[key] === 'object' && o1[key] !== null && typeof o2[key] === 'object' && o2[key] !== null) {
+//                     findDifferences(o1[key], o2[key], newPath);
+//                 } else if (o1[key] !== o2[key]) {
+//                     differences[newPath] = { obj1: o1[key], obj2: o2[key] };
+//                 }
+//             }
+//         }
+
+//         for (const key in o2) {
+//             if (o2.hasOwnProperty(key) && !o1.hasOwnProperty(key)) {
+//                 const newPath = path ? `${path}.${key}` : key;
+//                 differences[newPath] = { obj1: undefined, obj2: o2[key] };
+//             }
+//         }
+//     }
+
+//     findDifferences(obj1, obj2);
+//     return differences;
+// }
 const proviteData = ref()
 const proviteData1 = ref()
 
@@ -1001,3 +1131,8 @@ onMounted(() => {
     margin-right: 10px;
 }
 </style>
+<style scoped>
+:deep(.my-content) {
+    background: var(--el-color-success-light-7) !important;
+}
+</style>

src/views/pqs/supervise_jb/interfere/components/undocumented/addForm.vue

@@ -1050,6 +1050,8 @@ const confirmForm = async (flag: boolean) => {
                 addUploadRef.value?.submitForm(res.data)
                 resetForm()
                 close()
+            }).catch(() => {
+                loading.value = false
             })
         } else {
             await submitFormData(confirmFormData).then(res => {
@@ -1061,6 +1063,8 @@ const confirmForm = async (flag: boolean) => {
                 addUploadRef.value?.submitForm(res.data)
                 resetForm()
                 close()
+            }).catch(() => {
+                loading.value = false
             })
         }
     } else {
@@ -1202,7 +1206,9 @@ const confirmForm = async (flag: boolean) => {
                         addUploadRef.value?.submitForm(res.data)
                         resetForm()
                         close()
-                    })
+                    }).catch(() => {
+                loading.value = false
+            })
                 } else {
                     confirmFormData.id = resendId.value
                     if (controFlag.value) confirmFormData.dataType = 1
@@ -1219,7 +1225,9 @@ const confirmForm = async (flag: boolean) => {
                                 addUploadRef.value?.submitForm(res.data)
                                 resetForm()
                                 close()
-                            })
+                            }).catch(() => {
+                loading.value = false
+            })
                         } else {
                             await resend(confirmFormData).then(res => {
                                 ElMessage({
@@ -1229,7 +1237,9 @@ const confirmForm = async (flag: boolean) => {
                                 ruleFormRef.value.resetFields()
                                 resetForm()
                                 close()
-                            })
+                            }).catch(() => {
+                loading.value = false
+            })
                         }
                     } else {
                         await updateFormData(confirmFormData).then(res => {
@@ -1241,7 +1251,9 @@ const confirmForm = async (flag: boolean) => {
                             ruleFormRef.value.resetFields()
                             resetForm()
                             close()
-                        })
+                        }).catch(() => {
+                loading.value = false
+            })
                     }
                 }
             } else {

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

@@ -573,7 +573,6 @@ const preview = (val: any, url: any) => {
         }
         //预测评估报告
         if (val == 'predictionEvaluationReport') {
-            console.log(url, '9999999')
             predictionEvaluationReportRef?.value.open(url)
         }
         //预测评估评审意见报告
@@ -638,52 +637,54 @@ const getProviteData = async () => {
         proviteData.value = detailData.value.userReportSensitivePO
     }
     //可研报告
-    if (proviteData.value?.feasibilityReport != undefined) {
+    if (proviteData.value?.feasibilityReport != undefined && proviteData.value?.feasibilityReport.length>7) {
+       
         await getFileNamePath(proviteData.value.feasibilityReport, 'feasibilityReport')
     }
     //项目初步设计说明书
-    if (proviteData.value?.preliminaryDesignDescription != undefined) {
+    if (proviteData.value?.preliminaryDesignDescription != undefined && proviteData.value?.preliminaryDesignDescription.length>7) {
         await getFileNamePath(proviteData.value.preliminaryDesignDescription, 'preliminaryDesignDescription')
     }
     //预测评估报告
-    if (proviteData.value?.predictionEvaluationReport != undefined) {
+    if (proviteData.value?.predictionEvaluationReport != undefined && proviteData.value?.predictionEvaluationReport.length>7) {
         await getFileNamePath(proviteData.value.predictionEvaluationReport, 'predictionEvaluationReport')
     }
 
     //预测评估评审意见报告
-    if (proviteData.value?.predictionEvaluationReviewOpinions != undefined) {
+    if (proviteData.value?.predictionEvaluationReviewOpinions != undefined && proviteData.value?.predictionEvaluationReviewOpinions.length>7) {
+        
         await getFileNamePath(
             proviteData.value.predictionEvaluationReviewOpinions,
             'predictionEvaluationReviewOpinions'
         )
     }
     //用户接入变电站主接线示意图
-    if (proviteData.value?.substationMainWiringDiagram != undefined) {
+    if (proviteData.value?.substationMainWiringDiagram != undefined && proviteData.value?.substationMainWiringDiagram.length>7) {
         await getFileNamePath(proviteData.value.substationMainWiringDiagram, 'substationMainWiringDiagram')
     }
 
     //主要敏感终端清单
-    if (proviteData.value?.sensitiveDevices != undefined) {
+    if (proviteData.value?.sensitiveDevices != undefined && proviteData.value?.sensitiveDevices.length>7) {
         await getFileNamePath(proviteData.value.sensitiveDevices, 'sensitiveDevices')
     }
 
     //抗扰度测试报告
-    if (proviteData.value?.antiInterferenceReport != undefined) {
+    if (proviteData.value?.antiInterferenceReport != undefined && proviteData.value?.antiInterferenceReport.length>7) {
         await getFileNamePath(proviteData.value.antiInterferenceReport, 'antiInterferenceReport')
     }
 
     //背景电能质量测试报告
-    if (proviteData.value?.powerQualityReport != undefined) {
+    if (proviteData.value?.powerQualityReport != undefined && proviteData.value?.powerQualityReport.length>7) {
         await getFileNamePath(proviteData.value.powerQualityReport, 'powerQualityReport')
     }
 
     //其他附件
-    if (proviteData.value?.additionalAttachments != undefined) {
+    if (proviteData.value?.additionalAttachments != undefined && proviteData.value?.additionalAttachments.length>7) {
         getFileNamePath(proviteData.value.additionalAttachments, 'additionalAttachments')
     }
 
     // 入网评估报告
-    if (detailData.value.netInReport.length > 0) {
+    if ( detailData.value.netInReport.length > 0 ) {
         netInReportList.value = []
         detailData.value.netInReport.forEach((item: any) => {
             if (item != null) {

src/views/pqs/supervise_jb/interfere/components/undocumented/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <TableHeader datePicker nextFlag theCurrentTime ref='TableHeaderRef'>
+  <TableHeader datePicker nextFlag theCurrentTime showTimeAll ref='TableHeaderRef'>
     <template #select>
       <el-form-item label='项目名称'>
         <el-input v-model='tableStore.table.params.projectName' placeholder='请输入项目名称'></el-input>

src/views/pqs/supervise_jb/retire/monitor.vue

@@ -1,7 +1,7 @@
 <!--待办事项列表-->
 <template>
     <div>
-        <TableHeader date-picker nextFlag theCurrentTime>
+        <TableHeader date-picker nextFlag theCurrentTime showTimeAll>
             <template #select>
                 <el-form-item label="流程状态">
                     <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">

src/views/pqs/supervise_jb/retire/terminal.vue

@@ -1,7 +1,7 @@
 <!--待办事项列表-->
 <template>
     <div>
-        <TableHeader date-picker nextFlag theCurrentTime>
+        <TableHeader date-picker nextFlag theCurrentTime showTimeAll>
             <template v-slot:select>
                 <el-form-item label="流程状态">
                     <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">

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

@@ -1,5 +1,5 @@
 <template>
-    <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+    <TableHeader area datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef">
         <template #select>
             <el-form-item label="流程状态">
                 <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
@@ -10,7 +10,7 @@
             <el-form-item label="是否解决">
                 <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
                     <el-option label="未解决" value="0"></el-option>
-                    <el-option label="已解决" value="1"></el-option>
+                    <!-- <el-option label="已解决" value="1"></el-option> -->
                 </el-select>
             </el-form-item>
         </template>
@@ -44,7 +44,14 @@ import { deleteWarningLeaflet } from '@/api/supervision-boot/delete/index'
 import detail from '@/views/pqs/supervise/harmonicSurvey/test/detail.vue'
 const dictData = useDictData()
 
-const statusSelect = dictData.statusSelect()
+const statusSelect = [
+    { name: '待提交审批', id: 0 },
+    { name: '审批中', id: 1 },
+    { name: '审批通过', id: 2 },
+    { name: '审批不通过', id: 3 },
+    { name: '已取消', id: 4 },
+    { name: '新增', id: 5 }
+]
 //获取登陆用户姓名和部门
 const adminInfo = useAdminInfo()
 const { push } = useRouter()
@@ -65,7 +72,7 @@ const tableStore = new TableStore({
         },
         {
             title: '序号',
-           
+
             align: 'center',
             width: 80,
             formatter: (row: any) => {
@@ -134,11 +141,13 @@ const tableStore = new TableStore({
             custom: {
                 0: 'warning',
                 1: 'primary',
+                null: 'info'
 
             },
             replaceValue: {
                 0: '未解决',
                 1: '已解决',
+                null: '/'
 
             }
         },

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

@@ -1,5 +1,5 @@
 <template>
-    <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+    <TableHeader area datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef">
         <template #operation>
             <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
         </template>

src/views/pqs/supervise_jb/terminalNetworkDetection/components/cycleDetection/index.vue

@@ -1,6 +1,6 @@
 <!---终端入网检测-->
 <template>
-  <TableHeader area ref='TableHeaderRef'>
+  <TableHeader area  ref='TableHeaderRef'>
     <template #select>
       <el-form-item label='搜索'>
         <el-input

src/views/pqs/supervise_jb/terminalNetworkDetection/components/jointDebugList/index.vue

@@ -1,10 +1,10 @@
 <!---终端入网检测-->
 <template>
-    <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+    <TableHeader area datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef">
         <template #select>
             <el-form-item label="搜索">
                 <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端、监测点名称"
-                    clearable></el-input>
+                    clearable style="width: 230px"></el-input>
             </el-form-item>
             <el-form-item label="流程状态">
                 <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">

src/views/pqs/supervise_jb/terminalNetworkDetection/components/monitorpoint/addForm.vue

@@ -954,6 +954,8 @@ const confirmForm = async (flag: boolean) => {
             ruleFormRef.value.resetFields()
             resetForm()
             close()
+        }).catch(() => {
+            loading.value = false
         })
     } else {
         // 先判断提交终端信息与监测点信息
@@ -994,7 +996,9 @@ const confirmForm = async (flag: boolean) => {
                         ruleFormRef.value.resetFields()
                         resetForm()
                         close()
-                    })
+                    }).catch(() => {
+            loading.value = false
+        })
                 } else {
                     confirmFormData.id = resendId.value
                     await updateMointorPointFormData(confirmFormData).then(res => {
@@ -1007,7 +1011,9 @@ const confirmForm = async (flag: boolean) => {
                             resetForm()
                             close()
                         }
-                    })
+                    }).catch(() => {
+            loading.value = false
+        })
                 }
             } else {
                 // // console.log('表单验证失败')

src/views/pqs/supervise_jb/terminalNetworkDetection/components/monitorpoint/index.vue

@@ -1,10 +1,10 @@
 <!---终端入网检测-->
 <template>
-    <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+    <TableHeader area datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef">
         <template #select>
             <el-form-item label="搜索">
                 <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端、监测点名称"
-                    clearable></el-input>
+                    clearable style="width: 230px"></el-input>
             </el-form-item>
             <el-form-item label="流程状态">
                 <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">

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

@@ -1272,6 +1272,8 @@ const confirmForm = async (flag: boolean) => {
                 resetForm()
                 close()
             }
+        }).catch(() => {
+            loading.value = false
         })
     } else {
         // 提交终端信息
@@ -1310,7 +1312,9 @@ const confirmForm = async (flag: boolean) => {
                             resetForm()
                             close()
                         }
-                    })
+                    }).catch(() => {
+            loading.value = false
+        })
                 } else {
                     confirmFormData.reporter = adminInfo.$state.id
                     confirmFormData.orgId = adminInfo.$state.deptId
@@ -1327,7 +1331,9 @@ const confirmForm = async (flag: boolean) => {
                             resetForm()
                             close()
                         }
-                    })
+                    }).catch(() => {
+            loading.value = false
+        })
                 }
             } else {
                 console.log('表单验证失败')

src/views/pqs/supervise_jb/terminalNetworkDetection/components/terminainal/index.vue

@@ -1,9 +1,9 @@
 <template>
-    <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+    <TableHeader area datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef">
         <template #select>
             <el-form-item label="搜索">
-                <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端、监测点名称"
+                <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端名称"
-                    clearable></el-input>
+                    clearable style="width: 180px"></el-input>
             </el-form-item>
             <el-form-item label="流程状态">
                 <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">

src/views/pqs/supervise_jb/testRun/index.vue

@@ -1,7 +1,7 @@
 <!---试运行列表-->
 <template>
     <div class="default-main">
-        <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+        <TableHeader area datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef">
             <template #select>
                 <el-form-item label="流程状态">
                     <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">

src/views/system/bpm/task/done/index.vue

@@ -1,7 +1,7 @@
 <!--待办事项列表-->
 <template>
     <div>
-        <TableHeader date-picker theCurrentTime>
+        <TableHeader date-picker theCurrentTime showTimeAll>
             <template v-slot:select>
                 <el-form-item label='任务名称'>
                     <el-input v-model='tableStore.table.params.searchValue' placeholder='请输入任务名称' clearable maxlength="32"  show-word-limit/>

src/views/system/bpm/task/myInstance/index.vue

@@ -1,7 +1,7 @@
 <!--待办事项列表-->
 <template>
     <div>
-        <TableHeader date-picker theCurrentTime>
+        <TableHeader date-picker theCurrentTime showTimeAll>
             <template v-slot:select>
                 <el-form-item label="任务名称">
                     <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入任务名称" clearable