Merge branch 'master' into release-sy-v1.0.0

src/views/dike/engineeringCondition/identificationPlate/index.vue

@@ -11,9 +11,7 @@
       </el-breadcrumb-item>
     </el-breadcrumb>
     <div class="mainCon">
-      <div class="map">
+
-        <img style="width: 100%" src="@/assets/image/map.jpg" alt="" />
-      </div>
       <div class="list">
         <el-form
           :model="queryParams"
@@ -1174,15 +1172,9 @@ export default {
 .mainCon {
   display: flex;
   overflow-x: auto;
-  .map {
+
-    min-width: 400px;
-    height: 500px;
-    // border: 1px solid skyblue;
-    // background: skyblue;
-    margin-right: 20px;
-    flex: 1;
-  }
   .list {
+    min-height: 800px;
     min-width: 800px;
     flex: 2;
   }

src/views/sluice/engineeringCondition/identificationPlate/index.vue

@@ -11,9 +11,7 @@
       </el-breadcrumb-item>
     </el-breadcrumb>
     <div class="mainCon">
-      <div class="map">
+
-        <img style="width: 100%" src="@/assets/image/map.jpg" alt="" />
-      </div>
       <div class="list">
         <el-form
           :model="queryParams"
@@ -1207,15 +1205,9 @@ export default {
 .mainCon {
   display: flex;
   overflow-x: auto;
-  .map {
+
-    min-width: 400px;
-    height: 500px;
-    // border: 1px solid skyblue;
-    // background: skyblue;
-    margin-right: 20px;
-    flex: 1;
-  }
   .list {
+    min-height: 800px;
     min-width: 800px;
     flex: 2;
   }