Merge branch 'master' of http://git.dayaedu.com/lex/classroom-instruments

dist/assets/Scrollbar-ca77aa0a.js → dist/assets/Scrollbar-0d2c8b5e.js

@@ -1 +1 @@
-import{a9 as l,d as e,r as a,ac as n,aq as t}from"./index-fa8ee8aa.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,aq as t}from"./index-9cbc925f.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/Slider-f4a4f56f.js → dist/assets/Slider-420f3a33.js

@@ -1,4 +1,4 @@
-import{ar as We,r as x,as as Ge,at as M,a6 as n,au as m,a7 as j,av as ue,aw as Je,ax as qe,d as Qe,a8 as Ze,a9 as ge,ay as eo,E as w,az as oo,aA as ao,w as he,aB as to,ab as ve,aC as no,aD as Z,ac as v,aE as ro,aF as lo,aG as io,aH as so,T as co,aI as U,aJ as O,M as Q,aK as fe}from"./index-fa8ee8aa.js";const uo={railHeight:"4px",railWidthVertical:"4px",handleSize:"18px",dotHeight:"8px",dotWidth:"8px",dotBorderRadius:"4px"},ho=t=>{const l="rgba(0, 0, 0, .85)",y="0 2px 8px 0 rgba(0, 0, 0, 0.12)",{railColor:f,primaryColor:s,baseColor:d,cardColor:z,modalColor:R,popoverColor:_,borderRadius:L,fontSize:B,opacityDisabled:D}=t;return Object.assign(Object.assign({},uo),{fontSize:B,markFontSize:B,railColor:f,railColorHover:f,fillColor:s,fillColorHover:s,opacityDisabled:D,handleColor:"#FFF",dotColor:z,dotColorModal:R,dotColorPopover:_,handleBoxShadow:"0 1px 4px 0 rgba(0, 0, 0, 0.3), inset 0 0 1px 0 rgba(0, 0, 0, 0.05)",handleBoxShadowHover:"0 1px 4px 0 rgba(0, 0, 0, 0.3), inset 0 0 1px 0 rgba(0, 0, 0, 0.05)",handleBoxShadowActive:"0 1px 4px 0 rgba(0, 0, 0, 0.3), inset 0 0 1px 0 rgba(0, 0, 0, 0.05)",handleBoxShadowFocus:"0 1px 4px 0 rgba(0, 0, 0, 0.3), inset 0 0 1px 0 rgba(0, 0, 0, 0.05)",indicatorColor:l,indicatorBoxShadow:y,indicatorTextColor:d,indicatorBorderRadius:L,dotBorder:`2px solid ${f}`,dotBorderActive:`2px solid ${s}`,dotBoxShadow:""})},vo={name:"Slider",common:We,self:ho},fo=vo;function me(t){return window.TouchEvent&&t instanceof window.TouchEvent}function be(){const t=x(new Map),l=y=>f=>{t.value.set(y,f)};return Ge(()=>{t.value.clear()}),[t,l]}const mo=M([n("slider",`
+import{ar as We,r as x,as as Ge,at as M,a6 as n,au as m,a7 as j,av as ue,aw as Je,ax as qe,d as Qe,a8 as Ze,a9 as ge,ay as eo,E as w,az as oo,aA as ao,w as he,aB as to,ab as ve,aC as no,aD as Z,ac as v,aE as ro,aF as lo,aG as io,aH as so,T as co,aI as U,aJ as O,M as Q,aK as fe}from"./index-9cbc925f.js";const uo={railHeight:"4px",railWidthVertical:"4px",handleSize:"18px",dotHeight:"8px",dotWidth:"8px",dotBorderRadius:"4px"},ho=t=>{const l="rgba(0, 0, 0, .85)",y="0 2px 8px 0 rgba(0, 0, 0, 0.12)",{railColor:f,primaryColor:s,baseColor:d,cardColor:z,modalColor:R,popoverColor:_,borderRadius:L,fontSize:B,opacityDisabled:D}=t;return Object.assign(Object.assign({},uo),{fontSize:B,markFontSize:B,railColor:f,railColorHover:f,fillColor:s,fillColorHover:s,opacityDisabled:D,handleColor:"#FFF",dotColor:z,dotColorModal:R,dotColorPopover:_,handleBoxShadow:"0 1px 4px 0 rgba(0, 0, 0, 0.3), inset 0 0 1px 0 rgba(0, 0, 0, 0.05)",handleBoxShadowHover:"0 1px 4px 0 rgba(0, 0, 0, 0.3), inset 0 0 1px 0 rgba(0, 0, 0, 0.05)",handleBoxShadowActive:"0 1px 4px 0 rgba(0, 0, 0, 0.3), inset 0 0 1px 0 rgba(0, 0, 0, 0.05)",handleBoxShadowFocus:"0 1px 4px 0 rgba(0, 0, 0, 0.3), inset 0 0 1px 0 rgba(0, 0, 0, 0.05)",indicatorColor:l,indicatorBoxShadow:y,indicatorTextColor:d,indicatorBorderRadius:L,dotBorder:`2px solid ${f}`,dotBorderActive:`2px solid ${s}`,dotBoxShadow:""})},vo={name:"Slider",common:We,self:ho},fo=vo;function me(t){return window.TouchEvent&&t instanceof window.TouchEvent}function be(){const t=x(new Map),l=y=>f=>{t.value.set(y,f)};return Ge(()=>{t.value.clear()}),[t,l]}const mo=M([n("slider",`
  display: block;
  padding: calc((var(--n-handle-size) - var(--n-rail-height)) / 2) 0;
  position: relative;

dist/assets/index-5d1c9457.js → dist/assets/index-38a08f35.js

@@ -1 +1 @@
-import{d as u,r as o,e as p,f as a}from"./index-fa8ee8aa.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};
+import{d as u,r as o,e as p,f as a}from"./index-9cbc925f.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-8342e952.js → dist/assets/index-5eda53bd.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-fa8ee8aa.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-9cbc925f.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-d2039998.js → dist/assets/index-b0a81aac.js

@@ -1 +1 @@
-import{X as y,Y as F,S as P,Z as C,J as S}from"./index-fa8ee8aa.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-9cbc925f.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-d1c44b81.js → dist/assets/index-b7710e3e.js

@@ -1 +1 @@
-import{d as t,f as e,aM as a,j as p,k as n}from"./index-fa8ee8aa.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,aM as a,j as p,k as n}from"./index-9cbc925f.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-b94d7e31.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-fa8ee8aa.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-c512a091.js

@@ -0,0 +1 @@
+import{d as n,e as o,f as e,h as l,F as u,j as h,k as i}from"./index-9cbc925f.js";const d="_TheSearch_u8dnx_1",f="_active_u8dnx_16",t={TheSearch:d,active:f,default:"_default_u8dnx_22"},m=""+new URL("icon_search-8a6ade17.svg",import.meta.url).href,p=""+new URL("icon_searchActive-bf7fd0c6.svg",import.meta.url).href,_=n({name:"TheSearch",props:{round:{type:Boolean,default:!1}},emits:["search"],setup(c,{emit:s}){const a=o({value:""});return()=>e(l,{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:m},null),e("img",{class:t.active,src:p},null)]),suffix:()=>e(h,{size:"small",round:!0,type:"primary",onClick:()=>s("search",a.value)},{default:()=>[i("搜索")]})})}});export{_ as T};

