From e90e6a05c0e2c0808baaff8f0d2562d5258d1bb7 Mon Sep 17 00:00:00 2001
From: chenxing <chenxing@bestsch.com>
Date: Thu, 13 Aug 2026 11:59:43 +0800
Subject: [PATCH 1/3] ci

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index f89a32d..bd9183f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,7 +8,7 @@
             </transition>
             <div v-else class="no-authority-wrap">
                 <h3>暂无权限</h3>
-                <h6>如需查看，请联络管理员为您分配权限</h6>
+                <h6>如需查看，请联络管理员为您分配权限!</h6>
             </div>
         </div>
         <!-- <Modal v-model="isAlertModal" :closable="false" :mask-closable="false" title="更新提示" width="830">

From 1e06cabfbeb36302f724956be512102a28c42059 Mon Sep 17 00:00:00 2001
From: chenxing <chenxing@yunhai.com>
Date: Thu, 13 Aug 2026 12:02:48 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20npm=20ci=20->=20npm=20install?=
 =?UTF-8?q?=EF=BC=88lock=20=E4=B8=8D=E5=90=8C=E6=AD=A5=E8=A7=84=E9=81=BF?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/deploy.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 7adb71b..bd89cd0 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -56,7 +56,10 @@ jobs:
             # 去掉 Windows 专用 sass 二进制路径（Linux 容器内该路径无效，否则 build 报错）
             # .npmrc 被 gitignore、CI 克隆下来没有它，故仅在存在时才删（缺失不报错）
             if [ -f .npmrc ]; then sed -i "/SASS_BINARY_PATH/d" .npmrc; fi
-            npm ci
+            # 用 npm install 而非 npm ci：仓库 package-lock.json 与 package.json 不同步
+            #（sortablejs 锁 1.10.2 但 package.json 要求 1.15.7），npm ci 会强校验同步而失败；
+            # npm install 会按 package.json 重新对齐 lock 并安装，避免阻塞部署。
+            npm install
             npm run build
           '
 

From bbd9e23187d859b49f2753bdbed61ad2d7b1ffb0 Mon Sep 17 00:00:00 2001
From: chenxing <chenxing@bestsch.com>
Date: Thu, 13 Aug 2026 12:04:14 +0800
Subject: [PATCH 3/3] ci

---
 src/App.vue | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index bd9183f..88f6d57 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,7 +8,7 @@
             </transition>
             <div v-else class="no-authority-wrap">
                 <h3>暂无权限</h3>
-                <h6>如需查看，请联络管理员为您分配权限!</h6>
+                <h6>如需查看，请联络管理员为您分配权限</h6>
             </div>
         </div>
         <!-- <Modal v-model="isAlertModal" :closable="false" :mask-closable="false" title="更新提示" width="830">
