diff --git a/index.html b/index.html
index 8be7069..c801c4c 100644
--- a/index.html
+++ b/index.html
@@ -37,9 +37,4 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
-  <style type="text/css">
-    .amap-sug-result {
-      z-index: 2999!important;
-    }
-  </style>
 </html>

diff --git a/index.html b/index.html
index 8be7069..c801c4c 100644
--- a/index.html
+++ b/index.html
@@ -37,9 +37,4 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
-  <style type="text/css">
-    .amap-sug-result {
-      z-index: 2999!important;
-    }
-  </style>
 </html>
diff --git a/src/App.vue b/src/App.vue
index ec22623..5adc049 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -96,6 +96,8 @@
   document.body.style.setProperty('--g-sub-sidebar-menu-hover-color', '#008D68')
   document.body.style.setProperty('--color', '#008D68')
   document.body.style.setProperty('--el-button-hover-bg-color', '#41A877')
+  document.body.style.setProperty('--el-button-hover-border-color', '#41A877')
+  document.body.style.setProperty('--el-button-active-color', '#41A877')
 })
 </script>
 
@@ -110,3 +112,11 @@
     <system-info />
   </el-config-provider>
 </template>
+
+<style lang="scss">
+::v-deep .el-button {
+  &:hover {
+    background-color: #41a877 !important;
+  }
+}
+</style>

diff --git a/index.html b/index.html
index 8be7069..c801c4c 100644
--- a/index.html
+++ b/index.html
@@ -37,9 +37,4 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
-  <style type="text/css">
-    .amap-sug-result {
-      z-index: 2999!important;
-    }
-  </style>
 </html>
diff --git a/src/App.vue b/src/App.vue
index ec22623..5adc049 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -96,6 +96,8 @@
   document.body.style.setProperty('--g-sub-sidebar-menu-hover-color', '#008D68')
   document.body.style.setProperty('--color', '#008D68')
   document.body.style.setProperty('--el-button-hover-bg-color', '#41A877')
+  document.body.style.setProperty('--el-button-hover-border-color', '#41A877')
+  document.body.style.setProperty('--el-button-active-color', '#41A877')
 })
 </script>
 
@@ -110,3 +112,11 @@
     <system-info />
   </el-config-provider>
 </template>
+
+<style lang="scss">
+::v-deep .el-button {
+  &:hover {
+    background-color: #41a877 !important;
+  }
+}
+</style>
diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue
index d751989..8531d7a 100644
--- a/src/components/SelectLocationMap/map/index.vue
+++ b/src/components/SelectLocationMap/map/index.vue
@@ -21,7 +21,6 @@
 const AMap1 = ref()
 const remarkRef = ref()
 const placeSearchRef = ref()
-const searchList = ref()
 // 地图点击事件
 const clickHandler = function (e) {
   const location = [e.lnglat.getLng(), e.lnglat.getLat()]
@@ -67,7 +66,7 @@
         // city: "010", // 兴趣点城市
         citylimit: false, // 是否强制限制在设置的城市内搜索
         map: map.value, // 展现结果的地图实例
-        panel: 'info', // 结果列表将在此容器中进行展示。
+        panel: 'result', // 结果列表将在此容器中进行展示。
         autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
       })
       placeSearchRef.value = placeSearch
@@ -91,7 +90,9 @@
 const search = ref('')
 watch(() => search.value, (newVal) => {
   if (newVal) {
-    placeSearchRef.value.search(newVal)
+    placeSearchRef.value.search(newVal, (a, b) => {
+      console.log(a, b, 'assss')
+    })
   }
   else {
     placeSearchRef.value.clear()
@@ -112,7 +113,7 @@
         <el-input v-model="search" placeholder="请输入关键字" clearable />
       </div>
     </div>
-    <div id="info" />
+    <div id="result" />
   </div>
 </template>
 
@@ -121,11 +122,12 @@
   position: relative;
 }
 
-#info {
+#result {
   width: 270px;
   position: absolute;
   top: 34px;
   right: 0;
+  height: 100px;
 }
 
 #map {

diff --git a/index.html b/index.html
index 8be7069..c801c4c 100644
--- a/index.html
+++ b/index.html
@@ -37,9 +37,4 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
-  <style type="text/css">
-    .amap-sug-result {
-      z-index: 2999!important;
-    }
-  </style>
 </html>
diff --git a/src/App.vue b/src/App.vue
index ec22623..5adc049 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -96,6 +96,8 @@
   document.body.style.setProperty('--g-sub-sidebar-menu-hover-color', '#008D68')
   document.body.style.setProperty('--color', '#008D68')
   document.body.style.setProperty('--el-button-hover-bg-color', '#41A877')
+  document.body.style.setProperty('--el-button-hover-border-color', '#41A877')
+  document.body.style.setProperty('--el-button-active-color', '#41A877')
 })
 </script>
 
@@ -110,3 +112,11 @@
     <system-info />
   </el-config-provider>
 </template>
+
+<style lang="scss">
+::v-deep .el-button {
+  &:hover {
+    background-color: #41a877 !important;
+  }
+}
+</style>
diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue
index d751989..8531d7a 100644
--- a/src/components/SelectLocationMap/map/index.vue
+++ b/src/components/SelectLocationMap/map/index.vue
@@ -21,7 +21,6 @@
 const AMap1 = ref()
 const remarkRef = ref()
 const placeSearchRef = ref()
-const searchList = ref()
 // 地图点击事件
 const clickHandler = function (e) {
   const location = [e.lnglat.getLng(), e.lnglat.getLat()]
@@ -67,7 +66,7 @@
         // city: "010", // 兴趣点城市
         citylimit: false, // 是否强制限制在设置的城市内搜索
         map: map.value, // 展现结果的地图实例
-        panel: 'info', // 结果列表将在此容器中进行展示。
+        panel: 'result', // 结果列表将在此容器中进行展示。
         autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
       })
       placeSearchRef.value = placeSearch
@@ -91,7 +90,9 @@
 const search = ref('')
 watch(() => search.value, (newVal) => {
   if (newVal) {
-    placeSearchRef.value.search(newVal)
+    placeSearchRef.value.search(newVal, (a, b) => {
+      console.log(a, b, 'assss')
+    })
   }
   else {
     placeSearchRef.value.clear()
@@ -112,7 +113,7 @@
         <el-input v-model="search" placeholder="请输入关键字" clearable />
       </div>
     </div>
-    <div id="info" />
+    <div id="result" />
   </div>
 </template>
 
@@ -121,11 +122,12 @@
   position: relative;
 }
 
-#info {
+#result {
   width: 270px;
   position: absolute;
   top: 34px;
   right: 0;
+  height: 100px;
 }
 
 #map {
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index f48e375..eb370a9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -100,6 +100,7 @@
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
         const marker = new AMap.Marker({
+          zooms: [16, 20],
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
@@ -140,6 +141,7 @@
         })
         // const content = '<div>111</div>'
         const marker = new AMap.Marker({
+          zooms: [16, 20],
           position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
@@ -164,6 +166,7 @@
           })
         })
         marker.setLabel({
+          zooms: [16, 20],
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
           content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位

diff --git a/index.html b/index.html
index 8be7069..c801c4c 100644
--- a/index.html
+++ b/index.html
@@ -37,9 +37,4 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
-  <style type="text/css">
-    .amap-sug-result {
-      z-index: 2999!important;
-    }
-  </style>
 </html>
diff --git a/src/App.vue b/src/App.vue
index ec22623..5adc049 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -96,6 +96,8 @@
   document.body.style.setProperty('--g-sub-sidebar-menu-hover-color', '#008D68')
   document.body.style.setProperty('--color', '#008D68')
   document.body.style.setProperty('--el-button-hover-bg-color', '#41A877')
+  document.body.style.setProperty('--el-button-hover-border-color', '#41A877')
+  document.body.style.setProperty('--el-button-active-color', '#41A877')
 })
 </script>
 
@@ -110,3 +112,11 @@
     <system-info />
   </el-config-provider>
 </template>
