m

youxiw2000
2 parents 06cb807b 966cf780
Showing 3 changed files with 65 additions and 32 deletions
trash-ui/src/main.js
trash-ui/src/views/unit/dropPointInfo/index.vue
trash-unit/src/main/resources/mapper/unit/DropPointInfoMapper.xml
@@ -41,7 +41,7 @@ Vue.prototype.parseStatus = parseStatus
 Vue.prototype.checkPer = checkPermi
  
 Vue.use(plugins)
-Vue.prototype.$aMapKey = "902732b0ff4758e4b39f0f34f0cb1cb0";// 高德地图key
+Vue.prototype.$aMapKey = "3865c516a0e83ce0ca5cec3f2087675c";// 高德地图key
  
 // Vue.prototype.remoteFrame = "http://183.66.242.6:14601"
 // Vue.prototype.remoteFrame = "http://175.178.228.30:14601"
@@ -68,14 +68,6 @@ Vue.component(&#39;RightToolbar&#39;, RightToolbar)
  
 Vue.use(permission)
  
-/**
- * If you don't want to use mock-server
- * you want to use MockJs for mock api
- * you can execute: mockXHR()
- *
- * Currently MockJs will be used in the production environment,
- * please remove it before going online! ! !
- */
 Element.Dialog.props.closeOnClickModal.default = false;
  
 Vue.use(Element, {
@@ -19,7 +19,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="是否为实行物业管理的区域（小区）" prop="type" >
+      <el-form-item label="请选择所属区域" prop="district">
+        <el-select v-model="queryParams.district" placeholder="请输入所属区域" style="width: 100%" clearable @change="getStreets">
+          <el-option v-for="(area,index) in areas" :label="area.name" :value="area.code" :key="index"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="请选择所属街道" prop="street">
+        <el-select v-model="queryParams.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="type">
         <el-select v-model="queryParams.type" placeholder="请选择是否为实行物业管理的区域（小区）" clearable size="small">
           <el-option label="全部" value=""/>
           <el-option label="是" value="是"/>
@@ -80,7 +90,12 @@
  
     <el-table v-loading="loading" :data="dropPointInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="投放点名称" align="center" prop="dropPointName"/>
+      <el-table-column label="投放点编号" align="center" prop="dropPointNo"/>
+      <el-table-column label="投放点名称" align="center" prop="dropPointName">
+        <template slot-scope="scope">
+          <a href="javascript:void(0)" @click="handleInfo(scope.row)" style="color:#90DD5F;">{{ scope.row.dropPointName }}</a>
+        </template>
+      </el-table-column>
       <el-table-column label="所属区域" align="center" prop="district">
         <template slot-scope="scope">
           <span>{{ dict(scope.row.district) }}</span>
@@ -109,7 +124,6 @@
       <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"/>
       <el-table-column label="运营单位" align="center" prop="operatingUnit"/>
       <el-table-column label="运输单位" align="center" prop="transportUnit"/>
       <el-table-column label="审批状态" align="center" prop="status">
@@ -161,60 +175,60 @@
             </el-form-item>
  
             <el-form-item label="投放点名称" prop="dropPointName">
-              <el-input v-model="form.dropPointName" placeholder="请输入投放点名称"/>
+              <el-input v-model="form.dropPointName" placeholder="请输入投放点名称" :disabled="infoDisable"/>
             </el-form-item>
  
             <el-form-item label="所属区域" prop="street">
-              <el-select v-model="form.district" placeholder="请输入所属区域" style="width: 100%" clearable @change="getStreets">
+              <el-select v-model="form.district" placeholder="请输入所属区域" style="width: 100%" clearable @change="getStreets" :disabled="infoDisable">
                 <el-option v-for="(area,index) in areas" :label="area.name" :value="area.code" :key="index"/>
               </el-select>
             </el-form-item>
  
             <el-form-item label="所属街道" prop="street">
-              <el-select v-model="form.street" placeholder="请输入所属街道" style="width: 100%" clearable @change="getCommunitys">
+              <el-select v-model="form.street" placeholder="请输入所属街道" style="width: 100%" clearable @change="getCommunitys" :disabled="infoDisable">
                 <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-select v-model="form.community" placeholder="请输入所属社区" style="width: 100%" clearable>
+          <el-select v-model="form.community" placeholder="请输入所属社区" style="width: 100%" clearable :disabled="infoDisable">
             <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-input v-model="form.plot" placeholder="请输入小区" :disabled="infoDisable"/>
           </el-form-item>
  
             <el-form-item label="详细地址" prop="address">
-              <el-input v-model="form.address" placeholder="请输入详细地址"/>
+              <el-input v-model="form.address" placeholder="请输入详细地址" :disabled="infoDisable"/>
             </el-form-item>
  
             <el-form-item label="是否为实行物业管理的区域（小区）" prop="type" class="lowheight">
-              <el-select v-model="form.type" placeholder="请选择是否为实行物业管理的区域（小区）" style="width: 100%">
+              <el-select v-model="form.type" placeholder="请选择是否为实行物业管理的区域（小区）" style="width: 100%" :disabled="infoDisable">
                 <el-option label="是" value="是"/>
                 <el-option label="否" value="否"/>
               </el-select>
             </el-form-item>
  
             <el-form-item label="投放点面积(m²)" prop="area">
-              <el-input v-model="form.area" placeholder="请输入投放点面积"/>
+              <el-input v-model="form.area" placeholder="请输入投放点面积" :disabled="infoDisable"/>
             </el-form-item>
  
             <el-form-item label="投放点容量(m³)" prop="capacity">
-              <el-input v-model="form.capacity" placeholder="请输入投放点容量"/>
+              <el-input v-model="form.capacity" placeholder="请输入投放点容量" :disabled="infoDisable"/>
             </el-form-item>
  
             <el-form-item label="管理单位" prop="managementUnit">
-              <el-input v-model="form.managementUnit" placeholder="请输入管理单位"/>
+              <el-input v-model="form.managementUnit" placeholder="请输入管理单位" :disabled="infoDisable"/>
             </el-form-item>
  
             <el-form-item label="管理员" prop="custodian">
-              <el-input v-model="form.custodian" placeholder="请输入管理员"/>
+              <el-input v-model="form.custodian" placeholder="请输入管理员" :disabled="infoDisable"/>
             </el-form-item>
  
             <el-form-item label="管理员电话" prop="custodianPhone">
-              <el-input v-model="form.custodianPhone" placeholder="请输入管理员联系电话" :maxlength="11" show-word-limit/>
+              <el-input v-model="form.custodianPhone" placeholder="请输入管理员联系电话" :maxlength="11" show-word-limit :disabled="infoDisable"/>
             </el-form-item>
  
             <el-form-item label="投放时间" prop="dropTime" v-if="dropTime">
@@ -226,7 +240,7 @@
                   start: '00:00',
                   step: '00:15',
                   end: '23:45'
-                }">
+                }" :disabled="infoDisable">
               </el-time-select>
               <el-time-select
                 placeholder="结束时间"
@@ -237,26 +251,26 @@
                 step: '00:15',
                 end: '24:00',
                 minTime: form.dropTime
-              }">
+              }" :disabled="infoDisable">
               </el-time-select>
             </el-form-item>
  
             <el-form-item label="运营单位" prop="operatingUnit">
