Merge branch 'master' into iteration-login

dist/assets/Scrollbar-ddd13731.js → dist/assets/Scrollbar-27c35a2f.js

@@ -1 +1 @@
-import{a9 as l,d as e,r as a,ac as n,aq as t}from"./index-65c05462.js";const c=Object.assign(Object.assign({},l.props),{trigger:String,xScrollable:Boolean,onScroll:Function,size:Number}),i=e({name:"Scrollbar",props:c,setup(){const r=a(null);return Object.assign(Object.assign({},{scrollTo:(...o)=>{var s;(s=r.value)===null||s===void 0||s.scrollTo(o[0],o[1])},scrollBy:(...o)=>{var s;(s=r.value)===null||s===void 0||s.scrollBy(o[0],o[1])}}),{scrollbarInstRef:r})},render(){return n(t,Object.assign({ref:"scrollbarInstRef"},this.$props),this.$slots)}}),d=i;export{d as N};
+import{a9 as l,d as e,r as a,ac as n,ar as t}from"./index-95e721f9.js";const c=Object.assign(Object.assign({},l.props),{trigger:String,xScrollable:Boolean,onScroll:Function,size:Number}),i=e({name:"Scrollbar",props:c,setup(){const r=a(null);return Object.assign(Object.assign({},{scrollTo:(...o)=>{var s;(s=r.value)===null||s===void 0||s.scrollTo(o[0],o[1])},scrollBy:(...o)=>{var s;(s=r.value)===null||s===void 0||s.scrollBy(o[0],o[1])}}),{scrollbarInstRef:r})},render(){return n(t,Object.assign({ref:"scrollbarInstRef"},this.$props),this.$slots)}}),d=i;export{d as N};

dist/assets/index-0501053e.js

@@ -1 +0,0 @@
-import{d as n,e as o,f as e,h as l,F as u,j as h,k as i}from"./index-65c05462.js";const d="_TheSearch_u8dnx_1",m="_active_u8dnx_16",c={TheSearch:d,active:m,default:"_default_u8dnx_22"},p=""+new URL("icon_search-cda46378.svg",import.meta.url).href,f=""+new URL("icon_searchActive-80477bdc.svg",import.meta.url).href,_=n({name:"TheSearch",props:{round:{type:Boolean,default:!1}},emits:["search"],setup(t,{emit:s}){const a=o({value:""});return()=>e(l,{class:c.TheSearch,round:t.round,placeholder:"请输入搜索关键词",modelValue:a.value,"onUpdate:modelValue":r=>a.value=r},{prefix:()=>e(u,null,[e("img",{class:c.default,src:p},null),e("img",{class:c.active,src:f},null)]),suffix:()=>e(h,{size:"small",round:!0,type:"primary",onClick:()=>s("search",a.value)},{default:()=>[i("搜索")]})})}});export{_ as T};

dist/assets/index-169a3253.js

@@ -1 +0,0 @@
-import{d as u,r as o,e as p,f as a}from"./index-65c05462.js";const m="_wrap_1mptt_1",f="_notice_1mptt_7",r={wrap:m,notice:f},v=u({name:"TheNoticeBar",props:{text:{type:String,default:""}},setup(s){const e=o(),n=o(),t=p({isActive:!1,wrapWidth:0,contentWidth:0,contentStyle:{transitionDuration:"0s",transform:"translateX(0px)"},time:null}),c=()=>{t.isActive||!n.value||!e.value||(t.isActive=!0,t.contentWidth=n.value.getBoundingClientRect().width,t.wrapWidth=e.value.getBoundingClientRect().width,i())},i=()=>{if(t.contentWidth<=t.wrapWidth||!t.isActive){t.contentStyle.transitionDuration="0s",t.contentStyle.transform="translateX(0px)";return}t.contentStyle.transitionDuration="5s",t.contentStyle.transform="translateX(-100%)",t.time=setTimeout(()=>{t.contentStyle.transitionDuration="0s",t.contentStyle.transform=`translateX(${t.wrapWidth}px)`,requestAnimationFrame(()=>{i()})},5*1e3)},l=()=>{clearTimeout(t.time),t.isActive=!1,t.contentStyle.transitionDuration="0s",t.contentStyle.transform="translateX(0px)",t.time=null};return()=>a("div",{ref:e,class:r.wrap,onMouseenter:()=>c(),onMouseleave:()=>l()},[a("div",{ref:n,style:t.contentStyle,class:r.notice},[s.text])])}});export{v as T};

