Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetw...

徐旺旺

2021-04-14 be3ff5213201a3a8716f6186f5fd8b20ee264e48

Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

 src/assets/css/map/map-panel-style.less

@@ -115,7 +115,7 @@

  thead.is-group th {
    background: transparent;
    padding:0
    padding: 0
  }

  .el-table__expanded-cell {
@@ -565,39 +565,47 @@
.el-tabs--top .el-tabs__item.is-top:nth-child(2) {
  padding-left: 20px;
}

.el-tabs--border-card {
  background: none;
  border: none;
  box-shadow: none;
}
.el-tabs--border-card>.el-tabs__header {

.el-tabs--border-card > .el-tabs__header {
  background: none;
  border-bottom: none;
  margin: 0;
}
.el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active {

.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
  color: #409EFF;
  background: none;
  border: none;
}
.el-tabs--border-card>.el-tabs__header .el-tabs__item {

.el-tabs--border-card > .el-tabs__header .el-tabs__item {
  border: none;
}

.panel-right ::-webkit-scrollbar-thumb {
  background: none;
  border: none;
}

.el-card {
  margin-top: 15px;
  background: rgba(0, 16, 30, 0.5);
  border: 0.00521rem solid @color;
  box-shadow: 0 0 0.03rem @color;
}

.clearfix {
  display: inline-block;
  color: #ffffff;
  margin: 15px 0;
}

.fixed-table {
  background: rgba(0, 16, 30, 1);
  background: rgba(0, 16, 30, 1) !important;
}

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -31,10 +31,10 @@
<script>

import '@/utils/dragBoxes'
import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
import PublicChart from './GasComponents/PublicChart'
import PublicTabs from '@components/BaseNav/PublicBounced/common/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/common/PublicTable'
import PublicVideo from '@components/BaseNav/PublicBounced/common/PublicVideo'
import PublicChart from './common/PublicChart'

export default {
  name: 'PublicBounced',

 src/components/BaseNav/PublicBounced/common/PublicChart.vue

File was renamed from src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -27,12 +27,12 @@
</template>

<script>
import EChartsHour from './EChartsHour'
import EChartsDate from './EChartsDate'
import ECharts from './Echarts'
import EChartsHour from './echarts/EChartsHour'
import EChartsDate from './echarts/EChartsDate'
import ECharts from './echarts/Echarts'
// import EChartsDate from './EChartsDate'
import EChartsHourWasteWater from './EChartsHourWasteWater'
import EChartsTable from '@components/BaseNav/PublicBounced/GasComponents/EChartsTable'
import EChartsHourWasteWater from './echarts/EChartsHourWasteWater'
import EChartsTable from '@components/BaseNav/PublicBounced/common/echarts/EChartsTable'

export default {
  name: 'PublicChart',

 src/components/BaseNav/PublicBounced/common/PublicTable.vue

 src/components/BaseNav/PublicBounced/common/PublicTabs.vue

 src/components/BaseNav/PublicBounced/common/PublicVideo.vue

 src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue

File was renamed from src/components/BaseNav/PublicBounced/GasComponents/EChartsDate.vue
@@ -38,7 +38,7 @@
        <div class="detailbtn"  @click="onSubmit">查询</div>
        <div class="detailbtn" @click="dialogVisible = true" >明细表</div>
      </div>
      <div style="width:5rem;height:2rem;" id="echarts" ref="main">
      <div style="width:6rem;height:2rem;" id="echarts" ref="main">
      </div>
    </div>
    <!-- 明细弹框 -->
@@ -57,7 +57,7 @@
</template>

<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'

export default {
  name: 'ECharts',

 src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue

File was renamed from src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -43,7 +43,7 @@
                <div class="detailbtn"  @click="onSubmit">查询</div>
                <div class="detailbtn" @click="dialogVisible = true" >明细表</div>
             </div>
            <div style="width:5rem;height:2rem;" id="echarts" ref="main">
            <div style="width:676px;height:200px;" id="echarts" ref="main">
            </div>
        </div>
        <!-- 明细弹框 -->
@@ -62,7 +62,7 @@
</template>

<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'

export default {
  name: 'ECharts',

 src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue

File was renamed from src/components/BaseNav/PublicBounced/GasComponents/EChartsHourWasteWater.vue
@@ -62,7 +62,7 @@
</template>

<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'

export default {
  name: 'ECharts',

 src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue

 src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue

 src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue

 src/components/panel/RightSearchPanel.vue

@@ -242,7 +242,8 @@
.search-container {
  position: relative;
  //width: 1.79167rem;
  width: 2.79167rem;
  //width: 2.39167rem;
  width: 2.3rem;
  /*  height: 5.6475rem;*/
  overflow: hidden;
}

 src/components/panel/topicSearch/SewersSearch.vue

@@ -61,7 +61,9 @@
      <el-tab-pane label="分析" name="second">
        <SewersAnalysis></SewersAnalysis>
      </el-tab-pane>
      <el-tab-pane label="历史" name="third">历史</el-tab-pane>
      <el-tab-pane label="历史" name="third">
        <SewersHistory></SewersHistory>
      </el-tab-pane>
    </el-tabs>
  </div>
</template>
@@ -78,11 +80,13 @@

// 引入分析组件内容
import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'

export default {
  name: 'SewersSearch',
  components: {
    SewersAnalysis
    SewersAnalysis,
    SewersHistory
  },
  data () {
    return {

 src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue

@@ -101,5 +101,4 @@
</script>

<style lang="less" scoped>

</style>

 src/components/panel/topicSearch/SewersSelect/SewersHistory.vue

New file
@@ -0,0 +1,143 @@
<template>
  <div class="sewers-search" v-if="judgeVisible">
    <div class="search-panel ">
      <el-form ref="form" :model="form" label-width="90px" class="search-form">
        <el-form-item v-for="(item,index) in Options" :key="index" :label="item.label+'：'" size="mini"
                      class="search-panel-item">
          <el-select style="width: 100%" v-model="form.pipelineType" @change="handlePipelineType"
                     :popper-class="'select-down'">
            <el-option
                v-for="(ite,index) in item.options"
                :key="index"
                :label="ite.label"
                :value="ite.value">
            </el-option>
          </el-select>
        </el-form-item>
        <div class="rightButtonSearch">
          <el-input v-model="form.keyword" size="mini" placeholder="在此输入关键字搜索"></el-input>
          <el-button class="el-icon-search" @click="handleSearch"></el-button>
        </div>
      </el-form>
    </div>
    <el-scrollbar style="height:286.22px">
      <div class="environmental-risk-list hover"><!-- v-for="(item,index) in list" :key="index" -->
        <i class="state"></i>
        <div>
          <h3>###炼化部</h3>
          <p>所属部门：<span>炼化部</span></p>
          <p>风险级别：<span>三级</span></p>
        </div>
      </div>
      <div class="environmental-risk-list hover"><!-- v-for="(item,index) in list" :key="index" -->
        <i class="state"></i>
        <div>
          <h3>###炼化部</h3>
          <p>所属部门：<span>炼化部</span></p>
          <p>风险级别：<span>三级</span></p>
        </div>
      </div>
      <div class="environmental-risk-list hover"><!-- v-for="(item,index) in list" :key="index" -->
        <i class="state"></i>
        <div>
          <h3>###炼化部</h3>
          <p>所属部门：<span>炼化部</span></p>
          <p>风险级别：<span>三级</span></p>
        </div>
      </div>
    </el-scrollbar>
  </div>
</template>

<script>

export default {
  name: 'SewersHistory',
  data () {
    return {
      judgeVisible: true,
      form: {
        keyword: '历史数据'
      },
      // 数据搜索之后，存储数据的
      searchDataDisplay: [],
      Options: [
        {
          value: '1',
          label: '管线类型',
          options: [{
            value: '1-1',
            layerName: '雨水管线',
            key: 'yushuiguanxian',
            label: '雨水管线'
          }],
          labelList: [{
            label: '雨水管线',
            key: 'yushuiguanxian'
          }, {
            label: '长度(m)',
            key: 'length'
          }]
        },
        {
          value: '2',
          label: '变更年份',
          options: [{
            value: '2-1',
            layerName: '2004',
            key: '2004',
            label: '2004年'
          }, {
            value: '2-2',
            layerName: '2005',
            key: '2005',
            label: '2005年'
          }, {
            value: '2-3',
            layerName: '2006',
            key: '2006',
            label: '2006年'
          }],
          labelList: [{
            label: '输送介质',
            key: 'mediumtype'
          }, {
            label: '长度(m)',
            key: 'length'
          }]
        },
        {
          value: '3',
          label: '变更类型',
          options: [{
            value: '3-1',
            layerName: '全部',
            key: 'type',
            label: '全部'
          }],
          labelList: [{
            label: '输送介质',
            key: 'mediumtype'
          }, {
            label: '长度(m)',
            key: 'length'
          }]
        }
      ]
    }
  },
  methods: {
    handlePipelineType (val) {
      console.log(val)
    },
    // 点击搜索实现数据的搜索展示
    handleSearch (data) {
      console.log(data)
    }
  }
}
</script>

<style lang="less" scoped>

</style>