From 6ece9ecfc37b427632625a456ac6a448ffdbfbcf Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 24 Nov 2025 16:55:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/historyCourse/index.js                |   56 +
 src/layout/components/AppMain.vue             |    3 +-
 src/layout/index.vue                          |    3 +-
 src/router/index.js                           |    9 +-
 src/styles/iconfont.css                       |   27 +-
 src/styles/iconfont.ttf                       |  Bin 13000 -> 14672 bytes
 src/styles/iconfont.woff                      |  Bin 8312 -> 9196 bytes
 src/styles/iconfont.woff2                     |  Bin 7148 -> 7904 bytes
 src/views/calendar/components/addCalendar.vue | 1468 ++++++++---------
 src/views/course/components/addTypes.vue      |   16 +
 src/views/course/types.vue                    |   99 +-
 src/views/dashboard/index.vue                 |   20 +-
 .../components/addHistoryCourse.vue           |  274 +++
 src/views/historyCourse/index.vue             |  201 +++
 src/views/statistics/index.vue                |  432 +++--
 src/views/student/schoolmateCompany.vue       |  133 +-
 vue.config.js                                 |    6 +-
 17 files changed, 1866 insertions(+), 881 deletions(-)
 create mode 100644 src/api/historyCourse/index.js
 create mode 100644 src/views/historyCourse/components/addHistoryCourse.vue
 create mode 100644 src/views/historyCourse/index.vue

diff --git a/src/api/historyCourse/index.js b/src/api/historyCourse/index.js
new file mode 100644
index 0000000..b4571b5
--- /dev/null
+++ b/src/api/historyCourse/index.js
@@ -0,0 +1,56 @@
+import request from "@/utils/request";
+function customParamsSerializer(params) {
+  let result = '';
+  for (let key in params) {
+    if (params.hasOwnProperty(key)) {
+      if (Array.isArray(params[key])) {
+        params[key].forEach((item, index) => {
+          if (item.key) {
+            result += `${key}[${index}][key]=${item.key}&${key}[${index}][op]=${item.op}&${key}[${index}][value]=${item.value}&`;
+
+          } else {
+            result += `${key}[${index}]=${item}&`
+          }
+        });
+      } else {
+        result += `${key}=${params[key]}&`;
+      }
+    }
+  }
+  return result.slice(0, -1);
+}
+
+export function index(params, isLoading = false) {
+  return request({
+    method: "get",
+    url: "/api/admin/history-courses/index",
+    params,
+    paramsSerializer: customParamsSerializer,
+    isLoading
+  })
+}
+
+export function show(params, isLoading = true) {
+  return request({
+    method: "get",
+    url: "/api/admin/history-courses/show",
+    params,
+    isLoading
+  })
+}
+
+export function save(data) {
+  return request({
+    method: "post",
+    url: "/api/admin/history-courses/save",
+    data
+  })
+}
+
+export function destroy(params) {
+  return request({
+    method: "get",
+    url: "/api/admin/history-courses/destroy",
+    params
+  })
+}
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index dc16261..7c4942a 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,5 +1,6 @@
 <template>
-  <section class="app-main" :style="{'padding':key.includes('/dashboard')?'0!important':''}">
+  <!-- -->
+  <section class="app-main"  :style="{'padding':key.includes('/home')?'0!important':''}">
     <transition name="fade-transform" mode="out-in">
       <router-view :key="key" />
     </transition>
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 390e002..79a062e 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -3,7 +3,8 @@
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
     <sidebar class="sidebar-container" />
     <div class="main-container">
-      <div :class="{'fixed-header':fixedHeader}" :style="{'display':key.includes('/dashboard')?'none':''}">
+       <!--  -->
+      <div :class="{'fixed-header':fixedHeader}" :style="{'display':key.includes('/home')?'none':''}">
         <navbar />
       </div>
       <app-main />
diff --git a/src/router/index.js b/src/router/index.js
index bf44004..29e4211 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -67,13 +67,14 @@ export const constantRoutes = [{
     redirect: '/dashboard',
     children: [{
       path: 'dashboard',
-      name: '系统首页',
-      component: () => import('@/views/dashboard/index'),
+      name: '课程发布管理',
+      component: () => import('@/views/course/index'),
       meta: {
-        title: '系统首页',
+        title: '课程发布管理',
         icon: 'dashboard'
       }
-    }]
+    }],
+    hidden: true
   },
   {
     path: '/course/txl',
diff --git a/src/styles/iconfont.css b/src/styles/iconfont.css
index 71fb744..c14cc27 100644
--- a/src/styles/iconfont.css
+++ b/src/styles/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4625369 */
-  src: url('//at.alicdn.com/t/c/font_4625369_3liiqv0f3lb.woff2?t=1754754074864') format('woff2'),
-       url('//at.alicdn.com/t/c/font_4625369_3liiqv0f3lb.woff?t=1754754074864') format('woff'),
-       url('//at.alicdn.com/t/c/font_4625369_3liiqv0f3lb.ttf?t=1754754074864') format('truetype');
+  src: url('iconfont.woff2?t=1763968012909') format('woff2'),
+       url('iconfont.woff?t=1763968012909') format('woff'),
+       url('iconfont.ttf?t=1763968012909') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,26 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-shijianzhou:before {
+  content: "\e69a";
+}
+
+.icon-wenzhangguanli:before {
+  content: "\e634";
+}
+
+.icon-lishishuju:before {
+  content: "\e601";
+}
+
+.icon-shujutongji:before {
+  content: "\e67a";
+}
+
+.icon-shujuzonglan:before {
+  content: "\e62f";
+}
+
 .icon-tushu:before {
   content: "\e615";
 }
@@ -152,3 +172,4 @@
 .icon-tongzhigonggao:before {
   content: "\e7ab";
 }
+
diff --git a/src/styles/iconfont.ttf b/src/styles/iconfont.ttf
index 2e2bde30a941a1b0d02149ba069bac3ab209ed95..70238625ccc604080a084928750f65b4a4b691e3 100644
GIT binary patch
delta 2681
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
KZ}j$jll>b2-9rZe