dist/index.html

@@ -24,8 +24,8 @@
   <meta name="msapplication-tap-highlight" content="no" />
   <meta name="referrer" content="no-referrer" />
   <title>老师端</title>
-  <script type="module" crossorigin src="./assets/index-fa8ee8aa.js"></script>
-  <link rel="stylesheet" href="./assets/index-9f374edd.css">
+  <script type="module" crossorigin src="./assets/index-9cbc925f.js"></script>
+  <link rel="stylesheet" href="./assets/index-bdf2c1bf.css">
 </head>
 
 <body>

src/views/natural-resources/index.module.less

@@ -116,17 +116,24 @@
     height: 42px;
     font-size: 16px;
 
+    img {
+      width: 18px;
+      height: 18px;
+    }
+
     :global {
       .n-input-wrapper {
         padding-left: 12px;
         padding-right: 4px;
+        height: 42px !important;
       }
-    }
 
-    .searchBtn {
-      height: 34px;
-      font-size: 15px;
-      font-weight: 500;
+      .n-button {
+        height: 34px;
+        font-size: 15px;
+        font-weight: 500;
+        width: auto;
+      }
     }
   }
 

src/views/natural-resources/search-group-resources.tsx

@@ -2,6 +2,7 @@ import { defineComponent, reactive } from 'vue';
 import styles from './index.module.less';
 import { NButton, NForm, NFormItem, NInput, NSpace } from 'naive-ui';
 import iconAdd from './images/icon-add.svg';
