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

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

@@ -27,11 +27,20 @@
       </li>
       } }
       <div class="down">
-        <a (click)="downloadFile('“十四五”普通高等教育本科国家级规划教材申报书.docx')">
-          <span nz-icon nzType="file" nzTheme="outline"></span>
-          “十四五”普通高等教育本科
-          国家级规划教材申报书
-        </a>
+        <div class="a">
+          <a href="/file/遴选推荐表相关模板.zip" download>
+            <span nz-icon nzType="file-zip" nzTheme="outline"></span>
+            遴选推荐表相关模板
+          </a>
+        </div>
+        <div class="a">
+          <a (click)="downloadFile('“十四五”普通高等教育本科国家级规划教材申报书.docx')">
+            <span nz-icon nzType="file" nzTheme="outline"></span>
+            “十四五”普通高等教育本科
+            国家级规划教材申报书
+          </a>
+        </div>
+        
         <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">

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

@@ -43,7 +43,9 @@
   text-wrap: wrap;
   /* padding-left: 24px; */
   /* padding: 0; */
-
+  .a{
+    padding: 5px 0;
+  }
   .directions{
     margin-top: 10px;
     background: #F4CBCD;

projects/textbook/src/app/textbook/textbook.component.ts

@@ -104,8 +104,8 @@ export class TextbookComponent implements OnInit {
     approval: {
       listOfFilter: [
         {
-          value: '经中央有关部门审定的教材',
-          text: '经中央有关部门审定的教材',
+          value: '经中央有关部门审定的教材（已点对点通知）',
+          text: '经中央有关部门审定的教材（已点对点通知）',
         },
         {
           value: '首届全国教材建设奖优秀教材（高等教育类）教材',
@@ -903,7 +903,7 @@ export class TextbookComponent implements OnInit {
         _body += '</td>';
 
         _body += '<td>';
-        _body += `${data[row].get('code') || ''}`;
+        _body += `&nbsp;${data[row].get('code') || ''}`;
         _body += '</td>';
 
         _body += '<td>';
@@ -935,7 +935,7 @@ export class TextbookComponent implements OnInit {
         _body += '</td>';
 
         _body += '<td>';
-        _body += `${
+        _body += `&nbsp;${
           this.fromatFiled(data[row]?.get('childrens'), 'editionFirst')
         }`;
         _body += '</td>';

projects/textbook/src/modules/nav-admin/page-process/process-list/process-list.component.html

@@ -267,7 +267,7 @@
       <span>已选</span>
       <span class="styles_num__178Wa">{{ setOfCheckedId.size }}</span>
     </div>
-    <div class="batch-toolbar-actions">
+    <!-- <div class="batch-toolbar-actions">
       <div class="ant-space ant-space-horizontal ant-space-align-center">
         <div class="ant-space-item" style="margin-right: 16px">
           <button nz-button nzType="text" (click)="statusSelected('del')">
@@ -276,7 +276,7 @@
           </button>
         </div>
       </div>
-    </div>
+    </div> -->
     <div class="styles_cancel__AARoT">
       <button nz-button nzType="text" (click)="statusSelected('strat')">
         <span nz-icon nzType="caret-right" nzTheme="outline"></span>

projects/textbook/src/modules/nav-admin/page-process/process-list/process-list.component.scss

@@ -100,7 +100,7 @@
   display: flex;
   justify-content: center;
   bottom: 80px;
-  left: calc(50% - 376px);
+  left: calc(50% - 300px);
   -webkit-transform: translate(0);
   transform: translate(0);
   z-index: 99;

projects/textbook/src/modules/nav-admin/page-process/process-list/process-list.component.ts

@@ -417,9 +417,10 @@ export class ProcessListComponent implements OnInit {
       strat: '开始',
       stop: '暂停',
       end: '结束',
+      del: '删除',
     };
     this.modal.confirm({
-      nzTitle: '批量删除',
+      nzTitle: `批量${map[type]}`,
       nzContent:
         type == 'del'
           ? `删除后数据不可恢复，请谨慎操作`
@@ -456,7 +457,7 @@ export class ProcessListComponent implements OnInit {
   async onStatusChange(
     data: Parse.Object,
     type: string,
-    end?: boolean
+    end?: boolean,
   ): Promise<void> {
     console.log(data, type);
     switch (type) {

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

@@ -457,8 +457,8 @@ export class BasicInComponent implements OnInit {
   /* 是否重点立项教材可选列表 */
   options: Array<any> = [
     {
-      name: '经中央有关部门审定的教材',
-      code: '经中央有关部门审定的教材',
+      name: '经中央有关部门审定的教材（已点对点通知）',
+      code: '经中央有关部门审定的教材（已点对点通知）',
     },
     {
       name: '首届全国教材建设奖优秀教材（高等教育类）教材',

projects/textbook/src/modules/nav-province-contact/page-process/page-process.component.ts

@@ -68,6 +68,7 @@ export class PageProcessComponent implements OnInit {
         let query = new Parse.Query('EduProcess');
         query.include('branch', 'department');
         query.equalTo('objectId', id);
+        query.notEqualTo('isDeleted', true);
         let res = await query.first();
         if (res?.id) {
           let vrifly = await this.tbookSer.getEduProcess(

projects/textbook/src/modules/nav-province-contact/submitted/export-file/export-file.component.html

@@ -20,7 +20,7 @@
       <div class="val">{{otherCount}}</div>
     </div>
     <div class="row">
-      <div class="lable">推荐限额外申报数</div>
+      <div class="lable">不占用推荐限额申报数</div>
       <div class="val">{{allCount - otherCount}}</div>
     </div>
     <div class="row">

projects/textbook/src/modules/nav-province-contact/submitted/submitted.component.ts

@@ -37,6 +37,7 @@ export class SubmittedComponent implements OnInit {
     this.activeRoute.paramMap.subscribe(async (params) => {
       let id = params.get('id');
       let query = new Parse.Query('EduProcess');
+      query.notEqualTo('isDeleted', true);
       query.include('department');
       query.equalTo('objectId', id);
       this.eduProcess = await query.first();

server/db/index.js

@@ -8,6 +8,8 @@ import {_Session} from "./schemas/_Session"
 import {Submitted} from "./schemas/Submitted"
 import {EduProcess} from "./schemas/EduProcess"
 import { Department } from "./schemas/Department"
+import { Review } from "./schemas/Review"
+import { Activity } from "./schemas/Activity"
 export const EduSchemas = [
     _User,
     _Role,
@@ -18,6 +20,8 @@ export const EduSchemas = [
     EduCollection,
     Submitted,
     EduProcess,
-    Department
+    Department,
+    Review,
+    Activity
 ]
 module.exports.EduSchemas = EduSchemas

server/db/schemas/Activity.js

@@ -0,0 +1,58 @@
+/* 评审表 */
+export const Activity = {
+  "className": "Activity",
+  "fields": {
+    "name":{//活动名称
+      "type": "String",
+      "required": false
+    },
+    "eduProcess": { //评审教材
+      "type": "Pointer",
+      "targetClass": "EduProcess",
+      "required": false
+    },
+    "startDate": {//开始时间
+      "type": "Date",
+      "required": false
+    },
+    "deadline": {//截止时间
+      "type": "Date",
+      "required": false
+    },
+    "status":{//是否开始
+      "type": "Number",
+      "required": false
+    },
+    "desc":{//详情说明
+      "type": "String",
+      "required": false
+    },
+  },
+  "classLevelPermissions": {
+    "find": {
+      "*": true
+    },
+    "get": {
+      "*": true
+    },
+    "count": {
+      "*": true
+    },
+    "create": {
+      "*": true
+    },
+    "update": {
+      "*": true
+    },
+    "delete": {
+      "*": true
+    },
+    "addField": {
+      "*": true
+    },
+    "protectedFields": {
+      "*": []
+    }
+  }
+}
+module.exports.Activity = Activity

server/db/schemas/Review.js

@@ -0,0 +1,57 @@
+/* 评审表 */
+export const Review = {
+  "className": "Review",
+  "fields": {
+    "eduTextbook": { //评审教材
+      "type": "Pointer",
+      "targetClass": "EduTextbook",
+      "required": false
+    },
+    "user": {
+      "type": "Pointer",
+      "targetClass": "_User",
+      "required": false
+    },
+    "profile": { //评审用户
+      "type": "Pointer",
+      "targetClass": "Profile",
+      "required": false
+    },
+    "score": {//最终分数
+      "type": "Number"
+    },
+    "expect":{//预估分
+      "type": "Number"
+    },
+    "verify":{
+      "type": "Boolean"
+    }
+  },
+  "classLevelPermissions": {
+    "find": {
+      "*": true
+    },
+    "get": {
+      "*": true
+    },
+    "count": {
+      "*": true
+    },
+    "create": {
+      "*": true
+    },
+    "update": {
+      "*": true
+    },
+    "delete": {
+      "*": true
+    },
+    "addField": {
+      "*": true
+    },
+    "protectedFields": {
+      "*": []
+    }
+  }
+}
+module.exports.Review = Review