chenwj преди 5 години
родител
ревизия
a9e05e927c

+ 8 - 8
src/api/community/building.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/building/building/list',
+    url: '/api/community/building/list',
     method: 'get',
     params: {
       ...params,
@@ -14,7 +14,7 @@ export const getList = (current, size, params) => {
 
 export const getDetail = (id) => {
   return request({
-    url: '/api/building/building/detail',
+    url: '/api/community/building/detail',
     method: 'get',
     params: {
       id
@@ -24,7 +24,7 @@ export const getDetail = (id) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/api/building/building/remove',
+    url: '/api/community/building/remove',
     method: 'post',
     params: {
       ids,
@@ -34,7 +34,7 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/api/building/building/submit',
+    url: '/api/community/building/submit',
     method: 'post',
     data: row
   })
@@ -42,7 +42,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/api/building/building/submit',
+    url: '/api/community/building/submit',
     method: 'post',
     data: row
   })
@@ -50,7 +50,7 @@ export const update = (row) => {
 
 export const getBuildingList = (current, size, params) => {
   return request({
-    url: '/grid/building/showBuildingList',
+    url: '/grid/community/showBuildingList',
     method: 'get',
     params: {
       ...params,
@@ -62,7 +62,7 @@ export const getBuildingList = (current, size, params) => {
 
 export const getBuildingDetail = (id) => {
   return request({
-    url: '/grid/building/findBuildingById/' + id,
+    url: '/grid/community/findBuildingById/' + id,
     method: 'get',
     params: {
     }
@@ -72,7 +72,7 @@ export const getBuildingDetail = (id) => {
 
 export const batchAddSubmit = (row) => {
   return request({
-    url: '/api/building/building/batchAdd',
+    url: '/api/community/building/batchAdd',
     method: 'post',
     data: row
   })

+ 5 - 5
src/api/community/floor.js

@@ -2,7 +2,7 @@ import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/floor/floor/list',
+    url: '/api/community/floor/list',
     method: 'get',
     params: {
       ...params,
@@ -14,7 +14,7 @@ export const getList = (current, size, params) => {
 
 export const getDetail = (id) => {
   return request({
-    url: '/api/floor/floor/detail',
+    url: '/api/community/floor/detail',
     method: 'get',
     params: {
       id
@@ -24,7 +24,7 @@ export const getDetail = (id) => {
 
 export const remove = (ids) => {
   return request({
-    url: '/api/floor/floor/remove',
+    url: '/api/community/floor/remove',
     method: 'post',
     params: {
       ids,
@@ -34,7 +34,7 @@ export const remove = (ids) => {
 
 export const add = (row) => {
   return request({
-    url: '/api/floor/floor/save',
+    url: '/api/community/floor/save',
     method: 'post',
     data: row
   })
@@ -42,7 +42,7 @@ export const add = (row) => {
 
 export const update = (row) => {
   return request({
-    url: '/api/floor/floor/submit',
+    url: '/api/community/floor/submit',
     method: 'post',
     data: row
   })

+ 2 - 2
src/views/community/building.vue

@@ -73,8 +73,8 @@
 
   export default {
     components: {
-      devicebuilding,
-      buildingvideo
+      // devicebuilding,
+      // buildingvideo
     },
     data() {
       return {

+ 3 - 5
src/views/community/residential.vue

@@ -96,14 +96,14 @@
     validatePhone
   } from "@/util/validator"
   import residentialManage from "./residentialManage.vue";
-  import residentialDetail from "../../components/residential/residentialDetail.vue";
+  // import residentialDetail from "../../components/residential/residentialDetail.vue";
   import CyExcelImport from "../../components/excel/cy-excel-import.vue"
 
   export default {
     components: {
       CyAreaSelect,
       residentialManage,
-      residentialDetail,
+      // residentialDetail,
       CyExcelImport
     },
     data() {
@@ -142,7 +142,6 @@
           menuWidth: 200,
           column: [{
               label: "名称",
-              overHidden: true,
               width: 150,
               prop: "name",
               // row: true,
@@ -193,7 +192,7 @@
               overHidden: true,
               type: "select",
               remote: true,
-              dicUrl: "/api/agency/agency/select?size=10&agencyName={{key}}",
+              dicUrl: "/api/community/agency/select?size=10&agencyName={{key}}",
               props: {
                 label: "agencyName",
                 value: "id"
@@ -513,7 +512,6 @@
           if (!value){
             return
           }else{
-          debugger
             this.form.longitude = this.form.mapSelect.longitude;
             this.form.latitude = this.form.mapSelect.latitude;
             this.form.address = this.form.mapSelect.formattedAddress;

+ 3 - 3
src/views/community/room.vue

@@ -100,7 +100,7 @@
               display:false,
               type: "select",
               // search: true,
-              dicUrl: "/api/agency/agency/list",
+              dicUrl: "/api/community/agency/list",
               // cascaderItem: ['residentialId','unitId'],
               props: {
                 label: "agencyName",
@@ -145,7 +145,7 @@
               search: true,
               dicFlag: false,
               filterable: true,
-              dicUrl: "/api/building/building/list?select?residentialId={{key}}",
+              dicUrl: "/api/community/building/list?select?residentialId={{key}}",
               dicFormatter: (res)=>{
                 return res.data.records;
               },
@@ -191,7 +191,7 @@
               dicFlag: false,
               // cascaderIndex:1,
               // dicUrl: "/grid/estate/getUnitList",
-              dicUrl: "/api/floor/floor/list?unitId={{key}}&size=900000",
+              dicUrl: "/api/community/floor/list?unitId={{key}}&size=900000",
               dicFormatter: (res)=>{
                 return res.data.records;
               },

+ 2 - 2
src/views/community/unit.vue

@@ -141,7 +141,7 @@
               cascaderItem: ['residentialId'],
               type: "select",
               remote: true,
-              dicUrl: "/api/agency/agency/select?agencyName={{key}}",
+              dicUrl: "/api/community/agency/select?agencyName={{key}}",
               props: {
                 label: "agencyName",
                 value: "id"
@@ -180,7 +180,7 @@
               slot: true,
               type: "select",
               search: true,
-              dicUrl: `/api/building/building/select?residentialId={{key}}`,
+              dicUrl: `/api/community/building/select?residentialId={{key}}`,
               dicFlag: false,
               filterable: true,
               props: {