Merge branch 'master' of http://222.71.165.188:3000/yunxi/ningxiaWeb

# Conflicts:
#	jnpf-java-boot/jnpf-web/src/utils/apiUrl.js

jnpf-java-boot/jnpf-web/src/components/mapComponent/index.vue

@@ -2,13 +2,13 @@
  * @Author: 王文杰
  * @Date: 2024-02-02 09:28:28
  * @LastEditors: 王文杰
- * @LastEditTime: 2024-02-02 15:09:13
+ * @LastEditTime: 2024-02-05 15:36:32
  * @FilePath: /jnpf-web/src/components/mapComponents/index.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
 <template>
-  <el-dialog :visible="visible" style="z-index: 9999;" :append-to-body="true" :close-on-click-modal="false" @close="handleCancelMap" width="30%" title="选择地点">
-    <iframe id="mapPage" width="100%" height="600px" frameborder=0 :src="map_src">
+  <el-dialog :visible="visible" style="z-index: 9999;" :append-to-body="true" :close-on-click-modal="false" @close="handleCancelMap" title="选择地点">
+    <iframe id="mapPage" width="100%" height="400px" frameborder=0 :src="map_src">
     </iframe>
     <template slot="footer">
       <el-button @click="handleSureMap" type='primary'>确定</el-button>
@@ -92,5 +92,10 @@
   }
 </script>
 
-<style>
+<style scoped>
+.el-dialog {
+  .dialog__body {
+    /* height: 1200px; */
+  }
+}
 </style>

jnpf-java-boot/jnpf-web/src/utils/apiUrl.js

@@ -1,6 +1,14 @@
+/*
+ * @Author: 王文杰
+ * @Date: 2024-02-02 14:19:40
+ * @LastEditors: 王文杰
+ * @LastEditTime: 2024-02-05 15:38:26
+ * @FilePath: /jnpf-web/src/utils/apiUrl.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 module.exports = {
   // 开发环境接口配置
   APIURl: 'http://localhost:30000'
   // 测试环境接口配置
   //APIURl: 'http://222.71.165.187:30000'
-}
+}

jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/form.vue

@@ -838,7 +838,7 @@ export default {
     align-items: flex-start;
     margin-left: 0!important;
     .input {
-      width: 300px!important;
+      // width: 300px!important;
       margin-right: 10px;
     }
   }