diff --git a/src/views/DialogTabs/component/RQ_Warning.vue b/src/views/DialogTabs/component/RQ_Warning.vue index 0c844dc..7a51439 100644 --- a/src/views/DialogTabs/component/RQ_Warning.vue +++ b/src/views/DialogTabs/component/RQ_Warning.vue @@ -167,6 +167,7 @@ { a: '燃气-Ⅳ级应急-20240618', b: '2024-06-18 19:00', c: '2024-06-18 19:00', d: '已审核', e: '线下', releaseStatus: '0' }, { a: '燃气-Ⅳ级应急-20240618', b: '2024-06-18 19:00', c: '2024-06-18 19:00', d: '已审核', e: '线下', releaseStatus: '3' }, ]); +const accept = ref([]); const AllData = reactive({ pageNum: 1, pageSize: 10, @@ -191,8 +192,15 @@ } /** 多选框选中数据 */ function handleSelectionChange(selection) { - console.log(selection, 'selectionselection'); + accept.value.push(selection); + console.log(accept.value, 'saccept.value'); } +//确定 +function submitForm() { + console.log(accept.value, '确定.确定'); + active.value = 1; +} + // 取消 function cancelForm() { active.value = 1; @@ -243,7 +251,7 @@ justify-content: center; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 15px; color: #c1d3d4; margin-left: 10px; } @@ -297,7 +305,7 @@ justify-content: center; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; } } @@ -311,7 +319,7 @@ border: 1px solid #1cf5fc; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; overflow: auto; padding-top: 5px; @@ -327,7 +335,7 @@ border: 1px solid #1cf5fc; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; overflow: auto; padding-top: 5px; @@ -343,7 +351,7 @@ border: 1px solid #1cf5fc; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; overflow: auto; padding-top: 5px; @@ -354,7 +362,7 @@ background: #03b6a0; font-family: Source Han Sans CN; font-weight: bold; - font-size: 14px; + font-size: 16px; color: #ffffff; align-items: center; justify-content: center; @@ -379,6 +387,7 @@ :deep(.el-table) { --el-table-bg-color: rgba(255, 255, 255, 0) !important; .el-table__header-wrapper th { + font-size: 16px; background: rgb(3 182 160 / 37%) !important; color: #39f7ff; } diff --git a/src/views/DialogTabs/component/RQ_Warning.vue b/src/views/DialogTabs/component/RQ_Warning.vue index 0c844dc..7a51439 100644 --- a/src/views/DialogTabs/component/RQ_Warning.vue +++ b/src/views/DialogTabs/component/RQ_Warning.vue @@ -167,6 +167,7 @@ { a: '燃气-Ⅳ级应急-20240618', b: '2024-06-18 19:00', c: '2024-06-18 19:00', d: '已审核', e: '线下', releaseStatus: '0' }, { a: '燃气-Ⅳ级应急-20240618', b: '2024-06-18 19:00', c: '2024-06-18 19:00', d: '已审核', e: '线下', releaseStatus: '3' }, ]); +const accept = ref([]); const AllData = reactive({ pageNum: 1, pageSize: 10, @@ -191,8 +192,15 @@ } /** 多选框选中数据 */ function handleSelectionChange(selection) { - console.log(selection, 'selectionselection'); + accept.value.push(selection); + console.log(accept.value, 'saccept.value'); } +//确定 +function submitForm() { + console.log(accept.value, '确定.确定'); + active.value = 1; +} + // 取消 function cancelForm() { active.value = 1; @@ -243,7 +251,7 @@ justify-content: center; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 15px; color: #c1d3d4; margin-left: 10px; } @@ -297,7 +305,7 @@ justify-content: center; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; } } @@ -311,7 +319,7 @@ border: 1px solid #1cf5fc; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; overflow: auto; padding-top: 5px; @@ -327,7 +335,7 @@ border: 1px solid #1cf5fc; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; overflow: auto; padding-top: 5px; @@ -343,7 +351,7 @@ border: 1px solid #1cf5fc; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; overflow: auto; padding-top: 5px; @@ -354,7 +362,7 @@ background: #03b6a0; font-family: Source Han Sans CN; font-weight: bold; - font-size: 14px; + font-size: 16px; color: #ffffff; align-items: center; justify-content: center; @@ -379,6 +387,7 @@ :deep(.el-table) { --el-table-bg-color: rgba(255, 255, 255, 0) !important; .el-table__header-wrapper th { + font-size: 16px; background: rgb(3 182 160 / 37%) !important; color: #39f7ff; } diff --git a/src/views/DialogTabs/component/streetscape.vue b/src/views/DialogTabs/component/streetscape.vue index f52697a..2db4a7d 100644 --- a/src/views/DialogTabs/component/streetscape.vue +++ b/src/views/DialogTabs/component/streetscape.vue @@ -1,13 +1,44 @@ + + diff --git a/src/views/DialogTabs/component/RQ_Warning.vue b/src/views/DialogTabs/component/RQ_Warning.vue index 0c844dc..7a51439 100644 --- a/src/views/DialogTabs/component/RQ_Warning.vue +++ b/src/views/DialogTabs/component/RQ_Warning.vue @@ -167,6 +167,7 @@ { a: '燃气-Ⅳ级应急-20240618', b: '2024-06-18 19:00', c: '2024-06-18 19:00', d: '已审核', e: '线下', releaseStatus: '0' }, { a: '燃气-Ⅳ级应急-20240618', b: '2024-06-18 19:00', c: '2024-06-18 19:00', d: '已审核', e: '线下', releaseStatus: '3' }, ]); +const accept = ref([]); const AllData = reactive({ pageNum: 1, pageSize: 10, @@ -191,8 +192,15 @@ } /** 多选框选中数据 */ function handleSelectionChange(selection) { - console.log(selection, 'selectionselection'); + accept.value.push(selection); + console.log(accept.value, 'saccept.value'); } +//确定 +function submitForm() { + console.log(accept.value, '确定.确定'); + active.value = 1; +} + // 取消 function cancelForm() { active.value = 1; @@ -243,7 +251,7 @@ justify-content: center; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 15px; color: #c1d3d4; margin-left: 10px; } @@ -297,7 +305,7 @@ justify-content: center; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; } } @@ -311,7 +319,7 @@ border: 1px solid #1cf5fc; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; overflow: auto; padding-top: 5px; @@ -327,7 +335,7 @@ border: 1px solid #1cf5fc; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; overflow: auto; padding-top: 5px; @@ -343,7 +351,7 @@ border: 1px solid #1cf5fc; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; overflow: auto; padding-top: 5px; @@ -354,7 +362,7 @@ background: #03b6a0; font-family: Source Han Sans CN; font-weight: bold; - font-size: 14px; + font-size: 16px; color: #ffffff; align-items: center; justify-content: center; @@ -379,6 +387,7 @@ :deep(.el-table) { --el-table-bg-color: rgba(255, 255, 255, 0) !important; .el-table__header-wrapper th { + font-size: 16px; background: rgb(3 182 160 / 37%) !important; color: #39f7ff; } diff --git a/src/views/DialogTabs/component/streetscape.vue b/src/views/DialogTabs/component/streetscape.vue index f52697a..2db4a7d 100644 --- a/src/views/DialogTabs/component/streetscape.vue +++ b/src/views/DialogTabs/component/streetscape.vue @@ -1,13 +1,44 @@ + + diff --git a/src/views/oneMap/components/mapboxPopup.vue b/src/views/oneMap/components/mapboxPopup.vue index 4465edf..b3ce617 100644 --- a/src/views/oneMap/components/mapboxPopup.vue +++ b/src/views/oneMap/components/mapboxPopup.vue @@ -289,6 +289,7 @@ dataList: {}, popupShow: false, dateTime: [proxy.moment(new Date()).subtract(7, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')], + streetPosition: null, }); const dataOption = ref([]); const selectData = ref([]); @@ -469,12 +470,14 @@ }; //街景弹框点击事件 const showStreetLayer = () => { - console.log('少爷在这里加~~~~~~~~~'); let data = { title: '街景', comIDs: ['streetscape'], }; bus.emit('publicDialog', data); + setTimeout(() => { + bus.emit('streetPosition', allData.streetPosition); + }, 200); }; onMounted(() => { bus.on('closeCesiumPopup', () => { @@ -485,6 +488,7 @@ }); bus.on('popupcontent', params => { console.log('popup接收地图标注点值---111', params); + allData.streetPosition = params.point; allData.dataList = params.popupInfo; let pipePopupDiv = document.getElementById('cesiumPopupID'); diff --git a/src/views/DialogTabs/component/RQ_Warning.vue b/src/views/DialogTabs/component/RQ_Warning.vue index 0c844dc..7a51439 100644 --- a/src/views/DialogTabs/component/RQ_Warning.vue +++ b/src/views/DialogTabs/component/RQ_Warning.vue @@ -167,6 +167,7 @@ { a: '燃气-Ⅳ级应急-20240618', b: '2024-06-18 19:00', c: '2024-06-18 19:00', d: '已审核', e: '线下', releaseStatus: '0' }, { a: '燃气-Ⅳ级应急-20240618', b: '2024-06-18 19:00', c: '2024-06-18 19:00', d: '已审核', e: '线下', releaseStatus: '3' }, ]); +const accept = ref([]); const AllData = reactive({ pageNum: 1, pageSize: 10, @@ -191,8 +192,15 @@ } /** 多选框选中数据 */ function handleSelectionChange(selection) { - console.log(selection, 'selectionselection'); + accept.value.push(selection); + console.log(accept.value, 'saccept.value'); } +//确定 +function submitForm() { + console.log(accept.value, '确定.确定'); + active.value = 1; +} + // 取消 function cancelForm() { active.value = 1; @@ -243,7 +251,7 @@ justify-content: center; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 15px; color: #c1d3d4; margin-left: 10px; } @@ -297,7 +305,7 @@ justify-content: center; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; } } @@ -311,7 +319,7 @@ border: 1px solid #1cf5fc; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; overflow: auto; padding-top: 5px; @@ -327,7 +335,7 @@ border: 1px solid #1cf5fc; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; overflow: auto; padding-top: 5px; @@ -343,7 +351,7 @@ border: 1px solid #1cf5fc; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; overflow: auto; padding-top: 5px; @@ -354,7 +362,7 @@ background: #03b6a0; font-family: Source Han Sans CN; font-weight: bold; - font-size: 14px; + font-size: 16px; color: #ffffff; align-items: center; justify-content: center; @@ -379,6 +387,7 @@ :deep(.el-table) { --el-table-bg-color: rgba(255, 255, 255, 0) !important; .el-table__header-wrapper th { + font-size: 16px; background: rgb(3 182 160 / 37%) !important; color: #39f7ff; } diff --git a/src/views/DialogTabs/component/streetscape.vue b/src/views/DialogTabs/component/streetscape.vue index f52697a..2db4a7d 100644 --- a/src/views/DialogTabs/component/streetscape.vue +++ b/src/views/DialogTabs/component/streetscape.vue @@ -1,13 +1,44 @@ + + diff --git a/src/views/oneMap/components/mapboxPopup.vue b/src/views/oneMap/components/mapboxPopup.vue index 4465edf..b3ce617 100644 --- a/src/views/oneMap/components/mapboxPopup.vue +++ b/src/views/oneMap/components/mapboxPopup.vue @@ -289,6 +289,7 @@ dataList: {}, popupShow: false, dateTime: [proxy.moment(new Date()).subtract(7, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')], + streetPosition: null, }); const dataOption = ref([]); const selectData = ref([]); @@ -469,12 +470,14 @@ }; //街景弹框点击事件 const showStreetLayer = () => { - console.log('少爷在这里加~~~~~~~~~'); let data = { title: '街景', comIDs: ['streetscape'], }; bus.emit('publicDialog', data); + setTimeout(() => { + bus.emit('streetPosition', allData.streetPosition); + }, 200); }; onMounted(() => { bus.on('closeCesiumPopup', () => { @@ -485,6 +488,7 @@ }); bus.on('popupcontent', params => { console.log('popup接收地图标注点值---111', params); + allData.streetPosition = params.point; allData.dataList = params.popupInfo; let pipePopupDiv = document.getElementById('cesiumPopupID'); diff --git a/src/views/oneMap/index.vue b/src/views/oneMap/index.vue index c1cf2bb..64cfe29 100644 --- a/src/views/oneMap/index.vue +++ b/src/views/oneMap/index.vue @@ -40,6 +40,8 @@ + + { AllData.ErJiMenuShowID = null; }; - -// async function urlToFile(url, fileName) { -// // 使用 fetch 获取图片并转换为 Blob -// const response = await fetch(url); -// const blob = await response.blob(); -// // 将 Blob 转换为 File 对象 -// const file = new File([blob], fileName, { type: blob.type }); -// return file; -// } - -// const createCanvas = (id)=>{ -// let canvas = document.createElement("canvas"); -// canvas.id = "canvas"+id; -// canvas.style.display = 'none'; -// document.body.append(canvas); -// return canvas; -// } - -// const createPlot = async (e,canvas)=>{ -// var tif = await GeoTIFF.fromArrayBuffer( e.target.result); -// var tifImg = await tif.getImage(); -// var readRasters = await tifImg.readRasters(); -// plot == null &&(plot = new plotty.plot({canvas, data: readRasters[0], width: tifImg.getWidth(), height: tifImg.getHeight(), domain: [0, 256], colorScale: "mycolorscale"})); -// plot.setData(readRasters[0],tifImg.getWidth(),tifImg.getHeight()); -// plot.render(); -// } - -// const createCanvasLayer = (canvasId,i,bbox)=>{ -// bbox = [[bbox[0],bbox[3]],[bbox[2],bbox[3]],[bbox[2],bbox[1]],[bbox[0],bbox[1]]]; -// newfiberMapbox.map.addSource('canvas-source'+i, { -// type: 'canvas', -// canvas: canvasId , -// coordinates: bbox, -// animate: true -// }); - -// newfiberMapbox.map.addLayer({ -// id: 'canvas-layer'+i, -// type: 'raster', -// source: 'canvas-source'+i -// }); -// newfiberMapbox.map.moveLayer('canvas-layer'+i); -// } - -// const plotInit =(colorScale=colorScale)=>{ -// const minVal = colorScale[0].value; -// const maxVal = colorScale[colorScale.length -1].value; -// let color = colorScale.filter(i => Number(i.value) / maxVal <= 1); -// if(color[color.length-1].value / maxVal < 1) color.push({value:maxVal,color:colorScale[color.length].color}); -// plotty.addColorScale("mycolorscale",color.map(i => i.color), color.map(i => (i.value / maxVal).toFixed(5))); -// } - -// let colorScale = [ -// {value: "0", color: "rgba(7, 213, 118, 0)"}, -// {value: "0.1", color: "rgba(7, 213, 118, 0)"}, -// {value: "5", color: "rgba(7, 213, 118, 1)"}, -// {value: "15", color: "rgba(38, 129, 240,1)"}, -// {value: "30", color: "rgba(247, 223, 56, 1)"}, -// {value: "70", color: "rgba(230, 85, 41, 1)"}, -// {value: "140", color: "rgba(255, 26, 26, 1)"}, -// ] -// let imageFiles = []; -// let canvas = []; -// let plot = null; -// const initRainImage = async ()=>{ -// const images = [ -// "http://192.168.16.133:9994/tif/0819_0.tif", -// "http://192.168.16.133:9994/tif/0819_1.tif", -// "http://192.168.16.133:9994/tif/0819_2.tif", -// "http://192.168.16.133:9994/tif/0819_3.tif", -// "http://192.168.16.133:9994/tif/0819_4.tif", -// "http://192.168.16.133:9994/tif/0819_5.tif", -// "http://192.168.16.133:9994/tif/0819_6.tif", -// "http://192.168.16.133:9994/tif/0819_7.tif", -// "http://192.168.16.133:9994/tif/0819_8.tif", -// "http://192.168.16.133:9994/tif/0819_9.tif", -// "http://192.168.16.133:9994/tif/0819_10.tif", -// "http://192.168.16.133:9994/tif/0819_11.tif", -// "http://192.168.16.133:9994/tif/0819_12.tif", -// "http://192.168.16.133:9994/tif/0819_13.tif", -// "http://192.168.16.133:9994/tif/0819_14.tif", -// "http://192.168.16.133:9994/tif/0819_15.tif", -// "http://192.168.16.133:9994/tif/0819_16.tif", -// "http://192.168.16.133:9994/tif/0819_17.tif", -// "http://192.168.16.133:9994/tif/0819_18.tif", -// "http://192.168.16.133:9994/tif/0819_19.tif", -// "http://192.168.16.133:9994/tif/0819_20.tif", -// "http://192.168.16.133:9994/tif/0819_21.tif", -// "http://192.168.16.133:9994/tif/0819_22.tif", -// "http://192.168.16.133:9994/tif/0819_23.tif", -// ]; -// imageFiles = await Promise.all(images.map(url => urlToFile(url,_.last(_.split(url,"/"))))); - -// canvas = createCanvas(0); -// plotInit(colorScale); -// createCanvasLayer(canvas.id,0,[109.36903069276376,36.53005543707354,109.62694602722712,36.7105574823517]); -// let i = 0; -// let interval = setInterval(()=>{ -// if(i >= imageFiles.length) i = 0; -// setRainImage(i++); -// },1000) -// } - -// const setRainImage = (index) => { -// var reader = new FileReader(); -// reader.onload = e => createPlot(e,canvas); -// reader.readAsArrayBuffer(imageFiles[index]); -// } diff --git a/src/views/oneMap/components/mapboxPopup.vue b/src/views/oneMap/components/mapboxPopup.vue index 4465edf..b3ce617 100644 --- a/src/views/oneMap/components/mapboxPopup.vue +++ b/src/views/oneMap/components/mapboxPopup.vue @@ -289,6 +289,7 @@ dataList: {}, popupShow: false, dateTime: [proxy.moment(new Date()).subtract(7, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')], + streetPosition: null, }); const dataOption = ref([]); const selectData = ref([]); @@ -469,12 +470,14 @@ }; //街景弹框点击事件 const showStreetLayer = () => { - console.log('少爷在这里加~~~~~~~~~'); let data = { title: '街景', comIDs: ['streetscape'], }; bus.emit('publicDialog', data); + setTimeout(() => { + bus.emit('streetPosition', allData.streetPosition); + }, 200); }; onMounted(() => { bus.on('closeCesiumPopup', () => { @@ -485,6 +488,7 @@ }); bus.on('popupcontent', params => { console.log('popup接收地图标注点值---111', params); + allData.streetPosition = params.point; allData.dataList = params.popupInfo; let pipePopupDiv = document.getElementById('cesiumPopupID'); diff --git a/src/views/oneMap/index.vue b/src/views/oneMap/index.vue index c1cf2bb..64cfe29 100644 --- a/src/views/oneMap/index.vue +++ b/src/views/oneMap/index.vue @@ -40,6 +40,8 @@ + + { AllData.ErJiMenuShowID = null; }; - -// async function urlToFile(url, fileName) { -// // 使用 fetch 获取图片并转换为 Blob -// const response = await fetch(url); -// const blob = await response.blob(); -// // 将 Blob 转换为 File 对象 -// const file = new File([blob], fileName, { type: blob.type }); -// return file; -// } - -// const createCanvas = (id)=>{ -// let canvas = document.createElement("canvas"); -// canvas.id = "canvas"+id; -// canvas.style.display = 'none'; -// document.body.append(canvas); -// return canvas; -// } - -// const createPlot = async (e,canvas)=>{ -// var tif = await GeoTIFF.fromArrayBuffer( e.target.result); -// var tifImg = await tif.getImage(); -// var readRasters = await tifImg.readRasters(); -// plot == null &&(plot = new plotty.plot({canvas, data: readRasters[0], width: tifImg.getWidth(), height: tifImg.getHeight(), domain: [0, 256], colorScale: "mycolorscale"})); -// plot.setData(readRasters[0],tifImg.getWidth(),tifImg.getHeight()); -// plot.render(); -// } - -// const createCanvasLayer = (canvasId,i,bbox)=>{ -// bbox = [[bbox[0],bbox[3]],[bbox[2],bbox[3]],[bbox[2],bbox[1]],[bbox[0],bbox[1]]]; -// newfiberMapbox.map.addSource('canvas-source'+i, { -// type: 'canvas', -// canvas: canvasId , -// coordinates: bbox, -// animate: true -// }); - -// newfiberMapbox.map.addLayer({ -// id: 'canvas-layer'+i, -// type: 'raster', -// source: 'canvas-source'+i -// }); -// newfiberMapbox.map.moveLayer('canvas-layer'+i); -// } - -// const plotInit =(colorScale=colorScale)=>{ -// const minVal = colorScale[0].value; -// const maxVal = colorScale[colorScale.length -1].value; -// let color = colorScale.filter(i => Number(i.value) / maxVal <= 1); -// if(color[color.length-1].value / maxVal < 1) color.push({value:maxVal,color:colorScale[color.length].color}); -// plotty.addColorScale("mycolorscale",color.map(i => i.color), color.map(i => (i.value / maxVal).toFixed(5))); -// } - -// let colorScale = [ -// {value: "0", color: "rgba(7, 213, 118, 0)"}, -// {value: "0.1", color: "rgba(7, 213, 118, 0)"}, -// {value: "5", color: "rgba(7, 213, 118, 1)"}, -// {value: "15", color: "rgba(38, 129, 240,1)"}, -// {value: "30", color: "rgba(247, 223, 56, 1)"}, -// {value: "70", color: "rgba(230, 85, 41, 1)"}, -// {value: "140", color: "rgba(255, 26, 26, 1)"}, -// ] -// let imageFiles = []; -// let canvas = []; -// let plot = null; -// const initRainImage = async ()=>{ -// const images = [ -// "http://192.168.16.133:9994/tif/0819_0.tif", -// "http://192.168.16.133:9994/tif/0819_1.tif", -// "http://192.168.16.133:9994/tif/0819_2.tif", -// "http://192.168.16.133:9994/tif/0819_3.tif", -// "http://192.168.16.133:9994/tif/0819_4.tif", -// "http://192.168.16.133:9994/tif/0819_5.tif", -// "http://192.168.16.133:9994/tif/0819_6.tif", -// "http://192.168.16.133:9994/tif/0819_7.tif", -// "http://192.168.16.133:9994/tif/0819_8.tif", -// "http://192.168.16.133:9994/tif/0819_9.tif", -// "http://192.168.16.133:9994/tif/0819_10.tif", -// "http://192.168.16.133:9994/tif/0819_11.tif", -// "http://192.168.16.133:9994/tif/0819_12.tif", -// "http://192.168.16.133:9994/tif/0819_13.tif", -// "http://192.168.16.133:9994/tif/0819_14.tif", -// "http://192.168.16.133:9994/tif/0819_15.tif", -// "http://192.168.16.133:9994/tif/0819_16.tif", -// "http://192.168.16.133:9994/tif/0819_17.tif", -// "http://192.168.16.133:9994/tif/0819_18.tif", -// "http://192.168.16.133:9994/tif/0819_19.tif", -// "http://192.168.16.133:9994/tif/0819_20.tif", -// "http://192.168.16.133:9994/tif/0819_21.tif", -// "http://192.168.16.133:9994/tif/0819_22.tif", -// "http://192.168.16.133:9994/tif/0819_23.tif", -// ]; -// imageFiles = await Promise.all(images.map(url => urlToFile(url,_.last(_.split(url,"/"))))); - -// canvas = createCanvas(0); -// plotInit(colorScale); -// createCanvasLayer(canvas.id,0,[109.36903069276376,36.53005543707354,109.62694602722712,36.7105574823517]); -// let i = 0; -// let interval = setInterval(()=>{ -// if(i >= imageFiles.length) i = 0; -// setRainImage(i++); -// },1000) -// } - -// const setRainImage = (index) => { -// var reader = new FileReader(); -// reader.onload = e => createPlot(e,canvas); -// reader.readAsArrayBuffer(imageFiles[index]); -// } diff --git a/src/views/DialogTabs/component/RQ_Warning.vue b/src/views/DialogTabs/component/RQ_Warning.vue index 0c844dc..7a51439 100644 --- a/src/views/DialogTabs/component/RQ_Warning.vue +++ b/src/views/DialogTabs/component/RQ_Warning.vue @@ -167,6 +167,7 @@ { a: '燃气-Ⅳ级应急-20240618', b: '2024-06-18 19:00', c: '2024-06-18 19:00', d: '已审核', e: '线下', releaseStatus: '0' }, { a: '燃气-Ⅳ级应急-20240618', b: '2024-06-18 19:00', c: '2024-06-18 19:00', d: '已审核', e: '线下', releaseStatus: '3' }, ]); +const accept = ref([]); const AllData = reactive({ pageNum: 1, pageSize: 10, @@ -191,8 +192,15 @@ } /** 多选框选中数据 */ function handleSelectionChange(selection) { - console.log(selection, 'selectionselection'); + accept.value.push(selection); + console.log(accept.value, 'saccept.value'); } +//确定 +function submitForm() { + console.log(accept.value, '确定.确定'); + active.value = 1; +} + // 取消 function cancelForm() { active.value = 1; @@ -243,7 +251,7 @@ justify-content: center; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 15px; color: #c1d3d4; margin-left: 10px; } @@ -297,7 +305,7 @@ justify-content: center; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; } } @@ -311,7 +319,7 @@ border: 1px solid #1cf5fc; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; overflow: auto; padding-top: 5px; @@ -327,7 +335,7 @@ border: 1px solid #1cf5fc; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; overflow: auto; padding-top: 5px; @@ -343,7 +351,7 @@ border: 1px solid #1cf5fc; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; overflow: auto; padding-top: 5px; @@ -354,7 +362,7 @@ background: #03b6a0; font-family: Source Han Sans CN; font-weight: bold; - font-size: 14px; + font-size: 16px; color: #ffffff; align-items: center; justify-content: center; @@ -379,6 +387,7 @@ :deep(.el-table) { --el-table-bg-color: rgba(255, 255, 255, 0) !important; .el-table__header-wrapper th { + font-size: 16px; background: rgb(3 182 160 / 37%) !important; color: #39f7ff; } diff --git a/src/views/DialogTabs/component/streetscape.vue b/src/views/DialogTabs/component/streetscape.vue index f52697a..2db4a7d 100644 --- a/src/views/DialogTabs/component/streetscape.vue +++ b/src/views/DialogTabs/component/streetscape.vue @@ -1,13 +1,44 @@ + + diff --git a/src/views/oneMap/components/mapboxPopup.vue b/src/views/oneMap/components/mapboxPopup.vue index 4465edf..b3ce617 100644 --- a/src/views/oneMap/components/mapboxPopup.vue +++ b/src/views/oneMap/components/mapboxPopup.vue @@ -289,6 +289,7 @@ dataList: {}, popupShow: false, dateTime: [proxy.moment(new Date()).subtract(7, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')], + streetPosition: null, }); const dataOption = ref([]); const selectData = ref([]); @@ -469,12 +470,14 @@ }; //街景弹框点击事件 const showStreetLayer = () => { - console.log('少爷在这里加~~~~~~~~~'); let data = { title: '街景', comIDs: ['streetscape'], }; bus.emit('publicDialog', data); + setTimeout(() => { + bus.emit('streetPosition', allData.streetPosition); + }, 200); }; onMounted(() => { bus.on('closeCesiumPopup', () => { @@ -485,6 +488,7 @@ }); bus.on('popupcontent', params => { console.log('popup接收地图标注点值---111', params); + allData.streetPosition = params.point; allData.dataList = params.popupInfo; let pipePopupDiv = document.getElementById('cesiumPopupID'); diff --git a/src/views/oneMap/index.vue b/src/views/oneMap/index.vue index c1cf2bb..64cfe29 100644 --- a/src/views/oneMap/index.vue +++ b/src/views/oneMap/index.vue @@ -40,6 +40,8 @@ + + { AllData.ErJiMenuShowID = null; }; - -// async function urlToFile(url, fileName) { -// // 使用 fetch 获取图片并转换为 Blob -// const response = await fetch(url); -// const blob = await response.blob(); -// // 将 Blob 转换为 File 对象 -// const file = new File([blob], fileName, { type: blob.type }); -// return file; -// } - -// const createCanvas = (id)=>{ -// let canvas = document.createElement("canvas"); -// canvas.id = "canvas"+id; -// canvas.style.display = 'none'; -// document.body.append(canvas); -// return canvas; -// } - -// const createPlot = async (e,canvas)=>{ -// var tif = await GeoTIFF.fromArrayBuffer( e.target.result); -// var tifImg = await tif.getImage(); -// var readRasters = await tifImg.readRasters(); -// plot == null &&(plot = new plotty.plot({canvas, data: readRasters[0], width: tifImg.getWidth(), height: tifImg.getHeight(), domain: [0, 256], colorScale: "mycolorscale"})); -// plot.setData(readRasters[0],tifImg.getWidth(),tifImg.getHeight()); -// plot.render(); -// } - -// const createCanvasLayer = (canvasId,i,bbox)=>{ -// bbox = [[bbox[0],bbox[3]],[bbox[2],bbox[3]],[bbox[2],bbox[1]],[bbox[0],bbox[1]]]; -// newfiberMapbox.map.addSource('canvas-source'+i, { -// type: 'canvas', -// canvas: canvasId , -// coordinates: bbox, -// animate: true -// }); - -// newfiberMapbox.map.addLayer({ -// id: 'canvas-layer'+i, -// type: 'raster', -// source: 'canvas-source'+i -// }); -// newfiberMapbox.map.moveLayer('canvas-layer'+i); -// } - -// const plotInit =(colorScale=colorScale)=>{ -// const minVal = colorScale[0].value; -// const maxVal = colorScale[colorScale.length -1].value; -// let color = colorScale.filter(i => Number(i.value) / maxVal <= 1); -// if(color[color.length-1].value / maxVal < 1) color.push({value:maxVal,color:colorScale[color.length].color}); -// plotty.addColorScale("mycolorscale",color.map(i => i.color), color.map(i => (i.value / maxVal).toFixed(5))); -// } - -// let colorScale = [ -// {value: "0", color: "rgba(7, 213, 118, 0)"}, -// {value: "0.1", color: "rgba(7, 213, 118, 0)"}, -// {value: "5", color: "rgba(7, 213, 118, 1)"}, -// {value: "15", color: "rgba(38, 129, 240,1)"}, -// {value: "30", color: "rgba(247, 223, 56, 1)"}, -// {value: "70", color: "rgba(230, 85, 41, 1)"}, -// {value: "140", color: "rgba(255, 26, 26, 1)"}, -// ] -// let imageFiles = []; -// let canvas = []; -// let plot = null; -// const initRainImage = async ()=>{ -// const images = [ -// "http://192.168.16.133:9994/tif/0819_0.tif", -// "http://192.168.16.133:9994/tif/0819_1.tif", -// "http://192.168.16.133:9994/tif/0819_2.tif", -// "http://192.168.16.133:9994/tif/0819_3.tif", -// "http://192.168.16.133:9994/tif/0819_4.tif", -// "http://192.168.16.133:9994/tif/0819_5.tif", -// "http://192.168.16.133:9994/tif/0819_6.tif", -// "http://192.168.16.133:9994/tif/0819_7.tif", -// "http://192.168.16.133:9994/tif/0819_8.tif", -// "http://192.168.16.133:9994/tif/0819_9.tif", -// "http://192.168.16.133:9994/tif/0819_10.tif", -// "http://192.168.16.133:9994/tif/0819_11.tif", -// "http://192.168.16.133:9994/tif/0819_12.tif", -// "http://192.168.16.133:9994/tif/0819_13.tif", -// "http://192.168.16.133:9994/tif/0819_14.tif", -// "http://192.168.16.133:9994/tif/0819_15.tif", -// "http://192.168.16.133:9994/tif/0819_16.tif", -// "http://192.168.16.133:9994/tif/0819_17.tif", -// "http://192.168.16.133:9994/tif/0819_18.tif", -// "http://192.168.16.133:9994/tif/0819_19.tif", -// "http://192.168.16.133:9994/tif/0819_20.tif", -// "http://192.168.16.133:9994/tif/0819_21.tif", -// "http://192.168.16.133:9994/tif/0819_22.tif", -// "http://192.168.16.133:9994/tif/0819_23.tif", -// ]; -// imageFiles = await Promise.all(images.map(url => urlToFile(url,_.last(_.split(url,"/"))))); - -// canvas = createCanvas(0); -// plotInit(colorScale); -// createCanvasLayer(canvas.id,0,[109.36903069276376,36.53005543707354,109.62694602722712,36.7105574823517]); -// let i = 0; -// let interval = setInterval(()=>{ -// if(i >= imageFiles.length) i = 0; -// setRainImage(i++); -// },1000) -// } - -// const setRainImage = (index) => { -// var reader = new FileReader(); -// reader.onload = e => createPlot(e,canvas); -// reader.readAsArrayBuffer(imageFiles[index]); -// } diff --git a/src/views/oneMap/smartTunnel/RightBox.vue b/src/views/oneMap/smartTunnel/RightBox.vue index 1f97e0c..0153312 100644 --- a/src/views/oneMap/smartTunnel/RightBox.vue +++ b/src/views/oneMap/smartTunnel/RightBox.vue @@ -20,7 +20,7 @@
{{ jgjcData[item.code] == '1' ? '正常' : '异常' }} -
派单
+
派单
@@ -92,6 +92,7 @@ @@ -294,6 +314,7 @@ font-size: 16px; color: #ebfeff; text-align: center; + cursor: pointer; } } .tfInfo { diff --git a/src/views/DialogTabs/component/RQ_Warning.vue b/src/views/DialogTabs/component/RQ_Warning.vue index 0c844dc..7a51439 100644 --- a/src/views/DialogTabs/component/RQ_Warning.vue +++ b/src/views/DialogTabs/component/RQ_Warning.vue @@ -167,6 +167,7 @@ { a: '燃气-Ⅳ级应急-20240618', b: '2024-06-18 19:00', c: '2024-06-18 19:00', d: '已审核', e: '线下', releaseStatus: '0' }, { a: '燃气-Ⅳ级应急-20240618', b: '2024-06-18 19:00', c: '2024-06-18 19:00', d: '已审核', e: '线下', releaseStatus: '3' }, ]); +const accept = ref([]); const AllData = reactive({ pageNum: 1, pageSize: 10, @@ -191,8 +192,15 @@ } /** 多选框选中数据 */ function handleSelectionChange(selection) { - console.log(selection, 'selectionselection'); + accept.value.push(selection); + console.log(accept.value, 'saccept.value'); } +//确定 +function submitForm() { + console.log(accept.value, '确定.确定'); + active.value = 1; +} + // 取消 function cancelForm() { active.value = 1; @@ -243,7 +251,7 @@ justify-content: center; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 15px; color: #c1d3d4; margin-left: 10px; } @@ -297,7 +305,7 @@ justify-content: center; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; } } @@ -311,7 +319,7 @@ border: 1px solid #1cf5fc; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; overflow: auto; padding-top: 5px; @@ -327,7 +335,7 @@ border: 1px solid #1cf5fc; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; overflow: auto; padding-top: 5px; @@ -343,7 +351,7 @@ border: 1px solid #1cf5fc; font-family: Source Han Sans CN; font-weight: 400; - font-size: 14px; + font-size: 16px; color: #c1d3d4; overflow: auto; padding-top: 5px; @@ -354,7 +362,7 @@ background: #03b6a0; font-family: Source Han Sans CN; font-weight: bold; - font-size: 14px; + font-size: 16px; color: #ffffff; align-items: center; justify-content: center; @@ -379,6 +387,7 @@ :deep(.el-table) { --el-table-bg-color: rgba(255, 255, 255, 0) !important; .el-table__header-wrapper th { + font-size: 16px; background: rgb(3 182 160 / 37%) !important; color: #39f7ff; } diff --git a/src/views/DialogTabs/component/streetscape.vue b/src/views/DialogTabs/component/streetscape.vue index f52697a..2db4a7d 100644 --- a/src/views/DialogTabs/component/streetscape.vue +++ b/src/views/DialogTabs/component/streetscape.vue @@ -1,13 +1,44 @@ + + diff --git a/src/views/oneMap/components/mapboxPopup.vue b/src/views/oneMap/components/mapboxPopup.vue index 4465edf..b3ce617 100644 --- a/src/views/oneMap/components/mapboxPopup.vue +++ b/src/views/oneMap/components/mapboxPopup.vue @@ -289,6 +289,7 @@ dataList: {}, popupShow: false, dateTime: [proxy.moment(new Date()).subtract(7, 'days').format('YYYY-MM-DD'), proxy.moment().format('YYYY-MM-DD')], + streetPosition: null, }); const dataOption = ref([]); const selectData = ref([]); @@ -469,12 +470,14 @@ }; //街景弹框点击事件 const showStreetLayer = () => { - console.log('少爷在这里加~~~~~~~~~'); let data = { title: '街景', comIDs: ['streetscape'], }; bus.emit('publicDialog', data); + setTimeout(() => { + bus.emit('streetPosition', allData.streetPosition); + }, 200); }; onMounted(() => { bus.on('closeCesiumPopup', () => { @@ -485,6 +488,7 @@ }); bus.on('popupcontent', params => { console.log('popup接收地图标注点值---111', params); + allData.streetPosition = params.point; allData.dataList = params.popupInfo; let pipePopupDiv = document.getElementById('cesiumPopupID'); diff --git a/src/views/oneMap/index.vue b/src/views/oneMap/index.vue index c1cf2bb..64cfe29 100644 --- a/src/views/oneMap/index.vue +++ b/src/views/oneMap/index.vue @@ -40,6 +40,8 @@ + + { AllData.ErJiMenuShowID = null; }; - -// async function urlToFile(url, fileName) { -// // 使用 fetch 获取图片并转换为 Blob -// const response = await fetch(url); -// const blob = await response.blob(); -// // 将 Blob 转换为 File 对象 -// const file = new File([blob], fileName, { type: blob.type }); -// return file; -// } - -// const createCanvas = (id)=>{ -// let canvas = document.createElement("canvas"); -// canvas.id = "canvas"+id; -// canvas.style.display = 'none'; -// document.body.append(canvas); -// return canvas; -// } - -// const createPlot = async (e,canvas)=>{ -// var tif = await GeoTIFF.fromArrayBuffer( e.target.result); -// var tifImg = await tif.getImage(); -// var readRasters = await tifImg.readRasters(); -// plot == null &&(plot = new plotty.plot({canvas, data: readRasters[0], width: tifImg.getWidth(), height: tifImg.getHeight(), domain: [0, 256], colorScale: "mycolorscale"})); -// plot.setData(readRasters[0],tifImg.getWidth(),tifImg.getHeight()); -// plot.render(); -// } - -// const createCanvasLayer = (canvasId,i,bbox)=>{ -// bbox = [[bbox[0],bbox[3]],[bbox[2],bbox[3]],[bbox[2],bbox[1]],[bbox[0],bbox[1]]]; -// newfiberMapbox.map.addSource('canvas-source'+i, { -// type: 'canvas', -// canvas: canvasId , -// coordinates: bbox, -// animate: true -// }); - -// newfiberMapbox.map.addLayer({ -// id: 'canvas-layer'+i, -// type: 'raster', -// source: 'canvas-source'+i -// }); -// newfiberMapbox.map.moveLayer('canvas-layer'+i); -// } - -// const plotInit =(colorScale=colorScale)=>{ -// const minVal = colorScale[0].value; -// const maxVal = colorScale[colorScale.length -1].value; -// let color = colorScale.filter(i => Number(i.value) / maxVal <= 1); -// if(color[color.length-1].value / maxVal < 1) color.push({value:maxVal,color:colorScale[color.length].color}); -// plotty.addColorScale("mycolorscale",color.map(i => i.color), color.map(i => (i.value / maxVal).toFixed(5))); -// } - -// let colorScale = [ -// {value: "0", color: "rgba(7, 213, 118, 0)"}, -// {value: "0.1", color: "rgba(7, 213, 118, 0)"}, -// {value: "5", color: "rgba(7, 213, 118, 1)"}, -// {value: "15", color: "rgba(38, 129, 240,1)"}, -// {value: "30", color: "rgba(247, 223, 56, 1)"}, -// {value: "70", color: "rgba(230, 85, 41, 1)"}, -// {value: "140", color: "rgba(255, 26, 26, 1)"}, -// ] -// let imageFiles = []; -// let canvas = []; -// let plot = null; -// const initRainImage = async ()=>{ -// const images = [ -// "http://192.168.16.133:9994/tif/0819_0.tif", -// "http://192.168.16.133:9994/tif/0819_1.tif", -// "http://192.168.16.133:9994/tif/0819_2.tif", -// "http://192.168.16.133:9994/tif/0819_3.tif", -// "http://192.168.16.133:9994/tif/0819_4.tif", -// "http://192.168.16.133:9994/tif/0819_5.tif", -// "http://192.168.16.133:9994/tif/0819_6.tif", -// "http://192.168.16.133:9994/tif/0819_7.tif", -// "http://192.168.16.133:9994/tif/0819_8.tif", -// "http://192.168.16.133:9994/tif/0819_9.tif", -// "http://192.168.16.133:9994/tif/0819_10.tif", -// "http://192.168.16.133:9994/tif/0819_11.tif", -// "http://192.168.16.133:9994/tif/0819_12.tif", -// "http://192.168.16.133:9994/tif/0819_13.tif", -// "http://192.168.16.133:9994/tif/0819_14.tif", -// "http://192.168.16.133:9994/tif/0819_15.tif", -// "http://192.168.16.133:9994/tif/0819_16.tif", -// "http://192.168.16.133:9994/tif/0819_17.tif", -// "http://192.168.16.133:9994/tif/0819_18.tif", -// "http://192.168.16.133:9994/tif/0819_19.tif", -// "http://192.168.16.133:9994/tif/0819_20.tif", -// "http://192.168.16.133:9994/tif/0819_21.tif", -// "http://192.168.16.133:9994/tif/0819_22.tif", -// "http://192.168.16.133:9994/tif/0819_23.tif", -// ]; -// imageFiles = await Promise.all(images.map(url => urlToFile(url,_.last(_.split(url,"/"))))); - -// canvas = createCanvas(0); -// plotInit(colorScale); -// createCanvasLayer(canvas.id,0,[109.36903069276376,36.53005543707354,109.62694602722712,36.7105574823517]); -// let i = 0; -// let interval = setInterval(()=>{ -// if(i >= imageFiles.length) i = 0; -// setRainImage(i++); -// },1000) -// } - -// const setRainImage = (index) => { -// var reader = new FileReader(); -// reader.onload = e => createPlot(e,canvas); -// reader.readAsArrayBuffer(imageFiles[index]); -// } diff --git a/src/views/oneMap/smartTunnel/RightBox.vue b/src/views/oneMap/smartTunnel/RightBox.vue index 1f97e0c..0153312 100644 --- a/src/views/oneMap/smartTunnel/RightBox.vue +++ b/src/views/oneMap/smartTunnel/RightBox.vue @@ -20,7 +20,7 @@
{{ jgjcData[item.code] == '1' ? '正常' : '异常' }} -
派单
+
派单
@@ -92,6 +92,7 @@ @@ -294,6 +314,7 @@ font-size: 16px; color: #ebfeff; text-align: center; + cursor: pointer; } } .tfInfo { diff --git a/src/views/oneMap/smartTunnel/components/twoLine.vue b/src/views/oneMap/smartTunnel/components/twoLine.vue index d34aa79..e704f63 100644 --- a/src/views/oneMap/smartTunnel/components/twoLine.vue +++ b/src/views/oneMap/smartTunnel/components/twoLine.vue @@ -119,7 +119,7 @@ selectedMode: false, data: ['南向北', '北向南'], textStyle: { - color: '#7e99aa', + color: '#ebfeff', fontSize: 16, }, }, @@ -140,7 +140,7 @@ }, axisLabel: { show: true, - color: '#e2f5f7', + color: '#ebfeff', // interval: 0, fontSize: 16, // formatter: function (value) { @@ -161,7 +161,7 @@ nameLocation: 'end', // 将名称靠顶部 // nameRotate: 0, // 名称水平显示 nameTextStyle: { - color: '#7e99aa', + color: '#ebfeff', fontSize: 16, padding: [0, 20, -2, 0], }, @@ -170,7 +170,7 @@ }, axisLabel: { show: true, - color: '#7e99aa', + color: '#ebfeff', fontSize: 16, }, splitLine: {