From 0cbf795f21d787db7d6b29a59d81579a7a736ab8 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 16 四月 2021 14:40:09 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue | 12
src/components/LayerController/logic/WasteGas.js | 3
/dev/null | 73 ---
src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue | 23
src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue | 392 +++++++++++++++++++
src/components/layer/src/layer.vue | 126 ++++-
src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue | 31 -
src/components/table/components/tabHandover.vue | 4
src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue | 279 +++++++------
src/components/BaseNav/SoilGroundwater/ReportTable.vue | 181 +++++++++
src/components/layer/src/layer.js | 58 --
11 files changed, 866 insertions(+), 316 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
index dc58543..d22a3ce 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDate.vue
@@ -57,6 +57,7 @@
</template>
<script>
+import mapApi from '@/api/mapApi'
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
import dayjs from 'dayjs'
@@ -150,6 +151,17 @@
this.onSubmit()
},
methods: {
+ async getWasteGasMonData () {
+ const GasOnlinedata = {
+ onLineMonEmissPointId: '23',
+ monItemId: '28,31',
+ beginTime: '2020-04-06 15:13:20',
+ endTime: '2020-04-07 15:13:20',
+ dataType: '1'
+ }
+ const data = await mapApi.getWasteGasMonData(GasOnlinedata)
+ this.JsonDayCharts = data
+ },
onSubmit () {
console.log('submit!')
this.CreateCharts(this.JsonDayCharts.id, this.JsonDayCharts.title, this.JsonDayCharts.legend, this.JsonDayCharts.xdata, this.JsonDayCharts.ydatas, this.JsonDayCharts.yname, this.JsonDayCharts.id, this.JsonDayCharts.datatype)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
index 9d30887..c23fb93 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
@@ -37,7 +37,7 @@
center
v-dialogDrag
>
- <div class="el-dialog-div" style="height: 500px">
+ <div class="el-dialog-div">
<public-detailed-list v-bind="$attrs"></public-detailed-list>
</div>
</el-dialog>
@@ -45,6 +45,7 @@
</template>
<script>
+// import mapApi from '@/api/mapApi'
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
import dayjs from 'dayjs'
export default {
@@ -517,6 +518,395 @@
// createDivByMouse("s",params.event);
}) */
}
+ // 搴熸皵鎸夊ぉ鏌ヨ灏忔椂鏁版嵁
+ // queryZDYDate_24 (id) {
+ // this.formInline.timeStart
+ // this.formInline.timeEnd
+ // // var date = $('#riqi_24').val()
+ // // if (date) {
+ // // var date1 = new Date(date)
+ // // date1 = new Date(date1.getTime() - (8 * 3600000))
+ // // console(date1)
+ // // var dateUtil = new DateUtil()
+ // // var datePkg = dateUtil.getTowDate(date1, 'a', 24 * 3600000 - 1)
+ // // var dateTime1FullStr =
+ // var datatype = 2
+ // console(datePkg)
+ //
+ // if (CFG_Model.production) {
+ // get24HourDate(datePkg.dateTime1FullStr, datePkg.dateTime2FullStr, id, datatype, '28,31,226', function (res) {
+ // // 澶勭悊鏁版嵁寮�濮�
+ // var d = res
+ // var nameList = [] // 瀛樻斁鍥句緥
+ // var dateList = [] // 瀛樻斁鏃堕棿
+ // var dataList = [] // 瀛樻斁鏁版嵁
+ // var bzh = [] // 鏍囧噯鍊�
+ // var data = []
+ // wrwIDS = []
+ // for (var i = 0; i < d.length; i++) {
+ // var MonTimeStr = d[i].MonTimeStr
+ //
+ // // 20190430 add 鑾峰彇鐩戞祴鐐筰d 姹℃煋鐗﹊d 妫�娴嬮」id
+ // getWRW(d[i])
+ //
+ // var strDate
+ // var d1 = MonTimeStr.split('/')
+ // var d2 = d1[2].split(' ')
+ // var t = MonTimeStr.split(' ')
+ // var hlist = t[1].split(':')
+ // var h = hlist[0]
+ // if (d1[1] > 9) {
+ // // strDate=MonTimeStr.substring(8,10)+"鏃�";
+ // if (d2[0] > 9) {
+ // strDate = ''
+ // if (h > 9) {
+ // strDate += MonTimeStr.substring(11, 13) + '鏃�'
+ // } else {
+ // strDate += MonTimeStr.substring(11, 12) + '鏃�'
+ // }
+ // } else {
+ // strDate = ''
+ // if (h > 9) {
+ // strDate += MonTimeStr.substring(10, 12) + '鏃�'
+ // } else {
+ // strDate += MonTimeStr.substring(10, 11) + '鏃�'
+ // }
+ // }
+ // } else {
+ // if (d2[0] > 9) {
+ // strDate = ''
+ // if (h > 9) {
+ // strDate += MonTimeStr.substring(10, 12) + '鏃�'
+ // } else {
+ // strDate += MonTimeStr.substring(10, 11) + '鏃�'
+ // }
+ // } else {
+ // strDate = ''
+ // if (h > 9) {
+ // strDate += MonTimeStr.substring(9, 11) + '鏃�'
+ // } else {
+ // strDate += MonTimeStr.substring(9, 10) + '鏃�'
+ // }
+ // }
+ // }
+ //
+ // if (nameList.length == 0) {
+ // nameList.push(d[i].PoltmtrlName.trim())
+ // dateList.push(strDate)
+ // if ((d[i].PoltmtrlName == '搴熸皵娴侀噺' || d[i].PoltmtrlName == '搴熸皵') && d[i].MonQty < 0) {
+ // d[i].MonQty = 0
+ // }
+ // data.push(d[i].MonQty)
+ // bzh.push(d[i].StdValue)
+ // } else if (nameList.indexOf(d[i].PoltmtrlName.trim()) < 0) {
+ // nameList.push(d[i].PoltmtrlName)
+ // bzh.push(d[i].StdValue)
+ // dataList.push(data)
+ // data = new Array()
+ // if ((d[i].PoltmtrlName == '搴熸皵娴侀噺' || d[i].PoltmtrlName == '搴熸皵') && d[i].MonQty < 0) {
+ // d[i].MonQty = 0
+ // }
+ // data.push(d[i].MonQty)
+ // } else if (i == d.length - 1) {
+ // if ((d[i].PoltmtrlName == '搴熸皵娴侀噺' || d[i].PoltmtrlName == '搴熸皵') && d[i].MonQty < 0) {
+ // d[i].MonQty = 0
+ // }
+ // data.push(d[i].MonQty)
+ // dataList.push(data)
+ // } else {
+ // if (dateList.indexOf(strDate) < 0) {
+ // dateList.push(strDate)
+ // }
+ // if ((d[i].PoltmtrlName == '搴熸皵娴侀噺' || d[i].PoltmtrlName == '搴熸皵') && d[i].MonQty < 0) {
+ // d[i].MonQty = 0
+ // }
+ // data.push(d[i].MonQty)
+ // }
+ // }
+ // // 澶勭悊鏁版嵁缁撴潫
+ //
+ // // dateList=get24DateTime();
+ //
+ // var newList = []
+ // for (var i = 0; i < dataList.length; i++) {
+ // var list = dataList[i].reverse()
+ // newList.push(list)
+ // }
+ // dataList = newList
+ //
+ // var id = 'mychart'
+ // var title = '鍔犵儹鐐夌儫姘�'
+ // var lengList = []
+ // var objTemp
+ //
+ // for (var l = 0; l < nameList.length; l++) {
+ // var obj
+ // var iconurl
+ // if (nameList[l] == '浜屾哀鍖栫～') {
+ // iconurl = 'image://../assets/imgs/legend/SO2.png'
+ // } else if (nameList[l] == '姘哀鍖栫墿') {
+ // iconurl = 'image://../assets/imgs/legend/NOX.png'
+ // } else if (nameList[l] == '鐑熷皹') {
+ // iconurl = 'image://../assets/imgs/legend/YanChen.png'
+ // } else if (nameList[l] == '闈炵敳鐑锋�荤儍') {
+ // iconurl = 'image://../assets/imgs/legend/grn.png'
+ // } else if (nameList[l] == '娓╁害') {
+ // iconurl = 'image://../assets/imgs/legend/WenDu.png'
+ // } else {
+ // iconurl = 'image://../assets/imgs/legend/VOCs.png'
+ // }
+ //
+ // if (nameList[l] == '搴熸皵' || nameList[l] == '搴熸皵娴侀噺') { // 灏嗗簾姘旀祦閲忔帓鍒版暟缁勬渶鍚�
+ // objTemp = {
+ // name: nameList[l],
+ // icon: iconurl,
+ // textStyle: {
+ // color: '#ccc'
+ // },
+ // itemWidth: 20,
+ // itemHeight: 5
+ // }
+ // } else {
+ // obj = {
+ // name: nameList[l],
+ // icon: iconurl,
+ // textStyle: {
+ // color: '#ccc'
+ // },
+ // itemWidth: 20,
+ // itemHeight: 5
+ // }
+ // lengList.push(obj)
+ // }
+ // }
+ // lengList.push(objTemp)
+ //
+ // var legend = lengList
+ // var xdata = dateList.reverse()
+ // var ydatas = []
+ //
+ // for (var j = 0; j < nameList.length; j++) {
+ // var zdcbcolor, zxcolor
+ // if (nameList[j] == '浜屾哀鍖栫～') {
+ // zdcbcolor = 'red'
+ // zxcolor = '#fff21c'
+ // } else if (nameList[j] == '姘哀鍖栫墿') {
+ // zdcbcolor = 'red'
+ // zxcolor = '#00B0F0'
+ // } else if (nameList[j] == '鐑熷皹') {
+ // zdcbcolor = 'red'
+ // zxcolor = '#f48183'
+ // } else if (nameList[j] == '娓╁害') {
+ // zdcbcolor = 'red'
+ // zxcolor = '#F206FF'
+ // } else {
+ // zdcbcolor = 'red'
+ // zxcolor = '#9ACD32'
+ // }
+ // var ydata = {
+ // name: nameList[j],
+ // data: dataList[j],
+ // zdcbcolor: zdcbcolor,
+ // zxcolor: zxcolor,
+ // bzz: bzh[j]
+ // }
+ // exhbzz = {
+ // name: nameList[j],
+ // bzhui: bzh[j]
+ // }
+ // exhbzzList.push(exhbzz)
+ //
+ // ydatas.push(ydata)
+ // }
+ //
+ // var yname = '娴撳害(mg/m鲁)'
+ // CreateChart(id, title, legend, xdata, ydatas, yname, id, datatype)
+ // console.log(123323)
+ // console.log(id, title, legend, xdata, ydatas, yname, id, datatype)
+ // })
+ // } else {
+ // get24HourDate1(datePkg.dateTime1FullStr, datePkg.dateTime2FullStr, id, datatype, '28,31', function (res) {
+ // // 澶勭悊鏁版嵁寮�濮�
+ // var d = res
+ // var nameList = [] // 瀛樻斁鍥句緥
+ // var dateList = [] // 瀛樻斁鏃堕棿
+ // var dataList = [] // 瀛樻斁鏁版嵁
+ // var bzh = [] // 鏍囧噯鍊�
+ // var data = []
+ // wrwIDS = []
+ // for (var i = 0; i < d.length; i++) {
+ // var MonTimeStr = d[i].MonTimeStr
+ //
+ // // 20190430 add 鑾峰彇鐩戞祴鐐筰d 姹℃煋鐗﹊d 妫�娴嬮」id
+ // getWRW(d[i])
+ //
+ // var strDate
+ // var d1 = MonTimeStr.split('/')
+ // var t = MonTimeStr.split(' ')
+ // var hlist = t[1].split(':')
+ // var h = hlist[0]
+ // if (d1[1] > 9) {
+ // // strDate=MonTimeStr.substring(8,10)+"鏃�";
+ // strDate = ''
+ // if (h > 9) {
+ // strDate += MonTimeStr.substring(11, 13) + '鏃�'
+ // } else {
+ // strDate += MonTimeStr.substring(11, 12) + '鏃�'
+ // }
+ // } else {
+ // // strDate=MonTimeStr.substring(7,9)+"鏃�";
+ // strDate = ''
+ // if (h > 9) {
+ // strDate += MonTimeStr.substring(10, 12) + '鏃�'
+ // } else {
+ // strDate += MonTimeStr.substring(10, 11) + '鏃�'
+ // }
+ // }
+ //
+ // if (nameList.length == 0) {
+ // nameList.push(d[i].PoltmtrlName.trim())
+ // dateList.push(strDate)
+ // if ((d[i].PoltmtrlName == '搴熸皵娴侀噺' || d[i].PoltmtrlName == '搴熸皵') && d[i].MonQty < 0) {
+ // d[i].MonQty = 0
+ // }
+ // data.push(d[i].MonQty)
+ // bzh.push(d[i].StdValue)
+ // } else if (nameList.indexOf(d[i].PoltmtrlName.trim()) < 0) {
+ // nameList.push(d[i].PoltmtrlName)
+ // bzh.push(d[i].StdValue)
+ // dataList.push(data)
+ // data = new Array()
+ // if ((d[i].PoltmtrlName == '搴熸皵娴侀噺' || d[i].PoltmtrlName == '搴熸皵') && d[i].MonQty < 0) {
+ // d[i].MonQty = 0
+ // }
+ // data.push(d[i].MonQty)
+ // } else if (i == d.length - 1) {
+ // if ((d[i].PoltmtrlName == '搴熸皵娴侀噺' || d[i].PoltmtrlName == '搴熸皵') && d[i].MonQty < 0) {
+ // d[i].MonQty = 0
+ // }
+ // data.push(d[i].MonQty)
+ // dataList.push(data)
+ // } else {
+ // if (dateList.indexOf(strDate) < 0) {
+ // dateList.push(strDate)
+ // }
+ // if ((d[i].PoltmtrlName == '搴熸皵娴侀噺' || d[i].PoltmtrlName == '搴熸皵') && d[i].MonQty < 0) {
+ // d[i].MonQty = 0
+ // }
+ // data.push(d[i].MonQty)
+ // }
+ // }
+ // // 澶勭悊鏁版嵁缁撴潫
+ //
+ // dateList = get24DateTime()
+ // dateList.reverse()
+ // var newList = []
+ //
+ // for (var i = 0; i < dataList.length; i++) {
+ // var list = dataList[i].reverse()
+ // newList.push(list)
+ // }
+ // dataList = newList
+ //
+ // var id = 'mychart'
+ // var title = '鍔犵儹鐐夌儫姘�'
+ // var lengList = []
+ // var objTemp
+ //
+ // for (var l = 0; l < nameList.length; l++) {
+ // var obj
+ // var iconurl
+ // if (nameList[l] == '浜屾哀鍖栫～') {
+ // iconurl = 'image://../assets/imgs/legend/SO2.png'
+ // } else if (nameList[l] == '姘哀鍖栫墿') {
+ // iconurl = 'image://../assets/imgs/legend/NOX.png'
+ // } else if (nameList[l] == '鐑熷皹') {
+ // iconurl = 'image://../assets/imgs/legend/YanChen.png'
+ // } else if (nameList[l] == '闈炵敳鐑锋�荤儍') {
+ // iconurl = 'image://../assets/imgs/legend/grn.png'
+ // } else if (nameList[l] == '娓╁害') {
+ // iconurl = 'image://../assets/imgs/legend/WenDu.png'
+ // } else {
+ // iconurl = 'image://../assets/imgs/legend/VOCs.png'
+ // }
+ //
+ // if (nameList[l] == '搴熸皵' || nameList[l] == '搴熸皵娴侀噺') { // 灏嗗簾姘旀祦閲忔帓鍒版暟缁勬渶鍚�
+ // objTemp = {
+ // name: nameList[l],
+ // icon: iconurl,
+ // textStyle: {
+ // color: '#ccc'
+ // },
+ // itemWidth: 20,
+ // itemHeight: 5
+ // }
+ // } else {
+ // obj = {
+ // name: nameList[l],
+ // icon: iconurl,
+ // textStyle: {
+ // color: '#ccc'
+ // },
+ // itemWidth: 20,
+ // itemHeight: 5
+ // }
+ // lengList.push(obj)
+ // }
+ // }
+ // lengList.push(objTemp)
+ //
+ // var legend = lengList
+ // var xdata = dateList.reverse()
+ // var ydatas = []
+ //
+ // for (var j = 0; j < nameList.length; j++) {
+ // var zdcbcolor, zxcolor
+ // if (nameList[j] == '浜屾哀鍖栫～') {
+ // zdcbcolor = 'red'
+ // zxcolor = '#fff21c'
+ // } else if (nameList[j] == '姘哀鍖栫墿') {
+ // zdcbcolor = 'red'
+ // zxcolor = '#00B0F0'
+ // } else if (nameList[j] == '鐑熷皹') {
+ // zdcbcolor = 'red'
+ // zxcolor = '#f48183'
+ // } else if (nameList[j] == '娓╁害') {
+ // zdcbcolor = 'red'
+ // zxcolor = '#F206FF'
+ // } else {
+ // zdcbcolor = 'red'
+ // zxcolor = '#9ACD32'
+ // }
+ // var ydata = {
+ // name: nameList[j],
+ // data: dataList[j],
+ // zdcbcolor: zdcbcolor,
+ // zxcolor: zxcolor,
+ // bzz: bzh[j]
+ // }
+ // exhbzz = {
+ // name: nameList[j],
+ // bzhui: bzh[j]
+ // }
+ // exhbzzList.push(exhbzz)
+ // ydatas.push(ydata)
+ // }
+ //
+ // var yname = '娴撳害(mg/m鲁)'
+ // CreateChart(id, title, legend, xdata, ydatas, yname, id, datatype)
+ // onsole.log(id, title, legend, xdata, ydatas, yname, id, datatype)
+ // })
+ // }
+ // $('.btm span:nth-child(2)').empty()
+ // var html = '鐩戞祴鏃堕棿 锛�' + datePkg.dateTime1FullStr + ' 鑷� ' + datePkg.dateTime2FullStr + '锛�'
+ // $('.btm span:nth-child(2)').html(html)
+ //
+ // fore24Time = datePkg.dateTime1FullStr
+ // back24Time = datePkg.dateTime2FullStr
+ // } else {
+ // alert('鏌ヨ鏃堕棿涓嶈兘涓虹┖锛�')
+ // }
+ // }
// drawChart: function () {
// window.onresize = function () {
// var h1 = document.documentElement.clientHeight// 鑾峰彇灞忓箷鐨勯珮搴�
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
index 649ac41..bb57e74 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsTable.vue
@@ -31,7 +31,7 @@
<el-table-column
label="鐑熷皹">
<el-table-column
- prop="MonItemId"
+ prop="DataTypeName"
label="鐩戞祴鍊�">
</el-table-column>
<el-table-column
@@ -42,11 +42,11 @@
<el-table-column
label="闈炵敳鐑锋�荤儍">
<el-table-column
- prop="MonItemId"
+ prop="DataTypeName"
label="鐩戞祴鍊�">
</el-table-column>
<el-table-column
- prop="MonItemId"
+ prop="DataTypeName"
label="鏍囧噯鍊�">
</el-table-column>
</el-table-column>
@@ -54,32 +54,19 @@
</template>
<script>
+// import dayjs from 'dayjs'
export default {
name: 'EChartsTable',
data () {
return {
- tableData: [{
- LabMonTime: '2021-02-05 09:54',
- MonItemId: '---',
- EndMonTime: '30',
- NOMonTime: '44',
- NOEndTime: '100',
- SOMontime: '9',
- SoEndTime: '50'
- }, {
- LabMonTime: '2021-01-14 10:15',
- MonItemId: '---',
- EndMonTime: '30',
- NOMonTime: '70',
- NOEndTime: '100',
- SOMontime: '---',
- SoEndTime: '50'
- }]
+ tableData: []
}
},
created () {
- // this.tableData = [...this.$attrs.ManualData]
- // console.log(this.tableData)
+ this.$attrs.ManualData.forEach((item, index) => {
+ this.tableData.push(item)
+ this.tableData[index].LabMonTime = this.tableData[index].LabMonTime.replaceAll('T', ' ')
+ })
}
}
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
index 61a58f1..2be904a 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
@@ -835,6 +835,7 @@
}
console.log(option)
this.RealTimeChart.setOption(option)
+ // this.IntervalEXHRealTimeDate()
// this.RealTimeChart.on('legendselectchanged', function (params) {
// var StdVal = null
@@ -860,153 +861,153 @@
// var nowDate = new Date().Format()
// })
},
- getRtdb15s (unionTagCodeList, startTime, endTime, step, res) {
- if (this.res.length > 0) {
- // 澶勭悊鏁版嵁寮�濮�
- var d = res
- var nameList = [] // 瀛樻斁鍥句緥
-
- var data // 鏁版嵁绫诲瀷// var data={name:'',value:[now1.getFullYear(), now1.getMonth() + 1, now1.getDate().join('/'),value]}
- var datalist // 瀛樻斁data鐨勬暟缁�
- // var bzh = []
- for (var i = 0; i < d.length; i++) {
- if (d[i].ErrorMessage != null) {
- continue
- }
- // var name = CFG.DATA_REALTIME_TAGCODETABLE[d[i].UnionTagCode].TagName
-
- if (nameList.length === 0) {
- nameList.push(name)
-
- var newdate = new Date(this.res.ReadTime)
- data = {
- name: name,
- value: [newdate, this.res.TagValue]
- }
-
- datalist = {
- name: name,
- data: [data]
- }
-
- this.EXHRealTimeDataList.push(datalist)
- } else if (nameList.indexOf(name) < 0) {
- nameList.push(name)
-
- // var newdate = new Date(d[i].ReadTime)
-
- data = {
- name: name,
- value: [newdate, d[i].TagValue]
- }
- datalist = {
- name: name,
- data: [data]
- }
- this.EXHRealTimeDataList.push(datalist)
- } else if (i === d.length - 1) {
- if (nameList.indexOf(name) < 0) {
- nameList.push(name)
-
- // var newdate = new Date(d[i].ReadTime)
-
- data = {
- name: name,
- value: [newdate, d[i].TagValue]
- }
- datalist = {
- name: name,
- data: [data]
- }
- // EXHRealTimeDataList.push(datalist)
- } else {
- // var newdate = new Date(d[i].ReadTime)
- data = {
- name: name,
- value: [newdate, d[i].TagValue]
- }
- for (var k = 0; k < this.EXHRealTimeDataList.length; k++) {
- if (this.EXHRealTimeDataList[k].name === name) {
- this.EXHRealTimeDataList[k].data.push(data)
- }
- }
- }
- } else {
- const newdate = new Date(d[i].ReadTime)
- data = {
- name: name,
- value: [newdate, d[i].TagValue]
- }
- for (let k = 0; k < this.EXHRealTimeDataList.length; k++) {
- if (this.EXHRealTimeDataList[k].name === name) {
- this.EXHRealTimeDataList[k].data.push(data)
- }
- }
- }
- }
-
- // var divid = 'mychart_ss'
- // var title = name
- var lengList = []
- var objTemp
-
- for (var l = 0; l < nameList.length; l++) {
- var obj
- var iconurl
- if (nameList[l] === '浜屾哀鍖栫～') {
- iconurl = 'image://../assets/imgs/legend/SO2.png'
- } else if (nameList[l] === '姘哀鍖栫墿') {
- iconurl = 'image://../assets/imgs/legend/NOX.png'
- } else if (nameList[l] === '鐑熷皹') {
- iconurl = 'image://../assets/imgs/legend/YanChen.png'
- } else if (nameList[l] === '闈炵敳鐑锋�荤儍') {
- iconurl = 'image://../assets/imgs/legend/grn.png'
- } else if (nameList[l] === '娓╁害') {
- iconurl = 'image://../assets/imgs/legend/WenDu.png'
- } else {
- iconurl = 'image://../assets/imgs/legend/VOCs.png'
- }
-
- if (nameList[l] === '搴熸皵' || nameList[l] === '搴熸皵娴侀噺') { // 灏嗗簾姘旀祦閲忔帓鍒版暟缁勬渶鍚�
- objTemp = {
- name: nameList[l],
- icon: iconurl,
- textStyle: {
- color: '#ccc'
- },
- itemWidth: 20,
- itemHeight: 5
- }
- } else {
- obj = {
- name: nameList[l],
- icon: iconurl,
- textStyle: {
- color: '#ccc'
- },
- itemWidth: 20,
- itemHeight: 5
- }
- lengList.push(obj)
- }
- }
- lengList.push(objTemp)
-
- this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
- }
- },
+ // getRtdb15s (unionTagCodeList, startTime, endTime, step, res) {
+ // if (this.res.length > 0) {
+ // // 澶勭悊鏁版嵁寮�濮�
+ // var d = res
+ // var nameList = [] // 瀛樻斁鍥句緥
+ //
+ // var data // 鏁版嵁绫诲瀷// var data={name:'',value:[now1.getFullYear(), now1.getMonth() + 1, now1.getDate().join('/'),value]}
+ // var datalist // 瀛樻斁data鐨勬暟缁�
+ // // var bzh = []
+ // for (var i = 0; i < d.length; i++) {
+ // if (d[i].ErrorMessage != null) {
+ // continue
+ // }
+ // // var name = CFG.DATA_REALTIME_TAGCODETABLE[d[i].UnionTagCode].TagName
+ //
+ // if (nameList.length === 0) {
+ // nameList.push(name)
+ //
+ // var newdate = new Date(this.res.ReadTime)
+ // data = {
+ // name: name,
+ // value: [newdate, this.res.TagValue]
+ // }
+ //
+ // datalist = {
+ // name: name,
+ // data: [data]
+ // }
+ //
+ // this.EXHRealTimeDataList.push(datalist)
+ // } else if (nameList.indexOf(name) < 0) {
+ // nameList.push(name)
+ //
+ // // var newdate = new Date(d[i].ReadTime)
+ //
+ // data = {
+ // name: name,
+ // value: [newdate, d[i].TagValue]
+ // }
+ // datalist = {
+ // name: name,
+ // data: [data]
+ // }
+ // this.EXHRealTimeDataList.push(datalist)
+ // } else if (i === d.length - 1) {
+ // if (nameList.indexOf(name) < 0) {
+ // nameList.push(name)
+ //
+ // // var newdate = new Date(d[i].ReadTime)
+ //
+ // data = {
+ // name: name,
+ // value: [newdate, d[i].TagValue]
+ // }
+ // datalist = {
+ // name: name,
+ // data: [data]
+ // }
+ // // EXHRealTimeDataList.push(datalist)
+ // } else {
+ // // var newdate = new Date(d[i].ReadTime)
+ // data = {
+ // name: name,
+ // value: [newdate, d[i].TagValue]
+ // }
+ // for (var k = 0; k < this.EXHRealTimeDataList.length; k++) {
+ // if (this.EXHRealTimeDataList[k].name === name) {
+ // this.EXHRealTimeDataList[k].data.push(data)
+ // }
+ // }
+ // }
+ // } else {
+ // const newdate = new Date(d[i].ReadTime)
+ // data = {
+ // name: name,
+ // value: [newdate, d[i].TagValue]
+ // }
+ // for (let k = 0; k < this.EXHRealTimeDataList.length; k++) {
+ // if (this.EXHRealTimeDataList[k].name === name) {
+ // this.EXHRealTimeDataList[k].data.push(data)
+ // }
+ // }
+ // }
+ // }
+ //
+ // // var divid = 'mychart_ss'
+ // // var title = name
+ // var lengList = []
+ // var objTemp
+ //
+ // for (var l = 0; l < nameList.length; l++) {
+ // var obj
+ // var iconurl
+ // if (nameList[l] === '浜屾哀鍖栫～') {
+ // iconurl = 'image://../assets/imgs/legend/SO2.png'
+ // } else if (nameList[l] === '姘哀鍖栫墿') {
+ // iconurl = 'image://../assets/imgs/legend/NOX.png'
+ // } else if (nameList[l] === '鐑熷皹') {
+ // iconurl = 'image://../assets/imgs/legend/YanChen.png'
+ // } else if (nameList[l] === '闈炵敳鐑锋�荤儍') {
+ // iconurl = 'image://../assets/imgs/legend/grn.png'
+ // } else if (nameList[l] === '娓╁害') {
+ // iconurl = 'image://../assets/imgs/legend/WenDu.png'
+ // } else {
+ // iconurl = 'image://../assets/imgs/legend/VOCs.png'
+ // }
+ //
+ // if (nameList[l] === '搴熸皵' || nameList[l] === '搴熸皵娴侀噺') { // 灏嗗簾姘旀祦閲忔帓鍒版暟缁勬渶鍚�
+ // objTemp = {
+ // name: nameList[l],
+ // icon: iconurl,
+ // textStyle: {
+ // color: '#ccc'
+ // },
+ // itemWidth: 20,
+ // itemHeight: 5
+ // }
+ // } else {
+ // obj = {
+ // name: nameList[l],
+ // icon: iconurl,
+ // textStyle: {
+ // color: '#ccc'
+ // },
+ // itemWidth: 20,
+ // itemHeight: 5
+ // }
+ // lengList.push(obj)
+ // }
+ // }
+ // lengList.push(objTemp)
+ //
+ // this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
+ // }
+ // },
// 閽╁瓙璋冪敤瀹炴椂
- IntervalEXHRealTimeDate (id, unionTagCodeList, BBZMAPPING) {
+ IntervalEXHRealTimeDate () {
// 瀹氭椂鍣ㄥ嚱鏁�
- this.interValHander = setInterval(function () {
+ this.DrawEXHRealTimeDateChart()
+ setInterval(function () {
// $('.RealTime').empty()
this.startTime = dayjs().subtract(5, 'minute').format('YYYY-MM-DD HH:mm:ss')
this.endTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
this.step = '15'
// this.getRtdb15s(this.unionTagCodeList, this.startTime, this.endTime, this.step, this.res)
// PreQueryTime=endTime;
- this.DrawEXHRealTimeDateChart(this.JsonTimeCtarts.id, this.JsonTimeCtarts.title, this.JsonTimeCtarts.legend, this.JsonTimeCtarts.ydatas, this.JsonTimeCtarts.yname)
- this.IntervalEXHRealTimeDate(this.JSONTimeData.id, this.JSONTimeData.unionTagCodeList, this.BBZMAPPING)
+ this.IntervalEXHRealTimeDate()
}, 15000)
}
}
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
index 11f39fd..98eba0a 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/PublicDetailedList.vue
@@ -1,6 +1,6 @@
<template>
<div class="PublicDetailedList">
- <el-table :data="tableData" max-height="400px" border>
+ <el-table :data="tableData" max-height="500px" border>
<el-scrollbar style="height: 50vh">
<el-table-column prop="OnLineMonEmissPointName" label="鎺掓斁鐐�"></el-table-column>
<el-table-column prop="MonTimeStr" label="鐩戞祴鏃堕棿"></el-table-column>
@@ -31,6 +31,7 @@
</template>
<script>
+// import mapApi from '@/api/mapApi'
export default {
name: 'PublicDetailedList',
data () {
@@ -38,16 +39,20 @@
tableData: []
}
},
- mounted () {
+ created () {
// console.log(this.$attrs.value)
- if (this.$attrs.value === 'feiqi') {
- this.tableData = this.$attrs.getWasteGasDetails
- // console.log(this.$attrs.getWasteGasDetails)
- } else if (this.$attrs.value === 'feishui') {
- this.tableData = this.$attrs.getWasteWaterMonitoringDetails
- // console.log(this.$attrs.getWasteWaterMonitoringDetails)
- }
+ this.tableData = this.$attrs.getWasteGasDetails
+ // this.getWasteGasDetails()
+ // console.log(this.tableData)
+ // console.log(this.$attrs.getWasteGasDetails)
}
+ // methods: {
+ // async getWasteGasDetails () {
+ // const data = await mapApi.getWasteGasDetails
+ // this.tableData = data
+ // console.log(this.tableData)
+ // }
+ // }
}
</script>
diff --git a/src/components/BaseNav/SoilGroundwater/ReportTable.vue b/src/components/BaseNav/SoilGroundwater/ReportTable.vue
new file mode 100644
index 0000000..a395b17
--- /dev/null
+++ b/src/components/BaseNav/SoilGroundwater/ReportTable.vue
@@ -0,0 +1,181 @@
+<template>
+ <div class="waste-water">
+ <el-table class="tableBox" :data="tableData" style="width: 100%" @cell-click="handle">
+ <el-table-column width="30px" label="">
+ <template slot-scope="{row,$index}">
+ <el-popover placement="bottom" trigger="click" :disabled="!isShowIcon" popper-class="popovers">
+ <!-- <ChemicalWastewater v-show="$index ===1"></ChemicalWastewater> -->
+ <i class="el-icon-caret-right" :class="{active: isActive === $index}" slot="reference" @click="doIcon($index)"></i>
+ </el-popover>
+ </template>
+ </el-table-column>
+ <el-table-column label="搴忓彿" width="45px" type="index"></el-table-column>
+ <el-table-column prop="UserName" label="浼佷笟鍚嶇О" width="120px">
+ <template slot-scope="scope">
+ <div v-if="scope.row.UserName==='闆嗗洟鍚嶇О'" style="color: #00ffff">{{scope.row.UserName}}</div>
+ <div v-else-if="scope.row.UserName==='澶╂触鐭冲寲'" style="color: #00ffff">{{scope.row.UserName}}</div>
+ <div v-else >{{scope.row.UserName}}</div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="normal" >
+ <div slot="header">
+ <span>涓�绾ч闄╁湴鍧楋紙涓級</span>
+ </div>
+ <template slot-scope="{row,$index}">
+ <u v-if="$index!=2" >{{row.normal}}</u>
+ <el-popover v-else placement="bottom-end" width="200" trigger="click" popper-class="popovers" title="鐩戞祴鐐规槑缁嗚〃">
+ <refinery></refinery>
+ <u slot="reference" style="color: #00ffff">{{row.normal}}</u>
+ </el-popover>
+ </template>
+ </el-table-column>
+ <el-table-column prop="normal" >
+ <div slot="header">
+ <span>浜岀骇椋庨櫓鍦板潡锛堜釜锛�</span>
+ </div>
+ <template slot-scope="{row,$index}">
+ <u v-if="$index!=2" >{{row.normal}}</u>
+ <el-popover v-else placement="bottom-end" width="200" trigger="click" popper-class="popovers" title="鐩戞祴鐐规槑缁嗚〃">
+ <refinery></refinery>
+ <u slot="reference" style="color: #00ffff">{{row.normal}}</u>
+ </el-popover>
+ </template>
+ </el-table-column>
+ <el-table-column prop="normal" >
+ <div slot="header">
+ <span>涓夌骇椋庨櫓鍦板潡锛堜釜锛�</span>
+ </div>
+ <template slot-scope="{row,$index}">
+ <u v-if="$index!=2" >{{row.normal}}</u>
+ <el-popover v-else placement="bottom-end" width="200" trigger="click" popper-class="popovers" title="鐩戞祴鐐规槑缁嗚〃">
+ <refinery></refinery>
+ <u slot="reference" style="color: #00ffff">{{row.normal}}</u>
+ </el-popover>
+ </template>
+ </el-table-column>
+ <el-table-column prop="normal" >
+ <div slot="header">
+ <span>鍦熷￥閲囨牱鐐癸紙涓級</span>
+ </div>
+ <template slot-scope="{row,$index}">
+ <u v-if="$index!=2" >{{row.normal}}</u>
+ <el-popover v-else placement="bottom-end" width="200" trigger="click" popper-class="popovers" title="鐩戞祴鐐规槑缁嗚〃">
+ <refinery></refinery>
+ <u slot="reference" style="color: #00ffff">{{row.normal}}</u>
+ </el-popover>
+ </template>
+ </el-table-column>
+ <el-table-column prop="normal" >
+ <div slot="header">
+ <span>鍦颁笅姘撮噰鏍风偣锛堜釜锛�</span>
+ </div>
+ <template slot-scope="{row,$index}">
+ <u v-if="$index!=2" >{{row.normal}}</u>
+ <el-popover v-else placement="bottom-end" width="200" trigger="click" popper-class="popovers" title="鐩戞祴鐐规槑缁嗚〃">
+ <refinery></refinery>
+ <u slot="reference" style="color: #00ffff">{{row.normal}}</u>
+ </el-popover>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+</template>
+
+<script>
+// import ChemicalWastewater from './componented/ChemicalWastewater'
+import Refinery from '@components/table/components/componented/refinery'
+// import MissingAlarm from '@components/table/components/componented/MissingAlarm'
+export default {
+ name: 'WasteWater',
+ components: {
+ // MissingAlarm,
+ Refinery
+ // ChemicalWastewater
+ },
+ data () {
+ return {
+ isActive: '',
+ isShowIcon: false,
+ tableData: [{
+ UserName: '闆嗗洟鍚嶇О',
+ WasteWaters: '',
+ AddOutPut: '',
+ MonthOutPut: '',
+ NH4NPut: '',
+ NH4NMonth: '',
+ normal: '',
+ overProof: '',
+ Abnormal: '',
+ StopProduction: '',
+ deficiency: ''
+ }, {
+ UserName: '澶╂触鐭冲寲',
+ WasteWaters: '116.6',
+ AddOutPut: '58.3',
+ MonthOutPut: '13.1',
+ NH4NPut: '58.3',
+ NH4NMonth: '13.1',
+ normal: '21',
+ overProof: '2',
+ Abnormal: '2',
+ StopProduction: '2',
+ deficiency: '2'
+ }, {
+ UserName: 'xxxx鐐煎寲3',
+ WasteWaters: '116.6',
+ MonthOutPut: '13.1',
+ NH4NPut: '58.3',
+ NH4NMonth: '13.1',
+ normal: '21',
+ overProof: '2',
+ Abnormal: '2',
+ StopProduction: '2',
+ deficiency: '2'
+ }, {
+ UserName: 'xxxx4',
+ WasteWaters: '116.6',
+ AddOutPut: '58.3',
+ MonthOutPut: '13.1',
+ NH4NPut: '58.3',
+ NH4NMonth: '13.1',
+ normal: '21',
+ overProof: '2',
+ Abnormal: '2',
+ StopProduction: '2',
+ deficiency: '2'
+
+ }]
+ }
+ },
+ methods: {
+ tableHeaderColor ({ row, column, owIndex, columnIndex }) {
+ // return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px'
+ },
+ // 琛ㄥご鏍峰紡璁剧疆
+ rowClass () {
+ // return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
+ },
+ // 鑾峰彇鐐瑰嚮鐨勮〃鏍�
+ handle (row, column, event, cell) {
+ console.log(row.UserName)
+ },
+ doIcon (index) {
+ if (index !== 1) {
+ this.isShowIcon = false
+ this.isActive = ''
+ return
+ }
+ this.isShowIcon = !this.isShowIcon
+ if (index === this.isActive) {
+ this.isActive = ''
+ return
+ }
+ this.isActive = index
+ }
+ }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index bb5e353..022588c 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -87,7 +87,8 @@
instance.$mount()
document.body.appendChild(instance.$el)
instance.setGasData(e.layer.options.test, result.Result.DataInfo, Mondata.Result.DataInfo, ManualData.Result.DataInfo, 'feiqi')
- this.setPanTo(e.latlng, 80)
+ this.setPanTo(e.latlng, 150)
+ console.log(e.latlng)
}
// 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
this.differentTypes = (ContrLevel) => {
diff --git a/src/components/layer/src/iframe.vue b/src/components/layer/src/iframe.vue
deleted file mode 100644
index 4b9d07f..0000000
--- a/src/components/layer/src/iframe.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-<template>
- <div class="public-bounced map-background" v-drag>
- <div class="public-bounced-title panel-title" ref="publicBounced">
- <span>{{options.title}}</span>
- <i class="el-icon-circle-close" @click="close"></i>
- </div>
- <div class="public-bounced-content" :id="id">
- {{options.content}}
- </div>
- </div>
-</template>
-
-<script>
-import helper from './helper/helper.js'
-
-export default {
- data () {
- return {
- cls: {
- 'vl-notify-iframe': true
- },
- id: 'vlip' + new Date().getTime()
- }
- },
- props: {
- options: {
- type: Object,
- default: function () {
- return {}
- }
- }
- },
- computed: {
- contentStyle () {
- return {
- height: 'calc(100% - 50px)', // parseInt(this.options.area[1]) - 50 + "px",
- minHeight: '20px',
- overflow: 'auto'
- }
- }
- },
- async mounted () {
- this.getContent()
- helper.hiddenScrollBar(this.options)
- },
- methods: {
- close () {
-
- },
- async getContent () {
- await helper.sleep(10)
- const propsData = helper.deepClone(this.options.content.data) || {}
- propsData.layerid = this.options.id
- propsData.lydata = this.options.content.data
- propsData.lyoption = this.options
- console.log(this.options.content.content)
- const instance = new this.options.content.content({
- // 鍏蜂綋鍙傛暟淇℃伅锛岃鍙傝�僾ue婧愮爜
- parent: this.options.content.parent,
- propsData: propsData
- })
- instance.vm = instance.$mount()
- document.getElementById(this.id).appendChild(instance.vm.$el)
- this.options.layer.instancesVue[this.options.id].iframe = instance.vm
- },
-
- btnyes (event) {
- helper.btnyes(event, this.options)
- },
- btncancel (event) {
- helper.btncancel(event, this.options)
- }
- }
-}
-</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>
diff --git a/src/components/layer/src/layer.js b/src/components/layer/src/layer.js
index b42ef27..2d2db28 100644
--- a/src/components/layer/src/layer.js
+++ b/src/components/layer/src/layer.js
@@ -1,27 +1,12 @@
import layerVue from './layer.vue'
-const Notification = function (Vue, globalOption = {
- msgtime: 1.5 // msg娑堝け鏃堕棿
-}) {
- const NotificationConstructor = Vue.extend(layerVue)
+const Layer = function (Vue) {
+ const LayerVueExtend = Vue.extend(layerVue)
const self = {}
const defOptions = {
type: 0, // 0锛堜俊鎭锛岄粯璁わ級1锛堥〉闈㈠眰锛�2锛坕frame灞傦級3锛堝姞杞藉眰锛�4锛坱ips灞傦級,5msg,6prompt
title: '淇℃伅',
content: '',
- area: 'auto',
- offset: 'auto',
- icon: -1,
- btn: '纭畾',
- time: 0,
- maxmin: false, // 鏈�澶ф渶灏忓寲
- shade: true,
- yes: '',
- cancel: '',
- tips: [0, {}], // 鏀寔涓婂彸涓嬪乏鍥涗釜鏂瑰悜锛岄�氳繃1-4杩涜鏂瑰悜璁惧畾,鍙互璁惧畾tips: [1, '#c00']
- tipsMore: false, // 鏄惁鍏佽澶氫釜tips
- shadeClose: true,
- scrollbar: true, // 鏄惁鍏佽娴忚鍣ㄥ嚭鐜版粴鍔ㄦ潯:榛樿鏄厑璁�
- resize: false // 鏄惁鍏佽鎷変几锛岄粯璁ゆ槸涓嶅厑璁�
+ btn: '纭畾'
}
self.instances = {}
self.instancesVue = []
@@ -34,17 +19,20 @@
* @param {[type]} options [description]
* @return {[type]} [description]
*/
- self.open = function (options) {
- options = mergeJson(options, defOptions)
+ self.open = function (opt) {
+ /* let option = {
+ type: 1,
+ content: opt.content,
+ area: opt.area
+ } */
+ var options = mergeJson(opt, defOptions)
const id = `notification_${new Date().getTime()}_${seed++}`
options.id = id
options.layer = self
- const instance = new NotificationConstructor({
+ options.content.content = Vue.extend(options.content.content)
+ const instance = new LayerVueExtend({
data: options
})
- if (options.type === 1) {
- options.content.content = Vue.extend(options.content.content)
- }
instance.id = id
instance.vm = instance.$mount()
self.instances[id] = {
@@ -52,6 +40,7 @@
type: options.type
}
document.body.appendChild(instance.vm.$el)
+ instance.init()
self.instancesVue[id] = {
mask: '',
main: instance.vm,
@@ -59,28 +48,15 @@
}
return id
}
- /**
- * [description]
- * @param {[type]} options [description]
- * @return {[type]} [description]
- */
- self.iframe = function (opt) {
- let option = {
- type: 1,
- content: opt.content,
- area: opt.area
- }
- option = mergeJson(option, opt)
- console.log(option)
- return self.open(option)
- }
+
/**
* 鍏抽棴涓�涓脊绐�
* @param {[type]} id [description]
* @return {[type]} [description]
*/
self.close = function (id) {
- const oElm = document.getElementById(id)
+ console.log(id)
+ const oElm = document.getElementById(id).parentElement
if (oElm) {
document.body.removeChild(oElm)
delete self.instances[id]
@@ -192,4 +168,4 @@
}
// module.exports = Notification;
-export default Notification
+export default Layer
diff --git a/src/components/layer/src/layer.vue b/src/components/layer/src/layer.vue
index 1ef2000..b29753a 100644
--- a/src/components/layer/src/layer.vue
+++ b/src/components/layer/src/layer.vue
@@ -1,46 +1,114 @@
-<template lang="html">
- <component :options="this.$data" :is="getActiveName"></component>
+<template>
+ <div class="public-bounced map-background" v-drag>
+ <div class="public-bounced-title panel-title" ref="publicBounced">
+ <span>{{title}}</span>
+ <i class="el-icon-circle-close" @click="close"></i>
+ </div>
+ <div class="public-bounced-content" :id="id">
+ </div>
+ </div>
</template>
<script>
-import pzpage from './page.vue'
-import pziframe from './iframe.vue'
+import helper from './helper/helper.js'
export default {
data () {
return {
- id: '',
- type: 0, // 0锛坅lert榛樿锛�1锛堥〉闈㈠眰锛�2锛坕frame灞傦級3锛坙oading锛�4锛坱ips灞傦級,5(msg),6(prompt)
- title: '淇℃伅',
- content: '',
- area: 'auto',
- offset: 'auto',
- icon: -1,
- btn: '纭畾',
- time: 0,
- shade: true,
- yes: '',
- cancel: ''
+ cls: {
+ 'vl-notify-iframe': true
+ },
+ id: 'vlip' + new Date().getTime()
+ }
+ },
+ props: {
+ options: {
+ type: Object,
+ default: function () {
+ return {}
+ }
}
},
computed: {
- getActiveName () {
- const comps = [
- 'pzpage',
- 'pziframe'
- ]
- return comps[this.$data.type]
+ contentStyle () {
+ return {
+ height: 'calc(100% - 50px)', // parseInt(this.options.area[1]) - 50 + "px",
+ minHeight: '20px',
+ overflow: 'auto'
+ }
}
},
- mounted () {},
- methods: {},
- watch: {},
- components: {
- pzpage,
- pziframe
+ async mounted () {
+ helper.hiddenScrollBar(this.options)
+ },
+ methods: {
+ close () {
+ this.layer.close(this.id)
+ },
+ init () {
+ const propsData = helper.deepClone(this.content.content.data) || {}
+ propsData.layerid = this.id
+ propsData.lydata = this.content.data
+ propsData.lyoption = this.options
+ const instance = new this.content.content({
+ // 鍏蜂綋鍙傛暟淇℃伅锛岃鍙傝�僾ue婧愮爜
+ parent: this.content.parent,
+ propsData: propsData
+ })
+ instance.vm = instance.$mount()
+ document.getElementById(this.id).appendChild(instance.vm.$el)
+ }
}
}
</script>
-<style lang="less">
+<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>
diff --git a/src/components/layer/src/page.vue b/src/components/layer/src/page.vue
deleted file mode 100644
index 153f993..0000000
--- a/src/components/layer/src/page.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template lang="html">
- <div class="public-bounced map-background" v-drag v-show="flag">
- <div class="public-bounced-title panel-title" ref="publicBounced">
- <span>{{options.title}}</span>
- <i class="el-icon-circle-close" @click="closePopup"></i>
- </div>
- <div class="public-bounced-content">
- {{options.content}}
- </div>
- </div>
-</template>
-
-<script>
-export default {
- data () {
- return {
- moveLeft: 0, // 宸︾Щ鐨勮窛绂�
- moveTop: 0, // 涓婄Щ鐨勮窛绂�
- ismove: false
- }
- },
- props: {
- options: {
- type: Object,
- default: function () {
- return {}
- }
- }
- },
- computed: {},
- mounted () { },
- methods: {
- close: function (event) {
- const mask = event.target.getAttribute('class')
- if (mask && mask.indexOf('notify-mask') > -1) {
- this.options.layer.close(this.options.id)
- }
- },
- moveStart: function (event) {
- this.options.offset = this.options.offset === 'auto' ? [] : this.options.offset
- if (this.options.offset.length === 0) {
- this.options.offset.push(document.getElementById(this.options.id + '_alert').offsetLeft)
- this.options.offset.push(document.getElementById(this.options.id + '_alert').offsetTop)
- this.options.offset.push(0)
- }
- if (this.options.offset.length === 2) {
- this.options.offset.push(0)
- }
- this.options.offset[0] = (document.getElementById(this.options.id + '_alert').offsetLeft)
- this.options.offset[1] = (document.getElementById(this.options.id + '_alert').offsetTop)
- this.moveLeft = event.clientX
- this.moveTop = event.clientY
- this.ismove = true
- },
- move: function (event) {
- if (this.ismove) {
- const o = document.getElementById(this.options.id + '_alert')
- o.style.left = this.options.offset[0] + (event.clientX - this.moveLeft) + 'px'
- o.style.top = this.options.offset[1] + (event.clientY - this.moveTop) + 'px'
- }
- },
- moveEnd: function () {
- this.ismove = false
- }
- },
- watch: {
-
- },
- components: {
-
- }
-}
-</script>
diff --git a/src/components/table/components/tabHandover.vue b/src/components/table/components/tabHandover.vue
index e451864..dd0727a 100644
--- a/src/components/table/components/tabHandover.vue
+++ b/src/components/table/components/tabHandover.vue
@@ -23,6 +23,8 @@
<script>
import WasteWater from '@components/table/components/WasteWater'
+import ReportTable from '../../../components/BaseNav/SoilGroundwater/ReportTable'
+
// import WasteGas from '@components/table/components/WasteGas'
import SolidWaste from '@components/table/components/WasteSolid'
import AirQuality from '@components/table/components/AirQuality'
@@ -64,7 +66,7 @@
this.gcComp = AirQuality
break
case '鍦熷￥鍙婂湴涓嬫按':
- this.gcComp = AirQuality
+ this.gcComp = ReportTable
break
case '绠＄嚎':
this.gcComp = AirQuality
--
Gitblit v1.8.0