=0726

qingtian_vue/package.json

@@ -42,6 +42,7 @@
     "copy-webpack-plugin": "^4.0.1",
     "cross-spawn": "^5.0.1",
     "css-loader": "^0.28.0",
+    "element-resize-detector": "^1.2.3",
     "eslint": "^4.15.0",
     "eslint-config-standard": "^10.2.1",
     "eslint-friendly-formatter": "^3.0.0",

qingtian_vue/src/main.js

@@ -10,6 +10,9 @@ import 'element-ui/lib/theme-chalk/index.css'
 import './assets/font/iconfont.css'
 import * as echarts from 'echarts'
 import 'default-passive-events'
+import ElementResizeDetectorMaker from 'element-resize-detector';
+
+Vue.prototype.$erd = ElementResizeDetectorMaker();
 Vue.prototype.$echarts = echarts
 Vue.use(ElementUI)
 Vue.config.productionTip = false

qingtian_vue/src/views/Aqsc.vue

@@ -678,9 +678,18 @@
               <p></p>
               <div id="main7" style="max-width: 100%; height: 210px"></div>
             </el-tab-pane>
-            <el-tab-pane label="森林火险防控" name="third">
+
+            <el-tab-pane label="森林火险防控" name="third" disabled="true" title="建设中" tooltip="建设中">
+              <el-tooltip class="item-tabs" effect="light" placement="top"  slot="label">
+                <div slot="content">
+                  建设中
+                </div>
+                <span><i class="el-icon-date"></i> 森林火险防控</span>
+              </el-tooltip>
+
               <div id="main8" style="max-width: 100%; height: 210px"></div>
             </el-tab-pane>
+
           </el-tabs>
         </div>
       </div>

qingtian_vue/src/views/Ecology.vue

@@ -3,12 +3,12 @@
     <div class="shadow">
       <Breadcrumb :breadData="breadData"></Breadcrumb>
     </div>
-    <el-row :gutter="20" class="mt20" >
+    <el-row :gutter="20" class="mt20">
       <el-col :sm="12" :xs="24">
-        <div class="clear-water unify-item shadow"  ref="left_one">
+        <div class="clear-water unify-item shadow" ref="left_one" id="left_one" style="height: 640px;">
           <h3 class="module-tit">深化碧水行动</h3>
           <ul>
-            <li v-for="(item, index) in clear_water_info" :key="index">
+            <li v-for="(item, index) in clear_water_info" :key="index" style="margin-top:35px">
               <p class="cw-classify">{{ item.classify }}</p>
               <div class="cw-progress">
                 <el-progress
@@ -34,7 +34,7 @@
         </div>
       </el-col>
       <el-col :sm="12" :xs="24">
-        <div class="air-quality unify-item  shadow"  ref="right_one">
+        <div class="air-quality unify-item  shadow" ref="right_one" id="right_one" style="height: 640px">
           <h3 class="module-tit">空气质量巩固提升行动</h3>
           <div class="aq-map">
             <img src="../assets/images/sy-map.jpg" alt=""/>
@@ -85,7 +85,7 @@
     </el-row>
     <el-row :gutter="20">
       <el-col :sm="12" :xs="24">
-        <div class="no-waste unify-item  shadow">
+        <div class="no-waste unify-item  shadow" style="height:350px;">
           <h3 class="module-tit">无废城市建设</h3>
           <ul class="nw-con">
             <li
@@ -113,7 +113,7 @@
         </div>
       </el-col>
       <el-col :sm="12" :xs="24">
-        <div class="beautiful-rivers unify-item  shadow">
+        <div class="beautiful-rivers unify-item  shadow" style="height:350px">
           <h3 class="module-tit">美丽河湖库</h3>
           <ul class="br-con">
             <li v-for="(item, index) in br_info" :key="index">
@@ -182,9 +182,11 @@
 
 <script>
     import Breadcrumb from "../components/Breadcrumb.vue";
+
     import Tree from "../components/Tree.vue";
     import {messageFun} from "../util/jianquan";
 
+
     export default {
         name: "ecology",
         components: {Tree, Breadcrumb},
@@ -346,6 +348,15 @@
                 ],
             };
         },
+        created(){
+
+            // this.$erd.listenTo(this.$refs.right_one, (element) => {
+            //     debugger
+            //     var width = element.offsetWidth;
+            //     var height = element.offsetHeight;
+            //     console.log("height="+height);
+            // });
+        },
         mounted() {
             this.listenMessage();
             window.parent.postMessage(document.body.scrollHeight, '*');
@@ -357,10 +368,14 @@
             window.addEventListener("resize", function (e) {
                 window.parent.postMessage(document.body.scrollHeight, '*');
             });
-            // let t=this.$refs.right_one.clientHeight;
+
+
+
+            //
             //
             // this.$refs.left_one.style.height=t+"px";
         },
+
         methods: {
             listenMessage() {
                 window.addEventListener('message', this.bindThis.bind(this));
@@ -381,7 +396,7 @@
 
 <style lang="scss" scoped>
   .ecology {
-    // width: 1300px;
+
     width: calc(100% - 40px);
     margin: 0px auto;
     padding: 20px;
@@ -587,7 +602,7 @@
       justify-content: space-between;
 
       li {
-        padding: 12px 20px;
+        padding: 12px 10px;
         background-color: #eefbff;
         width: 48%;
         box-sizing: border-box;