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

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

@@ -71,7 +71,7 @@
             <div class="row">
               <div class="label">教材所属学科专业类</div>
               <div class="value">
-                {{ textBook?.discipline?.code }}-{{
+                {{ textBook?.discipline?.code }} {{
                   textBook?.discipline?.name
                 }}
               </div>
@@ -79,7 +79,7 @@
             <div class="row">
               <div class="label">教材应用对象及所属学科专业类</div>
               <div class="value">
-                {{ textBook?.majorPoniter?.code }}-{{
+                {{ textBook?.majorPoniter?.code }} {{
                   textBook?.majorPoniter?.name
                 }}
               </div>
@@ -214,7 +214,7 @@
             <div class="row">
               <div class="label">适用专业代码（六位）及名称</div>
               <div class="value">
-                {{ textBook?.major?.code }}-{{ textBook?.major?.name }}
+                {{ textBook?.major?.code }} {{ textBook?.major?.name }}
               </div>
             </div>
             <div class="row">

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

@@ -47,7 +47,7 @@
             <nz-option
               nzCustomContent
               [nzValue]="major.code"
-              [nzLabel]="major.name + '-' + major.code"
+              [nzLabel]="major?.code + ' ' + major?.name"
             >
               <div>{{ major.name }}</div>
               <div style="font-size: 12px; color: gray">{{ major.code }}</div>
@@ -88,7 +88,7 @@
             <nz-option
               nzCustomContent
               [nzValue]="major.code"
-              [nzLabel]="major.name + '-' + major.code"
+              [nzLabel]="major?.code + ' ' + major?.name"
             >
               <div>{{ major.name }}</div>
               <div style="font-size: 12px; color: gray">{{ major.code }}</div>

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

@@ -33,7 +33,7 @@
                 <nz-option
                   nzCustomContent
                   [nzValue]="major?.code"
-                  [nzLabel]="major?.name + '-' + major?.code"
+                  [nzLabel]="major?.code + ' ' + major?.name"
                 >
                   <div>{{ major?.name }}</div>
                   <div style="font-size: 12px; color: gray">