From 82d925fa5ef0fdd2c6206f46f685b36b4050da2e Mon Sep 17 00:00:00 2001
From: liangzongpeng <532365025@qq.com>
Date: Mon, 8 Jul 2024 14:07:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=B7=A5=E7=94=9F=E4=BA=A7=E3=80=81?=
 =?UTF-8?q?=E5=A4=87=E6=A1=88=E5=8F=B7=E3=80=81=E5=90=8D=E7=A7=B0LOGO?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/ReportDetailTable/ReportDetailTableService.cs   | 4 ++--
 Web/.env.development                                        | 4 ++--
 Web/src/layout/footer/index.vue                             | 4 ++--
 Web/src/stores/themeConfig.ts                               | 6 +++---
 Web/src/views/login/component/account.vue                   | 1 +
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Admin.NET/Admin.NET.Application/Service/ReportDetailTable/ReportDetailTableService.cs b/Admin.NET/Admin.NET.Application/Service/ReportDetailTable/ReportDetailTableService.cs
index 035d01f..96927d0 100644
--- a/Admin.NET/Admin.NET.Application/Service/ReportDetailTable/ReportDetailTableService.cs
+++ b/Admin.NET/Admin.NET.Application/Service/ReportDetailTable/ReportDetailTableService.cs
@@ -191,7 +191,7 @@ public class ReportDetailTableService : IDynamicApiController, ITransient
             }
         }
         repeatCodes = codesToKeep;
-        if (repeatCodes!=null&&repeatCodes.Count>0)
+        if (repeatCodes != null && repeatCodes.Count > 0)
         {
             var repeats = repeatCodes.ConvertAll(a => a.Code).Distinct();
             throw Oops.Oh($"条码重复：{string.Join("、", repeats)}");
@@ -261,7 +261,7 @@ public class ReportDetailTableService : IDynamicApiController, ITransient
                 {
                     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);
                     }
                 }
diff --git a/Web/.env.development b/Web/.env.development
index 78ced16..1e13e63 100644
--- a/Web/.env.development
+++ b/Web/.env.development
@@ -1,5 +1,5 @@
 # 本地环境
 ENV = development
 
-# 本地环境接口地址http://localhost:5005     http://139.199.191.197:9005
-VITE_API_URL = http://localhost:5005
\ No newline at end of file
+# 本地环境接口地址http://localhost:5005     http://49.234.181.176:9005
+VITE_API_URL = http://49.234.181.176:9005
\ No newline at end of file
diff --git a/Web/src/layout/footer/index.vue b/Web/src/layout/footer/index.vue
index e32fdd2..a702453 100644
--- a/Web/src/layout/footer/index.vue
+++ b/Web/src/layout/footer/index.vue
@@ -1,8 +1,8 @@
 <template>
 	<div class="layout-footer pb15">
 		<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>
 </template>
diff --git a/Web/src/stores/themeConfig.ts b/Web/src/stores/themeConfig.ts
index 9fcb6eb..c08d44d 100644
--- a/Web/src/stores/themeConfig.ts
+++ b/Web/src/stores/themeConfig.ts
@@ -104,7 +104,7 @@ export const useThemeConfig = defineStore('themeConfig', {
 			// 是否开启水印
 			isWatermark: false,
 			// 水印文案
-			watermarkText: '冠威科技',
+			watermarkText: '冠威云',
 
 			/**
 			 * 其它设置
@@ -137,9 +137,9 @@ export const useThemeConfig = defineStore('themeConfig', {
 			 * 全局网站标题 / 副标题
 			 */
 			// 网站主标题（菜单导航、浏览器当前网页标题）
-			globalTitle: '冠威科技',
+			globalTitle: '博溯星·冠威云',
 			// 网站副标题（登录页顶部文字）
-			globalViceTitle: '冠威科技',
+			globalViceTitle: '博溯星·冠威云',
 			// 网站副标题（登录页顶部文字）
 			globalViceTitleMsg: '',
 			// 默认初始语言，可选值"<zh-cn|en|zh-tw>"，默认 zh-cn
diff --git a/Web/src/views/login/component/account.vue b/Web/src/views/login/component/account.vue
index 9b2c0b8..ec95186 100644
--- a/Web/src/views/login/component/account.vue
+++ b/Web/src/views/login/component/account.vue
@@ -53,6 +53,7 @@
 			</el-button>
 		</el-form-item>
 		<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-form>