admin/wisdomisitezwfront-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'zhipeng_dev' into 'shenzhen-dev'

Browse Source 
feat: 通知公告我已知晓优化

See merge request !8
This commit is contained in:
Jane 2023-05-23 15:24:52 +08:00
commit 29c0e5333e
10 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/routers/modules/dynamicRouter.ts
View File

@ -53,7 +53,7 @@ export const initDynamicRouter = async (params?: any) => {
} else { } else {
router.addRoute("layout", item); router.addRoute("layout", item);
if (globalStore.path) { if (globalStore.path) {
console.log("exec"); // console.log("exec");
router.push(globalStore.path); router.push(globalStore.path);
// globalStore.setPath(null); // globalStore.setPath(null);

3
src/views/enterprise/notice/myReceive/index.scss
View File

@ -4,9 +4,6 @@
.el-table :deep(.el-table__header th) { .el-table :deep(.el-table__header th) {
height: 36px; height: 36px;
} }
.el-table :deep(.el-table__inner-wrapper) {
min-height: 120px;
}
.list { .list {
margin: 18px 0 32px 0; margin: 18px 0 32px 0;

2
src/views/enterprise/notice/myReceive/index.vue
View File

@ -62,7 +62,7 @@
</el-table> </el-table>
<template #footer> <template #footer>
<el-button type="primary" v-if="!store.isManager" @click="onKnow">我已知晓</el-button> <el-button type="primary" v-if="!store.isManager" @click="onKnow">我已知晓</el-button>
<el-button type="primary" @click="visible = false">关闭</el-button> <el-button type="primary" v-else @click="visible = false">关闭</el-button>
</template> </template>
</el-dialog> </el-dialog>
<el-dialog v-model="fileVisible" title="查看附件" width="30%" show-close> <el-dialog v-model="fileVisible" title="查看附件" width="30%" show-close>

6
src/views/goverment/notice/myPosted/index.scss
View File

@ -4,9 +4,9 @@
.el-table :deep(.el-table__header th) { .el-table :deep(.el-table__header th) {
height: 36px; height: 36px;
} }
.el-table :deep(.el-table__inner-wrapper) { // .el-table :deep(.el-table__inner-wrapper) {
min-height: 120px; // min-height: 120px;
} // }
.list { .list {
margin: 18px 0 32px 0; margin: 18px 0 32px 0;

12
src/views/goverment/notice/myPosted/index.vue
View File

@ -36,7 +36,6 @@
<el-table <el-table
:data="annexFiles" :data="annexFiles"
border border
max-height="200"
class="el-table" class="el-table"
:header-cell-style="{ backgroundColor: '#e1eeff', textAlign: 'center' }" :header-cell-style="{ backgroundColor: '#e1eeff', textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }" :cell-style="{ textAlign: 'center' }"
@ -66,8 +65,8 @@
<el-table-column prop="readTime" label="查看时间" /> <el-table-column prop="readTime" label="查看时间" />
</el-table> </el-table>
<template #footer> <template #footer>
<el-button type="primary" v-if="!store.isManager" @click="onKnow">我已知晓</el-button> <!-- <el-button type="primary" v-if="!store.isManager" @click="onKnow">我已知晓</el-button> -->
<el-button type="primary" v-else @click="visible = false">关闭</el-button> <el-button type="primary" @click="visible = false">关闭</el-button>
</template> </template>
</el-dialog> </el-dialog>
<el-dialog v-model="fileVisible" title="查看附件" width="30%" show-close> <el-dialog v-model="fileVisible" title="查看附件" width="30%" show-close>
@ -173,13 +172,6 @@ const onLook = async row => {
rowNoticeId.value = row.noticeId; rowNoticeId.value = row.noticeId;
}; };
const onKnow = async () => {
await noticeReadMyPost({ noticeId: rowNoticeId.value });
visible.value = false;
ElMessage.success("已知晓");
proTable.value.getTableList();
};
// 修改数据按钮 // 修改数据按钮
const handleEditItem = async (row: any) => { const handleEditItem = async (row: any) => {
const { result } = await noticeDetailMyPost({ noticeId: row.noticeId }); const { result } = await noticeDetailMyPost({ noticeId: row.noticeId });

3
src/views/goverment/notice/myReceive/index.scss
View File

@ -4,9 +4,6 @@
.el-table :deep(.el-table__header th) { .el-table :deep(.el-table__header th) {
height: 36px; height: 36px;
} }
.el-table :deep(.el-table__inner-wrapper) {
min-height: 120px;
}
.list { .list {
margin: 18px 0 32px 0; margin: 18px 0 32px 0;

2
src/views/goverment/notice/myReceive/index.vue
View File

@ -62,7 +62,7 @@
</el-table> </el-table>
<template #footer> <template #footer>
<el-button type="primary" v-if="!store.isManager" @click="onKnow">我已知晓</el-button> <el-button type="primary" v-if="!store.isManager" @click="onKnow">我已知晓</el-button>
<el-button type="primary" @click="visible = false">关闭</el-button> <el-button type="primary" v-else @click="visible = false">关闭</el-button>
</template> </template>
</el-dialog> </el-dialog>
<el-dialog v-model="fileVisible" title="查看附件" width="30%" show-close> <el-dialog v-model="fileVisible" title="查看附件" width="30%" show-close>

2
src/views/home/index.vue
View File

@ -90,8 +90,6 @@ const onChange = async (val: string) => {
// ); // );
onMounted(async () => { onMounted(async () => {
console.log(import.meta.url);
const res1 = await getHomePage(); const res1 = await getHomePage();
data.value = res1.result || {}; data.value = res1.result || {};
const res = await getModuleList(); const res = await getModuleList();

3
src/views/project/notice/myReceive/index.scss
View File

@ -4,9 +4,6 @@
.el-table :deep(.el-table__header th) { .el-table :deep(.el-table__header th) {
height: 36px; height: 36px;
} }
.el-table :deep(.el-table__inner-wrapper) {
min-height: 120px;
}
.list { .list {
margin: 18px 0 32px 0; margin: 18px 0 32px 0;

2
src/views/project/notice/myReceive/index.vue
View File

@ -62,7 +62,7 @@
</el-table> </el-table>
<template #footer> <template #footer>
<el-button type="primary" v-if="!store.isManager" @click="onKnow">我已知晓</el-button> <el-button type="primary" v-if="!store.isManager" @click="onKnow">我已知晓</el-button>
<el-button type="primary" @click="visible = false">关闭</el-button> <el-button type="primary" v-else @click="visible = false">关闭</el-button>
</template> </template>
</el-dialog> </el-dialog>
<el-dialog v-model="fileVisible" title="查看附件" width="30%" show-close> <el-dialog v-model="fileVisible" title="查看附件" width="30%" show-close>