冀北需求变更整改

2025-01-07 16:32:42 +08:00
parent 7d90b6bfcc
commit 72f2c5d0f3
52 changed files with 536 additions and 254 deletions
--- a/src/views/pqs/panorama/components/cityMapR.vue
+++ b/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: [
                    {
--- a/src/views/pqs/panorama/components/details/stand.vue
+++ b/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
-                        v-model="contaminate"
-                        style="margin-right: 50px"
-                        @change="contaminateC"
-                        size="small"
-                    >
+                    <el-radio-group v-model="contaminate" 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
-                        v-for="(item, i) in picEChart"
-                        :style="i == 3 ? `margin-left: 20%;` : ``"
-                        class="MyEChart"
-                        :options="item"
-                    />
+                    <MyEChart v-for="(item, i) in picEChart" :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;
 }
--- a/src/views/pqs/panorama/components/map.vue
+++ b/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]
-    if(data){
+    let data = areaLineInfo.value.filter((item: any) => regex.test(item.lineName))[0]
+    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>
--- a/src/views/pqs/panorama/components/style/map.scss
+++ b/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;
 }
+
--- a/src/views/pqs/panorama/index.vue
+++ b/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) {