gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into main

Browse Source
This commit is contained in:
IMaster 2024-07-05 11:44:44 +08:00
commit 9f2e9229c0
7 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin.NET/Admin.NET.Application/Configuration/CodeGen.json
View File

@ -3,7 +3,7 @@
// 代码生成配置项-程序集名称集合
"CodeGen": {
"EntityAssemblyNames": [ "Admin." ],
"EntityAssemblyNames": [ "Admin.NET.Core", "Admin.NET.Application" ],
"BaseEntityNames": [ "EntityTenantId", "EntityTenant", "EntityTenantBaseData", "EntityBaseData", "EntityBase", "EntityBaseId" ],
"EntityBaseColumn": {
"EntityTenantId": [ "Id", "TenantId" ],

2
Admin.NET/Admin.NET.Core/Entity/SysConfig.cs
View File

@ -12,7 +12,7 @@ namespace Admin.NET.Core;
[SugarTable(null, "系统参数配置表")]
[SysTable]
[SugarIndex("index_{table}_N", nameof(Name), OrderByType.Asc)]
[SugarIndex("index_{table}_C", nameof(Code), OrderByType.Asc)]
[SugarIndex("index_{table}_C", nameof(Code), OrderByType.Asc, IsUnique = true)]
public partial class SysConfig : EntityBase
{
/// <summary>

4
Admin.NET/Admin.NET.Core/Entity/SysOpenAccess.cs
View File

@ -51,8 +51,8 @@ public partial class SysOpenAccess : EntityBase
/// <summary>
/// 绑定用户
/// </summary>
[Newtonsoft.Json.JsonIgnore]
[System.Text.Json.Serialization.JsonIgnore]
//[Newtonsoft.Json.JsonIgnore]
//[System.Text.Json.Serialization.JsonIgnore]
[Navigate(NavigateType.OneToOne, nameof(BindUserId))]
public SysUser BindUser { get; set; }
}

11
Web/src/layout/navBars/topBar/userNews.vue
View File

@ -29,14 +29,16 @@
</div>
</el-tab-pane>
</el-tabs>
<el-dialog v-model="state.dialogVisible" draggable overflow width="769px">
<el-dialog v-model="state.dialogVisible" draggable width="769px">
<template #header>
<div style="color: #fff">
<el-icon size="16" style="margin-right: 10px; display: inline; vertical-align: middle"> <ele-Bell /> </el-icon>
<span>消息详情</span>
<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Bell /> </el-icon>
<span> 消息详情 </span>
</div>
</template>
<p v-html="state.content"></p>
<div class="w-e-text-container">
<div v-html="state.content" data-slate-editor></div>
</div>
<template #footer>
<span class="dialog-footer">
<el-button type="primary" @click="state.dialogVisible = false">确认</el-button>
@ -50,6 +52,7 @@
import { reactive } from 'vue';
import router from '/@/router';
import commonFunction from '/@/utils/commonFunction';
import '@wangeditor/editor/dist/css/style.css';
import { getAPI } from '/@/utils/axios-utils';
import { SysNoticeApi } from '/@/api-services/api';

2
Web/src/theme/index.scss
View File

@ -8,4 +8,4 @@
@import './dark.scss';
@import './iconfont/font_2298093_rnp72ifj3ba.scss';
@import './font-awesome/font-awesome.scss';
@import './vxe.scss';
@import './vxeTable.scss';

28
Web/src/theme/vxe.scss → Web/src/theme/vxeTable.scss
View File

@ -1,6 +1,22 @@
@import 'vxe-table/styles/all.scss';
@import 'vxe-pc-ui/styles/all.scss';
:root {
--vxe-ui-font-family: var(--el-font-family);
// --vxe-ui-font-color: var(--el-text-color-primary); // 原：#606266;
// --vxe-ui-primary-color: var(--el-color-primary); // 原：#409eff;
// --vxe-ui-primary-lighten-color: var(--el-color-primary);
// --vxe-ui-table-row-height-small: 36px; // 原：40px
// --vxe-ui-table-row-height-mini: 32px; // 原：36px
// --vxe-ui-table-row-line-height: 18px; // 原：22px
// // --vxe-ui-table-header-font-weight: 500; // 原 700
// --vxe-ui-table-font-color: var(--el-text-color-primary);
// --vxe-ui-table-header-font-color: var(--el-text-color-primary);
// --vxe-ui-table-footer-font-color: var(--el-text-color-primary);
// --vxe-ui-table-cell-padding-left: 8px; // 原：10px
// --vxe-ui-table-cell-padding-right: 8px; // 原：10px
}
.vxe-toolbar {
padding: 0 0 6px 0;
}
@ -61,9 +77,9 @@
color: unset !important;
}
:deep(.xGrid-style .vxe-body--row.warning-row) {
background-color: var(--el-color-warning-light-9);
}
:deep(.xGrid-style .vxe-body--row.success-row) {
background-color: var(--el-color-success-light-9);
}
// :deep(.xGrid-style .vxe-body--row.warning-row) {
// background-color: var(--el-color-warning-light-9);
// }
// :deep(.xGrid-style .vxe-body--row.success-row) {
// background-color: var(--el-color-success-light-9);
// }

15
Web/src/views/home/notice/index.vue
View File

@ -63,17 +63,19 @@
</vxe-grid>
</el-card>
<el-dialog v-model="state.visible" draggable overflow destroy-on-close width="769px">
<el-dialog v-model="state.isShowDialog" draggable width="769px">
<template #header>
<div style="color: #fff">
<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Bell /> </el-icon>
<span>消息详情</span>
<span> 消息详情 </span>
</div>
</template>
<p v-html="state.content"></p>
<div class="w-e-text-container">
<div v-html="state.content" data-slate-editor></div>
</div>
<template #footer>
<span class="dialog-footer">
<el-button type="primary" @click="state.visible = false">确认</el-button>
<el-button type="primary" @click="state.isShowDialog = false">确认</el-button>
</span>
</template>
</el-dialog>
@ -83,6 +85,7 @@
<script setup lang="ts" name="notice">
import { onMounted, reactive, ref } from 'vue';
import commonFunction from '/@/utils/commonFunction';
import '@wangeditor/editor/dist/css/style.css';
import { VxeGridInstance, VxePagerEvents, VxePagerDefines } from 'vxe-table';
import { useVxeTable } from '/@/hooks/vxeTableOptionsHook';
@ -105,7 +108,7 @@ const state = reactive({
descStr: 'desc', // 降序排序的关键字符
total: 0 as any,
},
visible: false,
isShowDialog: false,
title: '',
content: '',
});
@ -175,7 +178,7 @@ const sortChange = (options: any) => {
// 查看详情
const handleView = async (row: any) => {
state.content = row.sysNotice.content;
state.visible = true;
state.isShowDialog = true;
row.readStatus = 1;
// mittBus.emit('noticeRead', row.sysNotice.id);
await getAPI(SysNoticeApi).apiSysNoticeSetReadPost({ id: row.sysNotice.id });