+
+<style lang="scss">
+::v-deep .el-button {
+  &:hover {
+    background-color: #41a877 !important;
+  }
+}
+</style>
diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue
index d751989..8531d7a 100644
--- a/src/components/SelectLocationMap/map/index.vue
+++ b/src/components/SelectLocationMap/map/index.vue
@@ -21,7 +21,6 @@
 const AMap1 = ref()
 const remarkRef = ref()
 const placeSearchRef = ref()
-const searchList = ref()
 // 地图点击事件
 const clickHandler = function (e) {
   const location = [e.lnglat.getLng(), e.lnglat.getLat()]
@@ -67,7 +66,7 @@
         // city: "010", // 兴趣点城市
         citylimit: false, // 是否强制限制在设置的城市内搜索
         map: map.value, // 展现结果的地图实例
-        panel: 'info', // 结果列表将在此容器中进行展示。
+        panel: 'result', // 结果列表将在此容器中进行展示。
         autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
       })
       placeSearchRef.value = placeSearch
@@ -91,7 +90,9 @@
 const search = ref('')
 watch(() => search.value, (newVal) => {
   if (newVal) {
-    placeSearchRef.value.search(newVal)
+    placeSearchRef.value.search(newVal, (a, b) => {
+      console.log(a, b, 'assss')
+    })
   }
   else {
     placeSearchRef.value.clear()
@@ -112,7 +113,7 @@
         <el-input v-model="search" placeholder="请输入关键字" clearable />
       </div>
     </div>
-    <div id="info" />
+    <div id="result" />
   </div>
 </template>
 
@@ -121,11 +122,12 @@
   position: relative;
 }
 
-#info {
+#result {
   width: 270px;
   position: absolute;
   top: 34px;
   right: 0;
+  height: 100px;
 }
 
 #map {
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index f48e375..eb370a9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -100,6 +100,7 @@
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
         const marker = new AMap.Marker({
+          zooms: [16, 20],
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
@@ -140,6 +141,7 @@
         })
         // const content = '<div>111</div>'
         const marker = new AMap.Marker({
+          zooms: [16, 20],
           position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
@@ -164,6 +166,7 @@
           })
         })
         marker.setLabel({
+          zooms: [16, 20],
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
           content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
diff --git a/src/views/data/device/pageAdd.vue b/src/views/data/device/pageAdd.vue
index e311486..4892a7d 100644
--- a/src/views/data/device/pageAdd.vue
+++ b/src/views/data/device/pageAdd.vue
@@ -157,77 +157,63 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="120px">
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="设备名称:" prop="deviceName">
             <el-input v-model="areaForm.deviceName" :placeholder="dialogStatus === 'create' ? '请输入设备名称' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="areaForm.deviceType" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择设备类型' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select
+              v-model="areaForm.deviceType" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择设备类型' : ''"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="设备编号:" prop="deviceNo">
             <el-input v-model="areaForm.deviceNo" :placeholder="dialogStatus === 'create' ? '请输入设备编号' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="安装位置:" prop="installLocaltion">
             <el-input v-model="areaForm.installLocaltion" :placeholder="dialogStatus === 'create' ? '请输入安装位置' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="安装时间:" prop="installTime">
             <el-date-picker
-              v-model="areaForm.installTime"
-              type="datetime"
-              :placeholder="dialogStatus === 'create' ? '请选择安装时间' : ''"
-              style="width: 100%;"
+              v-model="areaForm.installTime" type="datetime"
+              :placeholder="dialogStatus === 'create' ? '请选择安装时间' : ''" style="width: 100%;"
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="所属分区" prop="ptn">
-            <el-select v-model="areaForm.ptn" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择所属分区' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in ptnList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select
+              v-model="areaForm.ptn" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择所属分区' : ''"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in ptnList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
-          <el-form-item label="状态" prop="stat">
-            <el-select v-model="areaForm.stat" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择状态' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in deviceStatusList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="设备状态" prop="stat">
+            <el-select
+              v-model="areaForm.stat" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择状态' : ''"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in deviceStatusList" :key="item.value" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -255,3 +241,4 @@
   width: 100%;
 }
 </style>
+

diff --git a/index.html b/index.html
index 8be7069..c801c4c 100644
--- a/index.html
+++ b/index.html
@@ -37,9 +37,4 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
-  <style type="text/css">
-    .amap-sug-result {
-      z-index: 2999!important;
-    }
-  </style>
 </html>
diff --git a/src/App.vue b/src/App.vue
index ec22623..5adc049 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -96,6 +96,8 @@
   document.body.style.setProperty('--g-sub-sidebar-menu-hover-color', '#008D68')
   document.body.style.setProperty('--color', '#008D68')
   document.body.style.setProperty('--el-button-hover-bg-color', '#41A877')
+  document.body.style.setProperty('--el-button-hover-border-color', '#41A877')
+  document.body.style.setProperty('--el-button-active-color', '#41A877')
 })
 </script>
 
@@ -110,3 +112,11 @@
     <system-info />
   </el-config-provider>
 </template>
+
+<style lang="scss">
+::v-deep .el-button {
+  &:hover {
+    background-color: #41a877 !important;
+  }
+}
+</style>
diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue
index d751989..8531d7a 100644
--- a/src/components/SelectLocationMap/map/index.vue
+++ b/src/components/SelectLocationMap/map/index.vue
@@ -21,7 +21,6 @@
 const AMap1 = ref()
 const remarkRef = ref()
 const placeSearchRef = ref()
-const searchList = ref()
 // 地图点击事件
 const clickHandler = function (e) {
   const location = [e.lnglat.getLng(), e.lnglat.getLat()]
@@ -67,7 +66,7 @@
         // city: "010", // 兴趣点城市
         citylimit: false, // 是否强制限制在设置的城市内搜索
         map: map.value, // 展现结果的地图实例
-        panel: 'info', // 结果列表将在此容器中进行展示。
+        panel: 'result', // 结果列表将在此容器中进行展示。
         autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
       })
       placeSearchRef.value = placeSearch