dist/assets/index-1300b69b.js → dist/assets/index-1705439f.js

@@ -1 +1 @@
-import{d as t,f as e,aM as a,j as p,k as n}from"./index-65c05462.js";const i=t({name:"404-page",setup(){return()=>e("div",{style:{height:"220px","margin-top":"150px","padding-top":"30px","font-size":"15px","text-align":"center"}},[e(a,{description:"你访问的页面不见了，你还可以",size:"large"},null),e(p,{type:"primary",text:!0},{default:()=>[n("返回上一页")]})])}});export{i as default};
+import{d as t,f as e,aN as a,j as p,k as n}from"./index-95e721f9.js";const i=t({name:"404-page",setup(){return()=>e("div",{style:{height:"220px","margin-top":"150px","padding-top":"30px","font-size":"15px","text-align":"center"}},[e(a,{description:"你访问的页面不见了，你还可以",size:"large"},null),e(p,{type:"primary",text:!0},{default:()=>[n("返回上一页")]})])}});export{i as default};

dist/assets/index-365803d4.css

@@ -0,0 +1 @@
+._wrap_3lsnj_1{max-width:100%;overflow:hidden;display:flex;align-items:center}._wrap_3lsnj_1._isAnitaion_3lsnj_7 ._notice_3lsnj_7,._wrap_3lsnj_1:hover ._notice_3lsnj_7{width:auto;overflow:initial}._notice_3lsnj_7{transition-duration:5s;width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;transition-timing-function:linear}

dist/assets/index-4906bab0.js → dist/assets/index-4b90fba4.js

@@ -1 +1 @@
-import{X as y,Y as F,S as P,Z as C,J as S}from"./index-65c05462.js";function g(e){return y()?(F(e),!0):!1}function w(e){return typeof e=="function"?e():S(e)}const R=typeof window<"u",m=()=>{};function D(e,i){function n(...t){return new Promise((o,r)=>{Promise.resolve(e(()=>i.apply(this,t),{fn:i,thisArg:this,args:t})).then(o).catch(r)})}return n}function b(e,i={}){let n,t,o=m;const r=u=>{clearTimeout(u),o(),o=m};return u=>{const a=w(e),s=w(i.maxWait);return n&&r(n),a<=0||s!==void 0&&s<=0?(t&&(r(t),t=null),Promise.resolve(u())):new Promise((c,p)=>{o=i.rejectOnCancel?p:c,s&&!t&&(t=setTimeout(()=>{n&&r(n),t=null,c(u())},s)),n=setTimeout(()=>{t&&r(t),t=null,c(u())},a)})}}function j(e,i=!0,n=!0,t=!1){let o=0,r,l=!0,u=m,a;const s=()=>{r&&(clearTimeout(r),r=void 0,u(),u=m)};return p=>{const f=w(e),T=Date.now()-o,d=()=>a=p();return s(),f<=0?(o=Date.now(),d()):(T>f&&(n||!l)?(o=Date.now(),d()):i&&(a=new Promise((h,x)=>{u=t?x:h,r=setTimeout(()=>{o=Date.now(),l=!0,h(d()),s()},Math.max(0,f-T))})),!n&&!r&&(r=setTimeout(()=>l=!0,f)),l=!1,a)}}function U(e,i=200,n={}){return D(b(i,n),e)}function V(e,i=200,n=!1,t=!0,o=!1){return D(j(i,n,t,o),e)}function W(e){P()&&C(e)}export{V as a,g as b,w as c,R as i,W as t,U as u};
+import{X as y,Y as F,S as P,Z as C,J as S}from"./index-95e721f9.js";function g(e){return y()?(F(e),!0):!1}function w(e){return typeof e=="function"?e():S(e)}const R=typeof window<"u",m=()=>{};function D(e,i){function n(...t){return new Promise((o,r)=>{Promise.resolve(e(()=>i.apply(this,t),{fn:i,thisArg:this,args:t})).then(o).catch(r)})}return n}function b(e,i={}){let n,t,o=m;const r=u=>{clearTimeout(u),o(),o=m};return u=>{const a=w(e),s=w(i.maxWait);return n&&r(n),a<=0||s!==void 0&&s<=0?(t&&(r(t),t=null),Promise.resolve(u())):new Promise((c,p)=>{o=i.rejectOnCancel?p:c,s&&!t&&(t=setTimeout(()=>{n&&r(n),t=null,c(u())},s)),n=setTimeout(()=>{t&&r(t),t=null,c(u())},a)})}}function j(e,i=!0,n=!0,t=!1){let o=0,r,l=!0,u=m,a;const s=()=>{r&&(clearTimeout(r),r=void 0,u(),u=m)};return p=>{const f=w(e),T=Date.now()-o,d=()=>a=p();return s(),f<=0?(o=Date.now(),d()):(T>f&&(n||!l)?(o=Date.now(),d()):i&&(a=new Promise((h,x)=>{u=t?x:h,r=setTimeout(()=>{o=Date.now(),l=!0,h(d()),s()},Math.max(0,f-T))})),!n&&!r&&(r=setTimeout(()=>l=!0,f)),l=!1,a)}}function U(e,i=200,n={}){return D(b(i,n),e)}function V(e,i=200,n=!1,t=!0,o=!1){return D(j(i,n,t,o),e)}function W(e){P()&&C(e)}export{V as a,g as b,w as c,R as i,W as t,U as u};

