diff --git a/.idea/misc.xml b/.idea/misc.xml index 28a804d..1c24890 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,4 +3,7 @@ + + \ No newline at end of file diff --git a/src/api/message/message.js b/src/api/message/message.js index bda0394..20c2b42 100644 --- a/src/api/message/message.js +++ b/src/api/message/message.js @@ -8,11 +8,11 @@ export function getMessageList(params) { return Promise.resolve({ total: 5, rows: [ - { id: 1, msgContent: '测试1111', msgRecTime: '2024-08-05 12:31:59', msgStatus: 'unread' }, - { id: 2, msgContent: '测试2222', msgRecTime: '2024-08-05 13:32:01', msgStatus: 'readed' }, - { id: 3, msgContent: '测试333', msgRecTime: '2024-08-05 14:09:07', msgStatus: 'unread' }, - { id: 4, msgContent: '测试4444', msgRecTime: '2024-08-05 15:37:10', msgStatus: 'readed' }, - { id: 5, msgContent: '测试5555', msgRecTime: '2024-08-05 17:29:39', msgStatus: 'unread' } + { id: 1, msgContent: '工具名称为:00071,已发布成功', msgRecTime: '2024-08-05 12:31:59', msgStatus: 'unread' }, + { id: 2, msgContent: '工具名称为:00071,申请使用已审核通过', msgRecTime: '2024-08-05 13:32:01', msgStatus: 'readed' }, + { id: 3, msgContent: '工具名称为:00073,已发布成功', msgRecTime: '2024-08-05 14:09:07', msgStatus: 'unread' }, + // { id: 4, msgContent: '测试4444', msgRecTime: '2024-08-05 15:37:10', msgStatus: 'readed' }, + // { id: 5, msgContent: '测试5555', msgRecTime: '2024-08-05 17:29:39', msgStatus: 'unread' } ], code: 200, msg: '操作成功' diff --git a/src/views/interchange/index.vue b/src/views/interchange/index.vue index 121c88a..a9b1ba1 100644 --- a/src/views/interchange/index.vue +++ b/src/views/interchange/index.vue @@ -21,7 +21,7 @@ @keyup.enter.native="handleQuery" /> - +
- 搜索 + 搜索 重置
@@ -95,8 +95,9 @@ @@ -160,7 +161,7 @@ import toolDetail from "./toolDetail"; export default { name: "User", - dicts: ['sys_normal_disable', 'tool_type'], + dicts: ['sys_normal_disable', 'tool_type','flow_business_status'], components: { Treeselect, blUserSelector, toolDetail }, data() { return { @@ -288,6 +289,7 @@ export default { /** 查询用户列表 */ getList() { this.loading = true; + this.queryParams.status = '2' listTool(this.addDateRange(this.queryParams, this.dateRange)).then(response => { this.toolList = response.rows; this.total = response.total; diff --git a/src/views/interchange/toolDetail.vue b/src/views/interchange/toolDetail.vue index d8bd5a8..6b80ee3 100644 --- a/src/views/interchange/toolDetail.vue +++ b/src/views/interchange/toolDetail.vue @@ -7,14 +7,15 @@
+ 0001 工具名称2 网络工具 单位自建 赵宁宇 - 人力资源部/员工关系组 - 启用中 + 人力资源部 + 在用 主要用于单位网络使用 - 运行良好,可正常使用 + 运行良好,可正常使用 单位网络使用 网络正常 正常开启即可用 diff --git a/src/views/message/index.vue b/src/views/message/index.vue index 8e4a34a..e1d1038 100644 --- a/src/views/message/index.vue +++ b/src/views/message/index.vue @@ -15,36 +15,14 @@
- 搜索 + 搜5索 重置
- -
- -
- -
-
+ +
全部标记已读
@@ -146,6 +124,7 @@ export default { getList() { this.loading = true getMessageList(this.queryParams).then(response => { + console.info("response============", response) this.total = response?.total this.tableList = response?.rows || [] this.loading = false diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 0bded8c..2106ecf 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -63,7 +63,7 @@ @click="handleAdd" v-hasPermi="['system:role:add']" >新增 - 导出 + >导出-->
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 9d9016b..47871e8 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -85,7 +85,7 @@ @click="handleAdd" v-hasPermi="['system:user:add']" >新增 - 删除 导出 + >导出-->
diff --git a/src/views/tool/index.vue b/src/views/tool/index.vue index bdc79c3..c7536b8 100644 --- a/src/views/tool/index.vue +++ b/src/views/tool/index.vue @@ -29,7 +29,7 @@ style="width: 240px" > 工具发布 - 批量删除 + 导出 @@ -109,8 +109,9 @@ @@ -125,11 +126,11 @@ class-name="small-padding fixed-width" >