@@ -91,7 +90,9 @@
 const search = ref('')
 watch(() => search.value, (newVal) => {
   if (newVal) {
-    placeSearchRef.value.search(newVal)
+    placeSearchRef.value.search(newVal, (a, b) => {
+      console.log(a, b, 'assss')
+    })
   }
   else {
     placeSearchRef.value.clear()
@@ -112,7 +113,7 @@
         <el-input v-model="search" placeholder="请输入关键字" clearable />
       </div>
     </div>
-    <div id="info" />
+    <div id="result" />
   </div>
 </template>
 
@@ -121,11 +122,12 @@
   position: relative;
 }
 
-#info {
+#result {
   width: 270px;
   position: absolute;
   top: 34px;
   right: 0;
+  height: 100px;
 }
 
 #map {
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index f48e375..eb370a9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -100,6 +100,7 @@
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
         const marker = new AMap.Marker({
+          zooms: [16, 20],
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
@@ -140,6 +141,7 @@
         })
         // const content = '<div>111</div>'
         const marker = new AMap.Marker({
+          zooms: [16, 20],
           position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
@@ -164,6 +166,7 @@
           })
         })
         marker.setLabel({
+          zooms: [16, 20],
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
           content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
diff --git a/src/views/data/device/pageAdd.vue b/src/views/data/device/pageAdd.vue
index e311486..4892a7d 100644
--- a/src/views/data/device/pageAdd.vue
+++ b/src/views/data/device/pageAdd.vue
@@ -157,77 +157,63 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="120px">
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="设备名称:" prop="deviceName">
             <el-input v-model="areaForm.deviceName" :placeholder="dialogStatus === 'create' ? '请输入设备名称' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="areaForm.deviceType" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择设备类型' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select
+              v-model="areaForm.deviceType" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择设备类型' : ''"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="设备编号:" prop="deviceNo">
             <el-input v-model="areaForm.deviceNo" :placeholder="dialogStatus === 'create' ? '请输入设备编号' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="安装位置:" prop="installLocaltion">
             <el-input v-model="areaForm.installLocaltion" :placeholder="dialogStatus === 'create' ? '请输入安装位置' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="安装时间:" prop="installTime">
             <el-date-picker
-              v-model="areaForm.installTime"
-              type="datetime"
-              :placeholder="dialogStatus === 'create' ? '请选择安装时间' : ''"
-              style="width: 100%;"
+              v-model="areaForm.installTime" type="datetime"
+              :placeholder="dialogStatus === 'create' ? '请选择安装时间' : ''" style="width: 100%;"
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="所属分区" prop="ptn">
-            <el-select v-model="areaForm.ptn" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择所属分区' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in ptnList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select
+              v-model="areaForm.ptn" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择所属分区' : ''"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in ptnList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
-          <el-form-item label="状态" prop="stat">
-            <el-select v-model="areaForm.stat" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择状态' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in deviceStatusList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="设备状态" prop="stat">
+            <el-select
+              v-model="areaForm.stat" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择状态' : ''"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in deviceStatusList" :key="item.value" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -255,3 +241,4 @@
   width: 100%;
 }
 </style>
+
diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue
index 0450150..d3d46b8 100644
--- a/src/views/data/electricity/components/branchAdd.vue
+++ b/src/views/data/electricity/components/branchAdd.vue
@@ -182,15 +182,15 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="24">
           <el-form-item label="支路编号:" prop="branchNumber">
             <el-input v-model="areaForm.branchNumber" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路首端节点:" prop="fbusId">
             <el-select
               v-model="areaForm.fbusId" class="m-2"
@@ -200,9 +200,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路末端节点:" prop="tbusId">
             <!-- <el-input v-model="areaForm.tbusId" :placeholder="dialogStatus === 'create' ? '请输入支路末端节点' : ''" /> -->
             <el-select
@@ -214,72 +212,61 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路电阻标幺值:" prop="r">
             <el-input v-model="areaForm.r" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路电纳标幺值:" prop="b">
             <el-input v-model="areaForm.b" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="长距离输电容量:" prop="ratea">
             <el-input v-model="areaForm.ratea" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="短距离输电容量:" prop="rateb">
             <el-input v-model="areaForm.rateb" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="紧急距离输电容量:" prop="ratec">
             <el-input v-model="areaForm.ratec" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路变比:" prop="ratio">
             <el-input v-model="areaForm.ratio" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路相位角:" prop="angle">
             <el-input v-model="areaForm.angle" />
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路最小相位角:" prop="angmin">
             <el-input v-model="areaForm.angmin" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路最大相位角:" prop="angmax">
             <el-input v-model="areaForm.angmax" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路是否运行:" prop="status2">
             <el-select
               v-model="areaForm.status2" class="m-2"

diff --git a/index.html b/index.html
index 8be7069..c801c4c 100644
--- a/index.html
+++ b/index.html
@@ -37,9 +37,4 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
-  <style type="text/css">
-    .amap-sug-result {
-      z-index: 2999!important;
-    }
-  </style>
 </html>
diff --git a/src/App.vue b/src/App.vue
index ec22623..5adc049 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -96,6 +96,8 @@
   document.body.style.setProperty('--g-sub-sidebar-menu-hover-color', '#008D68')
   document.body.style.setProperty('--color', '#008D68')
   document.body.style.setProperty('--el-button-hover-bg-color', '#41A877')
+  document.body.style.setProperty('--el-button-hover-border-color', '#41A877')
+  document.body.style.setProperty('--el-button-active-color', '#41A877')
 })
 </script>
 
@@ -110,3 +112,11 @@
     <system-info />
   </el-config-provider>
 </template>
+
+<style lang="scss">
+::v-deep .el-button {
+  &:hover {
+    background-color: #41a877 !important;
+  }
+}
+</style>
diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue
index d751989..8531d7a 100644
--- a/src/components/SelectLocationMap/map/index.vue
+++ b/src/components/SelectLocationMap/map/index.vue
@@ -21,7 +21,6 @@
 const AMap1 = ref()
 const remarkRef = ref()
 const placeSearchRef = ref()
-const searchList = ref()
 // 地图点击事件
 const clickHandler = function (e) {
   const location = [e.lnglat.getLng(), e.lnglat.getLat()]
@@ -67,7 +66,7 @@
         // city: "010", // 兴趣点城市
         citylimit: false, // 是否强制限制在设置的城市内搜索
         map: map.value, // 展现结果的地图实例
-        panel: 'info', // 结果列表将在此容器中进行展示。
+        panel: 'result', // 结果列表将在此容器中进行展示。
         autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
       })
       placeSearchRef.value = placeSearch