dist/assets/index-50089975.css

@@ -1 +0,0 @@
-._TheSearch_u8dnx_1{border-radius:20Px!important}._TheSearch_u8dnx_1 .n-input-wrapper{padding-right:4Px;height:42Px}._TheSearch_u8dnx_1 .n-input-wrapper .n-input__input-el{height:100%}._TheSearch_u8dnx_1 .n-button{width:72Px;height:34Px;opacity:.8}._TheSearch_u8dnx_1 ._active_u8dnx_16{display:none}._TheSearch_u8dnx_1.n-input--focus ._active_u8dnx_16{display:block}._TheSearch_u8dnx_1.n-input--focus ._default_u8dnx_22{display:none}._TheSearch_u8dnx_1.n-input--focus .n-button{opacity:1}

dist/assets/index-beeda43a.js → dist/assets/index-587d95cf.js

@@ -1 +1 @@
-import{d as l,f as e,h as u,I as o,r,R as I,o as c,F as p}from"./index-65c05462.js";const g="_searchInput_1cmht_1",m="_searchIcon_1cmht_9",S={searchInput:g,searchIcon:m},E=l({name:"student-studentList",props:["searchWord"],emits:["changeValue"],setup(t,{emit:n,attrs:A}){return()=>e("div",null,[e(u,o(A,{clearable:!0,class:S.searchInput,value:t.searchWord,onInput:a=>{n("changeValue",a)}}),{prefix:()=>e("span",{class:"icon-search-input"},null)})])}}),h="_arrow_fei3f_1",C="_CSelectWrap_fei3f_5",J="_CSelectInitWrap_fei3f_21",s={arrow:h,CSelectWrap:C,CSelectInitWrap:J},w="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAaCAYAAACtv5zzAAAAAXNSR0IArs4c6QAAANtJREFUSEvt0zFOAkEYQOFv7eEi9iba0GLlDextKNUbECmpuIItFSWNmnANPIEWtoZkJ5LJDv9AQuVOs8Vm3tt5/2zjzKs5M18vCAv/r0TXmLdNJvgI+1B9i26wwqCFfuMWb5GkZgY5PDGrJJGgBK+WHBJ0wZ9a8stemoMnKQlK8FkLfkQuGeM9n0mXIIInRpUkF9TCqyX7gmPhVZIkGGKL3TOt3UBT8+i657m+cInPJBhhfSK8dJI7LJPgAq+4whSL6JML7x/wjA3u8RP9aCd6/rb1gjBhnyhM9As5gjEbhIMMwQAAAABJRU5ErkJggg==",B="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAaCAYAAACtv5zzAAAAAXNSR0IArs4c6QAAASlJREFUSEvtlDFOxDAQRWecigJOAMegABpKFI3TcgUqShZusFDScIA9AbJltt0mSPQcI83SJjMo0S7KBmM7xTYoaT3zn+f/cRD2/OGe9WECRB3+JxaVZXlQVdUCAE4RcU5EL9HZPQXGmBsAeACADyK6RkTuLLLWFsz8uu1BxJnW+mkMxFo7Y+Z5r+eyKIpVB3DOHTdN8ykiR9sCpdQ9ET2mQIbiiLjOsuwkz/P1T8jW2nNmXgLA4ZhJjDF3ItK/yJdS6oqIylZnZ4vGQmLivwCbPJImSRH3AlIgqeJ/AkKQ9izk+XApgi/ZOXdR1/VbP/iBwE6gvo2L/ip8wW+EouJBi/q38UCSxJMBbaEx5kxEnrsmxFut9XvKI4xalCISqpkAUQcni6IWfQOwkaYb9TFYBgAAAABJRU5ErkJggg==",W=l({props:{inline:{type:Boolean,default:!1}},name:"CSelect",setup(t,{emit:n,attrs:A}){r(null);const a=r(!1);return()=>e(p,null,[e("div",{class:[s.CSelectWrap,t.inline?s.CSelectInitWrap:null]},[e(I,o({"show-checkmark":!1},A,{"onUpdate:show":i=>{a.value=i}}),{arrow:()=>a.value?e(c,{class:s.arrow,src:w},null):e(c,{class:s.arrow,src:B},null)})])])}});export{W as C,E as S};
+import{d as l,f as e,h as u,I as o,r,R as I,o as c,F as p}from"./index-95e721f9.js";const g="_searchInput_1cmht_1",m="_searchIcon_1cmht_9",S={searchInput:g,searchIcon:m},E=l({name:"student-studentList",props:["searchWord"],emits:["changeValue"],setup(t,{emit:n,attrs:A}){return()=>e("div",null,[e(u,o(A,{clearable:!0,class:S.searchInput,value:t.searchWord,onInput:a=>{n("changeValue",a)}}),{prefix:()=>e("span",{class:"icon-search-input"},null)})])}}),h="_arrow_fei3f_1",C="_CSelectWrap_fei3f_5",J="_CSelectInitWrap_fei3f_21",s={arrow:h,CSelectWrap:C,CSelectInitWrap:J},w="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAaCAYAAACtv5zzAAAAAXNSR0IArs4c6QAAANtJREFUSEvt0zFOAkEYQOFv7eEi9iba0GLlDextKNUbECmpuIItFSWNmnANPIEWtoZkJ5LJDv9AQuVOs8Vm3tt5/2zjzKs5M18vCAv/r0TXmLdNJvgI+1B9i26wwqCFfuMWb5GkZgY5PDGrJJGgBK+WHBJ0wZ9a8stemoMnKQlK8FkLfkQuGeM9n0mXIIInRpUkF9TCqyX7gmPhVZIkGGKL3TOt3UBT8+i657m+cInPJBhhfSK8dJI7LJPgAq+4whSL6JML7x/wjA3u8RP9aCd6/rb1gjBhnyhM9As5gjEbhIMMwQAAAABJRU5ErkJggg==",B="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAaCAYAAACtv5zzAAAAAXNSR0IArs4c6QAAASlJREFUSEvtlDFOxDAQRWecigJOAMegABpKFI3TcgUqShZusFDScIA9AbJltt0mSPQcI83SJjMo0S7KBmM7xTYoaT3zn+f/cRD2/OGe9WECRB3+JxaVZXlQVdUCAE4RcU5EL9HZPQXGmBsAeACADyK6RkTuLLLWFsz8uu1BxJnW+mkMxFo7Y+Z5r+eyKIpVB3DOHTdN8ykiR9sCpdQ9ET2mQIbiiLjOsuwkz/P1T8jW2nNmXgLA4ZhJjDF3ItK/yJdS6oqIylZnZ4vGQmLivwCbPJImSRH3AlIgqeJ/AkKQ9izk+XApgi/ZOXdR1/VbP/iBwE6gvo2L/ip8wW+EouJBi/q38UCSxJMBbaEx5kxEnrsmxFut9XvKI4xalCISqpkAUQcni6IWfQOwkaYb9TFYBgAAAABJRU5ErkJggg==",W=l({props:{inline:{type:Boolean,default:!1}},name:"CSelect",setup(t,{emit:n,attrs:A}){r(null);const a=r(!1);return()=>e(p,null,[e("div",{class:[s.CSelectWrap,t.inline?s.CSelectInitWrap:null]},[e(I,o({"show-checkmark":!1},A,{"onUpdate:show":i=>{a.value=i}}),{arrow:()=>a.value?e(c,{class:s.arrow,src:w},null):e(c,{class:s.arrow,src:B},null)})])])}});export{W as C,E as S};

