xll 3 tháng trước cách đây
mục cha
commit
0479c0ed3f

BIN
projects/textbook/public/file/工作联系人使用指南.pdf


+ 21 - 23
projects/textbook/src/app/comp-manage/comp-manage.component.html

@@ -2,29 +2,19 @@
   <div class="content-left" [style.width]="isCollapsed ? '' : '248px'">
     <div class="btn-menu">
       <button mat-icon-button (click)="toggleCollapsed()" aria-label="LogOut" style="margin-right: 12px;">
-        <mat-icon
-        svgIcon="menu"
-        ></mat-icon>
+        <mat-icon svgIcon="menu"></mat-icon>
       </button>
       {{ isCollapsed ? "" : "“十四五”普通高等教育本科国家级规划教材申报系统" }}
     </div>
 
-    <ul
-      [nzInlineCollapsed]="isCollapsed"
-      nz-menu
-      nzMode="inline"
-      style="width: 100%; background: #f9eaea;height: 100%;position: relative;"
-    >
+    <ul [nzInlineCollapsed]="isCollapsed" nz-menu nzMode="inline"
+      style="width: 100%; background: #f9eaea;height: 100%;position: relative;">
       @for (item of optionsMap[textbook.profile?.identity]; track item.id;let index = $index) { @if(item.child)
       {
       <li nz-submenu [nzTitle]="item.name" nzIcon="project" [nzOpen]="true">
         <ul>
           @for (child of item.child; track child.id;let idx = $index) {
-          <li
-            nz-menu-item
-            [nzSelected]="active == child.id"
-            (click)="toUrl(child)"
-          >
+          <li nz-menu-item [nzSelected]="active == child.id" (click)="toUrl(child)">
             {{ child.name }}
           </li>
           }
@@ -36,21 +26,29 @@
         <span>{{ item.name }}</span>
       </li>
       } }
-      @if (tbookSer.profile.identity == '高校联系人') {
-        <div class="down" (click)="downloadFile('“十四五”普通高等教育本科国家级规划教材申报书.docx')">
+      <div class="down">
+        <a (click)="downloadFile('“十四五”普通高等教育本科国家级规划教材申报书.docx')">
           <span nz-icon nzType="file" nzTheme="outline"></span>
           “十四五”普通高等教育本科
           国家级规划教材申报书
+        </a>
+        <div class="directions" (click)="openFile('/file/工作联系人使用指南.pdf')">
+          <a>
+            <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+              <path
+                d="M7.66683 12V13.3333H6.3335V12H1.00016C0.823352 12 0.653782 11.9298 0.528758 11.8047C0.403734 11.6797 0.333496 11.5101 0.333496 11.3333V0.666669C0.333496 0.489858 0.403734 0.320288 0.528758 0.195264C0.653782 0.0702397 0.823352 1.87243e-06 1.00016 1.87243e-06H5.00016C5.37855 -0.00044707 5.75269 0.0798393 6.09758 0.2355C6.44247 0.391161 6.75018 0.618613 7.00016 0.902669C7.25015 0.618613 7.55786 0.391161 7.90275 0.2355C8.24764 0.0798393 8.62177 -0.00044707 9.00016 1.87243e-06H13.0002C13.177 1.87243e-06 13.3465 0.0702397 13.4716 0.195264C13.5966 0.320288 13.6668 0.489858 13.6668 0.666669V11.3333C13.6668 11.5101 13.5966 11.6797 13.4716 11.8047C13.3465 11.9298 13.177 12 13.0002 12H7.66683ZM12.3335 10.6667V1.33334H9.00016C8.64654 1.33334 8.3074 1.47381 8.05735 1.72386C7.80731 1.97391 7.66683 2.31305 7.66683 2.66667V10.6667H12.3335ZM6.3335 10.6667V2.66667C6.3335 2.31305 6.19302 1.97391 5.94297 1.72386C5.69292 1.47381 5.35379 1.33334 5.00016 1.33334H1.66683V10.6667H6.3335Z"
+                fill="#C6233F" />
+            </svg>
+            <span>使用指南</span>
+          </a>
         </div>
-      }
+
+      </div>
     </ul>