@@ -91,7 +90,9 @@
 const search = ref('')
 watch(() => search.value, (newVal) => {
   if (newVal) {
-    placeSearchRef.value.search(newVal)
+    placeSearchRef.value.search(newVal, (a, b) => {
+      console.log(a, b, 'assss')
+    })
   }
   else {
     placeSearchRef.value.clear()
@@ -112,7 +113,7 @@
         <el-input v-model="search" placeholder="请输入关键字" clearable />
       </div>
     </div>
-    <div id="info" />
+    <div id="result" />
   </div>
 </template>
 
@@ -121,11 +122,12 @@
   position: relative;
 }
 
-#info {
+#result {
   width: 270px;
   position: absolute;
   top: 34px;
   right: 0;
+  height: 100px;
 }
 
 #map {
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index f48e375..eb370a9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -100,6 +100,7 @@
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
         const marker = new AMap.Marker({
+          zooms: [16, 20],
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
@@ -140,6 +141,7 @@
         })
         // const content = '<div>111</div>'
         const marker = new AMap.Marker({
+          zooms: [16, 20],
           position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
@@ -164,6 +166,7 @@
           })
         })
         marker.setLabel({
+          zooms: [16, 20],
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
           content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
diff --git a/src/views/data/device/pageAdd.vue b/src/views/data/device/pageAdd.vue
index e311486..4892a7d 100644
--- a/src/views/data/device/pageAdd.vue
+++ b/src/views/data/device/pageAdd.vue
@@ -157,77 +157,63 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="120px">
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="设备名称:" prop="deviceName">
             <el-input v-model="areaForm.deviceName" :placeholder="dialogStatus === 'create' ? '请输入设备名称' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="areaForm.deviceType" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择设备类型' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select
+              v-model="areaForm.deviceType" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择设备类型' : ''"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="设备编号:" prop="deviceNo">
             <el-input v-model="areaForm.deviceNo" :placeholder="dialogStatus === 'create' ? '请输入设备编号' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="安装位置:" prop="installLocaltion">
             <el-input v-model="areaForm.installLocaltion" :placeholder="dialogStatus === 'create' ? '请输入安装位置' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="安装时间:" prop="installTime">
             <el-date-picker
-              v-model="areaForm.installTime"
-              type="datetime"
-              :placeholder="dialogStatus === 'create' ? '请选择安装时间' : ''"
-              style="width: 100%;"
+              v-model="areaForm.installTime" type="datetime"
+              :placeholder="dialogStatus === 'create' ? '请选择安装时间' : ''" style="width: 100%;"
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="所属分区" prop="ptn">
-            <el-select v-model="areaForm.ptn" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择所属分区' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in ptnList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select
+              v-model="areaForm.ptn" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择所属分区' : ''"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in ptnList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
-          <el-form-item label="状态" prop="stat">
-            <el-select v-model="areaForm.stat" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择状态' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in deviceStatusList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="设备状态" prop="stat">
+            <el-select
+              v-model="areaForm.stat" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择状态' : ''"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in deviceStatusList" :key="item.value" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -255,3 +241,4 @@
   width: 100%;
 }
 </style>
+
diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue
index 0450150..d3d46b8 100644
--- a/src/views/data/electricity/components/branchAdd.vue
+++ b/src/views/data/electricity/components/branchAdd.vue
@@ -182,15 +182,15 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="24">
           <el-form-item label="支路编号:" prop="branchNumber">
             <el-input v-model="areaForm.branchNumber" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路首端节点:" prop="fbusId">
             <el-select
               v-model="areaForm.fbusId" class="m-2"
@@ -200,9 +200,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路末端节点:" prop="tbusId">
             <!-- <el-input v-model="areaForm.tbusId" :placeholder="dialogStatus === 'create' ? '请输入支路末端节点' : ''" /> -->
             <el-select
@@ -214,72 +212,61 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路电阻标幺值:" prop="r">
             <el-input v-model="areaForm.r" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路电纳标幺值:" prop="b">
             <el-input v-model="areaForm.b" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="长距离输电容量:" prop="ratea">
             <el-input v-model="areaForm.ratea" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="短距离输电容量:" prop="rateb">
             <el-input v-model="areaForm.rateb" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="紧急距离输电容量:" prop="ratec">
             <el-input v-model="areaForm.ratec" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路变比:" prop="ratio">
             <el-input v-model="areaForm.ratio" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路相位角:" prop="angle">
             <el-input v-model="areaForm.angle" />
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路最小相位角:" prop="angmin">
             <el-input v-model="areaForm.angmin" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路最大相位角:" prop="angmax">
             <el-input v-model="areaForm.angmax" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路是否运行:" prop="status2">
             <el-select
               v-model="areaForm.status2" class="m-2"
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 6a69406..064040c 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -233,111 +233,87 @@
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <select-location-map ref="selectRef" @confirm="confirm" />
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
-      <el-col :span="20">
-        <el-form-item label="节点类型:" prop="type">
-          <el-select v-model="areaForm.type" class="m-2" style="width: 100%;">
-            <el-option v-for="item in nodeTypeList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="节点名称:" prop="nodeName">
+            <el-input v-model="areaForm.nodeName" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="节点编号:" prop="busId">
             <el-input v-model="areaForm.busId" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
-          <el-form-item label="节点名称:" prop="nodeName">
-            <el-input v-model="areaForm.nodeName" />
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="节点类型:" prop="type">
+            <el-select v-model="areaForm.type" class="m-2" style="width: 100%;">
+              <el-option v-for="item in nodeTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <!-- <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="节点经度:" prop="lng">
-            <el-input v-model="areaForm.lng" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="节点纬度:" prop="lat">
-            <el-input v-model="areaForm.lat" />
-          </el-form-item>
-        </el-col>
-      </el-row> -->
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点经纬度:" prop="lng">
             <el-input v-model="locationDataStr" @focus="selectLocation" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="节点并联电导:" prop="gs">
             <el-input v-model="areaForm.gs" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点并联电纳:" prop="bs">
             <el-input v-model="areaForm.bs" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="母线断面号:" prop="area">
             <el-input v-model="areaForm.area" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点电压初始幅值:" prop="vm">
             <el-input v-model="areaForm.vm" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="节点电压初始相位角:" prop="va">
             <el-input v-model="areaForm.va" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="母线省损耗区域:" prop="zone">
             <el-input v-model="areaForm.zone" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="节点最大电压:" prop="vmax">
             <el-input v-model="areaForm.vmax" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点最小电压:" prop="vmin">
             <el-input v-model="areaForm.vmin" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="负荷有功功率:" prop="pd">
             <el-input v-model="areaForm.pd" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="负荷无功功率:" prop="qd">
             <el-input v-model="areaForm.qd" />
           </el-form-item>

diff --git a/index.html b/index.html
index 8be7069..c801c4c 100644
--- a/index.html
+++ b/index.html
@@ -37,9 +37,4 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
-  <style type="text/css">
-    .amap-sug-result {
-      z-index: 2999!important;
-    }
-  </style>
 </html>
diff --git a/src/App.vue b/src/App.vue
index ec22623..5adc049 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -96,6 +96,8 @@
   document.body.style.setProperty('--g-sub-sidebar-menu-hover-color', '#008D68')
   document.body.style.setProperty('--color', '#008D68')
   document.body.style.setProperty('--el-button-hover-bg-color', '#41A877')
+  document.body.style.setProperty('--el-button-hover-border-color', '#41A877')
+  document.body.style.setProperty('--el-button-active-color', '#41A877')
 })
 </script>
 
@@ -110,3 +112,11 @@
     <system-info />
   </el-config-provider>
 </template>
+
+<style lang="scss">
+::v-deep .el-button {
+  &:hover {
+    background-color: #41a877 !important;
+  }
+}
+</style>
diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue
index d751989..8531d7a 100644
--- a/src/components/SelectLocationMap/map/index.vue
+++ b/src/components/SelectLocationMap/map/index.vue
@@ -21,7 +21,6 @@
 const AMap1 = ref()
 const remarkRef = ref()
 const placeSearchRef = ref()
-const searchList = ref()
 // 地图点击事件
 const clickHandler = function (e) {
   const location = [e.lnglat.getLng(), e.lnglat.getLat()]
@@ -67,7 +66,7 @@
         // city: "010", // 兴趣点城市
         citylimit: false, // 是否强制限制在设置的城市内搜索
         map: map.value, // 展现结果的地图实例
-        panel: 'info', // 结果列表将在此容器中进行展示。
+        panel: 'result', // 结果列表将在此容器中进行展示。
         autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
       })
       placeSearchRef.value = placeSearch
