派生自 wuyushui/SewerAndRainNetwork

ChenZeping
2021-05-11 a6135ffcbf7dca73c3ff39ad6f7718880c3abe9a
企业应急修改
4个文件已修改
118 ■■■■■ 已修改文件
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue 79 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/conf/MapConfig.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/MapTemplate.vue 补丁 | 查看 | 原始文档 | blame | 历史
src/components/panel/topicSearch/SewersSelect/EnterpriseEmergency/ReportPopup.vue
@@ -1,13 +1,13 @@
<template>
    <div class="report-popup map-background" v-drag v-show="flags">
    <div class="report-popup map-background" v-drag v-show="!flags">
        <div class="public-bounced-title panel-title">
            <span>上报事件</span>
            <i class="el-icon-circle-close" @click="closePopup"></i>
        </div>
        <div class="report-content">
            <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="search-form">
                <el-form-item label="事件名称" prop="nameEvent">
                    <el-input v-model="ruleForm.nameEvent" class="report-input"></el-input>
                <el-form-item label="事件名称" prop="nameEvent" class="input-event-name">
                    <el-input v-model="ruleForm.nameEvent" placeholder="将事件命名"></el-input>
                </el-form-item>
                <el-form-item label="事件类型" prop="eventType">
                    <el-radio-group v-model="ruleForm.eventType">
@@ -54,6 +54,18 @@
                        </el-form-item>
                    </el-col>
                </el-row>
                <el-row>
                    <el-col :span="12">
                        <el-form-item label="管线名称" prop="region" class="search-panel-item">
                            <el-input v-model="ruleForm.name" class="report-input"></el-input>
                        </el-form-item>
                    </el-col>
                    <el-col :span="12">
                        <el-form-item label="管线类型" prop="name">
                            <label for="">自动带出不可修改</label>
                        </el-form-item>
                    </el-col>
                </el-row>
                <el-form-item>
                    <el-upload
                            class="upload-demo"
@@ -68,18 +80,21 @@
                        <el-button size="small" type="primary">点击上传</el-button>
                    </el-upload>
                </el-form-item>
                <el-form-item label="消息推送" prop="resource">
                    <el-radio-group v-model="ruleForm.resource">
                        <el-radio label="短信推送"></el-radio>
                        <el-radio label="手机应用推送"></el-radio>
                <el-form-item label="消息推送" prop="beingPush">
                    <el-radio-group v-model="ruleForm.beingPush">
                        <el-radio v-for="(item,index) in ruleForm.beingPushList" :label="item.value" :key="index">
                            <span>{{ item.name }}</span>
                        </el-radio>
                    </el-radio-group>
                </el-form-item>
                <div v-show="wayTo">
                <el-form-item label="事件描述" prop="desc">
                    <el-input type="textarea" v-model="ruleForm.desc"></el-input>
                </el-form-item>
                <el-form-item label="接收人员" prop="desc">
                    <el-input type="textarea" v-model="ruleForm.desc"></el-input>
                </el-form-item>
                </div>
                <el-form-item>
                    <el-button type="primary" @click="submitForm('ruleForm')">确认</el-button>
                    <el-button @click="resetForm('ruleForm')">取消</el-button>
