From dac4ce9c559a5ddd3d4666c9ac93d25dde97cacc Mon Sep 17 00:00:00 2001 From: wangqi <magical1908@outlook.com> Date: 星期四, 01 四月 2021 14:07:23 +0800 Subject: [PATCH] 修改函数名大小写 --- src/components/LayerController/logic/WasteGas.js | 12 ++++++------ src/api/mapApi.js | 4 ++-- src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue | 24 +++++++++++++++++------- src/api/mapUrl.js | 2 +- src/components/BaseNav/PublicBounced/PublicBounced.vue | 5 ----- 5 files changed, 26 insertions(+), 21 deletions(-) diff --git a/src/api/mapApi.js b/src/api/mapApi.js index cebf2b3..5c5cc73 100644 --- a/src/api/mapApi.js +++ b/src/api/mapApi.js @@ -21,8 +21,8 @@ getSolidWasteBaseInfo (data) { return axios.get(mapUrl.getSolidWasteBaseInfo, data) }, - GetWasteGas (data) { - return axios.get(mapUrl.GetWasteGas, data) + getWasteGas (data) { + return axios.get(mapUrl.getWasteGas, data) }, getCompany (data) { return axios.get(mapUrl.getCompany, data) diff --git a/src/api/mapUrl.js b/src/api/mapUrl.js index 1b986df..1755bd1 100644 --- a/src/api/mapUrl.js +++ b/src/api/mapUrl.js @@ -5,7 +5,7 @@ export const GetUser = $HOST + '/user/getUser' -export const GetWasteGas = $HOST + '/wasteGas/getWasteGas' +export const getWasteGas = $HOST + '/wasteGas/getWasteGas' export const getSolidWaste = $HOST + '/wasteSolid/getSolidWaste' diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue index a4c6dbd..e6001e3 100644 --- a/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue +++ b/src/components/BaseNav/PublicBounced/GasComponents/GasTab.vue @@ -9,14 +9,14 @@ <div class="main"> <div class="main-matter"> <el-row type="flex" class="row-bg row-item-one" justify="space-around"> - <el-col :span="12">鐩戞祴鐐瑰悕绉�:{{ displayContent.Name }}</el-col> - <el-col :span="12">鐢熶骇鍗曚綅:{{ displayContent.DeptSname }}</el-col> - <el-col :span="12">鎺掓斁绫诲瀷鍔犺浇:{{ displayContent.EmissTypeName }}</el-col> + <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ displayContent.Name }}</el-col> + <el-col :span="8">鐢熶骇鍗曚綅:{{ displayContent.porltName }}</el-col> + <el-col :span="8">鎺掓斁绫诲瀷鍔犺浇:{{ displayContent.MonTypeName }}</el-col> </el-row> <el-row type="flex" class="row-bg" justify="space-around"> - <el-col :span="12">鎺掓斁鍘诲悜:{{ displayContent.EmissTypeDirectName }}</el-col> - <el-col :span="12">鎺у埗绾у埆鍚嶇О:{{ displayContent.ContrLevelShowName }}</el-col> - <el-col :span="12">鍐�/澶栨帓鍙�:{{ displayContent.OrOutPortName }}</el-col> + <el-col :span="8">鎺掓斁鍘诲悜:{{ displayContent.EmissDirecti }}</el-col> + <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ displayContent.ContrLevelShowName }}</el-col> + <el-col :span="8">鍐�/澶栨帓鍙�:{{ displayContent.OrOutPortName }}</el-col> </el-row> </div> </div> @@ -28,8 +28,18 @@ name: 'GasTable', props: ['displayContent'], data () { - return {} + return { + // getGasDatas:[] + } + }, + mounted () { + // this.$nextTick(() => { + // this.getGasData.forEach(item => { + // this.getGasDatas = item + // }) + // }) } + } </script> diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue index c3852d2..5848dc0 100644 --- a/src/components/BaseNav/PublicBounced/PublicBounced.vue +++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue @@ -55,11 +55,6 @@ this.value = value console.log(this.flag) }, - // setData (data) { - // this.displayContent = data - // this.flag = true - // // this.value = value - // }, closePopup () { this.flag = false } diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js index 944cfb7..7a9d673 100644 --- a/src/components/LayerController/logic/WasteGas.js +++ b/src/components/LayerController/logic/WasteGas.js @@ -19,7 +19,7 @@ */ this.init = async (layer, L) => { this.animalService = new AnimalService({ L: L, layer: layer }) - const res = await mapApi.GetWasteGas() + const res = await mapApi.getWasteGas() const data = res.Result.DataInfo || {} console.log(data) for (let i = 0; i < data.length; i++) { @@ -51,13 +51,13 @@ this.clickListener = async (e) => { // console.log(e) this.animalService.pulseEffect(e.latlng) - const dataValue = { - StoragePlaceId: e.layer.options.test.StoragePlaceId - } - const result = await mapApi.GetWasteGas(dataValue) + // const dataValue = { + // StoragePlaceId: e.layer.options.test.StoragePlaceId + // } + // const result = await mapApi.getWasteGas(dataValue) const PublicBounced = window.Vue.extend(publicBounced) const instance = new PublicBounced() - instance.setData(result) + instance.setData(e.layer.options.test) instance.$mount() document.body.appendChild(instance.$el) } -- Gitblit v1.8.0