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

projects/textbook/src/modules/common/textbook-details/textbook-details.component.html

@@ -141,7 +141,7 @@
         </div>
       </div>
       <div class="templ">
-        <div class="title">教材适用情况</div>
+        <div class="title">作者信息</div>
         <div class="text mar10">
           作者（含主编，不超过 6 人，教材中明确出现姓名）
         </div>
@@ -500,7 +500,7 @@
           </div>
         </div>
       </div>
-      <div class="templ">
+      <!-- <div class="templ">
         <div class="title">初评推荐意见</div>
         <div class="base-content">
           <div class="row">
@@ -516,7 +516,7 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
 
     <div nz-col nzSpan="6">
@@ -544,7 +544,7 @@
         <nz-link nzHref="#base" nzTitle="附件材料清单"></nz-link>
         <nz-link nzHref="#base" nzTitle="教材作者诚信承诺"></nz-link>
         <nz-link nzHref="#base" nzTitle="申报单位承诺意见"></nz-link>
-        <nz-link nzHref="#base" nzTitle="初评推荐意见"></nz-link>
+        <!-- <nz-link nzHref="#base" nzTitle="初评推荐意见"></nz-link> -->
       </nz-anchor>
     </div>
   </div>

projects/textbook/src/modules/nav-author/apply/apply.component.html

@@ -1,3 +1,4 @@
+<div id="top"></div>
 <div class="site-page-header">
   <nz-page-header nzTitle="创建/编辑空间" nzSubtitle="" style="padding: 0">
     <nz-breadcrumb nz-page-header-breadcrumb>

projects/textbook/src/modules/nav-author/apply/apply.component.ts

@@ -65,6 +65,10 @@ export class ApplyComponent implements OnInit {
     } else if(event?.type == 'next'){
       this.state++;
     }
+    let topEle = document.getElementById('top')
+    if(topEle){
+      topEle.scrollIntoView({ behavior: 'smooth' });
+    }
   }
   save() {}
 

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

@@ -59,19 +59,19 @@
       </nz-form-item>
     </div>
     <div class="author-content">
-      <div class="title">专家审核意见表</div>
+      <div class="title">专家审查意见表</div>
       <div class="text">
         由第一主编所在单位和出版机构邀请校内外相关学科专业领域专家，对教材进行思想性、学术性审核。专家不少于
         3
-        名，其中半数以上为校外专家，专家分别实名评价并签字，并注明所在单位及专业身份。评价人不得是本教材的作者。<a (click)="downloadFile('专家审核意见表.docx')">下载模板</a>
+        名，其中半数以上为校外专家，专家分别实名评价并签字，并注明所在单位及专业身份。评价人不得是本教材的作者。<a (click)="downloadFile('专家审查意见表.docx')">下载模板</a>
       </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%">
+        <nz-form-label class="label" [nzNoColon]="true" [nzSm]="10" [nzXs]="10" nzRequired>上传专家审查意见表</nz-form-label>
+        <nz-form-control class="val" nzErrorTip="请上传专家审查意见表" style="width: 100%">
           @if (expertOpinion?.url) {
             <a style="color: #3e49b3;" (click)="openFile(expertOpinion?.url)">
               <span nz-icon nzType="file" nzTheme="outline"></span>
-              专家审核意见表
+              专家审查意见表
             </a>
           }
           <app-comp-upload [width]="320" (change)="upload($event, 'expertOpinion')" title="上传截图"></app-comp-upload>
@@ -84,7 +84,7 @@
     <div class="author-content">
       <div class="title">教材使用情况证明材料</div>
       <div class="text">
-        教材出版单位提供教材主要使用高校名单及使用情况证明材料，并加盖公章。<a (click)="downloadFile('专家审核意见表.docx')">下载模板</a>
+        教材出版单位提供教材主要使用高校名单及使用情况证明材料，并加盖公章。<a (click)="downloadFile('专家审查意见表.docx')">下载模板</a>
       </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>

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

@@ -74,7 +74,7 @@ export class AttachmentComponent implements OnInit {
     name: '',
     url: '',
   }
