From cb4ce544a38a4720b88946949b3258705d5ae2da Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 02 四月 2021 17:07:37 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/SolidWasteSearch.vue | 62 ++++++++-----------------------
1 files changed, 16 insertions(+), 46 deletions(-)
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index 3627d14..b283cb1 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -18,10 +18,18 @@
</el-option>
</el-select>
</el-form-item>
- <div class="search-radio">
+ <!-- <div class="search-radio">
<el-radio v-model="radio" label="1">鍏ㄩ儴</el-radio>
<el-radio v-model="radio" label="2">姝ｅ父</el-radio>
<el-radio v-model="radio" label="3">棰勮</el-radio>
+ </div> -->
+ <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-group>
+
+ <div class="rightButtonSearch">
+ <el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
+ <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
</div>
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
<i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i>
@@ -85,6 +93,8 @@
<!-- </div>-->
<!-- </el-card>-->
</div>
+ <!-- <el-scrollbar style="height:100%">-->
+ <!-- </el-scrollbar>-->
</div>
</template>
@@ -97,6 +107,11 @@
props: ['title'],
data () {
return {
+ levelOfRisk: [
+ { name: '鍏ㄩ儴', value: '1' },
+ { name: '姝ｅ父', value: '2' },
+ { name: '棰勮', value: '3' }
+ ],
judgeVisible: true,
solidWasteTypeOptions: [{
value: '1',
@@ -236,49 +251,4 @@
margin: 15px auto;
}
-.solidwaste-search {
- position: relative;
- overflow: hidden;
-
- .search-panel {
- background-color: transparent;
- border: 1px solid @background-color-split;
- padding: 10px;
-
- /deep/ input {
- border-radius: 0;
- background-color: @background-color-split;
- border: solid 1px @color;
- color: @color-gray;
- font-size: 0.01rem;
-
- .el-select .el-input.is-focus .el-input__inner {
- border-color: @color;
- }
- }
-
- /deep/ input:focus {
- border-color: @color;
- }
- }
-
- .search-btn {
- }
-
- .search-radio {
- margin: 15px auto;
- display: flex;
- align-items: center;
- justify-content: space-around;
- }
-
- .location-btn:hover, .el-input__icon:hover {
- color: @color;
- cursor: pointer;
- }
-
- .box-card {
- margin: 15px auto;
- }
-}
</style>
--
Gitblit v1.8.0