-              <el-input v-model="form.operatingUnit" placeholder="请输入运营单位"/>
+              <el-input v-model="form.operatingUnit" placeholder="请输入运营单位" :disabled="infoDisable"/>
             </el-form-item>
  
             <el-form-item label="运输单位" prop="transportUnit">
-              <el-input v-model="form.transportUnit" placeholder="请输入运输单位"/>
+              <el-input v-model="form.transportUnit" placeholder="请输入运输单位" :disabled="infoDisable"/>
             </el-form-item>
  
             <el-form-item label="坐标点" prop="coordinatePoint">
-              <el-input v-model="form.coordinatePoint" placeholder="请输入坐标点经纬度" readonly @click.native="handleOpenMap"/>
+              <el-input v-model="form.coordinatePoint" placeholder="请输入坐标点经纬度" readonly @click.native="handleOpenMap" :disabled="infoDisable"/>
             </el-form-item>
 <!--            <el-button type="primary" @click="handleOpenMap">坐标点</el-button>-->
  
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-show="!infoDisable">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -317,7 +331,7 @@ import Treeselect from &quot;@riophae/vue-treeselect&quot;;
  
 // 设置安全密钥
 window._AMapSecurityConfig = {
-  securityJsCode: 'aa1db7d8f534f3da3f6d8a6a71382802',
+  securityJsCode: 'c82d0bf9ef42c220d3295a712cdd18b8',
 }
  
 export default {
@@ -350,6 +364,8 @@ export default {
         dropPointName: null,
         address: null,
         type: null,
+        district: null,
+        street: null,
       },
       // 表单参数
       form: {},
@@ -424,7 +440,8 @@ export default {
       center: null,
       circleMarker: null,
       endTime: null,
-      dropTime: true
+      dropTime: true,
+      infoDisable: false
     };
   },
   created() {
@@ -455,6 +472,26 @@ export default {
     // this.initAMap();
   },
   methods: {
+    handleInfo(row){
+      this.reset();
+      const id = row.id;
+      this.dropTime = false;
+      getDropPointInfo(id).then(response => {
+        let dropTime = response.data.dropTime.split("~");
+        this.form = response.data;
+        let dropNo = response.data.dropPointNo;
+        console.log(this.form)
+        this.getStreets(this.form.district)
+        this.getCommunitys(this.form.street)
+        this.form.dropTime = dropTime[0];
+        this.endTime = dropTime[1];
+        this.open = true;
+        this.title = "查看投放点信息管理";
+        this.dropTime = true;
+        this.infoDisable = true;
+        this.form.dropPointNo = dropNo;
+      });
+    },
     dict(code){
       for(let key in this.areas){
         if(this.areas[key].code === code){
@@ -718,6 +755,7 @@ export default {
       getDropPointInfo(id).then(response => {
         let dropTime = response.data.dropTime.split("~");
         this.form = response.data;
+        let dropNo = response.data.dropPointNo;
         console.log(this.form)
         this.getStreets(this.form.district)
         this.getCommunitys(this.form.street)
@@ -726,6 +764,7 @@ export default {
         this.open = true;
         this.title = "修改投放点信息管理";
         this.dropTime = true;
+        this.form.dropPointNo = dropNo;
       });
     },
     /** 提交按钮 */
@@ -47,6 +47,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 			<if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
 			<if test="type != null  and type != ''"> and type = #{type}</if>
 			<if test="dropPointNo != null  and dropPointNo != ''"> and drop_point_no like concat(#{dropPointNo}, '%')</if>
+			 <if test="district != null  and district != ''"> and district = #{district}</if>
+			  <if test="street != null  and street != ''"> and street = #{street}</if>
 			<if test="sList != null  and sList.size() > 0 ">
 				and street in
 				<foreach item="id" collection="sList" open="(" separator=","