From 0c9979075994d553695e1027b0d31566c838aff7 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 12 三月 2021 11:32:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/panel/topicSearch/SewersSearch.vue | 71 ++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 6fe9340..9a67eea 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -1,5 +1,5 @@
<template>
- <div class="sewers-search">
+ <div class="sewers-search">
<div class="el-message-box__content" style="padding:6px;font-size: 13px;">
<div class="box__content" v-if="gdVisible">
<div>
@@ -25,46 +25,47 @@
</el-option>
</el-select>
</el-form-item>
-<!-- <el-form-item >-->
- <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>
- </el-input>
-<!-- </el-form-item>-->
-<!-- <el-form-item>-->
-<!-- <input type="button" class="btn-ok" @click="handleSearch" value="鏌ヨ">-->
-<!-- <input type="button" class="btn-reset" @click="handleSearch" value="閲嶇疆">-->
-<!-- </el-form-item>-->
+ <!-- <el-form-item >-->
+ <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>
+ </el-input>
+ <!-- </el-form-item>-->
+ <!-- <el-form-item>-->
+ <!-- <input type="button" class="btn-ok" @click="handleSearch" value="鏌ヨ">-->
+ <!-- <input type="button" class="btn-reset" @click="handleSearch" value="閲嶇疆">-->
+ <!-- </el-form-item>-->
</el-form>
</el-card>
+ <el-scrollbar style="height:100%">
<el-card class="search-result" >
<div class="B-TMD-table-list" v-for="(item,index) in list" :key="index">
<div class="B-TMD-table-list-title">
<div class="B-TMD-table-list-head">
<div class="B-TMD-table-list-title-y"
:class="['B-TMD-table-list-title-y-nam', { 'warning': item.vehicleStatus==='910003' }, { 'offline': item.vehicleStatus==='910001' }]">
-<!-- <span>杩愬崟鍙凤細</span>-->
+ <!-- <span>杩愬崟鍙凤細</span>-->
<span id="waybillNumber" class=""
:title="item.properties.pipename">
<span class="location-btn" @click="handleLocation(item)">{{ item.properties.pipename }}</span>
</span>
</div>
-<!-- <div class="B-TMD-table-list-title-c">-->
-<!-- {{ labelList[0] }}锛�-->
-<!-- <span id="plateNumber_p">-->
-<!-- <span id="plateNumber_n"><a href="#">{{ item.properties.item.p1 }}</a></span>-->
-<!-- </span>-->
-<!-- </div>-->
+ <!-- <div class="B-TMD-table-list-title-c">-->
+ <!-- {{ labelList[0] }}锛�-->
+ <!-- <span id="plateNumber_p">-->
+ <!-- <span id="plateNumber_n"><a href="#">{{ item.properties.item.p1 }}</a></span>-->
+ <!-- </span>-->
+ <!-- </div>-->
</div>
-<!-- <div class="B-TMD-table-icons" style="float:right">-->
-<!-- <ul>-->
-<!-- <li class="B-TMD-table-list-title-y-adress"-->
-<!-- @click="handleLocation(item)"></li>-->
-<!-- <li :class="[{'B-TMD-table-list-title-y-car': item.vehicleStatus ==='910002', 'B-TMD-table-list-title-y-car-offline': item.vehicleStatus ==='910001','B-TMD-table-list-title-y-car-warning': item.vehicleStatus==='910003' }]"></li>-->
-<!-- </ul>-->
-<!-- </div>-->
+ <!-- <div class="B-TMD-table-icons" style="float:right">-->
+ <!-- <ul>-->
+ <!-- <li class="B-TMD-table-list-title-y-adress"-->
+ <!-- @click="handleLocation(item)"></li>-->
+ <!-- <li :class="[{'B-TMD-table-list-title-y-car': item.vehicleStatus ==='910002', 'B-TMD-table-list-title-y-car-offline': item.vehicleStatus ==='910001','B-TMD-table-list-title-y-car-warning': item.vehicleStatus==='910003' }]"></li>-->
+ <!-- </ul>-->
+ <!-- </div>-->
</div>
<div class="B-TMD-table-list-content">
@@ -72,17 +73,17 @@
<span>{{ itm.label }}锛�</span>
<span id="b_twe_loan" :title="item.properties[itm.key] ">{{ item.properties[itm.key] }}</span>
</div>
-<!-- <div><span>鏀惰揣浼佷笟锛�</span> <span-->
-<!-- id="b_twe_loan1" :title="item.recvWarehouseName">{{ item.recvWarehouseName }}</span>-->
-<!-- </div>-->
+ <!-- <div><span>鏀惰揣浼佷笟锛�</span> <span-->
+ <!-- id="b_twe_loan1" :title="item.recvWarehouseName">{{ item.recvWarehouseName }}</span>-->
+ <!-- </div>-->
</div>
-<!-- <div class="B-TMD-table-list-bottom">-->
-<!-- <div class="B-TMD-table-list-bottom-name">-->
-<!-- 璐х墿鍚嶇О锛�<span :title="item.materialName">{{ item.materialName }}</span></div>-->
-<!-- </div>-->
+ <!-- <div class="B-TMD-table-list-bottom">-->
+ <!-- <div class="B-TMD-table-list-bottom-name">-->
+ <!-- 璐х墿鍚嶇О锛�<span :title="item.materialName">{{ item.materialName }}</span></div>-->
+ <!-- </div>-->
</div>
</el-card>
-
+ </el-scrollbar>
<el-card class="footer-page" v-if="total > 10">
<el-pagination
small
--
Gitblit v1.8.0