Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

src/views/learningpath/LearningPath.vue

@@ -95,6 +95,7 @@
       centered="true"
       v-model:visible="out"
       :footer="null"
+      wrapClassName="CreatePath"
     >
       <div class="out">
         <div class="top">
@@ -534,6 +535,13 @@ export default {
 };
 </script>
 <style lang="scss">
+.clearfix:before,
+.clearfix:after {
+  content: " ";
+  display: block;
+  clear: both;
+}
+.CreatePath {
   .ant-modal {
     width: 680px !important;
     height: 528px !important;
@@ -715,11 +723,6 @@ export default {
       }
     }
   }
-.clearfix:before,
-.clearfix:after {
-  content: " ";
-  display: block;
-  clear: both;
 }
 .learningPath {
   width: 100%;

src/views/learningpath/LevelAddDetail.vue

@@ -29,6 +29,7 @@
       centered="true"
       :footer="null"
       :closable="clos"
+      wrapClassName="AddLevel"
     >
       <div class="header">
         <div class="headmain">
@@ -310,7 +311,7 @@
       <div class="draw" style="position: relative">
         <a-drawer
           v-model:visible="visible"
-          class="drawerStyle"
+          class="drawerStyle ProjectDrawer"
           title="关联项目"
           placement="right"
           width="80%"
@@ -322,7 +323,7 @@
               <img
                 style="width: 29px; height: 29px; cursor: pointer"
                 src="../../assets/images/basicinfo/close.png"
-                @click="showDrawer"
+                @click="closeDrawer"
               />
             </div>
             <div class="drawerbox">
@@ -648,6 +649,9 @@ export default {
     const showDrawer = () => {
       state.visible = true;
     };
+    const closeDrawer = () => {
+      state.visible = false;
+    };
     const showModal = () => {
       state.modal = true;
     };
@@ -802,6 +806,7 @@ export default {
       selectProjectName2,
       tableDataFunc,
       showDrawer,
+      closeDrawer,
       showModal,
       closeModal,
       afterVisibleChange,
@@ -819,6 +824,7 @@ export default {
   display: block;
   clear: both;
 }
+.AddLevel {
   .ant-modal {
     width: 624px !important;
     height: 388px !important;
@@ -954,16 +960,17 @@ export default {
       }
     }
   }
-.drawerStyle {
-  .ant-drawer-content-wrapper {
-    // max-width: 1000px;
-    .ant-drawer-header {
-      display: none !important;
-    }
-    .ant-drawer-body {
-      padding: 0;
-    }
 }
+.ProjectDrawer {
+  // .ant-drawer-content-wrapper {
+
+  //   .ant-drawer-header {
+  //     display: none !important;
+  //   }
+  //   .ant-drawer-body {
+  //     padding: 0;
+  //   }
+  // }
   .drawerMain {
     min-width: 600px;
     margin: 0px 32px 0px 32px;

src/views/projectcenter/TaskPage.vue

@@ -896,6 +896,17 @@
                     </div>
                   </div>
                 </div>
+                <div class="tab">
+                  <a-table
+                    :columns="jindutablecolumns"
+                    :data-source="jindutabledata"
+                    :loading="tableDataTotal === -1 ? true : false"
+                    expandRowByClick="true"
+                    :scroll="{ y: 330 }"
+                    @expand="expandTable"
+                    :pagination="false"
+                  />
+                </div>
               </div>
               <div class="rank">
                 <div class="rankhead">
@@ -910,6 +921,17 @@
                     </div>
                   </div>
                 </div>
+                <div class="tab">
+                  <a-table
+                    :columns="xuefentablecolumns"
+                    :data-source="xuefentabledata"
+                    :loading="tableDataTotal === -1 ? true : false"
+                    expandRowByClick="true"
+                    :scroll="{ y: 330 }"
+                    @expand="expandTable"
+                    :pagination="false"
+                  />
+                </div>
               </div>
               <div class="rank">
                 <div class="rankhead">
@@ -924,6 +946,17 @@
                     </div>
                   </div>
                 </div>
+                <div class="tab">
+                  <a-table
+                    :columns="xueshitablecolumns"
+                    :data-source="xueshitabledata"
+                    :loading="tableDataTotal === -1 ? true : false"
+                    expandRowByClick="true"
+                    :scroll="{ y: 330 }"
+                    @expand="expandTable"
+                    :pagination="false"
+                  />
+                </div>
               </div>
             </div>
           </div>
@@ -933,7 +966,9 @@
             <div class="set_tit">
               <span>基本信息</span>
             </div>
-            <hr color="#E8E8E8" />
+            <!-- <hr color="#E8E8E8" />
+             -->
+            <div class="line"></div>
             <div class="set_body">
               <div class="edit">
                 <div class="img"></div>
@@ -1397,6 +1432,272 @@ export default {
       valueDate: "", //排行榜输入日期
       noticeChecked: true,
       noticeContent: "请输入要发布的公告",
+
+      //进度排行表
+      jindutabledata: [
+        {
+          rank: "1",
+          name: "哈哈",
+          jd: "80%",
+        },
+
+        {
+          rank: "2",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "3",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "4",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "5",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "6",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "7",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "8",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "9",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "10",
+          name: "哈哈",
+          jd: "70%",
+        },
+      ],
+      jindutablecolumns: [
+        {
+          title: "排名",
+          dataIndex: "rank",
+          key: "rank",
+          width: 50,
+          align: "center",
+          className: "h",
+          customRender: (text) => {
+            if (text.record.rank == "1") {
+              return (
+                <div
+                  style={{
+                    width: 24,
+                    height: 24,
+                    backgroundImage:
+                      "url(" +
+                      require("../../assets/images/taskpage/one.png") +
+                      ")",
+                  }}
+                >fewfwe</div>
+              );
+            } else if (text.record.rank == "2") {
+              return <div>ggg</div>;
+            } else if (text.record.rank == "3") {
+              return <div>ggg</div>;
+            } else {
+              return <div>{text.record.rank}</div>;
+            }
+          },
+        },
+        {
+          title: "名称",
+          dataIndex: "name",
+          key: "name",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
+
+        {
+          title: "进度",
+          dataIndex: "jd",
+          key: "jd",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
+      ],
+      //学分排行表
+      xuefentabledata: [
+        {
+          rank: "1",
+          name: "哈哈",
+          jd: "80%",
+        },
+
+        {
+          rank: "2",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "3",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "4",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "5",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "6",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "7",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "8",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "9",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "10",
+          name: "哈哈",
+          jd: "70%",
+        },
+      ],
+      xuefentablecolumns: [
+        {
+          title: "排名",
+          dataIndex: "rank",
+          key: "rank",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "名称",
+          dataIndex: "name",
+          key: "name",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
+
+        {
+          title: "进度",
+          dataIndex: "jd",
+          key: "jd",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
+      ],
+      //学识排行表
+      xueshitabledata: [
+        {
+          rank: "1",
+          name: "哈哈",
+          jd: "80%",
+        },
+
+        {
+          rank: "2",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "3",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "4",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "5",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "6",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "7",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "8",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "9",
+          name: "哈哈",
+          jd: "70%",
+        },
+        {
+          rank: "10",
+          name: "哈哈",
+          jd: "70%",
+        },
+      ],
+      xueshitablecolumns: [
+        {
+          title: "排名",
+          dataIndex: "rank",
+          key: "rank",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "名称",
+          dataIndex: "name",
+          key: "name",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
+
+        {
+          title: "进度",
+          dataIndex: "jd",
+          key: "jd",
+          width: 50,
+          align: "center",
+          className: "h",
+        },
+      ],
     });
     const showModal = () => {
       state.pubproject = true;
@@ -2556,7 +2857,7 @@ export default {
   .content6 {
     width: 100%;
     height: 100%;
-    background-color: #bfa;
+    // background-color: #bfa;
     .title {
       font-size: 18px;
       font-weight: 500;
@@ -2650,6 +2951,7 @@ export default {
         background: #ffffff;
         border-radius: 2px;
         border: 1px solid rgba(125, 125, 125, 0.39);
+        margin-bottom: 20px;
         .rankhead {
           height: 75px;
           width: 100%;
@@ -2681,6 +2983,22 @@ export default {
             }
           }
         }
+        .tab {
+          // margin-top: 20px;
+          // margin-left: 24px;
+          border-radius: 4px 4px 0px 0px;
+          border: 1px solid #e9e9e9;
+          margin: 20px 24px 0 24px;
+          th.h {
+            background-color: #eff4fc !important;
+          }
+
+          .ant-table-tbody
+            > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+            > td {
+            background: #f6f9fd;
+          }
+        }
       }
     }
   }
@@ -2691,6 +3009,12 @@ export default {
       font-weight: 500;
       color: #232425;
     }
+    .line {
+      width: 100%;
+      height: 1px;
+      background-color: #e8e8e8;
+      margin-top: 10px;
+    }
     .set_body {
       margin-left: 34px;
       margin-right: 34px;