diff --git a/src/views/oneMap/SmartDrainage/PsLeftBox.vue b/src/views/oneMap/SmartDrainage/PsLeftBox.vue index 885a45f..4a6974b 100644 --- a/src/views/oneMap/SmartDrainage/PsLeftBox.vue +++ b/src/views/oneMap/SmartDrainage/PsLeftBox.vue @@ -231,7 +231,7 @@ width: 430px; margin: 0 auto; height: calc(100% - 40px); - overflow: auto; + overflow: hidden; cursor: pointer; // background: red; li { diff --git a/src/views/oneMap/SmartDrainage/PsLeftBox.vue b/src/views/oneMap/SmartDrainage/PsLeftBox.vue index 885a45f..4a6974b 100644 --- a/src/views/oneMap/SmartDrainage/PsLeftBox.vue +++ b/src/views/oneMap/SmartDrainage/PsLeftBox.vue @@ -231,7 +231,7 @@ width: 430px; margin: 0 auto; height: calc(100% - 40px); - overflow: auto; + overflow: hidden; cursor: pointer; // background: red; li { diff --git a/src/views/oneMap/components/FHPL.vue b/src/views/oneMap/components/FHPL.vue index 28bde00..0ff3bff 100644 --- a/src/views/oneMap/components/FHPL.vue +++ b/src/views/oneMap/components/FHPL.vue @@ -33,12 +33,17 @@ const AllData = reactive({}); const curType = ref(false); const isShowMonitorCalender = ref(false); +const Bottomshow = ref(false); +const control = ref('0'); const showPanel = ref(true); //面板展开收起 // 面板内容展开收起控制 const props = defineProps({ showPanel: { type: Boolean, }, + BottomshowPanel: { + type: Boolean, + }, }); function openUserDialog(params) { isShowMonitorCalender.value = true; @@ -60,16 +65,12 @@ () => props.showPanel, () => { showPanel.value = props.showPanel; - bus.on('BottomHidden', params => { - console.log(params, 'params2222'); - }); + Bottomshow.value = props.BottomshowPanel; }, { immediate: true } ); onMounted(() => { - bus.on('BottomHidden', params => { - console.log(params, 'params111'); - }); + bus.emit('checkBottom', control.value); }); diff --git a/src/views/oneMap/SmartDrainage/PsLeftBox.vue b/src/views/oneMap/SmartDrainage/PsLeftBox.vue index 885a45f..4a6974b 100644 --- a/src/views/oneMap/SmartDrainage/PsLeftBox.vue +++ b/src/views/oneMap/SmartDrainage/PsLeftBox.vue @@ -231,7 +231,7 @@ width: 430px; margin: 0 auto; height: calc(100% - 40px); - overflow: auto; + overflow: hidden; cursor: pointer; // background: red; li { diff --git a/src/views/oneMap/components/FHPL.vue b/src/views/oneMap/components/FHPL.vue index 28bde00..0ff3bff 100644 --- a/src/views/oneMap/components/FHPL.vue +++ b/src/views/oneMap/components/FHPL.vue @@ -33,12 +33,17 @@ const AllData = reactive({}); const curType = ref(false); const isShowMonitorCalender = ref(false); +const Bottomshow = ref(false); +const control = ref('0'); const showPanel = ref(true); //面板展开收起 // 面板内容展开收起控制 const props = defineProps({ showPanel: { type: Boolean, }, + BottomshowPanel: { + type: Boolean, + }, }); function openUserDialog(params) { isShowMonitorCalender.value = true; @@ -60,16 +65,12 @@ () => props.showPanel, () => { showPanel.value = props.showPanel; - bus.on('BottomHidden', params => { - console.log(params, 'params2222'); - }); + Bottomshow.value = props.BottomshowPanel; }, { immediate: true } ); onMounted(() => { - bus.on('BottomHidden', params => { - console.log(params, 'params111'); - }); + bus.emit('checkBottom', control.value); }); diff --git a/src/views/oneMap/components/FXHG.vue b/src/views/oneMap/components/FXHG.vue index e08bc2c..0f48499 100644 --- a/src/views/oneMap/components/FXHG.vue +++ b/src/views/oneMap/components/FXHG.vue @@ -2,7 +2,9 @@
11111
-
111
+
+ 111 +
放回放回返回 @@ -17,6 +19,8 @@ const AllData = reactive({}); const curType = ref(false); const showPanel = ref(true); //面板展开收起 +const showBottom = ref(true); +const control = ref('1'); // 面板内容展开收起控制 const props = defineProps({ showPanel: { @@ -26,8 +30,10 @@ function goBack(params) { console.log('111'); showPanel.value = true; + showBottom.value = false; curType.value = true; } + watch( () => props.showPanel, () => { @@ -37,9 +43,7 @@ ); onMounted(() => { - bus.on('BottomHidden', params => { - console.log(params, 'params111'); - }); + bus.emit('checkBottom', control.value); let initePSTimer = setInterval(() => { if (!newfiberMapbox) return; bus.emit('setLayerVisible', { layername: 'ysLine1', isCheck: true }); @@ -79,10 +83,10 @@ } .BottomBox { width: 900px; - height: 300px; + height: 280px; position: absolute; - right: 100px; - top: 70px; + right: 500px; + bottom: 70px; background: linear-gradient(0deg, rgba(0, 93, 114, 0.8) 0%, rgba(0, 93, 114, 0.8) 100%); border-radius: 6px; border: 1px solid #47eef3; diff --git a/src/views/oneMap/SmartDrainage/PsLeftBox.vue b/src/views/oneMap/SmartDrainage/PsLeftBox.vue index 885a45f..4a6974b 100644 --- a/src/views/oneMap/SmartDrainage/PsLeftBox.vue +++ b/src/views/oneMap/SmartDrainage/PsLeftBox.vue @@ -231,7 +231,7 @@ width: 430px; margin: 0 auto; height: calc(100% - 40px); - overflow: auto; + overflow: hidden; cursor: pointer; // background: red; li { diff --git a/src/views/oneMap/components/FHPL.vue b/src/views/oneMap/components/FHPL.vue index 28bde00..0ff3bff 100644 --- a/src/views/oneMap/components/FHPL.vue +++ b/src/views/oneMap/components/FHPL.vue @@ -33,12 +33,17 @@ const AllData = reactive({}); const curType = ref(false); const isShowMonitorCalender = ref(false); +const Bottomshow = ref(false); +const control = ref('0'); const showPanel = ref(true); //面板展开收起 // 面板内容展开收起控制 const props = defineProps({ showPanel: { type: Boolean, }, + BottomshowPanel: { + type: Boolean, + }, }); function openUserDialog(params) { isShowMonitorCalender.value = true; @@ -60,16 +65,12 @@ () => props.showPanel, () => { showPanel.value = props.showPanel; - bus.on('BottomHidden', params => { - console.log(params, 'params2222'); - }); + Bottomshow.value = props.BottomshowPanel; }, { immediate: true } ); onMounted(() => { - bus.on('BottomHidden', params => { - console.log(params, 'params111'); - }); + bus.emit('checkBottom', control.value); }); diff --git a/src/views/oneMap/components/FXHG.vue b/src/views/oneMap/components/FXHG.vue index e08bc2c..0f48499 100644 --- a/src/views/oneMap/components/FXHG.vue +++ b/src/views/oneMap/components/FXHG.vue @@ -2,7 +2,9 @@
11111
-
111
+
+ 111 +
放回放回返回 @@ -17,6 +19,8 @@ const AllData = reactive({}); const curType = ref(false); const showPanel = ref(true); //面板展开收起 +const showBottom = ref(true); +const control = ref('1'); // 面板内容展开收起控制 const props = defineProps({ showPanel: { @@ -26,8 +30,10 @@ function goBack(params) { console.log('111'); showPanel.value = true; + showBottom.value = false; curType.value = true; } + watch( () => props.showPanel, () => { @@ -37,9 +43,7 @@ ); onMounted(() => { - bus.on('BottomHidden', params => { - console.log(params, 'params111'); - }); + bus.emit('checkBottom', control.value); let initePSTimer = setInterval(() => { if (!newfiberMapbox) return; bus.emit('setLayerVisible', { layername: 'ysLine1', isCheck: true }); @@ -79,10 +83,10 @@ } .BottomBox { width: 900px; - height: 300px; + height: 280px; position: absolute; - right: 100px; - top: 70px; + right: 500px; + bottom: 70px; background: linear-gradient(0deg, rgba(0, 93, 114, 0.8) 0%, rgba(0, 93, 114, 0.8) 100%); border-radius: 6px; border: 1px solid #47eef3; diff --git a/src/views/oneMap/floodPrevention/FholRightBox.vue b/src/views/oneMap/floodPrevention/FholRightBox.vue index d68e2a0..1f62ae2 100644 --- a/src/views/oneMap/floodPrevention/FholRightBox.vue +++ b/src/views/oneMap/floodPrevention/FholRightBox.vue @@ -372,7 +372,7 @@ .tableBody { width: 100%; height: calc(100% - 35px); - overflow: auto; + overflow: hidden; .tableBodyList { height: 34px; diff --git a/src/views/oneMap/SmartDrainage/PsLeftBox.vue b/src/views/oneMap/SmartDrainage/PsLeftBox.vue index 885a45f..4a6974b 100644 --- a/src/views/oneMap/SmartDrainage/PsLeftBox.vue +++ b/src/views/oneMap/SmartDrainage/PsLeftBox.vue @@ -231,7 +231,7 @@ width: 430px; margin: 0 auto; height: calc(100% - 40px); - overflow: auto; + overflow: hidden; cursor: pointer; // background: red; li { diff --git a/src/views/oneMap/components/FHPL.vue b/src/views/oneMap/components/FHPL.vue index 28bde00..0ff3bff 100644 --- a/src/views/oneMap/components/FHPL.vue +++ b/src/views/oneMap/components/FHPL.vue @@ -33,12 +33,17 @@ const AllData = reactive({}); const curType = ref(false); const isShowMonitorCalender = ref(false); +const Bottomshow = ref(false); +const control = ref('0'); const showPanel = ref(true); //面板展开收起 // 面板内容展开收起控制 const props = defineProps({ showPanel: { type: Boolean, }, + BottomshowPanel: { + type: Boolean, + }, }); function openUserDialog(params) { isShowMonitorCalender.value = true; @@ -60,16 +65,12 @@ () => props.showPanel, () => { showPanel.value = props.showPanel; - bus.on('BottomHidden', params => { - console.log(params, 'params2222'); - }); + Bottomshow.value = props.BottomshowPanel; }, { immediate: true } ); onMounted(() => { - bus.on('BottomHidden', params => { - console.log(params, 'params111'); - }); + bus.emit('checkBottom', control.value); }); diff --git a/src/views/oneMap/components/FXHG.vue b/src/views/oneMap/components/FXHG.vue index e08bc2c..0f48499 100644 --- a/src/views/oneMap/components/FXHG.vue +++ b/src/views/oneMap/components/FXHG.vue @@ -2,7 +2,9 @@
11111
-
111
+
+ 111 +
放回放回返回 @@ -17,6 +19,8 @@ const AllData = reactive({}); const curType = ref(false); const showPanel = ref(true); //面板展开收起 +const showBottom = ref(true); +const control = ref('1'); // 面板内容展开收起控制 const props = defineProps({ showPanel: { @@ -26,8 +30,10 @@ function goBack(params) { console.log('111'); showPanel.value = true; + showBottom.value = false; curType.value = true; } + watch( () => props.showPanel, () => { @@ -37,9 +43,7 @@ ); onMounted(() => { - bus.on('BottomHidden', params => { - console.log(params, 'params111'); - }); + bus.emit('checkBottom', control.value); let initePSTimer = setInterval(() => { if (!newfiberMapbox) return; bus.emit('setLayerVisible', { layername: 'ysLine1', isCheck: true }); @@ -79,10 +83,10 @@ } .BottomBox { width: 900px; - height: 300px; + height: 280px; position: absolute; - right: 100px; - top: 70px; + right: 500px; + bottom: 70px; background: linear-gradient(0deg, rgba(0, 93, 114, 0.8) 0%, rgba(0, 93, 114, 0.8) 100%); border-radius: 6px; border: 1px solid #47eef3; diff --git a/src/views/oneMap/floodPrevention/FholRightBox.vue b/src/views/oneMap/floodPrevention/FholRightBox.vue index d68e2a0..1f62ae2 100644 --- a/src/views/oneMap/floodPrevention/FholRightBox.vue +++ b/src/views/oneMap/floodPrevention/FholRightBox.vue @@ -372,7 +372,7 @@ .tableBody { width: 100%; height: calc(100% - 35px); - overflow: auto; + overflow: hidden; .tableBodyList { height: 34px; diff --git a/src/views/oneMap/index.vue b/src/views/oneMap/index.vue index 60f3fff..35f88f8 100644 --- a/src/views/oneMap/index.vue +++ b/src/views/oneMap/index.vue @@ -3,11 +3,7 @@
@@ -26,9 +22,7 @@ - + @@ -36,12 +30,7 @@ - + - + - +