From 22d70999e5f89ba944f27c1589bec864c57084ea Mon Sep 17 00:00:00 2001 From: 陈泽平 <chenzeping> Date: 星期一, 17 五月 2021 15:43:14 +0800 Subject: [PATCH] 管线图片添加 --- src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue | 69 ++++++++++++++++++++++++---------- public/assets/images/map/sewers/含油污水.png | 0 src/conf/layers/LayerPipeLines.js | 9 ++++ src/conf/layers/LayerArea.js | 3 + src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue | 8 ++-- public/assets/images/map/sewers/防火堤.png | 0 public/assets/images/map/sewers/含硫污水.png | 0 src/conf/layers/LayerHbss.js | 3 + public/assets/images/map/sewers/含盐污水.png | 0 public/assets/images/map/sewers/净化水.png | 0 public/assets/images/map/sewers/生产污水.png | 0 public/assets/images/map/sewers/含碱污水.png | 0 src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue | 9 +++- src/conf/layers/LayerFsss.js | 3 + public/assets/images/map/sewers/管架.png | 0 public/assets/images/map/sewers/流向.png | 0 public/assets/images/map/sewers/管廊.png | 0 src/components/panel/topicSearch/SolidWasteSearch.vue | 5 +- public/assets/images/map/sewers/事故水.png | 0 public/assets/images/map/sewers/循环水.png | 0 public/assets/images/map/sewers/生活污水.png | 0 public/assets/images/map/sewers/装置区.png | 0 public/assets/images/map/sewers/截流闸.png | 0 public/assets/images/map/sewers/公司.png | 0 public/assets/images/map/sewers/溢流堰.png | 0 25 files changed, 79 insertions(+), 30 deletions(-) diff --git "a/public/assets/images/map/sewers/\344\272\213\346\225\205\346\260\264.png" "b/public/assets/images/map/sewers/\344\272\213\346\225\205\346\260\264.png" new file mode 100644 index 0000000..a633444 --- /dev/null +++ "b/public/assets/images/map/sewers/\344\272\213\346\225\205\346\260\264.png" Binary files differ diff --git "a/public/assets/images/map/sewers/\345\205\254\345\217\270.png" "b/public/assets/images/map/sewers/\345\205\254\345\217\270.png" new file mode 100644 index 0000000..0d202f5 --- /dev/null +++ "b/public/assets/images/map/sewers/\345\205\254\345\217\270.png" Binary files differ diff --git "a/public/assets/images/map/sewers/\345\207\200\345\214\226\346\260\264.png" "b/public/assets/images/map/sewers/\345\207\200\345\214\226\346\260\264.png" new file mode 100644 index 0000000..d5359a1 --- /dev/null +++ "b/public/assets/images/map/sewers/\345\207\200\345\214\226\346\260\264.png" Binary files differ diff --git "a/public/assets/images/map/sewers/\345\220\253\346\262\271\346\261\241\346\260\264.png" "b/public/assets/images/map/sewers/\345\220\253\346\262\271\346\261\241\346\260\264.png" new file mode 100644 index 0000000..38b284c --- /dev/null +++ "b/public/assets/images/map/sewers/\345\220\253\346\262\271\346\261\241\346\260\264.png" Binary files differ diff --git "a/public/assets/images/map/sewers/\345\220\253\347\233\220\346\261\241\346\260\264.png" "b/public/assets/images/map/sewers/\345\220\253\347\233\220\346\261\241\346\260\264.png" new file mode 100644 index 0000000..5c93042 --- /dev/null +++ "b/public/assets/images/map/sewers/\345\220\253\347\233\220\346\261\241\346\260\264.png" Binary files differ diff --git "a/public/assets/images/map/sewers/\345\220\253\347\241\253\346\261\241\346\260\264.png" "b/public/assets/images/map/sewers/\345\220\253\347\241\253\346\261\241\346\260\264.png" new file mode 100644 index 0000000..10705fb --- /dev/null +++ "b/public/assets/images/map/sewers/\345\220\253\347\241\253\346\261\241\346\260\264.png" Binary files differ diff --git "a/public/assets/images/map/sewers/\345\220\253\347\242\261\346\261\241\346\260\264.png" "b/public/assets/images/map/sewers/\345\220\253\347\242\261\346\261\241\346\260\264.png" new file mode 100644 index 0000000..676138b --- /dev/null +++ "b/public/assets/images/map/sewers/\345\220\253\347\242\261\346\261\241\346\260\264.png" Binary files differ diff --git "a/public/assets/images/map/sewers/\345\276\252\347\216\257\346\260\264.png" "b/public/assets/images/map/sewers/\345\276\252\347\216\257\346\260\264.png" new file mode 100644 index 0000000..d3569e2 --- /dev/null +++ "b/public/assets/images/map/sewers/\345\276\252\347\216\257\346\260\264.png" Binary files differ diff --git "a/public/assets/images/map/sewers/\346\210\252\346\265\201\351\227\270.png" "b/public/assets/images/map/sewers/\346\210\252\346\265\201\351\227\270.png" new file mode 100644 index 0000000..6790e49 --- /dev/null +++ "b/public/assets/images/map/sewers/\346\210\252\346\265\201\351\227\270.png" Binary files differ diff --git "a/public/assets/images/map/sewers/\346\265\201\345\220\221.png" "b/public/assets/images/map/sewers/\346\265\201\345\220\221.png" new file mode 100644 index 0000000..b87b23d --- /dev/null +++ "b/public/assets/images/map/sewers/\346\265\201\345\220\221.png" Binary files differ diff --git "a/public/assets/images/map/sewers/\346\272\242\346\265\201\345\240\260.png" "b/public/assets/images/map/sewers/\346\272\242\346\265\201\345\240\260.png" new file mode 100644 index 0000000..81a8b47 --- /dev/null +++ "b/public/assets/images/map/sewers/\346\272\242\346\265\201\345\240\260.png" Binary files differ diff --git "a/public/assets/images/map/sewers/\347\224\237\344\272\247\346\261\241\346\260\264.png" "b/public/assets/images/map/sewers/\347\224\237\344\272\247\346\261\241\346\260\264.png" new file mode 100644 index 0000000..0897c51 --- /dev/null +++ "b/public/assets/images/map/sewers/\347\224\237\344\272\247\346\261\241\346\260\264.png" Binary files differ diff --git "a/public/assets/images/map/sewers/\347\224\237\346\264\273\346\261\241\346\260\264.png" "b/public/assets/images/map/sewers/\347\224\237\346\264\273\346\261\241\346\260\264.png" new file mode 100644 index 0000000..5165e20 --- /dev/null +++ "b/public/assets/images/map/sewers/\347\224\237\346\264\273\346\261\241\346\260\264.png" Binary files differ diff --git "a/public/assets/images/map/sewers/\347\256\241\345\273\212.png" "b/public/assets/images/map/sewers/\347\256\241\345\273\212.png" new file mode 100644 index 0000000..e07d50f --- /dev/null +++ "b/public/assets/images/map/sewers/\347\256\241\345\273\212.png" Binary files differ diff --git "a/public/assets/images/map/sewers/\347\256\241\346\236\266.png" "b/public/assets/images/map/sewers/\347\256\241\346\236\266.png" new file mode 100644 index 0000000..0ade675 --- /dev/null +++ "b/public/assets/images/map/sewers/\347\256\241\346\236\266.png" Binary files differ diff --git "a/public/assets/images/map/sewers/\350\243\205\347\275\256\345\214\272.png" "b/public/assets/images/map/sewers/\350\243\205\347\275\256\345\214\272.png" new file mode 100644 index 0000000..525d157 --- /dev/null +++ "b/public/assets/images/map/sewers/\350\243\205\347\275\256\345\214\272.png" Binary files differ diff --git "a/public/assets/images/map/sewers/\351\230\262\347\201\253\345\240\244.png" "b/public/assets/images/map/sewers/\351\230\262\347\201\253\345\240\244.png" new file mode 100644 index 0000000..33076a5 --- /dev/null +++ "b/public/assets/images/map/sewers/\351\230\262\347\201\253\345\240\244.png" Binary files differ diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue b/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue index 873db6e..fb1eb41 100644 --- a/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue +++ b/src/components/panel/topicSearch/EnterpriseEmergency/EventQuery.vue @@ -26,7 +26,8 @@ </el-form-item> <el-form-item label="浜嬩欢绫诲瀷锛�"> <el-radio-group v-model="form.transferData" class="levelOfRisk"> - <el-radio v-for="(item,index) in form.levelOfRisk" :label="item.value" :key="index"> + <el-radio v-for="(item,index) in form.levelOfRisk" :label="item.value" :key="index" + @change="redioChange(item.name)"> <span class="levelOfRisk-type">{{ item.name }}</span> </el-radio> </el-radio-group> @@ -38,12 +39,28 @@ </el-form> </el-form> <el-scrollbar style="height:286.22px"> - <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" - :class="activeNum===index?'hover':''"> + <!-- <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" :class="activeNum===index?'hover':''" @click="accordPopup(item)">--> + <!-- <!– <i class="state"></i>–>--> + <!-- <img class="state" :src="getImgSrc(item.properties.type)" style="background: none"/>--> + <!-- <div>--> + <!-- <h3 @click="handleLocation(item,index)">浜嬩欢鍚嶇О:XXX浜嬩欢</h3>--> + <!-- <h5>--> + <!-- 浜嬩欢浜嬩欢:2021骞�3鏈�21鏃�--> + <!-- <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;">鍒犻櫎</el-button>--> + <!-- </h5>--> + <!-- <p>--> + <!-- 浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span>--> + <!-- </p>--> + <!-- <p>浜嬩欢绫诲瀷锛�<span>{{ item.properties.pipecode }}</span>--> + <!-- <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;">浜嬩欢绠$悊--> + <!-- </el-button>--> + <!-- </p>--> + <!-- </div>--> + <!-- </div>--> + <div class="environmental-risk-list"> <!-- <i class="state"></i>--> - <img class="state" :src="getImgSrc()" style="background: none"/> <div> - <h3 @click="handleLocation(item,index)">浜嬩欢鍚嶇О:XXX浜嬩欢</h3> + <h3>浜嬩欢鍚嶇О:XXX浜嬩欢</h3> <h5> 浜嬩欢浜嬩欢:2021骞�3鏈�21鏃� <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;">鍒犻櫎</el-button> @@ -51,8 +68,10 @@ <p> 浜嬩欢鐘舵�侊細<span>瀹℃壒闃舵</span> </p> - <p>浜嬩欢绫诲瀷锛�<span>{{ item.properties.pipecode }}</span> - <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;">浜嬩欢绠$悊 + <p>浜嬩欢绫诲瀷锛�<span>妯℃嫙绠$嚎浜嬩欢</span> + <el-button class="rt btn00fff6" size="mini" style="margin-right: 0.04rem;" + @click="accordPopup()"> + <span>浜嬩欢绠$悊</span> </el-button> </p> </div> @@ -106,13 +125,34 @@ this.wfsHelper = new WfsHelper() }, methods: { + // 鐐瑰嚮浜嬩欢绠$悊 + accordPopup () { + console.log('item') + window.$layer.open({ + content: { + content: ReportPopup, // 缁勪欢 + parent: this, // 鐖剁粍浠� + data: { // 浼犻�掔殑鍙傛暟 + // storagePlaceId: e.layer.options.totransferData.StoragePlaceId + } + } + // title: 'title' // 鏍囬 + }) + }, + // radio鏁版嵁閫夋嫨 + redioChange (item) { + console.log(item) + }, + // 鏍规嵁鏁版嵁杩斿洖灞曠ず涓嶅悓鐨勫浘鐗� getImgSrc () { const icon = this.form.dataType.icon return icon ? 'assets/images/map/' + icon : '' }, + // form 2 琛ㄥ崟鏁版嵁閫夋嫨浜嬩欢 handleDataType () { this.list = [] }, + // form 琛ㄥ崟鏁版嵁閫夋嫨 handlePipelineType (val) { this.list = [] for (let i = 0; i < this.items.length; i++) { @@ -123,6 +163,7 @@ } } }, + // 鏁版嵁鎼滅储浜嬩欢 async handleSearch () { this.list = [] this.wfsHelper.clearFilter() @@ -137,25 +178,13 @@ this.list = res.features } }, + // 鎼滅储鐨勬暟鎹偣鍑讳簨浠� handleLocation (val, index) { console.log(val) this.activeNum = index // layer && layer.openPopup() // window.layerFactory.flyByFeature(val, this.form.dataType.code) window.map.flyTo([val.properties.y, val.properties.x], 15) - }, - btnAffiliatedFacilities () { - console.log('item') - window.$layer.open({ - content: { - content: ReportPopup, // 缁勪欢 - parent: this, // 鐖剁粍浠� - data: { // 浼犻�掔殑鍙傛暟 - // storagePlaceId: e.layer.options.totransferData.StoragePlaceId - } - } - // title: 'title' // 鏍囬 - }) } } } diff --git a/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue index 6f9f0e8..3c9a2ee 100644 --- a/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue +++ b/src/components/panel/topicSearch/EnterpriseEmergency/ResourcesQuery.vue @@ -43,8 +43,8 @@ <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" :class="activeNum===index?'hover':''" @click="handleLocation(item,index)"> <img class="state" :src="getImgSrc(item.properties.type)" style="background: none"/> - <h3>璧勬簮绫诲瀷:{{item.properties.type}}</h3> - <h5>璧勬簮鍚嶇О:{{item.properties.companyname}}</h5> + <h3>{{changeAmount}}绫诲瀷:{{item.properties.type}}</h3> + <h5>{{changeAmount}}鍚嶇О:{{item.properties.name}}</h5> <p>璐熻矗浜�:<span>{{item.properties.resperson}}</span></p> <p>鐢佃瘽:<span>{{item.properties.telephone}}</span></p> </div> @@ -78,7 +78,8 @@ list: [], items: [LayerEmergencySource, LayerSurroundings], subItems: LayerEmergencySource.layers || LayerSurroundings.layers, - WfsHelper: null + WfsHelper: null, + changeAmount: '璧勬簮' } }, mounted () { @@ -102,8 +103,10 @@ } if (this.form.pipelineType === '搴旀�ヨ祫婧�') { this.subItems = LayerEmergencySource.layers + this.changeAmount = '璧勬簮' } else if (this.form.pipelineType === '鍛ㄨ竟鐜') { this.subItems = LayerSurroundings.layers + this.changeAmount = '鐜' } }, handleDataType (val) { diff --git a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue index 78533f5..71cc2fb 100644 --- a/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue +++ b/src/components/panel/topicSearch/SewersSelect/SewersAnalysis.vue @@ -439,10 +439,10 @@ this.linkPipeline.push(line) }) }, - // 杩為�氭�� 鍒嗘瀽缁撴灉table鍒楄〃鏁版嵁閫夋嫨鐐瑰嚮浜嬩欢 + // 瀹氫綅鏂规硶浜嬩欢 linkResultSelect (e) { // console.log('杩為�氭�у垎鏋愮粨鏋滃垪琛ㄧ偣鍑�') - // console.log(e) + console.log(e) const geom = JSON.parse(e.geomText) if (this.currentSelectResultLine != null) { this.currentSelectResultLine.remove() @@ -483,8 +483,8 @@ this.selectPipeLine() }, async bgSelect (e) { - console.log('閫夋嫨鐖嗙绠℃') - console.log(e) + // console.log('閫夋嫨鐖嗙绠℃') + // console.log(e) this.bgFm = [] if (this.bgMarker != null) { this.bgMarker.remove() diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue index e536771..cc8a508 100644 --- a/src/components/panel/topicSearch/SolidWasteSearch.vue +++ b/src/components/panel/topicSearch/SolidWasteSearch.vue @@ -30,7 +30,6 @@ <el-scrollbar style="height:286.22px"> <div class="environmental-risk-list" v-for="(item,index) in searchDataDisplay" :key="index" @click="setBounced(item)"> - <!-- <i class="state"></i>--> <img src="../../../../public/assets/images/map/solidwaste/gf_green2.png" alt="" class="state"> <div> <h3>###鐐煎寲閮�</h3> @@ -159,7 +158,7 @@ }, // 鏁版嵁灞曠ず,鐐瑰嚮杩涜寮规鍙婄偣鐨勫睍绀� setBounced (val) { - // console.log(val) + console.log(val) const pos = [val.Latitude, val.Longitude] window.map.setView(pos, 15) window.$layer.open({ @@ -173,7 +172,7 @@ title: val.Name }) pulseEffect([val.Latitude, val.Longitude]) - setPanTo(pos, 250) + setPanTo(pos, 200) } } } diff --git a/src/conf/layers/LayerArea.js b/src/conf/layers/LayerArea.js index 5a2106c..c4d82db 100644 --- a/src/conf/layers/LayerArea.js +++ b/src/conf/layers/LayerArea.js @@ -13,6 +13,7 @@ sname: '鍏徃', // 琛ㄥ悕 checked: true, // 榛樿閫変腑鐘舵�� type: 0, + icon: 'sewers/鍏徃.png', legendImage: '../.././assets/images/map/company_refining.png' }, { @@ -21,6 +22,7 @@ sname: '鐮佸ご', checked: false, // 榛樿閫変腑鐘舵�� type: 0, + icon: 'sewers/鐮佸ご.png', legendImage: '../.././assets/images/map/sewers/鐮佸ご.png' }, { @@ -28,6 +30,7 @@ name: '瑁呯疆鍖�', sname: '瑁呯疆鍖�', checked: false, // 榛樿閫変腑鐘舵�� + icon: 'sewers/瑁呯疆鍖�.png', typeName: 'sewer:unitareaboundary' } ] diff --git a/src/conf/layers/LayerFsss.js b/src/conf/layers/LayerFsss.js index b0e4350..9ab0a79 100644 --- a/src/conf/layers/LayerFsss.js +++ b/src/conf/layers/LayerFsss.js @@ -47,6 +47,7 @@ minZoom: 16, type: SERVICE_TYPE.WMS, typeName: 'sewer:piperack', + icon: 'sewers/绠℃灦.png', checked: false }, { @@ -56,6 +57,7 @@ minZoom: 16, type: SERVICE_TYPE.WMS, typeName: 'sewer:pipegallery', + icon: 'sewers/绠″粖.png', checked: false }, { @@ -63,6 +65,7 @@ name: '娴佸悜', sname: 'ywslx', type: SERVICE_TYPE.WMS, + icon: 'sewers/娴佸悜.png', checked: false }, { diff --git a/src/conf/layers/LayerHbss.js b/src/conf/layers/LayerHbss.js index 7727670..54f61f7 100644 --- a/src/conf/layers/LayerHbss.js +++ b/src/conf/layers/LayerHbss.js @@ -35,6 +35,7 @@ minZoom: 16, type: SERVICE_TYPE.WMS, typeName: 'sewer:firedike', + icon: 'sewers/闃茬伀鍫�.png', checked: false }, { @@ -53,6 +54,7 @@ sname: '鎴祦闂�', type: SERVICE_TYPE.WMS, typeName: 'sewer:collectingbasin', + icon: 'sewers/鎴祦闂�.png', checked: false }, { @@ -62,6 +64,7 @@ minZoom: 16, type: SERVICE_TYPE.WMS, typeName: 'ewer:overflowweir', + icon: 'sewers/婧㈡祦鍫�.png', checked: false }, { diff --git a/src/conf/layers/LayerPipeLines.js b/src/conf/layers/LayerPipeLines.js index ff746f1..476db82 100644 --- a/src/conf/layers/LayerPipeLines.js +++ b/src/conf/layers/LayerPipeLines.js @@ -40,6 +40,7 @@ type: SERVICE_TYPE.WMS, layerGroup: 'sewer:pipeline_group', typeName: 'sewer:pipeline', + icon: 'sewers/浜嬫晠姘�.png', minZoom: 13, filter: 'mediumtype = \'浜嬫晠姘碶'', index: 1 @@ -52,6 +53,7 @@ type: SERVICE_TYPE.WMS, layerGroup: 'sewer:pipeline_group', typeName: 'sewer:pipeline', + icon: 'sewers/鍚补姹℃按.png', minZoom: 13, color: '#ffaa00', filter: 'mediumtype = \'鍚补姹℃按\'', @@ -69,6 +71,7 @@ type: SERVICE_TYPE.WMS, layerGroup: 'sewer:pipeline_group', typeName: 'sewer:pipeline', + icon: 'sewers/鍚洂姹℃按.png', minZoom: 13, filter: 'mediumtype = \'鍚洂姹℃按\'', index: 1 @@ -81,6 +84,7 @@ type: SERVICE_TYPE.WMS, layerGroup: 'sewer:pipeline_group', typeName: 'sewer:pipeline', + icon: 'sewers/鍚⒈姹℃按.png', filter: 'mediumtype = \'鍚⒈姹℃按\'', minZoom: 10, index: 1 @@ -93,6 +97,7 @@ type: SERVICE_TYPE.WMS, layerGroup: 'sewer:pipeline_group', typeName: 'sewer:pipeline', + icon: 'sewers/鍚~姹℃按.png', filter: 'mediumtype = \'鍚~姹℃按\'', minZoom: 10, index: 1 @@ -105,6 +110,7 @@ type: SERVICE_TYPE.WMS, layerGroup: 'sewer:pipeline_group', typeName: 'sewer:pipeline', + icon: 'sewers/鐢熸椿姹℃按.png', filter: 'mediumtype = \'鐢熸椿姹℃按\'', minZoom: 13, index: 1 @@ -117,6 +123,7 @@ type: SERVICE_TYPE.WMS, layerGroup: 'sewer:pipeline_group', typeName: 'sewer:pipeline', + icon: 'sewers/鍑�鍖栨按.png', filter: 'mediumtype = \'鍑�鍖栨按\'', minZoom: 13, index: 1 @@ -128,6 +135,7 @@ type: SERVICE_TYPE.WMS, layerGroup: 'sewer:pipeline_group', typeName: 'sewer:pipeline', + icon: 'sewers/寰幆姘�.png', filter: 'mediumtype = \'寰幆姘碶'', checked: false, minZoom: 13, @@ -141,6 +149,7 @@ type: SERVICE_TYPE.WMS, layerGroup: 'sewer:pipeline_group', typeName: 'sewer:pipeline', + icon: 'sewers/鐢熶骇姹℃按.png', filter: 'mediumtype = \'鐢熶骇姹℃按\'', minZoom: 13, color: '#a8a800', -- Gitblit v1.8.0