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

projects/textbook/src/app/comp-manage/comp-manage.component.html

@@ -36,12 +36,13 @@
         <span>{{ item.name }}</span>
       </li>
       } }
-
-      <li (click)="downloadFile('“十四五”普通高等教育本科国家级规划教材申报书.docx')" style="position: absolute;bottom: 150px; height: 100px; text-wrap: wrap;" nz-menu-item>
-        <span nz-icon nzType="file" nzTheme="outline"></span>
-        “十四五”普通高等教育本科
-        国家级规划教材申报书
-      </li>
+      @if (tbookSer.profile.identity == '高校联系人') {
+        <div class="down" (click)="downloadFile('“十四五”普通高等教育本科国家级规划教材申报书.docx')">
+          <span nz-icon nzType="file" nzTheme="outline"></span>
+          “十四五”普通高等教育本科
+          国家级规划教材申报书
+        </div>
+      }
     </ul>
     <app-comp-nav
       [viewCollapsed]="isCollapsed"

projects/textbook/src/app/comp-manage/comp-manage.component.scss

@@ -35,6 +35,16 @@
     position: relative;
   }
 }
+.down{
+  position: absolute;
+  bottom: 200px;
+  /* height: 100px; */
+  line-height: 24px;
+  text-wrap: wrap;
+  /* padding-left: 24px; */
+  /* padding: 0; */
+  color: blue;
+}
 
 ::ng-deep .ant-menu-sub.ant-menu-inline{
   background: #f9eaea;

projects/textbook/src/app/textbook/textbook.component.html

@@ -146,11 +146,7 @@
           }
         </td>
         <td nzEllipsis>
-<<<<<<< HEAD
           {{ data?.get("majorPoniter")?.code + '/'+data?.get("majorPoniter")?.name || "-" }}
-=======
-          {{ data?.get("majorPoniter")?.name || "-" }}
->>>>>>> 97e6109cf35ed44c937fef2cd84cfbaeeb5c8810
         </td>
         <td nzEllipsis>
           @for (vul of data?.get('childrens'); track vul) {