dist/assets/index-73922017.js

@@ -0,0 +1 @@
+import{d as f,r as l,e as A,w as d,f as m}from"./index-95e721f9.js";const p="_wrap_3lsnj_1",y="_isAnitaion_3lsnj_7",v="_notice_3lsnj_7",a={wrap:p,isAnitaion:y,notice:v},o=n=>{requestAnimationFrame(()=>{requestAnimationFrame(()=>{n()})})},h=f({name:"TheNoticeBar",props:{text:{type:String,default:""},isAnimation:{type:Boolean,default:!1}},setup(n){const e=l(),i=l(),t=A({isActive:!1,wrapWidth:0,contentWidth:0,contentStyle:{transitionDuration:"0s",transform:"translateX(0px)"},time:null}),s=()=>{t.isActive||!i.value||!e.value||(t.isActive=!0,t.contentWidth=i.value.getBoundingClientRect().width,t.wrapWidth=e.value.getBoundingClientRect().width,r())},r=()=>{if(t.contentWidth<=t.wrapWidth||!t.isActive){t.contentStyle.transitionDuration="0s",t.contentStyle.transform="translateX(0px)";return}t.contentStyle.transitionDuration="5s",t.contentStyle.transform="translateX(-100%)",t.time=setTimeout(()=>{t.contentStyle.transitionDuration="0s",t.contentStyle.transform=`translateX(${t.wrapWidth}px)`,o(r)},5*1e3)},c=()=>{clearTimeout(t.time),t.isActive=!1,t.contentStyle.transitionDuration="0s",t.contentStyle.transform="translateX(0px)",t.time=null};return d(()=>n.isAnimation,u=>{o(u?s:c)}),()=>m("div",{ref:e,class:[a.wrap,n.isAnimation?a.isAnitaion:""],onMouseenter:()=>!n.isAnimation&&s(),onMouseleave:()=>!n.isAnimation&&c()},[m("div",{ref:i,style:t.contentStyle,class:a.notice},[n.text])])}});export{h as T};

