1

src/assets/scss/modules/visual/command.scss

@@ -81,7 +81,7 @@
         box-shadow: 0px 4px 8px 0px rgba(147, 147, 147, 0.26);
 
         > input {
-            width: 420px;
+            width: 400px;
             border: none;
             line-height: 45px;
             font-size: 18px;
@@ -90,10 +90,17 @@
             color: #333333;
         }
 
-        > img {
+        .i-search {
             margin: 0 16px;
-            width: 30px;
+            width: 24px;
-            height: 30px;
+            height: 24px;
+        }
+
+        .i-close {
+            margin-left: 15px;
+            opacity: 0.2;
+            width: 20px;
+            cursor: pointer;
         }
 
         .btn {
@@ -206,7 +213,11 @@
     }
 
     .list {
-        min-height: 780px;
+        margin-right: -8px;
+        height: calc(825px - 120px);
+        overflow-y: auto;
+        overflow-x: hidden;
+        @include scrollBar;
     }
 }
 

src/views/modules/visual/command/cpts/eventInfo.vue

@@ -18,7 +18,7 @@
           :eventId="eventId"
           :eventDetailData="eventDetailData"
           :source="'visiual'"
-                            @close="handleClose"
+          @close="handleClose"
           @handleClose="handleClose"
           @handleOk="handleOk"
           @dialogOk="handleEditSuccess"

src/views/modules/visual/command/cpts/map.vue

@@ -628,9 +628,7 @@ export default {
     },
 
     async setDotMarker(item, posArr) {
-      if (searchMarker) {
+      this.removeDotMarker();
-        searchMarker.remove();
-      }
       const marker = new Marker({
         offsets: [0, -20],
       }).setLnglat(posArr);
@@ -659,6 +657,12 @@ export default {
       searchMarker = marker;
     },
 
+    removeDotMarker() {
+      if (searchMarker) {
+        searchMarker.remove();
+      }
+    },
+
     // 把地图缩放等级在原来基础上大一点
     zoomInABit() {
       //   let current = scene.getZoom();

src/views/modules/visual/command/index.vue

@@ -43,13 +43,14 @@
 
         <div class="m-search">
           <div class="input">
-            <img src="@/assets/img/shuju/command/search.png" />
+            <img class="i-search" src="@/assets/img/shuju/command/search.png" />
             <input
               type="text"
               placeholder="请输入"
               @keyup.enter="handleSearch"
               v-model="searchName"
             />
+            <img class="i-close" @click="clearSearch" src="@/assets/img/shuju/command/close.png" />
             <div class="btn" @click="handleSearch">搜索</div>
           </div>
           <div class="result" v-if="showedSearchResult">
@@ -189,6 +190,7 @@
       v-if="pageType === 'create-demand'"
       ref="ref_demand"
       :icResiUserId="icResiUserId"
+      :selGridId="selGridId"
       @handleClose="handleClose"
     />
 
@@ -769,6 +771,11 @@ export default {
       }
     },
 
+    clearSearch(){
+      this.searchName = '';
+      this.$refs.map.removeDotMarker();
+    },
+
     async searchPos() {
       let data = await this.$refs.map.searchPos(this.searchName);