src/components/BaseNav/WasteGas/Index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/BaseNav/WasteGas/PublicTabs.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/BaseNav/WasteGas/WasteGasIndex.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/BaseNav/WasteGas/flueGas.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/LayerController/logic/WasteGas.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Tube.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/components/BaseNav/WasteGas/Index.vue
File was deleted src/components/BaseNav/WasteGas/PublicTabs.vue
@@ -6,40 +6,53 @@ <div class="border_corner border_corner_right_bottom"></div> <div class="main"> <div class="main-matter"> <div> <!-- <div>--> <!-- <ul>--> <!-- <li>监测点名称:{{ setWasteGasdata.Name }}</li>--> <!-- <li>生产单位:{{ setWasteGasdata.porltName }}</li>--> <!-- <li>排放类型名称:{{ setWasteGasdata.MonTypeName }}</li>--> <!-- <li>排放去向:{{ setWasteGasdata.EmissDirecti }}</li>--> <!-- <li>控制级别名称:{{ setWasteGasdata.ContrLevelShowName }}</li>--> <!-- <li>内/外排口:{{ setWasteGasdata.OrOutPortName }}</li>--> <!-- </ul>--> <ul> <!-- <li>场所名称:{{ setSolidWaste.StoragePlaceName }}</li>--> <!-- <li>贮存能力:{{ setSolidWaste.StorageQty }}(吨)</li>--> <!-- <li>剩余贮存能力:{{ setSolidWaste.SurplusFloorArea }}(吨)</li>--> <!-- <li>占地面积(㎡):{{ setSolidWaste.DesignFloorArea }}(㎡)</li>--> <!-- <li>最近贮存日期:{{ setSolidWaste.StorageDate }}</li>--> <!-- <li class="lastli"></li>--> <li v-for="(item,index) in tabList" :key="index"></li> <li>监测点名称:</li> <li>生产单位:</li> <li>排放类型名称:</li> <li>排放去向:</li> <li>控制级别名称:</li> <li>内/外排口:</li> </ul> </div> <!-- </div>--> </div> </div> </div> </template> <script> import mapApi from '@/api/mapApi' export default { name: 'GasTable', props: ['setSolidWaste', 'value', 'setWasteGasdata', 'setWasteWaterdata'], data () { return { tabList: [] } }, mounted () { this.$nextTick(() => { // this.getTabsData() }) }, methods: { // async getTabsData () { // // 基本信息 和 详细信息 展示数据所需参数 // const dataValue = { // StoragePlaceId: e.layer.options.totransferData.StoragePlaceId // } // // 基本信息 tabs // const resultBasic = await mapApi.getSolidWasteBaseInfo(dataValue) // } async refsDataTabs (data) { const dataValue = { StoragePlaceId: data } const resultBasic = await mapApi.getWasteGasDetails(dataValue) console.log(resultBasic) } } } </script> src/components/BaseNav/WasteGas/WasteGasIndex.vue
New file @@ -0,0 +1,99 @@ <template> <public-sector> <template v-slot:tabs> <public-tabs ref='refsTabsData'></public-tabs> </template> <template v-slot:table> <public-echarts ref="refsTableData"></public-echarts> </template> <template v-slot:video> <public-video></public-video> </template> </public-sector> </template> <script> import PublicTabs from '@components/BaseNav/WasteGas/PublicTabs' import PublicEcharts from '@components/BaseNav/PublicBounced/common/PublicChart' import PublicVideo from '@components/BaseNav/PublicVideo' import PublicSector from '@components/BaseNav/PublicSector' export default { name: 'WasteGasIndex', props: ['storagePlaceId'], components: { PublicSector, PublicTabs, PublicEcharts, PublicVideo }, mounted () { this.$nextTick(() => { this.refsData() console.log(this.storagePlaceId) }) }, data () { return {} }, methods: { refsData () { const data = this.storagePlaceId this.$refs.refsTabsData.refsDataTabs(data) this.$refs.refsTableData.refsDataTable(data) } } } </script> <style lang="less" scoped> .public-bounced { z-index: 2000; position: absolute; top: 35%; left: 20%; .public-bounced-title { cursor: move; height: 0.1rem; padding: 10px 0; display: flex; align-items: center; justify-content: space-between; span { color: #f4f7ff; margin: 0 15px; font-size: 14px; } i { color: #C0C4CC; margin: 0 15px; font-size: 22px; cursor: pointer; } i:hover { color: #00fff6; } } .public-bounced-content { //padding: 0.1rem; display: flex; //align-items: center; //justify-content: space-around; .public-bounced-content-left { //width: 4.8rem; } .public-bounced-content-right { //width: 3rem; margin-left: 0.1rem; } } } </style> src/components/BaseNav/WasteGas/flueGas.js
File was deleted src/components/LayerController/logic/WasteGas.js
@@ -11,7 +11,8 @@ // const ImagBright = '/assets/images/map/exhaust/fq_bright_green.png' const mapApi = require('../../../api/mapApi').default const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default // const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default const WasteGasIndex = require('../../BaseNav/WasteGas/WasteGasIndex').default // const WasteGasChats = require('./WasteGasChats').default module.exports = function () { /** @@ -58,37 +59,49 @@ this.clickListener = async (e) => { // console.log(e) this.animalService.pulseEffect(e.latlng) const dataValue = { StoragePlaceId: e.layer.options.test.StoragePlaceId // const dataValue = { // StoragePlaceId: e.layer.options.test.StoragePlaceId // } // console.log(e.layer.options.test.EpsGisMonPointId) const title = e.layer.options.test.Name // const GasOnlinedata = { // onLineMonEmissPointId: '23', // monItemId: '28,31', // beginTime: '2020-04-06 15:13:20', // endTime: '2020-04-07 15:13:20', // dataType: '1' // } // const GasManualData = { // companyId: '3900100145', // labMonPointId: '219', // beginTime: '2020-04-06 15:13:20', // endTime: ' 2020-04-07 15:13:20' // } // const ManualData = await mapApi.getWasteGasManualData(GasManualData) // console.log(ManualData) // const Mondata = await mapApi.getWasteGasMonData(GasOnlinedata) // // console.log(Mondata) // const result = await mapApi.getWasteGasDetails(dataValue) // // console.log(result.Result.DataInfo) // const PublicBounced = window.Vue.extend(publicBounced) // const instance = new PublicBounced() // // console.log(e.layer.options.test) // instance.$mount() // document.body.appendChild(instance.$el) // instance.setGasData(e.layer.options.test, result.Result.DataInfo, Mondata.Result.DataInfo, ManualData.Result.DataInfo, 'feiqi') window.$layer.open({ content: { content: WasteGasIndex, // 组件 parent: this, // 父组件 data: { // 传递的参数 storagePlaceId: e.layer.options.test.StoragePlaceId } console.log(dataValue) const GasOnlinedata = { onLineMonEmissPointId: '23', monItemId: '28,31', beginTime: '2020-04-06 15:13:20', endTime: '2020-04-07 15:13:20', dataType: '1' } const GasManualData = { companyId: '3900100145', labMonPointId: '219', beginTime: '2020-04-06 15:13:20', endTime: ' 2020-04-07 15:13:20' } const ManualData = await mapApi.getWasteGasManualData(GasManualData) console.log(ManualData) const Mondata = await mapApi.getWasteGasMonData(GasOnlinedata) // console.log(Mondata) const result = await mapApi.getWasteGasDetails(dataValue) // console.log(result.Result.DataInfo) const PublicBounced = window.Vue.extend(publicBounced) const instance = new PublicBounced() // console.log(e.layer.options.test) instance.$mount() document.body.appendChild(instance.$el) instance.setGasData(e.layer.options.test, result.Result.DataInfo, Mondata.Result.DataInfo, ManualData.Result.DataInfo, 'feiqi') }, title: title // 标题 }) // console.log(e.layer.options.totransferData.EpsGisMonPointId) this.setPanTo(e.latlng, 150) console.log(e.latlng) // console.log(e.latlng) } // 不同类型图片加载 this.differentTypes = (ContrLevel) => { src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Connectivity.vue
@@ -1,36 +1,54 @@ <template> <div class="connectivity"> <el-row> <el-button type="primary" size="mini">起始管段</el-button> <el-button type="primary" size="mini">结束管段</el-button> <el-button type="primary" size="mini">连通性分析</el-button> <el-button type="primary" size="mini">清除</el-button> <el-button type="primary" size="mini" @click="linkClickStart" title="地图上点击选择需要进行连通分析的管段">起始管段</el-button> <el-button type="primary" size="mini" @click="linkClickEnd" title="地图上点击与所选管段连通管段">结束管段</el-button> <el-button type="primary" size="mini" @click="linkQuery" title="根据起始、结束管段进行连通性分析">连通性分析</el-button> <el-button type="primary" size="mini" @click="linkClear" title="根据起始、结束管段进行连通性分析">清除</el-button> </el-row> <el-card class="box-card"> <el-scrollbar style="height:2rem"> <span class="clearfix">起始管段</span> <el-table ref="singleTable" highlight-current-row :data="tableData" style="width: 100%"> max-height="200" style="width: 100%" size="mini"> <el-table-column prop="date" label="管线类型"> prop="lineloopna" label="管线类型" > </el-table-column> <el-table-column prop="name" label="管线名称"> sortable width="100" prop="pipecode" label="管线名称" > </el-table-column> <el-table-column prop="province" label="起点编号"> sortable width="100" prop="startpoint" label="起点编号" > </el-table-column> <el-table-column prop="city" label="终点编号"> sortable width="100" prop="endpointnu" label="终点编号" > </el-table-column> <el-table-column class-name="fixed-table" class-name="fixed-tablea" fixed="right" label="操作"> label="操作" > <template slot-scope="scope"> <el-button @click="linkSelectStart(scope.row)" type="text" size="small">选择</el-button> </template> </el-table-column> </el-table> <span class="clearfix">结束管段</span> @@ -85,6 +103,7 @@ label="操作"> </el-table-column> </el-table> </el-scrollbar> </el-card> </div> </template> @@ -94,11 +113,45 @@ name: 'Connectivity', data () { return { // 连通性 linkType: 1, // 1 连通性起始管段 0 连通性结束管段 用来判断是点击了起始 还是结束管段 tableData: [] } }, methods: { // 地图点击起始管段 linkClickStart () { console.log('地图点击起始管段') this.linkType = 1 // this.selectPipeLine() }, // 地图点击结束管段 linkClickEnd () { console.log('地图点击结束管段') this.linkType = 0 // this.selectPipeLine() }, // 连通性分析 linkQuery () { console.log('点击连通性分析') }, // 清除功能 linkClear () { console.log('点击清除') }, // 选择起始管段 linkSelectStart () { console.log('选择起始管段') } } } </script> <style lang="less" scoped> /deep/ .fixed-tablea { background: rgba(0, 16, 30, 1) !important; } /deep/ .el-table__fixed-right::before { background: none; } </style> src/components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay.js
New file @@ -0,0 +1,427 @@ // export default { // handleClick (tab, event) { // console.log(tab, event) // this.clearLinkPipe() // this.clearLX() // this.linkClear() // this.jdmClear() // this.bgFm = [] // this.bgPipeLine = [] // this.tableData = [] // this.tableDataLiuxiang = [] // this.tableDataLinkStart = [] // this.tableDataLinkEnd = [] // this.tableDataLinkResult = [] // }, // linkClickStart () { // console.log('地图点击起始管段') // this.linkType = 1 // this.selectPipeLine() // }, // linkClickEnd () { // console.log('地图点击结束管段') // this.linkType = 0 // this.selectPipeLine() // }, // linkSelectStart (e) { // console.log('选择起始管段') // console.log(e) // this.$refs.singleTable.setCurrentRow(e) // this.currentSelectStart = e // if (this.currentSelectStartLine != null) { // this.currentSelectStartLine.remove() // this.currentSelectStartLine = null // } // const geom = JSON.parse(e.geomText) // this.currentSelectStartLine = L.geoJSON(geom, { // style: function (feature) { // return { color: 'rgba(0,255,0,.6)' } // } // }).addTo(this.map) // this.map.panInsideBounds(this.currentSelectStartLine.getBounds()) // }, // linkSelectEnd (e) { // console.log('选择结束管段') // console.log(e) // this.currentSelectEnd = e // // if (this.currentSelectEndLine != null) { // this.currentSelectEndLine.remove() // this.currentSelectEndLine = null // } // // const geom = JSON.parse(e.geomText) // this.currentSelectEndLine = L.geoJSON(geom, { // style: function (feature) { // return { color: 'rgba(200,0,200,.6)' } // } // }).addTo(this.map) // this.map.panInsideBounds(this.currentSelectEndLine.getBounds()) // }, // linkResultSelect (e) { // console.log('连通性分析结果列表点击') // console.log(e) // // const geom = JSON.parse(e.geomText) // if (this.currentSelectResultLine != null) { // this.currentSelectResultLine.remove() // this.currentSelectResultLine = null // } // this.currentSelectResultLine = L.geoJSON(geom, { // style: function (feature) { // return { // color: 'rgba(255,0,0,.6)', // weight: 6 // } // } // }).addTo(this.map) // this.map.panInsideBounds(this.currentSelectResultLine.getBounds()) // }, // // 连通性查询 // async linkQuery () { // this.tableDataLinkResult = [] // if (this.linkPipeline.length > 1) { // this.linkPipeline.forEach((itm) => { // itm.remove() // }) // this.linkPipeline = [] // } // if (this.currentSelectStart === null || this.currentSelectEnd === null) { // this.$message('请选择起始管段和结束管段') // return // } // const param = { // startLineID: this.currentSelectStart.id, // endLineID: this.currentSelectEnd.id // } // // const res = await api.findConnectedPipelines(param) // // if (res.data.length === 0) { // this.$message('没有找到连通的管段') // this.currentLinkIsTrue = '不连通' // return // } // this.tableDataLinkResult = res.data // this.currentLinkIsTrue = '连通' // const linkPipe = [] // res.data.forEach((itm, idx) => { // const geom = JSON.parse(itm.geomText) // const points = [] // geom.coordinates.forEach((it, id) => { // points.push(it.reverse()) // }) // // linkPipe.push(points) // }) // // linkPipe.forEach((itm, idx) => { // const param1 = { // points: itm, // option: { // dashArray: '15 15', // dashSpeed: -30, // color: '#ffff00' // } // } // const line = main.createFlowLine(param1) // this.linkPipeline.push(line) // }) // }, // // linkClear () { // if (this.currentSelectStartLine != null) { // this.currentSelectStartLine.remove() // this.currentSelectStartLine = null // } // if (this.currentSelectEndLine != null) { // this.currentSelectEndLine.remove() // this.currentSelectEndLine = null // } // if (this.currentSelectResultLine != null) { // this.currentSelectResultLine.remove() // this.currentSelectResultLine = null // } // if (this.bgMarker != null) { // this.bgMarker.remove() // this.bgMarker = null // } // }, // lxResultSelect () { // console.log('连通性分析结果列表点击') // console.log(e) // // const geom = JSON.parse(e.geomText) // if (this.currentSelectResultLine != null) { // this.currentSelectResultLine.remove() // this.currentSelectResultLine = null // } // this.currentSelectResultLine = L.geoJSON(geom, { // style: function (feature) { // return { color: 'rgba(0,250,255,.6)' } // } // }).addTo(this.map) // this.map.panInsideBounds(this.currentSelectResultLine.getBounds()) // }, // async lxQuery (e) { // this.clearLinkPipe() // const param = { // lineNodeID: e.startpoint // } // const res = await api.findFlowDirection(param) // // this.lxTableDataResult = res.data // const linkPipe = [] // res.data.forEach((itm, idx) => { // const geom = JSON.parse(itm.geomText) // const points = [] // geom.coordinates.forEach((it, id) => { // points.push(it.reverse()) // }) // // linkPipe.push(points) // }) // // linkPipe.forEach((itm, idx) => { // const param1 = { // points: itm, // option: { // dashArray: '15 15', // dashSpeed: -30, // color: '#ffff00' // } // } // const line = main.createFlowLine(param1) // this.linkPipeline.push(line) // }) // }, // // bgClick () { // this.selectPipeLine() // }, // async bgSelect (e) { // console.log('选择爆管管段') // console.log(e) // this.bgFm = [] // if (this.bgMarker != null) { // this.bgMarker.remove() // this.bgMarker = null // } // // if (this.currentSelectEndLine != null) { // this.currentSelectEndLine.remove() // this.currentSelectEndLine = null // } // this.clearLinkPipe() // const geom = JSON.parse(e.geomText) // this.currentSelectEndLine = L.geoJSON(geom, { // style: function (feature) { // return { color: 'rgba(200,0,200,.6)' } // } // }).addTo(this.map) // this.map.panInsideBounds(this.currentSelectEndLine.getBounds()) // // const param = { // lineID: e.id // } // const res = await api.findLeakages(param) // console.log(res) // // const len = res.data.length // if (len === 0) { // this.$message('未找到需要关闭的阀门') // // return // } // res.data.reverse() // this.bgFm = res.data // // this.bgPoint = res.data[0].startControlPoint // // const point = JSON.parse(this.bgPoint.geomText) // // const p = [point.coordinates[1], point.coordinates[0]] // // this.bgMarker = main.createFlowMarker(p) // this.bgMarker.bindTooltip(this.bgPoint.pointnumbe) // this.bgMarker.addTo(this.map) // this.map.flyTo(p) // // const linkPipe = [] // res.data.forEach((itm, idx) => { // const geom = JSON.parse(itm.geomText) // const points = [] // geom.coordinates.forEach((it, id) => { // points.push(it.reverse()) // }) // // linkPipe.push(points) // }) // // linkPipe.forEach((itm, idx) => { // const param1 = { // points: itm, // option: { // dashArray: '15 15', // dashSpeed: -30, // color: '#ffff00' // } // } // const line = main.createFlowLine(param1) // this.linkPipeline.push(line) // }) // }, // bgFmClick (e) { // console.log('点击影响的阀门') // console.log(e) // const point = [e.data[0][0], e.data[0][1]] // const marker = main.createFlowMarker(point) // marker.addTo(this.map) // this.map.flyTo(point, 16) // }, // // 流向地图上点击 // selectPipeLine () { // this.map.on('click', this.selectClick) // }, // // 地图上点击回调 // selectClick (e) { // this.map.off('click', this.selectClick) // const point = [e.latlng.lng, e.latlng.lat] // console.log(point) // this.getPipeLine(point) // }, // // // 流向数据请求 // async getPipeLine (point) { // const param = { // x: point[0], // y: point[1], // radius: 3 // } // // const res = await api.getPipeline(param) // // 3 流向 // // if (this.activeName === 'first') { // if (this.linkType) { // this.tableDataLinkStart = res.data // } else { // this.tableDataLinkEnd = res.data // } // } else if (this.activeName === 'second') { // this.bgPipeLine = res.data // } else if (this.activeName === 'third') { // this.tableDataLiuxiang = res.data // } else if (this.activeName === 'fourth') { // // } // // console.log(res) // }, // // 流向-管线选择 // selectRowLiuXiang (e) { // // 选择要显示的流向线 // console.log('选择要显示的流向线') // console.log(e) // }, // lxHandleClick (e) { // console.log('正流向显示') // console.log(e) // // this.clearLX() // const param = { // points: e.data, // option: { // dashArray: '15 15', // dashSpeed: -30 // } // } // this.flowPipeLine = main.createFlowLine(param) // }, // clearLinkPipe () { // if (this.linkPipeline.length > 0) { // this.linkPipeline.forEach((itm, idx) => { // itm.remove() // }) // } // this.linkPipeline = [] // }, // clearLX () { // if (this.flowPipeLine != null) { // this.flowPipeLine.remove() // this.flowPipeLine = null // } // }, // lxHandleClick2 (e) { // console.log('逆流向显示') // console.log(e) // if (this.flowPipeLine != null) { // this.flowPipeLine.remove() // this.flowPipeLine = null // } // const param = { // points: e.data, // option: { // dashArray: '15 15', // dashSpeed: 30 // } // } // this.flowPipeLine = main.createFlowLine(param) // }, // // 横断面数据请求 // async getHdmPoint (line) { // console.log('横断面的绘制线') // console.table(line) // this.hdmParam = { // x1: line[0].lng, // y1: line[0].lat, // x2: line[1].lng, // y2: line[1].lat // } // }, // // 横断面选择后 图表展示 // async selectRow (e) { // console.log(e) // // 3. 使用刚指定的配置项和数据,显示图表 // // const option = { // xAxis: { // type: 'category', // data: ['井1', '井2', '井3', '井4', '井5', '井6', '井7'] // }, // yAxis: { // type: 'value' // }, // series: [{ // data: [820, 932, 901, 934, 1290, 1330, 1320], // type: 'line' // }] // } // // this.myChartShow = true // this.myChart.setOption(option) // }, // drawLine () { // console.log('drawLine') // if (this.measure === null) { // this.measure = new DrawLine(this.map) // } // this.measure.destory() // this.measure.init() // }, // async jdmQuery () { // if (this.hdmParam == null) { // this.$message('请先在地图上绘制截断线') // return // } // const res = await api.getCrossSection(this.hdmParam) // console.log(res) // // debugger // }, // jdmClear () { // this.hdmParam = null // if (this.measure != null) { // this.measure.destory() // } // } // } src/components/panel/topicSearch/SewersSelect/AnalysisChoose/Tube.vue
@@ -2,10 +2,11 @@ <div class="connectivity"> <el-row> <span class="tube-span">爆管(相关开关)</span> <el-button type="primary" size="mini">选择管线</el-button> <el-button type="primary" size="mini">清除</el-button> <el-button type="primary" size="mini" @click="bgClick">选择管线</el-button> <el-button type="primary" size="mini" @click="handleClick('czp')">清除</el-button> </el-row> <el-card class="box-card"> <el-scrollbar style="height:350px"> <span class="clearfix">发生爆裂的管段</span> <el-table :data="tableData" @@ -58,16 +59,32 @@ label="操作"> </el-table-column> </el-table> </el-scrollbar> </el-card> </div> </template> <script> // import PublicWay from '@components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay' export default { name: 'Tube', data () { return { tableData: [] tableData: [], tube: [] } }, methods: { // 选指管线 bgClick () { this.selectPipeLine() }, // 清楚绘制 handleClick (val) { console.log(val) // PublicWay.handleClick(val) } } } src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue
@@ -23,8 +23,10 @@ import Flow from '@components/panel/topicSearch/SewersSelect/AnalysisChoose/Flow' import CrossSectional from '@components/panel/topicSearch/SewersSelect/AnalysisChoose/CrossSectional' // import PublicWay from '@components/panel/topicSearch/SewersSelect/AnalysisChoose/PublicWay' export default { name: 'SewersFirstTab', name: 'SewersAnalysis', components: { Connectivity, Tube, @@ -39,6 +41,7 @@ methods: { handleClick (tab, event) { console.log(tab, event) // PublicWay.handleClick(tab, event) } } }