tongshanglei 3 年之前
父節點
當前提交
1dc241d4f4

+ 9 - 1
src/views/wind/wind/index.scss

@@ -48,7 +48,15 @@
         border-radius: 0px;
         
     }
-    
+    #mapTipsBox{
+        margin-left: 100px;
+        border-radius: 5px;
+        background-color: #fff;
+        line-height: 32px;
+        padding: 5px 10px;
+        font-size: 14px;
+        color:#3895e5;
+    }
     #rightPanel {
         display: inline-block;
         width: 500px;

+ 4 - 1
src/views/wind/wind/index.vue

@@ -37,7 +37,7 @@
                     </el-option>
                 </el-select>
                 <bm-auto-complete v-if=" searchType =='area' "   :sugStyle="{zIndex: 1}">
-                    <el-input  size="medium" class="searchInput" v-model="keyword" autocomplete="off" maxlength="256" placeholder="输入地址关键字进行搜索,在空白处点击鼠标右键添加" />
+                    <el-input  size="medium" class="searchInput" v-model="keyword" autocomplete="off" maxlength="256" placeholder="输入地址关键字搜索地区,在空白处点击鼠标右键添加" />
                 </bm-auto-complete>
                 <el-input  v-if=" searchType =='wind' " v-model="windWord" @keyup.enter.native="searchWindList" size="medium" class="searchInput" autocomplete="off" maxlength="256" placeholder="输入风场名称或者风场编号等进行搜索" />
                 <el-input  v-if=" searchType =='pump' " v-model="pumpWord" @keyup.enter.native="searchPumpList"  size="medium" class="searchInput" autocomplete="off" maxlength="256" placeholder="输入液压泵名称或者液压泵编号等进行搜索" />
@@ -54,6 +54,9 @@
                     </el-row>
                 </div>
             </bm-control>
+            <bm-control id="mapTipsBox" anchor="BMAP_ANCHOR_BOTTOM_LEFT" :offset="showHideOffset">
+              <div>右键点击页面空白处可添加风场区域,选择完区域后右键/双击图形可保存</div>
+            </bm-control>
         </baidu-map>
         <!-- 风场表单 -->
         <el-dialog title="风场信息" :visible.sync="visibleWindDialog" destroy-on-close width="600px">

+ 26 - 0
src/views/wind/wind/table/PumpTable.vue

@@ -1,5 +1,26 @@
 <template>
     <div class="app-container">
+        <el-input
+            v-model="queryParam.name"
+            placeholder="液压泵名称"
+            clearable
+            class="filter-item form-search-input fl"
+            @keyup.enter.native="handleSearch"
+          />
+          <el-input
+            v-model="queryParam.number"
+            placeholder="液压泵编号"
+            clearable
+            class="filter-item form-search-input fl"
+            @keyup.enter.native="handleSearch"
+          />
+
+          
+     
+        <el-button class="filter-item fl search" icon="el-icon-search" @click="handleBuildSearch">
+            搜索
+        </el-button>
+
         <div class="table-body">
             <el-table
                 :data="tableData"
@@ -141,4 +162,9 @@ export default {
         height: 178px;
         display: block;
     }
+    .form-search-input{
+        width:40%;
+        margin-right: 8px;
+        margin-bottom: 10px;
+    }
 </style>

+ 25 - 0
src/views/wind/wind/table/WindTable.vue

@@ -1,5 +1,25 @@
 <template>
     <div class="app-container">
+        <el-input
+            v-model="queryParam.name"
+            placeholder="风场名称"
+            clearable
+            class="filter-item form-search-input fl"
+            @keyup.enter.native="handleSearch"
+          />
+        <el-input
+            v-model="queryParam.number"
+            placeholder="风场编号"
+            clearable
+            class="filter-item form-search-input fl"
+            @keyup.enter.native="handleSearch"
+          />
+
+          
+     
+        <el-button class="filter-item fl search" icon="el-icon-search" @click="handleBuildSearch">
+            搜索
+        </el-button>
         <div class="table-body">
             <el-table
                 :data="tableData"
@@ -182,4 +202,9 @@ export default {
         height: 178px;
         display: block;
     }
+    .form-search-input{
+        width:40%;
+        margin-right: 8px;
+        margin-bottom: 10px;
+    }
 </style>