delta 1002
zcmZ{iOGwmF6vn?h|9Ow|a-4kSIOc@;AQVC=Bx@K;0)>)X2{ozB1lkOf3rk_97Lje7
zoHlI>+Efr37-G8?E?QI&w9`c#T}W=KMHtifpG!;c<#+Er_j%5D?x)<wRIxiBJbzRG
z%K~6Mk($1Jeg4w@V}N}hXq!w=B`3R{%r^npBE4x&I5v$h9IumDdS-U6I8rVHYL|9#
zIx~@6z4qz>&%dU9VJ113RSA{idL8ZP&E(8f;8{P{j$h@Qschz!cQ$`H(F1gEaMRyM
z>#YMZDDEZMiFoLWzyB9JR!#ul-#4!Q@5|+Kk5w6WX**#tXIad1u~J0sm0B$KP8KRQ
z)EyX=Q5SnRUoF6@M!54dqOc+&5Ss)fEDh2uF=>;|(v~G`EXq=8-_l;&D+3ajK^c}&
z8JCn~Bq!!t!nl}MyhGPBh#yeTVd#Jg1W}7>_~@MzN6<)b3>-ojHh2(#AN6oBHajAy
z!(mjxizYNPh8DQcil`eQG@yoY+e>Gye@a=ym9MJk@YZZuS^?&^0v}_b8a@jNXy^ch
zcbL!>NLXV^CiNP+2WimIQAo3fE<<7(IuB{fn+-2A*mr6e5u{hc*dPNMMhS^)7%yZ{
z!^k1S8fpL;)ldz{xQ4nw_^V9J>`PjMyq$v^8p;OAXeb~gtD%&ToQ9%87B!R?vZSHV
zke3=t4tcLJKahOZFb$AR4HJUx7eL-@Oxd@Y0u%l*>^#*lUD#REFmc%Vsxec@vY;aB
zx%y^Vu<ROR#;&zsv)g_+qK=}|=ghehu6OPl_p-<B>92BofBOo)kNz?L&%ndLT5u@%
fp}M1bIW!bfZ&pru_u5sg)X_Jju(ICwSSkDibe7)|

diff --git a/src/styles/iconfont.woff b/src/styles/iconfont.woff
index 66c56d1bae3e5ed8e4167bf2744ec6769864085c..62458c96a3603fc6b62aa4c8c15b010edbd51616 100644
GIT binary patch
delta 8731
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
F006i}$nXFF

delta 7849
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
H)Bpegr8*ED

diff --git a/src/styles/iconfont.woff2 b/src/styles/iconfont.woff2
index 8e7376776e4d2ff0820febc13e080d128b972aa5..a9ab68580a0d67d06375a6504768ba6cc4ac97de 100644
GIT binary patch
literal 7904
zcmV<69v|U%Pew8T0RR9103P4~3jhEB069<q03MM50RR9100000000000000000000
z0000SR0d!Gi5d#pAju~IHUcCAfg}r500bZfgl7kYMjO8`RRlH;0Epxx5=Dii%Krb9
zAjeS+w}StSD=KyLP9;uaLpXQtXu}K>jw?A5mb)Vl@nJ;(gD~qXW8}X*eE5}LwWzlh
z*9(<q(L<7=$wRT<|IXegBHuM6K{G=Mc=JjmK?x*cCNHAH^V|GCaHTGJNfi_@00}{H
zh&mNTFcKB*2`<ZC;r6VxtEa1a8_Y%hKhZrGsr#F5uKtWwxk&ed{nkE{frDgr=l`NY
zS4*0}9}#72^6Ku`mQ?F1Y=!E*)8Ai=u_Mf%5<9k<mUnG0>Gh|%lIH%hIE7M3Bn}J4
zV4_<{@LWkzf3wk+;oBVj9B`O}ZG&2RYA+DbV9r$9SW1e95+qy#u#=+#vc3JRJ!Lzv
zalmi@&~``QBn1$V0}5<cs%A?le5%A(QGHN8=c4hr{93O13m~aI01^R_9)eIxP(Jbl
zNXj8obk221mA@lMCCG`C9R4%)j_MpznL<&0(Uo>l)`prZbo4I$!m2bPY3hs2_Pms#
z8w@p!Rk#l1s(;T#JP&w)+BDU7CIU^Dt`v7K@1H7^7Z6;<Q(5`Mpg%fZkbw%m=vLnF
zhk9q#_HD~Wd;*c;1G-1WNBQ;RmtOc3DkbFydhqBXsdT*nfBn#01EsIN_PYs|E>J-U
zr;$a9FWbZM8Tb}XMQNJ8sUhA~fctbXsu?Q!EKk0lSf&ioM8_IZvx=t9nOD<fjm-|}
z)ca!SrQ;{tU3>j57YX)gFVo{%O`d&cms8=sgsQzsQrep#^MA?%rb<@Lj8t_T*wj$B
zqN1?W)HgA<uC1nJ$C@nzWkcJ-uAY5ehxW{ESP)e>vJLTHO&^kg5mOR{D3KV%DoI1k
zNG4)LvJh3$1JNNp5eFn6u}S(N8l)IeCuN8gQi-ULA&7$1aQmv!Ks3o%M4vPuCS)pN
zOlBe0$s$CXoQ$ZEQxGk3Dq@G6jaVb+AhyVPhyhuHD3eWyA-M*zO>Ra6c?hvfb|QLY
zFJhk@LUj4&&>f0;5{Ny%@7B$swnMi8wI3N4;7Gs4Lm(RT-UApuRz~7R32K@^MUt71
zpa`Z5R3D|_HyyH?DxW;euyQ3n>r%0`7X(}ynP><w6z_pPOgX=R;*3O@-Asu!QHFJx
zC&|S2pAj$%E`N*pSp!GT=cMd6WhFvdRpO9*-T(eM&|`CzOxGqZ5QczxJM>=;_Ia~`
zq-r)~+p8f3nLE-|+RR!%`AW5&+eDUSll@LEB$eTp^1RtQDc`4!S@V*qlqL351%!5m
zu@{*s*GnMYA#7|)pT#rK*v31q#)Z=BgR-R<0KRogJ>F-Un8b$ovo8R%LXl$0HZdim
z<nz;SxYUqLT$wFfrCTmMRAkE@^D6tzG##vkvD6LWYy&kQNOk|)X<Gh)3I|lVi<M<A
zO~`uGR8@*aT&l@Qqb@GdtDn<gKkrug^&JaI7i`t3eS+>M@lMtdVbK%{fK9*ewxpau
zNx4j6+@F)12|&^$3$aXkl{5~5OiZ^zLC)tD$B}ZmQZn5o$5HZmxlp+2Ha)Y%q*PLi
z(bK@}SQIs?T`ZF0$J=eQCX`6t>*Q#mj)=KBNpOs}%9Bf0PCU6BtVDvUe&N5(`LFY-
zV(6dqVm0tm>M!2_e??*Gp)6_N;8J{<O6W`1BNtXZwOYou+BlmDoESI7Gr~vDb#|XC
zjBs|TYrIo^jh&1Bgs~JhH{r1!+t`o;L7WZsSKa2%+Vhj{9`h2GFM|@PCuPiu`TfLy
zOm7+wGZ5VE9d4nGFLY09do-}tc536!&YfP+(i`X@22pX-^xRyvvS~hJjSQmNqFBuZ
zUM1kJyM|fN?Dzx`(t&%vWS~(aaZx*AYY8{IvT8iWP*k@xqs;5X1VQE)X#YM=@;bJ(
z8J8H!FxM50mkYe^Vw4w!Q=>n8%0aCL2x2A&yGk3hgv;Z-e(H?yx4t>}okygUN@`Dw
z695|JsV^mXH`4z0Y7nHRV<3?^)K#}GSZ1JFC!udT=`NULkdbt6W>Sk;MC4y{s+Txm
z=0bEGmi2$FuUcKr<fNuu!Zt;l68XR_D(jd{1t8S!qQN!Nb^y|`hOQ_Hoe|X4L&Oo!
zBiM@fad#*G@46;q)JQ)6u4zzSF6a!)yU3JOa|5d?QPSan0a~tt=74uP8LRwet%q)7
z;~*q$2C>*}cU&5i;+Ta<E9rxkQ=@9AENo@AgHQ!2`yxjGrtIZ9PyxbadH+piFm%(A
zPS_i218L%K!SiV5y3v0{;k-<V&WI5_3-k)o(cWzIzOfXIkseZJgbke~my4l=#$#x>
z?=w><X-2k1w>>$jC1*uU5<tdj*f(yyy1wMrPE!h8H&CZ$Aoi5-Et}kf>>fn@SI}Dk
zyECadGzNh2{soV-qrZ6ReA8i)FQ1J~2Y0&D9l%|-qiv<YiHfu70TdsO<n|>v4IK=Z
zhKElrt_b;oJ$ro<bTUv^@KfGYwk~tc5P(+VtwFSe9tP@Vu*l7@0f>6-o{gP3uLog9
z4FE)sYS*&RGnMdotfLUEf(W>=Eyjw<P%Bc$0kX1UZ^y}&t!62Hdq{xk7RH7Ax%@uP
zf?QoBThl?PvT;k*dEWNh#TwEb<vTR=chgrc6XLAp^fe;&P!E&xAiWagNnq1kTfA%~
zG3E1BQJzoM3c~p*Uxw2Z%FsBgdfArA1?sUbSh%j;Ha1pe7-tQo3{p7Qx^2*xi6At;
z?&q`6w!LYu8jL=yZu}yWW!631y$KepB6pWLy()l-te%KPH`QDtOSZJ|Mn&k1u<wp&
zL`qPyAd9|O1S1VOvuC20`b^=jW-8~yr2m>u*emI|@oLXydQmZOs#f9Jg|2b8{X5p@
z__NDYSg5zek}RS&TcY$=OEm*zs7|gOM18LdtNG;oIw&icxN!rrFg`cV#&f~FHSaz-
zB71()=`mRH4>c|^?@uVC27t_oc?k@Km)&y&id5qwR;coZ!bRBD3d`8`wy1cPCT)E5
z%h8q*AX}OR=UpyLu5q05FQm(w!ocA#{YVN<0TI9{hacu)VO$<?XE9(u3@HSU^Dc7T
z=!x{LuY4fYU#zfOjQ!yiO)@3F6|5|e>3eQWBoi2WNNLefJ1ssX;fsK-GawWx7a5*n
zM7;_q<VeV3gYt0Gf-x)oz#o=D1PqNBNlcKO1V6w)6ZgZ%D@bz%rX4}JUbHh`Eh7Bl
z!k(>TI(G>NdY_?AtaQE&N32Yz#(~cZ?mwui#B$ReEu#$5$&IZF?vv*=q5h|+L0@!y
zKNA)7k^gLb5vyJ$U2><=E_FnakgnFgQXen^w40#_)u;Kmj30*dgb`Svw4_5Un&A2q
z?gH7nd%<@$?ZqUluZC4&d-E$jhoGKMx)K)32&(s2yXiFpY3M_B$E4c9%h<A_@uUpN
zyrOY3r#1S%ZlDaqX}-n{DGy~Rxbt8=udqcI;`wi7tw@!*5*c~16>Zv>_Oc4gf^%Oc
zyeP_Ox<GUfXZ;_p9%wcfju9n-1VVq2;nM=jH;MtVK!eq(4pYA&;~5@^nqr5fxXx!Y
zO;GU}&&X!QUkJr74~Tc~saRPd`^Bqb+o~FuaXgf&>e4J()+*QZB|8#)2PMcZRW0w1
zXjr$9;x|u3z!+u3WA5W0osg!O#vO;=Y$;dW3ZDq$Dqu+V>+eLD74xE;I>L`ukh;`3
zcyM3X&yJP|+0(qwS?>TrAtGR2C`<rjR~T}sAw@!}x1hptl+5Z7W>5%m_RCrcjy5N1
zu_`eFf!LcSv#c1sAdf}}-Iows#j#AvH!|hyBMMrmJhio053wa7CL1E@IMYO6HXE)Z
zgFZ58a}ZA|y8n=#OlX-DBb+-=8FBV6Bv57DI#$v4w<WL5+9H5+jVigML()rSD<W+!
z2b<#;3YaaI1Kli50tBg|g|t;ggL^geU`2OmL^pSjhGx9qPMJ_a8q-RM+DK8%SgJ5v
z1%Rxh6sSSUQ8yCI1XtHPb3l&?PPOSQ?lxTB<$=(XiU)x(Eo*bT2G?4NT*z2kv$s%)
zw&rVdxU(gf6Z;CdyPTkmOA};Do_sfBFlw6owM6TUyu=YS82JFqqBSCdhO|3`85_cn
zawfjhao}1^N2&dE=+|_#2;)weIKtH7ev{V~w}5VcD@N?#U(O`Q$nPSj?us1dE^t=R
zOoHz!YLbkTMiSQ3jw~U$onhEN$Y7yx_*xYTi*tcchH)vGM3V2u#C2S4UO7U|4=9vq
z2#d~)1e4#P>2rm-P7e@<T*u8d9mS@%UKP`pP}FD_(p0Ibbq*vg_x%J{9o9NDm+<+5
zYx^k(525V8CWyMc>G^=GcE?b+utcXdr`2`j=+-_K4amY1n6`rc)D0N!m-^@8<0;Wg
zG7q3y%VT+aUGT2qU-0s7J#O=Byl;D<p8Bvj!<-s6S)7mJ{5U0zPx{Dlk@l2}^O3kX
zQ%KVn5Et=}4k#%{Y0tt1iu=hlRowHgqit}b0w7ek4(@^V<6$SW8(v$EJ9PTkI6^P0
zkC5*9#*<yohWClT<QO=gVHsNnf04DzzRT^hdYOHGm?bpSGEZwM37s!ht0uxK<;gOV
z3ZyB?@<L$56vb!sKDcLR*th@s9Y^-;hdY=~ct70D?1|a(d2Ya;x2yv#`;5}Qfev5;
zmiNB6d_uT2EX*1{;f-+M#5MPu%lx>k@aY9(^3>|QF$H&p11GMz?_TDemTsG+n-&>4
zO*ab&2TojbgUgd&{2^+;Eygx8dTLbE)aaSEIpY2JyI?^`l@?VVHX+PnsVi8PK4qM^
zP_%NTs8Bp^itq+F>OR)fmwDJ{1Y8xBCzWpq-9a-@yQl`*S2Dkyc@r)>+s?O7m=Kqk
zWHz^DgR;D)@_bMPLigqztg=Q`WqYU3BBtaiM>2PoS9*3;_9$T%cdxV{IQT?+YO=OU
zo1EHyqQnY{)IZhsVvdHrr9n@7*T~jbSdog;+9ta$1CuzJX4DMSk}3Sf^y;Q?=G9Z<
zYnY-Y{t6JGmfN;#S|V|TH9|~$DIH~xPJG6yjEeX^9sMw>9$j4+zZQ*u3Dfi&+Lc%D
z27@WTGN1uV0};Q-hzFfqO{RMw<VE{Qh$ljV=&vZ5e_Pxs(u%bOG6rGPMvvc$_*<bY
z<UzfAFx4pfEK)#EuUDg<7=}2+s{4O?tvFmgB_@f`LnXtp0qH9b@4kC@R?ewUTWyan
zWMDw(ll^~_0Ex~48L)<lU%Dgo-kDUla%TA|`wWPPedduA6euCQTufi|iXidx@tX>!
zX5Im0A=if-;9b!=**nvFa%)AxdV!zU*6NqJndcxl=r?qT>_gT~#ZxW1F|g!(kbe#r
z;dghxvSPyVtMAkAuf{9gM|S&`9-EqjEExqiVY@%@R}+3hjEn5qcDQYy+rw+*-rzOx
zdJ@MCZX^Aa#8^$~3c~o%Oif0%B2PIX%$y`n5RYrxyia1RY10aVHPp21pBR?&A1fNy
z2sG#~#2CtLkJB6+Z<B}4z0&;)A(S|C%+mh^Z4mUyQ+*gRcTC_qPk!uc-`kX!2`QV2
z+jsGGU5rbxg<6dM%k`p9yif2j{MgF|LO!Zy36e&*9Nzn6K{n1wZO3H``aN0PJAzq)
zJ6x7$zu*?$PIcgK36kIQSVUKNelgEaEfkum?NozMFj5jwGU)AXraGu`e7@Rm)_Hs!
znQW%osb&i4F~x_lnQEX?;w-~vG9Ey#uM%3Y!rKC@MOe`07tqLn3&=Ds;1+PV`)w}5
z-9&M5KT;z4_8Y@gGD%b}Ae~e!a7AvBPMor5YAa1*fv{B|$jDf55K+;E0)(E0AyWug
zOg0@62oM!mFsYU_z!@Ob5|c@t`gZK$;TIr&vJL;aG~s++4yjySj!}NWZX*tmdP91J
zJ(%&zQ@jeVZm&w-HQw_Bi<EPA#e2>sJ@ZZqajp37Dd0}w4&r7@>D82J4ZSDlF@QUy
z`{f_v|5Oy~_e&Jw_w>4A$1++OzZgx7r_4r7v@qZK*ISV@55D@*#gF{`d||s+H86v>
z;VYX1j7Gx5o{N@Q{7m9#2vel@S2U!6i(ob~M+u%{*C<n;-4W_Fm((}GJuoj3+bSlw
zU=i#hi1?4PK?U~^P!FpJh30)2PXZ)`ibA6{`f+sKae@;Ck-lZLGSpuerxr?6ox#e$
z^mIj0+q%Bqb!QdIG)47Rs@oTRnJODM<Ko_j{Pd>+-w*DItQ2dk(zn@~okB**efZDP
zA_?BBK<9*dR()0nYE|IqvH$%<1nS`*>nTqz8}D!L5AOfD?KDnCSD&wlF*Gx1?udH>
z|EL3Zo!f1E?Ry0LlyA&5`Rf18Z8rLzMnB(in$T52QvArI-q#dV>{~YbwZ!8r^E81s
znM(|~U_|gJ+HWlS{Pkbx4+P)PG!zpBS6*F!g6r93=POjA<|ky|joHcf)@5^wMq9#?
zAjmBa9|v6fx)P;EiNq*PbVw7TxiKJ7>PV0_4=_p-9MZ(RMoEIytW2zqH&!>RuG-k#
z5q~g_>UdKx(M4P`6}Aq~iDwr{lfrQkH6)kYT65}E+|0|=%QJCT^Gx7&Iga2&oCNi-
z@OuWS7JLufLFgfLyp>oLJ1g61#wmuO_D1!M=kMCdFLEjY;9{w#Pv4)OHU+z=^N(AX
zyiS!ZY+KnByKw)l%bt+q)-sqS%Q}6xtye!bLVu7%JvI2I_R*WZ*R?&bFOeS?zSmW+
z^S!zZTo!4fOqyWURHD?JAZ;s@Ad`~46i*_aC?XVn5q%18XZw+`Bs1#m;Uu+Hm8Hzc
zP-dylgX4q)GlH_LV&|HHjp}=f7}3s2jQJ_0cjuNc3g|cT5ews1K14Y`MRhYV=}gTA
zVRk@*#9)-fOAjPS4HAh#nvm^2!_bhiqzLu0^NanwlZ4-E<O>pq&qe())r_Rl9-i@_
zW4k`;;KC_~Ts~lX;iO;4Q5@oN@L>uq2LTb*rIq26!b?lTCPs`53{G5oM#3jvo@ixa
z97o4)GEg0e8L)O=jG10ECO<@-uPMB*DN^Tk+?9KDQh8&FW=xQ0qtIx)lkz(gs7f|J
zAlzUK5E9@=Z-^;&7h!-=od}4e305rs*qt34yL;vm!xVLHkl7rZr@oo1j^@E;b?!}d
zULJE$u6oMYIlhk#R%!=z#fsJ>b&?kOkuKKz$Ha*AqV2IF$b+umK5*z_M6u%SdU4;B
zzfP<N*>`eeIZ}Efl7lqTWk}{k?nLXRM@3Dy4cxnIt?(-(SFO%Ho*WdStw@M2vxL==
z@Ertf@U-ZSBpbm=cS^p?V*2g<(XwcIBfXzBy9glsSQh}9V3XPULBA&V(8X@kWz)Ot
z)1(gR5_`RtbQ+L>X?Fk!OjRgSi-n^<5Geb^H{n)on6>OXwT`mUp*@%{z^e7TT1n_e
zx(POdxyMZJKytw9XQr#Bx7WsAYtrkF>#KCvOxM0Y(VO%O{?Y%dZ*JS|(u0Vd$G0E_
zG%beph!w?p%tnntCegN_kP4c{jWxiI;_PH<X(qZ#fYEN#E<W!z;-<z7y1jDS;ufpE
zFQe#=_GktgfbAIhvk|WbZ9_PJNqG|~dY;}(%~R(DPkm-fyqVD2Ljz3q9+@!ZVmwEh
zczW7c>;c?cTnqLC;Tmh?>a7@y2l8T_Cu&B2)lM`o>yZiQga?YjvjHjIPP5~sf*$@r
zYc9Ah=nxF>6@_6?!B2gbiBHq`*ZFBri+_!0sVTv0De3My%37+5qmnv=rPvT7ug@^r
zx0kl`+d3$w*LX2&6HGH9mL?p4r_I&D8*u-{qA|EuKP&*iP6Hrlu65TgM({3;03|5<
zcFFgm<zsoR$?gtNQ(yo<aHiGx_;Et>{2$LtLwp`<_8de|sDmhgMiT%48vq)hQRV}r
zp4>sBfgR)TkDHK2`-I8qVuFn*aANn-FPXKPJt%Z$HUhx>(%LL2xLI@ApDaQ_pJ+6p
z8wxm-&aUeKjT528s(<3ZUoWv}{upOu_hrQJcY2c(WXx-ydp)w9#vV4^0B^G~|L#cV
zG-7<G4$;-VCU89&+e&W1&cHQN8nJ7OzlGd-h$gboeVBzp8NPEBudzCqnb^j);sE6a
zUcfG5A3O-JQrozJ<zx*rdzc?kC_M4~o9II*Kt+MJqs!O<lJy`2=vMi-d}Kr0qu=5-
z<5T}}8FuJ)yp*)-+5>n#W~pxJD@vE=U$A7JZrn19u8iJ-9A-Vhh9px|Q{VySfO3~g
zD+BQC$tn{+MBBJ=TtJjWfl7dD#Mz($WE@o;<;HRBI%}q_$Dy|d3?l7S969dYySm(M
z+a~Fl=5_0yJPx6N6Elk_K3pG45gDF4a?3)9fLMl=G^AHbFy+0Vo<*jUaV(wpVb_ze
z%SazdKJXqXTe=7Ku}sOD^VjvIm(n;UI55759P@;*7LS(Zdb3W|;Rcx(%zx9e(+6%<
z{C>#VAo!M-n%}|SDsb}Ee5YXRb@%s0!z0A4#P_foelH#)@bPH7+CC<DNIf(ryUjN9
zh6@wbi+ODid1HAGJ9&$P7Y9fTaT4j+fY17s4LCI+KrfN#O_Dgh*c2xg$C<?XIEnZt
z_u*E}wg;MPZJI;ZL44WHT`it1YkL?QH*K8NUR1n%8;i}_(InMLZ7dxNU`iOD+~sX_
zjdvxbP2q8rvw`uMqaaf%y(%eW`B-G6*k;(0F&5My@njHH-Nrl^8S^oIb{lm(ow}sS
zPtoLoLRbR`Ai-RVwpgPn)>@tj2TojbKe;Sv&QM5hgnCjW1UX81ldWEM2#SPUpV$tI
zNtqTHn5HyYj61ds!={o&2F|E_g6Gs6{Vd_Y85=cl{%i_1eF|P2XHl90)6xP>%916L
z%8beeVQQV|8^N3MpiG@L=lg`g;`$xOr46HpFz3V~W6`#yTqp9O6Y~`!TlmES82VF|
zDE;zpnB}P<bBtmMax;(!cYCx$+#oSa8pIAsrC5~<m;W>cIqw?_g=9cMxO9rSXQqmo
zDReGE0sd-#;y89vq^J;U4a&+2vEU1Q-41R4=6I6N$`PoOi-p50pZ&z~eY;~v>+czQ
zajfV|ps3G~lK_eF{`obMrzS32l97Ubsm%2SO<mp@a@s>$RK(PYy4!4R%Cf|aMNkTm
z69=1h1R{miy9@K47Fs*w$IPh3OEym0le1ATYH!mPhiZ!Fyd^s3s3Y`XE?*p46`&W3
z^(OKT7ot2MY`1kfLU;N&*GW$2zB$WdanHWxhH&4W<+6B(-<;}nc2-ZT!8`FGtg*yV
zGdu~Y6jmX-P?fOq<eu|LrB5Z23{D1>u5z~x23&u7ofEb1sY)oiyu0o}QUCyeenX!G
zz!d}?hs4Rg3ywljQ%j&8XwjB`EBcRcmkt&jX!YkIYke(b^Iw4I(BUiD_PwwRVo%-F
z3&k8|ZGj?ec*Gur{NvEIQ#Stts)hMGGzE6I|3G2bSMT3J)zH7UB8!=ylQsZAE$A2Z
zPW17;dFW@u=s|QZ^&UWX#;ECHQx+X<RzV!t!@42CYr@(YP_e^sjEc~fpF<k}ARD?X
z?tp@PV{QOK{<qDg!1r|8>JsYMZ+PN=caA+zJh@WHeo|0cEdT%y(4gd~okW)nirfNS
zcrZ6t^Pe(DI4b`~)*Z<A_PPD-2Z`@4CSnmEIEq5pwhKVBx*zb*nEgXPFH0L)Qw{i$
zoHrD3xD6$EK2o_>+E76h+)#xV+0Z0&@y;y_g*sGuG+^I*(ttwq(SSyA1|U=IC%B>Z
zy8(mk7qF=PZ-C`QX+)wJ|K1}6OjI;h6tmOn4Dv=F(1-=UH1UGIB*s*?)tSy-p+g_S
zqa2uC2wG{+xw_0g7+TA!@SI^BT4@NyX}hgW9<7-3${7!Vpj#%C$oQ%x#vGkHjDLR*
zkRdGKEu|OJD;1?Tu5`6@ETk*NS>0kJsigs<Cy=Qr22V3N<+8wl&8L`BnC%RTZ>*No
z!!Dd^SGlyU(mGztKcE!vcDGud&QYK-91$eNV6xa8?%y43Bt7G&^6g}0=XCGUGdHhS
z@BD(oK7IT3FDfn>P-@{NHl>WfO;VQSAxa)_#t1k|^CBylVaa4cCkJ*Wqs3mD2o~H_
zkV}|(_t-#+&dh0uWF&7SGh>#JLc^1#>2{b?nYN2|XP5Qv%v0^kB)-zevECfjg-7Jf
z4EiBb4znvT32Dw-jL(Sa5Yo}@$eIZtM+sqW%*0Wf2~DkGC2WlZ#}ZH$XUS3uFOJ1c
zOvuIpxBT3w1B-i;^V&8e;D~@{thk7S%=B?tn-#NrIJ&2y$o}Na>FZ)}l9GAMFu(^C
z^J{SVjFMk7!USlhF25`Q1^K~z&g+PgI4d*$<kd5SeU_zjmAz*c3ZVW@+H5=z>@Kh4
KdJAV@Q~&^$^%#u+

literal 7148
zcmV<I8x!PrPew8T0RR9102}N83jhEB05Zq`02`YC0RR9100000000000000000000
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

diff --git a/src/views/calendar/components/addCalendar.vue b/src/views/calendar/components/addCalendar.vue
index bb13ede..4dbad7e 100644
--- a/src/views/calendar/components/addCalendar.vue
+++ b/src/views/calendar/components/addCalendar.vue
@@ -1,734 +1,734 @@
-<template>
-  <div>
-    <xy-dialog
-      ref="dialog"
-      :width="70"
-      :is-show.sync="isShow"
-      :type="'form'"
-      :title="type === 'add' ? '新增日程' : '编辑日程'"
-      :form="form"
-      :rules="rules"
-    >
-      <template v-slot:is_publish>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red; font-weight: bold; padding-right: 4px"
-              >*</span
-            >是否对外展示：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select
-              v-model="form.is_publish"
-              placeholder="请选择"
-              clearable
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in [{id:1,value:'是'},{id:0,value:'否'}]"
-                :key="item.id"
-                :label="item.value"
-                :value="item.id"
-              >
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-slot:type>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red; font-weight: bold; padding-right: 4px"
-              >*</span
-            >日程类型：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select
-              v-model="form.type"
-              @change="changeType"
-              placeholder="请选择日程类型"
-              clearable
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in type_options"
-                :key="item.id"
-                :label="item.value"
-                :value="item.id"
-              >
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-if="form.type === 1 || form.type === 2" v-slot:course_id>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red; font-weight: bold; padding-right: 4px"
-              >*</span
-            >课程：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select
-              v-model="form.course_id"
-              :disabled="canSelect"
-              @change="changeCourse"
-              placeholder="请选择课程"
-              filterable
-              clearable
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in course_options"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              >
-              <div style="display: flex; justify-content: space-between;padding: 0 10px;">
-                <span style="color: #999; font-size: 12px;">{{item.type_detail?item.type_detail.name:''}} | {{ item.name }}</span>
-                <span style="color: #999; font-size: 12px;">{{ item.is_arrange?'需排课':'无需排课' }}</span>
-              </div>
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-if="form.type === 1 || form.type === 2" v-slot:introduce>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="font-weight: bold">
-            <span
-              style="color: red; font-weight: bold; padding-right: 4px"
-            ></span
-            >具体说明：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select
-              v-model="form.introduce"
-              filterable
-              allow-create
-              default-first-option
-              placeholder="请选择或新建模块"
-              clearable
-              style="width: 100%"
-              @change="onModuleChange"
-              @create="onCreateModule"
-            >
-              <el-option
-                v-for="item in module_options"
-                :key="item.id"
-                :label="item.value"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-if="form.type === 2" v-slot:course_content_id>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red; font-weight: bold; padding-right: 4px"
-              >*</span
-            >课表：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select
-              v-model="form.course_content_id"
-              @change="changeCourseContent"
-              placeholder="请选择课表"
-              clearable
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in course_content_options"
-                :key="item.id"
-                :label="item.theme"
-                :value="item.id"
-              >
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:title>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red; font-weight: bold; padding-right: 4px"
-              >*</span
-            >标题：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input
-              v-model="form.title"
-              placeholder="请输入标题"
-              clearable
-              style="width: 100%"
-            ></el-input>
-          </div>
-        </div>
-      </template>
-      <template v-slot:url>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="font-weight: bold">
-            <span
-              style="color: red; font-weight: bold; padding-right: 4px"
-            ></span
-            >资讯链接：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select
-            v-if="form.type === 4 || form.type === 1"
-              filterable
-              remote
-              v-model="form.url"
-              :remote-method="remoteMethod"
-              :loading="loading"
-              placeholder="请输入关键词查询资讯"
-              clearable
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in zixunList"
-                :key="item.id"
-                :label="item.title"
-                :value="item.titleurl"
-              >
-              </el-option>
-            </el-select>
-            <el-input v-else v-model="form.url" placeholder="请输入链接" clearable style="width: 100%;"></el-input>
-          </div>
-        </div>
-      </template>
-      <!-- <template v-slot:date>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>日期：
-          </div>
-          <div class="xy-table-item-content">
-            <el-date-picker v-model="form.date"  style="width: 100%;"
-             type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期时间" align="right">
-            </el-date-picker>
-          </div>
-        </div>
-      </template> -->
-      <template v-slot:start_time>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red; font-weight: bold; padding-right: 4px"
-              >*</span
-            >开始时间：
-          </div>
-          <div class="xy-table-item-content">
-            <el-date-picker
-              v-model="form.start_time"
-              style="width: 100%"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              format="yyyy-MM-dd HH:mm:ss"
-              type="datetime"
-              placeholder="选择日期时间"
-              align="right"
-              :picker-options="pickerOptions"
-            >
-            </el-date-picker>
-          </div>
-        </div>
-      </template>
-      <template v-slot:end_time>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="font-weight: bold">
-            <span
-              style="color: red; font-weight: bold; padding-right: 4px"
-            ></span
-            >截止时间：
-          </div>
-          <div class="xy-table-item-content">
-            <el-date-picker
-              v-model="form.end_time"
-              style="width: 100%"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              format="yyyy-MM-dd HH:mm:ss"
-              type="datetime"
-              placeholder="选择日期时间"
-              align="right"
-              :picker-options="pickerOptions"
-            >
-            </el-date-picker>
-          </div>
-        </div>
-      </template>
-      <template v-slot:days>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red; font-weight: bold; padding-right: 4px"></span
-            >天数：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input-number
-              v-model="form.days"
-              :min="0"
-              :step="1"
-              style="width: 100%"
-            ></el-input-number>
-          </div>
-        </div>
-      </template>
-      <template v-slot:address>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red; font-weight: bold; padding-right: 4px"
-              ></span
-              >地址：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input v-model="form.address" placeholder="请输入地址" clearable style="width: 100%;"></el-input>
-          </div>
-        </div>
-      </template>
-      <template v-slot:color>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red; font-weight: bold; padding-right: 4px"
-              ></span
-              >主题颜色：
-          </div>
-          <div class="xy-table-item-content">
-            <el-color-picker v-model="form.color"></el-color-picker>
-          </div>
-        </div>
-      </template>
-      <template v-slot:content v-if="form.type === 3">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="font-weight: bold">
-            <span
-              style="color: red; font-weight: bold; padding-right: 4px"
-            ></span
-            >内容：
-          </div>
-          <div class="xy-table-item-content">
-            <my-tinymce
-              v-if="showTinymce"
-              @input="saveContent"
-              :value="form.content"
-            ></my-tinymce>
-          </div>
-        </div>
-      </template>
-      <template v-slot:footerContent>
-        <el-button type="primary" size="small" @click="submit">保存</el-button>
-        <!-- <el-popconfirm style="margin:0 10px" @confirm="delCalendar" title="确定删除吗？">
-          <el-button type="danger" size="small" v-if="type==='editor'" slot="reference">删除</el-button>
-        </el-popconfirm> -->
-        <el-popconfirm style="margin:0 10px" @confirm="delCalendar" title="确定删除吗？">
-          <el-button type="danger" size="small" slot="reference">删除</el-button>
-        </el-popconfirm>
-      </template>
-    </xy-dialog>
-  </div>  
-</template>
-
-<script>
-import { show, save,destroy } from "@/api/calendars/index.js";
-import { index as courseIndex } from "@/api/course/index.js";
-import { index as courseContentIndex } from "@/api/course/courseContent.js";
-export default {
-  components: {},
-  data() {
-    return {
-      isShow: false,
-      type: "add",
-      id: "",
-      showTinymce: false,
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "今天",
-            onClick(picker) {
-              picker.$emit("pick", new Date());
-            },
-          },
-          {
-            text: "昨天",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24);
-              picker.$emit("pick", date);
-            },
-          },
-          {
-            text: "一周前",
-            onClick(picker) {
-              const date = new Date();
-              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", date);
-            },
-          },
-        ],
-      },
-      type_options: [
-        {
-          id: 1,
-          value: "课程",
-        },
-        // {
-        //   id: 2,
-        //   value: '课表'
-        // },
-        {
-          id: 3,
-          value: "自定义事件",
-        },
-        {
-          id: 4,
-          value: "资讯",
-        },
-      ],
-      course_content_options: [],
-      course_options: [],
-      canSelect: false,
-      module_options: [
-        { id: 1, value: '第一模块' },
-        { id: 2, value: '第二模块' },
-        { id: 3, value: '第三模块' },
-        { id: 4, value: '第四模块' },
-        { id: 5, value: '第五模块' },
-        { id: 6, value: '第六模块' },
-        { id: 7, value: '第七模块' },
-        { id: 8, value: '第八模块' },
-        { id: 9, value: '第九模块' },
-        { id: 10, value: '第十模块' }
-      ],
-      form: {
-        is_publish:1,
-        type: "",
-        course_id: "",
-        introduce: "",
-        course_content_id: "",
-        title: "",
-        url: "",
-        // date: '',
-        start_time: "",
-        end_time: "",
-        days: 0,
-        address:'',
-        color:'',
-        content: "",
-      },
-      rules: {
-        title: [
-          {
-            required: true,
-            message: "请输入标题",
-          },
-        ],
-        start_time: [
-          {
-            required: true,
-            message: "请选择开始时间",
-          },
-        ],
-        // end_time: [{
-        //   required: true,
-        //   message: '请选择结束时间'
-        // }],
-      },
-      zixunList: [],
-      suppressAutoDays: false,
-    };
-  },
-  created() {
-    this.getCourseList();
-    this.getZxList();
-  },
-  methods: {
-    remoteMethod(query) {
-      if (query !== "") {
-        this.loading = true;
-        this.getZxList(query);
-      } else {
-        this.zixunList = [];
-      }
-    },
-    async getZxList(query) {
-      const proUrl = `${process.env.VUE_APP_PRO_API}`;
-      var baseUrl = proUrl + "/e/extend/news.php";
-      try {
-        // 直接调用 axios.get()，传入接口地址和参数
-        const response = await axios.get(baseUrl, {
-          params: {
-            page: 1,
-            pagesize: 999,
-            keyword: query,
-          }, // GET 参数（拼在 URL 后）
-          timeout: 5000, // 超时时间（毫秒）
-        });
-        // 请求成功，存储结果
-        if (response.status === 200) {
-          this.zixunList = response.data.rows;
-        }
-        this.loading = false;
-        console.log("GET 请求成功：", response);
-      } catch (error) {
-        // 请求失败，处理错误
-        console.error("GET 请求失败：", error);
-        alert("请求失败：" + (error.response?.data?.msg || "网络错误"));
-      }
-    },
-    async getCourseList() {
-      const res = await courseIndex({
-        page: 1,
-        page_size: 999,
-        sort_name: "id",
-        sort_type: "DESC",
-        show_relation: ["image", "typeDetail"],
-      });
-      this.course_options = res.data;
-    },
-    async getCourseContentList(course_id) {
-      const res = await courseContentIndex({
-        page: 1,
-        page_size: 999,
-        filter: [
-          {
-            key: "course_id",
-            op: "like",
-            value: course_id,
-          },
-        ],
-      });
-      if (res.data.length < 1) {
-        this.$Message.warning("该课程暂无课表");
-        return;
-      }
-      this.course_content_options = res.data;
-    },
-    saveContent(e) {
-      this.form.content = e;
-    },
-    changeType(e) {
-      console.log("type", e);
-    },
-    changeIntroduce(e) {
-      console.log("e", e);
-      if (e) {
-        this.form.title = this.form.title + " - " + e;
-      }
-    },
-    changeCourse(e) {
-      console.log("course", e);
-      // 获取课表
-      if (this.form.type == 2) {
-        this.form.course_content_id = "";
-        this.getCourseContentList(e);
-      }
-      // 选择课程 自动填充
-      if (this.form.type == 1) {
-        this.course_options.map((item) => {
-          if (item.id === e) {
-            this.form.title =
-              (item.type_detail ? item.type_detail.name + " - " : "") +
-              item.name;
-            this.form.start_time = item.start_date
-              ? `${item.start_date} 09:00:00`
-              : "";
-            this.form.end_time = item.end_date
-              ? `${item.end_date} 17:00:00`
-              : "";
-            this.form.date = item.start_date;
-            this.form.url = item.url;
-            this.form.color = item.type_detail?(item.type_detail.color?item.type_detail.color:''):''
-          }
-        });
-        this.updateDaysFromDates();
-      }
-    },
-    changeCourseContent(e) {
-      // 选择课表 自动填充
-      if (this.form.type == 2) {
-        this.course_content_options.map((item) => {
-          if (item.id === e) {
-            this.form.title = item.theme;
-            this.form.start_time = item.start_date;
-            this.form.end_time = item.end_date;
-            this.form.date = item.start_date;
-          }
-        });
-        this.updateDaysFromDates();
-      }
-    },
-    onModuleChange(value) {
-      // 当选择模块时，自动拼接到标题后面
-      if (value && this.form.title) {
-        // 先去除标题中可能存在的模块值
-        let cleanTitle = this.form.title;
-        this.module_options.forEach(module => {
-          if (cleanTitle.includes(' - ' + module.value)) {
-            cleanTitle = cleanTitle.replace(' - ' + module.value, '');
-          }
-        });
-        // 拼接新的模块值
-        this.form.title = cleanTitle + ' - ' + value;
-      }
-    },
-    onCreateModule(value) {
-      // 当创建新模块时，添加到选项列表并选中
-      const newModule = {
-        id: this.module_options.length + 1,
-        value: value
-      };
-      this.module_options.push(newModule);
-      this.form.introduce = value;
-      // 先去除标题中可能存在的模块值，再拼接新的模块值
-      if (this.form.title) {
-        let cleanTitle = this.form.title;
-        this.module_options.forEach(module => {
-          if (cleanTitle.includes(' | ' + module.value)) {
-            cleanTitle = cleanTitle.replace(' | ' + module.value, '');
-          }
-        });
-        // 拼接新的模块值
-        this.form.title = cleanTitle + ' | ' + value;
-      }
-    },
-    submit() {
-      if (this.id) {
-        this.form.id = this.id;
-      }
-      if (this.type == "add") {
-        this.form.id = "";
-        this.form.title = this.form.introduce
-          ? this.form.title + " - " + this.form.introduce
-          : this.form.title;
-      }
-      save({
-        ...this.form,
-      }).then((res) => {
-        this.$message({
-          type: "success",
-          message: this.type === "add" ? "新增成功" : "编辑成功",
-        });
-        this.isShow = false;
-        this.$emit("refresh");
-      });
-    },
-
-    getDetail() {
-      show({
-        id: this.id,
-      }).then((res) => {
-        this.suppressAutoDays = true;
-        this.form = this.base.requestToForm(res, this.form);
-        this.form.is_publish = res.is_publish ? res.is_publish : 0;
-        this.form.days = this.normalizeDaysValue(res.days);
-        this.showTinymce = true;
-        this.$nextTick(() => {
-          this.suppressAutoDays = false;
-        });
-      });
-    },
-    delCalendar() {
-      destroy({
-        id: this.id,
-      }).then((res) => {
-        this.$message({
-          type: "success",
-          message: "删除成功",
-        });
-        this.isShow = false;
-        this.$emit("refresh");
-      });
-    },
-    getDefaultDateTime(time) {
-      const date = new Date();
-      const year = date.getFullYear();
-      const month = `${date.getMonth() + 1}`.padStart(2, "0");
-      const day = `${date.getDate()}`.padStart(2, "0");
-      return `${year}-${month}-${day} ${time}`;
-    },
-    setDefaultTimes() {
-      if (!this.form.start_time) {
-        this.form.start_time = this.getDefaultDateTime("09:00:00");
-      }
-      if (!this.form.end_time) {
-        this.form.end_time = this.getDefaultDateTime("17:00:00");
-      }
-      this.updateDaysFromDates();
-    },
-    updateDaysFromDates() {
-      if (!this.form.start_time || !this.form.end_time) {
-        this.form.days = 0;
-        return;
-      }
-      const startDateStr = this.form.start_time.split(" ")[0];
-      const endDateStr = this.form.end_time.split(" ")[0];
-      const startDate = new Date(startDateStr.replace(/-/g, "/"));
-      const endDate = new Date(endDateStr.replace(/-/g, "/"));
-      if (Number.isNaN(startDate.getTime()) || Number.isNaN(endDate.getTime())) {
-        return;
-      }
-      const diff =
-        Math.floor(
-          (endDate.getTime() - startDate.getTime()) / (24 * 60 * 60 * 1000)
-        ) + 1;
-      this.form.days = this.normalizeDaysValue(diff > 0 ? diff : 0);
-    },
-    normalizeDaysValue(value) {
-      if (value === null || value === undefined || value === "") {
-        return 0;
-      }
-      const num = Number(value);
-      if (Number.isNaN(num)) {
-        return 0;
-      }
-      return Math.max(0, Math.round(num));
-    },
-  },
-  watch: {
-    "form.start_time"() {
-      if (this.suppressAutoDays) return;
-      this.updateDaysFromDates();
-    },
-    "form.end_time"() {
-      if (this.suppressAutoDays) return;
-      this.updateDaysFromDates();
-    },
-    isShow(newVal) {
-      if (newVal) {
-        if (this.type === "editor") {
-          console.log("id", this.id);
-          this.getDetail();
-        } else {
-          this.showTinymce = true;
-          this.setDefaultTimes();
-        }
-      } else {
-        this.id = "";
-        this.showTinymce = false;
-        this.form = {
-          is_publish: 1,
-          type: "",
-          course_id: "",
-          introduce: "",
-          course_content_id: "",
-          title: "",
-          url: "",
-          date: "",
-          start_time: "",
-          end_time: "",
-          days: 0,
-          address:'',
-          color:'',
-          content: "",
-        };
-        this.setDefaultTimes();
-        this.$refs["dialog"].reset();
-      }
-    },
-  },
-};
-</script>
-
-<style scoped lang="scss">
-::v-deep .content {
-  flex-basis: 100%;
-}
-</style>
+<template>
+  <div>
+    <xy-dialog
+      ref="dialog"
+      :width="70"
+      :is-show.sync="isShow"
+      :type="'form'"
+      :title="type === 'add' ? '新增日程' : '编辑日程'"
+      :form="form"
+      :rules="rules"
+    >
+      <template v-slot:is_publish>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red; font-weight: bold; padding-right: 4px"
+              >*</span
+            >是否对外展示：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select
+              v-model="form.is_publish"
+              placeholder="请选择"
+              clearable
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in [{id:1,value:'是'},{id:0,value:'否'}]"
+                :key="item.id"
+                :label="item.value"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+      <template v-slot:type>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red; font-weight: bold; padding-right: 4px"
+              >*</span
+            >日程类型：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select
+              v-model="form.type"
+              @change="changeType"
+              placeholder="请选择日程类型"
+              clearable
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in type_options"
+                :key="item.id"
+                :label="item.value"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+      <template v-if="form.type === 1 || form.type === 2" v-slot:course_id>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red; font-weight: bold; padding-right: 4px"
+              >*</span
+            >课程：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select
+              v-model="form.course_id"
+              :disabled="canSelect"
+              @change="changeCourse"
+              placeholder="请选择课程"
+              filterable
+              clearable
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in course_options"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              >
+              <div style="display: flex; justify-content: space-between;padding: 0 10px;">
+                <span style="color: #999; font-size: 12px;">{{item.type_detail?item.type_detail.name:''}} | {{ item.name }}</span>
+                <span style="color: #999; font-size: 12px;">{{ item.is_arrange?'需排课':'无需排课' }}</span>
+              </div>
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+      <template v-if="form.type === 1 || form.type === 2" v-slot:introduce>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span
+              style="color: red; font-weight: bold; padding-right: 4px"
+            ></span
+            >具体说明：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select
+              v-model="form.introduce"
+              filterable
+              allow-create
+              default-first-option
+              placeholder="请选择或新建模块"
+              clearable
+              style="width: 100%"
+              @change="onModuleChange"
+              @create="onCreateModule"
+            >
+              <el-option
+                v-for="item in module_options"
+                :key="item.id"
+                :label="item.value"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+      <template v-if="form.type === 2" v-slot:course_content_id>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red; font-weight: bold; padding-right: 4px"
+              >*</span
+            >课表：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select
+              v-model="form.course_content_id"
+              @change="changeCourseContent"
+              placeholder="请选择课表"
+              clearable
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in course_content_options"
+                :key="item.id"
+                :label="item.theme"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:title>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red; font-weight: bold; padding-right: 4px"
+              >*</span
+            >标题：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input
+              v-model="form.title"
+              placeholder="请输入标题"
+              clearable
+              style="width: 100%"
+            ></el-input>
+          </div>
+        </div>
+      </template>
+      <template v-slot:url>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span
+              style="color: red; font-weight: bold; padding-right: 4px"
+            ></span
+            >资讯链接：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select
+            v-if="form.type === 4 || form.type === 1"
+              filterable
+              remote
+              v-model="form.url"
+              :remote-method="remoteMethod"
+              :loading="loading"
+              placeholder="请输入关键词查询资讯"
+              clearable
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in zixunList"
+                :key="item.id"
+                :label="item.title"
+                :value="item.titleurl"
+              >
+              </el-option>
+            </el-select>
+            <el-input v-else v-model="form.url" placeholder="请输入链接" clearable style="width: 100%;"></el-input>
+          </div>
+        </div>
+      </template>
+      <!-- <template v-slot:date>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>日期：
+          </div>
+          <div class="xy-table-item-content">
+            <el-date-picker v-model="form.date"  style="width: 100%;"
+             type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期时间" align="right">
+            </el-date-picker>
+          </div>
+        </div>
+      </template> -->
+      <template v-slot:start_time>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red; font-weight: bold; padding-right: 4px"
+              >*</span
+            >开始时间：
+          </div>
+          <div class="xy-table-item-content">
+            <el-date-picker
+              v-model="form.start_time"
+              style="width: 100%"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd HH:mm:ss"
+              type="datetime"
+              placeholder="选择日期时间"
+              align="right"
+              :picker-options="pickerOptions"
+            >
+            </el-date-picker>
+          </div>
+        </div>
+      </template>
+      <template v-slot:end_time>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span
+              style="color: red; font-weight: bold; padding-right: 4px"
+            ></span
+            >截止时间：
+          </div>
+          <div class="xy-table-item-content">
+            <el-date-picker
+              v-model="form.end_time"
+              style="width: 100%"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd HH:mm:ss"
+              type="datetime"
+              placeholder="选择日期时间"
+              align="right"
+              :picker-options="pickerOptions"
+            >
+            </el-date-picker>
+          </div>
+        </div>
+      </template>
+      <template v-slot:days>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red; font-weight: bold; padding-right: 4px"></span
+            >天数：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input-number
+              v-model="form.days"
+              :min="0"
+              :step="1"
+              style="width: 100%"
+            ></el-input-number>
+          </div>
+        </div>
+      </template>
+      <template v-slot:address>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red; font-weight: bold; padding-right: 4px"
+              ></span
+              >地址：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.address" placeholder="请输入地址" clearable style="width: 100%;"></el-input>
+          </div>
+        </div>
+      </template>
+      <template v-slot:color>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red; font-weight: bold; padding-right: 4px"
+              ></span
+              >主题颜色：
+          </div>
+          <div class="xy-table-item-content">
+            <el-color-picker v-model="form.color"></el-color-picker>
+          </div>
+        </div>
+      </template>
+      <template v-slot:content v-if="form.type === 3">
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span
+              style="color: red; font-weight: bold; padding-right: 4px"
+            ></span
+            >内容：
+          </div>
+          <div class="xy-table-item-content">
+            <my-tinymce
+              v-if="showTinymce"
+              @input="saveContent"
+              :value="form.content"
+            ></my-tinymce>
+          </div>
+        </div>
+      </template>
+      <template v-slot:footerContent>
+        <el-button type="primary" size="small" @click="submit">保存</el-button>
+        <!-- <el-popconfirm style="margin:0 10px" @confirm="delCalendar" title="确定删除吗？">
+          <el-button type="danger" size="small" v-if="type==='editor'" slot="reference">删除</el-button>
+        </el-popconfirm> -->
+        <el-popconfirm style="margin:0 10px" @confirm="delCalendar" title="确定删除吗？">
+          <el-button type="danger" size="small" slot="reference">删除</el-button>
+        </el-popconfirm>
+      </template>
+    </xy-dialog>
+  </div>  
+</template>
+
+<script>
+import { show, save,destroy } from "@/api/calendars/index.js";
+import { index as courseIndex } from "@/api/course/index.js";
+import { index as courseContentIndex } from "@/api/course/courseContent.js";
+export default {
+  components: {},
+  data() {
+    return {
+      isShow: false,
+      type: "add",
+      id: "",
+      showTinymce: false,
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "今天",
+            onClick(picker) {
+              picker.$emit("pick", new Date());
+            },
+          },
+          {
+            text: "昨天",
+            onClick(picker) {
+              const date = new Date();
+              date.setTime(date.getTime() - 3600 * 1000 * 24);
+              picker.$emit("pick", date);
+            },
+          },
+          {
+            text: "一周前",
+            onClick(picker) {
+              const date = new Date();
+              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", date);
+            },
+          },
+        ],
+      },
+      type_options: [
+        {
+          id: 1,
+          value: "课程",
+        },
+        // {
+        //   id: 2,
+        //   value: '课表'
+        // },
+        {
+          id: 3,
+          value: "自定义事件",
+        },
+        {
+          id: 4,
+          value: "资讯",
+        },
+      ],
+      course_content_options: [],
+      course_options: [],
+      canSelect: false,
+      module_options: [
+        { id: 1, value: '第一模块' },
+        { id: 2, value: '第二模块' },
+        { id: 3, value: '第三模块' },
+        { id: 4, value: '第四模块' },
+        { id: 5, value: '第五模块' },
+        { id: 6, value: '第六模块' },
+        { id: 7, value: '第七模块' },
+        { id: 8, value: '第八模块' },
+        { id: 9, value: '第九模块' },
+        { id: 10, value: '第十模块' }
+      ],
+      form: {
+        is_publish:1,
+        type: "",
+        course_id: "",
+        introduce: "",
+        course_content_id: "",
+        title: "",
+        url: "",
+        // date: '',
+        start_time: "",
+        end_time: "",
+        days: 0,
+        address:'',
+        color:'',
+        content: "",
+      },
+      rules: {
+        title: [
+          {
+            required: true,
+            message: "请输入标题",
+          },
+        ],
+        start_time: [
+          {
+            required: true,
+            message: "请选择开始时间",
+          },
+        ],
+        // end_time: [{
+        //   required: true,
+        //   message: '请选择结束时间'
+        // }],
+      },
+      zixunList: [],
+      suppressAutoDays: false,
+    };
+  },
+  created() {
+    this.getCourseList();
+    this.getZxList();
+  },
+  methods: {
+    remoteMethod(query) {
+      if (query !== "") {
+        this.loading = true;
+        this.getZxList(query);
+      } else {
+        this.zixunList = [];
+      }
+    },
+    async getZxList(query) {
+      const proUrl = `${process.env.VUE_APP_PRO_API}`;
+      var baseUrl = proUrl + "/e/extend/news.php";
+      try {
+        // 直接调用 axios.get()，传入接口地址和参数
+        const response = await axios.get(baseUrl, {
+          params: {
+            page: 1,
+            pagesize: 999,
+            keyword: query,
+          }, // GET 参数（拼在 URL 后）
+          timeout: 5000, // 超时时间（毫秒）
+        });
+        // 请求成功，存储结果
+        if (response.status === 200) {
+          this.zixunList = response.data.rows;
+        }
+        this.loading = false;
+        console.log("GET 请求成功：", response);
+      } catch (error) {
+        // 请求失败，处理错误
+        console.error("GET 请求失败：", error);
+        alert("请求失败：" + (error.response?.data?.msg || "网络错误"));
+      }
+    },
+    async getCourseList() {
+      const res = await courseIndex({
+        page: 1,
+        page_size: 999,
+        sort_name: "id",
+        sort_type: "DESC",
+        show_relation: ["image", "typeDetail"],
+      });
+      this.course_options = res.data;
+    },
+    async getCourseContentList(course_id) {
+      const res = await courseContentIndex({
+        page: 1,
+        page_size: 999,
+        filter: [
+          {
+            key: "course_id",
+            op: "like",
+            value: course_id,
+          },
+        ],
+      });
+      if (res.data.length < 1) {
+        this.$Message.warning("该课程暂无课表");
+        return;
+      }
+      this.course_content_options = res.data;
+    },
+    saveContent(e) {
+      this.form.content = e;
+    },
+    changeType(e) {
+      console.log("type", e);
+    },
+    changeIntroduce(e) {
+      console.log("e", e);
+      if (e) {
+        this.form.title = this.form.title + " - " + e;
+      }
+    },
+    changeCourse(e) {
+      console.log("course", e);
+      // 获取课表
+      if (this.form.type == 2) {
+        this.form.course_content_id = "";
+        this.getCourseContentList(e);
+      }
+      // 选择课程 自动填充
+      if (this.form.type == 1) {
+        this.course_options.map((item) => {
+          if (item.id === e) {
+            this.form.title =
+              (item.type_detail ? item.type_detail.name + " - " : "") +
+              item.name;
+            this.form.start_time = item.start_date
+              ? `${item.start_date} 09:00:00`
+              : "";
+            this.form.end_time = item.end_date
+              ? `${item.end_date} 17:00:00`
+              : "";
+            this.form.date = item.start_date;
+            this.form.url = item.url;
+            this.form.color = item.type_detail?(item.type_detail.color?item.type_detail.color:''):''
+          }
+        });
+        this.updateDaysFromDates();
+      }
+    },
+    changeCourseContent(e) {
+      // 选择课表 自动填充
+      if (this.form.type == 2) {
+        this.course_content_options.map((item) => {
+          if (item.id === e) {
+            this.form.title = item.theme;
+            this.form.start_time = item.start_date;
+            this.form.end_time = item.end_date;
+            this.form.date = item.start_date;
+          }
+        });
+        this.updateDaysFromDates();
+      }
+    },
+    onModuleChange(value) {
+      // 当选择模块时，自动拼接到标题后面
+      if (value && this.form.title) {
+        // 先去除标题中可能存在的模块值
+        let cleanTitle = this.form.title;
+        this.module_options.forEach(module => {
+          if (cleanTitle.includes(' - ' + module.value)) {
+            cleanTitle = cleanTitle.replace(' - ' + module.value, '');
+          }
+        });
+        // 拼接新的模块值
+        this.form.title = cleanTitle + ' - ' + value;
+      }
+    },
+    onCreateModule(value) {
+      // 当创建新模块时，添加到选项列表并选中
+      const newModule = {
+        id: this.module_options.length + 1,
+        value: value
+      };
+      this.module_options.push(newModule);
+      this.form.introduce = value;
+      // 先去除标题中可能存在的模块值，再拼接新的模块值
+      if (this.form.title) {
+        let cleanTitle = this.form.title;
+        this.module_options.forEach(module => {
+          if (cleanTitle.includes(' | ' + module.value)) {
+            cleanTitle = cleanTitle.replace(' | ' + module.value, '');
+          }
+        });
+        // 拼接新的模块值
+        this.form.title = cleanTitle + ' | ' + value;
+      }
+    },
+    submit() {
+      if (this.id) {
+        this.form.id = this.id;
+      }
+      if (this.type == "add") {
+        this.form.id = "";
+        this.form.title = this.form.introduce
+          ? this.form.title + " - " + this.form.introduce
+          : this.form.title;
+      }
+      save({
+        ...this.form,
+      }).then((res) => {
+        this.$message({
+          type: "success",
+          message: this.type === "add" ? "新增成功" : "编辑成功",
+        });
+        this.isShow = false;
+        this.$emit("refresh");
+      });
+    },
+
+    getDetail() {
+      show({
+        id: this.id,
+      }).then((res) => {
+        this.suppressAutoDays = true;
+        this.form = this.base.requestToForm(res, this.form);
+        this.form.is_publish = res.is_publish ? res.is_publish : 0;
+        this.form.days = this.normalizeDaysValue(res.days);
+        this.showTinymce = true;
+        this.$nextTick(() => {
+          this.suppressAutoDays = false;
+        });
+      });
+    },
+    delCalendar() {
+      destroy({
+        id: this.id,
+      }).then((res) => {
+        this.$message({
+          type: "success",
+          message: "删除成功",
+        });
+        this.isShow = false;
+        this.$emit("refresh");
+      });
+    },
+    getDefaultDateTime(time) {
+      const date = new Date();
+      const year = date.getFullYear();
+      const month = `${date.getMonth() + 1}`.padStart(2, "0");
+      const day = `${date.getDate()}`.padStart(2, "0");
+      return `${year}-${month}-${day} ${time}`;
+    },
+    setDefaultTimes() {
+      if (!this.form.start_time) {
+        this.form.start_time = this.getDefaultDateTime("09:00:00");
+      }
+      if (!this.form.end_time) {
+        this.form.end_time = this.getDefaultDateTime("17:00:00");
+      }
+      this.updateDaysFromDates();
+    },
+    updateDaysFromDates() {
+      if (!this.form.start_time || !this.form.end_time) {
+        this.form.days = 0;
+        return;
+      }
+      const startDateStr = this.form.start_time.split(" ")[0];
+      const endDateStr = this.form.end_time.split(" ")[0];
+      const startDate = new Date(startDateStr.replace(/-/g, "/"));
+      const endDate = new Date(endDateStr.replace(/-/g, "/"));
+      if (Number.isNaN(startDate.getTime()) || Number.isNaN(endDate.getTime())) {
+        return;
+      }
+      const diff =
+        Math.floor(
+          (endDate.getTime() - startDate.getTime()) / (24 * 60 * 60 * 1000)
+        ) + 1;
+      this.form.days = this.normalizeDaysValue(diff > 0 ? diff : 0);
+    },
+    normalizeDaysValue(value) {
+      if (value === null || value === undefined || value === "") {
+        return 0;
+      }
+      const num = Number(value);
+      if (Number.isNaN(num)) {
+        return 0;
+      }
+      return Math.max(0, Math.round(num));
+    },
+  },
+  watch: {
+    "form.start_time"() {
+      if (this.suppressAutoDays) return;
+      this.updateDaysFromDates();
+    },
+    "form.end_time"() {
+      if (this.suppressAutoDays) return;
+      this.updateDaysFromDates();
+    },
+    isShow(newVal) {
+      if (newVal) {
+        if (this.type === "editor") {
+          console.log("id", this.id);
+          this.getDetail();
+        } else {
+          this.showTinymce = true;
+          this.setDefaultTimes();
+        }
+      } else {
+        this.id = "";
+        this.showTinymce = false;
+        this.form = {
+          is_publish: 1,
+          type: "",
+          course_id: "",
+          introduce: "",
+          course_content_id: "",
+          title: "",
+          url: "",
+          date: "",
+          start_time: "",
+          end_time: "",
+          days: 0,
+          address:'',
+          color:'',
+          content: "",
+        };
+        this.setDefaultTimes();
+        this.$refs["dialog"].reset();
+      }
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+::v-deep .content {
+  flex-basis: 100%;
+}
+</style>
diff --git a/src/views/course/components/addTypes.vue b/src/views/course/components/addTypes.vue
index af5d2b1..98d2070 100644
--- a/src/views/course/components/addTypes.vue
+++ b/src/views/course/components/addTypes.vue
@@ -182,6 +182,19 @@
           </div>
         </div>
       </template>
+      <template v-slot:is_history>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>是否历史课程体系：
+          </div>
+          <div class="xy-table-item-content">
+            <el-radio-group style="width:100%" v-model="form.is_history">
+              <el-radio :label="1">是</el-radio>
+              <el-radio :label="0">否</el-radio>
+            </el-radio-group>
+          </div>
+        </div>
+      </template>
 
 
     </xy-dialog>
@@ -219,6 +232,7 @@
           show_txl:'',
           show_mobile:'',
           auto_schoolmate:'',
+          is_history:0,
         },
         rules: {
           name: [{
@@ -263,6 +277,7 @@
           this.form.show_txl = res.show_txl?res.show_txl:(res.show_txl==0?0:'')
           this.form.show_mobile = res.show_mobile?res.show_mobile:(res.show_mobile==0?0:'')
           this.form.auto_schoolmate = res.auto_schoolmate?res.auto_schoolmate:(res.auto_schoolmate==0?0:'')
+          this.form.is_history = res.is_history?res.is_history:0
         })
       },
 
@@ -294,6 +309,7 @@
             show_txl:'',
             show_mobile:'',
             auto_schoolmate:'',
+            is_history:0,
           },
           this.$refs['dialog'].reset()
         }
diff --git a/src/views/course/types.vue b/src/views/course/types.vue
index 4a3bb43..ec2c786 100644
--- a/src/views/course/types.vue
+++ b/src/views/course/types.vue
@@ -6,8 +6,27 @@
         <lx-header icon="md-apps" :text="$route.meta.title" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
           <div slot="content">
             <div class="searchwrap" style="display: flex;align-items: center;">
-              <el-button type="primary" size="small" @click="editTypes('add')">新增</el-button>
-
+              <div>
+                <el-select v-model="select.status" placeholder="请选择状态" clearable style="width: 100%;">
+                  <el-option v-for="item in types_status" :key="item.id" :label="item.value" :value="item.id">
+                  </el-option>
+                </el-select>
+              </div>
+              <div>
+                <el-select v-model="select.is_history" placeholder="请选择是否历史课程体系" clearable style="width: 100%;">
+                  <el-option label="是" :value="1">
+                  </el-option>
+                  <el-option label="否" :value="0">
+                  </el-option>
+                </el-select>
+              </div>
+              <div>
+                <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
+                <el-button type="primary" size="small" @click="resetSelect">重置</el-button>
+              </div>
+              <div>
+                <el-button type="primary" size="small" @click="editTypes('add')">新增</el-button>
+              </div>
             </div>
           </div>
 
@@ -27,14 +46,22 @@
             </template>
           </el-table-column>
         </template>
-
+        <template v-slot:is_history>
+          <el-table-column align='center' label="是否历史课程体系" width="180" header-align="center">
+            <template slot-scope="scope">
+              <el-tag :type="scope.row.is_history === 1 ? 'success' : 'info'" v-if="scope.row.is_history === 1">是</el-tag>
+              <el-tag :type="scope.row.is_history === 0 ? 'info' : 'success'" v-else>否</el-tag>
+              
+            </template>
+          </el-table-column>
+        </template>
         <template v-slot:btns>
           <el-table-column align='left' label="操作" width="180" header-align="center">
             <template slot-scope="scope">
               <el-button type="primary" size="small"
-                @click="editTypes('editor',scope.row.id)">编辑</el-button>
-              <el-popconfirm style="margin:0 10px" @confirm="deleteList(scope.row.id)" title="确定删除吗？">
-                <el-button type="danger" size="small" slot="reference">删除</el-button>
+                @click="editTypes('editor',scope.row.id)">编辑</el-button>
+              <el-popconfirm style="margin:0 10px" @confirm="deleteList(scope.row.id)" title="确定删除吗？">
+                <el-button type="danger" size="small" slot="reference">删除</el-button>
               </el-popconfirm>
               <!-- <el-button type="primary" size="small" @click="goAttendance">考勤</el-button>
               <el-button type="primary" size="small" @click="setMain(scope.row.id)">设定班主任</el-button> -->
@@ -63,6 +90,8 @@
     data() {
       return {
         select: {
+          status: '',
+          is_history: '',
           page: 1,
           page_size: 10,
         },
@@ -77,6 +106,14 @@
           label: '状态',
           align: 'center',
           width: 120,
+        }, {
+          prop: 'is_history',
+          label: '是否历史课程体系',
+          align: 'center',
+          width: 180,
+          formatter: (row) => {
+            return row.is_history === 1 ? '是' : '否'
+          }
         }]
 
       }
@@ -95,32 +132,54 @@
         this.getList()
       },
       async getList() {
+        const filter = []
+        if (this.select.status !== '') {
+          filter.push({
+            key: 'status',
+            op: 'like',
+            value: this.select.status
+          })
+        }
+        if (this.select.is_history !== '') {
+          filter.push({
+            key: 'is_history',
+            op: 'like',
+            value: this.select.is_history
+          })
+        }
         const res = await index({
           page: this.select.page,
-          page_size: this.select.page_size
+          page_size: this.select.page_size,
+          filter: filter
         })
         this.list = res.data
         this.total = res.total
       },
 
+      resetSelect() {
+        this.select.status = ''
+        this.select.is_history = ''
+        this.select.page = 1
+        this.getList()
+      },
       editTypes(type, id) {
         this.$refs.addTypes.type = type
         if (id) {
           this.$refs.addTypes.id = id
         }
         this.$refs.addTypes.isShow = true
-      },
-      deleteList(id) {
-        var that = this;
-        destroy({
-          id: id,
-        }).then(response => {
-          this.$Message.success('删除成功');
-          this.getList()
-        }).catch(error => {
-          console.log(error)
-          reject(error)
-        })
+      },
+      deleteList(id) {
+        var that = this;
+        destroy({
+          id: id,
+        }).then(response => {
+          this.$Message.success('删除成功');
+          this.getList()
+        }).catch(error => {
+          console.log(error)
+          reject(error)
+        })
       },
     }
   }
@@ -141,4 +200,4 @@
       }
     }
   }
-</style>
+</style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index d3a6211..a8a3953 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -319,16 +319,16 @@ export default {
       nationalMapInstance: null,
       nationalMarkers: [],
       mapData: [
-        { name: '张家港市', value: 12, imageKey: 'zjg' },
-        { name: '常熟市', value: 10, imageKey: 'cs' },
-        { name: '太仓市', value: 16, imageKey: 'tc' },
-        { name: '相城区', value: 82, imageKey: 'xc' },
-        { name: '高新区', value: 35, imageKey: 'gx' },
-        { name: '姑苏区', value: 26, imageKey: 'gs' },
-        { name: '工业园区', value: 96, imageKey: 'gyy' },
-        { name: '昆山市', value: 42, imageKey: 'ks' },
-        { name: '吴中区', value: 66, imageKey: 'wz' },
-        { name: '吴江区', value: 52, imageKey: 'wj' }
+        { name: '张家港市', value: 0, imageKey: 'zjg' },
+        { name: '常熟市', value: 0, imageKey: 'cs' },
+        { name: '太仓市', value: 0, imageKey: 'tc' },
+        { name: '相城区', value: 0, imageKey: 'xc' },
+        { name: '高新区', value: 0, imageKey: 'gx' },
+        { name: '姑苏区', value: 0, imageKey: 'gs' },
+        { name: '工业园区', value: 0, imageKey: 'gyy' },
+        { name: '昆山市', value: 0, imageKey: 'ks' },
+        { name: '吴中区', value: 0, imageKey: 'wz' },
+        { name: '吴江区', value: 0, imageKey: 'wj' }
       ],
       // 区域位置配置
       // 基础地图尺寸: 534 * 444 像素
diff --git a/src/views/historyCourse/components/addHistoryCourse.vue b/src/views/historyCourse/components/addHistoryCourse.vue
new file mode 100644
index 0000000..1f43548
--- /dev/null
+++ b/src/views/historyCourse/components/addHistoryCourse.vue
@@ -0,0 +1,274 @@
+<template>
+  <div>
+    <xy-dialog ref="dialog" :width="70" :is-show.sync="isShow" :type="'form'"
+      :title="type === 'add' ? '新增历史课程体系' : '编辑历史课程体系'" :form="form" :rules="rules" @submit="submit">
+      <template v-slot:type>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>课程体系：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select v-model="form.type" placeholder="请选择课程体系" clearable style="width: 100%;">
+              <el-option v-for="item in courseTypeOptions" :key="item.id" :label="item.name" :value="String(item.id)">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+      <template v-slot:course_name>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>课程名称：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.course_name" placeholder="请输入课程名称" clearable style="width: 100%;" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:start_time>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>开始日期：
+          </div>
+          <div class="xy-table-item-content">
+            <el-date-picker
+              v-model="form.start_time"
+              type="date"
+              placeholder="请选择开始日期"
+              style="width: 100%;"
+              value-format="yyyy-MM-dd">
+            </el-date-picker>
+          </div>
+        </div>
+      </template>
+      <template v-slot:end_time>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>结束日期：
+          </div>
+          <div class="xy-table-item-content">
+            <el-date-picker
+              v-model="form.end_time"
+              type="date"
+              placeholder="请选择结束日期"
+              style="width: 100%;"
+              value-format="yyyy-MM-dd">
+            </el-date-picker>
+          </div>
+        </div>
+      </template>
+      <template v-slot:course_type_signs_pass>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>培养人数（未去重）：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input-number v-model="form.course_type_signs_pass" :min="0" placeholder="请输入培养人数（未去重）" style="width: 100%;" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:course_type_signs_pass_unique>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>培养人数（去重）：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input-number v-model="form.course_type_signs_pass_unique" :min="0" placeholder="请输入培养人数（去重）" style="width: 100%;" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:course_signs_pass>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>课程培养人数：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input-number v-model="form.course_signs_pass" :min="0" placeholder="请输入课程培养人数" style="width: 100%;" />
+          </div>
+        </div>
+      </template>
+    </xy-dialog>
+  </div>
+</template>
+
+<script>
+import { save, show } from '@/api/historyCourse/index.js'
+import { index as courseTypeIndex } from '@/api/course/courseType.js'
+
+export default {
+  components: {
+
+  },
+  data() {
+    return {
+      isShow: false,
+      type: 'add',
+      id: '',
+      courseTypeOptions: [],
+      form: {
+        type: '',
+        course_name: '',
+        start_time: '',
+        end_time: '',
+        course_type_signs_pass: 0,
+        course_type_signs_pass_unique: 0,
+        course_signs_pass: 0
+      },
+      rules: {
+        type: [{
+          required: true,
+          message: '请选择课程体系'
+        }],
+        course_name: [{
+          required: true,
+          message: '请输入课程名称'
+        }],
+        start_time: [{
+          required: true,
+          message: '请选择开始日期'
+        }],
+        end_time: [{
+          required: true,
+          message: '请选择结束日期'
+        }],
+        course_type_signs_pass: [{
+          required: true,
+          message: '请输入培养人数（未去重）'
+        }],
+        course_type_signs_pass_unique: [{
+          required: true,
+          message: '请输入培养人数（去重）'
+        }],
+        course_signs_pass: [{
+          required: true,
+          message: '请输入课程培养人数'
+        }]
+      }
+    }
+  },
+  created() {
+    this.getCourseTypeList()
+  },
+  methods: {
+    async getCourseTypeList() {
+      try {
+        const res = await courseTypeIndex({
+          page: 1,
+          page_size: 999,
+          filter: [{
+            key: 'is_history',
+            op: 'eq',
+            value: 1
+          }]
+        })
+        if (res && res.data) {
+          this.courseTypeOptions = res.data
+          if (this.courseTypeOptions.length === 0) {
+            this.$message.warning('请先创建历史课程体系')
+          }
+        }
+      } catch (error) {
+        console.error('获取课程体系列表失败:', error)
+        this.$message.error('获取课程体系列表失败')
+      }
+    },
+    submit() {
+      if (this.courseTypeOptions.length === 0) {
+        this.$message.warning('请先创建历史课程体系')
+        return
+      }
+      if (this.id) {
+        this.form.id = this.id
+      }
+      if (this.type === 'add') {
+        this.form.id = ''
+      }
+      // 确保 type 是字符串格式
+      if (this.form.type !== null && this.form.type !== undefined) {
+        this.form.type = String(this.form.type)
+      }
+      // 确保数字字段有值
+      if (this.form.course_type_signs_pass === null || this.form.course_type_signs_pass === undefined) {
+        this.form.course_type_signs_pass = 0
+      }
+      if (this.form.course_type_signs_pass_unique === null || this.form.course_type_signs_pass_unique === undefined) {
+        this.form.course_type_signs_pass_unique = 0
+      }
+      if (this.form.course_signs_pass === null || this.form.course_signs_pass === undefined) {
+        this.form.course_signs_pass = 0
+      }
+      save(this.form).then(res => {
+        this.$message({
+          type: 'success',
+          message: this.type === 'add' ? '新增成功' : '编辑成功'
+        })
+        this.isShow = false
+        this.$emit('refresh')
+      }).catch(error => {
+        console.log(error)
+        this.$message.error(this.type === 'add' ? '新增失败' : '编辑失败')
+      })
+    },
+
+    getDetail() {
+      show({
+        id: this.id
+      }).then(res => {
+        // 确保 type 是字符串格式，如果是数字则转换为字符串
+        const typeValue = res.type !== null && res.type !== undefined ? String(res.type) : ''
+        this.form = {
+          type: typeValue,
+          course_name: res.course_name || '',
+          start_time: res.start_time || '',
+          end_time: res.end_time || '',
+          course_type_signs_pass: res.course_type_signs_pass !== undefined ? res.course_type_signs_pass : 0,
+          course_type_signs_pass_unique: res.course_type_signs_pass_unique !== undefined ? res.course_type_signs_pass_unique : 0,
+          course_signs_pass: res.course_signs_pass !== undefined ? res.course_signs_pass : 0
+        }
+      }).catch(error => {
+        console.log(error)
+        this.$message.error('获取详情失败')
+      })
+    }
+  },
+  watch: {
+    isShow(newVal) {
+      if (newVal) {
+        // 重新获取课程体系列表
+        this.getCourseTypeList()
+        if (this.type === 'editor') {
+          this.getDetail()
+        } else {
+          this.form = {
+            type: '',
+            course_name: '',
+            start_time: '',
+            end_time: '',
+            course_type_signs_pass: 0,
+            course_type_signs_pass_unique: 0,
+            course_signs_pass: 0
+          }
+        }
+      } else {
+        this.id = ''
+        this.type = 'add'
+        this.form = {
+          type: '',
+          course_name: '',
+          start_time: '',
+          end_time: '',
+          course_type_signs_pass: 0,
+          course_type_signs_pass_unique: 0,
+          course_signs_pass: 0
+        }
+        this.$refs['dialog'].reset()
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>
+
diff --git a/src/views/historyCourse/index.vue b/src/views/historyCourse/index.vue
new file mode 100644
index 0000000..bc9be25
--- /dev/null
+++ b/src/views/historyCourse/index.vue
@@ -0,0 +1,201 @@
+<template>
+  <div>
+    <div>
+      <div ref="lxHeader">
+        <lx-header icon="md-apps" :text="$route.meta.title" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+          <div slot="content">
+            <div class="searchwrap" style="display: flex;align-items: center;">
+              <div>
+                <el-input v-model="select.course_name" placeholder="请输入课程名称" clearable />
+              </div>
+              <div>
+                <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
+              </div>
+              <div>
+                <el-button type="primary" size="small" @click="editHistoryCourse('add')">新增</el-button>
+              </div>
+            </div>
+          </div>
+        </lx-header>
+      </div>
+    </div>
+
+    <div>
+      <xy-table :list="list" :total="total" :table-item="table_item" @pageIndexChange="pageIndexChange" @pageSizeChange="pageSizeChange">
+        <template v-slot:type>
+          <el-table-column align="center" label="课程体系" width="200" header-align="center">
+            <template slot-scope="scope">
+              {{ getCourseTypeName(scope.row.type) }}
+            </template>
+          </el-table-column>
+        </template>
+        <template v-slot:btns>
+          <el-table-column align="center" label="操作" width="180" header-align="center">
+            <template slot-scope="scope">
+              <el-button type="primary" size="small" @click="editHistoryCourse('editor',scope.row.id)">编辑</el-button>
+              <el-popconfirm title="确定删除吗？" style="margin:0 10px" @confirm="deleteList(scope.row.id)">
+                <el-button slot="reference" type="danger" size="small">删除</el-button>
+              </el-popconfirm>
+            </template>
+          </el-table-column>
+        </template>
+      </xy-table>
+    </div>
+
+    <add-history-course ref="addHistoryCourse" @refresh="getList" />
+  </div>
+</template>
+
+<script>
+import addHistoryCourse from './components/addHistoryCourse.vue'
+import { index, destroy } from '@/api/historyCourse/index.js'
+import { index as courseTypeIndex } from '@/api/course/courseType.js'
+
+export default {
+  components: {
+    addHistoryCourse
+  },
+  data() {
+    return {
+      select: {
+        course_name: '',
+        page: 1,
+        page_size: 10
+      },
+      list: [],
+      total: 0,
+      courseTypeOptions: [],
+      table_item: [{
+        prop: 'type',
+        label: '课程体系',
+        align: 'center',
+        width: 200
+      }, {
+        prop: 'course_name',
+        label: '课程名称',
+        align: 'left',
+        minWidth: 200
+      }, {
+        prop: 'start_time',
+        label: '开始日期',
+        align: 'center',
+        width: 150
+      }, {
+        prop: 'end_time',
+        label: '结束日期',
+        align: 'center',
+        width: 150
+      }, {
+        prop: 'course_type_signs_pass',
+        label: '培养人数（未去重）',
+        align: 'center',
+        width: 150
+      }, {
+        prop: 'course_type_signs_pass_unique',
+        label: '培养人数（去重）',
+        align: 'center',
+        width: 150
+      }, {
+        prop: 'course_signs_pass',
+        label: '课程培养人数',
+        align: 'center',
+        width: 150
+      }]
+    }
+  },
+  created() {
+    this.getCourseTypeList()
+    this.getList()
+  },
+  methods: {
+    async getCourseTypeList() {
+      try {
+        const res = await courseTypeIndex({
+          page: 1,
+          page_size: 999,
+          filter: [{
+            key: 'is_history',
+            op: 'eq',
+            value: 1
+          }]
+        })
+        if (res && res.data) {
+          this.courseTypeOptions = res.data
+        }
+      } catch (error) {
+        console.error('获取课程体系列表失败:', error)
+      }
+    },
+    getCourseTypeName(type) {
+      if (!type) return ''
+      // type 是字符串，需要匹配 id（可能是数字或字符串）
+      const courseType = this.courseTypeOptions.find(item => {
+        // 同时支持数字和字符串匹配
+        return String(item.id) === String(type) || item.id === type
+      })
+      return courseType ? courseType.name : type
+    },
+    pageIndexChange(e) {
+      this.select.page = e
+      this.getList()
+    },
+    pageSizeChange(e) {
+      this.select.page_size = e
+      this.select.page = 1
+      this.getList()
+    },
+    editHistoryCourse(type, id) {
+      if (type === 'editor') {
+        this.$refs.addHistoryCourse.id = id
+      }
+      this.$refs.addHistoryCourse.type = type
+      this.$refs.addHistoryCourse.isShow = true
+    },
+    async getList() {
+      const params = {
+        page_size: this.select.page_size,
+        page: this.select.page
+      }
+      if (this.select.course_name) {
+        params.filter = [{
+          key: 'course_name',
+          op: 'like',
+          value: this.select.course_name
+        }]
+      }
+      const res = await index(params, false)
+      this.list = res.data
+      this.total = res.total
+    },
+    deleteList(id) {
+      destroy({
+        id: id
+      }).then(response => {
+        this.$message.success('删除成功')
+        this.getList()
+      }).catch(error => {
+        console.log(error)
+        this.$message.error('删除失败')
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.searchwrap {
+  display: flex;
+  align-items: center;
+
+  &>div {
+    display: flex;
+    align-items: center;
+    margin-right: 10px;
+
+    span {
+      min-width: 70px;
+    }
+  }
+}
+</style>
+
diff --git a/src/views/statistics/index.vue b/src/views/statistics/index.vue
index 1c8a1e9..45fed40 100644
--- a/src/views/statistics/index.vue
+++ b/src/views/statistics/index.vue
@@ -67,14 +67,56 @@
       </div>
       
       <!-- 学员统计卡片 -->
-      <div class="stats-container">
-        <div class="stats-card" :class="stat.cardClass" v-for="(stat, index) in studentStats" :key="index">
-          <i class="el-icon-download stats-download" @click.stop="exportStat(stat)"></i>
-          <div class="stats-icon">
-            <i :class="stat.icon"></i>
+      <div class="stats-categories-container">
+        <!-- 全宽分类 -->
+        <div
+          class="stats-category stats-category-full"
+          v-for="(category, categoryIndex) in fullCategories"
+          :key="'full-' + categoryIndex">
+          <h4 class="category-title">{{ category.title }}</h4>
+          <div
+            class="stats-container"
+            :class="{
+              'stats-container-full': category.layout !== 'half',
+              'stats-container-half': category.layout === 'half'
+            }">
+            <div class="stats-card" :class="stat.cardClass" v-for="(stat, index) in category.stats" :key="stat.key || index">
+              <i class="el-icon-download stats-download" @click.stop="exportStat(stat)"></i>
+              <div class="stats-icon">
+                <i :class="stat.icon"></i>
+              </div>
+              <h3>{{ stat.value }}</h3>
+              <p>{{ stat.label }}</p>
+            </div>
+          </div>
+        </div>
+
+        <!-- 半宽分类，每行两个 -->
+        <div
+          class="stats-half-row"
+          v-for="(row, rowIndex) in halfCategoryRows"
+          :key="'half-row-' + rowIndex">
+          <div
+            class="stats-category stats-category-half"
+            v-for="(category, categoryIndex) in row"
+            :key="'half-' + rowIndex + '-' + categoryIndex">
+            <h4 class="category-title">{{ category.title }}</h4>
+            <div
+              class="stats-container"
+              :class="{
+                'stats-container-full': category.layout !== 'half',
+                'stats-container-half': category.layout === 'half'
+              }">
+              <div class="stats-card" :class="stat.cardClass" v-for="(stat, index) in category.stats" :key="stat.key || index">
+                <i class="el-icon-download stats-download" @click.stop="exportStat(stat)"></i>
+                <div class="stats-icon">
+                  <i :class="stat.icon"></i>
+                </div>
+                <h3>{{ stat.value }}</h3>
+                <p>{{ stat.label }}</p>
+              </div>
+            </div>
           </div>
-          <h3>{{ stat.value }}</h3>
-          <p>{{ stat.label }}</p>
         </div>
       </div>
       
@@ -98,19 +140,19 @@
             </div>
           </div>
           <div class="detail-table">
-            <el-table :data="courseDetailData" :span-method="objectSpanMethod" :header-cell-style="headerCellStyle">
+            <el-table 
+              :data="courseDetailData" 
+              :span-method="objectSpanMethod" 
+              :header-cell-style="headerCellStyle"
+              show-summary
+              :summary-method="getCourseDetailSummary">
               <el-table-column prop="courseSystem" label="课程体系" width="200" align="center"></el-table-column>
               <el-table-column prop="totalPeople" label="培养人数（未去重）" width="200" align="center"></el-table-column>
               <el-table-column prop="uniquePeople" label="培养人数（课程体系内已去重）" width="280" align="center"></el-table-column>
+              <el-table-column prop="courseIndex" label="期数" width="120" align="center"></el-table-column>
               <el-table-column prop="courseName" label="开课" min-width="200"></el-table-column>
               <el-table-column prop="coursePeople" label="课程培养人数" width="150" align="center"></el-table-column>
             </el-table>
-            <div class="table-summary">
-              <span>累计：</span>
-              <span>培养人数（未去重）：{{ courseDetailSummary.totalPeople }}</span>
-              <span>培养人数（课程体系内已去重）：{{ courseDetailSummary.uniquePeople }}</span>
-              <span>课程培养人数：{{ courseDetailSummary.coursePeople }}</span>
-            </div>
           </div>
         </el-col>
       </el-row>
@@ -132,16 +174,16 @@
             </div>
           </div>
           <div class="detail-table">
-            <el-table :data="regionData" style="width: 100%" :header-cell-style="headerCellStyle">
+            <el-table 
+              :data="regionData" 
+              style="width: 100%" 
+              :header-cell-style="headerCellStyle"
+              show-summary
+              :summary-method="getRegionSummary">
               <el-table-column prop="region" label="区域" width="200" align="center"></el-table-column>
               <el-table-column prop="totalPeople" label="培养人数（未去重）" align="center"></el-table-column>
               <el-table-column prop="uniquePeople" label="培养人数（已去重）" align="center"></el-table-column>
             </el-table>
-            <div class="table-summary">
-              <span>累计：</span>
-              <span>培养人数（未去重）：{{ regionSummary.totalPeople }}</span>
-              <span>培养人数（已去重）：{{ regionSummary.uniquePeople }}</span>
-            </div>
           </div>
         </el-col>
       </el-row>
@@ -160,6 +202,19 @@ export default {
   name: 'Statistics',
   mixins: [formMixin],
   components: {},
+  computed: {
+    fullCategories() {
+      return this.statsCategories.filter(category => category.layout !== 'half')
+    },
+    halfCategoryRows() {
+      const halves = this.statsCategories.filter(category => category.layout === 'half')
+      const rows = []
+      for (let i = 0; i < halves.length; i += 2) {
+        rows.push(halves.slice(i, i + 2))
+      }
+      return rows
+    }
+  },
   data() {
     return {
       chartLoading: false,
@@ -172,69 +227,134 @@ export default {
       },
       courseOptions: [],
       courseTypeList: [], // 课程体系列表
-      studentStats: [
-        {
-          key: 'course_signs_invested',
-          icon: 'el-icon-user-solid',
-          value: '0',
-          label: '被投企业数',
-          cardClass: 'student-card-1'
-        },
-        {
-          key: 'course_signs_pass',
-          icon: 'el-icon-s-check',
-          value: '0',
-          label: '培养人数（未去重）',
-          cardClass: 'student-card-2'
-        },
+      statsCategories: [
         {
-          key: 'course_signs_pass_unique',
-          icon: 'el-icon-s-custom',
-          value: '0',
-          label: '培养人数（已去重）',
-          cardClass: 'student-card-3'
-        },
-        {
-          key: 'course_total',
-          icon: 'el-icon-date',
-          value: '0',
-          label: '开课场次',
-          cardClass: 'student-card-4'
-        },
-        {
-          key: 'course_day_total',
-          icon: 'el-icon-c-scale-to-original',
-          value: '0',
-          label: '开课天数',
-          cardClass: 'student-card-5'
+          layout: 'full',
+          title: '培养数据',
+          stats: [
+            {
+              key: 'course_signs_pass',
+              icon: 'el-icon-s-check',
+              value: '0',
+              label: '培养人次（未去重）',
+              cardClass: 'student-card-1'
+            },
+            {
+              key: 'course_signs_pass_unique',
+              icon: 'el-icon-s-custom',
+              value: '0',
+              label: '培养人数（已去重）',
+              cardClass: 'student-card-2'
+            },
+            {
+              key: 'ganbu_total',
+              icon: 'el-icon-s-opportunity',
+              value: '0',
+              label: '跟班学员数',
+              cardClass: 'student-card-3'
+            },
+            {
+              key: 'company_ganbu_total',
+              icon: 'el-icon-s-check',
+              value: '0',
+              label: '全市干部参与数',
+              cardClass: 'student-card-4'
+            },
+            {
+              key: 'company_join_total',
+              icon: 'el-icon-s-promotion',
+              value: '0',
+              label: '元禾员工参与数',
+              cardClass: 'student-card-5'
+            }
+          ]
         },
         {
-          key: 'company_market_total',
-          icon: 'el-icon-office-building',
-          value: '0',
-          label: '上市公司数',
-          cardClass: 'student-card-1'
+          layout: 'half',
+          title: '开课数据',
+          stats: [
+            {
+              key: 'course_total',
+              icon: 'el-icon-date',
+              value: '0',
+              label: '开课场次',
+              cardClass: 'student-card-1'
+            },
+            {
+              key: 'course_day_total',
+              icon: 'el-icon-c-scale-to-original',
+              value: '0',
+              label: '开课天数',
+              cardClass: 'student-card-2'
+            }
+          ]
         },
         {
-          key: 'company_market_year_total',
-          icon: 'el-icon-s-finance',
-          value: '0',
-          label: '今年上市公司数',
-          cardClass: 'student-card-2'
+          layout: 'half',
+          title: '上市数据',
+          stats: [
+            {
+              key: 'company_market_total',
+              icon: 'el-icon-office-building',
+              value: '0',
+              label: '上市公司数',
+              cardClass: 'student-card-1'
+            },
+            {
+              key: 'company_market_after_enrollment_total',
+              icon: 'el-icon-s-marketing',
+              value: '0',
+              label: '入学后上市公司数',
+              cardClass: 'student-card-2'
+            },
+            {
+              key: 'company_market_year_total',
+              icon: 'el-icon-s-finance',
+              value: '0',
+              label: '今年上市公司数',
+              cardClass: 'student-card-3'
+            }
+          ]
         },
         {
-          key: 'company_market_after_enrollment_total',
-          icon: 'el-icon-s-marketing',
-          value: '0',
-          label: '入学后上市公司数',
-          cardClass: 'student-card-3'
+          layout: 'half',
+          title: '被投数据',
+          stats: [
+            {
+              key: 'course_signs_invested',
+              icon: 'el-icon-user-solid',
+              value: '0',
+              label: '被投企业数',
+              cardClass: 'student-card-1'
+            }
+          ]
         },
         {
-          key: 'ganbu_total',
-          icon: 'el-icon-s-opportunity',
-          value: '0',
-          label: '跟班学员数',
-          cardClass: 'student-card-4'
+          layout: 'half',
+          title: '三个全覆盖数据',
+          stats: [
+            {
+              key: 'cover_head_total',
+              icon: 'el-icon-s-shop',
+              value: '0',
+              label: '苏州头部科技企业数',
+              cardClass: 'student-card-1'
+            },
+            {
+              key: 'cover_rencai_total',
+              icon: 'el-icon-s-custom',
+              value: '0',
+              label: '苏州高层次科技人才数',
+              cardClass: 'student-card-2'
+            },
+            {
+              key: 'cover_stock_total',
+              icon: 'el-icon-s-opportunity',
+              value: '0',
+              label: '苏州重点上市公司数',
+              cardClass: 'student-card-3'
+            }
+          ]
         }
       ],
       courseDetailData: [],
@@ -685,12 +805,14 @@ export default {
       // 根据API返回的数据更新统计卡片
       if (data && data.list) {
         const statsData = data.list
-        this.studentStats.forEach(stat => {
-          if (stat.key && statsData.hasOwnProperty(stat.key)) {
-            stat.value = statsData[stat.key] ?? '0'
-          } else {
-            stat.value = '0'
-          }
+        this.statsCategories.forEach(category => {
+          category.stats.forEach(stat => {
+            if (stat.key && Object.prototype.hasOwnProperty.call(statsData, stat.key)) {
+              stat.value = statsData[stat.key] ?? '0'
+            } else {
+              stat.value = '0'
+            }
+          })
         })
       }
       
@@ -728,6 +850,7 @@ export default {
               courseSystem: group.courseSystem,
               totalPeople: group.totalPeople,
               uniquePeople: group.uniquePeople,
+              courseIndex: index + 1,
               courseName: course.courseName,
               coursePeople: course.coursePeople,
               isFirstRow: index === 0 // 标记是否为该课程体系的第一行
@@ -762,7 +885,7 @@ export default {
         this.regionSummary = { totalPeople: 0, uniquePeople: 0 }
       }
       
-      console.log('统计数据已更新:', this.studentStats)
+      console.log('统计数据已更新:', this.statsCategories)
       console.log('课程分类明细数据已更新:', this.courseDetailData)
       console.log('区域明细数据已更新:', this.regionData)
     },
@@ -840,6 +963,55 @@ export default {
         fontSize: '0.99rem',
         textAlign: 'center'
       };
+    },
+
+    // 课程分类明细表格合计方法
+    getCourseDetailSummary({ columns, data }) {
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          // 第一列显示"累计"
+          sums[index] = '累计'
+        } else if (index === 1) {
+          // 培养人数（未去重）
+          sums[index] = this.courseDetailSummary.totalPeople
+        } else if (index === 2) {
+          // 培养人数（课程体系内已去重）
+          sums[index] = this.courseDetailSummary.uniquePeople
+        } else if (index === 3) {
+          // 期数：统计总行数
+          sums[index] = data.length
+        } else if (index === 4) {
+          // 开课列不显示合计
+          sums[index] = ''
+        } else if (index === 5) {
+          // 课程培养人数
+          sums[index] = this.courseDetailSummary.coursePeople
+        } else {
+          sums[index] = ''
+        }
+      })
+      return sums
+    },
+
+    // 区域明细表格合计方法
+    getRegionSummary({ columns, data }) {
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          // 第一列显示"累计"
+          sums[index] = '累计'
+        } else if (index === 1) {
+          // 培养人数（未去重）
+          sums[index] = this.regionSummary.totalPeople
+        } else if (index === 2) {
+          // 培养人数（已去重）
+          sums[index] = this.regionSummary.uniquePeople
+        } else {
+          sums[index] = ''
+        }
+      })
+      return sums
     }
   }
 }
@@ -947,31 +1119,69 @@ export default {
   }
 }
 
-.stats-container {
+.stats-categories-container {
   display: flex;
-  flex-wrap: wrap;
-  justify-content: space-between;
+  flex-direction: column;
   gap: 20px;
   margin-bottom: 30px;
+}
+
+.stats-category-full {
+  width: 100%;
+}
+
+.stats-half-row {
+  display: flex;
+  gap: 20px;
+  width: 100%;
+}
+
+.stats-category-half {
+  flex: 1;
+}
+
+.category-title {
+  color: #0f4c75;
+  font-weight: bold;
+  font-size: 1.2rem;
+  margin-bottom: 15px;
+  padding-left: 10px;
+  border-left: 4px solid #00a8ff;
+}
+
+.stats-container {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  gap: 15px;
   padding: 0 10px;
 }
 
+.stats-container-full {
+  width: 100%;
+  justify-content: space-between;
+}
+
+.stats-container-half {
+  width: 100%;
+}
+
 .stats-card {
-  border-radius: 20px;
-  padding: 28px 20px;
+  border-radius: 15px;
+  padding: 20px 15px;
   margin-bottom: 0;
-  box-shadow: 0 15px 35px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 10px 25px rgba(0, 0, 0, 0.1);
   transition: all 0.4s ease;
   position: relative;
   overflow: hidden;
   text-align: center;
-  height: 200px;
+  height: 150px;
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  flex: 0 0 calc(20% - 16px);
-  min-width: calc(20% - 16px);
+  flex: 1 1 calc(20% - 15px);
+  min-width: 180px;
   
   &::before {
     content: '';
@@ -989,28 +1199,28 @@ export default {
   }
   
   h3 {
-    font-size: 2.24rem;
+    font-size: 1.6rem;
     font-weight: bold;
-    margin-bottom: 15px;
+    margin-bottom: 8px;
     text-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
     flex-shrink: 0;
   }
   
   p {
-    font-size: 1.08rem;
+    font-size: 0.85rem;
     opacity: 0.95;
     margin: 0;
     font-weight: 500;
     flex-shrink: 0;
-    margin-bottom:15px;
+    line-height: 1.3;
   }
 }
 
 .stats-download {
   position: absolute;
-  top: 12px;
-  right: 12px;
-  font-size: 1.1rem;
+  top: 8px;
+  right: 8px;
+  font-size: 0.9rem;
   color: rgba(255, 255, 255, 0.8);
   cursor: pointer;
   transition: color 0.2s ease;
@@ -1022,9 +1232,9 @@ export default {
 }
 
 .stats-icon {
-  font-size: 2.8rem;
+  font-size: 2rem;
   opacity: 0.9;
-  margin-bottom: 15px;
+  margin-bottom: 8px;
   text-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
   flex-shrink: 0;
 }
@@ -1141,6 +1351,21 @@ export default {
   background: linear-gradient(135deg, #f8f9fa 0%, #e3f2fd 100%) !important;
 }
 
+/* 合计行样式 */
+.detail-table .el-table .el-table__footer-wrapper {
+  .el-table__footer {
+    background: rgba(15, 76, 117, 0.05) !important;
+    
+    td {
+      background: rgba(15, 76, 117, 0.05) !important;
+      color: #0f4c75 !important;
+      font-weight: 600 !important;
+      border-top: 1px solid rgba(15, 76, 117, 0.12) !important;
+      border-bottom: 1px solid rgba(15, 76, 117, 0.12) !important;
+    }
+  }
+}
+
 .table-summary {
   display: flex;
   flex-wrap: wrap;
@@ -1195,6 +1420,12 @@ export default {
 }
 
 /* 响应式布局 */
+@media (max-width: 1024px) {
+  .stats-half-row {
+    flex-direction: column;
+  }
+}
+
 @media (max-width: 767.98px) {
   .stats-container {
     flex-direction: column;
@@ -1202,7 +1433,8 @@ export default {
   }
   
   .stats-card {
-    width: 100%;
+    width: 100% !important;
+    max-width: 100% !important;
     margin-bottom: 15px;
   }
   
diff --git a/src/views/student/schoolmateCompany.vue b/src/views/student/schoolmateCompany.vue
index 970f0dc..38c4fd2 100644
--- a/src/views/student/schoolmateCompany.vue
+++ b/src/views/student/schoolmateCompany.vue
@@ -21,6 +21,26 @@
                 </el-option>
               </el-select>
               </div>
+              <div>
+                <el-input v-model="select.course_name" placeholder="请输入课程名称"></el-input>
+              </div>
+              <div>
+                <el-input v-model="select.user_name" placeholder="请输入学员名称"></el-input>
+              </div>
+              <div>
+                <el-select v-model="select.course_type_id" placeholder="请选择课程体系" clearable style="width: 100%;">
+                  <el-option v-for="item in courseTypeOptions" :key="item.id" :label="item.name" :value="item.id">
+                  </el-option>
+                </el-select>
+              </div>
+              <div>
+                <el-select v-model="select.is_schoolmate" placeholder="请选择是否校友" clearable style="width: 100%;">
+                  <el-option label="是" :value="1">
+                  </el-option>
+                  <el-option label="否" :value="0">
+                  </el-option>
+                </el-select>
+              </div>
               <div>
                 <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
                 <el-button type="primary" size="small" @click="resetSelect">重置</el-button>
@@ -69,12 +89,21 @@
           </el-table-column>
         </template>
         <template v-slot:project_users>
-          <el-table-column align='center' label="管理平台-项目经理-首次出资时间" width="300" header-align="center">
+          <el-table-column align='center' label="管理平台-项目经理-首次出资时间-投资金额" width="360" header-align="center">
             <template slot-scope="scope">
-              <div v-for="(item,index) in scope.row.project_users">
-                <div style="text-align: left;">
-                  {{index+1}}、{{ item.groupName }}-{{ item.userName }}-{{ item.investDate }}
+              <div style="display: flex; align-items: center; justify-content: space-between;">
+                <div style="flex: 1;">
+                  <div v-for="(item,index) in scope.row.project_users" :key="index">
+                    <div style="text-align: left;">
+                      {{index+1}}、{{ item.groupName }}-{{ item.userName }}-{{ item.investDate }}{{ item.amount ? '-' + item.amount : '' }}
+                    </div>
+                  </div>
                 </div>
+                <i v-if="scope.row.project_users && scope.row.project_users.length > 0" 
+                   class="el-icon-edit" 
+                   style="cursor: pointer; color: #409EFF; margin-left: 10px; font-size: 16px;"
+                   @click="openEditProjectUsers(scope.row)">
+                </i>
               </div>
             </template>
           </el-table-column>
@@ -185,6 +214,32 @@
     </div>
 
     <add-company ref="addCompany" @refresh="getList"></add-company>
+
+    <!-- 编辑项目经理信息弹窗 -->
+    <el-dialog
+      title="编辑项目经理信息"
+      :visible.sync="editProjectUsersDialogVisible"
+      width="800px">
+      <el-table :data="editProjectUsersData" border style="width: 100%">
+        <el-table-column prop="groupName" label="管理平台" width="150" align="center"></el-table-column>
+        <el-table-column prop="userName" label="项目经理" width="150" align="center"></el-table-column>
+        <el-table-column prop="investDate" label="首次出资时间" width="150" align="center"></el-table-column>
+        <el-table-column label="投资金额" width="200" align="center">
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.amount"
+              style="width: 100%;"
+              placeholder="请输入投资金额"
+              clearable>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="editProjectUsersDialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="saveProjectUsers">确认</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -196,8 +251,12 @@
   import {
     index,
     destroy,
-    companyConfig
+    companyConfig,
+    save
   } from "@/api/student/schoolmateCompany.js"
+  import {
+    index as courseTypeIndex
+  } from "@/api/course/courseType.js"
   import formMixin from "@/mixin/formMixin.js";
   export default {
     mixins: [formMixin],
@@ -210,12 +269,20 @@
           company_name: '',
           is_yh_invested: '',
           company_tag: '',
+          course_name: '',
+          user_name: '',
+          is_schoolmate: '',
+          course_type_id: '',
           page: 1,
           page_size: 10
         },
         companiesTags:[],
+        courseTypeOptions: [],
         list: [],
         total: 0,
+        editProjectUsersDialogVisible: false,
+        editProjectUsersData: [],
+        currentEditCompanyId: null,
         table_item: [{
           type: 'index',
           align: 'center',
@@ -274,6 +341,7 @@
     created() {
       this.getList()
       this.getCompanyConfig()
+      this.getCourseTypeList()
     },
     updated() {
       // 在数据更新后，统一设置学员信息列的高度
@@ -298,6 +366,10 @@
           page_size: 9999,
           page: 1,
           is_export:1,
+          course_name: this.select.course_name,
+          user_name: this.select.user_name,
+          is_schoolmate: this.select.is_schoolmate !== '' ? this.select.is_schoolmate : '',
+          course_type_id: this.select.course_type_id,
           filter: [{
             key: 'company_name',
             op: 'like',
@@ -318,6 +390,19 @@
         const res = await companyConfig()
         this.companiesTags = res.companiesTags
       },
+      async getCourseTypeList() {
+        try {
+          const res = await courseTypeIndex({
+            page: 1,
+            page_size: 999
+          })
+          if (res && res.data) {
+            this.courseTypeOptions = res.data
+          }
+        } catch (error) {
+          console.error('获取课程体系列表失败:', error)
+        }
+      },
       toQicc(company_name) {
         var url = 'https://www.qcc.com/web/search?key='
         if(company_name){
@@ -347,6 +432,10 @@
         this.select.company_name = ''
         this.select.is_yh_invested = ''
         this.select.company_tag = ''
+        this.select.course_name = ''
+        this.select.user_name = ''
+        this.select.is_schoolmate = ''
+        this.select.course_type_id = ''
         this.select.page = 1
         this.getList()
       },
@@ -354,6 +443,10 @@
         const res = await index({
           page_size: this.select.page_size,
           page: this.select.page,
+          course_name: this.select.course_name,
+          user_name: this.select.user_name,
+          is_schoolmate: this.select.is_schoolmate !== '' ? this.select.is_schoolmate : '',
+          course_type_id: this.select.course_type_id,
           filter: [{
             key: 'company_name',
             op: 'like',
@@ -388,6 +481,36 @@
           reject(error)
         })
       },
+      // 打开编辑项目经理信息弹窗
+      openEditProjectUsers(row) {
+        this.currentEditCompanyId = row.id
+        // 深拷贝数组，避免直接修改原数据，并确保每个项目都有 amount 字段
+        this.editProjectUsersData = (row.project_users || []).map(item => {
+          return {
+            ...item,
+            amount: item.amount !== undefined && item.amount !== null ? String(item.amount) : ''
+          }
+        })
+        this.editProjectUsersDialogVisible = true
+      },
+      // 保存项目经理信息
+      saveProjectUsers() {
+        if (!this.currentEditCompanyId) {
+          this.$message.error('缺少企业ID')
+          return
+        }
+        save({
+          id: this.currentEditCompanyId,
+          project_users: this.editProjectUsersData
+        }).then(response => {
+          this.$message.success('保存成功')
+          this.editProjectUsersDialogVisible = false
+          this.getList()
+        }).catch(error => {
+          console.log(error)
+          this.$message.error('保存失败')
+        })
+      },
       // 统一设置学员信息列的高度，确保虚线对齐
       alignUserItemHeights() {
         this.$nextTick(() => {
diff --git a/vue.config.js b/vue.config.js
index 19d070b..7ffc4f9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -28,9 +28,9 @@ module.exports = {
    */
   publicPath: process.env.ENV === 'staging' ? '/admin' : '/admin',
   // 测试
-  outputDir: '/Users/mac/Documents/朗业/2025/s-苏州科技商学院/wx.sstbc.com/public/admin',
-//  正式
-  // outputDir: '/Users/mac/Documents/朗业/2024/s-苏州科技商学院/wx.sstbc.com/public/admin',
+  // outputDir: '/Users/mac/Documents/朗业/2025/s-苏州科技商学院/wx.sstbc.com/public/admin',
+  //  正式
+  outputDir: '/Users/mac/Documents/朗业/2024/s-苏州科技商学院/wx.sstbc.com/public/admin',
   assetsDir: 'static',
   css: {
     loaderOptions: { // 向 CSS 相关的 loader 传递选项