@@ -91,7 +90,9 @@
 const search = ref('')
 watch(() => search.value, (newVal) => {
   if (newVal) {
-    placeSearchRef.value.search(newVal)
+    placeSearchRef.value.search(newVal, (a, b) => {
+      console.log(a, b, 'assss')
+    })
   }
   else {
     placeSearchRef.value.clear()
@@ -112,7 +113,7 @@
         <el-input v-model="search" placeholder="请输入关键字" clearable />
       </div>
     </div>
-    <div id="info" />
+    <div id="result" />
   </div>
 </template>
 
@@ -121,11 +122,12 @@
   position: relative;
 }
 
-#info {
+#result {
   width: 270px;
   position: absolute;
   top: 34px;
   right: 0;
+  height: 100px;
 }
 
 #map {
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index f48e375..eb370a9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -100,6 +100,7 @@
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
         const marker = new AMap.Marker({
+          zooms: [16, 20],
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
@@ -140,6 +141,7 @@
         })
         // const content = '<div>111</div>'
         const marker = new AMap.Marker({
+          zooms: [16, 20],
           position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
@@ -164,6 +166,7 @@
           })
         })
         marker.setLabel({
+          zooms: [16, 20],
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
           content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
diff --git a/src/views/data/device/pageAdd.vue b/src/views/data/device/pageAdd.vue
index e311486..4892a7d 100644
--- a/src/views/data/device/pageAdd.vue
+++ b/src/views/data/device/pageAdd.vue
@@ -157,77 +157,63 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="120px">
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="设备名称:" prop="deviceName">
             <el-input v-model="areaForm.deviceName" :placeholder="dialogStatus === 'create' ? '请输入设备名称' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="areaForm.deviceType" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择设备类型' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select
+              v-model="areaForm.deviceType" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择设备类型' : ''"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="设备编号:" prop="deviceNo">
             <el-input v-model="areaForm.deviceNo" :placeholder="dialogStatus === 'create' ? '请输入设备编号' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="安装位置:" prop="installLocaltion">
             <el-input v-model="areaForm.installLocaltion" :placeholder="dialogStatus === 'create' ? '请输入安装位置' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="安装时间:" prop="installTime">
             <el-date-picker
-              v-model="areaForm.installTime"
-              type="datetime"
-              :placeholder="dialogStatus === 'create' ? '请选择安装时间' : ''"
-              style="width: 100%;"
+              v-model="areaForm.installTime" type="datetime"
+              :placeholder="dialogStatus === 'create' ? '请选择安装时间' : ''" style="width: 100%;"
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="所属分区" prop="ptn">
-            <el-select v-model="areaForm.ptn" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择所属分区' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in ptnList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select
+              v-model="areaForm.ptn" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择所属分区' : ''"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in ptnList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
-          <el-form-item label="状态" prop="stat">
-            <el-select v-model="areaForm.stat" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择状态' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in deviceStatusList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="设备状态" prop="stat">
+            <el-select
+              v-model="areaForm.stat" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择状态' : ''"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in deviceStatusList" :key="item.value" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -255,3 +241,4 @@
   width: 100%;
 }
 </style>
+
diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue
index 0450150..d3d46b8 100644
--- a/src/views/data/electricity/components/branchAdd.vue
+++ b/src/views/data/electricity/components/branchAdd.vue
@@ -182,15 +182,15 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="24">
           <el-form-item label="支路编号:" prop="branchNumber">
             <el-input v-model="areaForm.branchNumber" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路首端节点:" prop="fbusId">
             <el-select
               v-model="areaForm.fbusId" class="m-2"
@@ -200,9 +200,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路末端节点:" prop="tbusId">
             <!-- <el-input v-model="areaForm.tbusId" :placeholder="dialogStatus === 'create' ? '请输入支路末端节点' : ''" /> -->
             <el-select
@@ -214,72 +212,61 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路电阻标幺值:" prop="r">
             <el-input v-model="areaForm.r" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路电纳标幺值:" prop="b">
             <el-input v-model="areaForm.b" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="长距离输电容量:" prop="ratea">
             <el-input v-model="areaForm.ratea" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="短距离输电容量:" prop="rateb">
             <el-input v-model="areaForm.rateb" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="紧急距离输电容量:" prop="ratec">
             <el-input v-model="areaForm.ratec" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路变比:" prop="ratio">
             <el-input v-model="areaForm.ratio" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路相位角:" prop="angle">
             <el-input v-model="areaForm.angle" />
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路最小相位角:" prop="angmin">
             <el-input v-model="areaForm.angmin" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路最大相位角:" prop="angmax">
             <el-input v-model="areaForm.angmax" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路是否运行:" prop="status2">
             <el-select
               v-model="areaForm.status2" class="m-2"
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 6a69406..064040c 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -233,111 +233,87 @@
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <select-location-map ref="selectRef" @confirm="confirm" />
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
-      <el-col :span="20">
-        <el-form-item label="节点类型:" prop="type">
-          <el-select v-model="areaForm.type" class="m-2" style="width: 100%;">
-            <el-option v-for="item in nodeTypeList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="节点名称:" prop="nodeName">
+            <el-input v-model="areaForm.nodeName" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="节点编号:" prop="busId">
             <el-input v-model="areaForm.busId" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
-          <el-form-item label="节点名称:" prop="nodeName">
-            <el-input v-model="areaForm.nodeName" />
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="节点类型:" prop="type">
+            <el-select v-model="areaForm.type" class="m-2" style="width: 100%;">
+              <el-option v-for="item in nodeTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <!-- <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="节点经度:" prop="lng">
-            <el-input v-model="areaForm.lng" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="节点纬度:" prop="lat">
-            <el-input v-model="areaForm.lat" />
-          </el-form-item>
-        </el-col>
-      </el-row> -->
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点经纬度:" prop="lng">
             <el-input v-model="locationDataStr" @focus="selectLocation" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="节点并联电导:" prop="gs">
             <el-input v-model="areaForm.gs" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点并联电纳:" prop="bs">
             <el-input v-model="areaForm.bs" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="母线断面号:" prop="area">
             <el-input v-model="areaForm.area" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点电压初始幅值:" prop="vm">
             <el-input v-model="areaForm.vm" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="节点电压初始相位角:" prop="va">
             <el-input v-model="areaForm.va" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="母线省损耗区域:" prop="zone">
             <el-input v-model="areaForm.zone" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="节点最大电压:" prop="vmax">
             <el-input v-model="areaForm.vmax" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点最小电压:" prop="vmin">
             <el-input v-model="areaForm.vmin" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="负荷有功功率:" prop="pd">
             <el-input v-model="areaForm.pd" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="负荷无功功率:" prop="qd">
             <el-input v-model="areaForm.qd" />
           </el-form-item>
diff --git a/src/views/data/electricity/networkAdd.vue b/src/views/data/electricity/networkAdd.vue
index 1d6e914..b712b23 100644
--- a/src/views/data/electricity/networkAdd.vue
+++ b/src/views/data/electricity/networkAdd.vue
@@ -159,43 +159,37 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="140px">
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="配电网名称:" prop="electricityName">
             <el-input v-model="areaForm.electricityName" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="基准功率:" prop="basePower">
             <el-input v-model="areaForm.basePower" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="系统节点数:" prop="codeNum">
             <el-input v-model="areaForm.codeNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="发电机数:" prop="genNum">
             <el-input v-model="areaForm.genNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="系统负荷数:" prop="loadNum">
             <el-input v-model="areaForm.loadNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点之间支路数:" prop="branchNum">
             <el-input v-model="areaForm.branchNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>

diff --git a/index.html b/index.html
index 8be7069..c801c4c 100644
--- a/index.html
+++ b/index.html
@@ -37,9 +37,4 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
-  <style type="text/css">
-    .amap-sug-result {
-      z-index: 2999!important;
-    }
-  </style>
 </html>
diff --git a/src/App.vue b/src/App.vue
index ec22623..5adc049 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -96,6 +96,8 @@
   document.body.style.setProperty('--g-sub-sidebar-menu-hover-color', '#008D68')
   document.body.style.setProperty('--color', '#008D68')
   document.body.style.setProperty('--el-button-hover-bg-color', '#41A877')
+  document.body.style.setProperty('--el-button-hover-border-color', '#41A877')
+  document.body.style.setProperty('--el-button-active-color', '#41A877')
 })
 </script>
 
@@ -110,3 +112,11 @@
     <system-info />
   </el-config-provider>
 </template>
+
+<style lang="scss">
+::v-deep .el-button {
+  &:hover {
+    background-color: #41a877 !important;
+  }
+}
+</style>
diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue
index d751989..8531d7a 100644
--- a/src/components/SelectLocationMap/map/index.vue
+++ b/src/components/SelectLocationMap/map/index.vue
@@ -21,7 +21,6 @@
 const AMap1 = ref()
 const remarkRef = ref()
 const placeSearchRef = ref()
-const searchList = ref()
 // 地图点击事件
 const clickHandler = function (e) {
   const location = [e.lnglat.getLng(), e.lnglat.getLat()]
@@ -67,7 +66,7 @@
         // city: "010", // 兴趣点城市
         citylimit: false, // 是否强制限制在设置的城市内搜索
         map: map.value, // 展现结果的地图实例
-        panel: 'info', // 结果列表将在此容器中进行展示。
+        panel: 'result', // 结果列表将在此容器中进行展示。
         autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
       })
       placeSearchRef.value = placeSearch
