开放项目管理

src/views/home.vue

@@ -152,7 +152,7 @@
 				<keep-alive>
 					<router-view></router-view>
 				</keep-alive>
-        
+
       </el-main>
     </el-container>
   </el-container>
@@ -377,13 +377,13 @@ export default {
           //     },
           //   ],
           // },
-          // {
-          //   id: 4,
-          //   label: "项目管理",
-          //   goto: "/ProjectManagement",
-          //   icon: "el-icon-receiving",
-          //   group: [],
-          // },
+          {
+            id: 4,
+            label: "项目管理",
+            goto: "/ProjectManagement",
+            icon: "el-icon-receiving",
+            group: [],
+          },
           // {
           //   id: 5,
           //   label: "项目结项",

src/views/projectApply/projectApplication.vue

@@ -158,7 +158,7 @@
         @cell-click="cellProjectClick"
       >
         <!-- selection-change批量选择功能后续可能用到 -->
-        <!-- 
+        <!--
         <el-table-column
           type="selection"
           width="25"
@@ -1066,10 +1066,31 @@ export default {
                 let student = item.course_student
                   ? JSON.parse(item.course_student)
                   : [];
-                let money = item.money ? JSON.parse(item.money) : {};
-                // _json["项目编号"] = item.ProjectNo;
+                // console.log("👉",i)
+                _json["项目编号"] = item.ProjectNo;
                 _json["项目名称"] = item.title;
                 _json["项目负责人"] = item.pro_leader;
+								_json["所在部门"] = item.name;
+                _json["分类"] = item.sort;
+                _json["预算（万）"] = item.fund / 10000;
+                _json["创建时间"] = item.createTime;
+                _json["联系电话"] = item.phone;
+
+                _json["项目状态"] =
+                  item.isReturn == 0
+                    ? this.classType.find((i) => i.value == item.isupload)[
+                        "title"
+                      ]
+                    : this.isReturnType[item.isReturn];
+
+                _json["项目起始时间"] = item.begin_at;
+                _json["计划完成时间"] = item.plannedEnd_at;
+                _json["项目组人数"] = student.length+teacher.length;
+                _json["参与学生人数"] = student.length
+                _json["参与教师人数"] = teacher.length
+
+
+                let money = item.money ? JSON.parse(item.money) : {};
                 _json["小型仪器设备费"] = money["device"]
                   ? money["device"]
                   : "0";
@@ -1091,24 +1112,21 @@ export default {
                   ? money["Transaction"]
                   : "0";
 
-                // _json["所在部门"] = item.name;
-                // _json["分类"] = item.sort;
-                // _json["预算（万）"] = item.fund / 10000;
-                // _json["创建时间"] = item.createTime;
-                // _json["联系电话"] = item.phone;
-                // _json["项目状态"] =
-                //   item.isReturn == 0
-                //     ? this.classType.find((i) => i.value == item.isupload)[
-                //         "title"
-                //       ]
-                //     : this.isReturnType[item.isReturn];
-                // for (let i = 0; i < student.length; i++) {
-                //   _json["学生成员" + (i + 1)] = student[i].name;
-                // 	_json["学生班级" + (i + 1)] = student[i].collage;
-                // }
-                // for (let i = 0; i < teacher.length; i++) {
-                //   _json["指导老师" + (i + 1)] = teacher[i].name;
-                // }
+                for (let i = 0; i < student.length; i++) {
+                  _json["学生成员" + (i + 1)] = student[i].name;
+                	_json["学生班级" + (i + 1)] = student[i].collage;
+                  _json["角色分工" + (i + 1)] = student[i].work
+                }
+                for (let i = 0; i < teacher.length; i++) {
+                  _json["指导老师" + (i + 1)] = teacher[i].name;
+                  _json["所在学院" + (i + 1)] = teacher[i].collage;
+                  _json["角色分工" + (i + 1)] = student[i].work
+                }
+
+
+
+
+
 
                 _array.push(_json);
               });
@@ -1118,6 +1136,7 @@ export default {
               let ws = XLSX.utils.json_to_sheet(_array); //将json对象数组转化成工作表
               ws["!cols"] = [
                 //设置每一列的宽度
+                { wch: 20 },
                 { wch: 50 },
                 { wch: 20 },
                 { wch: 20 },
@@ -1136,13 +1155,48 @@ export default {
                 { wch: 20 },
                 { wch: 20 },
                 { wch: 20 },
-                { wch: 10 },
-                { wch: 10 },
-                { wch: 10 },
-                { wch: 10 },
-                { wch: 10 },
-                { wch: 10 },
-                { wch: 10 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
+                { wch: 20 },
               ];
               XLSX.utils.book_append_sheet(workbook, ws, "sheet1"); //把sheet添加到workbook里，第三个参数是sheet名
               XLSX.writeFile(workbook, "项目列表.xlsx");