diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/AreaController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/AreaController.java
index 09a0bb1..0a88fd0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/AreaController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/AreaController.java
@@ -2,6 +2,8 @@ package com.ruoyi.system.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.system.domain.ServiceCate;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -46,6 +48,22 @@ public class AreaController extends BaseController
return getDataTable(list);
}
+
+
+ /**
+ * 查询地区信息列表不分页，只要用户下拉选择
+ */
+ @PreAuthorize("@ss.hasPermi('system:Area:query')")
+ @GetMapping(value = "/selectAreaList/{id}")
+ public AjaxResult selectServiceCateList(@PathVariable("id") Long id)
+ {
+ Area area=new Area();
+ if(id!=null){
+ area.setPid(id);
+ }
+ return success(areaService.selectAreaList(area));
+ }
+
/**
* 导出地区信息列表
*/
diff --git a/ruoyi-ui/src/api/system/Area.js b/ruoyi-ui/src/api/system/Area.js
index d7df459..6d55c1d 100644
--- a/ruoyi-ui/src/api/system/Area.js
+++ b/ruoyi-ui/src/api/system/Area.js
@@ -1,44 +1,44 @@
import request from '@/utils/request'
-// 查询地区信息列表
+// 查询地区列表
export function listArea(query) {
return request({
- url: '/system/Area/list',
+ url: '/system/area/list',
method: 'get',
params: query
})
}
-// 查询地区信息详细
+// 查询地区详细
export function getArea(id) {
return request({
- url: '/system/Area/' + id,
+ url: '/system/area/' + id,
method: 'get'
})
}
-// 新增地区信息
+// 新增地区
export function addArea(data) {
return request({
- url: '/system/Area',
+ url: '/system/area',
method: 'post',
data: data
})
}
-// 修改地区信息
+// 修改地区
export function updateArea(data) {
return request({
- url: '/system/Area',
+ url: '/system/area',
method: 'put',
data: data
})
}
-// 删除地区信息
+// 删除地区
export function delArea(id) {
return request({
- url: '/system/Area/' + id,
+ url: '/system/area/' + id,
method: 'delete'
})
}
diff --git a/ruoyi-ui/src/api/system/MobileMiddle.js b/ruoyi-ui/src/api/system/MobileMiddle.js
index f59f18d..30cbd86 100644
--- a/ruoyi-ui/src/api/system/MobileMiddle.js
+++ b/ruoyi-ui/src/api/system/MobileMiddle.js
@@ -17,6 +17,14 @@ export function getMobileMiddle(id) {
})
}
+// 查询双向呼叫号码详细
+export function selectAreaList(id) {
+ return request({
+ url: '/system/Area/selectAreaList/' + id,
+ method: 'get'
+ })
+}
+
// 新增双向呼叫号码
export function addMobileMiddle(data) {
return request({
diff --git a/ruoyi-ui/src/api/system/MobileNotify.js b/ruoyi-ui/src/api/system/MobileNotify.js
index e7d416c..d5ff6f3 100644
--- a/ruoyi-ui/src/api/system/MobileNotify.js
+++ b/ruoyi-ui/src/api/system/MobileNotify.js
@@ -17,6 +17,15 @@ export function getMobileNotify(id) {
})
}
+
+// 查询双向呼叫号码详细
+export function selectAreaList(id) {
+ return request({
+ url: '/system/Area/selectAreaList/' + id,
+ method: 'get'
+ })
+}
+
// 新增语音通知号码
export function addMobileNotify(data) {
return request({
diff --git a/ruoyi-ui/src/views/system/Content/index.vue b/ruoyi-ui/src/views/system/Content/index.vue
index 0201ca3..249d7af 100644
--- a/ruoyi-ui/src/views/system/Content/index.vue
+++ b/ruoyi-ui/src/views/system/Content/index.vue
@@ -58,16 +58,7 @@
v-hasPermi="['system:Content:remove']"
>删除
-
- 导出
-
+
@@ -149,31 +140,13 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 显示
+ 不显示
+