@@ -91,7 +90,9 @@
 const search = ref('')
 watch(() => search.value, (newVal) => {
   if (newVal) {
-    placeSearchRef.value.search(newVal)
+    placeSearchRef.value.search(newVal, (a, b) => {
+      console.log(a, b, 'assss')
+    })
   }
   else {
     placeSearchRef.value.clear()
@@ -112,7 +113,7 @@
         <el-input v-model="search" placeholder="请输入关键字" clearable />
       </div>
     </div>
-    <div id="info" />
+    <div id="result" />
   </div>
 </template>
 
@@ -121,11 +122,12 @@
   position: relative;
 }
 
-#info {
+#result {
   width: 270px;
   position: absolute;
   top: 34px;
   right: 0;
+  height: 100px;
 }
 
 #map {
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index f48e375..eb370a9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -100,6 +100,7 @@
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
         const marker = new AMap.Marker({
+          zooms: [16, 20],
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
@@ -140,6 +141,7 @@
         })
         // const content = '<div>111</div>'
         const marker = new AMap.Marker({
+          zooms: [16, 20],
           position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
@@ -164,6 +166,7 @@
           })
         })
         marker.setLabel({
+          zooms: [16, 20],
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
           content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
diff --git a/src/views/data/device/pageAdd.vue b/src/views/data/device/pageAdd.vue
index e311486..4892a7d 100644
--- a/src/views/data/device/pageAdd.vue
+++ b/src/views/data/device/pageAdd.vue
@@ -157,77 +157,63 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="120px">
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="设备名称:" prop="deviceName">
             <el-input v-model="areaForm.deviceName" :placeholder="dialogStatus === 'create' ? '请输入设备名称' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="areaForm.deviceType" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择设备类型' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select
+              v-model="areaForm.deviceType" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择设备类型' : ''"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="设备编号:" prop="deviceNo">
             <el-input v-model="areaForm.deviceNo" :placeholder="dialogStatus === 'create' ? '请输入设备编号' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="安装位置:" prop="installLocaltion">
             <el-input v-model="areaForm.installLocaltion" :placeholder="dialogStatus === 'create' ? '请输入安装位置' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="安装时间:" prop="installTime">
             <el-date-picker
-              v-model="areaForm.installTime"
-              type="datetime"
-              :placeholder="dialogStatus === 'create' ? '请选择安装时间' : ''"
-              style="width: 100%;"
+              v-model="areaForm.installTime" type="datetime"
+              :placeholder="dialogStatus === 'create' ? '请选择安装时间' : ''" style="width: 100%;"
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="所属分区" prop="ptn">
-            <el-select v-model="areaForm.ptn" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择所属分区' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in ptnList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select
+              v-model="areaForm.ptn" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择所属分区' : ''"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in ptnList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
-          <el-form-item label="状态" prop="stat">
-            <el-select v-model="areaForm.stat" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择状态' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in deviceStatusList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="设备状态" prop="stat">
+            <el-select
+              v-model="areaForm.stat" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择状态' : ''"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in deviceStatusList" :key="item.value" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -255,3 +241,4 @@
   width: 100%;
 }
 </style>
+
diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue
index 0450150..d3d46b8 100644
--- a/src/views/data/electricity/components/branchAdd.vue
+++ b/src/views/data/electricity/components/branchAdd.vue
@@ -182,15 +182,15 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="24">
           <el-form-item label="支路编号:" prop="branchNumber">
             <el-input v-model="areaForm.branchNumber" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路首端节点:" prop="fbusId">
             <el-select
               v-model="areaForm.fbusId" class="m-2"
@@ -200,9 +200,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路末端节点:" prop="tbusId">
             <!-- <el-input v-model="areaForm.tbusId" :placeholder="dialogStatus === 'create' ? '请输入支路末端节点' : ''" /> -->
             <el-select
@@ -214,72 +212,61 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路电阻标幺值:" prop="r">
             <el-input v-model="areaForm.r" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路电纳标幺值:" prop="b">
             <el-input v-model="areaForm.b" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="长距离输电容量:" prop="ratea">
             <el-input v-model="areaForm.ratea" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="短距离输电容量:" prop="rateb">
             <el-input v-model="areaForm.rateb" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="紧急距离输电容量:" prop="ratec">
             <el-input v-model="areaForm.ratec" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路变比:" prop="ratio">
             <el-input v-model="areaForm.ratio" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路相位角:" prop="angle">
             <el-input v-model="areaForm.angle" />
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路最小相位角:" prop="angmin">
             <el-input v-model="areaForm.angmin" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路最大相位角:" prop="angmax">
             <el-input v-model="areaForm.angmax" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路是否运行:" prop="status2">
             <el-select
               v-model="areaForm.status2" class="m-2"
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 6a69406..064040c 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -233,111 +233,87 @@
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <select-location-map ref="selectRef" @confirm="confirm" />
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
-      <el-col :span="20">
-        <el-form-item label="节点类型:" prop="type">
-          <el-select v-model="areaForm.type" class="m-2" style="width: 100%;">
-            <el-option v-for="item in nodeTypeList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="节点名称:" prop="nodeName">
+            <el-input v-model="areaForm.nodeName" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="节点编号:" prop="busId">
             <el-input v-model="areaForm.busId" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
-          <el-form-item label="节点名称:" prop="nodeName">
-            <el-input v-model="areaForm.nodeName" />
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="节点类型:" prop="type">
+            <el-select v-model="areaForm.type" class="m-2" style="width: 100%;">
+              <el-option v-for="item in nodeTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <!-- <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="节点经度:" prop="lng">
-            <el-input v-model="areaForm.lng" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="节点纬度:" prop="lat">
-            <el-input v-model="areaForm.lat" />
-          </el-form-item>
-        </el-col>
-      </el-row> -->
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点经纬度:" prop="lng">
             <el-input v-model="locationDataStr" @focus="selectLocation" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="节点并联电导:" prop="gs">
             <el-input v-model="areaForm.gs" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点并联电纳:" prop="bs">
             <el-input v-model="areaForm.bs" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="母线断面号:" prop="area">
             <el-input v-model="areaForm.area" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点电压初始幅值:" prop="vm">
             <el-input v-model="areaForm.vm" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="节点电压初始相位角:" prop="va">
             <el-input v-model="areaForm.va" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="母线省损耗区域:" prop="zone">
             <el-input v-model="areaForm.zone" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="节点最大电压:" prop="vmax">
             <el-input v-model="areaForm.vmax" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点最小电压:" prop="vmin">
             <el-input v-model="areaForm.vmin" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="负荷有功功率:" prop="pd">
             <el-input v-model="areaForm.pd" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="负荷无功功率:" prop="qd">
             <el-input v-model="areaForm.qd" />
           </el-form-item>
diff --git a/src/views/data/electricity/networkAdd.vue b/src/views/data/electricity/networkAdd.vue
index 1d6e914..b712b23 100644
--- a/src/views/data/electricity/networkAdd.vue
+++ b/src/views/data/electricity/networkAdd.vue
@@ -159,43 +159,37 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="140px">
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="配电网名称:" prop="electricityName">
             <el-input v-model="areaForm.electricityName" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="基准功率:" prop="basePower">
             <el-input v-model="areaForm.basePower" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="系统节点数:" prop="codeNum">
             <el-input v-model="areaForm.codeNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="发电机数:" prop="genNum">
             <el-input v-model="areaForm.genNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="系统负荷数:" prop="loadNum">
             <el-input v-model="areaForm.loadNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点之间支路数:" prop="branchNum">
             <el-input v-model="areaForm.branchNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
diff --git a/src/views/data/electricity/pageAdd.vue b/src/views/data/electricity/pageAdd.vue
index f3616c1..4efc62d 100644
--- a/src/views/data/electricity/pageAdd.vue
+++ b/src/views/data/electricity/pageAdd.vue
@@ -173,15 +173,13 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="名称:" prop="stationName">
             <el-input v-model="areaForm.stationName" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="设备列表:" prop="deviceId">
             <el-select
               v-model="areaForm.deviceId" class="m-2"
@@ -192,57 +190,49 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
-          <el-form-item label="发电机组对应节点数:" prop="nodeId">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="对应节点数:" prop="nodeId">
             <el-input v-model="areaForm.nodeId" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="发电机有功/MW:" prop="pg">
             <el-input v-model="areaForm.pg" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="发电机无功:" prop="qg">
             <el-input v-model="areaForm.qg" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="最大无功:" prop="qmax">
             <el-input v-model="areaForm.qmax" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="最小无功:" prop="qmin">
             <el-input v-model="areaForm.qmin" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点电压:" prop="vg">
             <el-input v-model="areaForm.vg" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="发电机容量:" prop="mbase">
             <el-input v-model="areaForm.mbase" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="运行状态:" prop="status">
             <el-select
               v-model="areaForm.status" class="m-2"
@@ -253,54 +243,24 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="最大有功:" prop="pmax">
             <el-input v-model="areaForm.pmax" :placeholder="dialogStatus === 'create' ? '请输入最大有功' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="最小有功:" prop="pmin">
             <el-input v-model="areaForm.pmin" :placeholder="dialogStatus === 'create' ? '请输入最小有功' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <!-- <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="碳排强度:" prop="strength">
             <el-input v-model="areaForm.strength" :placeholder="dialogStatus === 'create' ? '请输入碳排强度' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <!-- <el-row :gutter="20">
-        <el-col :span="20">
-          <el-form-item label="设备列表" prop="deviceId">
-            <el-select v-model="areaForm.deviceId" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择设备' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in deviceList"
-                :key="item.id"
-                :label="item.deviceName"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
-          <el-form-item label="电量/V:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入电量/V' : ''" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
-          <el-form-item label="功率/W:" prop="power">
-            <el-input v-model="areaForm.power" :placeholder="dialogStatus === 'create' ? '请输入功率/W' : ''" />
-          </el-form-item>
-        </el-col>
       </el-row> -->
     </el-form>
     <template #footer>

diff --git a/index.html b/index.html
index 8be7069..c801c4c 100644
--- a/index.html
+++ b/index.html
@@ -37,9 +37,4 @@
     <script type="module" src="/src/main.ts"></script>
     <%- devtoolScript %>
   </body>
-  <style type="text/css">
-    .amap-sug-result {
-      z-index: 2999!important;
-    }
-  </style>
 </html>
diff --git a/src/App.vue b/src/App.vue
index ec22623..5adc049 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -96,6 +96,8 @@
   document.body.style.setProperty('--g-sub-sidebar-menu-hover-color', '#008D68')
   document.body.style.setProperty('--color', '#008D68')
   document.body.style.setProperty('--el-button-hover-bg-color', '#41A877')
+  document.body.style.setProperty('--el-button-hover-border-color', '#41A877')
+  document.body.style.setProperty('--el-button-active-color', '#41A877')
 })
 </script>
 
