From 693e7ee78ff93a514892ee272bde57be5bc5cc29 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 15 四月 2021 09:40:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SolidWasteSearch.vue | 60 +++++++++++++++--------------
src/components/table/components/SolidWaste.vue | 39 ++++++++++++-------
2 files changed, 55 insertions(+), 44 deletions(-)
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 3457c1d..5da507e 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -29,7 +29,8 @@
<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>
+ <!-- <i class="state"></i>-->
+ <img src="../../../../public/assets/images/map/solidwaste/gf_green2.png" alt="" class="state">
<div>
<h3>###鐐煎寲閮�</h3>
<p>鎵�灞為儴闂細<span>{{ item.Name }}</span></p>
@@ -52,6 +53,33 @@
data () {
return {
judgeVisible: true,
+ form: {
+ keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
+ // 鏁版嵁鐨勪紶閫�
+ transferData: 1
+ },
+ levelOfRisk: [
+ {
+ name: '鍏ㄩ儴',
+ value: 1
+ },
+ {
+ name: '姝ｅ父',
+ value: 2
+ },
+ {
+ name: '棰勮',
+ value: 3
+ }
+ ],
+ // 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
+ searchDataDisplay: [],
+ instance: null,
+ intervals: [],
+ layer: window.map,
+ L: window.L,
+ times: 5,
+ colors: ['#98FB98', '#ff0000'],
solidWasteTypeOptions: [{
value: '1',
label: '鍖哄煙',
@@ -116,34 +144,7 @@
label: '闀垮害(m)',
key: 'length'
}]
- }],
- form: {
- keyword: '鍥哄簾闈㈡澘鏁版嵁鏌ヨ',
- // 鏁版嵁鐨勪紶閫�
- transferData: 1
- },
- levelOfRisk: [
- {
- name: '鍏ㄩ儴',
- value: 1
- },
- {
- name: '姝ｅ父',
- value: 2
- },
- {
- name: '棰勮',
- value: 3
- }
- ],
- // 鏁版嵁鎼滅储涔嬪悗锛屽瓨鍌ㄦ暟鎹殑
- searchDataDisplay: [],
- instance: null,
- intervals: [],
- layer: window.map,
- L: window.L,
- times: 5,
- colors: ['#98FB98', '#ff0000']
+ }]
}
},
methods: {
@@ -152,6 +153,7 @@
// console.log(this.form.keyword)
const result = await mapApi.getSolidWaste(data)
this.searchDataDisplay = result.Result.DataInfo
+ console.log(this.searchDataDisplay)
},
// 涓嶅悓绫诲瀷鍥剧墖灏佽
differentTypes (judgeValue) {
diff --git a/src/components/table/components/SolidWaste.vue b/src/components/table/components/SolidWaste.vue
index ae00c44..8d635dd 100644
--- a/src/components/table/components/SolidWaste.vue
+++ b/src/components/table/components/SolidWaste.vue
@@ -20,7 +20,8 @@
: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>
+ <i class="el-icon-caret-right" :class="{active: isActive === $index}" slot="reference"
+ @click="doIcon($index)"></i>
<!-- <i class="el-icon-caret-bottom" slot="reference" v-else @click="doIcon($index)"></i>-->
</el-popover>
</template>
@@ -29,9 +30,9 @@
</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>
+ <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="WasteWaters" label="澶栨帓搴熸按閲忥紙m鲁锛�" width="100px"></el-table-column>
@@ -46,7 +47,7 @@
<el-table-column label="鎺掓斁鍙ｆ娴嬬粺璁＄姸鎬�">
<el-table-column prop="normal" label="姝ｅ父" width="60px">
<template slot-scope="{row,$index}">
- <u v-if="$index!=2" >{{row.normal}}</u>
+ <u v-if="$index!=2">{{ row.normal }}</u>
<el-popover v-else
placement="bottom-end"
width="200"
@@ -55,7 +56,7 @@
title="鐩戞祴鐐规槑缁嗚〃"
>
<refinery></refinery>
- <u slot="reference" style="color: #00ffff">{{row.normal}}</u>
+ <u slot="reference" style="color: #00ffff">{{ row.normal }}</u>
<!-- <i class="el-icon-caret-bottom" v-else-if="isShowIcon&&scope.row.index===1"></i>-->
<!-- <i v-if="isShowIcon" class="el-icon-caret-bottom" slot="reference" @click="isbtn"></i>-->
<!-- <i v-else class="el-icon-caret-right" slot="reference" @click="isbtn"></i>-->
@@ -67,7 +68,7 @@
<el-table-column prop="StopProduction" label="鍋滀骇" width="60px"></el-table-column>
<el-table-column prop="deficiency" label="缂哄け" width="60px">
<template slot-scope="{row,$index}">
- <u v-if="$index!=1" >{{row.deficiency}}</u>
+ <u v-if="$index!=1">{{ row.deficiency }}</u>
<el-popover v-else
placement="bottom-end"
width="200"
@@ -76,7 +77,7 @@
popper-class="popovers"
>
<MissingAlarm></MissingAlarm>
- <u slot="reference" style="color: #00ffff">{{row.deficiency}}</u>
+ <u slot="reference" style="color: #00ffff">{{ row.deficiency }}</u>
</el-popover>
</template>
</el-table-column>
@@ -92,6 +93,7 @@
import ChemicalWastewater from './componented/ChemicalWastewater'
import Refinery from '@components/table/components/componented/refinery'
import MissingAlarm from '@components/table/components/componented/MissingAlarm'
+
export default {
name: 'SolidWaste',
components: {
@@ -155,11 +157,16 @@
}
},
methods: {
- tableHeaderColor ({ row, column, owIndex, columnIndex }) {
+ 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 () {
+ rowClass () {
// return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
},
// 鑾峰彇鐐瑰嚮鐨勮〃鏍�
@@ -183,17 +190,19 @@
}
</script>
-<style scoped>
-.popovers{
+<style lang="less" scoped>
+.popovers {
width: auto !important;
background-color: gray !important;
}
-.popovers.el-popover{
- padding:0;
+
+.popovers.el-popover {
+ padding: 0;
}
+
.active {
/*color: red;*/
- transform:rotate(90deg);
+ transform: rotate(90deg);
}
</style>
--
Gitblit v1.8.0