修改南工程测试问题

src/utils/dictionary.ts

@@ -169,6 +169,7 @@ export const indexOptions = [
 ]
 //谐波次数
 export const harmonicOptions = [
+    { label: '基波', value: 1 },
     { label: '2次', value: 2 },
     { label: '3次', value: 3 },
     { label: '4次', value: 4 },

src/views/pqs/harmonicMonitoring/monitoringPoint/online/wentaishujufenxi/index.vue

@@ -71,7 +71,7 @@ const formData = reactive<{
     searchEndTime: '',
     condition: ['10', '11', '12'],
     valueType: 1,
-    harmonic: 2,
+    harmonic: 1,
     inHarmonic: 1,
     ptType: 0
 })
@@ -1092,10 +1092,27 @@ const shujuchuli = (res: any) => {
 }
 const rendering = () => {
     height.value = mainHeight(200, list.value.length > 1 ? 2 : 1)
+    
     list.value.forEach((item: any) => {
+        if (item.targetName == '电压不平衡') {
+
+            item.valueName = ''
+            item.legend = item.legend.map((item2: any) => {
+                if (item2 == '零序电压') {
+                    item2 = item2 + '(V)'
+                } else if (item2 == '正序电压') {
+                    item2 = item2 + '(kV)'
+                } else if (item2 == '负序电压') {
+                    item2 = item2 + '(V)'
+                }
+                return item2
+            })
+           
+        }
+
         let opitonserise: any[] = []
         item.legend.forEach((item2: any) => {
-            if (item.avalue !== undefined && (item2 == 'A相' || item2 == 'AB相' || item2 == '零序电压')) {
+            if (item.avalue !== undefined && (item2 == 'A相' || item2 == 'AB相' || item2 == '零序电压(V)')) {
                 let data = {
                     name: item2,
                     symbol: 'none',
@@ -1111,7 +1128,7 @@ const rendering = () => {
                     data: item.avalue
                 }
                 opitonserise.push(data)
-            } else if (item.bvalue !== undefined && (item2 == 'B相' || item2 == 'BC相' || item2 == '正序电压')) {
+            } else if (item.bvalue !== undefined && (item2 == 'B相' || item2 == 'BC相' || item2 == '正序电压(kV)')) {
                 let data = {
                     name: item2,
                     symbol: 'none',
@@ -1127,7 +1144,7 @@ const rendering = () => {
                     data: item.bvalue
                 }
                 opitonserise.push(data)
-            } else if (item.cvalue !== undefined && (item2 == 'C相' || item2 == 'CA相' || item2 == '负序电压')) {
+            } else if (item.cvalue !== undefined && (item2 == 'C相' || item2 == 'CA相' || item2 == '负序电压(V)')) {
                 let data = {
                     name: item2,
                     symbol: 'none',
@@ -1356,17 +1373,17 @@ const getEcharts = () => {
                                     : params[i].value[1] == 0
                                         ? '总谐波电流方向:无<br/>'
                                         : '总谐波电流方向:流出<br/>'
-                        } else if (params[i].seriesName == '正序电压') {
+                        } else if (params[i].seriesName == '正序电压(kV)') {
                             let str = (params[i].value[1] * 1).toString()
                             let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
                             let str1 = str.replace(reg, '$1,')
-                            tips += params[i].seriesName + ':' + str1 + 'kV<br/>'
+                            tips += params[i].seriesName.replace("(kV)", "") + ':' + str1 + 'kV<br/>'
-                        } else if (params[i].seriesName == '零序电压' || params[i].seriesName == '负序电压') {
+                        } else if (params[i].seriesName == '零序电压(V)' || params[i].seriesName == '负序电压(V)') {
                             let str = (params[i].value[1] * 1).toString()
                             let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
                             let str1 = str.replace(reg, '$1,')
-                            tips += params[i].seriesName + ':' + str1 + 'V<br/>'
+                            tips += params[i].seriesName.replace("(V)", "") + ':' + str1 + 'V<br/>'
-                        } else if (params[i].seriesName !== '正序电压') {
+                        } else if (params[i].seriesName !== '正序电压(kV)') {
                             let str = (params[i].value[1] * 1).toString()
                             let reg = str.indexOf('.') > -1 ? /(\d)(?=(\d{3})+\.)/g : /(\d)(?=(?:\d{3})+$)/g
                             let str1 = str.replace(reg, '$1,')

src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue

@@ -2,40 +2,34 @@
     <div class="default-main" :style="height">
         <splitpanes style="height: 100%" class="default-theme" id="navigation-splitpanes">
             <pane :size="size">
-                <PointTree
+                <PointTree v-if="showTree" :default-expand-all="false" @node-click="handleNodeClick"
-                    :default-expand-all="false"
+                    @init="handleNodeClick">
-                    @node-click="handleNodeClick"
+                </PointTree>
-                    @init="handleNodeClick"
-                ></PointTree>
             </pane>
             <pane style="background: #fff" :style="height">
                 <TableHeader ref="TableHeaderRef" datePicker>
                     <template v-slot:select>
                         <el-form-item label="模板策略">
                             <el-select v-model="Template" @change="changetype" placeholder="请选择模版" value-key="id">
-                                <el-option
+                                <el-option v-for="item in templatePolicy" :key="item.id" :label="item.name"
-                                    v-for="item in templatePolicy"
+                                    :value="item"></el-option>
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item"
-                                ></el-option>
                             </el-select>
                         </el-form-item>
                         <el-form-item label="报表类型">
                             <el-input readonly type='text' value='分析报表'></el-input>
-<!--                            <el-select-->
+                            <!--                            <el-select-->
-<!--                                :disabled="true"-->
+                            <!--                                :disabled="true"-->
-<!--                                v-model="reportForm"-->
+                            <!--                                v-model="reportForm"-->
-<!--                                :popper-append-to-body="false"-->
+                            <!--                                :popper-append-to-body="false"-->
-<!--                                placeholder="请选择报表类型"-->
+                            <!--                                placeholder="请选择报表类型"-->
-<!--                            >-->
+                            <!--                            >-->
-<!--                                <el-option-->
+                            <!--                                <el-option-->
-<!--                                    v-for="item in reportFormList"-->
+                            <!--                                    v-for="item in reportFormList"-->
-<!--                                    :key="item.value"-->
+                            <!--                                    :key="item.value"-->
-<!--                                    :label="item.label"-->
+                            <!--                                    :label="item.label"-->
-<!--                                    :value="item.value"-->
+                            <!--                                    :value="item.value"-->
-<!--                                ></el-option>-->
+                            <!--                                ></el-option>-->
-<!--                            </el-select>-->
+                            <!--                            </el-select>-->
                         </el-form-item>
                     </template>
                     <template #operation>
@@ -64,6 +58,7 @@ import { exportExcel } from '@/views/system/reportForms/export.js'
 defineOptions({
     name: 'harmonic-boot/xieboReport'
 })
+const showTree = ref(false)
 const height = mainHeight(20)
 const size = ref(0)
 const dictData = useDictData()
@@ -99,7 +94,7 @@ const tableStore = new TableStore({
         tableStore.table.data.forEach((item: any) => {
             item.data1 ? (item.data = JSON.parse(item.data1)) : ''
             item.celldata.forEach((k: any) => {
-              item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v ) : ''
+                item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v) : ''
             })
         })
         console.log(tableStore.table.data)
@@ -128,6 +123,9 @@ getTemplateByDept({ id: dictData.state.area[0].id }).then((res: any) => {
     templatePolicy.value = res.data
     Template.value = res.data[0]
     reportForm.value = res.data[0]?.reportForm
+    showTree.value = true
+}).catch((err: any) => {
+    showTree.value = true
 })
 const changetype = (val: any) => {
     reportForm.value = val.reportForm

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

@@ -1,8 +1,47 @@
 <template>
     <div class="default-main">
         <DatePicker ref="datePickerRef" theCurrentTime style="display: none" />
-        <baidu-map class="map" :style="height" @ready="initMap" @zoomend='syncCenterAndZoom'
+        <!-- 搜索框 -->
-            :center="{ lng: 116.403765, lat: 39.914850 }" :zoom="10" :scroll-wheel-zoom='true'>
+        <div class="query-box-wrap">
+            <el-input v-model.trim="inputQuery" style="height: 46px; width: 334px" @keyup.enter="DeviceQ"
+                placeholder="请输入终端名称">
+                <template #prefix>
+                    <div class="Icon"></div>
+                </template>
+
+                <template #suffix>
+                    <el-icon @click="DeviceQ" class="el-input__icon">
+                        <Search />
+                    </el-icon>
+                </template>
+            </el-input>
+        </div>
+        <!-- 搜索内容展示 -->
+        <div class="query-box-wrap collapse" v-show="showWrap">
+            <div v-if="QueryList.length == 0" class="collapse_none">查询无结果</div>
+            <el-collapse v-if="QueryList.length > 0 && showCollapse" v-model="activeName" accordion>
+                <el-collapse-item v-for="(item, i) in QueryList" :name="i">
+                    <template #title>
+                        {{ item.psrName }}
+                        <span class="ml10" style="color: #0d867f">{{ item.count }}</span>
+                    </template>
+                    <div class="collapseBox">
+                        <div class="group-list__item"
+                            :style="colorKey == k.coordinate ? 'background-color: #009ea81a;' : ''"
+                            v-for="k in item.psrList" @click="flyTo(k)">
+                            <p>{{ k.psrName }}</p>
+                            <p>{{ k.vlevelName }}|{{ k.maintOrgName }}</p>
+                        </div>
+                    </div>
+                </el-collapse-item>
+            </el-collapse>
+            <div v-if="QueryList.length > 0 && !showCollapse" class="collapse_none" style="color: #009ea8"
+                @click="showCollapse = true">
+                展开搜索结果
+            </div>
+        </div>
+        <baidu-map class="map" :style="height" @ready="initMap" @zoomend='syncCenterAndZoom' :center="center"
+            :zoom="zoomMap" :scroll-wheel-zoom='true'>
             <!--  线-->
             <div v-if='zoom > 13'>
                 <bm-polyline :path='path' v-for='(path, index) in polyline' :key='index'></bm-polyline>
@@ -16,14 +55,50 @@
             <!-- 点 -->
             <BmlMarkerClusterer maxZoom='12'>
                 <bm-marker :position='path' v-for='path in areaLineInfo' :key='path.lineId' :icon='path.icon'
-                    @click='markerClick(path)'></bm-marker>
+                    @click='markerClick(path)' :zIndex="1">
-            </BmlMarkerClusterer>
+
-            <!-- 行政区划 -->
+                    <bm-label v-if='zoom > 14' :content="path.lineName"
-            <bm-boundary v-for="item in boundaryList" :name="item.name" :strokeWeight="2" strokeColor="#0e8780"
+                        :labelStyle="{ color: '#fff', border: '0px solid #fff', backgroundColor: 'rgba(0, 0, 0, 0.5)', borderRadius: '10px', padding: '2px 5px', fontSize: '12px', lineHeight: '15px', transform: 'translateX(-30%)' }"
-                fillColor="#0e8780" fillOpacity="0.05"></bm-boundary>
+                        :offset="{ height: 33 }" />
+
+                </bm-marker>
+            </BmlMarkerClusterer>
+            <!-- 详情 -->
+            <bm-marker :position='infoWindowPoint' :icon="{ url: '1', size: { width: 0, height: 0 } }">
+                <bm-info-window :show='infoWindowPoint.show' @close='infoWindowPoint.show = false'>
+                    <el-descriptions :title='infoWindowPoint.lineName' :column='1' v-if='infoWindowPoint.lineId'>
+                        <el-descriptions-item label='供电公司'>{{ infoWindowPoint.gdName }}</el-descriptions-item>
+                        <el-descriptions-item label='变电站'>{{ infoWindowPoint.subName }}</el-descriptions-item>
+                        <el-descriptions-item label='母线'>{{ infoWindowPoint.voltageName }}</el-descriptions-item>
+                        <el-descriptions-item label='网络参数'>
+                            {{ infoWindowPoint.ip }}
+                        </el-descriptions-item>
+                        <el-descriptions-item label='PT变化'>{{ infoWindowPoint.pt2 }}</el-descriptions-item>
+                        <el-descriptions-item label='CT变化'>{{ infoWindowPoint.ct2 }}</el-descriptions-item>
+                        <el-descriptions-item label='生产厂家'>
+                            {{ infoWindowPoint.manufacturer }}
+                        </el-descriptions-item>
+                        <el-descriptions-item label='终端状态'>
+                            {{
+                                infoWindowPoint.runFlag == 0 ? '投运' : infoWindowPoint.runFlag == 1 ? '热备用' : '停运'
+                            }}
+                        </el-descriptions-item>
+                        <el-descriptions-item label='通讯状态'>
+                            {{ infoWindowPoint.comFlag == 0 ? '中断' : '正常' }}
+                        </el-descriptions-item>
+                        <el-descriptions-item>
+                            <el-button type='primary' size='small' @click='lookPoint(infoWindowPoint)'>查看详情</el-button>
+
+                        </el-descriptions-item>
+                    </el-descriptions>
+                    <el-descriptions :title='infoWindowPoint.subName' :column='1' v-else-if='infoWindowPoint.subId'
+                        style='padding-top: 10px'></el-descriptions>
+                </bm-info-window>
+            </bm-marker>
+            <!-- 行政区划 -->
+            <!-- <bm-boundary v-for="item in boundaryList" :name="item.name" :strokeWeight="2" strokeColor="#0e8780"
+                fillColor="#0e8780" fillOpacity="0.05"></bm-boundary> -->
 
-            <!-- <bm-polygon :path="polygonPath" stroke-color="blue" :stroke-opacity="0.5" :stroke-weight="2" :editing="true"
-                @lineupdate="updatePolygonPath" /> -->
 
         </baidu-map>
     </div>
@@ -35,10 +110,19 @@ import { getAreaLineInfo } from '@/api/event-boot/areaInfo'
 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'
+const emit = defineEmits(['changeValue', 'drop', 'show'])
 const datePickerRef = ref()
 const height = mainHeight(20)
 // 页面中直接引入就可以
 const dictData = useDictData()
+const inputQuery: any = ref('')
+const QueryList: any = ref([])
+const activeName: any = ref(0)
+const zoomMap = ref(9)
+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([
@@ -55,15 +139,17 @@ const siteList = ref<any>([])
 const polyline = ref<any>([])
 const lineId = ref('')
 const center = ref({
-    lng: 0,
+    lng: 116.403765, lat: 39.914850
-    lat: 0
 })
+const infoWindowPoint = ref<anyObj>({
+    lng: 0,
+    lat: 0,
+    show: false
+})
+// 地图实例
 const initMap = async ({ BMap, map }: any) => {
-
-
-
-
 }
+// 加载点
 const addMarkers = async (row?: any, key?: any, num?: any) => {
 
     let params = {
@@ -78,8 +164,8 @@ const addMarkers = async (row?: any, key?: any, num?: any) => {
     }
 
     let { data } = await getAreaLineInfo(params)
-    polyline.value=[]
+    polyline.value = []
-    areaLineInfo.value=[]
+    areaLineInfo.value = []
     let r = 0.0035
     let list = data.filter((item: any) => item.lng != 0)
     list.forEach((item: any) => {
@@ -154,11 +240,12 @@ const addMarkers = async (row?: any, key?: any, num?: any) => {
         areaLineInfo.value.push(...item.children)
     })
     siteList.value = list
-    center.value.lng = areaLineInfo.value[0].lng
+    // center.value.lng = areaLineInfo.value[0].lng
-    center.value.lat = areaLineInfo.value[0].lat
+    // center.value.lat = areaLineInfo.value[0].lat
 
 
 }
+// 获取zoom
 const syncCenterAndZoom = (e: any) => {
     zoom.value = e.target.getZoom()
 }
@@ -174,12 +261,62 @@ const locatePositions = (e: any) => {
     //     onlyDisplay: true
     // })
 }
+// 点击点
 const markerClick = (e: any) => {
-    // infoWindowPoint.value = e
+
-    // infoWindowPoint.value.show = true
+    infoWindowPoint.value = e
+    infoWindowPoint.value.show = true
 }
-const mouseover = () => {
+// 查看详情
-    console.log(123);
+const lookPoint = (e: any) => {
+    emit('drop', e.lineId)
+    emit('show', true)
+
+}
+// 搜索
+const DeviceQ = () => {
+
+    showCollapse.value = true
+    if (inputQuery.value.length == 0) return
+
+    let list = []
+    let regex = new RegExp(inputQuery.value, 'i')
+    let data = areaLineInfo.value.filter((item: any) => regex.test(item.lineName))
+        .map((item: any) => {
+            return {
+
+                psrName: item.lineName,
+                vlevelName: item.voltageScale,
+                maintOrgName: item.gdName,
+                coordinate: [item.lng, item.lat]
+            }
+        })
+    // data.replace(//s/g,',')
+
+
+    if (data.length > 0) {
+        list.push({
+            count: data.length,
+            psrList: data,
+            psrName: '监测点'
+        })
+    }
+    QueryList.value = list
+    showWrap.value = true
+}
+
+// 定位
+const flyTo = (e: any) => {
+    console.log("🚀 ~ flyTo ~ e:", e)
+    let regex = new RegExp(e.psrName, 'i')
+    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]
+    if(data){
+        markerClick(data)
+    }
+   
 
 }
 onMounted(() => {
@@ -187,8 +324,15 @@ onMounted(() => {
 defineExpose({ addMarkers, locatePositions })
 </script>
 <style lang="scss" scoped>
+@use '@/views/pqs/qualityInspeection/panorama/components/style/map.scss';
+
 .map {
     width: 100%;
 
 }
-</style>
+
+.query-box-wrap {
+    z-index: 1;
+}
+
+// @use '@/views/pqs/panorama/components/style/map.scss';</style>

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

@@ -3,6 +3,7 @@
     top: 10px;
     left: calc(50% - 305px);
     border-radius: 8px;
+    z-index: 1;
     overflow: hidden;
     .Icon {
         width: 30px;

src/views/pqs/panorama/index.vue

@@ -37,7 +37,8 @@
             </div>
         </div>
 
-        <Info v-if="!lineInfo" ref="InfoRef" @back="lineInfo = true" />
+        <Info v-if="!lineInfo" style="    position: absolute;
+    top: -10px;width: 100%;" ref="InfoRef" @back="lineInfo = true,infoShow(false)" />
     </div>
 </template>
 

src/views/pqs/voltageSags/monitoringPoint/online/navigation/map.vue

@@ -38,7 +38,7 @@
                 <span>无暂降</span>
             </div>
         </div>
-        <baidu-map class='bm-view' :zoom='zoom' :map-click='false' :scroll-wheel-zoom='true' :center='center'
+        <baidu-map class='bm-view'  v-if="hackReset" :zoom='zoom' :map-click='false' :scroll-wheel-zoom='true' :center='center'
             @ready='handler' @zoomend='syncCenterAndZoom' :dragging="true" >
             <bm-map-type :map-types="['BMAP_NORMAL_MAP', 'BMAP_HYBRID_MAP']"
                 anchor='BMAP_ANCHOR_TOP_RIGHT'></bm-map-type>
@@ -94,7 +94,7 @@
 
 <script setup lang='ts'>
 import { BmlMarkerClusterer } from 'vue-baidu-map-3x'
-import { nextTick, ref, watch } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { getAreaLineInfo } from '@/api/event-boot/areaInfo'
 import DatePicker from '@/components/form/datePicker/index.vue'
 import { useAdminInfo } from '@/stores/adminInfo'
@@ -116,7 +116,7 @@ const adminInfo = useAdminInfo()
 const datePickerRef = ref()
 const zoom = ref(11)
 const loading = ref(true)
-
+const hackReset = ref(true)
 
 const center = ref({
     lng: 0,
@@ -241,6 +241,19 @@ const markerClick = (e: any) => {
 const changeTab = (e: string) => {
     emit('changeTab', e)
 }
+onMounted(() => {
+    if (siteList.value.length == 0) {
+        setTimeout(() => {
+            hackReset.value = false
+
+        }, 1000)
+        setTimeout(() => {
+            hackReset.value = true
+
+        }, 2000)
+    }
+
+})
 </script>
 <style lang='scss' scoped>
 .bm-view {

src/views/pqs/voltageSags/overview/index.vue

@@ -48,8 +48,8 @@
                         :value='item.lineId'></el-option>
                 </el-select>
             </div>
-            <baidu-map class='bm-view' :zoom='zoom' :map-click='false' :scroll-wheel-zoom='true' :center='center'
+            <baidu-map class='bm-view' v-if="hackReset" :zoom='zoom' :map-click='false' :scroll-wheel-zoom='true'
-                @ready='handler' :dragging="true" @zoomend='syncCenterAndZoom'>
+                :center='center' @ready='handler' :dragging="true" @zoomend='syncCenterAndZoom'>
                 <bm-map-type :map-types="['BMAP_NORMAL_MAP', 'BMAP_HYBRID_MAP']"
                     anchor='BMAP_ANCHOR_TOP_RIGHT'></bm-map-type>
                 <!--  线-->
@@ -115,7 +115,7 @@
 
 <script setup lang='ts'>
 import { BmlMarkerClusterer } from 'vue-baidu-map-3x'
-import { ref } from 'vue'
+import { ref, onMounted } from 'vue'
 import { mainHeight } from '@/utils/layout'
 import { getAreaLineInfo } from '@/api/event-boot/areaInfo'
 import DatePicker from '@/components/form/datePicker/index.vue'
@@ -130,6 +130,7 @@ defineOptions({
 const height = mainHeight(20)
 const adminInfo = useAdminInfo()
 const datePickerRef = ref()
+const hackReset = ref(true)
 const zoom = ref(13)
 const loading = ref(true)
 const popupEvent = ref()
@@ -281,6 +282,19 @@ const lookPoint = () => {
         }
     })
 }
+onMounted(() => {
+    if (siteList.value.length == 0) {
+        setTimeout(() => {
+            hackReset.value = false
+
+        }, 1000)
+        setTimeout(() => {
+            hackReset.value = true
+
+        }, 2000)
+    }
+
+})
 </script>
 <style lang='scss' scoped>
 .bm-view {