From c865ad4e70b0769d0a4bfd3ad67aed1198f7fde5 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 14 四月 2021 10:13:35 +0800
Subject: [PATCH] 问题修复修改
---
src/components/panel/topicSearch/GasWasteSearch.vue | 59 ++++++++++++++++++-----------
src/components/panel/topicSearch/SewersSearch.vue | 2
2 files changed, 38 insertions(+), 23 deletions(-)
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index c852889..da7907e 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -1,10 +1,10 @@
<template>
<div class="sewers-search" v-if="gdVisible">
- <div class="panel-title">{{title}}</div>
+ <div class="panel-title">{{ title }}</div>
<div class="search-panel ">
<el-form ref="form" :model="form" label-width="90px" class="search-form">
<el-form-item label="鍖哄煙锛�" size="mini" class="search-panel-item">
- <el-select style="width: 100%" v-model="form.areaVal" @change="areaType" :popper-class="'select-down'">
+ <el-select style="width: 100%" v-model="form.areaVal" @change="areaType" :popper-class="'select-down'">
<el-option
v-for="item in inareaTypeOptions"
:key="item.value"
@@ -14,7 +14,8 @@
</el-select>
</el-form-item>
<el-form-item label="浼佷笟鍚嶇О锛�" size="mini">
- <el-select style="width: 100%" v-model="form.enterpriseVal" @change="enterpriseType" :popper-class="'select-down'">
+ <el-select style="width: 100%" v-model="form.enterpriseVal" @change="enterpriseType"
+ :popper-class="'select-down'">
<el-option
v-for="item in enterpriseTypeOptions"
:key="item.value"
@@ -24,7 +25,8 @@
</el-select>
</el-form-item>
<el-form-item label="浜岀骇鍗曚綅锛�" size="mini">
- <el-select style="width: 100%" v-model="form.enterpriseSubunitsVal" @change="enterpriseSubunitsType" :popper-class="'select-down'">
+ <el-select style="width: 100%" v-model="form.enterpriseSubunitsVal" @change="enterpriseSubunitsType"
+ :popper-class="'select-down'">
<el-option
v-for="item in enterpriseSubunitsTypeOptions"
:key="item.value"
@@ -34,7 +36,8 @@
</el-select>
</el-form-item>
<el-form-item label="涓夌骇鍗曚綅锛�" size="mini">
- <el-select style="width: 100%" v-model="form.enterpriseSubunitsVal" @change="enterpriseSubunitsType" :popper-class="'select-down'">
+ <el-select style="width: 100%" v-model="form.enterpriseSubunitsVal" @change="enterpriseSubunitsType"
+ :popper-class="'select-down'">
<el-option
v-for="item in enterpriseSubunitsTypeOptions"
:key="item.value"
@@ -43,13 +46,14 @@
</el-option>
</el-select>
</el-form-item>
-<!-- <el-form-item label="椋庨櫓绾у埆" size="mini"></el-form-item>-->
+ <!-- <el-form-item label="椋庨櫓绾у埆" size="mini"></el-form-item>-->
<el-radio-group v-model="form.type" class="levelOfRisk">
- <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name}}</span></el-radio>
+ <el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{ item.name }}</span>
+ </el-radio>
</el-radio-group>
<!-- <el-form-item >-->
<div class="rightButtonSearch">
- <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
+ <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
<!-- <el-button slot="append" icon="el-icon-search" size="mini"></el-button>-->
<!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
<!-- <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i> -->
@@ -64,7 +68,7 @@
</el-form>
</div>
<el-scrollbar style="height:264px">
- <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
+ <div class="environmental-risk-list"><!-- v-for="(item,index) in list" :key="index" -->
<i class="state"></i>
<div>
<h3>###鐐煎寲閮�</h3>
@@ -97,24 +101,20 @@
</template>
<script>
-<<<<<<< HEAD
-import WfsHelper from '@components/helpers/WfsHelper'
-import AjaxUtils from '@utils/AjaxUtils'
-=======
+
+// import WfsHelper from '@components/helpers/WfsHelper'
+// import AjaxUtils from '@utils/AjaxUtils'
+
import mapApi from '@/api/mapApi'
// import WfsHelper from '@components/helpers/WfsHelper'
->>>>>>> d838248f54e3bcacf9c2a54f7dc692525af3c051
export default {
name: 'GasWasteSearch',
data () {
return {
gdVisible: true,
list: [],
-<<<<<<< HEAD
-=======
// labelList: PipelineTypeOptions[0].labelList,
->>>>>>> d838248f54e3bcacf9c2a54f7dc692525af3c051
total: 0,
inareaTypeOptions: [],
enterpriseTypeOptions: [],
@@ -130,11 +130,26 @@
isWaybillHover: true,
isRouteHover: false,
levelOfRisk: [
- { name: '鍏ㄩ儴', value: '1' },
- { name: '姝ｅ父', value: '2' },
- { name: '瓒呮爣', value: '3' },
- { name: '寮傚父', value: '4' },
- { name: '鍋滀骇', value: '5' }
+ {
+ name: '鍏ㄩ儴',
+ value: '1'
+ },
+ {
+ name: '姝ｅ父',
+ value: '2'
+ },
+ {
+ name: '瓒呮爣',
+ value: '3'
+ },
+ {
+ name: '寮傚父',
+ value: '4'
+ },
+ {
+ name: '鍋滀骇',
+ value: '5'
+ }
]
}
},
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 1656191..dedb740 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -78,7 +78,7 @@
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
-// 寮曞叆鍒嗘瀽缁勪欢鍐呭
+// 寮曞叆缁勪欢鍐呭
import SewersAnalysis from '@components/panel/topicSearch/SewersSelect/SewersAnalysis'
import SewersHistory from '@components/panel/topicSearch/SewersSelect/SewersHistory'
--
Gitblit v1.8.0