dyh
/
DigitalFactory
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

返工生产、备案号、名称LOGO

main
liangzongpeng 2024-07-08 14:07:12 +08:00
parent c04c184c93
commit 82d925fa5e
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin.NET/Admin.NET.Application/Service/ReportDetailTable/ReportDetailTableService.cs
View File

@ -191,7 +191,7 @@ public class ReportDetailTableService : IDynamicApiController, ITransient
} }
} }
repeatCodes = codesToKeep; repeatCodes = codesToKeep;
if (repeatCodes!=null&&repeatCodes.Count>0) if (repeatCodes != null && repeatCodes.Count > 0)
{ {
var repeats = repeatCodes.ConvertAll(a => a.Code).Distinct(); var repeats = repeatCodes.ConvertAll(a => a.Code).Distinct();
throw Oops.Oh($"条码重复：{string.Join("、", repeats)}"); throw Oops.Oh($"条码重复：{string.Join("、", repeats)}");
@ -261,7 +261,7 @@ public class ReportDetailTableService : IDynamicApiController, ITransient
{ {
if (!upPrintCodeDetail.Code.Contains("#")) if (!upPrintCodeDetail.Code.Contains("#"))
{ {
upPrintCodeDetail.Code = new string('#', (upPrintCodeDetails.Where(t => t.Code.Contains("#")).Count()) + 1) + upPrintCodeDetail.Code; upPrintCodeDetail.Code = "#" + upPrintCodeDetail.Code;
await _codeDetailService.UpdateByEntity(upPrintCodeDetail); await _codeDetailService.UpdateByEntity(upPrintCodeDetail);
} }
} }

4
Web/.env.development
View File

@ -1,5 +1,5 @@
# 本地环境 # 本地环境
ENV = development ENV = development
# 本地环境接口地址http://localhost:5005 http://139.199.191.197:9005 # 本地环境接口地址http://localhost:5005 http://49.234.181.176:9005
VITE_API_URL = http://localhost:5005 VITE_API_URL = http://49.234.181.176:9005

4
Web/src/layout/footer/index.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div class="layout-footer pb15"> <div class="layout-footer pb15">
<div class="layout-footer-warp"> <div class="layout-footer-warp">
<div>冠威科技</div> <div class="mt5">博溯星 Copyright © 2024 GuanWei All rights reserved.</div>
<div class="mt5">Copyright © 2024 GuanWei All rights reserved.</div> <a href="https://beian.miit.gov.cn/" target="_blank">粤ICP备2024274790号-1</a>
</div> </div>
</div> </div>
</template> </template>

6
Web/src/stores/themeConfig.ts
View File

@ -104,7 +104,7 @@ export const useThemeConfig = defineStore('themeConfig', {
// 是否开启水印 // 是否开启水印
isWatermark: false, isWatermark: false,
// 水印文案 // 水印文案
watermarkText: '冠威科技', watermarkText: '冠威云',
/** /**
* 其它设置 * 其它设置
@ -137,9 +137,9 @@ export const useThemeConfig = defineStore('themeConfig', {
* 全局网站标题 / 副标题 * 全局网站标题 / 副标题
*/ */
// 网站主标题（菜单导航、浏览器当前网页标题） // 网站主标题（菜单导航、浏览器当前网页标题）
globalTitle: '冠威科技', globalTitle: '博溯星·冠威云',
// 网站副标题（登录页顶部文字） // 网站副标题（登录页顶部文字）
globalViceTitle: '冠威科技', globalViceTitle: '博溯星·冠威云',
// 网站副标题（登录页顶部文字） // 网站副标题（登录页顶部文字）
globalViceTitleMsg: '', globalViceTitleMsg: '',
// 默认初始语言，可选值"<zh-cn|en|zh-tw>"，默认 zh-cn // 默认初始语言，可选值"<zh-cn|en|zh-tw>"，默认 zh-cn

1
Web/src/views/login/component/account.vue
View File

@ -53,6 +53,7 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
<div class="font12 mt30 login-animation4 login-msg">{{ $t('message.mobile.msgText') }}</div> <div class="font12 mt30 login-animation4 login-msg">{{ $t('message.mobile.msgText') }}</div>
<a href="https://beian.miit.gov.cn/" target="_blank" style="text-align: center;" >博溯星 粤ICP备2024274790号-1</a>
<!-- <el-button type="primary" round v-waves @click="weixinSignIn" :loading="state.loading.signIn"></el-button> --> <!-- <el-button type="primary" round v-waves @click="weixinSignIn" :loading="state.loading.signIn"></el-button> -->
</el-form> </el-form>