dist/assets/index-9707d1be.css

@@ -1 +0,0 @@
-._wrap_1mptt_1{max-width:100%;overflow:hidden;display:flex;align-items:center}._wrap_1mptt_1:hover ._notice_1mptt_7{width:auto;overflow:initial}._notice_1mptt_7{transition-duration:5s;width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;transition-timing-function:linear}

dist/assets/index-a585796f.js

@@ -0,0 +1 @@
+import{d as o,e as l,f as e,h as n,F as u,j as h,k as i}from"./index-95e721f9.js";const d="_TheSearch_otd4a_1",m="_active_otd4a_16",t={TheSearch:d,active:m,default:"_default_otd4a_22"},p=""+new URL("icon_search-cda46378.svg",import.meta.url).href,f=""+new URL("icon_searchActive-80477bdc.svg",import.meta.url).href,_=o({name:"TheSearch",props:{round:{type:Boolean,default:!1}},emits:["search"],setup(c,{emit:s}){const a=l({value:""});return()=>e(n,{class:t.TheSearch,round:c.round,placeholder:"请输入搜索关键词",modelValue:a.value,"onUpdate:modelValue":r=>a.value=r},{prefix:()=>e(u,null,[e("img",{class:t.default,src:p},null),e("img",{class:t.active,src:f},null)]),suffix:()=>e(h,{size:"small",round:!0,type:"primary",onClick:()=>s("search",a.value)},{default:()=>[i("搜索")]})})}});export{_ as T};

