修改辽宁反馈问题

src/views/pqs/panorama/components/line/info.vue

@@ -3,7 +3,7 @@
         <DatePicker ref="datePickerRef" style="display: none" theCurrentTime />
         <el-page-header :icon="ArrowLeft" @back="emit('back')">
             <template #content>
-                <span style="font-size: 16px">{{ dropList.lineName }}详情　</span>
+                <span style="font-size: 16px">{{ dropList.objName ? dropList.objName + '_' : '' }}{{ dropList.lineName }}详情　</span>
                 <span style="font-weight: 500">最新数据时间：</span>
                 <span style="color: var(--color-primary-default)">{{ dropList.updateTime }}</span>
             </template>

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

@@ -7,7 +7,7 @@
                 v-model.trim="inputQuery"
                 style="height: 46px; width: 334px"
                 @keyup.enter="DeviceQ"
-                placeholder="请输入终端名称"
+                placeholder="请输入监测点相关信息"
             >
                 <template #prefix>
                     <div class="Icon"></div>
@@ -37,7 +37,7 @@
                             @click="flyTo(k)"
                         >
                             <p>{{ k.psrName }}</p>
-                            <p>{{ k.vlevelName }}|{{ k.maintOrgName }}</p>
+                            <p>{{ k.vlevelName }} | {{ k.maintOrgName }} {{ k.objName ? `| ${k.objName}` : '' }}</p>
                         </div>
                     </div>
                 </el-collapse-item>
@@ -484,6 +484,9 @@ const lookPoint = (e: any) => {
     emit('show', true)
 }
 // 搜索
+const matchLineItem = (item: any, regex: RegExp) =>
+    regex.test(item.lineName) || (item.objName && regex.test(item.objName))
+
 const DeviceQ = () => {
     showCollapse.value = true
     if (inputQuery.value.length == 0) return
@@ -491,13 +494,14 @@ const DeviceQ = () => {
     let list = []
     let regex = new RegExp(inputQuery.value, 'i')
     let data = areaLineInfo.value
-        .filter((item: any) => regex.test(item.lineName))
+        .filter((item: any) => matchLineItem(item, regex))
         .map((item: any) => {
             return {
                 psrName: item.lineName,
                 vlevelName: item.voltageScale,
                 maintOrgName: item.gdName,
-                coordinate: [item.lng, item.lat]
+                coordinate: [item.lng, item.lat],
+                objName: item.objName
             }
         })
     // data.replace(//s/g,',')
@@ -522,7 +526,7 @@ const flyTo = (e: any, zoom?: number) => {
         zoomMap.value = zoom
     } else {
         zoomMap.value = 15
-        let data = areaLineInfo.value.filter((item: any) => regex.test(item.lineName))[0]
+        let data = areaLineInfo.value.filter((item: any) => matchLineItem(item, regex))[0]
         if (data) {
             markerClick(data)
         }

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

@@ -31,8 +31,8 @@
                 <div>
                     <div class="vcl mt2">
                         <p
-                            v-for="(item, i) in vList"
-                            :style="i == 0 ? 'width: 60px' : i == vList?.length - 1 ? 'width: 32px' : 'flex:1'"
+                            v-for="(item, i) in displayVList"
+                            :style="i == 0 ? 'width: 60px' : i == displayVList?.length - 1 ? IS_LN ? 'flex:1' : 'width: 32px' : 'flex:1'"
                         >
                             {{ item }}
                         </p>
@@ -43,7 +43,7 @@
                             {{ item.title }}
                         </p>
                         <p
-                            v-for="(k, i) in vList?.slice(0, vList.length - 2)"
+                            v-for="(k, i) in dataVList"
                             class="numOne"
                             @click="LookMap(item.list[i].numOneList, item.list[i].numTwoList, 0)"
                         >
@@ -58,7 +58,7 @@
                         <p class="numOne" @click="LookMap(item.list[3].numOneList, item.list[3].numTwoList, 0)">
                             {{ item.list[3].numOne }}
                         </p> -->
-                        <p
+                        <p v-if="!IS_LN"
                             style="font-size: 12px; width: 32px; cursor: pointer; color: var(--el-color-primary)"
                             @click.stop="open(i)"
                         >
@@ -165,7 +165,7 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, reactive, ref, provide } from 'vue'
+import { onMounted, reactive, ref, provide, computed } from 'vue'
 import { useDictData } from '@/stores/dictData'
 import { mainHeight } from '@/utils/layout'
 import { ArrowRight, View } from '@element-plus/icons-vue'
@@ -180,6 +180,7 @@ import {
     getGridDiagramRunData, getAreaObjAlarm
 } from '@/api/device-boot/panorama'
 const emit = defineEmits(['LookMap', 'GridDiagram'])
+const IS_LN = import.meta.env.VITE_NAME == 'LN' || import.meta.env.VITE_NAME == 'LNqr'
 const dictData = useDictData()
 const show = ref(false)
 const standRef = ref()
@@ -391,6 +392,10 @@ const legengList = [
 ]
 const panoramicVoltage: any = dictData.getBasicData('Dev_Voltage_Stand')
 const vList = ref(['', '500kV', '220kV', '110kV', '35kV', ''])
+const displayVList = computed(() => (IS_LN && vList.value.length ? vList.value.slice(0, -1) : vList.value))
+const dataVList = computed(() =>
+    IS_LN ? vList.value.slice(1, -1) : vList.value.slice(0, vList.value.length - 2)
+)
 const formRow: any = ref({})
 const height = mainHeight(30)
 const boxHeight = mainHeight(290, 2)