+import TheSearch from '/src/components/TheSearch';
 
 export default defineComponent({
   name: 'search-group',
@@ -82,7 +83,7 @@ export default defineComponent({
             </NSpace>
           </NFormItem>
 
-          <NInput
+          {/* <NInput
             type="text"
             placeholder="请输入搜索关键词"
             clearable
@@ -92,12 +93,17 @@ export default defineComponent({
             {{
               prefix: () => <span class={'icon-search-input'}></span>,
               suffix: () => (
-                <NButton round type="primary" class={styles.searchBtn}>
+                <NButton
+                  round
+                  size="small"
+                  type="primary"
+                  class={styles.searchBtn}>
                   搜索
                 </NButton>
               )
             }}
-          </NInput>
+          </NInput> */}
+          <TheSearch class={styles.inputSearch} />
         </NForm>
       </div>
     );

src/views/prepare-lessons/model/resource-search-group/index.tsx

@@ -42,15 +42,7 @@ export default defineComponent({
             v-model:value={forms.search}
             class={styles.inputSearch}>
             {{
-              prefix: () => <span class={'icon-search-input'}></span>,
-              suffix: () => (
-                <NButton
-                  type="primary"
-                  class={styles.searchBtn}
-                  disabled={forms.search ? false : true}>
-                  搜索
-                </NButton>
-              )
+              prefix: () => <span class={'icon-search-input'}></span>
             }}
           </NInput>
         </div>

src/views/prepare-lessons/model/select-music/index.module.less

@@ -96,28 +96,30 @@
 
   .inputSearch {
     position: absolute;
-    top: 0;
+    top: 4px;
     right: 40px;
     width: 360px;
     height: 42px;
     font-size: 16px;
 
+    img {
+      width: 18px;
+      height: 18px;
+    }
+
     :global {
       .n-input-wrapper {
         padding-left: 12px;
         padding-right: 4px;
+        height: 42px !important;
       }
-    }
 
-    .searchBtn {
-      height: 34px;
-      font-size: 15px;
-      font-weight: 500;
-    }
-
-    .iconSearch {
-      width: 16px;
-      height: 17px;
+      .n-button {
+        height: 34px;
+        font-size: 15px;
+        font-weight: 500;
+        width: auto;
+      }
     }
   }
 }

src/views/prepare-lessons/model/select-music/search-group.tsx

@@ -1,6 +1,7 @@
 import { defineComponent, reactive, ref } from 'vue';
 import styles from './index.module.less';
 import { NButton, NForm, NFormItem, NInput, NSpace } from 'naive-ui';
+import TheSearch from '/src/components/TheSearch';
 
 export default defineComponent({
   name: 'search-group',
@@ -54,7 +55,7 @@ export default defineComponent({
             </NSpace>
           </NFormItem>
         </NForm>
-        <NInput
+        {/* <NInput
           type="text"
           placeholder="请输入搜索关键词"
           clearable
@@ -69,7 +70,8 @@ export default defineComponent({
               </NButton>
             )
           }}
-        </NInput>
+        </NInput> */}
+        <TheSearch class={styles.inputSearch} />
       </div>
     );
   }