与客户沟通对接，装修垃圾投放点新增页面需要修改：

1、社区录入改成字典下拉格式（客户回去统计字典数据） 2、增加小区字段，放在社区下面，小区隶属社区为必填项（非下拉） 3、投放点编号规则修改：原有基础上拼接社区代码 4、“投放点形式”改为“是否为实行物业管理的区域（小区）”为下拉格式 5、把管理单位一栏改为非必填 6、“管理人”改为“管理员” 7、投放时间格式更改：改为时间段格式（HH:mm~HH:mm）

与客户沟通对接，装修垃圾投放点新增页面需要修改：
1、社区录入改成字典下拉格式（客户回去统计字典数据） 2、增加小区字段，放在社区下面，小区隶属社区为必填项（非下拉） 3、投放点编号规则修改：原有基础上拼接社区代码 4、“投放点形式”改为“是否为实行物业管理的区域（小区）”为下拉格式 5、把管理单位一栏改为非必填 6、“管理人”改为“管理员” 7、投放时间格式更改：改为时间段格式（HH:mm~HH:mm）
2c2c2c
1 parent fb390ddb
Showing 4 changed files with 126 additions and 52 deletions
trash-ui/src/api/dict.js
trash-ui/src/views/unit/dropPointInfo/index.vue
trash-unit/src/main/java/com/trash/dropPointInfo/domain/DropPointInfo.java
trash-unit/src/main/resources/mapper/unit/DropPointInfoMapper.xml
@@ -215,3 +215,10 @@ export function getAreaList() {
     method: 'get'
   });
 }
+
+export function getAreasList() {
+  return requestRemote({
+    url: '/api/gisservice/v2/jurisdictions/areas?dict=1',
+    method: 'get'
+  });
+}
@@ -19,11 +19,11 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="投放点形式" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择投放点形式" clearable size="small">
+      <el-form-item label="是否为实行物业管理的区域（小区）" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择是否为实行物业管理的区域（小区）" clearable size="small">
           <el-option label="全部" value=""/>
-          <el-option label="固定" value="固定"/>
-          <el-option label="临时" value="临时"/>
+          <el-option label="是" value="是"/>
+          <el-option label="否" value="否"/>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -94,12 +94,13 @@
         </template>
       </el-table-column>
       <el-table-column label="社区" align="center" prop="community"/>
+      <el-table-column label="小区" align="center" prop="plot"/>
       <el-table-column label="详细地址" align="center" prop="address"/>
       <el-table-column label="投放点形式" align="center" prop="type"/>
       <el-table-column label="投放点面积(m²)" align="center" prop="area"/>
       <el-table-column label="投放点容量(m³)" align="center" prop="capacity"/>
       <el-table-column label="管理单位" align="center" prop="managementUnit"/>
-      <el-table-column label="管理人" align="center" prop="custodian"/>
+      <el-table-column label="管理员" align="center" prop="custodian"/>
       <el-table-column label="管理员电话" align="center" prop="custodianPhone"/>
       <el-table-column label="投放时间" align="center" prop="dropTime" width="180"/>
       <el-table-column label="投放点编号" align="center" prop="dropPointNo"/>
@@ -112,7 +113,7 @@
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}-{i}-{s}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -164,24 +165,29 @@
             </el-form-item>
             <el-form-item label="所属街道" prop="street">
-              <el-select v-model="form.street" placeholder="请输入所属街道" style="width: 100%" clearable>
-                <el-option v-for="(area,index) in streets" :label="area.name" :value="area.code" :key="area.code" @click.native="createDropPointNo(area)"/>
+              <el-select v-model="form.street" placeholder="请输入所属街道" style="width: 100%" clearable @change="getCommunitys">
+                <el-option v-for="(area,index) in streets" :label="area.name" :value="area.code" :key="area.code"/>
               </el-select>
             </el-form-item>
-            <el-form-item label="社区" prop="community">
-              <el-input v-model="form.community" placeholder="请输入社区"/>
-            </el-form-item>
+        <el-form-item label="社区" prop="community">
+          <el-select v-model="form.community" placeholder="请输入所属社区" style="width: 100%" clearable>
+            <el-option v-for="(area,index) in communitys" :label="area.name" :value="area.code" :key="area.code" @click.native="createDropPointNo(area,'community')"/>
+          </el-select>
+        </el-form-item>
+          <el-form-item label="小区" prop="plot">
+            <el-input v-model="form.plot" placeholder="请输入小区"/>
+          </el-form-item>
             <el-form-item label="详细地址" prop="address">
               <el-input v-model="form.address" placeholder="请输入详细地址"/>
             </el-form-item>
-            <el-form-item label="投放点形式" prop="type">
-              <el-select v-model="form.type" placeholder="请选择投放点形式" style="width: 100%">
-                <el-option label="固定" value="固定"/>
-                <el-option label="临时" value="临时"/>
+            <el-form-item label="是否为实行物业管理的区域（小区）" prop="type">
+              <el-select v-model="form.type" placeholder="请选择是否为实行物业管理的区域（小区）" style="width: 100%">
+                <el-option label="是" value="是"/>
+                <el-option label="否" value="否"/>
               </el-select>
             </el-form-item>
