From 944d07498da955c8f8427b71f0af0f5b52c635ae Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 07 四月 2021 10:08:10 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/panel/topicSearch/SewersSearch.vue |  196 ++++++++++++++++++++++++------------------------
 1 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index e6e416a..46e94a3 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -1,106 +1,106 @@
 <template>
-  <div class="query-search" v-if="gdVisible">
-    <div class="search-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.pipelineType" @change="handlePipelineType"  :popper-class="'select-down'">
-            <el-option
-                v-for="item in pipelineTypeOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="form.pipelineType+'锛�'" size="mini">
-          <el-select style="width: 100%"  v-model="form.dataType"  @change="handleDataType" :popper-class="'select-down'">
-            <el-option
-                v-for="item in dataTypeOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <!--              <el-form-item >-->
-        <div class="rightButtonSearch">
-          <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-button class="el-icon-search" @click="handleSearch"></el-button>
-        </div>
-        <!--              </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>
-    </div>
-    <el-scrollbar style="height:100%">
-      <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 id="waybillNumber" class=""
-                    :title="item.properties.pipename">
+        <div class="sewers-search" v-if="gdVisible">
+          <div class="search-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.pipelineType" @change="handlePipelineType"  :popper-class="'select-down'">
+                  <el-option
+                      v-for="item in pipelineTypeOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item :label="form.pipelineType+'锛�'" size="mini">
+                <el-select style="width: 100%"  v-model="form.dataType"  @change="handleDataType" :popper-class="'select-down'">
+                  <el-option
+                      v-for="item in dataTypeOptions"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <!--              <el-form-item >-->
+              <div class="rightButtonSearch">
+                <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-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
+              </div>
+              <!--              </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>
+          </div>
+          <el-scrollbar style="height:380.44px;" >
+            <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 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>
-          <!--                <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">
+                  </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>
+              <div class="B-TMD-table-list-content">
 
-          <div v-for="itm in labelList" :key="itm.label">
-            <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 v-for="itm in labelList" :key="itm.label">
+                  <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>
+              <!--              <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-scrollbar>
+          <el-card class="footer-page" v-if="total > 10">
+            <el-pagination
+                small
+                @current-change="handlePage"
+                :page-size=pageSize
+                layout="prev, pager, next"
+                :total=total
+                :current-page=current
+                class="warnPagination"
+            >
+            </el-pagination>
+          </el-card>
         </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-scrollbar>
-    <el-card class="footer-page" v-if="total > 10">
-      <el-pagination
-          small
-          @current-change="handlePage"
-          :page-size=pageSize
-          layout="prev, pager, next"
-          :total=total
-          :current-page=current
-          class="warnPagination"
-      >
-      </el-pagination>
-    </el-card>
-  </div>
-  <!--        <div class="monitor2" v-if="hbVisible">-->
-  <!--          <env-protect-search></env-protect-search>-->
-  <!--        </div>-->
-  <!--        <div class="monitor2" v-if="pkVisible">-->
-  <!--          <discharge-search></discharge-search>-->
-  <!--        </div>-->
+      <!--        <div class="monitor2" v-if="hbVisible">-->
+      <!--          <env-protect-search></env-protect-search>-->
+      <!--        </div>-->
+      <!--        <div class="monitor2" v-if="pkVisible">-->
+      <!--          <discharge-search></discharge-search>-->
+      <!--        </div>-->
 </template>
 
 <script>

--
Gitblit v1.8.0