@@ -130,9 +145,21 @@
            value: 3
          }
        ],
        atTime: ''
        atTime: '',
        beingPush: '',
        beingPushList: [
          {
            name: '短信推送',
            value: 1
          },
          {
            name: '手机应用推送',
            value: 2
          }
        ]
      },
      fileList: [],
      wayTo: false,
      rules: {
        name: [
          {
@@ -205,19 +232,39 @@
</script>
<style lang="less" scoped>
    .report-popup {
        width: 35%;
        z-index: 999;
        position: absolute;
        top: 15%;
        left: 35%;
    }
    /deep/ input {
        border-radius: 0;
        background-color: rgba(0, 255, 246, 0.14);
        border: solid 1px #00fff6;
        color: #C0C4CC;
        font-size: 0.01rem;
        padding: 0 15px;
    }
    /deep/ .input-event-name {
        margin: 15px 0;
        width: 55%;
        .el-input__inner {
            width: 100%;
            border-radius: 5px;
            background: rgba(0, 16, 30, 0.5);
        }
    }
    /deep/ .el-form-item__label {
        color: @color;
    }
    /deep/ .el-radio__label {
        color: @color;
    }
    .report-popup {
        width: 35%;
        z-index: 999;
        position: absolute;
        top: 35%;
        left: 20%;
    }
</style>
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -13,7 +13,7 @@
                <!--        <el-scrollbar style="height:450px">-->
                <!--          <el-card shadow="hover">-->
                <span class="fixed-style">起始管段</span>
                <el-table class="tableBox" height="100" max-height="200" :data="tableDataLinkStart" @row-click="linkSelectStart" highlight-current-row style="width: 100%" size="mini">
                <el-table class="tableBox" height="100" max-height="200" :data="tableDataLinkStart" highlight-current-row style="width: 100%" size="mini">
                    <el-table-column prop="datasource" label="管段类型"></el-table-column>
                    <el-table-column :show-overflow-tooltip="true" sortable width="100" prop="pipecode" label="管段名称"></el-table-column>
                    <el-table-column sortable width="100" prop="material" label="起点编号"></el-table-column>
@@ -112,16 +112,16 @@
                </el-table>
            </el-tab-pane>
            <el-tab-pane label="横断面" name="fourth">
                <div>
                <el-row>
                    <el-button type="primary" @click="drawLine" size="mini"  title="地图上绘制要进行分析截断面的线">绘制线段</el-button>
                    <el-button type="primary" @click="jdmQuery" size="mini"  title="截断面分析">截断面分析</el-button>
                    <el-button type="primary" @click="jdmClear" size="mini"  title="清除截断面分析结果">清除</el-button>
                </div>
                </el-row>
                <!-- <el-card class="box-card">-->
                <div slot="header" class="fixed-style">
                    <span>管段查询结果</span>
                </div>
                <el-table class="tableBox" :data="tableData" max-height="200" highlight-current-row style="width: 100%" @row-click="selectRow" size="mini">
                <el-table class="tableBox" :data="tableData" height="150" max-height="200" highlight-current-row style="width: 100%" @row-click="selectRow" size="mini">
                    <el-table-column prop="pipename" label="管段名称"></el-table-column>
                    <el-table-column prop="mediumtype" label="管段类型" width="80"></el-table-column>
                    <el-table-column class-name="fixed-table" fixed="right" label="图表"  width="40">
@@ -247,27 +247,21 @@
    },
    // 地图上点击回调
    selectClick (e) {
      console.log(e)
      // console.log(e)
      window.map.off('click', this.selectClick)
      const point = [e.latlng.lng, e.latlng.lat]
      this.getPipeLine(point)
      // if () {
      //   // 关闭弹窗
      //   window.layerFactory.clickSwitch = false
      // } else {
      //   window.layerFactory.clickSwitch = true
      // }
    },
    // 点击获取判断数据
    async getPipeLine (point) {
      const param = {
        x: point[0],
        y: point[1],
        radius: 5
        radius: 3
      }
      // 根据参数请求接口数据
      const res = await mapApi.findPipelineByClickPoint(param)
      console.log(res)
      console.log(res.pipesegcode)
      if (this.activeName === 'first') {
        if (this.linkType === 1) {
          this.tableDataLinkStart = res.data
@@ -305,6 +299,7 @@
    },
    // 连通性 起始管段 table列表数据 选择数据事件 的点击事件
    linkSelectStart (e) {
      // console.log(e)
      // console.log('选择起始管段')
      // this.$refs.singleTable.setCurrentRow(e)
      this.currentSelectStart = e
@@ -331,7 +326,7 @@
    },
    // 连通性 结束管段 table列表数据 选择数据事件 的点击事件
    linkSelectEnd (e) {
      console.log('选择结束管段')
      // console.log('选择结束管段')
      this.currentSelectEnd = e
      // 做判断remove
@@ -345,15 +340,15 @@
        style: function (feature) {
          return {
            weight: 10,
            color: 'rgba(255, 247, 0, 0.6)'
            color: 'rgba(255, 247, 0, 0.7)'
          }
        }
      }).addTo(window.map)
      window.map.panInsideBounds(this.currentSelectEndLine.getBounds())
    },
    // 连通性查询
    // 连通性查询 结果
    async linkQuery () {
      // 每次查询分析结果为空
      // 每次查询分析结果制空
      this.tableDataLinkResult = []
      if (this.linkPipeline.length > 1) {
        this.linkPipeline.forEach((itm) => {
@@ -380,9 +375,7 @@
      if (res.data.length === 0) {
        this.$message('没有找到连通的管段')
        // 进行判断
        // if (this.tableDataLinkStart === [] && this.tableDataLinkEnd === []) {
        this.currentLinkIsTrue = '不连通'
        // }
        return
      }
      this.tableDataLinkResult = res.data
src/conf/MapConfig.js
@@ -22,10 +22,10 @@
  minZoom: 3,
  maxZoom: 17,
  // center: [26, 104],
  center: [34.828558921813965, 117.41676807403564],
  zoom: 5,
  // center: [32.25853085517883, 118.78592848777771],
  // zoom: 15,
  // center: [34.828558921813965, 117.41676807403564],
  // zoom: 5,
  center: [32.25853085517883, 118.78592848777771],
  zoom: 16,
  worldCopyJump: true,
  inertia: true,
  zoomControl: false,
src/views/MapTemplate.vue