@@ -197,24 +203,35 @@
               <el-input v-model="form.managementUnit" placeholder="请输入管理单位"/>
             </el-form-item>
-            <el-form-item label="管理人" prop="custodian">
-              <el-input v-model="form.custodian" placeholder="请输入管理人"/>
+            <el-form-item label="管理员" prop="custodian">
+              <el-input v-model="form.custodian" placeholder="请输入管理员"/>
             </el-form-item>
             <el-form-item label="管理员电话" prop="custodianPhone">
               <el-input v-model="form.custodianPhone" placeholder="请输入管理员联系电话" :maxlength="11" show-word-limit/>
             </el-form-item>
-            <el-form-item label="投放时间" prop="dropTime">
+            <el-form-item label="投放时间" prop="dropTime" v-if="dropTime">
               <el-time-select
+                placeholder="起始时间"
                 v-model="form.dropTime"
-                style="width: 100%"
+                style="width: 50%"
                 :picker-options="{
-                    start: '00:00',
-                    step: '00:30',
-                    end: '23:30'
-                  }"
-                placeholder="选择时间">
+                  start: '00:00',
+                  step: '00:15',
+                  end: '23:45'
+                }">
+              </el-time-select>
+              <el-time-select
+                placeholder="结束时间"
+                v-model="endTime"
+                style="width: 50%"
+                :picker-options="{
+                start: '00:15',
+                step: '00:15',
+                end: '24:00',
+                minTime: form.dropTime
+              }">
               </el-time-select>
             </el-form-item>
@@ -284,7 +301,7 @@ import {
   updateDropPointInfo,
   exportDropPointInfo
 } from "@/api/unit/dropPointInfo";
-import {getAreaList} from "@/api/dict"
+import {getAreaList,getAreasList} from "@/api/dict"
 import AMapLoader from "@amap/amap-jsapi-loader";
 import Treeselect from "@riophae/vue-treeselect";
