feat:增加学习路径及项目发布的统计,增加组织树

src/App.vue

@@ -18,11 +18,13 @@
 <script>
 import { computed, defineComponent } from "vue";
 import { useRouter, useRoute } from "vue-router";
+import { useStore } from "vuex";
 import NavLeft from "@/components/NavLeft";
 import NavTop from "@/components/NavTop";
 import OpenPages from "@/components/OpenPages";
 import BreadCrumb from "@/components/BreadCrumb";
 import zhCN from "ant-design-vue/es/locale/zh_CN";
+import * as api from "./api/index1";
 export default defineComponent({
   components: {
     NavLeft,
@@ -33,13 +35,28 @@ export default defineComponent({
   setup() {
     const router = useRouter();
     const route = useRoute();
+    const store = useStore();
     // console.log("router", router.getRoutes(), route);
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });
 
     const currentRouteName = computed(() => route.name);
-
+    //获取组织树
+    const orgTree = () => {
+      api
+        .orgtree()
+        .then((res) => {
+          console.log("获取集团组织成功", res);
+          if (res.status === 200) {
+            store.commit("getOrgtreeList", res.data.data);
+          }
+        })
+        .catch((err) => {
+          console.log("获取集团组织失败", err);
+        });
+    };
+    orgTree();
     return {
       routes,
       name: currentRouteName,

src/api/index.js

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-07 17:06:45
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-15 16:43:26
+ * @LastEditTime: 2022-11-20 17:45:37
  * @FilePath: /fe-manage/src/api/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -69,3 +69,5 @@ export const getDiscussDetail=(obj)=>http.post('/discuss/getDiscussDetail',obj)
 
 //获取模版列表
 export const getTemplate = (obj) => http.post('/admin/project/template/list', obj)
+//获取项目统计
+export const getProjectCount = (projectId) => http.get('/admin/project/projectCount', { params: { projectId: projectId } })

src/api/index1.js

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-04 22:45:31
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-18 14:24:33
+ * @LastEditTime: 2022-11-20 15:39:38
  * @FilePath: /fe-manage/src/api/index1.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -53,7 +53,8 @@ export const createLearnPath = (obj) => http.post('/admin/router/edit', obj);
 export const getLearnPath = (obj) => http.post('/admin/router/list', obj);
 //学习路径图的发布、停用、删除
 export const handleLearnPath = (obj) => http.post('/admin/router/handle', obj);
-
+//获取路径图统计数据
+export const getLearnCount = (routerId) => http.get('/admin/router/getCount', { params: { routerId: routerId } })
 //获取关卡
 export const getChapter = (obj) => http.post('/admin/router/detail', { params: obj });
 
@@ -83,6 +84,12 @@ export const scoreRank = (obj) => http.post('/admin/project/scoreRank', obj);
 export const billboard = (obj) => http.post('/admin/project/billboard', obj);
 //项目基础信息-----------------------------------
 
+
+// 获取组织结构树
+export const orgtree = () => http.get('/org/tree');
+
+
+
 // 测试方法
 // import * as api from '../../api/index'
 // api.getLearnPath({}).then(res => {

src/api/method.js

@@ -168,205 +168,7 @@ const commonData={
 
 
 //组织树
-const  organizationalTree= [
+const organizationalTree = []
-	{
-		title: "京东方",
-		value: "京东方",
-		children: [
-			{
-				title: "产研部",
-				value: "产研部",
-				children: [
-					{
-						title: "产品部",
-						value: "产品部",
-					},
-					{
-						title: "研究部",
-						value: "研究部",
-					},
-					{
-						title: "研究部2",
-						value: "研究部2",
-					},
-					{
-						title: "研究3",
-						value: "研究3",
-					},
-					{
-						title: "研究4",
-						value: "研究4",
-					},
-					{
-						title: "研究部5",
-						value: "研究部5",
-					},
-					{
-						title: "研究部6",
-						value: "研究部6",
-					},
-					{
-						title: "研究部7",
-						value: "研究部7",
-					},
-					{
-						title: "研究部8",
-						value: "研究部8",
-					},
-					{
-						title: "研究部9",
-						value: "研究部9",
-					},
-				],
-			},
-			{
-				title: "二级标题",
-				value: "二级标题",
-				children: [
-					{
-						title: "三级标题",
-						value: "三级标题",
-						children: [
-							{
-								title: "四级标题",
-								value: "四级标题",
-								children: [
-									{
-										title: "五级标题",
-										value: "五级标题",
-										children: [
-											{
-												title: "六级标题",
-												value: "六级标题",
-												children: [
-													{
-														title: "七级标题",
-														value: "七级标题",
-														children: [
-															{
-																title: "八级标题",
-																value: "八级标题",
-																children: [
-																	{
-																		title: "九级标题",
-																		value: "九级标题",
-																		children: [
-																			{
-																				title: "十级标题",
-																				value: "十级标题",
-																				children: [
-																					{
-																						title: "十一级标题",
-																						value: "十一级标题",
-																						children: [
-																							{
-																								title: "十二级标题",
-																								value: "十二级标题",
-																								children: [
-																									{
-																										title:
-																											"十三级标题十三级标题十三级标题十三级标题",
-																										value: "十三级标题",
-																										children: [
-																											{
-																												title:
-																													"十四级标题",
-																												value:
-																													"十四级标题",
-																												children: [
-																													{
-																														title:
-																															"十五级标题",
-																														value:
-																															"十五级标题",
-																														children: [
-																															{
-																																title:
-																																	"十六级标题",
-																																value:
-																																	"十六级标题",
-																																children:
-																																	[
-																																		{
-																																			title:
-																																				"十七级标题",
-																																			value:
-																																				"十七级标题",
-																																			children:
-																																				[
-																																					{
-																																						title:
-																																							"十八级标题",
-																																						value:
-																																							"十八级标题",
-																																						children:
-																																							[
-																																								{
-																																									title:
-																																										"十九级标题",
-																																									value:
-																																										"十九级标题",
-																																									children:
-																																										[
-																																											{
-																																												title:
-																																													"二十级标题二十级标题",
-																																												value:
-																																													"二十级标题二十级标题",
-																																											},
-																																										],
-																																								},
-																																							],
-																																					},
-																																				],
-																																		},
-																																	],
-																															},
-																														],
-																													},
-																												],
-																											},
-																										],
-																									},
-																								],
-																							},
-																						],
-																					},
-																				],
-																			},
-																		],
-																	},
-																],
-															},
-														],
-													},
-												],
-											},
-										],
-									},
-								],
-							},
-						],
-					},
-				],
-			},
-			{
-				title: "人力资源部",
-				value: "人力资源部",
-				children: [
-					{
-						title: "人事部",
-						value: "人事部",
-					},
-					{
-						title: "行政部",
-						value: "行政部",
-					},
-				],
-			},
-		],
-	},
-]
 export {
 	toDate,
 	getWeek,

src/components/drawers/UnlockMode.vue

@@ -18,7 +18,7 @@
       <div class="main">
         <div class="classify">
           <div
-            v-for="item, index in classify"
+            v-for="(item, index) in classify"
             :key="index"
             class="classifyItem"
             @click="selectClassify(item)"
@@ -36,25 +36,38 @@
           </div>
         </div>
         <div v-if="selectClassifyType === 1" class="type1">
-  <span style="font-weight: 500">描述：</span><span>不设学习限制，学员可以在任何时间学习</span>
+          <span style="font-weight: 500">描述：</span
+          ><span>不设学习限制，学员可以在任何时间学习</span>
         </div>
         <div v-if="selectClassifyType === 2" class="type1 type2">
-  <div><span style="font-weight: 500">描述：</span><span>辩论、活动、测评、调研、投票按照设置时间</span></div>
+          <div>
+            <span style="font-weight: 500">描述：</span
+            ><span>辩论、活动、测评、调研、投票按照设置时间</span>
+          </div>
           <div class="radio">
             <span>解锁单元：</span>
             <a-radio v-model:checked="checked">逐个任务解锁</a-radio>
           </div>
         </div>
         <div v-if="selectClassifyType === 3" class="type1 type3">
-  <div><span style="font-weight: 500">描述：</span><span>前一个阶段达成目标后解锁下一个阶段</span></div>
+          <div>
+            <span style="font-weight: 500">描述：</span
+            ><span>前一个阶段达成目标后解锁下一个阶段</span>
+          </div>
           <div class="radio" style="display: flex">
             <div style="margin-top: 1px">解锁条件：</div>
             <a-radio-group v-model:value="radioSelect">
-   <div><a-radio :value="1">逐个任务解锁，完成一个任务后解锁下一个</a-radio></div>
+              <div>
-  <div style="margin-top:24px"> <a-radio :value="2">完成当前阶段所有必修任务解锁下一阶段</a-radio></div>
+                <a-radio :value="1"
- 
+                  >逐个任务解锁，完成一个任务后解锁下一个</a-radio
+                >
+              </div>
+              <div style="margin-top: 24px">
+                <a-radio :value="2"
+                  >完成当前阶段所有必修任务解锁下一阶段</a-radio
+                >
+              </div>
             </a-radio-group>
-  
           </div>
         </div>
       </div>
@@ -92,11 +105,14 @@ export default {
           text: "闯关模式",
         },
       ],
-      selectClassifyType: 3,
+      selectClassifyType: 1,
       checked: true,
       radioSelect: 1,
     });
     const closeDrawer = () => {
+      state.selectClassifyType = 1;
+      state.checked = true;
+      state.radioSelect = 1;
       ctx.emit("update:unlockModeVisible", false);
     };
 

src/store/index.js

@@ -1,3 +1,11 @@
+/*
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-11-09 09:26:26
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-11-20 16:06:52
+ * @FilePath: /fe-manage/src/store/index.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import { createStore } from "vuex";
 
 export default createStore({
@@ -14,6 +22,8 @@ export default createStore({
 
     assessmentName: "",
     routerId: null,
+
+    orgtreeList: [],
   },
   getters: {},
   mutations: {
@@ -31,6 +41,9 @@ export default createStore({
       console.log("state.assessmentName");
       console.log(state.assessmentName);
     },
+    getOrgtreeList(state, orgtreeList) {
+      state.orgtreeList = orgtreeList;
+    }
   },
   actions: {},
   modules: {},

src/views/learningpath/LearningPath.vue

@@ -194,7 +194,7 @@
             <img class="im" src="../../assets/px.jpg" /> -->
               <div
                 @click="chooseImg(item)"
-                v-for="item,index in imgData"
+                v-for="(item, index) in imgData"
                 :key="item.key"
                 class="learnBgItem"
                 :style="{
@@ -203,10 +203,14 @@
                       ? '2px solid rgba(78, 166, 255, 1)'
                       : '1px solid #C7CBD2',
                   'background-image': 'url(' + item.source + ')',
-                   display:index>=5?'none':'flex'
+                  display: index >= 5 ? 'none' : 'flex',
                 }"
               ></div>
-              <div @click="showLearnBgMore" v-if="imgData.length > 5" class="learnBgItem learnBgMore">
+              <div
+                @click="showLearnBgMore"
+                v-if="imgData.length > 5"
+                class="learnBgItem learnBgMore"
+              >
                 查看更多 <img src="../../assets/images/projectadd/go.png" />
               </div>
             </div>
@@ -322,12 +326,16 @@
                       ? '2px solid rgba(78, 166, 255, 1)'
                       : '1px solid #ccc',
                   'background-image': 'url(' + item.source + ')',
-                  display:index>=5?'none':'flex'
+                  display: index >= 5 ? 'none' : 'flex',
                 }"
               >
                 <!-- <img class="im" :src="item.source" /> -->
               </div>
-               <div @click="showLearnBgMore" v-if="imgData.length > 5" class="learnBgItem learnBgMore">
+              <div
+                @click="showLearnBgMore"
+                v-if="imgData.length > 5"
+                class="learnBgItem learnBgMore"
+              >
                 查看更多 <img src="../../assets/images/projectadd/go.png" />
               </div>
             </div>
@@ -392,7 +400,9 @@
         <div class="projectbox">
           <div class="promessage">
             <div class="messageme">路径信息</div>
-            <div class="messagege">当前路径共0个关卡，0个任务</div>
+            <div class="messagege">
+              当前路径共{{ routeChapters }}个关卡，{{ routeTasks }}个任务
+            </div>
           </div>
           <div class="stumessage">
             <div class="messageme1">学员信息</div>
@@ -618,8 +628,6 @@
           >
             <!-- <img class="im" :src="item.source" /> -->
           </div>
-
-          
         </div>
         <div class="btn">
           <button class="samtn btn1" @click="closeLearnBgMore">取消</button>
@@ -695,7 +703,8 @@ export default {
         {
           id: 7,
           source: require("../../assets/images/leveladd/2.png"),
-        }, {
+        },
+        {
           id: 5,
           source: require("../../assets/images/leveladd/3.png"),
         },
@@ -706,7 +715,8 @@ export default {
         {
           id: 7,
           source: require("../../assets/images/leveladd/2.png"),
-        }, {
+        },
+        {
           id: 5,
           source: require("../../assets/images/leveladd/3.png"),
         },
@@ -717,7 +727,8 @@ export default {
         {
           id: 7,
           source: require("../../assets/images/leveladd/2.png"),
-        }, {
+        },
+        {
           id: 5,
           source: require("../../assets/images/leveladd/3.png"),
         },
@@ -728,7 +739,8 @@ export default {
         {
           id: 7,
           source: require("../../assets/images/leveladd/2.png"),
-        }, {
+        },
+        {
           id: 5,
           source: require("../../assets/images/leveladd/3.png"),
         },
@@ -739,7 +751,8 @@ export default {
         {
           id: 7,
           source: require("../../assets/images/leveladd/2.png"),
-        }, {
+        },
+        {
           id: 5,
           source: require("../../assets/images/leveladd/3.png"),
         },
@@ -836,7 +849,9 @@ export default {
       endTime: null, //结束时间
       //发布---------------
       releasePathId: null, //发布路径id
-      routeStudentsNum: 0,
+      routeStudentsNum: 0, //学员总数
+      routeChapters: 0, //关卡总数
+      routeTasks: 0, //任务总数
       recallPathId: null, //撤回路径id
       stopPathId: null, //停用路径id
       copyPathId: null, //复制路径iid
@@ -881,32 +896,19 @@ export default {
     const showPub = (routerId) => {
       state.pub = true;
       state.releasePathId = routerId;
-      //获取学员总数
-      let obj = {
-        pageNo: 0,
-        pageSize: 0,
-        routerId: routerId,
-      };
       api
-        .getStudent(obj)
+        .getLearnCount(routerId)
         .then((res) => {
           if (res.status === 200) {
-            // console.log("res", res.data.data);
+            // console.log("获取关卡、任务、学员统计数据", res.data);
-            state.routeStudentsNum = res.data.data.total;
+            state.routeStudentsNum = res.data.students;
+            state.routeChapters = res.data.chapters;
+            state.routeTasks = res.data.tasks;
           }
         })
         .catch((err) => {
           console.log("err", err);
         });
-      //获取学习路径详细信息
-      api
-        .getRouterDetail(routerId)
-        .then((res) => {
-          console.log("学习路径详情", res);
-        })
-        .catch((err) => {
-          console.log("学习路径详情获取错误", err);
-        });
     };
     //确定发布
     const releaseLearnPath = () => {
@@ -1641,6 +1643,7 @@ export default {
       // console.log("执行");
       getLearnPath();
     });
+
     return {
       ...toRefs(state),
       selectProjectName,
@@ -1948,7 +1951,6 @@ export default {
               margin-bottom: 20px;
               margin-right: 10px;
             }
-
           }
           .btn {
             width: 100%;

src/views/learningpath/LevelAddDetail.vue

@@ -186,13 +186,20 @@
                 <span>学习模式：</span>
                 <div class="inputbox">
                   <input type="text" placeholder="按学习时间解锁" />
-                <div class="bottonbox"><div class="btnText">切换模式</div></div>
+                  <div class="bottonbox" @click="showModeVisible">
+                    <div class="btnText">切换模式</div>
                   </div>
                 </div>
+                <!-- 切换模式抽屉 -->
+                <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
+              </div>
               <div class="line"></div>
               <router-link to="/leveladd">
                 <div style="display: flex">
-                <img class="img2" src="../../assets/images/leveladd/back.png" />
+                  <img
+                    class="img2"
+                    src="../../assets/images/leveladd/back.png"
+                  />
                   <div class="return">返回</div>
                 </div>
               </router-link>
@@ -482,7 +489,9 @@
                 </div>
                 <div class="btn btn2">
                   <div class="imgIcon"></div>
-                <div class="btnText" @click="showDeleteALLModal">批量删除</div>
+                  <div class="btnText" @click="showDeleteALLModal">
+                    批量删除
+                  </div>
                 </div>
               </div>
             </div>
@@ -535,7 +544,9 @@
                 <div style="width: 120px; text-align: center">任务名称</div>
                 <div style="width: 120px; text-align: center">必修/选修</div>
                 <div style="width: 87px; text-align: center">时长</div>
-              <div style="width: 120px; text-align: center; margin-right: 20px">
+                <div
+                  style="width: 120px; text-align: center; margin-right: 20px"
+                >
                   操作
                 </div>
               </div>
@@ -625,7 +636,11 @@
                       {{ element.cretime }}分钟
                     </div>
                     <div
-                    style="width: 120px; text-align: center; margin-right: 20px"
+                      style="
+                        width: 120px;
+                        text-align: center;
+                        margin-right: 20px;
+                      "
                     >
                       <div class="opa">
                         <div class="opacation">
@@ -659,7 +674,10 @@
               </draggable>
             </div>
             <!-- 无数据样式 -->
-          <div class="notable" :style="{ display: stm_hs ? 'block' : 'none' }">
+            <div
+              class="notable"
+              :style="{ display: stm_hs ? 'block' : 'none' }"
+            >
               <div class="notablebox">
                 <div class="boxbody">
                   <div class="boximg"></div>
@@ -732,13 +750,20 @@
                 <span>学习模式：</span>
                 <div class="inputbox">
                   <input type="text" placeholder="按学习时间解锁" />
-                <div class="bottonbox"><div class="btnText">切换模式</div></div>
+                  <div class="bottonbox" @click="showModeVisible">
+                    <div class="btnText">切换模式</div>
                   </div>
                 </div>
+                <!-- 切换模式抽屉 -->
+                <unlock-mode v-model:unlockModeVisible="unlockModeVisible" />
+              </div>
               <div class="line"></div>
               <router-link to="/leveladd">
                 <div style="display: flex">
-                <img class="img2" src="../../assets/images/leveladd/back.png" />
+                  <img
+                    class="img2"
+                    src="../../assets/images/leveladd/back.png"
+                  />
                   <div class="return">返回</div>
                 </div>
               </router-link>
@@ -810,7 +835,9 @@
                           >
                         </div>
                         <div class="boxtitle2">
-                        <span style="color: #878b92">请添加学员或导入学员</span>
+                          <span style="color: #878b92"
+                            >请添加学员或导入学员</span
+                          >
                         </div>
                       </div>
                       <div class="smallleft"></div>
@@ -837,10 +864,6 @@
       </div>
     </div>
 
-
-
-
-
     <div class="footbtn">
       <div class="btnbox">
         <div class="btn btn2">
@@ -969,8 +992,8 @@
             </div>
           </div>
         </div>
-      </div></a-modal
+      </div>
-    >
+    </a-modal>
 
     <!-- 是否删除关卡弹窗 -->
     <a-modal
@@ -1030,6 +1053,7 @@ import * as apiProj from "../../api/index.js";
 import { RouterEditTask } from "@/api/indexTask";
 import dayjs from "dayjs";
 import { toDate } from "../../api/method";
+import UnlockMode from "../../components/drawers/UnlockMode.vue";
 export default {
   name: "LevelAddDetail",
   components: {
@@ -1047,6 +1071,7 @@ export default {
     AddLive,
     AddRef,
     draggable,
+    UnlockMode,
   },
   setup() {
     const state = reactive({
@@ -1311,6 +1336,8 @@ export default {
       updateChapterID: null, //编辑关卡id
       deleteChapterModal: false, //删除关卡弹窗
       deleteChapterId: null, //删除关卡id
+
+      unlockModeVisible: false, //切换模式抽屉
     });
 
     const showModal = (element) => {
@@ -1337,7 +1364,7 @@ export default {
           name: state.value1,
           remark: state.value2,
           routerId: state.routerId,
-        chapterId:state.updateChapterID
+          chapterId: state.updateChapterID,
         };
         api
           .updateChapter(obj)
@@ -1381,14 +1408,14 @@ export default {
     };
     //打开删除关卡弹窗
     const showDeleteChapter = (id) => {
-state.deleteChapterId=id
+      state.deleteChapterId = id;
- state.deleteChapterModal=true
+      state.deleteChapterModal = true;
-}
+    };
     //关闭删除关卡弹窗
     const closeDeleteChapter = () => {
-  state.deleteChapterId=null
+      state.deleteChapterId = null;
-  state.deleteChapterModal=false
+      state.deleteChapterModal = false;
-}
+    };
     //删除关卡
     const deleteChapter = () => {
       console.log("chapterId", state.deleteChapterId);
@@ -1399,8 +1426,8 @@ const closeDeleteChapter=()=>{
         .deleteChapter(obj)
         .then((res) => {
           console.log("删除关卡成功", res);
-          message.success('删除关卡成功')
+          message.success("删除关卡成功");
-          closeDeleteChapter()
+          closeDeleteChapter();
           getDetail();
         })
         .catch((err) => {
@@ -1553,7 +1580,6 @@ const closeDeleteChapter=()=>{
       state.visible = false;
     };
 
-  
     const afterVisibleChange = (bool) => {
       console.log("visible", bool);
     };
@@ -2007,14 +2033,14 @@ const closeDeleteChapter=()=>{
     const getAllProjText = () => {
       apiProj
         .getProjectList({
-          "beginTime": 0,
+          beginTime: 0,
-          "createName": "",
+          createName: "",
-          "endTime": 0,
+          endTime: 0,
-          "manager": "",
+          manager: "",
-          "name": "",
+          name: "",
-          "pageNo": 0,
+          pageNo: 0,
-          "pageSize": 0,
+          pageSize: 0,
-          "status": 0
+          status: 0,
         })
         .then((res) => {
           let arr = res.data.data.rows;
@@ -2025,7 +2051,7 @@ const closeDeleteChapter=()=>{
         })
         .catch((err) => {
           console.log("获取全部项目信息接口失败", err);
-          console.log('+++++++++++++++++++++++++++++++++++++++++++++++');
+          console.log("+++++++++++++++++++++++++++++++++++++++++++++++");
           // state.createLoading = false;
         });
     };
@@ -2049,6 +2075,11 @@ const closeDeleteChapter=()=>{
           console.log(err, 1111);
         });
     };
+
+    //显示切换模式抽屉
+    const showModeVisible = () => {
+      state.unlockModeVisible = true;
+    };
     onMounted(() => {
       // createCase();
       getAllProjText();
@@ -2106,10 +2137,11 @@ const closeDeleteChapter=()=>{
       getAllProjText,
       updateTask,
 
-
       showDeleteChapter,
       closeDeleteChapter,
       deleteChapter,
+
+      showModeVisible,
     };
   },
 };

src/views/projectcenter/ProjectAdd.vue

@@ -169,7 +169,34 @@
           </div>
 
           <div class="in select">
-            <a-select
+            <a-tree-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="classifySelect2"
+              style="width: 100%"
+              :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+              placeholder="自动带出 可修改"
+              allow-clear
+              tree-default-expand-all
+              :tree-data="classifyList2"
+              :fieldNames="{
+                children: 'children',
+                label: 'name',
+                value: 'id',
+              }"
+              :disabled="viewDetail ? true : false"
+              @change="classificationChange2"
+              dropdownClassName="treeDropdown"
+            >
+              <!-- <template #title="{ value: val, title }">
+      <b v-if="val === 'parent 1-1'" style="color: #08c">sss</b>
+      <template v-else>{{ title }}</template>
+    </template> -->
+            </a-tree-select>
+            <!-- <a-select
               :getPopupContainer="
                 (triggerNode) => {
                   return triggerNode.parentNode || document.body;
@@ -179,8 +206,9 @@
               placeholder="自动带出 可修改"
               :options="classifyList2"
               @change="classificationChange2"
+              :field-names="{ label: 'name', value: 'id', options: 'children' }"
               :disabled="viewDetail ? true : false"
-            />
+            /> -->
           </div>
         </div>
         <div class="name name2">
@@ -359,22 +387,24 @@
   </div>
 </template>
 <script>
-import { reactive, toRefs, ref, onUnmounted } from "vue";
+import { reactive, toRefs, ref, onUnmounted, computed } from "vue";
 import { message } from "ant-design-vue";
 import { useRouter, useRoute } from "vue-router";
 import dayjs from "dayjs";
 import * as api from "../../api/index";
+// import * as api1 from "../../api/index1";
 import { storage } from "../../api/storage";
 import { toDate } from "../../api/method";
-
+import { useStore } from "vuex";
 export default {
   name: "projectAdd",
   setup() {
+    const store = useStore();
     // 编辑页面跳转过来时候，自动填充表格
     const routers = useRoute();
     const isEdit = ref(false);
     let peojectID = "";
-
+    console.log("store.state.orgtreeList", store.state.orgtreeList);
     if (routers.query.projectId) {
       storage.set("projectAddId", routers.query.projectId);
       isEdit.value = true;
@@ -515,7 +545,7 @@ export default {
       valueE1: null,
       valueE2: null,
       classifySelect1: [],
-      classifySelect2: [],
+      classifySelect2: null,
       classifySelect3: [],
       classifySelect4: [],
       rangevalue: [],
@@ -690,11 +720,25 @@ export default {
     };
 
     // 资源归属 sourceBelongId 后续给接口
-    const classifyList2 = ref([
+    const classifyList2 = computed(() => {
-      { value: 1, label: "项目一" },
+      return store.state.orgtreeList ? store.state.orgtreeList : ref(null);
-      { value: 2, label: "项目二" },
+    });
-      { value: 3, label: "项目三" },
+
-    ]);
+    // //获取资源归属
+    // const orgTree = () => {
+    //   api1
+    //     .orgtree()
+    //     .then((res) => {
+    //       console.log("获取集团组织成功", res);
+    //       if (res.status === 200) {
+    //         classifyList2.value = res.data.data;
+    //       }
+    //     })
+    //     .catch((err) => {
+    //       console.log("获取集团组织失败", err);
+    //     });
+    // };
+    // orgTree();
 
     let sourceBelongIdC = "";
     const classificationChange2 = (key) => {
@@ -1357,4 +1401,18 @@ export default {
     }
   }
 }
+.treeDropdown {
+  // width: 240px !important;
+  // border-radius: 5px;
+  // min-height: 600px !important;
+  .ant-select-tree-list-scrollbar {
+    width: 5px !important;
+    .ant-select-tree-list-scrollbar-thumb {
+      background-color: #4ea6ff !important;
+    }
+  }
+  .ant-select-tree-indent-unit {
+    width: 7px !important;
+  }
+}
 </style>

src/views/projectcenter/ProjectManage.vue

@@ -968,7 +968,9 @@
         <div class="projectbox">
           <div class="promessage">
             <div class="messageme">项目信息</div>
-            <div class="messagege">当前项目共0个阶段，0个任务</div>
+            <div class="messagege">
+              当前项目共{{ projectStages }}个阶段，{{ projectTasks }}个任务
+            </div>
           </div>
           <div class="stumessage">
             <div class="messageme1">学员信息</div>
@@ -1041,7 +1043,9 @@
             <div class="close_exit" @click="closeReminderModal"></div>
           </div>
           <div class="body">
-            <div style="margin-left:60px;margin-right:60px">请您根据自身需求选择对应项目类别，多层项目与单层项目操作不同，层级不同</div>
+            <div style="margin-left: 60px; margin-right: 60px">
+              请您根据自身需求选择对应项目类别，多层项目与单层项目操作不同，层级不同
+            </div>
           </div>
           <div class="del_btnbox">
             <div class="del_btn btn2" @click="okReminderModal">
@@ -1052,7 +1056,6 @@
       </div>
     </a-modal>
 
-
     <!-- 归属权抽屉 -->
     <proj-owner-ship v-model:ProjOwnervisible="ProjOwnervisible" />
     <!-- 授权名单抽屉 -->
@@ -1061,9 +1064,6 @@
     <proj-check-ship v-model:ProjCheckvisible="ProjCheckvisible" />
     <!-- 管理权抽屉 -->
     <proj-manage-ship v-model:ProjManagevisible="ProjManagevisible" />
-
-
-
   </div>
 </template>
 <script>
@@ -1118,7 +1118,9 @@ export default {
       tableDataTotal: -1, //学习路径列表总数
       pageSize: 10, //每页10条数据
 
-      projectStudentsNum: 0, //发布弹窗-学员人数
+      projectStudentsNum: 0, //发布弹窗-学员人
+      projectStages: 0,
+      projectTasks: 0,
       releaseProjectId: null, //发布的项目id
       releaseProjectName: null, //发布的项目名称
       releaseProjectTime: null, //发布的项目时间
@@ -1800,26 +1802,39 @@ export default {
       state.releaseProjectName = object.name;
       state.releaseProjectTime = object.time;
       console.log("object", object);
-      //获取学员总数
-      let obj = {
-        pageNo: 0,
-        pageSize: 0,
-        projectId: object.projectId,
-      };
       api
-        .projectStudent(obj)
+        .getProjectCount(object.projectId)
         .then((res) => {
           if (res.status === 200) {
-            // console.log("res", res.data);
+            console.log("获取关卡、任务、学员统计数据", res.data);
-            state.projectStudentsNum = res.data.data.total
+            state.projectStudentsNum = res.data.students;
-              ? res.data.data.total
+            state.projectStages = res.data.stages;
-              : 0;
+            state.projectTasks = res.data.tasks;
           }
         })
         .catch((err) => {
-          console.log("获取学员人数失败", err);
+          console.log("err", err);
         });
-      //获取阶段及任务总数
+      // //获取学员总数
+      // let obj = {
+      //   pageNo: 0,
+      //   pageSize: 0,
+      //   projectId: object.projectId,
+      // };
+      // api
+      //   .projectStudent(obj)
+      //   .then((res) => {
+      //     if (res.status === 200) {
+      //       // console.log("res", res.data);
+      //       state.projectStudentsNum = res.data.data.total
+      //         ? res.data.data.total
+      //         : 0;
+      //     }
+      //   })
+      //   .catch((err) => {
+      //     console.log("获取学员人数失败", err);
+      //   });
+      // //获取阶段及任务总数
     };
     //确认发布项目
     const releaseProject = () => {
@@ -3071,8 +3086,7 @@ export default {
     };
 
     const showModal1 = () => {
-     
+      state.reminderModal = true;
-     state.reminderModal=true
     };
     const closeModal1 = () => {
       state.estabish = false;
@@ -3102,13 +3116,12 @@ export default {
     };
 
     const closeReminderModal = () => {
-  state.reminderModal=false
+      state.reminderModal = false;
-   
+    };
-}
     const okReminderModal = () => {
-  state.reminderModal=false
+      state.reminderModal = false;
       state.estabish = true;
-}
+    };
     return {
       ...toRefs(state),
       selectProjectName,

src/views/projectcenter/TaskAdd.vue

@@ -992,7 +992,6 @@
       </div></a-modal
     >
 
-
     <!-- 是否删除阶段弹窗 -->
     <a-modal
       v-model:visible="deleteStageModal"
@@ -1023,9 +1022,6 @@
         </div>
       </div>
     </a-modal>
-
-
-   
   </div>
 </template>
 
@@ -1050,7 +1046,7 @@ import * as apistage from "../../api/indexStage";
 import * as apimove from "../../api/indexMovetask";
 import draggable from "vuedraggable";
 import { storage } from "../../api/storage";
-import UnlockMode from '../../components/drawers/UnlockMode.vue'
+import UnlockMode from "../../components/drawers/UnlockMode.vue";
 const drawercolumns = [
   {
     title: "项目名称",
@@ -1728,7 +1724,7 @@ unlockModeVisible:false,//切换模式抽屉
             console.log("修改阶段成功", res);
             state.valuesname = "";
             state.valuesnotice = "";
-           closeModal()
+            closeModal();
             state.updateStageID = null;
             message.destroy();
             message.success("修改阶段成功");
@@ -1747,9 +1743,9 @@ unlockModeVisible:false,//切换模式抽屉
           .editStage(obj)
           .then((res) => {
             console.log("添加阶段成功", res);
-            state.valuesname = ""
+            state.valuesname = "";
-              state.valuesnotice = ""
+            state.valuesnotice = "";
-             closeModal()
+            closeModal();
             message.destroy();
             message.success("添加阶段成功");
             getTask();
@@ -1760,18 +1756,16 @@ unlockModeVisible:false,//切换模式抽屉
       }
     };
 
-
     //打开删除阶段弹窗
     const showDeleteStage = (id) => {
-
+      state.deleteStageId = id;
-state.deleteStageId=id
+      state.deleteStageModal = true;
- state.deleteStageModal=true
+    };
-}
     //关闭删除阶段弹窗
     const closeDeleteStage = () => {
-  state.deleteStageId=null
+      state.deleteStageId = null;
-  state.deleteStageModal=false
+      state.deleteStageModal = false;
-}
+    };
     //删除阶段
     const deleteStage = () => {
       console.log("chapterId", state.deleteStageId);
@@ -1782,8 +1776,8 @@ const closeDeleteStage=()=>{
         .deleteStage(obj)
         .then((res) => {
           console.log("删除阶段成功", res);
-          message.success('删除阶段成功')
+          message.success("删除阶段成功");
-          closeDeleteStage()
+          closeDeleteStage();
           getTask();
         })
         .catch((err) => {
@@ -2033,8 +2027,8 @@ const closeDeleteStage=()=>{
 
     //显示切换模式抽屉
     const showModeVisible = () => {
-state.unlockModeVisible=true
+      state.unlockModeVisible = true;
-    }
+    };
     return {
       ...toRefs(state),
       selectProjectName,

src/views/system/SystemManage.vue

@@ -77,7 +77,7 @@
         </div>
       </template>
     </draggable>
-    <div id="qrcode" style="display:flex;flex-direction: column;">
+    <div id="qrcode" style="display: flex; flex-direction: column">
       <div>下载二维码</div>
       <qrcode-vue
         :value="qrcodeUrl"
@@ -91,10 +91,29 @@
   </div>
 
   <div @click="changeCodevisible">显示二维码弹窗</div>
-  <two-dimensional-code v-model:codevisible="codevisible" :codeInfo="codeInfo" index="0" type="课程二维码"/>
+  <two-dimensional-code
+    v-model:codevisible="codevisible"
+    :codeInfo="codeInfo"
+    index="0"
+    type="课程二维码"
+  />
 
   <div @click="changeCodevisible2">显示二维码弹窗22</div>
-  <two-dimensional-code v-model:codevisible="codevisible2" :codeInfo="codeInfo2" index="1" type="签到二维码"/>
+  <two-dimensional-code
+    v-model:codevisible="codevisible2"
+    :codeInfo="codeInfo2"
+    index="1"
+    type="签到二维码"
+  />
+
+  <a-table
+    :columns="columns"
+    :data-source="data"
+    :row-selection="{
+      selectedRowKeys: selectedRowKeys,
+      onChange: onSelectChange,
+    }"
+  />
 </template>
 <script>
 import { reactive, toRefs } from "vue";
@@ -112,7 +131,7 @@ import draggable from "vuedraggable";
 import QrcodeVue from "qrcode.vue";
 import html2canvas from "html2canvas";
 
-import TwoDimensionalCode from '../../components/TwoDimensionalCode.vue'
+import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
 export default {
   name: "SystemManage",
   components: {
@@ -121,8 +140,9 @@ export default {
     // PlusOutlined,
     draggable,
     QrcodeVue,
-    TwoDimensionalCode
+    TwoDimensionalCode,
   },
+
   setup() {
     const state = reactive({
       visible: false,
@@ -164,7 +184,72 @@ export default {
       codevisible: false,
       codeInfo: {},
       codevisible2: false,
-      codeInfo2:{}
+      codeInfo2: {},
+
+      columns: [
+        {
+          title: "Name",
+          dataIndex: "name",
+          key: "name",
+        },
+        {
+          title: "Age",
+          dataIndex: "age",
+          key: "age",
+          width: "12%",
+        },
+        {
+          title: "Address",
+          dataIndex: "address",
+          width: "30%",
+          key: "address",
+        },
+      ],
+      data: [
+        {
+          key: 1,
+          name: "John Brown sr.",
+          age: 60,
+          address: "New York No. 1 Lake Park",
+        },
+        {
+          key: 2,
+          name: "Joe Black",
+          age: 32,
+          address: "Sidney No. 1 Lake Park",
+        },
+        {
+          key: 3,
+          name: "Joe Black",
+          age: 32,
+          address: "Sidney No. 1 Lake Park",
+        },
+        {
+          key: 4,
+          name: "Joe Black",
+          age: 32,
+          address: "Sidney No. 1 Lake Park",
+        },
+        {
+          key: 5,
+          name: "Joe Black",
+          age: 32,
+          address: "Sidney No. 1 Lake Park",
+        },
+        {
+          key: 6,
+          name: "Joe Black",
+          age: 32,
+          address: "Sidney No. 1 Lake Park",
+        },
+        {
+          key: 7,
+          name: "Joe Black",
+          age: 32,
+          address: "Sidney No. 1 Lake Park",
+        },
+      ],
+      selectedRowKeys: [],
     });
 
     const showDrawer = () => {
@@ -248,12 +333,12 @@ export default {
     //下载二维码图片
     const downloadQr = (num) => {
       console.log("num", num);
-      state.qrcodeSize=num
+      state.qrcodeSize = num;
       let filename = `${new Date().getTime()}.png`;
- let canvas=document.getElementsByTagName('canvas')[0]
+      let canvas = document.getElementsByTagName("canvas")[0];
-        let imageUrl = canvas.toDataURL("image/png")
+      let imageUrl = canvas.toDataURL("image/png");
 
-let canvasBox = document.createElement('canvas');
+      let canvasBox = document.createElement("canvas");
       let ctx = canvasBox.getContext("2d");
       var img = new Image();
       // 需要添加文字的图片
@@ -261,25 +346,24 @@ let canvasBox = document.createElement('canvas');
       // 等待图片加载完成
       img.onload = function () {
         // 将图片添加到canvas
-		    ctx.drawImage(img, 0, 0, 1240, 2208)
+        ctx.drawImage(img, 0, 0, 1240, 2208);
         // 设置字体
-			ctx.font = "73px 微软雅黑 bolder"
+        ctx.font = "73px 微软雅黑 bolder";
         // 设置字体颜色
-			ctx.fillStyle = "#955f17"
+        ctx.fillStyle = "#955f17";
-			ctx.textAlign = "center"
+        ctx.textAlign = "center";
         // 添加文字和位置
         ctx.fillText("微信名", 621, 1050);
 
         // 导出为图片
-			let url = canvasBox.toDataURL("image/png")
+        let url = canvasBox.toDataURL("image/png");
         let a = document.createElement("a");
         a.style.display = "none";
         a.download = filename;
         a.href = url;
         document.body.appendChild(a);
         a.click();
-    }
+      };
-
 
       // let a = document.createElement("a");
       // a.style.display = "none";
@@ -288,7 +372,6 @@ let canvasBox = document.createElement('canvas');
       // document.body.appendChild(a);
       // a.click();
 
-
       html2canvas(document.querySelector("#qrcode"), {
         useCORS: true, //支持图片跨域
       }).then((canvas) => {
@@ -300,7 +383,7 @@ let canvasBox = document.createElement('canvas');
         //                 let filename = `${new Date().getTime()}.png`;
         //                 var imageUrl = extra_canvas.toDataURL("image/png",1.0);
 
-        console.log('canvas',canvas, canvas.width,canvas.style.width)
+        console.log("canvas", canvas, canvas.width, canvas.style.width);
 
         // //   let ctx = canvas.getContext('2d');
         // //           ctx.drawImage(canvas,0,0,canvas.width, canvas.height);
@@ -321,21 +404,30 @@ let canvasBox = document.createElement('canvas');
 
     //显示二维码弹窗
     const changeCodevisible = () => {
-      state.codevisible=true
+      state.codevisible = true;
       state.codeInfo = {
         title: "签到二维码",
-        name:'管理者进阶面授课程',
+        name: "管理者进阶面授课程",
         url: "https://www.baidu.com/",
-      }
+      };
-    }
+    };
     const changeCodevisible2 = () => {
-      state.codevisible2=true
+      state.codevisible2 = true;
       state.codeInfo2 = {
         title: "签到二维码2222",
-        name:'管理者进阶面授课程2222',
+        name: "管理者进阶面授课程2222",
         url: "https://blog.csdn.net/qq_44034384/article/details/93612152",
+      };
+    };
+
+    const onSelectChange = (selectedRowKeys) => {
+      console.log("selectedRowKeys changed: ", selectedRowKeys);
+
+      if (selectedRowKeys.length > 2) {
+        return;
       }
-    }
+      state.selectedRowKeys = selectedRowKeys;
+    };
     return {
       ...toRefs(state),
       showDrawer,
@@ -346,6 +438,8 @@ let canvasBox = document.createElement('canvas');
       downloadQr,
       changeCodevisible,
       changeCodevisible2,
+
+      onSelectChange,
     };
   },
 };