@@ -105,24 +105,26 @@ export default {
                     APIConfig.Base.GetUserMod,
                     null,
                     resp => {
-                        let resps={"code":0,"msg":"","data":
-                        [
-                            {"id":1493,"appId":551,"modId":1,"name":"学制选择","parentId":0,"path":null,"level":0,"page":"/","icon":null,"orderNumber":1493,"usable":true,"children":[],"modules":[]},
-                            {"id":1494,"appId":551,"modId":2,"name":"时段设置","parentId":0,"path":null,"level":0,"page":"/itemSet","icon":null,"orderNumber":1494,"usable":true,"children":[],"modules":[]},
-                            {"id":1494,"appId":551,"modId":3,"name":"区域操作日志","parentId":0,"path":null,"level":0,"page":"/areaOperateDaily","icon":null,"orderNumber":1494,"usable":true,"children":[],"modules":[]},
-                            {"id":1494,"appId":551,"modId":4,"name":"学校设置","parentId":0,"path":null,"level":0,"page":"/schoolSetting","icon":null,"orderNumber":1494,"usable":true,"children":[],"modules":[]},
-                            {"id":1494,"appId":551,"modId":5,"name":"课程设置","parentId":0,"path":null,"level":0,"page":"/subjectManForZy","icon":null,"orderNumber":1494,"usable":true,"children":[],"modules":[]},
-                            {"id":1494,"appId":551,"modId":6,"name":"学科管理","parentId":0,"path":null,"level":0,"page":"/subjectSetzhi","icon":null,"orderNumber":1494,"usable":true,"children":[],"modules":[]},
-                            {"id":1494,"appId":551,"modId":7,"name":"班级管理","parentId":0,"path":null,"level":0,"page":"/classManage","icon":null,"orderNumber":1494,"usable":true,"children":[],"modules":[]},
-                            {"id":1494,"appId":551,"modId":8,"name":"选修班管理","parentId":0,"path":null,"level":0,"page":"/electiveClassManage","icon":null,"orderNumber":1494,"usable":true,"children":[],"modules":[]},
-                            {"id":1494,"appId":551,"modId":9,"name":"教师管理","parentId":0,"path":null,"level":0,"page":"/teacherManage","icon":null,"orderNumber":1494,"usable":true,"children":[],"modules":[]},
-                            {"id":1494,"appId":551,"modId":10,"name":"学生管理","parentId":0,"path":null,"level":0,"page":"/studentManage","icon":null,"orderNumber":1494,"usable":true,"children":[],"modules":[]},
-                            {"id":1494,"appId":551,"modId":11,"name":"历史查询","parentId":0,"path":null,"level":0,"page":"/historySearch","icon":null,"orderNumber":1494,"usable":true,"children":[],"modules":[]},
-                            {"id":1494,"appId":551,"modId":12,"name":"学生异动管理","parentId":0,"path":null,"level":0,"page":"/studentYDManage","icon":null,"orderNumber":1494,"usable":true,"children":[],"modules":[]},
-                            {"id":1494,"appId":551,"modId":13,"name":"教师转入管理","parentId":0,"path":null,"level":0,"page":"/zhuanruinfo","icon":null,"orderNumber":1494,"usable":true,"children":[],"modules":[]},
-                            {"id":1494,"appId":551,"modId":14,"name":"学生转入管理","parentId":0,"path":null,"level":0,"page":"/zhuanruinfostu","icon":null,"orderNumber":1494,"usable":true,"children":[],"modules":[]},
-                            {"id":1494,"appId":551,"modId":15,"name":"日志管理","parentId":0,"path":null,"level":0,"page":"/dailySearch","icon":null,"orderNumber":1494,"usable":true,"children":[],"modules":[]},
-                        ],"timeNow":"2026-06-17 14:44:05"}
+                        let resps = {
+                            "code": 0, "msg": "", "data":
+                                [
+                                    { "id": 1493, "appId": 551, "modId": 1, "name": "学制选择", "parentId": 0, "path": null, "level": 0, "page": "/", "icon": null, "orderNumber": 1493, "usable": true, "children": [], "modules": [] },
+                                    { "id": 1494, "appId": 551, "modId": 2, "name": "时段设置", "parentId": 0, "path": null, "level": 0, "page": "/itemSet", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] },
+                                    { "id": 1494, "appId": 551, "modId": 3, "name": "区域操作日志", "parentId": 0, "path": null, "level": 0, "page": "/areaOperateDaily", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] },
+                                    { "id": 1494, "appId": 551, "modId": 4, "name": "学校设置", "parentId": 0, "path": null, "level": 0, "page": "/schoolSetting", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] },
+                                    { "id": 1494, "appId": 551, "modId": 5, "name": "课程设置", "parentId": 0, "path": null, "level": 0, "page": "/subjectManForZy", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] },
+                                    { "id": 1494, "appId": 551, "modId": 6, "name": "学科管理", "parentId": 0, "path": null, "level": 0, "page": "/subjectSetzhi", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] },
+                                    { "id": 1494, "appId": 551, "modId": 7, "name": "班级管理", "parentId": 0, "path": null, "level": 0, "page": "/classManage", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] },
+                                    { "id": 1494, "appId": 551, "modId": 8, "name": "选修班管理", "parentId": 0, "path": null, "level": 0, "page": "/electiveClassManage", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] },
+                                    { "id": 1494, "appId": 551, "modId": 9, "name": "教师管理", "parentId": 0, "path": null, "level": 0, "page": "/teacherManage", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] },
+                                    { "id": 1494, "appId": 551, "modId": 10, "name": "学生管理", "parentId": 0, "path": null, "level": 0, "page": "/studentManage", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] },
+                                    { "id": 1494, "appId": 551, "modId": 11, "name": "历史查询", "parentId": 0, "path": null, "level": 0, "page": "/historySearch", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] },
+                                    { "id": 1494, "appId": 551, "modId": 12, "name": "学生异动管理", "parentId": 0, "path": null, "level": 0, "page": "/studentYDManage", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] },
+                                    { "id": 1494, "appId": 551, "modId": 13, "name": "教师转入管理", "parentId": 0, "path": null, "level": 0, "page": "/zhuanruinfo", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] },
+                                    { "id": 1494, "appId": 551, "modId": 14, "name": "学生转入管理", "parentId": 0, "path": null, "level": 0, "page": "/zhuanruinfostu", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] },
+                                    { "id": 1494, "appId": 551, "modId": 15, "name": "日志管理", "parentId": 0, "path": null, "level": 0, "page": "/dailySearch", "icon": null, "orderNumber": 1494, "usable": true, "children": [], "modules": [] },
+                                ], "timeNow": "2026-06-17 14:44:05"
+                        }
                         resolve(resps.data);
                     },
                     error => reject(error)
@@ -221,16 +223,19 @@ export default {
 .mop-load-div {
     display: none;
 }
+
 /* 开始过渡阶段,动画出去阶段 */
 .fade-enter-active,
 .fade-leave-active {
     transition: all 1ms cubic-bezier(0, 0.99, 1, 0.03);
 }
+
 /* 进入开始 */
 .fade-enter {
     // transform: translateY(10px);
     opacity: 0;
 }
+
 /* 出去终点 */
 .fade-leave-active {
     // transform: translateY(-10px);
@@ -241,14 +246,17 @@ export default {
 .back-leave-active {
     transition: all 1ms cubic-bezier(0, 0.99, 1, 0.03);
 }
+
 /* 进入开始 */
 .back-enter {
     display: none;
 }
+
 /* 出去终点 */
 .back-leave-active {
     display: none;
 }
+
 #app {
     height: 100%;
 }