@@ -110,3 +112,11 @@
     <system-info />
   </el-config-provider>
 </template>
+
+<style lang="scss">
+::v-deep .el-button {
+  &:hover {
+    background-color: #41a877 !important;
+  }
+}
+</style>
diff --git a/src/components/SelectLocationMap/map/index.vue b/src/components/SelectLocationMap/map/index.vue
index d751989..8531d7a 100644
--- a/src/components/SelectLocationMap/map/index.vue
+++ b/src/components/SelectLocationMap/map/index.vue
@@ -21,7 +21,6 @@
 const AMap1 = ref()
 const remarkRef = ref()
 const placeSearchRef = ref()
-const searchList = ref()
 // 地图点击事件
 const clickHandler = function (e) {
   const location = [e.lnglat.getLng(), e.lnglat.getLat()]
@@ -67,7 +66,7 @@
         // city: "010", // 兴趣点城市
         citylimit: false, // 是否强制限制在设置的城市内搜索
         map: map.value, // 展现结果的地图实例
-        panel: 'info', // 结果列表将在此容器中进行展示。
+        panel: 'result', // 结果列表将在此容器中进行展示。
         autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
       })
       placeSearchRef.value = placeSearch
@@ -91,7 +90,9 @@
 const search = ref('')
 watch(() => search.value, (newVal) => {
   if (newVal) {
-    placeSearchRef.value.search(newVal)
+    placeSearchRef.value.search(newVal, (a, b) => {
+      console.log(a, b, 'assss')
+    })
   }
   else {
     placeSearchRef.value.clear()
@@ -112,7 +113,7 @@
         <el-input v-model="search" placeholder="请输入关键字" clearable />
       </div>
     </div>
-    <div id="info" />
+    <div id="result" />
   </div>
 </template>
 
@@ -121,11 +122,12 @@
   position: relative;
 }
 
-#info {
+#result {
   width: 270px;
   position: absolute;
   top: 34px;
   right: 0;
+  height: 100px;
 }
 
 #map {
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index f48e375..eb370a9 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -100,6 +100,7 @@
           imageOffset: new AMap.Pixel(0, 0), // 图像相对展示区域的偏移量，适于雪碧图等
         })
         const marker = new AMap.Marker({
+          zooms: [16, 20],
           position: markerArr.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
@@ -140,6 +141,7 @@
         })
         // const content = '<div>111</div>'
         const marker = new AMap.Marker({
+          zooms: [16, 20],
           position: markerArr1.value[i], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
           map: map.value,
           title: '测试坐标',
@@ -164,6 +166,7 @@
           })
         })
         marker.setLabel({
+          zooms: [16, 20],
           offset: new AMap.Pixel(-10, -2), // 设置文本标注偏移量
           content: `<div>${markerArrInfo1.value[i].stationName}</div>`, // 设置文本标注内容
           direction: 'right', // 设置文本标注方位
diff --git a/src/views/data/device/pageAdd.vue b/src/views/data/device/pageAdd.vue
index e311486..4892a7d 100644
--- a/src/views/data/device/pageAdd.vue
+++ b/src/views/data/device/pageAdd.vue
@@ -157,77 +157,63 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="120px">
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="设备名称:" prop="deviceName">
             <el-input v-model="areaForm.deviceName" :placeholder="dialogStatus === 'create' ? '请输入设备名称' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="areaForm.deviceType" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择设备类型' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select
+              v-model="areaForm.deviceType" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择设备类型' : ''"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in deviceTypeList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="设备编号:" prop="deviceNo">
             <el-input v-model="areaForm.deviceNo" :placeholder="dialogStatus === 'create' ? '请输入设备编号' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="安装位置:" prop="installLocaltion">
             <el-input v-model="areaForm.installLocaltion" :placeholder="dialogStatus === 'create' ? '请输入安装位置' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="安装时间:" prop="installTime">
             <el-date-picker
-              v-model="areaForm.installTime"
-              type="datetime"
-              :placeholder="dialogStatus === 'create' ? '请选择安装时间' : ''"
-              style="width: 100%;"
+              v-model="areaForm.installTime" type="datetime"
+              :placeholder="dialogStatus === 'create' ? '请选择安装时间' : ''" style="width: 100%;"
             />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="所属分区" prop="ptn">
-            <el-select v-model="areaForm.ptn" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择所属分区' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in ptnList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.value"
-              />
+            <el-select
+              v-model="areaForm.ptn" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择所属分区' : ''"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in ptnList" :key="item.id" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
-          <el-form-item label="状态" prop="stat">
-            <el-select v-model="areaForm.stat" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择状态' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in deviceStatusList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"
-              />
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="设备状态" prop="stat">
+            <el-select
+              v-model="areaForm.stat" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择状态' : ''"
+              style="width: 100%;"
+            >
+              <el-option v-for="item in deviceStatusList" :key="item.value" :label="item.name" :value="item.value" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -255,3 +241,4 @@
   width: 100%;
 }
 </style>
+
diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue
index 0450150..d3d46b8 100644
--- a/src/views/data/electricity/components/branchAdd.vue
+++ b/src/views/data/electricity/components/branchAdd.vue
@@ -182,15 +182,15 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="24">
           <el-form-item label="支路编号:" prop="branchNumber">
             <el-input v-model="areaForm.branchNumber" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路首端节点:" prop="fbusId">
             <el-select
               v-model="areaForm.fbusId" class="m-2"
@@ -200,9 +200,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路末端节点:" prop="tbusId">
             <!-- <el-input v-model="areaForm.tbusId" :placeholder="dialogStatus === 'create' ? '请输入支路末端节点' : ''" /> -->
             <el-select
@@ -214,72 +212,61 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路电阻标幺值:" prop="r">
             <el-input v-model="areaForm.r" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路电纳标幺值:" prop="b">
             <el-input v-model="areaForm.b" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="长距离输电容量:" prop="ratea">
             <el-input v-model="areaForm.ratea" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="短距离输电容量:" prop="rateb">
             <el-input v-model="areaForm.rateb" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="紧急距离输电容量:" prop="ratec">
             <el-input v-model="areaForm.ratec" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路变比:" prop="ratio">
             <el-input v-model="areaForm.ratio" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路相位角:" prop="angle">
             <el-input v-model="areaForm.angle" />
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路最小相位角:" prop="angmin">
             <el-input v-model="areaForm.angmin" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="支路最大相位角:" prop="angmax">
             <el-input v-model="areaForm.angmax" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="支路是否运行:" prop="status2">
             <el-select
               v-model="areaForm.status2" class="m-2"
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index 6a69406..064040c 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -233,111 +233,87 @@
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <select-location-map ref="selectRef" @confirm="confirm" />
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
-      <el-col :span="20">
-        <el-form-item label="节点类型:" prop="type">
-          <el-select v-model="areaForm.type" class="m-2" style="width: 100%;">
-            <el-option v-for="item in nodeTypeList" :key="item.id" :label="item.name" :value="item.value" />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="节点名称:" prop="nodeName">
+            <el-input v-model="areaForm.nodeName" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
           <el-form-item label="节点编号:" prop="busId">
             <el-input v-model="areaForm.busId" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
-          <el-form-item label="节点名称:" prop="nodeName">
-            <el-input v-model="areaForm.nodeName" />
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="节点类型:" prop="type">
+            <el-select v-model="areaForm.type" class="m-2" style="width: 100%;">
+              <el-option v-for="item in nodeTypeList" :key="item.id" :label="item.name" :value="item.value" />
+            </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-      <!-- <el-row :gutter="20">
-        <el-col :span="10">
-          <el-form-item label="节点经度:" prop="lng">
-            <el-input v-model="areaForm.lng" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="节点纬度:" prop="lat">
-            <el-input v-model="areaForm.lat" />
-          </el-form-item>
-        </el-col>
-      </el-row> -->
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点经纬度:" prop="lng">
             <el-input v-model="locationDataStr" @focus="selectLocation" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="节点并联电导:" prop="gs">
             <el-input v-model="areaForm.gs" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点并联电纳:" prop="bs">
             <el-input v-model="areaForm.bs" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="母线断面号:" prop="area">
             <el-input v-model="areaForm.area" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点电压初始幅值:" prop="vm">
             <el-input v-model="areaForm.vm" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="节点电压初始相位角:" prop="va">
             <el-input v-model="areaForm.va" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="母线省损耗区域:" prop="zone">
             <el-input v-model="areaForm.zone" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="节点最大电压:" prop="vmax">
             <el-input v-model="areaForm.vmax" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点最小电压:" prop="vmin">
             <el-input v-model="areaForm.vmin" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="负荷有功功率:" prop="pd">
             <el-input v-model="areaForm.pd" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="负荷无功功率:" prop="qd">
             <el-input v-model="areaForm.qd" />
           </el-form-item>
diff --git a/src/views/data/electricity/networkAdd.vue b/src/views/data/electricity/networkAdd.vue
index 1d6e914..b712b23 100644
--- a/src/views/data/electricity/networkAdd.vue
+++ b/src/views/data/electricity/networkAdd.vue
@@ -159,43 +159,37 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="140px">
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="配电网名称:" prop="electricityName">
             <el-input v-model="areaForm.electricityName" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="基准功率:" prop="basePower">
             <el-input v-model="areaForm.basePower" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="系统节点数:" prop="codeNum">
             <el-input v-model="areaForm.codeNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="发电机数:" prop="genNum">
             <el-input v-model="areaForm.genNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="系统负荷数:" prop="loadNum">
             <el-input v-model="areaForm.loadNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点之间支路数:" prop="branchNum">
             <el-input v-model="areaForm.branchNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
diff --git a/src/views/data/electricity/pageAdd.vue b/src/views/data/electricity/pageAdd.vue
index f3616c1..4efc62d 100644
--- a/src/views/data/electricity/pageAdd.vue
+++ b/src/views/data/electricity/pageAdd.vue
@@ -173,15 +173,13 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="160px">
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="名称:" prop="stationName">
             <el-input v-model="areaForm.stationName" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="设备列表:" prop="deviceId">
             <el-select
               v-model="areaForm.deviceId" class="m-2"
@@ -192,57 +190,49 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
-          <el-form-item label="发电机组对应节点数:" prop="nodeId">
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="对应节点数:" prop="nodeId">
             <el-input v-model="areaForm.nodeId" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="发电机有功/MW:" prop="pg">
             <el-input v-model="areaForm.pg" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="发电机无功:" prop="qg">
             <el-input v-model="areaForm.qg" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="最大无功:" prop="qmax">
             <el-input v-model="areaForm.qmax" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="最小无功:" prop="qmin">
             <el-input v-model="areaForm.qmin" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="节点电压:" prop="vg">
             <el-input v-model="areaForm.vg" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="发电机容量:" prop="mbase">
             <el-input v-model="areaForm.mbase" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="运行状态:" prop="status">
             <el-select
               v-model="areaForm.status" class="m-2"
@@ -253,54 +243,24 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="最大有功:" prop="pmax">
             <el-input v-model="areaForm.pmax" :placeholder="dialogStatus === 'create' ? '请输入最大有功' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="最小有功:" prop="pmin">
             <el-input v-model="areaForm.pmin" :placeholder="dialogStatus === 'create' ? '请输入最小有功' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <!-- <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="碳排强度:" prop="strength">
             <el-input v-model="areaForm.strength" :placeholder="dialogStatus === 'create' ? '请输入碳排强度' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <!-- <el-row :gutter="20">
-        <el-col :span="20">
-          <el-form-item label="设备列表" prop="deviceId">
-            <el-select v-model="areaForm.deviceId" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择设备' : ''" style="width: 100%;">
-              <el-option
-                v-for="item in deviceList"
-                :key="item.id"
-                :label="item.deviceName"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
-          <el-form-item label="电量/V:" prop="electricalVoltage">
-            <el-input v-model="areaForm.electricalVoltage" :placeholder="dialogStatus === 'create' ? '请输入电量/V' : ''" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
-          <el-form-item label="功率/W:" prop="power">
-            <el-input v-model="areaForm.power" :placeholder="dialogStatus === 'create' ? '请输入功率/W' : ''" />
-          </el-form-item>
-        </el-col>
       </el-row> -->
     </el-form>
     <template #footer>
diff --git a/src/views/data/environment/pageAdd.vue b/src/views/data/environment/pageAdd.vue
index f008056..7038a40 100644
--- a/src/views/data/environment/pageAdd.vue
+++ b/src/views/data/environment/pageAdd.vue
@@ -140,57 +140,49 @@
 <template>
   <el-dialog v-model="dialogFormVisible" :title="textMap[dialogStatus]" append-to-body>
     <el-form ref="dataFormRef" :rules="rules" :model="areaForm" label-position="right" label-width="120px">
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="环境温度:" prop="temperature">
             <el-input v-model="areaForm.temperature" :placeholder="dialogStatus === 'create' ? '请输入环境温度' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="相对湿度:" prop="humidity">
             <el-input v-model="areaForm.humidity" :placeholder="dialogStatus === 'create' ? '请输入相对湿度' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="风速:" prop="windSpeed">
             <el-input v-model="areaForm.windSpeed" :placeholder="dialogStatus === 'create' ? '请输入风速' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="风向:" prop="windSpeed">
             <el-input v-model="areaForm.windDirection" :placeholder="dialogStatus === 'create' ? '请输入风向' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="大气压力:" prop="atmos">
             <el-input v-model="areaForm.atmos" :placeholder="dialogStatus === 'create' ? '请输入大气压力' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="降雨量:" prop="rainfall">
             <el-input v-model="areaForm.rainfall" :placeholder="dialogStatus === 'create' ? '请输入降雨量' : ''" />
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="光照辐射量:" prop="careRadiation">
             <el-input v-model="areaForm.careRadiation" :placeholder="dialogStatus === 'create' ? '请输入光照辐射量' : ''" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="20">
+        <el-col :span="12">
           <el-form-item label="总辐射量:" prop="totalRadiation">
             <el-input v-model="areaForm.totalRadiation" :placeholder="dialogStatus === 'create' ? '请输入总辐射量' : ''" />
           </el-form-item>