-  /** 专家审核意见表*/
+  /** 专家审查意见表*/
   expertOpinion: any = {
     name: '',
     url: '',
@@ -129,7 +129,7 @@ export class AttachmentComponent implements OnInit {
       isNull = true
     }
     if (this.expertOpinion.url == '' || !this.expertOpinion.url) {
-      msgList.push('专家审核意见表')
+      msgList.push('专家审查意见表')
       isNull = true
     }
     if (this.evidence.url == '' || !this.evidence.url) {

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

@@ -109,10 +109,16 @@
       <nz-form-control nzErrorTip="请输入完成项" [nzSm]="12" [nzXs]="12">
         <nz-input-group>
           <nz-select nzShowSearch nzAllowClear nzPlaceHolder="请输入是否重点立项教材" formControlName="approval">
-            <nz-option nzCustomContent [nzValue]="'基础学科“101计划”核心教材'" [nzLabel]="'基础学科“101计划”核心教材'">基础学科“101计划”核心教材</nz-option>
+            <nz-option nzCustomContent [nzValue]="'经有关部门审定的教材'" [nzLabel]="'经有关部门审定的教材'">经有关部门审定的教材</nz-option>
+            <nz-option nzCustomContent [nzValue]="'首届全国教材建设奖优秀教材（高等教育类）教材'" [nzLabel]="'首届全国教材建设奖优秀教材（高等教育类）教材'">首届全国教材建设奖优秀教材（高等教育类）教材</nz-option>
+            <nz-option nzCustomContent [nzValue]="'“101计划”核心教材'" [nzLabel]="'“101计划”核心教材'">“101计划”核心教材</nz-option>
+            <nz-option nzCustomContent [nzValue]="'“四新”重点建设教材（含战略性新兴领域教材）'" [nzLabel]="'“四新”重点建设教材（含战略性新兴领域教材）'">“四新”重点建设教材（含战略性新兴领域教材）</nz-option>
+            <nz-option nzCustomContent [nzValue]="'否'" [nzLabel]="'否'">否</nz-option>
+            
+            <!-- <nz-option nzCustomContent [nzValue]="'基础学科“101计划”核心教材'" [nzLabel]="'基础学科“101计划”核心教材'">基础学科“101计划”核心教材</nz-option>
             <nz-option nzCustomContent [nzValue]="'战略性新兴领域教材'" [nzLabel]="'战略性新兴领域教材'">战略性新兴领域教材</nz-option>
             <nz-option nzCustomContent [nzValue]="'“四新”重点建设教材'" [nzLabel]="'“四新”重点建设教材'">“四新”重点建设教材</nz-option>
-            <nz-option nzCustomContent [nzValue]="'否'" [nzLabel]="'否'">否</nz-option>
+            <nz-option nzCustomContent [nzValue]="'否'" [nzLabel]="'否'">否</nz-option> -->
           </nz-select>
         </nz-input-group>
       </nz-form-control>

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

@@ -152,6 +152,10 @@ export class BasicInComponent implements OnInit {
     },
   ];
   importantProjectList: Array<any> = [
+    {
+      title: '首届全国教材建设奖全国优秀教材（高等教育类）',
+      value: '首届全国教材建设奖全国优秀教材（高等教育类）',
+    },
     {
       title: '“十二五”普通高等教育本科国家级规划教材',
       value: '“十二五”普通高等教育本科国家级规划教材',
@@ -164,10 +168,7 @@ export class BasicInComponent implements OnInit {
       title: '“十二五”以来省级规划教材',
       value: '“十二五”以来省级规划教材',
     },
-    {
-      title: '首届全国教材建设奖全国优秀教材（高等教育类）',
-      value: '首届全国教材建设奖全国优秀教材（高等教育类）',
-    },
+ 
     
     {
       title: '其他省部级及以上项目',

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

@@ -11,7 +11,7 @@
               <nz-select style="width: 80%" nzShowSearch nzAllowClear nzPlaceHolder="填写 6 位专业代码选择"
                 formControlName="major" (ngModelChange)="changeCode()" (nzOnSearch)="getCode($event)">
                 @for(major of selectList; track major.code;let index = $index){
-                <nz-option nzCustomContent [nzValue]="major.code" [nzLabel]="major.code">
+                <nz-option nzCustomContent [nzValue]="major.code" [nzLabel]="major.name+'-'+major.code">
                   <div>{{ major.name }}</div>
                   <div style="font-size: 12px;color: gray;">{{ major.code }}</div>
                 </nz-option>
@@ -59,6 +59,7 @@
                   @for (checkItem of checkOptionsThree; track $index) {
                     <label [ngModelOptions]="{standalone: true}"  nz-checkbox [nzValue]="checkItem.value" [(ngModel)]="checkItem.checked">{{checkItem.value}}</label>
                   }
+                  （如不涉及，此行可不选）
                 </div>
               </nz-checkbox-wrapper>
             </nz-form-control>

projects/textbook/src/modules/nav-author/components/textbook-pertain/textbook-pertain.component.ts

@@ -113,7 +113,7 @@ export class TextbookPertainComponent implements OnInit {
     { label: '专业课', value: '专业课' ,checked:false},
   ];
   checkOptionsThree = [
-    { label: '思想作者理论课', value: '思想作者理论课',checked:false},
+    { label: '思想政治理论课', value: '思想政治理论课',checked:false},
     { label: '实验课', value: '实验课',checked:false },
   ];
   checkTwo: any = null
@@ -172,7 +172,7 @@ export class TextbookPertainComponent implements OnInit {
         for(let i in list){
           if(list[i].label=='必修课'||list[i].label=='选修课'){
             one.push(list[i])
-          }else if(list[i].label=='思想作者理论课'||list[i].label=='实验课'){
+          }else if(list[i].label=='思想政治理论课'||list[i].label=='实验课'){
             three.push(list[i])
           }else if(list[i].checked){
             this.checkTwo=list[i].label
@@ -410,7 +410,7 @@ export class TextbookPertainComponent implements OnInit {
   }
   downloadFile(){
     let fileName = '十四五”普通高等教育本科国家级规划教材第一次遴选推荐申报表.docx'
-    const fileUrl = `../../../../../public/file/${fileName}`;
+    let fileUrl = `../../../../../public/file/${fileName}`;
     this.http.get(fileUrl, { responseType: 'blob' }).subscribe((blob) => {
       const url = window.URL.createObjectURL(blob);
       const a = document.createElement('a');
@@ -421,5 +421,17 @@ export class TextbookPertainComponent implements OnInit {
       document.body.removeChild(a);
       window.URL.revokeObjectURL(url);
     })
+    let fileName02 = '教材编写人员政治审查表.docx'
+    let fileUrl02 = `../../../../../public/file/${fileName02}`;
+    this.http.get(fileUrl02, { responseType: 'blob' }).subscribe((blob) => {
+      const url = window.URL.createObjectURL(blob);
+      const a = document.createElement('a');
+      a.href = url;
+      a.download = fileName02;
+      document.body.appendChild(a);
+      a.click();
+      document.body.removeChild(a);
+      window.URL.revokeObjectURL(url);
+    })
   }
   }

projects/textbook/src/modules/nav-author/textbook-details/textbook-details.component.html

@@ -451,7 +451,7 @@
           </div>
         </div>
       </div>
-      <div class="templ">
+      <!-- <div class="templ">
         <div class="title">初评推荐意见</div>
         <div class="base-content">
           <div class="row">
@@ -467,7 +467,7 @@
             </div>
           </div>
         </div>
-      </div>
+      </div> -->
     </div>
 
     <div nz-col nzSpan="6">
@@ -495,7 +495,7 @@
         <nz-link nzHref="#base" nzTitle="附件材料清单"></nz-link>
         <nz-link nzHref="#base" nzTitle="教材作者诚信承诺"></nz-link>
         <nz-link nzHref="#base" nzTitle="申报单位承诺意见"></nz-link>
-        <nz-link nzHref="#base" nzTitle="初评推荐意见"></nz-link>
+        <!-- <nz-link nzHref="#base" nzTitle="初评推荐意见"></nz-link> -->
       </nz-anchor>
     </div>
   </div>