From fb0a6bcb4d33401998881fa59a593ec31948296e Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Fri, 10 Dec 2021 18:33:14 +0800
Subject: [PATCH] update

---
 src/pages/assessment/add/index.vue | 122 +++++++++++++++++------------
 src/pages/project/list/index.vue   |   1 +
 2 files changed, 72 insertions(+), 51 deletions(-)

diff --git a/src/pages/assessment/add/index.vue b/src/pages/assessment/add/index.vue
index 5dd5d7d..08634a3 100644
--- a/src/pages/assessment/add/index.vue
+++ b/src/pages/assessment/add/index.vue
@@ -73,6 +73,14 @@
                                 :value="item.cid">
                             </el-option>
                         </el-select>
+                        <!-- <el-select v-model="form.curriculumId" @change="initData">
+                            <el-option
+                                v-for="item in systemList"
+                                :key="item.id"
+                                :label="item.label"
+                                :value="item.id">
+                            </el-option>
+                        </el-select> -->
                     </div>
                 </div>
             </el-card>
@@ -245,7 +253,8 @@ export default {
             page: 1,
             pageSize: 5,
             total: 0,
-            isToProject: false
+            isToProject: false,
+            systemList: []
         };
     },
     computed: {
@@ -311,7 +320,7 @@ export default {
             });
             // 缓存全选和半选状态下的所有节点
             this.allCheckedNodes = [...checked.checkedNodes, ...checked.halfCheckedNodes];
-            console.log(this.allCheckedNodes)
+            // console.log(this.allCheckedNodes)
         },
         filterNode(value, data) { // 对树节点进行过滤
             if (!value) return true;
@@ -379,61 +388,72 @@ export default {
             });
         },
         getProjectData() {
-            // this.$get(`${this.api.projectListByCourseId}?cid=${this.form.curriculumId}&permissions=1&projectName=${this.keyword}`).then(res => {
-            //     let { status, data } = res;
-            //     console.log(data)
-            //     if (status === 200 && data) {
-            //         let list = data;
-            //         let result = [];
-            //         list.map(n => {
-            //             n.enable || result.push(n);
-            //         });
-            //         this.projectDataAll = result;
-            //         console.log(result)
-            //         this.total = result.length;
-            //         // this.handlePage();
-            //     }
-            // }).catch(err => {
-            // });
+            this.$get(`${this.api.projectListByCourseId}?cid=${this.form.curriculumId}&permissions=1&projectName=${this.keyword}`).then(res => {
+                let { status, data } = res;
+                if (status === 200 && data) {
+                    let list = data;
+                    let result = [];
+                    list.map(n => {
+                        n.enable || result.push(n);
+                    });
+                    this.projectDataAll = result;
+                    console.log(result)
+                    this.total = result.length;
+                    this.handlePage();
+                }
+            }).catch(err => {
+            });
             
+            // test
+            // for(let i=0; i<this.cidList.length; i++) {
+            //     this.$get(`${this.api.projectListByCourseId}?cid=${this.cidList[i]}&permissions=1&projectName=${this.keyword}`).then(res => {
+            //         let { status, data } = res;
+            //         console.log('---')
+            //         console.log(data)
+            //         if (status === 200 && data) {
+            //             let list = data;
+            //             let result = [];
+            //             list.map(n => {
+            //                 n.enable || result.push(n);
+            //             });
+            //             this.projectDataAll = result;
+            //             console.log(result)
+            //             this.total = result.length;
+            //             this.handlePage();
+            //         }
+            //     }).catch(err => {
+            //     });
+            // }
 
 
             
-            this.$get(this.api.getSystemIdBySchool).then(res => {
+            // this.$get(this.api.getSystemIdBySchool).then(res => {
 
-                if (res.status == 200){
-                    const systemList = res.data;
-                    // 如果systemId有历史记录，就取历史记录里的systemId，否则就取默认的systemId
-                    const systemId = systemList[0].id;
-                    console.log(this.keyword,
-                        this.page,
-                        this.pageSize)
-                    console.log(systemId)
-                    let data = {
-                        platformId: 1, // 平台：职站:1 中台:3
-                        founder: 2, // 创建人角色(0:系统 1:老师 2:全部)
-                        state: "", // 状态(0:草稿箱 1:已发布)
-                        permissions: 1, // 项目权限(0:练习 1:考核 2:竞赛)
-                        projectName: this.keyword,
-                        pageNum: this.page,
-                        pageSize: this.pageSize,
-                        systemId
-                    };
-                    this.$post(this.api.queryProjectManage, data).then(res => {
-                        // this.listData = res.data.records;
-                        // this.total = res.data.total;
-                        console.log(res.data)
-                        const { data: { records } } = res
-                        this.projectDataAll = records;
-                        this.total = records.length;
-                        console.log(this.projectDataAll)
-                        this.handlePage();
-                    }).catch(err => {
-                    });
-                }else{
-                }
+            //     if (res.status == 200){
+            //         this.systemList = res.data;
+            //         // 如果systemId有历史记录，就取历史记录里的systemId，否则就取默认的systemId
+            //         const systemId = this.systemList[0].id;
+            //         let data = {
+            //             platformId: 1, // 平台：职站:1 中台:3
+            //             founder: 2, // 创建人角色(0:系统 1:老师 2:全部)
+            //             state: "", // 状态(0:草稿箱 1:已发布)
+            //             permissions: 1, // 项目权限(0:练习 1:考核 2:竞赛)
+            //             projectName: this.keyword,
+            //             pageNum: this.page,
+            //             pageSize: this.pageSize,
+            //             systemId
+            //         };
+            //         this.$post(this.api.queryProjectManage, data).then(res => {
+            //             const { data: { records } } = res
+            //             this.projectDataAll = records;
+            //             this.total = records.length;
+            //             this.handlePage();
+            //         }).catch(err => {
+            //         });
+            //     }else{
+            //     }
 
-            });
+            // });
         },
         handlePage() {
             let result = this.projectDataAll.slice((this.page - 1) * this.pageSize, this.page * this.pageSize);
diff --git a/src/pages/project/list/index.vue b/src/pages/project/list/index.vue
index 01822b4..f8d7b7a 100644
--- a/src/pages/project/list/index.vue
+++ b/src/pages/project/list/index.vue
@@ -254,6 +254,7 @@ export default {
 
                 if (res.status == 200){
                     this.systemList = res.data;
+                    console.log(this.systemList)
                     // 如果systemId有历史记录，就取历史记录里的systemId，否则就取默认的systemId
                     this.systemId = this.lastSystemId ? this.lastSystemId : this.systemList[0].id;
                     this.getData();