|
@@ -21,7 +21,6 @@
|
|
|
v-model="searchName"
|
|
|
placeholder="请输入名称"
|
|
|
@keyup.enter.native="searchByName()"
|
|
|
- clearable
|
|
|
size="small"
|
|
|
prefix-icon="el-icon-search"
|
|
|
/>
|
|
@@ -30,7 +29,7 @@
|
|
|
<div class="d-l-con-icon">
|
|
|
<div
|
|
|
class="icon-con"
|
|
|
- :class="{ on: iconCurrentIndex == item.resourceTable }"
|
|
|
+ :class="{ on: iconCurrentIndex == item.type }"
|
|
|
v-for="(item, index) in resourcesList"
|
|
|
v-on:click="fireControlViewPoint(item.type, searchName)"
|
|
|
>
|
|
@@ -196,7 +195,7 @@ export default {
|
|
|
// 根据名称筛选资源点位
|
|
|
searchByName() {
|
|
|
this.$modal.msgSuccess("正在查询,请稍后...");
|
|
|
- this.fireControlViewPoint(this.resourceTable, this.searchName);
|
|
|
+ this.fireControlViewPoint(this.resourceTable, this.searchName,"search");
|
|
|
},
|
|
|
/** ----------------------------------底部按钮公用组件开始------------------------------------- */
|
|
|
bottomMenuList() {
|
|
@@ -371,7 +370,11 @@ export default {
|
|
|
that.fireControlViewPoint("ziyuan", "");
|
|
|
});
|
|
|
},
|
|
|
- fireControlViewPoint(resourceTable, name) {
|
|
|
+ fireControlViewPoint(resourceTable, name, search) {
|
|
|
+ if(resourceTable == this.resourceTable && search != "search"){
|
|
|
+ resourceTable = "ziyuan"
|
|
|
+ }
|
|
|
+ this.iconCurrentIndex = resourceTable;
|
|
|
// 搜索框
|
|
|
if (name == "" || name == null || name == undefined) {
|
|
|
name = "";
|
|
@@ -380,9 +383,7 @@ export default {
|
|
|
}
|
|
|
console.log("name=", name);
|
|
|
console.log("this.showSearch=", this.showSearch);
|
|
|
- if(resourceTable == this.resourceTable){
|
|
|
- resourceTable = "ziyuan"
|
|
|
- }
|
|
|
+
|
|
|
let that = this;
|
|
|
that.resourceTable = resourceTable;
|
|
|
that.markersList = [];
|