dist/assets/index-c5a39e63.css

@@ -0,0 +1 @@
+._TheSearch_otd4a_1{border-radius:1.04167vw!important}._TheSearch_otd4a_1 .n-input-wrapper{padding-right:.20833vw;height:2.1875vw}._TheSearch_otd4a_1 .n-input-wrapper .n-input__input-el{height:100%}._TheSearch_otd4a_1 .n-button{width:3.75vw;height:1.77083vw;opacity:.8}._TheSearch_otd4a_1 ._active_otd4a_16{display:none}._TheSearch_otd4a_1.n-input--focus ._active_otd4a_16{display:block}._TheSearch_otd4a_1.n-input--focus ._default_otd4a_22{display:none}._TheSearch_otd4a_1.n-input--focus .n-button{opacity:1}

dist/index.html

@@ -24,7 +24,7 @@
   <meta name="msapplication-tap-highlight" content="no" />
   <meta name="referrer" content="no-referrer" />
   <title>老师端</title>
-  <script type="module" crossorigin src="./assets/index-65c05462.js"></script>
+  <script type="module" crossorigin src="./assets/index-95e721f9.js"></script>
   <link rel="stylesheet" href="./assets/index-9f374edd.css">
 </head>
 

src/components/TheNoticeBar/index.module.less

@@ -3,7 +3,7 @@
     overflow: hidden;
     display: flex;
     align-items: center;
