派生自 wuyushui/SewerAndRainNetwork

zhangshuaibao
2021-04-12 5c8fde411c0dab24ee394239287412d4665b8c03
修改报警提示
6个文件已修改
75 ■■■■■ 已修改文件
src/Sgis.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/LayerController/logic/WasteWater.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/plugin/FullScreen.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/plugin/MeaSure.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/Sgis.js
@@ -1,7 +1,7 @@
import BasemapHelper from '@components/helpers/BasemapHelper'
import VectorLayerHelper from '@components/helpers/VectorLayerHelper'
// 初始化显示
// import '@components/plugin/PathDrag'
import '@components/plugin/PathDrag'
import MapConfig from '@/conf/MapConfig'
import '@components/plugin/PathDashFlow' // 流动线图
import DownLoad from '@components/plugin/DownLoad'
src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
@@ -2,6 +2,9 @@
<template>
    <div id="Tab">
        <div class="infomation">
            <ul>
                <li></li>
            </ul>
            <el-row>
                <el-col :span="6"><div class="grid-content bg-purple">氮氧化物:29.93标准:100</div></el-col>
                <el-col :span="6"><div class="grid-content bg-purple">二氧化硫:17.34标准:50</div></el-col>
@@ -69,6 +72,7 @@
<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
// import dayjs from 'dayjs'
export default {
  name: 'ECharts',
@@ -86,7 +90,8 @@
      formInline: {
        user: '',
        region: ''
      }
      },
      info: this.series
    }
  },
  methods: {
@@ -277,7 +282,12 @@
          data: data[k]
        })
      }
      console.log(series)
      // --------------------------
      var arr = []
      for (var x = 0; x < dataWatch.length; x++) {
        arr.push(dataWatch[x].MonTimeStr)
      }
      console.log(arr)
      const opitons = this.initOptions(dateDate, series)
      this.myChart = this.$echarts.init(this.$refs.main)
      this.myChart.setOption(opitons)
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -10,6 +10,15 @@
            <li @click='tabTaggle("EChartsDate")'>日数据</li>
            <li @click='tabTaggle("ECharts")'>人工数据</li>
        </ul>
        <div id="title" >
            <span><strong> &nbsp; </strong></span>
            <span >正常</span>
            <span ></span>
            <span >预警</span>
            <span ></span>
            <span >超标</span>
            <span ></span>
        </div>
        <component :is="currentTab" v-bind="$attrs"></component>
    </div>
</template>
@@ -113,4 +122,47 @@
  color: #682000;
  cursor: pointer;
}
#title{
    height: 30px;
    /* margin-top: 30px; */
    color: #ffffff;
    margin-top: 5px;
}
#title span:nth-child(1){
    /*margin-left: 478px*/
}
#title span:nth-child(2){
    /*margin-left: 177px*/
}
#title span:nth-child(3){
    display: inline-block;
    background-color: #4ec99c;
    height: 15px;
    width: 35px;
    margin-left: 10px;
    border-radius: 5px;
}
#title span:nth-child(6){
    /*margin-left: 21px*/
}
#title span:nth-child(7){
    display: inline-block;
    background-color: red;
    height: 15px;
    width: 35px;
    margin-left: 7px;
    border-radius: 5px;
}
#title span:nth-child(4){
    margin-left: 17px;
}
#title span:nth-child(5){
    display: inline-block;
    background-color: orange;
    height: 15px;
    width: 35px;
    margin-left: 9px;
    border-radius: 5px;
}
</style>
src/components/LayerController/logic/WasteWater.js
@@ -45,6 +45,8 @@
    }
  }
  // 分割线-------------------------------------------------------------------------------
  // this.
  this.bindTooltip = (layer) => {
    return layer.options.test.Name
  }
src/components/plugin/FullScreen.js
@@ -48,7 +48,8 @@
      },
      _toggleTitle: function () {
        this.link.title = this.optionsthis._map.isFullscreen()]
        this.link.title = this.options
        this._map.isFullscreen()
      }
    })
src/components/plugin/MeaSure.js
@@ -52,6 +52,7 @@
    areaMeasure.points.pop()
  },
  dblclick: function (e) { // 双击结束
    console.log(areaMeasure.polygon.dragging)
    console.log('双击结束', e)
    areaMeasure.polygon.enableEdit()
    areaMeasure.polygon.dragging.disable()
@@ -128,6 +129,7 @@
    distanceMeasure.points.pop()
  },
  dblclick: function (e) { // 双击结束
    console.log(distanceMeasure.polyline.dragging)
    console.log('双击结束', e)
    distanceMeasure.polyline.enableEdit()
    distanceMeasure.polyline.dragging.disable()