From d986680eae4743401eff9ba221dcd129767669f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= <yuejx@dongwu-inc.com>
Date: Wed, 2 Nov 2022 18:00:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=AE=A8=E8=AE=BA=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?,=E6=B7=BB=E5=8A=A0=E5=85=B3=E5=8D=A1=E7=9A=84=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexDiscuss.js                   |   2 +-
 src/api/indexLevel.js                     |   8 +-
 src/components/drawers/AddActive.vue      |   9 +-
 src/components/drawers/ProMess.vue        |   4 +-
 src/components/drawers/SeeStu.vue         | 322 ++++++++++------------
 src/views/learningpath/LevelAddDetail.vue |  27 +-
 src/views/projectcenter/TaskAdd.vue       |  59 ++++
 7 files changed, 247 insertions(+), 184 deletions(-)

diff --git a/src/api/indexDiscuss.js b/src/api/indexDiscuss.js
index cc9863a9..5167f69c 100644
--- a/src/api/indexDiscuss.js
+++ b/src/api/indexDiscuss.js
@@ -10,4 +10,4 @@ export const getDiscussDetail = (obj) => http.post('/discuss/getDiscussDetail',
 export const deleteDiscuss = (obj) => http.post('/discuss/deleteDiscuss', { params: obj });
 
 //修改讨论接口
-export const updateDiscuss = (obj) => http.post('/discuss/updateDiscuss', { params: obj });
\ No newline at end of file
+export const updateDiscuss = (obj) => http.post('/discuss/updateDiscuss',  obj );
\ No newline at end of file
diff --git a/src/api/indexLevel.js b/src/api/indexLevel.js
index 39e22fcd..b7b1b400 100644
--- a/src/api/indexLevel.js
+++ b/src/api/indexLevel.js
@@ -1,8 +1,14 @@
 import http from "./config";
 
-//新建或编辑关卡
+//新建关卡
 export const editChapter = (obj) => http.post('/admin/router/editChapter', obj, {
     headers: {
         'token': '123'
     }
+});
+//编辑关卡
+export const updateChapter = (obj) => http.post('/admin/router/editChapter', obj, {
+    headers: {
+        'token': '123'
+    }
 });
\ No newline at end of file
diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index 5388f71c..baceb73c 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -71,6 +71,12 @@
           </div>
           <div class="main_item">
             <div class="signbox">
+            <div class="sign">
+                <img
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
+                />
+              </div>
               <span style="margin-right: 3px">活动时间：</span>
             </div>
             <div class="btnbox">
@@ -284,8 +290,9 @@ export default {
     //创建活动
     const createActivity = () => {
       if(!state.inputV1) return message.warning("请输入活动名称");
-      if(!state.inputV2) return message.warning("请输入活动时长");
       if(!state.textV1) return message.warning("请输入活动公告");
+      if(!state.time) return message.warning("请输入活动时间");
+      if(!state.inputV2) return message.warning("请输入活动时长");
       if(!state.inputV3) return message.warning("请输入活动地址");
       let startTime = toDate(new Date(state.time[0].$d).getTime() / 1000, "Y-M-D");
       let endTime = toDate(new Date(state.time[1].$d).getTime() / 1000, "Y-M-D");
diff --git a/src/components/drawers/ProMess.vue b/src/components/drawers/ProMess.vue
index 5c365471..49e1cc79 100644
--- a/src/components/drawers/ProMess.vue
+++ b/src/components/drawers/ProMess.vue
@@ -3,7 +3,7 @@
     :visible="Provisible"
     class="drawerStyle promess"
     placement="right"
-    width="50%"
+    width="70%"
     @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
@@ -75,7 +75,7 @@ export default {
     }
   }
   .drawerMain {
-    min-width: 434px;
+    min-width: 600px;
     margin: 0px 32px 0px 32px;
     overflow-x: scroll;
     display: flex;
diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue
index 36657360..42932f58 100644
--- a/src/components/drawers/SeeStu.vue
+++ b/src/components/drawers/SeeStu.vue
@@ -69,178 +69,74 @@
           </div>
         </div>
         <div class="mainbox">
-          <div class="rowtitle" @click="changeDown">
-            <div class="titleimg">
-              <img
-                :src="
-                  showDown
-                    ? require('../../assets/images/studentimg/open.png')
-                    : require('../../assets/images/studentimg/close.png')
-                "
-              />
-            </div>
-            <div class="titletext">阶段1 腾飞班阶段1</div>
-          </div>
-          <div :style="{ display: showDown ? 'block' : 'none' }">
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/zai.png" /></div>
-                <div class="text1">在线</div>
-                <div class="text2">如何成为一个产品经理</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/complete.png" />
+          <a-collapse v-model:activeKey="stageListActive" >
+            <template #expandIcon="{ isActive }">
+                    <img style="margin-right: 20px"
+                    :src="
+                      isActive
+                        ? require('../../assets/images/studentimg/open.png')
+                        : require('../../assets/images/studentimg/close.png')
+                    " />
+                    <div></div>
+            </template>
+            <a-collapse-panel v-for="(value, index) in stageList" :key="index" :header="value.text">
+              <div class="rowclass" v-for="(item, key) in value.children" :key="key">
+                <div class="leftclass">
+                  <div><img :src="
+														item.course === '在线'
+															? require('../../assets/images/leveladd/zai.png')
+															: item.course === '面授'
+																? require('../../assets/images/leveladd/mian.png')
+																: item.course === '案例'
+																	? require('../../assets/images/leveladd/an.png')
+																	: item.course === '作业'
+																		? require('../../assets/images/leveladd/zuo.png')
+																		: item.course === '考试'
+																			? require('../../assets/images/leveladd/kao.png')
+																			: item.course === '直播'
+																				? require('../../assets/images/leveladd/zhi.png')
+																				: item.course === '外链'
+																					? require('../../assets/images/leveladd/wai.png')
+																					: item.course === '讨论'
+																						? require('../../assets/images/leveladd/tao.png')
+																						: item.course === '活动'
+																							? require('../../assets/images/leveladd/huo.png')
+																							: item.course === '测评'
+																								? require('../../assets/images/leveladd/ce.png')
+																								: item.course === '调研'
+																									? require('../../assets/images/leveladd/diao.png')
+																									: item.course === '投票'
+																										? require('../../assets/images/leveladd/tou.png')
+																										: null
+													" /></div>
+                  <div class="text1">{{item.course}}</div>
+                  <div class="text2">{{item.name}}</div>
                 </div>
-                <div class="altext">已完成</div>
-              </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/zhi.png" /></div>
-                <div class="text1">直播</div>
-                <div class="text2">管理者播课</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/complete.png" />
+                <div class="alreadyclass">
+                  <div class="alimg">
+                    <img :src="
+                      item.complete === '已完成'
+                        ? require('../../assets/images/studentimg/complete.png')
+                        : require('../../assets/images/studentimg/notice.png')
+                    "/>
+                  </div>
+                  <div class="altext">{{item.complete}}</div>
                 </div>
-                <div class="altext">已完成</div>
-              </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/mian.png" /></div>
-                <div class="text1">面授</div>
-                <div class="text2">管理面授课</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/notice.png" />
-                </div>
-                <div class="altext">未完成</div>
-              </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/huo.png" /></div>
-                <div class="text1">活动</div>
-                <div class="text2">管理者活动</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/notice.png" />
-                </div>
-                <div class="altext">未完成</div>
-              </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/zuo.png" /></div>
-                <div class="text1">作业</div>
-                <div class="text2">管理者作业</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/notice.png" />
-                </div>
-                <div class="altext">未完成</div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="mainbox">
-          <div class="rowtitle" @click="changeDown1">
-            <div class="titleimg">
-              <img
-                :src="
-                  showDown1
-                    ? require('../../assets/images/studentimg/open.png')
-                    : require('../../assets/images/studentimg/close.png')
-                "
-              />
-            </div>
-            <div class="titletext">阶段2 腾飞班阶段2</div>
-          </div>
-          <div :style="{ display: showDown1 ? 'block' : 'none' }">
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/zai.png" /></div>
-                <div class="text1">在线</div>
-                <div class="text2">如何成为一个产品经理</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/complete.png" />
-                </div>
-                <div class="altext">已完成</div>
-              </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/zhi.png" /></div>
-                <div class="text1">直播</div>
-                <div class="text2">管理者播课</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/complete.png" />
-                </div>
-                <div class="altext">已完成</div>
-              </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/mian.png" /></div>
-                <div class="text1">面授</div>
-                <div class="text2">管理面授课</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/notice.png" />
-                </div>
-                <div class="altext">未完成</div>
-              </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/huo.png" /></div>
-                <div class="text1">活动</div>
-                <div class="text2">管理者活动</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/notice.png" />
-                </div>
-                <div class="altext">未完成</div>
-              </div>
-            </div>
-            <div class="rowclass">
-              <div class="leftclass">
-                <div><img src="../../assets/images/leveladd/zuo.png" /></div>
-                <div class="text1">作业</div>
-                <div class="text2">管理者作业</div>
-              </div>
-              <div class="alreadyclass">
-                <div class="alimg">
-                  <img src="../../assets/images/studentimg/notice.png" />
-                </div>
-                <div class="altext">未完成</div>
-              </div>
-            </div>
-          </div>
+              </div>             
+            </a-collapse-panel>
+          </a-collapse>
         </div>
       </div>
       <div class="btnn">
         <button class="btn2" @click="closeDrawer">关闭</button>
       </div>
     </div>
-  </a-drawer>
     <pro-mess v-model:Provisible="Provisible" />
+  </a-drawer>
 </template>
 
 <script>
-import { reactive, toRefs } from "vue";
+import { reactive, toRefs} from "vue";
 import ProMess from "./ProMess.vue";
 export default {
   name: "SeeStu",
@@ -256,6 +152,69 @@ export default {
         Provisible: false,
         showDown: true,
         showDown1: false,
+        stageList: [
+          {
+            text: "阶段1腾飞班阶段1",
+            children: [
+              {
+                course: "在线",
+                name: "如何成为一个产品经理",
+                complete: "已完成",
+              },
+              {
+                course: "直播",
+                name: "管理直播课",
+                complete: "已完成",
+              },
+              {
+                course: "面授",
+                name: "管理面授课",
+                complete: "未完成",
+              },
+              {
+                course: "活动",
+                name: "管理活动",
+                complete: "未完成",
+              },
+              {
+                course: "作业",
+                name: "管理者作业",
+                complete: "未完成",
+              },
+            ],
+          },
+          {
+            text: "阶段2腾飞班阶段2",
+            children: [
+              {
+                course: "考试",
+                name: "如何成为一个产品经理",
+                complete: "已完成",
+              },
+              {
+                course: "案例",
+                name: "如何成为一个产品经理",
+                complete: "已完成",
+              },
+              {
+                course: "外链",
+                name: "如何成为一个产品经理",
+                complete: "已完成",
+              },
+              {
+                course: "讨论",
+                name: "如何成为一个产品经理",
+                complete: "未完成",
+              },
+              {
+                course: "测评",
+                name: "如何成为一个产品经理",
+                complete: "未完成",
+              },
+            ],
+          },
+        ],
+        stageListActive: 0,
     });
     const closeDrawer = () => {
       ctx.emit("update:Seevisible", false);
@@ -286,7 +245,7 @@ export default {
 };
 </script>
 
-<style scoped lang="scss" >
+<style lang="scss" >
 .seestu {
   .ant-drawer-content-wrapper {
     // max-width: 1000px;
@@ -399,24 +358,33 @@ export default {
         // height: 463px;
         margin-right: 37px;
         margin-top: 32px;
-        border: 1px solid rgba(221, 238, 255, 1);
-        border-radius: 6px;
-        .rowtitle {
-          height: 56px;
-          background: rgba(240, 246, 252, 1);
+        //border: 1px solid rgba(221, 238, 255, 1);
+        //border-radius: 6px;
+        .ant-collapse {
+          background-color: #FFFFFF;
+          border: 0;
+        }
+        .ant-collapse-content > .ant-collapse-content-box {
+          padding: 0;
+          border: 0;
+        }
+        .ant-collapse > .ant-collapse-item {
+          border: 1px solid rgba(221, 238, 255, 1);
+          border-radius: 6px;
+          margin-bottom: 15px;
+          border-bottom: 0px;
+        }
+        .ant-collapse-content {
+          border-top: 0;
+        }
+        .ant-collapse-header {
           display: flex;
           align-items: center;
-          .titleimg {
-            width: 20px;
-            height: 20px;
-            margin-left: 23px;
-          }
-          .titletext {
-            color: rgba(51, 51, 51, 1);
-            font-size: 16px;
-            font-weight: 500;
-            margin-left: 16px;
-          }
+          height: 56px;
+          background-color: rgba(240, 246, 252, 1);
+          font-size: 16px;
+          color: rgba(51, 51, 51, 1);
+          font-weight: 500;
         }
         .rowclass {
           height: 81px;
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 149db76c..7e2638a9 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -817,9 +817,10 @@ export default {
       isactive: -1,
       isActive: false,
       projectChecked: null, //项目单选框
+      updateChapterID: null, //修改关卡id
     });
 
-    //新建或编辑关卡
+    //新建关卡
     const editChapter = () => {
        if(!state.value1) return message.warning("请输入关卡名称");
       let obj = {
@@ -845,6 +846,25 @@ export default {
           console.log("创建失败", err);
         });
     }
+
+    //编辑关卡
+    const updateChapter = () => {
+      let obj = {
+        chapterId: state.updateChapterID,
+        name: "",
+        remark:"",
+        routerId: 0,
+      };
+      api
+        .updateChapter(obj)
+        .then((res) => {
+          console.log("修改成功",res);
+          message.success("修改成功");
+        })
+        .catch((err) => {
+          console.log("修改失败",err);
+        })
+    };
     const showDrawer = () => {
       state.visible = true;
     };
@@ -973,7 +993,9 @@ export default {
                   <span style="color:#4EA6FF;margin-right:25px;cursor:pointer">
                     编辑
                   </span>
-                  <span style="color:#4EA6FF;cursor:pointer">删除</span>
+                  <span style="color:#4EA6FF;cursor:pointer" onClick={() => {
+                    updateChapter();
+                  }}>删除</span>
                 </div>
               </div>
             );
@@ -1204,6 +1226,7 @@ export default {
       delete_exit,
       drawertableColumns,
       editChapter,
+      updateChapter,
     };
   },
 };
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 1a5a7ad1..26d1fd84 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -1052,6 +1052,31 @@ export default {
           console.log("删除失败", err);
         });
     };
+    //编辑讨论
+    const editDiscuss = () => {
+      let obj = {
+        createTime: "",
+        createUser: 0,
+        discussExplain: "",
+        discussFlag: "",
+        discussId: 0,
+        discussName: "",
+        discussSettings: "",
+        discussTag: "",
+        projectId: 0,
+        updateTime: "",
+        updateUser: 0
+      };
+      apidiscuss
+        .updateDiscuss(obj)
+        .then((res) => {
+          console.log("更新成功", res);
+          message.success("更新成功");
+        })
+        .catch((err) => {
+          console.log("更新失败", err);
+        });
+    };
     //删除活动
     const deleteActivity = () => {
       let obj = {
@@ -1070,6 +1095,38 @@ export default {
           console.log("删除失败", err);
         });
     };
+    //编辑活动
+    const editActivity = () => {
+      let obj = {
+        activityAddress: "",
+        activityDuration: "",
+        activityEndTime: "",
+        activityExplain: "",
+        activityFlag: "",
+        activityId: 0,
+        activityName: "",
+        activityNotice: "",
+        activityStartTime: "",
+        activityTag: "",
+        afterSignIn: "",
+        beforeSignIn: "",
+        createTime: "",
+        createUser: 0,
+        signOutTime: "",
+        standardSettings: "",
+        updateTime: "",
+        updateUser: 0,
+      };
+      apiactivity
+        .updateActivity(obj)
+        .then((res) => {
+          console.log("更新成功", res);
+          message.success("更新成功");
+        })
+        .catch((err) => {
+          console.log("更新失败", err);
+        });
+    };
     //删除测评测试
     const deleteEvalText = () => {
       let obj = {
@@ -1234,8 +1291,10 @@ export default {
       getTask,
       deleteLiveBroadcast,
       deleteDiscuss,
+      editDiscuss,
       deleteEvalText,
       deleteActivity,
+      editActivity,
       deleteInvistText,
     };
   },