-    &:hover{
+    &.isAnitaion, &:hover{
         .notice{
             width: auto;
             overflow: initial;

src/components/TheNoticeBar/index.tsx

@@ -1,12 +1,24 @@
-import { defineComponent, onMounted, reactive, ref } from 'vue';
+import { defineComponent, reactive, ref, watch } from 'vue';
 import styles from './index.module.less';
 
+const refAnimation = (callback: any) => {
+  requestAnimationFrame(() => {
+    requestAnimationFrame(() => {
+      callback();
+    });
+  });
+};
+
 export default defineComponent({
   name: 'TheNoticeBar',
   props: {
     text: {
       type: String,
       default: ''
+    },
+    isAnimation: {
+      type: Boolean,
+      default: false
     }
   },
   setup(props) {
@@ -42,9 +54,7 @@ export default defineComponent({
       notiData.time = setTimeout(() => {
         notiData.contentStyle.transitionDuration = '0s';
         notiData.contentStyle.transform = `translateX(${notiData.wrapWidth}px)`;
-        requestAnimationFrame(() => {
-          startAnimate();
-        });
+        refAnimation(startAnimate);
       }, 5 * 1000);
     };
     const stopAnimate = () => {
@@ -54,12 +64,22 @@ export default defineComponent({
       notiData.contentStyle.transform = 'translateX(0px)';
       notiData.time = null;
     };
+    watch(
+      () => props.isAnimation,
+      val => {
+        if (val) {
+          refAnimation(init);
+        } else {
+          refAnimation(stopAnimate);
+        }
+      }
+    );
     return () => (
       <div
         ref={wrapRef}
-        class={styles.wrap}
-        onMouseenter={() => init()}
-        onMouseleave={() => stopAnimate()}>
+        class={[styles.wrap, props.isAnimation ? styles.isAnitaion : '']}
+        onMouseenter={() =>  !props.isAnimation && init()}
+        onMouseleave={() => !props.isAnimation && stopAnimate()}>
         <div
           ref={contentRef}
           style={notiData.contentStyle}

src/components/TheSearch/index.module.less

@@ -1,10 +1,10 @@
 .TheSearch {
-    border-radius: 20Px !important;
+    border-radius: 20px !important;
 
     :global {
         .n-input-wrapper {
-            padding-right: 4Px;
-            height: 42Px;
+            padding-right: 4px;
+            height: 42px;
 
             .n-input__input-el {
                 height: 100%;
@@ -12,8 +12,8 @@
         }
 
         .n-button {
-            width: 72Px;
-            height: 34Px;
+            width: 72px;
+            height: 34px;
             opacity: .8;
         }
     }

src/components/card-type/index.module.less

@@ -76,11 +76,9 @@
       padding-left: 6px;
       font-size: 16px;
       max-width: 180px;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
       color: #131415;
       font-weight: 600;
+      flex: 1;
     }
   }
 

src/components/card-type/index.tsx

@@ -59,6 +59,7 @@ export default defineComponent({
    */
   emits: ['click', 'collect', 'add'],
   setup(props, { emit }) {
+    const isAnimation = ref(false);
     const formatType = (type: string) => {
       let typeImg = iconImage;
       switch (type) {
@@ -81,7 +82,13 @@ export default defineComponent({
     return () => (
       <div
         onClick={() => emit('click', props.item)}
-        class={[styles['card-section']]}>
+        class={[styles['card-section']]}
+        onMouseenter={() => {
+          isAnimation.value = true;
+        }}
+        onMouseleave={() => {
+          isAnimation.value = false;
+        }}>
         <NCard
           class={[
             styles['card-section'],
@@ -125,7 +132,10 @@ export default defineComponent({
                     objectFit="cover"
                   />
                   <span class={styles.titleContent}>
-                    <TheNoticeBar text={props.item.title} />
+                    <TheNoticeBar
+                      isAnimation={isAnimation.value}
+                      text={props.item.title}
+                    />
                   </span>
                 </div>
                 {/* 收藏 */}

src/components/layout/index.tsx

@@ -91,22 +91,22 @@ export default defineComponent({
                 ) - RectInfo.height;
 
               if (left < 0) {
-                left = 0;
+                left = 2;
               }
               if (top < 0) {
-                top = 0;
+                top = 2;
               }
               if (right < 0) {
-                right = 0;
+                right = 2;
               }
               if (bottom < 0) {
-                bottom = 0;
+                bottom = 2;
               }
-              if (left > mainWidth) {
-                left = mainWidth;
+              if (left > mainWidth - 2) {
+                left = mainWidth - 2;
               }
-              if (top > mainHeight) {
-                top = mainHeight;
+              if (top > mainHeight - 2) {
+                top = mainHeight - 2;
               }
 
               target!.style.left = `${left}px`;

src/views/attend-class/index.module.less

@@ -266,7 +266,7 @@
 
   :global {
     .n-drawer-body-content-wrapper {
-      padding: 0px !important;
+      padding: 8px 0px 0px !important;
       text-align: center;
 
       &>div {

src/views/attend-class/index.tsx

@@ -26,7 +26,8 @@ import {
   NDrawerContent,
   NModal,
   NSpace,
-  NButton
+  NButton,
+  NTooltip
 } from 'naive-ui';
 import CardType from '@/components/card-type';
 import Pen from './component/tools/pen';
@@ -718,28 +719,42 @@ export default defineComponent({
             styles.switchDisplaySection,
             activeData.model ? '' : styles.sectionAnimate
           ]}>
-          <div
-            class={styles.displayBtn}
-            onClick={() =>
-              openStudyTool({
-                type: 'pen',
-                icon: iconNote,
-                name: '批注'
-              })
-            }>
-            <img src={iconNote} />
-          </div>
-          <div
-            class={styles.displayBtn}
-            onClick={() =>
-              openStudyTool({
-                type: 'whiteboard',
-                icon: iconWhiteboard,
-                name: '白板'
-              })
-            }>
-            <img src={iconWhiteboard} />
-          </div>
+          <NTooltip trigger="hover">
+            {{
+              trigger: () => (
+                <div
+                  class={styles.displayBtn}
+                  onClick={() =>
+                    openStudyTool({
+                      type: 'pen',
+                      icon: iconNote,
+                      name: '批注'
+                    })
+                  }>
+                  <img src={iconNote} />
+                </div>
+              ),
+              default: () => '批注'
+            }}
+          </NTooltip>
+          <NTooltip trigger="hover">
+            {{
+              trigger: () => (
+                <div
+                  class={styles.displayBtn}
+                  onClick={() =>
+                    openStudyTool({
+                      type: 'whiteboard',
+                      icon: iconWhiteboard,
+                      name: '白板'
+                    })
+                  }>
+                  <img src={iconWhiteboard} />
+                </div>
+              ),
+              default: () => '白板'
+            }}
+          </NTooltip>
         </div>
 
         {/* 显示列表 */}

src/views/home/index.module.less

@@ -518,13 +518,13 @@
     position: relative;
 
     .teachGroupListDot {
-      width: 14px;
-      height: 14px;
+      width: 15px;
+      height: 15px;
       background: #198cfe;
-      border: 3px solid #d1e8ff;
+      border: 4px solid #d1e8ff;
       border-radius: 50%;
       top: 28px;
-      left: -7px;
+      left: -8px;
       position: absolute;
     }
   }

src/views/natural-resources/index.tsx

@@ -13,7 +13,7 @@ export default defineComponent({
       loading: false,
       pagination: {
         page: 1,
-        rows: 10,
+        rows: 50,
         pageTotal: 0
       },
       tableList: [] as any
@@ -22,10 +22,8 @@ export default defineComponent({
       list: [],
       height: '100%' as any
     });
-
     const formatData = () => {
       const rows = listData.rows || [];
-      console.log(rows);
       const tempList: any = [];
       rows.forEach((row: any, i: number) => {
         tempList.push({
@@ -36,10 +34,43 @@ export default defineComponent({
           isCollect: i % 3 ? false : true,
           isSelected: i % 4 ? false : true
         });
+
+        if (i === 2 || i === 12) {
+          tempList.push({
+            id: i + 3,
+            type: 'VIDEO',
+            title: '其多列',
+            url: 'https://gyt.ks3-cn-beijing.ksyuncs.com/courseware/1687844640957.png',
+            isCollect: i % 3 ? false : true,
+            isSelected: i % 4 ? false : true
+          });
+        }
+
+        if (i === 0 || i === 6) {
+          tempList.push({
+            id: i + 3,
+            type: 'AUDIO',
+            title: '歌曲表演 大鹿',
+            url: 'https://gyt.ks3-cn-beijing.ksyuncs.com/courseware/1687916228530.png',
+            isCollect: i % 3 ? false : true,
+            isSelected: i % 4 ? false : true
+          });
+        }
+
+        if (i === 5 || i === 15) {
+          tempList.push({
+            id: i + 3,
+            type: 'IMG',
+            title: '其多列',
+            url: 'https://gyt.ks3-cn-beijing.ksyuncs.com/courseware/1688007481564.jpg',
+            isCollect: i % 3 ? false : true,
+            isSelected: i % 4 ? false : true
+          });
+        }
       });
 
       forms.list = tempList || [];
-      state.pagination.pageTotal = tempList.length;
+      // state.pagination.pageTotal = tempList.length;
       state.pagination.rows = tempList.length;
     };
     const getList = () => {

src/views/setting/index.tsx

@@ -18,7 +18,7 @@ export default defineComponent({
           <NTabPane name="person" tab="个人信息">
             <PersonInfo></PersonInfo>
           </NTabPane>
-          <NTabPane name="school" tab="学校设置"></NTabPane>
+          <NTabPane disabled name="school" tab="学校设置"></NTabPane>
         </NTabs>
       </div>
     );

src/views/xiaoku-ai/index.module.less

@@ -6,7 +6,7 @@
 }
 
 .tools {
-    padding: 32Px 32Px 20Px 32Px;
+    padding: 32px 32px 20px 32px;
     display: flex;
     align-items: flex-start;
     flex-shrink: 0;
@@ -14,20 +14,30 @@
     :global {
         .n-input {
             margin-left: auto;
-            width: 361Px;
+            width: 360px;
         }
-        .n-button.n-button--disabled{
+
+        .n-button.n-button--disabled {
             cursor: initial;
             padding: 0;
         }
     }
 
-    .tagWrap{
+    .tagWrap {
         flex: 1;
         margin-right: 20Px;
     }
-    .tags{
+
+    .tags {
         padding: 12px 0;
+
+        :global {
+            .n-button {
+                height: 37px;
+                padding: 0 24px;
+                font-size: 18px;
+            }
+        }
     }
 }
 
@@ -81,7 +91,7 @@
             height: calc(100% - 8Px);
             background-color: #C5C5C5;
             z-index: 1;
-            
+
 
         }