@@ -338,7 +355,10 @@ export default {
           {required: true, message: "请输入所属街道", trigger: "blur"}
         ],
         community: [
-          {required: true, message: "请输入社区", trigger: "blur"}
+          {required: true, message: "请选择社区", trigger: "blur"}
+        ],
+        plot: [
+          {required: true, message: "请输入小区", trigger: "blur"}
         ],
         address: [
           {required: true, message: "请输入详细地址", trigger: "blur"}
@@ -360,7 +380,7 @@ export default {
           {required: true, message: "请输入管理单位", trigger: "blur"}
         ],
         custodian: [
-          {required: true, message: "请输入管理人", trigger: "blur"}
+          {required: true, message: "请输入管理员", trigger: "blur"}
         ],
         custodianPhone: [
           {required: true, message: "请输入管理员电话", trigger: "blur"},
@@ -373,9 +393,6 @@ export default {
         dropTime: [
           {required: true, message: "请选择投放时间", trigger: "change"}
         ],
-        operatingUnit: [
-          {required: true, message: "请输入运营单位", trigger: "blur"}
-        ],
         transportUnit: [
           {required: true, message: "请输入运输单位", trigger: "blur"}
         ],
@@ -383,8 +400,12 @@ export default {
           {required: true, message: "请点击坐标点按钮选择坐标点", trigger: "blur"}
         ]
       },
+      //区域
       areas: [],
+      //街道
       streets:[],
+      //社区
+      communitys:[],
       // 地图
       map: null,
       keywords: "",
@@ -392,27 +413,31 @@ export default {
       openMap:false,
       center: null,
       circleMarker: null,
+      endTime: null,
+      dropTime: true
     };
   },
   created() {
-    getAreaList().then(response => {
+    getAreasList().then(response => {
       if(response==null || response.length===0){
         this.$message.error("获取区域列表失败");
         return;
       }
-      const data = response;
-      for (let dataKey in data) {
-        if(data[dataKey].level === '3'){
-          this.areas.push({name:data[dataKey].name,code:data[dataKey].id, streets:[]})
-        }
-      }
-      for(let dataKey in data){
-        for(let areas1Key in this.areas){
-          if(data[dataKey].pid === this.areas[areas1Key].code){
-            this.areas[areas1Key].streets.push({code:data[dataKey].id, name:data[dataKey].name})
-          }
-        }
-      }
+      let data = response.filter(data => data.code === "430100");
+      this.areas = data[0].items;
+      console.log(this.areas)
+      // for (let dataKey in data) {
+      //   if(data[dataKey].parentCode === '430100'){
+      //     this.areas.push({name:data[dataKey].name,code:data[dataKey].code, streets:[]})
+      //   }
+      // }
+      // for(let dataKey in data){
+      //   for(let areas1Key in this.areas){
+      //     if(data[dataKey].parentCode === this.areas[areas1Key].code){
+      //       this.areas[areas1Key].streets.push({code:data[dataKey].code, name:data[dataKey].name,item:data[dataKey].items})
+      //     }
+      //   }
+      // }
     });
     this.getList();
@@ -573,17 +598,25 @@ export default {
       }
     },
     createDropPointNo(area){
-      listDropPointInfo({dropPointNo: area.code}).then(response => {
-        const total = response.total+1;
-        this.form.dropPointNo = area.code+total.toString().padStart(3, '0');
-      });
+        listDropPointInfo({dropPointNo: area.code}).then(response => {
+          const total = response.total+1;
+          this.form.dropPointNo = area.code+total.toString().padStart(3, '0');
+        });
+
     },
     getStreets(regionName) {
       this.streets = [];
       this.form.dropPointNo = null;
       this.form.street = null;
       const region = this.areas.find(region => region.code === regionName);
-      this.streets = region.streets;
+      this.streets = region.items;
+    },
+    getCommunitys(regionName){
+      this.communitys = [];
+      this.form.dropPointNo = null;
+      this.form.community = null;
+      const region = this.streets.find(region => region.code === regionName);
+      this.communitys = region.items;
     },
     /** 下载文件 */
     /** 查询投放点信息管理列表 */
@@ -624,6 +657,9 @@ export default {
         updateTime: null,
         updateBy: null
       };
+      this.endTime = null;
+      this.streets = [];
+      this.communitys = [];
       this.map = null;
       this.center = null;
       this.resetForm("form");
@@ -654,26 +690,42 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids
+      this.dropTime = false;
       getDropPointInfo(id).then(response => {
+        let dropTime = response.data.dropTime.split("~");
+        console.log(dropTime)
         this.form = response.data;
+        this.form.dropTime = dropTime[0];
+        this.endTime = dropTime[1];
         this.open = true;
         this.title = "修改投放点信息管理";
+        this.dropTime = true;
       });
     },
     /** 提交按钮 */
     submitForm() {
+
       this.$refs["form"].validate(valid => {
         if (valid) {
+          let dropTime = this.form.dropTime;
+          if(this.endTime!=null){
+            this.form.dropTime = this.form.dropTime + "~" + this.endTime;
+          }else{
+            this.$message.error("请选择投放结束时间");
+            return;
+          }
           if (this.form.id != null) {
             updateDropPointInfo(this.form).then(response => {
               this.msgSuccess("修改成功");
               this.open = false;
+              this.form.dropTime = dropTime;
               this.getList();
             });
           } else {
             addDropPointInfo(this.form).then(response => {
               this.msgSuccess("新增成功");
               this.open = false;
+              this.form.dropTime = dropTime;
               this.getList();
             });
           }
@@ -39,6 +39,10 @@ public class DropPointInfo extends BaseEntity
     @Excel(name = "社区")
     private String community;
+    /** 小区 */
+    @Excel(name = "小区")
+    private String plot;
+
     /** 详细地址 */
     @Excel(name = "详细地址")
     private String address;
@@ -59,8 +63,8 @@ public class DropPointInfo extends BaseEntity
     @Excel(name = "管理单位")
     private String managementUnit;
-    /** 管理人 */
-    @Excel(name = "管理人")
+    /** 管理员 */
+    @Excel(name = "管理员")
     private String custodian;
     /** 管理员电话 */
@@ -101,6 +105,13 @@ public class DropPointInfo extends BaseEntity
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
+    public String getPlot() {
+        return plot;
+    }
+
+    public void setPlot(String plot) {
+        this.plot = plot;
+    }
     public String getCoordinatePoint() {
         return coordinatePoint;
@@ -26,6 +26,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		<result property="createBy" column="create_by" />
 		<result property="updateTime" column="update_time" />
 		<result property="updateBy" column="update_by" />
+		<result property="plot" column="plot" />
 	</resultMap>
 	<sql id="selectDropPointInfoVo">
@@ -33,7 +34,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		area, capacity, management_unit, custodian, custodian_phone,
 		drop_time, drop_point_no, operating_unit,
 		transport_unit,coordinate_point, create_time, create_by, update_time,
-		update_by from drop_point_info
+		update_by,plot from drop_point_info
 	</sql>
 	<select id="selectDropPointInfoList" parameterType="DropPointInfo"
@@ -85,6 +86,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="createBy != null">create_by,</if>
 			<if test="updateTime != null">update_time,</if>
 			<if test="updateBy != null">update_by,</if>
+		    <if test="plot != null">plot,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="dropPointName != null">#{dropPointName},</if>
@@ -107,6 +109,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="createBy != null">#{createBy},</if>
 			<if test="updateTime != null">#{updateTime},</if>
 			<if test="updateBy != null">#{updateBy},</if>
+			<if test="plot != null">#{plot},</if>
 		</trim>
 	</insert>
@@ -133,6 +136,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="createBy != null">create_by = #{createBy},</if>
 			<if test="updateTime != null">update_time = #{updateTime},</if>
 			<if test="updateBy != null">update_by = #{updateBy},</if>
+			<if test="plot != null">plot = #{plot},</if>
 		</trim>
 		where id = #{id}
 	</update>