Merge remote-tracking branch 'origin/develop' into local-test

修改icon图标
ISCS底部报警
2024-10-15 09:56:05 +08:00 · 2024-10-15 09:55:43 +08:00 · 2024-10-14 17:12:22 +08:00 · 2024-10-14 15:36:57 +08:00 · 2024-10-12 17:02:24 +08:00 · 2024-10-11 17:14:10 +08:00
7 changed files with 34 additions and 11 deletions
--- a/index.html
+++ b/index.html
@ -3,17 +3,40 @@
  <head>
    <title><%= productName %></title>

-    <meta charset="utf-8">
-    <meta name="description" content="<%= productDescription %>">
-    <meta name="format-detection" content="telephone=no">
-    <meta name="msapplication-tap-highlight" content="no">
-    <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">
+    <meta charset="utf-8" />
+    <meta name="description" content="<%= productDescription %>" />
+    <meta name="format-detection" content="telephone=no" />
+    <meta name="msapplication-tap-highlight" content="no" />
+    <meta
+      name="viewport"
+      content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"
+    />

-    <link rel="icon" type="image/png" sizes="128x128" href="icons/favicon-128x128.png">
-    <link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png">
-    <link rel="icon" type="image/ico" href="favicon.ico">
+    <link
+      rel="icon"
+      type="image/png"
+      sizes="128x128"
+      href="icons/favicon-128x128.png"
+    />
+    <link
+      rel="icon"
+      type="image/png"
+      sizes="96x96"
+      href="icons/favicon-96x96.png"
+    />
+    <link
+      rel="icon"
+      type="image/png"
+      sizes="32x32"
+      href="icons/favicon-32x32.png"
+    />
+    <link
+      rel="icon"
+      type="image/png"
+      sizes="16x16"
+      href="icons/favicon-16x16.png"
+    />
+    <link rel="icon" type="image/ico" href="logo_changan.png" />
  </head>
  <body>
    <!-- quasar:entry-point -->
--- a/public/icons/favicon-128x128.png
+++ b/public/icons/favicon-128x128.png
--- a/public/icons/favicon-16x16.png
+++ b/public/icons/favicon-16x16.png
--- a/public/icons/favicon-32x32.png
+++ b/public/icons/favicon-32x32.png
--- a/public/icons/favicon-96x96.png
+++ b/public/icons/favicon-96x96.png
--- a/public/logo_changan.png
+++ b/public/logo_changan.png
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit ea8b911846b63f649a254250ba81c7a804da332a
+Subproject commit 87726ae0917aedf814210d9725ee354aa15bb1f9
Author	SHA1	Message	Date
joylink_fanyuhong	ca12e4d1a9	Merge remote-tracking branch 'origin/develop' into local-test All checks were successful local-test-CICD / Docker-Build (push) Successful in 2m20s Details	2024-10-15 09:56:05 +08:00
joylink_fanyuhong	391863ee21	修改icon图标	2024-10-15 09:55:43 +08:00
joylink_zhaoerwei	16230d77e4	ISCS底部报警	2024-10-14 17:12:22 +08:00
joylink_fanyuhong	0787c7419e	代码调整	2024-10-14 15:36:57 +08:00
joylink_zhaoerwei	aacfdf8b2d	完善绘制风格配置	2024-10-12 17:02:24 +08:00
joylink_fanyuhong	975a8a89aa	Merge branch 'develop' of https://gitea.joylink.club/joylink/rtss-simulation-app-client into develop	2024-10-11 17:14:10 +08:00
joylink_fanyuhong	37c56e2962	删除fas遗留文件	2024-10-11 17:14:08 +08:00
joylink_zhaoerwei	38bc44f2f9	绘制选择bug赞提（粗处理）	2024-10-11 17:07:53 +08:00
joylink_zhaoerwei	8dc7214ceb	公共的图形——圆	2024-10-11 15:16:31 +08:00
joylink_fanyuhong	c5beb9fbfd	Merge branch 'develop' of https://gitea.joylink.club/joylink/rtss-simulation-app-client into develop	2024-10-11 09:57:41 +08:00
joylink_fanyuhong	fd0bfb0ab2	同步数据调整	2024-10-11 09:52:46 +08:00
joylink_zhaoerwei	63eff006b0	修改矩形碰撞检测+动态加载绘制工具	2024-10-10 17:19:36 +08:00