Merge branch 'master' of http://git.fmode.cn:3000/bin/edu-textbook

projects/textbook/src/modules/nav-author/components/attachment/attachment.component.html

@@ -171,7 +171,7 @@
     </nz-form-item>
   </div>
   <div class="author-content">
-    <div class="title">5.教材版权信息（必须上传）</div>
+    <div class="title">5.版权信息及CIP数据（必须上传）</div>
     <nz-form-item class="row" style="margin-bottom: 16px">
       <nz-form-label class="label" [nzNoColon]="true" [nzSm]="10" [nzXs]="10" nzRequired>版权页截图</nz-form-label>
       <nz-form-control class="val" nzErrorTip="请上传版权页截图" style="width: 100%">
@@ -211,7 +211,7 @@
 
 
 
-    <div class="author-content">
+    <div >
       <div class="text">如 CIP 数据中无“教材”字样的，须再上传内容提要或前言或后记中可以证明本书为教材的相关内容截图</div>
       @if (cipProveFile.length>0) {
       @for (url of cipProveFile; track $index) {

projects/textbook/src/modules/nav-author/components/attachment/attachment.component.scss

@@ -14,6 +14,8 @@
     }
   }
   .author-content{
+    border-bottom: #c8c7c7 solid 1px;
+    margin-bottom: 26px;
     .edit-icon{
       color:#756B6D;
     }

projects/textbook/src/modules/nav-author/components/basic-in/basic-in.component.html

@@ -81,7 +81,7 @@
         <nz-input-group>
           <nz-select [nzOptionOverflowSize]="nzOptionOverflowSize" nzShowSearch nzAllowClear nzPlaceHolder="输入所属本科专业类代码（四位）搜索所属学科" formControlName="majorPoniter">
             @for(major of selectList; track major.code;let index = $index){
-            <nz-option nzCustomContent [nzValue]="major.name" [nzLabel]="major.name+'/'+major.code">
+            <nz-option nzCustomContent [nzValue]="major.name" [nzLabel]="major.name+'-'+major.code">
               <div>{{ major.name }}</div>
               <div style="font-size: 12px;color: gray;">{{ major.code }}</div>
             </nz-option>