Merge branch 'master' of http://218.59.175.43:3000/zhangzl/rongxin.dashboard

src/views/resource/land/index.vue

@@ -326,7 +326,7 @@
 
     <!-- 地图对话框 -->
     <el-dialog :title="title" :visible.sync="openMap" width="1200px" append-to-body>
-      <el-divider><h3 class="header-anchor">地图信息：绿色地块表示该地块，青色表示本组织已标记的其他地块</h3></el-divider>
+      <el-divider><h3 class="header-anchor">地图信息：红色地块表示该地块，青色表示本组织已标记的其他地块</h3></el-divider>
       <div id="full-screen-acceptance" style="width: 100%;height:65vh;">
         <!--<div id="landMapDiv"></div>-->
         <div id="mapWrap"></div>
@@ -941,11 +941,11 @@ export default {
           style: new ol.style.Style({
             fill: new ol.style.Fill({
               //矢量图层填充颜色，以及透明度
-              color: "rgba(204, 255, 204,0.3)",
+              color: "yellow",
             }),
             stroke: new ol.style.Stroke({
               //边界样式
-              color: "#47c68f",
+              color: "yellow",
               width: 3,
             }),
           }),

src/views/resource/operation/index.vue

@@ -210,7 +210,7 @@
 
     <!-- 添加或修改地块经营对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="820px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="120px">
 
         <el-form-item label="区域位置名称" prop="deptName">
           <el-input v-model="form.deptName" placeholder="请输入区域位置名称"  show-word-limit :maxlength="100"/>