-    <app-comp-nav
-      [viewCollapsed]="isCollapsed"
-      class="left-fonter"
-      [style.width]="isCollapsed ? '248px' : ''"
-    ></app-comp-nav>
+    <app-comp-nav [viewCollapsed]="isCollapsed" class="left-fonter"
+      [style.width]="isCollapsed ? '248px' : ''"></app-comp-nav>
   </div>
   <div class="preview">
     <router-outlet></router-outlet>
   </div>
-</div>
+</div>

+ 12 - 1
projects/textbook/src/app/comp-manage/comp-manage.component.scss

@@ -43,7 +43,18 @@
   text-wrap: wrap;
   /* padding-left: 24px; */
   /* padding: 0; */
-  color: blue;
+
+  .directions{
+    margin-top: 10px;
+    background: #F4CBCD;
+    padding:15px 20px ;
+    display: flex;
+    align-items: center;
+    span{
+      margin-left: 8px;
+      color: #C6233F;
+    }
+  }
 }
 
 ::ng-deep .ant-menu-sub.ant-menu-inline{

+ 4 - 0
projects/textbook/src/app/comp-manage/comp-manage.component.ts

@@ -234,4 +234,8 @@ export class CompManageComponent implements OnInit {
       window.URL.revokeObjectURL(url);
     })
   }
+
+  openFile(url:string){
+    window.open(url)
+  }
 }

+ 3 - 41
projects/textbook/src/modules/common/textbook-details/textbook-details.component.ts

@@ -36,38 +36,7 @@ export class TextbookDetailsComponent implements OnInit {
 
 /**扩展表记录 */
 eduTextbookVolumeList: Array<any> = []
-/**获取扩展表记录 */
-async getEduTextbookVolumeList() {
-  if (this.textBook?.typeNumber && this.textBook?.typeNumber > 12) {
-    this.textBook.typeNumber = 12
-  }
-  console.log(this.textBook?.type, this.textBook?.typeNumber)
-  let query = new Parse.Query('EduTextbookVolume')
-  query.equalTo('eduTextbook', this.textBook?.objectId)
-  query.ascending('createdAt')//小到大
-  query.notEqualTo('isDeleted', true)
-  if (this.textBook?.type == '全册') {
-    query.limit(this.textBook?.typeNumber)
-  } else {
-    query.limit(1)
-  }
-  let req = await query.find()
-  let list = [] 
-  for(let i in req){
-    list.push(req[i].toJSON())
-  }
-  console.log(list)
-  if (this.textBook?.type == '全册') {
-    this.eduTextbookVolumeList = new Array(this.textBook?.typeNumber).fill({ objectId: '' })
-    for (let i in list) {
-      this.eduTextbookVolumeList[i] = list[i]
-    }
-  } else {
-    this.eduTextbookVolumeList[0] = list[0]
-    console.log(this.eduTextbookVolumeList)
-  }
 
-}
 /** 册数*/
 typeNumber:any
 /** 申报类型*/
@@ -75,28 +44,21 @@ type:any
 
 
 
-
-
-
-
-
-
-
-
-
   constructor(private router: Router, private activeRoute: ActivatedRoute) {}
 
   ngOnInit() {
     this.activeRoute.paramMap.subscribe(async (params) => {
       this.user = Parse.User.current()
       let id = params.get('id');
+      console.log(id)
       if (id) {
         let query = new Parse.Query('EduTextbook');
         query.equalTo('objectId', id);
+        query.include('childrens')
         let r = await query.first();
         this.textBook = r?.toJSON()
         console.log(this.textBook);
-        this.getEduTextbookVolumeList()
+        this.eduTextbookVolumeList = this.textBook?.childrens
       }
     });
   }

+ 1 - 1
projects/textbook/src/modules/nav-province-contact/submitted/complete/complete.component.html

@@ -18,7 +18,7 @@
       style="margin-right: 20px"
       (click)="revoke()"
     >
-      撤销公示
+      撤销报送
     </button>
     <button
       nz-button