diff --git a/common/system/config.js b/common/system/config.js
deleted file mode 100644
index a404d82..0000000
--- a/common/system/config.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import request from '@/utils/request'
-
-// 查询参数列表
-export function listConfig(query) {
- return request({
- url: '/system/config/list',
- method: 'get',
- params: query
- })
-}
-
-// 查询参数详细
-export function getConfig(configId) {
- return request({
- url: '/system/config/' + configId,
- method: 'get'
- })
-}
-
-// 根据参数键名查询参数值
-export function getConfigKey(configKey) {
- return request({
- url: '/system/config/configKey/' + configKey,
- method: 'get'
- })
-}
-
-// 新增参数配置
-export function addConfig(data) {
- return request({
- url: '/system/config',
- method: 'post',
- data: data
- })
-}
-
-// 修改参数配置
-export function updateConfig(data) {
- return request({
- url: '/system/config',
- method: 'put',
- data: data
- })
-}
-
-// 删除参数配置
-export function delConfig(configId) {
- return request({
- url: '/system/config/' + configId,
- method: 'delete'
- })
-}
-
-// 刷新参数缓存
-export function refreshCache() {
- return request({
- url: '/system/config/refreshCache',
- method: 'delete'
- })
-}
diff --git a/common/system/dept.js b/common/system/dept.js
deleted file mode 100644
index 9f8864b..0000000
--- a/common/system/dept.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import request from '@/utils/request'
-
-// 查询部门列表
-export function listDept(query) {
- return request({
- url: '/system/dept/list',
- method: 'get',
- params: query
- })
-}
-
-// 查询部门列表(排除节点)
-export function listDeptExcludeChild(deptId) {
- return request({
- url: '/system/dept/list/exclude/' + deptId,
- method: 'get'
- })
-}
-
-// 查询部门详细
-export function getDept(deptId) {
- return request({
- url: '/system/dept/' + deptId,
- method: 'get'
- })
-}
-
-// 新增部门
-export function addDept(data) {
- return request({
- url: '/system/dept',
- method: 'post',
- data: data
- })
-}
-
-// 修改部门
-export function updateDept(data) {
- return request({
- url: '/system/dept/edit',
- method: 'post',
- data: data
- })
-}
-
-// 删除部门
-export function delDept(deptId) {
- return request({
- url: "/mz/apartment/delete/" + deptId,
- method: "post",
- });
-}
-
-// 上传部门图片
-export function uploadDeptImages(data) {
- return request({
- url: '/system/dept/upload',
- method: 'post',
- data: data,
- headers: {
- 'Content-Type': 'multipart/form-data'
- }
- })
-}
-
-// 房屋专属左侧组织树
-export function getdeptList() {
- return request({
- url: '/mz/building/getdeptList',
- method: 'get'
- })
-}
\ No newline at end of file
diff --git a/common/system/menu.js b/common/system/menu.js
deleted file mode 100644
index 6e70be1..0000000
--- a/common/system/menu.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import request from '@/utils/request'
-
-// 查询菜单列表
-export function listMenu(query) {
- return request({
- url: '/system/menu/list',
- method: 'get',
- params: query
- })
-}
-
-// 查询菜单详细
-export function getMenu(menuId) {
- return request({
- url: '/system/menu/' + menuId,
- method: 'get'
- })
-}
-
-// 查询菜单下拉树结构
-export function treeselect() {
- return request({
- url: '/system/menu/treeselect',
- method: 'get'
- })
-}
-
-// 根据角色ID查询菜单下拉树结构
-export function roleMenuTreeselect(roleId) {
- return request({
- url: '/system/menu/roleMenuTreeselect/' + roleId,
- method: 'get'
- })
-}
-
-// 新增菜单
-export function addMenu(data) {
- return request({
- url: '/system/menu',
- method: 'post',
- data: data
- })
-}
-
-// 修改菜单
-export function updateMenu(data) {
- return request({
- url: '/system/menu/update',
- method: 'post',
- data: data
- })
-}
-
-// 删除菜单
-export function delMenu(menuId) {
- return request({
- url: '/system/menu/delete/' + menuId,
- method: 'post'
- })
-}
-// 清除缓存
-export const clearCache = () => {
- return request({
- url: '/cache/clearAll',
- method: 'get'
- })
-}
-// 清除缓存
-export const clearCache1 = () => {
- return request({
- url: '/static/count',
- method: 'get'
- })
-}
\ No newline at end of file
diff --git a/common/system/notice.js b/common/system/notice.js
deleted file mode 100644
index c274ea5..0000000
--- a/common/system/notice.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询公告列表
-export function listNotice(query) {
- return request({
- url: '/system/notice/list',
- method: 'get',
- params: query
- })
-}
-
-// 查询公告详细
-export function getNotice(noticeId) {
- return request({
- url: '/system/notice/' + noticeId,
- method: 'get'
- })
-}
-
-// 新增公告
-export function addNotice(data) {
- return request({
- url: '/system/notice',
- method: 'post',
- data: data
- })
-}
-
-// 修改公告
-export function updateNotice(data) {
- return request({
- url: '/system/notice',
- method: 'put',
- data: data
- })
-}
-
-// 删除公告
-export function delNotice(noticeId) {
- return request({
- url: '/system/notice/' + noticeId,
- method: 'delete'
- })
-}
\ No newline at end of file
diff --git a/common/system/post.js b/common/system/post.js
deleted file mode 100644
index 1a8e9ca..0000000
--- a/common/system/post.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询岗位列表
-export function listPost(query) {
- return request({
- url: '/system/post/list',
- method: 'get',
- params: query
- })
-}
-
-// 查询岗位详细
-export function getPost(postId) {
- return request({
- url: '/system/post/' + postId,
- method: 'get'
- })
-}
-
-// 新增岗位
-export function addPost(data) {
- return request({
- url: '/system/post',
- method: 'post',
- data: data
- })
-}
-
-// 修改岗位
-export function updatePost(data) {
- return request({
- url: '/system/post',
- method: 'put',
- data: data
- })
-}
-
-// 删除岗位
-export function delPost(postId) {
- return request({
- url: '/system/post/' + postId,
- method: 'delete'
- })
-}
diff --git a/common/system/role.js b/common/system/role.js
deleted file mode 100644
index aadd9ff..0000000
--- a/common/system/role.js
+++ /dev/null
@@ -1,119 +0,0 @@
-import request from '@/utils/request'
-
-// 查询角色列表
-export function listRole(query) {
- return request({
- url: '/system/role/list',
- method: 'get',
- params: query
- })
-}
-
-// 查询角色详细
-export function getRole(roleId) {
- return request({
- url: '/system/role/' + roleId,
- method: 'get'
- })
-}
-
-// 新增角色
-export function addRole(data) {
- return request({
- url: '/system/role',
- method: 'post',
- data: data
- })
-}
-
-// 修改角色
-export function updateRole(data) {
- return request({
- url: '/system/role/update',
- method: 'post',
- data: data
- })
-}
-
-// 角色数据权限
-export function dataScope(data) {
- return request({
- url: '/system/role/dataScope',
- method: 'post',
- data: data
- })
-}
-
-// 角色状态修改
-export function changeRoleStatus(roleId, status) {
- const data = {
- roleId,
- status
- }
- return request({
- url: '/system/role/changeStatus',
- method: 'put',
- data: data
- })
-}
-
-// 删除角色
-export function delRole(roleId) {
- return request({
- url: '/system/role/delete/' + roleId,
- method: 'post'
- })
-}
-
-// 查询角色已授权用户列表
-export function allocatedUserList(query) {
- return request({
- url: '/system/role/authUser/allocatedList',
- method: 'get',
- params: query
- })
-}
-
-// 查询角色未授权用户列表
-export function unallocatedUserList(query) {
- return request({
- url: '/system/role/authUser/unallocatedList',
- method: 'get',
- params: query
- })
-}
-
-// 取消用户授权角色
-export function authUserCancel(data) {
- return request({
- url: '/system/role/authUser/cancel',
- method: 'post',
- data: data
- })
-}
-
-// 批量取消用户授权角色
-export function authUserCancelAll(data) {
- return request({
- url: '/system/role/authUser/cancelAll',
- method: 'post',
- params: data
- })
-}
-
-// 授权用户选择
-export function authUserSelectAll(data) {
- return request({
- url: '/system/role/authUser/selectAll',
- method: 'get',
- params: data
- })
-}
-
-// 根据角色ID查询部门树结构
-export function deptTreeSelect(roleId) {
- return request({
- url: '/system/role/deptTree/' + roleId,
- method: 'get'
- })
-}
diff --git a/common/system/user.js b/common/system/user.js
deleted file mode 100644
index f3f5a06..0000000
--- a/common/system/user.js
+++ /dev/null
@@ -1,136 +0,0 @@
-import request from '@/utils/request'
-import { parseStrEmpty } from "@/utils/ruoyi";
-
-// 查询用户列表
-export function listUser(query) {
- return request({
- url: '/system/user/list',
- method: 'get',
- params: query
- })
-}
-
-// 查询用户详细
-export function getUser(userId) {
- return request({
- url: '/system/user/' + parseStrEmpty(userId),
- method: 'get'
- })
-}
-
-// 新增用户
-export function addUser(data) {
- return request({
- url: '/system/user',
- method: 'post',
- data: data
- })
-}
-
-// 修改用户
-export function updateUser(data) {
- return request({
- url: '/system/user/update',
- method: 'post',
- data: data
- })
-}
-
-// 删除用户
-export function delUser(userId) {
- return request({
- url: '/system/user/delete/' + userId,
- method: 'post'
- })
-}
-
-// 用户密码重置
-export function resetUserPwd(userId, password) {
- const data = {
- userId,
- password
- }
- return request({
- url: '/system/user/resetPwd',
- method: 'post',
- data: data
- })
-}
-
-// 用户状态修改
-export function changeUserStatus(userId, status) {
- const data = {
- userId,
- status
- }
- return request({
- url: '/system/user/changeStatus',
- method: 'post',
- data: data
- })
-}
-
-// 查询用户个人信息
-export function getUserProfile() {
- return request({
- url: '/system/user/profile',
- method: 'get'
- })
-}
-
-// 修改用户个人信息
-export function updateUserProfile(data) {
- return request({
- url: '/system/user/profile',
- method: 'put',
- data: data
- })
-}
-
-// 用户密码重置
-export function updateUserPwd(oldPassword, newPassword) {
- const data = {
- oldPassword,
- newPassword
- }
- return request({
- url: '/system/user/profile/updatePwd',
- method: 'put',
- params: data
- })
-}
-
-// 用户头像上传
-export function uploadAvatar(data) {
- return request({
- url: '/system/user/profile/avatar',
- method: 'post',
- headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
- data: data
- })
-}
-
-// 查询授权角色
-export function getAuthRole(userId) {
- return request({
- url: '/system/user/authRole/' + userId,
- method: 'get'
- })
-}
-
-// 保存授权角色
-export function updateAuthRole(data) {
- return request({
- url: '/system/user/authRole',
- method: 'get',
- params: data
- })
-}
-
-// 查询部门下拉树结构
-export function deptTreeSelect() {
- return request({
- url: '/system/user/deptTree',
- method: 'get'
- })
-}
diff --git a/pages.json b/pages.json
index 4e1a25b..a51f837 100644
--- a/pages.json
+++ b/pages.json
@@ -22,20 +22,7 @@
"disableScroll": true
}
},
- {
- "path": "pages/tabBar/bsPage/bsRecord",
- "style": {
- "navigationBarTitleText": "报事",
- "disableScroll": true
- }
- },
- {
- "path": "pages/tabBar/bsPage/bsReport",
- "style": {
- "navigationBarTitleText": "上报",
- "disableScroll": true
- }
- },
+
{
"path": "pages/tabBar/msg/index",
"style": {
@@ -108,6 +95,20 @@
"enablePullDownRefresh": true,
"onReachBottomDistance": 100
}
+ },
+ {
+ "path": "bsPage/bsRecord",
+ "style": {
+ "navigationBarTitleText": "报事",
+ "disableScroll": true
+ }
+ },
+ {
+ "path": "bsPage/bsReport",
+ "style": {
+ "navigationBarTitleText": "上报",
+ "disableScroll": true
+ }
}
]
}],
diff --git a/pages/tabBar/mine/index.vue b/pages/tabBar/mine/index.vue
index 7e88d58..7ce8985 100644
--- a/pages/tabBar/mine/index.vue
+++ b/pages/tabBar/mine/index.vue
@@ -2,12 +2,14 @@
- {{
- userInfo.userName
- }}
+ {{ userInfo.userName }}
@@ -37,7 +32,7 @@ import { logout } from "@/pages/api";
export default {
data() {
return {
- userInfo:{},
+ userInfo: {},
menuList: [
// {
// icon: "/static/img/repair.png",
@@ -60,17 +55,6 @@ export default {
// url: "/pagesA/mine/changePwd",
// },
],
- btnStyle: {
- position: "fixed",
- left: "40rpx",
- bottom: 0,
- width: "60%",
- height: "44px",
- fontSize: "18px",
- margin: "50px",
- marginTop: "200rpx",
- background: "linear-gradient(90deg, #0DC6C6 0%, #13C2C2 100%)",
- },
};
},
onLoad() {
@@ -88,6 +72,10 @@ export default {
console.log("userInfo", userInfo);
},
methods: {
+ isNetAvatar(url) {
+ return typeof url === "string" && /^https?:\/\//.test(url);
+ },
+
async handleLogout() {
try {
await logout();
@@ -107,6 +95,29 @@ export default {
diff --git a/pagesA/release/detail/detail.vue b/pagesA/release/detail/detail.vue
index 6f7c61b..fbf3361 100644
--- a/pagesA/release/detail/detail.vue
+++ b/pagesA/release/detail/detail.vue
@@ -121,7 +121,7 @@ export default {
userInfo: {}, // 用户信息
roomDetail: {}, // 房间详情
btnStyle:
- "background:linear-gradient(90deg,#0DC6C6 0%,#13C2C2 100%);font-size:36rpx;border-radius:48rpx;width:60vw;height:80rpx;",
+ "background:linear-gradient(90deg,#0DC6C6 0%,#13C2C2 100%);font-size:36rpx;border-radius:48rpx;width:60vw;height:80rpx;border:none;",
deviceList: [
{ name: "空调", status: "完好" },
{ name: "冰箱", status: "完好" },
diff --git a/static/img/avatar.png b/static/img/avatar.png
new file mode 100644
index 0000000..765f631
Binary files /dev/null and b/static/img/avatar.png differ
diff --git a/static/img/消息-灰.png b/static/img/消息-灰.png
index 98c3fa3..50cc7e0 100644
Binary files a/static/img/消息-灰.png and b/static/img/消息-灰.png differ
diff --git a/static/img/消息.png b/static/img/消息.png
index c4573a8..ecefb02 100644
Binary files a/static/img/消息.png and b/static/img/消息.png differ
diff --git a/utils/config.js b/utils/config.js
index 0aa01f0..7c2baad 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -1 +1,2 @@
export const baseUrl = "http://219.146.91.110:30801/mz-api";
+// export const baseUrl = "https://zsbz.qdcfy.com/mz-api";