diff --git a/.env b/.env index 6f13cd86..e27eea0a 100644 --- a/.env +++ b/.env @@ -1,5 +1,4 @@ # 网站主标题 -#VITE_GLOBAL_TITLE= '浦江县机关事务智慧后勤一体化平台' VITE_GLOBAL_TITLE= '智慧后勤一体化平台' # footer diff --git a/.env.dev b/.env.dev index 8c08ab94..35f5f738 100644 --- a/.env.dev +++ b/.env.dev @@ -8,7 +8,8 @@ VITE_OPEN = true ENV = 'dev' # ADMIN 服务地址 -VITE_ADMIN_PROXY_PATH = https://www.zianxin.com +# VITE_ADMIN_PROXY_PATH = https://www.zianxin.com +VITE_ADMIN_PROXY_PATH = https://rj4jv5rwqs.by.takin.cc # 图片访问基础地址 VITE_IMAGE_BASE_PATH = https://www.zianxin.com/api diff --git a/index.html b/index.html index 4421d6d8..89d20b10 100644 --- a/index.html +++ b/index.html @@ -1,35 +1,29 @@ - - + + - - + + - - + + - - - + + + - + - + - 浦江县机关事务智慧后勤一体化平台 + 智慧后勤一体化平台 diff --git a/public/favicon.ico b/public/favicon.ico index e70bfa0e..1722dec6 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/api/admin/dept.ts b/src/api/admin/dept.ts index e170e8ab..36535024 100644 --- a/src/api/admin/dept.ts +++ b/src/api/admin/dept.ts @@ -1,8 +1,13 @@ import request from "/@/utils/request" +/** + * TODO 有/admin/dept/tree方法 + * v1会查询所有的部门(没有权限的部门会上锁) + * v2只会查询当前用户有权限的部门 + */ export const deptTree = (params?: Object) => { return request({ - url: "/admin/dept/tree", + url: "/admin/dept/tree/v2", method: "get", params, }) diff --git a/src/api/integrated/adRecord.ts b/src/api/integrated/adRecord.ts new file mode 100755 index 00000000..1f7fd304 --- /dev/null +++ b/src/api/integrated/adRecord.ts @@ -0,0 +1,40 @@ +import request from "/@/utils/request" + +export function fetchList(query?: Object) { + return request({ + url: "/integrated/ad-record/page", + method: "get", + params: query, + }) +} + +export function addObj(obj?: Object) { + return request({ + url: "/integrated/ad-record", + method: "post", + data: obj, + }) +} + +export function getObj(id?: string) { + return request({ + url: "/integrated/ad-record/" + id, + method: "get", + }) +} + +export function delObjs(ids?: Object) { + return request({ + url: "/integrated/ad-record", + method: "delete", + data: ids, + }) +} + +export function putObj(obj?: Object) { + return request({ + url: "/integrated/ad-record", + method: "put", + data: obj, + }) +} diff --git a/src/views/act/act-cancel/index.vue b/src/views/act/act-cancel/index.vue index 2d296bd0..e4073e5b 100644 --- a/src/views/act/act-cancel/index.vue +++ b/src/views/act/act-cancel/index.vue @@ -24,38 +24,22 @@
- + 新 增 - + 删除 - +
- + @@ -68,14 +52,8 @@ @@ -95,14 +73,17 @@ - + diff --git a/src/views/act/cancel-item/index.vue b/src/views/act/cancel-item/index.vue index 678ca588..cc76a180 100644 --- a/src/views/act/cancel-item/index.vue +++ b/src/views/act/cancel-item/index.vue @@ -22,15 +22,9 @@ - + @@ -47,21 +41,15 @@ - + diff --git a/src/views/ad/record/index.vue b/src/views/ad/record/index.vue new file mode 100755 index 00000000..e4c04ad1 --- /dev/null +++ b/src/views/ad/record/index.vue @@ -0,0 +1,117 @@ + + + \ No newline at end of file diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue index 9d3b6e0a..6e117895 100644 --- a/src/views/admin/system/user/index.vue +++ b/src/views/admin/system/user/index.vue @@ -74,6 +74,19 @@ inactive-value="9"> + + +