合并

src/api/index1.js

@@ -72,7 +72,8 @@ export const getRouterDetail = (routerId) => http.get('/admin/router/detail', {
 export const addStudent = (obj) => http.post('/admin/router/addStudent', obj);
 //删除学员
 export const delStudent = (obj) => http.post('/admin/router/deleteStudent', obj);
-
+// 获取学员路径图进度明细
+export const stuProgress = (obj) => http.post('/admin/router/studentProcess', obj);
 
 
 //项目基础信息-----------------------------------

src/api/indexProjStu.js

@@ -22,4 +22,7 @@ export const studentProcess = (obj) => http.get('/admin/project/studentProcess',
 export const topStudent = (obj) => http.post('/admin/project/topStudent', obj)
 
 //项目概览
-export const overview = (obj) => http.get('/admin/project/overview', { params: obj })
+export const overview = (obj) => http.get('/admin/project/overview', { params: obj })
+
+//设置项目积分规则
+export const setScoreRule = (obj) => http.post('/admin/project/setScoreRule', obj)

src/api/indexTaskadd.js

@@ -15,3 +15,6 @@ export const deleteTask = (obj) => http.delete('/admin/project/deleteTask', { pa
 
 //新建或编辑项目
 export const editProj = (obj) => http.post('/admin/project/edit', obj)
+
+//路径图里的新建或编辑关卡任务
+export const editTask = (obj) => http.post('/admin/router/editTask', obj)

src/components/TwoDimensionalCode.vue

@@ -0,0 +1,270 @@
+<template>
+  <div class="twoDimensionalCode">
+    <!--二维码页面 -->
+    <a-modal
+      :visible="codevisible"
+      :footer="null"
+      :closable="closableQR"
+      wrapClassName="codeModal"
+      style="margin-top: 400px"
+      :zIndex="9999"
+      @cancel="qr_exit"
+    >
+      <div id="qrcode" class="QR">
+        <div class="qr_header"></div>
+        <div class="qr_main">
+          <div class="qrm_header">
+            <span style="title">{{codeInfo.title?codeInfo.title:''}}</span>
+            <div class="close_exit" @click="closeCodeModal"></div>
+          </div>
+          <div class="qrm_body">
+            <div class="codename">{{codeInfo.name?codeInfo.name:''}}</div>
+            <qrcode-vue
+              :value="codeInfo.url?codeInfo.url:''"
+              :size="qrcodeSize"
+              style="width: 200px; height: 200px"
+            ></qrcode-vue>
+          </div>
+
+          <div class="qrm_footer">
+            <span style="margin-left: 52px">下载二维码</span>
+            <div class="qrmbtn" @click="downloadQr(200)">
+              <div class="btntext">200*200</div>
+            </div>
+            <div class="qrmbtn" @click="downloadQr(200)">
+              <div class="btntext">400*400</div>
+            </div>
+            <div class="qrmbtn" @click="downloadQr(200)">
+              <div class="btntext">800*800</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
+    <!--二维码页面 -->
+  </div>
+</template>
+<script>
+import { reactive, toRefs, watch } from "vue";
+import QrcodeVue from "qrcode.vue";
+// import html2canvas from "html2canvas";
+export default {
+  name: "TwoDimensionalCode",
+  components: {
+    QrcodeVue,
+  },
+  props: {
+    codevisible: {
+      type: Boolean,
+      default: false,
+    },
+    codeInfo: {
+      type: Object,
+      default: function () {
+        return {};
+      },
+    },
+     index: {
+      type: String,
+      default: "",
+    },
+  },
+  setup(props, ctx) {
+    const state = reactive({
+      qrcodeUrl: "https://www.baidu.com/",
+      qrcodeSize: 800,
+      codeInfo: {},
+    });
+
+    //下载二维码图片
+    const downloadQr = (num) => {
+      state.qrcodeSize = num;
+      // let filename = `${new Date().getTime()}.png`;
+      // let canvas = document.getElementsByTagName("canvas")[0];
+      // let imageUrl = canvas.toDataURL("image/png");
+
+      // let canvasBox = document.createElement("canvas");
+      // let ctx = canvasBox.getContext("2d");
+      // var img = new Image();
+      // // 需要添加文字的图片
+      // img.src = imageUrl;
+      // // 等待图片加载完成
+      // img.onload = function () {
+      //   // 将图片添加到canvas
+      //   ctx.drawImage(img, 0, 0, 1240, 2208);
+      //   // 设置字体
+      //   ctx.font = "73px 微软雅黑 bolder";
+      //   // 设置字体颜色
+      //   ctx.fillStyle = "#955f17";
+      //   ctx.textAlign = "center";
+      //   // 添加文字和位置
+      //   ctx.fillText("微信名", 621, 1050);
+
+      //   // 导出为图片
+      //   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";
+      // // a.download = filename;
+      // // a.href = imageUrl;
+      // // document.body.appendChild(a);
+      // // a.click();
+
+      // html2canvas(document.querySelector("#qrcode"), {
+      //   useCORS: true, //支持图片跨域
+      // }).then((canvas) => {
+      //   // var extra_canvas = document.createElement("canvas");
+      //   //                 extra_canvas.setAttribute('width',num);
+      //   //                 extra_canvas.setAttribute('height',num);
+      //   //                 var ctx = extra_canvas.getContext('2d');
+      //   //                 ctx.drawImage(canvas,0,0,num,num);
+      //   //                 let filename = `${new Date().getTime()}.png`;
+      //   //                 var imageUrl = extra_canvas.toDataURL("image/png",1.0);
+
+      //   console.log("canvas", canvas, canvas.width, canvas.style.width);
+
+      //   // //   let ctx = canvas.getContext('2d');
+      //   // //           ctx.drawImage(canvas,0,0,canvas.width, canvas.height);
+      //   // //            canvas.width=num
+      //   // //  canvas.height=num
+      //   // //  canvas.style.width=num+'px'
+      //   // // canvas.style.height=num+'px'
+      //   //   let filename = `${new Date().getTime()}.png`;
+      //   //   let imageUrl = canvas.toDataURL("image/png");
+      //   //   let a = document.createElement("a");
+      //   //   a.style.display = "none";
+      //   //   a.download = filename;
+      //   //   a.href = imageUrl;
+      //   //   document.body.appendChild(a);
+      //   //   a.click();
+      // });
+console.log('document.getElementsByClassName',document.getElementsByClassName('codeModal'),Number(props.index))
+          let canvas =document.getElementsByClassName('codeModal')[Number(props.index)].getElementsByTagName('canvas')[0];
+          let filename = `${new Date().getTime()}.png`;
+          let imageUrl = canvas.toDataURL("image/png");
+          let a = document.createElement("a");
+          a.style.display = "none";
+          a.download = filename;
+          a.href = imageUrl;
+          document.body.appendChild(a);
+          a.click();
+    };
+    const closeCodeModal = () => {
+      ctx.emit("update:codevisible", false);
+    };
+    watch(() => {
+      let obj = {
+        title: "",
+        name: "",
+        url: "",
+      };
+      state.codeInfo = Object.assign(obj, props.codeInfo);
+      console.log("codeInfo22222", state.codeInfo,props.index);
+    });
+    return {
+      ...toRefs(state),
+      downloadQr,
+      closeCodeModal,
+    };
+  },
+};
+</script>
+<style scoped lang="scss">
+.twoDimensionalCode {
+}
+.codeModal {
+  .ant-modal {
+    .ant-modal-content {
+      width: 479px !important;
+      .ant-modal-body {
+        .QR {
+          z-index: 9999;
+          width: 520px;
+          background: #ffffff;
+          box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
+          position: absolute;
+          left: 50%;
+          top: 10%;
+          transform: translate(-50%, -50%);
+          .qr_header {
+            position: absolute;
+            width: calc(100%);
+            height: 40px;
+            background: linear-gradient(
+              rgba(78, 166, 255, 0.2) 0%,
+              rgba(78, 166, 255, 0) 100%
+            );
+          }
+          .qr_main {
+            width: 100%;
+            position: relative;
+            .qrm_header {
+              display: flex;
+              align-items: center;
+              padding-top: 20px;
+              padding-left: 26px;
+              font-size: 16px;
+              .title {
+                font-size: 16px;
+                font-weight: 600;
+                color: #333333;
+                line-height: 22px;
+              }
+              .close_exit {
+                position: absolute;
+                right: 42px;
+                cursor: pointer;
+                width: 20px;
+                height: 20px;
+                background-image: url(@/assets/images/coursewareManage/close.png);
+                background-size: 100% 100%;
+              }
+            }
+            .qrm_body {
+              width: 100%;
+              margin-top: 22px;
+              margin-bottom: 32px;
+              display: flex;
+              flex-direction: column;
+              align-items: center;
+              .codename {
+                font-size: 18px;
+                font-weight: 400;
+                color: #333333;
+                line-height: 25px;
+                margin-bottom: 20px;
+              }
+            }
+            .qrm_footer {
+              display: flex;
+              align-items: center;
+              margin-bottom: 44px;
+              .qrmbtn {
+                width: 80px;
+                height: 32px;
+                display: flex;
+                line-height: 32px;
+                justify-content: center;
+                border-radius: 4px;
+                border: 1px solid #387df7;
+                margin-left: 16px;
+                cursor: pointer;
+                .btntext {
+                  color: #387df7;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/components/drawers/CheckStu.vue

@@ -21,14 +21,14 @@
             <img src="../../assets/images/studentimg/character.png" />
           </div>
           <div class="stumation">
-            <div class="stuname">王明</div>
+            <div class="stuname">{{pro.userInfoBo.userName}}</div>
-            <div class="stugangw">产研部门 - 产品经理</div>
+            <div class="stugangw">{{pro.userInfoBo.deptName+'-'+pro.userInfoBo.jobName}}</div>
           </div>
           <div class="sortbox">
             <div class="sortname">进度排名</div>
             <div class="sortnub">
-              <span class="nub1">2</span>
+              <span class="nub1">{{pro.currentChapterCnt}}</span>
-              <span class="total">/10</span>
+              <span class="total">/{{pro.totalChapterCnt}}</span>
             </div>
           </div>
           <a-divider
@@ -42,8 +42,8 @@
           <div class="sortbox" style="margin-left: 34px">
             <div class="sortname">完成必修</div>
             <div class="sortnub">
-              <span class="nub1">3</span>
+              <span class="nub1">{{pro.currentReqCnt}}</span>
-              <span class="total">/10</span>
+              <span class="total">/{{pro.totalReqCnt}}</span>
             </div>
           </div>
           <a-divider
@@ -57,7 +57,7 @@
           <div class="sortbox" style="margin-left: 34px">
             <div class="sortname">已修证书</div>
             <div class="sortnub">
-              <span class="nub1">1</span>
+              <span class="nub1">{{pro.certCnt}}</span>
             </div>
           </div>
         </div>
@@ -68,8 +68,10 @@
             <div><img src="../../assets/images/studentimg/chak.png" /></div>
           </div>
         </div>
-        <div class="mainbox">
+        <div v-for="(item,index) in pro.chapterProcessList" class="mainbox"
-          <div class="rowtitle" @click="changeDown">
+        style="margin-top: 15px; height: 56px"
+        :key="item.chapterId">
+        <div class="rowtitle" @click="changeDown">
             <div class="titleimg">
               <img
                 :src="
@@ -79,84 +81,26 @@
                 "
               />
             </div>
-            <div class="titletext">阶段1 腾飞班阶段1</div>
+            <div class="titletext">关卡{{index}} {{item.chapterName}}</div>
           </div>
+
           <div :style="{ display: showDown ? 'block' : 'none' }">
-            <div class="rowclass">
+            <div  v-for="_item in item.taskProcessList" :key="_item.routerTaskId" class="rowclass">
               <div class="leftclass">
                 <div><img src="../../assets/images/leveladd/zai.png" /></div>
-                <div class="text1">在线</div>
+                <div class="text1">{{checkType(_item.type)}}</div>
-                <div class="text2">如何成为一个产品经理</div>
+                <div class="text2">{{_item.name}}</div>
               </div>
               <div class="alreadyclass">
                 <div class="alimg">
                   <img src="../../assets/images/studentimg/complete.png" />
                 </div>
-                <div class="altext">已完成</div>
+                <div class="altext">{{checkStatus(_item.status)}}</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>
-        <div class="mainbox" style="margin-top: 15px; height: 56px">
+
-          <div class="rowtitle">
-            <div class="titleimg">
-              <img src="../../assets/images/studentimg/close.png" />
-            </div>
-            <div class="titletext">阶段2 腾飞班阶段2</div>
-          </div>
-        </div>
       </div>
       <div class="btnn">
         <button class="btn2">关闭</button>
@@ -169,6 +113,8 @@
 <script>
 import { reactive, toRefs } from "vue";
 import CheckStuMess from "./CheckStuMess.vue";
+import {stuProgress} from "@/api/index1";
+import {message} from "ant-design-vue";
 export default {
   name: "CheckStu",
   components: { CheckStuMess },
@@ -177,11 +123,16 @@ export default {
       type: Boolean,
       default: false,
     },
+    studentId: {
+      type: Number,
+      default: null,
+    }
   },
   setup(props, ctx) {
     const state = reactive({
       StuMessvisible: false,
       showDown: false,
+      pro:null,
     });
     const closeDrawer = () => {
       ctx.emit("update:CheckStuvisible", false);
@@ -191,11 +142,56 @@ export default {
       state.StuMessvisible = true;
     };
     const afterVisibleChange = (bool) => {
+      if(props.CheckStuvisible) {
+        getStuProgress()
+      }
       console.log("state", bool);
     };
     const changeDown = () => {
       state.showDown = !state.showDown;
     };
+    const getStuProgress = () => {
+      let obj = {
+        routerId:100,
+        studentId:props.studentId
+      }
+      stuProgress(obj).then(res => {
+        message.success("操作成功")
+        state.pro = res.data.data
+        console.log(res)
+      }).catch(err => {
+        message.error("操作失败"+err)
+        console.log(err)
+      })
+    }
+
+    const checkType = (type) => {
+    let typeRules = [
+        "",
+        "在线",
+        "面授",
+        "案例",
+        "作业",
+        "考试",
+        "直播",
+        "外链",
+        "讨论",
+        "活动",
+        "测评",
+        "评估",
+        "投票",
+      ];
+      return typeRules[type];
+  }
+
+  const checkStatus = (status) => {
+    if(status < 0) return "未开始"
+    let statusRules = [
+      "进行中","已完成"
+    ]
+    return statusRules[status]
+  }
+
 
     return {
       ...toRefs(state),
@@ -203,7 +199,10 @@ export default {
       closeDrawer,
       showProMess,
       changeDown,
+      checkType,
+      checkStatus,
       // change,
+
     };
   },
 };

src/components/drawers/CorPowerlist.vue

@@ -8,135 +8,126 @@
       @after-visible-change="afterVisibleChange"
     >
       <div class="drawerMain">
-        <div class="header">
+              <div class="header">
-          <div class="headerTitle">授权名单</div>
+        <div class="headerTitle">授权名单</div>
-          <img
+        <img
-            style="width: 29px; height: 29px; cursor: pointer"
+          style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
+          src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
+          @click="closeDrawer"
+        />
+      </div>
+      <div class="main">
+        <div class="search">
+          <div class="leftchoose">
+            <div class="namecon" style="margin-right: 30px">
+              <div class="name">姓名：</div>
+              <a-input
+                v-model:value="name"
+                style="width: 270px; height: 40px; border-radius: 8px"
+                placeholder="请输入姓名"
+              />
+            </div>
+          </div>
+
+          <div class="btns">
+            <div class="btn btn1" style="margin-right: 20px">
+              <div class="img1"></div>
+              <div class="wz">搜索</div>
+            </div>
+            <div class="btn btn2">
+              <div class="img2"></div>
+              <div class="wz">重置</div>
+            </div>
+          </div>
+        </div>
+
+        <div class="tableBox" style="margin-top: 10px">
+          <a-table
+            style="border: 1px solid #f2f6fe"
+            :columns="tableDataFunc()"
+            :data-source="tableData"
+            :loading="tableDataTotal === -1 ? true : false"
+            expandRowByClick="true"
+            @expand="expandTable"
+            :scroll="{ x: 900 }"
+            :pagination="false"
+           
           />
         </div>
-        <div class="contentMain">
+
-          <div class="main_items">
+        <div class="tableBox">
-            <div class="mi_ipts">
+          <div class="pa">
-              <div class="mii_ipt">
+            <a-pagination
-                <div class="ipt_name">姓名：</div>
+              showSizeChanger="true"
-                <div class="fi_input">
+              showQuickJumper="true"
-                  <a-input
+              hideOnSinglePage="true"
-                    v-model:value="inputV1"
+              :pageSize="pageSize"
-                    style="width: 264px; height: 40px; border-radius: 8px"
+              :current="currentPage"
-                    placeholder="请输入姓名"
+              :total="tableDataTotal"
-                  />
+              class="pagination"
-                </div>
+            />
-              </div>
-            </div>
-            <div class="mi_btns">
-              <div class="btn btn1">
-                <div class="search"></div>
-                <div class="btnText">搜索</div>
-              </div>
-              <div class="btn btn2">
-                <div class="search"></div>
-                <div class="btnText">重置</div>
-              </div>
-            </div>
-          </div>
-  
-          <div class="main_table">
-            <a-table
-                :row-selection="{
-                  selectedRowKeys: selectedRowKeys,
-                  onChange: onSelectChange,
-                }"
-                :columns="columns1"
-                :data-source="tableData1"
-                :loading="tableDataTotal === -1 ? true : false"
-                :pagination="false"
-              >
-                <template #bodyCell="{ column }">
-                  <template v-if="column.key === 'opacation'">
-                    <a>取消授权</a>
-                  </template>
-                </template>
-              </a-table>
-              <div class="tableBox">
-                <div class="pa">
-                <a-pagination
-                  showSizeChanger="true"
-                  showQuickJumper="true"
-                  hideOnSinglePage="true"
-                  :pageSize="pageSize"
-                  :current="currentPage"
-                  :total="tableDataTotal"
-                  class="pagination"
-                />
-              </div>
-              </div>
           </div>
         </div>
-        <div class="main_btns">
+        <!-- <div class="tab" style="margin-top: 20px; margin-bottom: 100px">
-          <button class="btn1">取消</button>
+          <a-table
-          <button class="btn2">确定</button>
+            style="border: 1px solid #f2f6fe"
+            :columns="tablecolumns"
+            :data-source="tabledata"
+            :loading="tableDataTotal === -1 ? true : false"
+            expandRowByClick="true"
+            :scroll="{ x: 900, y: 350 }"
+            @expand="expandTable"
+            :pagination="false"
+            :row-selection="{
+              columnWidth: 30,
+              selectedRowKeys: selectedRowKeys,
+              onChange: onSelectChange,
+            }"
+          />
+        </div> -->
+      </div>
+  <!-- 取消授权弹窗 -->
+    <a-modal
+      v-model:visible="cancelModal"
+      :footer="null"
+      :closable="closeCancel"
+      wrapClassName="copyModal"
+      centered="true"
+    >
+      <div class="delete">
+        <div class="del_header"></div>
+        <div class="del_main">
+          <div class="header">
+            <div class="icon"></div>
+            <span>提示</span>
+            <div class="close_exit" @click="closeCancelModal"></div>
+          </div>
+          <div class="body">
+            <span>您确定要取消该用户的授权吗</span>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1">
+              <div class="btnText" @click="delete_exit">取消</div>
+            </div>
+            <div class="del_btn btn2">
+              <div class="btnText" @click="delete_exit">确定</div>
+            </div>
+          </div>
         </div>
       </div>
+    </a-modal>
+
+        <div class="botm"></div>
+    <div class="btnn">
+      <button class="btn1">取消</button>
+      <button class="btn2">确定</button>
+    </div>
+      </div>
     </a-drawer>
 </template>
   
   <script>
-  import { reactive, toRefs, ref } from "vue";
+  import { reactive, toRefs } from "vue";
-  const columns1 = [
-  {
-    title: "姓名",
-    dataIndex: "name",
-    key: "name",
-    width: "10%",
-    align: "left",
-  },
-  {
-    title: "归属组织",
-    dataIndex: "organization",
-    key: "organization",
-    width: "19%",
-    align: "center",
-  },
-  {
-    title: "岗位",
-    dataIndex: "position",
-    key: "position",
-    width: "19%",
-    align: "center",
-  },
-  {
-    title: "拥有权限",
-    dataIndex: "authority",
-    key: "authority",
-    width: "19%",
-    align: "center",
-  },
-  {
-    title: "操作",
-    dataIndex: "opacation",
-    key: "opacation",
-    width: "34%",
-    align: "center",
-  },
-];
-  const rowSelection = ref({
-    checkStrictly: false,
-    onChange: (selectedRowKeys, selectedRows) => {
-      console.log(
-        `selectedRowKeys: ${selectedRowKeys}`,
-        "selectedRows: ",
-        selectedRows
-      );
-    },
-    onSelect: (record, selected, selectedRows) => {
-      console.log(record, selected, selectedRows);
-    },
-    onSelectAll: (selected, selectedRows, changeRows) => {
-      console.log(selected, selectedRows, changeRows);
-    },
-  });
   export default {
     name: "CorPoerlist",
     props: {
@@ -147,47 +138,98 @@
     },
     setup(props, ctx) {
       const state = reactive({
-        tableData1: [
+         name: null,
+      showmodal: false, //勾选提示框
+      closable: false, //modal右上角的关闭按钮
+      pageSize: 10,
+      currentPage: 1,
+      tableDataTotal: 100,
+      selectedRowKeys: [],
+      cancelModal: false, //取消授权弹窗
+      closeCancel: false, //取消授权弹窗关闭图标
+       tableData: [
         {
           key: 1,
-          name: "李明",
+          name: "张三",
-          organization: "-",
+          com: "产研部",
-          position: "产品经理",
+          gang: "产品经理",
-          authority: "归属权",
+          number: "20201234",
+          state: "管理权",
         },
         {
           key: 2,
-          name: "李洋",
+          name: "张三",
-          organization: "-",
+          com: "产研部",
-          position: "产品经理",
+          gang: "产品经理",
-          authority: "查看权",
+          number: "20201234",
+          state: "管理权",
         },
         {
           key: 3,
-          name: "小李",
+          name: "张三",
-          organization: "-",
+          com: "产研部",
-          position: "产品经理",
+          gang: "产品经理",
-          authority: "管理权",
+          number: "20201234",
+          state: "管理权",
         },
         {
           key: 4,
-          name: "雄安名",
+          name: "张三",
-          organization: "-",
+          com: "产研部",
-          position: "产品经理",
+          gang: "产品经理",
-          authority: "管理权",
+          number: "20201234",
+          state: "管理权",
         },
         {
           key: 5,
-          name: "王哥",
+          name: "张三",
-          organization: "-",
+          com: "产研部",
-          position: "产品经理",
+          gang: "产品经理",
-          authority: "管理权",
+          number: "20201234",
+          state: "管理权",
+        },
+        {
+          key: 6,
+          name: "张三",
+          com: "产研部",
+          gang: "产品经理",
+          number: "20201234",
+          state: "归属权",
+        },
+        {
+          key: 7,
+          name: "张三",
+          com: "产研部",
+          gang: "产品经理",
+          number: "20201234",
+          state: "查看权",
+        },
+        {
+          key: 8,
+          name: "张三",
+          com: "产研部",
+          gang: "产品经理",
+          number: "20201234",
+          state: "管理权",
+        },
+        {
+          key: 9,
+          name: "张三",
+          com: "产研部",
+          gang: "产品经理",
+          number: "20201234",
+          state: "管理权",
+        },
+        {
+          key: 10,
+          name: "张三",
+          com: "产研部",
+          gang: "产品经理",
+          number: "20201234",
+          state: "管理权",
         },
       ],
-        currentPage: 1,
+      
-        tableDataTotal: 100,
-        pageSize: 10,
-        inputV1:'',
       });
       const closeDrawer = () => {
         ctx.emit("update:corpowerlistVisible", false);
@@ -195,12 +237,104 @@
       const afterVisibleChange = (bool) => {
         console.log("state", bool);
       };
+        const onSelectChange = (selectedRowKeys) => {
+      console.log("selectedRowKeys changed: ", selectedRowKeys);
+      state.selectedRowKeys = selectedRowKeys;
+    };
+    const showCancelModal = () => {
+      state.cancelModal = true;
+    };
+    const closeCancelModal = () => {
+      state.cancelModal = false;
+    };
+
+        const tableDataFunc = () => {
+      const columns = [
+        {
+          title: "姓名",
+          dataIndex: "name",
+          // width: "30%",
+          key: "name",
+          width: 70,
+          align: "left",
+          className: "classify",
+          scopedSlots: { customRender: "action" }, //引入的插槽
+          customRender: (text) => {
+            // console.log(text.record.checked1);
+            return (
+              <div class="racona">
+                <span> {text.record.name}</span>
+              </div>
+            );
+          },
+        },
+         {
+          title: "工号",
+          dataIndex: "number",
+          // width: "30%",
+          key: "number",
+          width: 100,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "归属组织",
+          dataIndex: "com",
+          // width: "30%",
+          key: "com",
+          width: 100,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "所在岗位",
+          dataIndex: "gang",
+          key: "gang",
+          width: 100,
+          align: "center",
+          className: "h",
+        },
+
+        {
+          title: "拥有权限",
+          dataIndex: "state",
+          key: "state",
+          width: 100,
+          align: "center",
+          className: "h",
+        },
+        {
+          title: "操作",
+          className: "h",
+          dataIndex: "opacation",
+          key: "opacation",
+          width: 100,
+          align: "center",
+          scopedSlots: { customRender: "action" }, //引入的插槽
+          customRender: () => {
+            return (
+              <div
+                class="opa"
+                onClick={() => {
+                  showCancelModal();
+                }}
+              >
+                取消授权
+              </div>
+            );
+          },
+        },
+      ];
+      return columns;
+    };
       return {
         ...toRefs(state),
-        afterVisibleChange,
         closeDrawer,
-        columns1,
+      onSelectChange,
-        rowSelection,
+      tableDataFunc,
+      showCancelModal,
+      closeCancelModal,
+      afterVisibleChange,
       };
     },
   };
@@ -209,182 +343,339 @@
   // .ant-table-striped :deep(.table-striped) td {
   //   background-color: #fafafa !important;
   // }
-  
+  .copyModal {
-  .corpowerlistDrawer {
+  .ant-modal {
-    .drawerMain {
+    width: 424px !important;
-      .header {
+    height: 258px !important;
-        height: 73px;
+    .ant-modal-content {
-        border-bottom: 1px solid #e8e8e8;
+      width: 424px !important;
-        display: flex;
+      height: 258px !important;
-        justify-content: space-between;
+      .ant-modal-body {
-        align-items: center;
+        width: 424px !important;
-        .headerTitle {
+        height: 258px !important;
-          font-size: 18px;
+        padding: 0 !important;
-          font-weight: 600;
+        .delete {
-          color: #333333;
+          z-index: 999;
-          line-height: 25px;
+          width: 424px;
-          margin-left: 24px;
+          height: 258px;
-          background-color: #ffffff;
+          background: #ffffff;
-        }
+          box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
-      }
+          border-radius: 4px;
-      .contentMain {
+          // position: absolute;
-        margin-top: 32px;
+          // left: 50%;
-        padding-right: 20px;
+          // top: 10%;
-        .main_items {
+          // transform: translate(-50%, -50%);
-          display: flex;
+          .del_header {
-          justify-content: space-between;
+            position: absolute;
-          margin-bottom: 12px;
+            width: calc(100%);
-          flex-wrap: wrap;
+            height: 68px;
-          .mi_ipts {
+            background: linear-gradient(
-            display: flex;
+              rgba(78, 166, 255, 0.2) 0%,
-            margin-bottom: 20px;
+              rgba(78, 166, 255, 0) 100%
-            .mii_ipt {
+            );
-              display: flex;
-              align-items: center;
-              margin-right: 24px;
-              .ipt_name {
-                white-space: nowrap;
-              }
-            }
           }
-          .mi_btns {
+          .del_main {
-            display: flex;
+            width: 100%;
-            margin-left: 38px;
+            position: relative;
-            margin-bottom: 20px;
+            .header {
-            cursor: pointer;
-            .btn {
-              padding: 0px 26px 0px 26px;
-              height: 38px;
-              border-radius: 8px;
-              border: 1px solid rgba(64, 158, 255, 1);
               display: flex;
               align-items: center;
+              padding-top: 20px;
+              padding-left: 26px;
+              font-size: 16px;
+              .icon {
+                width: 16px;
+                height: 16px;
+                margin-right: 10px;
+                background-image: url(@/assets/images/coursewareManage/notice.png);
+                background-size: 100% 100%;
+              }
+              .close_exit {
+                position: absolute;
+                right: 42px;
+                cursor: pointer;
+                width: 20px;
+                height: 20px;
+                background-image: url(@/assets/images/coursewareManage/close.png);
+                background-size: 100% 100%;
+              }
+            }
+            .body {
+              width: 100%;
+              margin: 34px auto 56px auto;
+              display: flex;
               justify-content: center;
-              margin-left: 14px;
+              align-items: center;
-              flex-shrink: 0;
+              flex-direction: column;
-              .search {
+              // background-color: red;
-                background-size: 100%;
+              position: relative;
-              }
+              .back {
-              .btnText {
+                position: absolute;
-                font-size: 14px;
+                top: 30px;
+                font-size: 12px;
                 font-weight: 400;
-                line-height: 36px;
+                color: #666666;
-                margin-left: 5px;
               }
             }
-            .btn1 {
+            .del_btnbox {
-              background: rgb(64, 158, 255);
+              display: flex;
-              .search {
+              margin: 30px auto;
-                width: 15px;
+              justify-content: center;
-                height: 17px;
+              .del_btn {
-                background-image: url("@/assets/images/coursewareManage/search0.png");
+                width: 100px;
+                height: 40px;
+                background: rgba(64, 158, 255, 0);
+                border-radius: 8px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+
+                flex-shrink: 0;
+                cursor: pointer;
+                .btnText {
+                  font-size: 14px;
+                  font-weight: 400;
+                  line-height: 40px;
+                }
               }
-              .btnText {
+              .btn1 {
-                color: rgb(255, 255, 255);
+                border: 1px solid rgba(64, 158, 255, 1);
+                color: #4ea6ff;
+                margin-right: 14px;
               }
-            }
+              .btn2 {
-            .btn2 {
+                background-color: #4ea6ff;
-              background: rgb(255, 255, 255);
-              .search {
-                width: 15px;
-                height: 17px;
-                background-image: url("@/assets/images/coursewareManage/reset1.png");
-              }
-              .btnText {
-                color: rgb(64, 158, 255);
-              }
-            }
-            .btn1:hover {
-              background: rgb(255, 255, 255);
-              .search {
-                background-image: url("@/assets/images/courseManage/search1.png");
-              }
-              .btnText {
-                color: #388be1;
-              }
-            }
-            .btn2:hover {
-              background: rgba(64, 158, 255, 1);
-              .search {
-                background-image: url("@/assets/images/courseManage/reset0.png");
-              }
-              .btnText {
                 color: #ffffff;
               }
             }
           }
         }
-        .main_table {
-          position: relative;
-            padding-bottom: 80px;
-            .classify {
-              margin-left: 10px !important;
-              padding-left: 9px !important;
-            }
-            .ant-checkbox-wrapper {
-              align-items: center;
-              margin-top: -2px;
-            }
-            .ant-table-selection-column {
-              padding: 0px !important;
-              padding-left: 60px !important;
-            }
-            .ant-table-thead > tr > th {
-              background-color: rgba(239, 244, 252, 1);
-            }
-            th.h {
-              background-color: #eff4fc !important;
-            }
-
-            .ant-table-tbody
-              > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-              > td {
-              background: #f6f9fd;
-            }
-            .tableBox{
-              .pa {
-              left: 0;
-              width: 100%;
-              // height: 20px;
-              // background-color: red;
-              display: flex;
-              justify-content: center;
-              position: absolute;
-              bottom: 20px;
-            }
-            }
-          }
-      }
-  
-      .main_btns {
-        height: 72px;
-        width: 100%;
-        bottom: 0;
-        left: 0;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
-        .btn1 {
-          width: 100px;
-          height: 40px;
-          border: 1px solid #4ea6ff;
-          border-radius: 8px;
-          color: #4ea6ff;
-          background-color: #fff;
-          cursor: pointer;
-        }
-        .btn2 {
-          cursor: pointer;
-          width: 100px;
-          height: 40px;
-          background: #4ea6ff;
-          border-radius: 8px;
-          border: 0;
-          margin-left: 15px;
-          color: #fff;
-        }
       }
     }
   }
+}
+  .corpowerlistDrawer {
+    // width: 80%;
+  .ant-drawer-content-wrapper {
+    // max-width: 1000px;
+    .ant-drawer-header {
+      display: none !important;
+    }
+    .ant-drawer-body {
+      padding: 0;
+    }
+  }
+  .drawerMain {
+    // overflow: auto;
+    min-width: 500px;
+    margin: 0px 32px 0px 32px;
+    overflow-x: auto;
+    display: flex;
+    flex-direction: column;
+    .header {
+      height: 73px;
+      border-bottom: 1px solid #e8e8e8;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      flex-shrink: 0;
+      // background-color: red;
+      margin-bottom: 20px;
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        // margin-left: 24px;
+      }
+    }
+    .main {
+      width: 100%;
+      // height: 100%;
+      // background-color: #bfa;
+      overflow-y: auto;
+      margin-bottom: 80px;
+      .search {
+        width: 100%;
+        display: flex;
+        flex-wrap: wrap;
+        margin-top: 10px;
+        //justify-content: space-between;
+        .leftchoose {
+          display: flex;
+          margin-right: 20px;
+          .namecon {
+            display: flex;
+            flex-wrap: nowrap;
+            margin-bottom: 10px;
+            .name {
+              margin-top: 8px;
+              white-space: nowrap;
+            }
+            // .name {
+            //   margin-top: 8px;
+
+            //   color: rgba(0, 0, 0, 0.85);
+            //   font-size: 14px;
+            //   font-weight: 400;
+            // }
+          }
+        }
+
+        .btns {
+          display: flex;
+          flex-wrap: nowrap;
+
+          .btn {
+            cursor: pointer;
+            width: 100px;
+            height: 40px;
+            border-radius: 8px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            .img1 {
+              width: 15px;
+              height: 17px;
+              background-image: url(../../assets/images/courseManage/search0.png);
+              background-size: 100% 100%;
+              margin-right: 7px;
+            }
+            .img2 {
+              width: 16px;
+              height: 18px;
+              background-image: url(../../assets/images/courseManage/reset1.png);
+              background-size: 100% 100%;
+              margin-right: 7px;
+            }
+          }
+
+          .btn1 {
+            background: #409eff;
+
+            color: #ffffff;
+          }
+          .btn2 {
+            background: #ffffff;
+
+            color: #409eff;
+            border: 1px solid #409eff;
+          }
+        }
+      }
+
+      .tableBox {
+        // margin-bottom: 80px;
+
+        .classify {
+          // margin-left: 11px !important;
+          // padding-left: 9px !important;
+          padding-left: 20px !important;
+        }
+        .ant-checkbox-wrapper {
+          align-items: center;
+          margin-top: -2px;
+        }
+        .ant-table-selection-column {
+          padding: 0px !important;
+          // padding-left: 45px !important;
+        }
+        .ant-table-thead > tr > th {
+          background-color: rgba(239, 244, 252, 1);
+        }
+        th.h {
+          background-color: #eff4fc !important;
+        }
+
+        .ant-table-tbody
+          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+          > td {
+          background: #f6f9fd;
+        }
+        .opa {
+          // background-color: #bfa;
+          font-size: 14px;
+          font-weight: 400;
+          color: #388be1;
+          cursor: pointer;
+        }
+      }
+      .tableBox {
+        .pa {
+          // left: 0;
+          margin-top: 25px;
+          // margin-bottom: 70px;
+          width: 100%;
+          // height: 20px;
+          // background-color: red;
+          display: flex;
+          justify-content: center;
+          // position: absolute;
+          // bottom: 20px;
+          // margin-bottom: 20px;
+          .ant-pagination-prev,
+          .ant-pagination-next,
+          .ant-pagination-options {
+            margin-bottom: 10px;
+          }
+          .ant-pagination-item {
+            margin-bottom: 10px;
+          }
+        }
+      }
+      // .tab {
+      //   .ant-table-thead > tr > th {
+      //     background-color: rgba(239, 244, 252, 1) !important;
+      //   }
+
+      //   th.h {
+      //     background-color: #eff4fc !important;
+      //   }
+
+      //   .ant-table-tbody
+      //     > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+      //     > td {
+      //     background: #f6f9fd;
+      //   }
+      // }
+    }
+  }
+  // .botm {
+  //   width: 100%;
+  //   height: 200px;
+  //   background-color: red;
+
+  // }
+  .btnn {
+    height: 72px;
+    width: 100%;
+    position: absolute;
+    background-color: #fff;
+    bottom: 0;
+    left: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+    .btn1 {
+      width: 100px;
+      height: 40px;
+      border: 1px solid #4ea6ff;
+      border-radius: 8px;
+      color: #4ea6ff;
+      background-color: #fff;
+      cursor: pointer;
+    }
+    .btn2 {
+      cursor: pointer;
+      width: 100px;
+      height: 40px;
+      background: #409eff;
+      border-radius: 8px;
+      border: 0;
+      margin-left: 15px;
+      color: #fff;
+    }
+  }
+  }
   </style>

src/components/drawers/FaceManage.vue

@@ -362,7 +362,7 @@ export default {
     let timer;
     onMounted(() => {
       setTimeout(() => {
-        getManageList();
+      //  getManageList();
       }, 1000);
       timer = setInterval(() => {
         state.open = false;

src/components/drawers/PowerList.vue

@@ -147,13 +147,13 @@ export default {
       selectedRowKeys: [],
       cancelModal: false, //取消授权弹窗
       closeCancel: false, //取消授权弹窗关闭图标
-      tableData: [
+    tableData: [
         {
           key: 1,
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -161,7 +161,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -169,7 +169,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -177,7 +177,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -185,7 +185,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -193,7 +193,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "归属权",
         },
         {
@@ -201,7 +201,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "查看权",
         },
         {
@@ -209,6 +209,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -216,6 +217,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -223,6 +225,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
+          number: "20201234",
           state: "管理权",
         },
       ],
@@ -262,6 +265,15 @@ export default {
               </div>
             );
           },
+        },
+         {
+          title: "工号",
+          dataIndex: "number",
+          // width: "30%",
+          key: "number",
+          width: 100,
+          align: "center",
+          className: "h",
         },
         {
           title: "归属组织",
@@ -326,11 +338,7 @@ export default {
 </script>
 
 <style lang="scss">
-.me {
+
-  .ant-modal-body {
-    padding: 0px;
-  }
-}
 .copyModal {
   .ant-modal {
     width: 424px !important;

src/components/drawers/ProjPowerList.vue

@@ -42,7 +42,7 @@
 
         <div class="tableBox" style="margin-top: 10px">
           <a-table
-            style="border: 1px solid #f2f6fe;"
+            style="border: 1px solid #f2f6fe"
             :columns="tableDataFunc()"
             :data-source="tableData"
             :loading="tableDataTotal === -1 ? true : false"
@@ -50,7 +50,6 @@
             @expand="expandTable"
             :scroll="{ x: 900 }"
             :pagination="false"
-           
           />
         </div>
         <div class="tableBox">
@@ -153,7 +152,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -161,7 +160,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -169,7 +168,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -177,7 +176,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -185,7 +184,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -193,7 +192,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "归属权",
         },
         {
@@ -201,7 +200,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
-
+          number: "20201234",
           state: "查看权",
         },
         {
@@ -209,6 +208,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -216,6 +216,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
+          number: "20201234",
           state: "管理权",
         },
         {
@@ -223,6 +224,7 @@ export default {
           name: "张三",
           com: "产研部",
           gang: "产品经理",
+          number: "20201234",
           state: "管理权",
         },
       ],
@@ -257,12 +259,21 @@ export default {
           customRender: (text) => {
             // console.log(text.record.checked1);
             return (
-              <div class="racona" >
+              <div class="racona">
                 <span> {text.record.name}</span>
               </div>
             );
           },
         },
+        {
+          title: "工号",
+          dataIndex: "number",
+          // width: "30%",
+          key: "number",
+          width: 100,
+          align: "center",
+          className: "h",
+        },
         {
           title: "归属组织",
           dataIndex: "com",
@@ -376,7 +387,7 @@ export default {
         display: flex;
         flex-wrap: wrap;
         margin-top: 10px;
-        justify-content: space-between;
+        // justify-content: space-between;
         .leftchoose {
           display: flex;
           margin-right: 20px;

src/components/drawers/ProjectOwn.vue

@@ -665,31 +665,31 @@ export default {
     //根据右侧快速选人高度，判断是否显示更多
     const selectedsHeight = () => {
       let resize = elementResizeDetectorMaker();
-      resize.listenTo(document.getElementById('Ownership').querySelector("#selecteds"), function (ele) {
+      resize.listenTo(document.getElementById('ProjOwnership').querySelector("#selecteds"), function (ele) {
         console.log("ele", ele.offsetHeight);
         if (ele.offsetHeight > 160 && !state.showHidden) {
           state.showMore = true;
-          document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "hidden";
+          document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.overflow = "hidden";
-         document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "160px";
+         document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.height = "160px";
         } else if (ele.offsetHeight < 160) {
           state.showMore = false;
           state.showHidden = false;
-         document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "hidden";
+         document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.overflow = "hidden";
-          document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "160px";
+          document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.height = "160px";
         }
       });
     };
     const morePeopleShow = () => {
       state.showMore = false;
       state.showHidden = true;
-      document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "";
+      document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.overflow = "";
-      document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "";
+      document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.height = "";
     };
     const morePeopleHidden = () => {
       state.showMore = true;
       state.showHidden = false;
-      document.getElementById('Ownership').querySelector("#selectedsBox").style.overflow = "hidden";
+      document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.overflow = "hidden";
-      document.getElementById('Ownership').querySelector("#selectedsBox").style.height = "160px";
+      document.getElementById('ProjOwnership').querySelector("#selectedsBox").style.height = "160px";
     };
 
     // 结束 快速选人------------------------------------------------------------------

src/components/drawers/ProjectScore.vue

@@ -164,8 +164,50 @@
                 ><span class="scoretext">{{ score1 }} </span><span>积分</span>
               </div>
               <div class="content">
-                <span>优秀学员可获得 </span
+                <span>完成在线课程获得 </span
-                ><span class="scoretext">{{ score2 }}</span
+                ><span class="scoretext">{{ done }}</span
+                ><span style="margin-right:50px">积分</span>
+                <span>完成面授课程获得 </span
+                ><span class="scoretext">{{ done1 }}</span
+                ><span style="margin-right:50px">积分</span>
+                <span>完成作业成绩不低于 </span
+                ><span class="scoretext">{{ done2 }}</span
+                ><span>分获得</span>
+                <span class="scoretext">{{ done3 }}</span
+                ><span>积分</span>
+              </div>
+              <div class="content">
+                <span>前</span
+                ><span class="scoretext">{{ four1}}</span
+                ><span>名学完在线课程获得</span>
+                <span class="scoretext">{{ four2}}</span
+                ><span style="margin-right:50px">积分</span>
+                <span>前</span
+                ><span class="scoretext">{{ four3}}</span
+                ><span>名提交作业且成绩不低于</span>
+                <span class="scoretext">{{ four4}}</span
+                ><span >分获得</span>
+                <span class="scoretext">{{ four5}}</span
+                ><span>积分</span>
+              </div>
+              <div class="content">
+                <span>考试成绩高于</span
+                ><span class="scoretext">{{ five1 }}</span
+                ><span>分获得</span>
+                <span class="scoretext">{{ five2 }}</span
+                ><span>积分</span>
+              </div>
+              <div class="content">
+                <span>考勤正常学员获得 </span
+                ><span class="scoretext">{{ six1}}</span
+                ><span>积分</span>
+              </div>
+              <div class="content">
+                <span>成为小组长获得</span
+                ><span class="scoretext">{{ seven1 }}</span
+                ><span style="margin-right:50px">积分</span>
+                <span>优秀学员可获得</span>
+                <span class="scoretext">{{ seven2 }}</span
                 ><span>积分</span>
               </div>
             </div>
@@ -186,11 +228,82 @@
                 ><span>积分</span>
               </div>
               <div class="content">
-                <span>优秀学员可获得 </span
+                <span>完成在线课程获得 </span
                 ><span
-                  ><a-input v-model:value="score2" :bordered="false" /></span
+                  ><a-input v-model:value="done" :bordered="false" /></span
-                ><span>积分</span>
+                ><span style="margin-right:50px">积分</span>
+                <span>完成面授课程获得 </span
+                ><a-input
+                    v-model:value="done1"
+                    :bordered="false"
+                  />
+                  <span style="margin-right:50px">积分</span>
+                  <span>完成作业成绩不低于 </span
+                ><a-input
+                    v-model:value="done2"
+                    :bordered="false"
+                  /><span>分获得</span>
+                  <a-input
+                    v-model:value="done3"
+                    :bordered="false"
+                  /><span>积分</span>
               </div>
+              <div class="content">
+                <span>前</span
+                ><a-input
+                    v-model:value="four1"
+                    :bordered="false"
+                  /><span>名学完在线课程获得</span>
+                  <a-input
+                    v-model:value="four2"
+                    :bordered="false"
+                  /><span style="margin-right:50px">积分</span>
+                <span>前</span
+                ><a-input
+                    v-model:value="four3"
+                    :bordered="false"
+                  /><span>名提交作业且成绩不低于</span>
+                  <a-input
+                    v-model:value="four4"
+                    :bordered="false"
+                  /><span >分获得</span>
+                  <a-input
+                    v-model:value="four5"
+                    :bordered="false"
+                  /><span>积分</span>
+
+              </div>
+              <div class="content">
+                <span>考试成绩高于</span
+                ><a-input
+                    v-model:value="five1"
+                    :bordered="false"
+                  /><span>分获得</span>
+                  <a-input
+                    v-model:value="five2"
+                    :bordered="false"
+                  /><span>积分</span>
+              </div>
+              <div class="content">
+                <span>考勤正常学员获得 </span
+                ><a-input
+                    v-model:value="six1"
+                    :bordered="false"
+                  /><span>积分</span>
+              </div>
+              <div class="content">
+                <span>成为小组长获得</span
+                ><a-input
+                    v-model:value="seven1"
+                    :bordered="false"
+                  /><span style="margin-right:50px">积分</span>
+                <span>优秀学员可获得</span>
+                <a-input
+                    v-model:value="seven2"
+                    :bordered="false"
+                  /><span>积分</span>
+              </div>
+              
             </div>
           </div>
         </div></a-tab-pane
@@ -372,6 +485,20 @@ export default {
       Svisible: false,
       score1: 5,
       score2: 5,
+      done:null,
+      done1:null,
+      done2:null,
+      done3:null,
+      four1:null,
+      four2:null,
+      four3:null,
+      four4:null,
+      four5:null,
+      five1:null,
+      five2:null,
+      six1:null,
+      seven1:null,
+      seven2:null,
       edit: true,
       searchRankName:null,//榜单搜索名称
     });

src/components/drawers/StuAdd.vue

@@ -1081,6 +1081,7 @@ export default {
       // console.log("selectedRowKeys changed: ", selectedRowKeys,item);
       state.selectedRowKeys = selectedRowKeys;
       state.choosepeople = item.reverse();
+      console.log(item, "选中你了！", state.choosepeople);
       selectedsHeight();
     };
     //单个删除选中的人

src/components/drawers/TestManage.vue

@@ -291,7 +291,7 @@ export default {
     let timer;
     onMounted(() => {
       setTimeout(() => {
-        getManageList();
+        // getManageList();
       }, 1000);
       timer = setInterval(() => {
         state.open = false;

src/components/drawers/TimeManage.vue

@@ -291,7 +291,7 @@ export default {
     let timer;
     onMounted(() => {
       setTimeout(() => {
-        getManageList();
+      //  getManageList();
       }, 500);
       timer = setInterval(() => {
         state.open = false;

src/components/drawers/WorkManage.vue

@@ -312,7 +312,7 @@ export default {
 
     onMounted(() => {
       setTimeout(() => {
-        getManageList();
+       // getManageList();
       }, 1000);
     });
     return {

src/views/courselibrary/CoursewareManage.vue

@@ -1673,6 +1673,13 @@
     <!-- 添加授权侧弹窗 -->
     <corpowerlist v-model:corpowerlistVisible="corpowerlistvisible" />
     <!-- 添加授权侧弹窗 -->
+     <!-- 添加查看权侧弹窗 -->
+    <course-view v-model:courseviewvisible="courseviewvisible" />
+    <!-- 添加查看权侧弹窗 -->
+     <!-- 添加归属权侧弹窗 -->
+    <course-owner v-model:courseownervisible="courseownervisible" />
+    <!-- 添加归属权侧弹窗 -->
+    
   </div>
 </template>
 <script>
@@ -1688,6 +1695,8 @@ import {
 import { message } from "ant-design-vue";
 import OwnPower from "../../components/drawers/OwnPower.vue";
 import Corpowerlist from "../../components/drawers/CorPowerlist.vue";
+import CourseView from "../../components/drawers/CourseView.vue"
+import CourseOwner from "../../components/drawers/CourseOwner.vue"
 import {
   // list,
   edit,
@@ -2130,6 +2139,8 @@ export default defineComponent({
     Corpowerlist,
     Editor,
     Toolbar,
+    CourseView,
+    CourseOwner,
   },
   setup() {
     const state = reactive({
@@ -2426,7 +2437,8 @@ export default defineComponent({
       //抽屉状态
       ownpowervisible: false,
       corpowerlistvisible: false,
-
+      courseviewvisible:false,
+courseownervisible:false,
       offcourseId: null,
       projectName: "",
       name: "",
@@ -2747,14 +2759,18 @@ export default defineComponent({
                             value="查看权"
                             label="查看权"
                             style="padding-left:30px;"
-                          >
+                          onClick={()=>{
+                            state.courseviewvisible=true
+                          }}>
                             <div>查看权</div>
                           </a-select-option>
                           <a-select-option
                             value="管理权"
                             label="管理权"
                             style="padding-left:30px;"
-                          >
+                          onClick={()=>{
+                            state.courseownervisible=true
+                          }}>
                             <div>管理权</div>
                           </a-select-option>
                         </a-select>
@@ -2852,14 +2868,18 @@ export default defineComponent({
                             value="查看权"
                             label="查看权"
                             style="padding-left:30px;"
-                          >
+                           onClick={()=>{
+                            state.courseviewvisible=true
+                          }}>
                             <div>查看权</div>
                           </a-select-option>
                           <a-select-option
                             value="管理权"
                             label="管理权"
                             style="padding-left:30px;"
-                          >
+                           onClick={()=>{
+                            state.courseownervisible=true
+                          }}>
                             <div>管理权</div>
                           </a-select-option>
                         </a-select>
@@ -2988,14 +3008,18 @@ export default defineComponent({
                             value="查看权"
                             label="查看权"
                             style="padding-left:30px;"
-                          >
+                           onClick={()=>{
+                            state.courseviewvisible=true
+                          }}>
                             <div>查看权</div>
                           </a-select-option>
                           <a-select-option
                             value="管理权"
                             label="管理权"
                             style="padding-left:30px;"
-                          >
+                           onClick={()=>{
+                            state.courseownervisible=true
+                          }}>
                             <div>管理权</div>
                           </a-select-option>
                         </a-select>

src/views/learningpath/LevelAdd.vue

@@ -69,7 +69,7 @@
                 <div class="centerbox" style="color: rgba(255, 182, 78, 1)">
                   添加任务
                 </div>
-                <div class="centermain">快速添加任务/阶段</div>
+                <div class="centermain">快速添加任务/关卡</div>
               </div>
               <div
                 class="taskbox"
@@ -113,7 +113,7 @@
           <!-- 概览（无数据） -->
           <!-- 概览（有数据） -->
           <div :style="{ display: nodata ? 'none' : 'block' }">
-            <div class="onerow"><div class="taskmain">项目概览</div></div>
+            <div class="onerow"><div class="taskmain">关卡概览</div></div>
             <div class="second" style="margin-top: 0">
               <div class="nubbox">
                 <span class="nub1">{{routerInfoOverview.totalStudentCnt}}</span>
@@ -149,7 +149,7 @@
                 <div class="nub2">总完成率</div>
               </div>
             </div>
-            <div class="onerow"><div class="taskmain">阶段信息</div></div>
+            <div class="onerow"><div class="taskmain">关卡信息</div></div>
             <div class="stagemess">
               <div v-for="item in stageList" 
               :class= "{ 'stage1': item.stageId == choosedStageId, 'stage2': item.stageId != choosedStageId }"
@@ -160,8 +160,8 @@
               <div class="stage2">阶段2</div> -->
             </div>
             <div class="stagesecond">
-              <div class="staname">阶段名称：</div>
+              <div class="staname">关卡名称：</div>
-              <div class="stamess">管理者进阶-腾飞班1第一阶段</div>
+              <div class="stamess">管理者进阶-腾飞班1第一关卡</div>
             </div>
             <div class="stagelast">
               <div class="stagepro">
@@ -263,6 +263,7 @@
               </router-link>
             </div>
             <!-- 无数据显示快速创建 -->
+            <div v-show="!taskSyllabus.length">
             <router-link :to="{ path: '/leveladddetail' }">
               <div
                 class="taskbox"
@@ -283,6 +284,7 @@
                 <div class="centermain">快速创建关卡任务</div>
               </div>
             </router-link>
+          </div>
             <!-- 无数据显示快速创建 -->
 
             <!-- 有数据-->
@@ -396,7 +398,7 @@
                         class="operation"
                         style="cursor: pointer"
                         :style="{
-                          display: item.course === '面授' ? 'flex' : 'none',
+                          display: item.type === 2 ? 'flex' : 'none',
                         }"
                         @click="showFS"
                       >
@@ -405,10 +407,10 @@
                       <div
                         class="operation"
                         style="cursor: pointer"
-                        @click="showAA(item.course, item.name)"
+                        @click="showAA(item.type, item.name)"
                         :style="{
                           display:
-                            item.course === '直播' || item.course === '活动'
+                            item.type === 6 || item.type === 9
                               ? 'flex'
                               : 'none',
                         }"
@@ -420,19 +422,19 @@
                         style="cursor: pointer"
                         :style="{
                           display:
-                            item.course === '直播' ||
+                            item.type === 6 ||
-                            item.course === '活动' ||
+                            item.type === 9 ||
-                            item.course === '面授'
+                            item.type === 2
                               ? 'flex'
                               : 'none',
                         }"
                         @click="
-                          item.course === '面授'
+                          item.type ===2
-                            ? showCopyModal(item.course)
+                            ? showCopyModal(item.type)
-                            : item.course === '直播'
+                            : item.type === 6
-                            ? showzhibModal(item.course)
+                            ? showzhibModal(item.type)
-                            : item.course === '活动'
+                            : item.type === 9
-                            ? showhuodModal(item.course)
+                            ? showhuodModal(item.type)
                             : null
                         "
                       >
@@ -442,21 +444,21 @@
                         class="operation"
                         style="cursor: pointer; margin-right: 35px"
                         @click="
-                          item.course === '在线' ||
+                          item.type === 1 ||
-                          item.course === '案例' ||
+                          item.type === 3 ||
-                          item.course === '外链' ||
+                          item.type === 7 ||
-                          item.course === '讨论' ||
+                          item.type === 8 ||
-                          item.course === '直播' ||
+                          item.type === 6 ||
-                          item.course === '评估' ||
+                          item.type === 11 ||
-                          item.course === '投票' ||
+                          item.type === 12 ||
-                          item.course === '活动'
+                          item.type === 9
-                            ? showTime(item.course, item.name)
+                            ? showTime(item.type, item.name)
-                            : item.course === '考试' || item.course === '测评'
+                            : item.type === 5 || item.type === 10
-                            ? showTest(item.course, item.name)
+                            ? showTest(item.type, item.name)
-                            : item.course === '面授'
+                            : item.type === 2
-                            ? showFace(item.course)
+                            ? showFace(item.type)
-                            : item.course === '作业'
+                            : item.type === 4
-                            ? showWork(item.course)
+                            ? showWork(item.type)
                             : null
                         "
                       >
@@ -544,6 +546,7 @@
                     :current="currentPage"
                     :total="tableDataTotal"
                     class="pagination"
+                    style="display:none"
                   />
                 </div>
               </div>
@@ -638,81 +641,7 @@
                   </div>
                 </div>
               </div>
-              <div class="Gcon">
+              
-                <div class="pad"></div>
-                <div class="Gin" style="margin-top: 0px">
-                  <div class="headone">
-                    <div class="box"></div>
-                    <div class="onetitle">关卡晋级规则</div>
-                  </div>
-                  <div class="twomain clearfix">
-                    <a-switch
-                      size="small"
-                      v-model:checked="checked2"
-                      style="margin-top: -5px"
-                    />
-                    <span class="info">启用关卡自动规则加入</span>
-                    <div class="infor">
-                      若开启“新建/编辑关卡-添加学员”支持设定自动加入规则，将于每日8点同步数据
-                    </div>
-                    <div :class="[checked2 ? 'chooseshow' : 'choo']">
-                      <div class="fane">选择范围</div>
-                      <div class="select">
-                        <a-select
-                          v-model:value="projectName"
-                          style="
-                            width: 250px;
-                            border-radius: 8px;
-                            margin-top: 15px;
-                          "
-                          placeholder="请选择部门"
-                          :options="projectNameList"
-                          @change="selectProjectName3"
-                          allowClear
-                          showSearch
-                        ></a-select>
-                      </div>
-                      <div class="select">
-                        <a-select
-                          v-model:value="projectName2"
-                          style="
-                            width: 250px;
-                            border-radius: 8px;
-                            margin-top: 15px;
-                          "
-                          placeholder="请选择岗位"
-                          :options="projectNameList2"
-                          @change="selectProjectName2"
-                          allowClear
-                          showSearch
-                        ></a-select>
-                      </div>
-                    </div>
-                    <div class="btm">
-                      <div class="bmo">关卡学习方案展示设置</div>
-                      <div class="bmt">仅支持移动端</div>
-                      <div class="chosecon">
-                        <div class="chose">
-                          <input
-                            type="checkbox"
-                            name="cb1"
-                            value="lieb"
-                            class="inl"
-                          /><span class="sh">列表展示</span>
-                        </div>
-                        <div class="chose" style="margin-left: 20px">
-                          <input
-                            type="checkbox"
-                            name="cb1"
-                            value="lieb"
-                            class="inl"
-                          /><span class="sh">路径展示</span>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
             </div>
           </a-tab-pane>
 
@@ -919,7 +848,10 @@
       <!-- 导入学员抽屉 -->
       <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" />
       <!-- 学员管理查看抽屉 -->
-      <check-stu v-model:CheckStuvisible="CheckStuvisible" />
+      <check-stu 
+      v-model:CheckStuvisible="CheckStuvisible"
+      v-model:studentId="studentId"
+       />
       <!-- 面授学员抽屉 -->
       <face-stu v-model:FSvisible="FSvisible" />
       <!-- 活动考勤抽屉 -->
@@ -943,8 +875,9 @@
   </div>
 </template>
 <script>
-import { ref, reactive, toRefs,onMounted } from "vue";
+import { ref, reactive, toRefs,onMounted, createVNode } from "vue";
-import { message } from "ant-design-vue";
+import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+import { message, Modal } from "ant-design-vue";
 import PathAddStu from "../../components/drawers/pathStuAdd";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
 import CheckStu from "../../components/drawers/CheckStu";
@@ -993,6 +926,7 @@ export default {
       twobtnn: false,
       inputbox: false,
       Wvisible: false, //作业管理
+      studentId:null,
       // 共享文档列表
       docList:[
         {
@@ -1010,79 +944,6 @@ export default {
       ], 
       huodModal: false,
       zhibModal: false,
-      projectNameListt: [
-        {
-          id: 1,
-          value: "导出信息",
-          label: "导出信息",
-        },
-        {
-          id: 2,
-          value: "批量调整关卡",
-          label: "批量调整关卡",
-        },
-        {
-          id: 3,
-          value: "批量删除",
-          label: "批量删除",
-        },
-      ],
-      projectNameList: [
-        {
-          id: 1,
-          value: "项目一",
-          label: "项目一",
-        },
-        {
-          id: 2,
-          value: "项目二",
-          label: "项目二",
-        },
-        {
-          id: 3,
-          value: "项目三",
-          label: "项目三",
-        },
-        {
-          id: 4,
-          value: "项目四",
-          label: "项目四",
-        },
-      ],
-      projectNameList2: [
-        {
-          id: 1,
-          value: "项目一",
-          label: "项目一",
-        },
-        {
-          id: 2,
-          value: "项目二",
-          label: "项目二",
-        },
-        {
-          id: 3,
-          value: "项目三",
-          label: "项目三",
-        },
-        {
-          id: 4,
-          value: "项目四",
-          label: "项目四",
-        },
-      ],
-      projectNameList4: [
-        {
-          id: 1,
-          value: "关卡1",
-          label: "关卡1",
-        },
-        {
-          id: 2,
-          value: "关卡2",
-          label: "关卡2",
-        },
-      ],
       //任务大纲列表
       taskSyllabus: [
         {
@@ -1109,7 +970,6 @@ export default {
       nubvalue3: ref("4"),
       nubvalue1: ref("4"),
       fileList:ref([]),
-      checked2: false,
       docChecked:true,
       currentPage: 1,
       tableDataTotal: 100,
@@ -1158,80 +1018,7 @@ export default {
         //   test: 1,
         // },
       ],
-      tableData: [
+      tableData: [],
-        {
-          key: 1,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡2",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 2,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡2",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 3,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡2",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 4,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡1",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 5,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡1",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 6,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡2",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 7,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡2",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-        {
-          key: 8,
-          name: "张三",
-          com: "产研部",
-          gang: "产品经理",
-          cur: "关卡2",
-          jin: "2/10",
-          time: "2022-07-15 14:00",
-        },
-      ],
     });
 
     const levelList = reactive({
@@ -1254,31 +1041,15 @@ export default {
       stageList: [ // 阶段列表
         {
           stageId:1,
-          stage:"阶段一"
+          stage:"关卡一"
         },
         {
           stageId:2,
-          stage:"阶段二"
+          stage:"关卡二"
         }
       ]
     })
 
-    // console.log("store", state.routerId);
-    const selectProjectName = (value, index) => {
-      console.log("value", value, index);
-      if (value === "批量删除") {
-        showDeleteALLModal();
-      }
-    };
-    const selectProjectName2 = (value, index) => {
-      console.log("value", value, index);
-    };
-    const selectProjectName3 = (value, index) => {
-      console.log("value", value, index);
-    };
-    const selectProjectName4 = (value, index) => {
-      console.log("value", value, index);
-    };
     const tableDataFunc = () => {
       const columns = [
         {
@@ -1362,7 +1133,7 @@ export default {
                 <div class="opacation">
                   <span
                     onClick={() => {
-                      showCheckStu();
+                      showCheckStu(text.record.studentId);
                     }}
                     style="color:#4EA6FF;margin-right:25px;cursor:pointer"
                   >
@@ -1378,7 +1149,7 @@ export default {
                     调整
                   </span>
                   <span style="color:#4EA6FF;cursor:pointer"
-                  onClick={() => {myDelStudent}}
+                  onClick={() => {delConfirm(text.record.studentId)}}
                   >删除</span>
                 </div>
               </div>
@@ -1410,8 +1181,9 @@ export default {
     const showImpStu = () => {
       state.AddImpStuvisible = true;
     };
-    const showCheckStu = () => {
+    const showCheckStu = (id) => {
       state.CheckStuvisible = true;
+      state.studentId = id;
     };
     const showbtn = () => {
       state.twobtn = false;
@@ -1491,32 +1263,44 @@ export default {
     const getStudent = () => {
       let obj = {
         name: "",
-        pageNo: 0,
+        pageNo: 1,
-        pageSize: 0,
+        pageSize: 10,
-        routerId: state.routerId,
+        routerId: 100,
       };
       api
         .getStudent(obj)
         .then((res) => {
           console.log("获取学员列表", res);
+          let data = res.data.data.rows || null;
+          state.tableData = []
+          if(data.length){
+            for(let i in data) {
+              let _time = new Date(data[i].beginStudyTime*1000);
+              state.tableData.push({
+                key:i+1,
+                com:data[i].userInfoBo.deptName,
+                name:data[i].userInfoBo.userName,
+                gang:data[i].userInfoBo.jobName,
+                cur:data[i].currentChapterName || '0',
+                jin:data[i].completeChapterCnt+'/'+ data[i].totalChapterCnt,
+                time:_time.toLocaleDateString(),
+                studentId:data[i].studentId,
+              })
+              
+              // state.tableData[i].key = i+1;
+              // state.tableData[i].com = data[i].userInfoBo.deptName;
+              // state.tableData[i].name = data[i].userInfoBo.userName
+              // state.tableData[i].gang = data[i].userInfoBo.jobName
+              // state.tableData[i].cur = data[i].currentChapterName || '0'
+              // state.tableData[i].jin = data[i].completeChapterCnt+'/'+ data[i].totalChapterCnt
+              // state.tableData[i].time = _time.toLocaleDateString()
+            }
+          }
         })
         .catch((err) => {
           console.log("获取学员列表失败", err);
         });
     };
-    const myDelStudent = () => {
-      let obj = {
-        "routerId": 0,
-        "studentIds": []
-      };
-      api.methods(obj).then(res => {
-        message.success("删除成功")
-        console.log(res)
-      }).catch(err => {
-        message.error("删除失败"+err)
-        console.log(err)
-      })
-    }
   const checkType = (type) => {
     let typeRules = [
         "",
@@ -1598,13 +1382,28 @@ export default {
       }
     };
 
+    const delConfirm = (id) => {
+        Modal.confirm({
+        title: '是否确认删除',
+        icon: createVNode(ExclamationCircleOutlined),
+        content: '',
+        okText: '确认',
+        cancelText: '取消',
+        onOk(){
+          api.delStudent({routerId:100,studentIds:[id]}).then(res => {
+          message.success("删除成功")
+          console.log(res)
+        }).catch(err => {
+          message.error("删除失败"+err)
+          console.log(err)
+        })
+        }
+      });
+    }
+
     return {
       ...toRefs(state),
       ...toRefs(levelList),
-      selectProjectName,
-      selectProjectName2,
-      selectProjectName3,
-      selectProjectName4,
       showDeleteALLModal,
       closeDeleteALLModal,
       tableDataFunc,
@@ -1631,7 +1430,7 @@ export default {
       changeTabs,
       checkType,
       handleChange,
-      myDelStudent,
+      delConfirm,
     };
   },
 };

src/views/learningpath/LevelAddDetail.vue

@@ -296,7 +296,6 @@
               v-model:routerTaskId="routerTaskId"
               v-model:edit="edit"
               v-model:EditLiveId="EditLiveId"
-             
             />
           </div>
           <div class="lin"></div>
@@ -319,7 +318,6 @@
               v-model:routerTaskId="routerTaskId"
               v-model:edit="edit"
               v-model:EditRefId="EditRefId"
-             
             />
           </div>
           <div class="lin"></div>
@@ -342,7 +340,6 @@
               v-model:chooseStageId="chooseStageId"
               v-model:routerTaskId="routerTaskId"
               v-model:EditDiscussId="EditDiscussId"
-             
             />
           </div>
           <div class="lin"></div>
@@ -584,10 +581,10 @@
                       <div class="opacationt clearfix">
                         <a-switch
                           style="margin-left: -50px; margin-top: 3px"
-                          :checked="element.checked1"
+                          v-model:checked="element.checked1"
                           size="small"
                           active-color="red"
-                          @click="changeCourseType(element.id)"
+                          @click="changeCourseType(element)"
                         />
                         <div class="showt clearfix">
                           <div
@@ -834,7 +831,6 @@
     <!-- 导入学员抽屉 -->
     <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" />
     <!-- 添加讨论侧弹窗 -->
- 
 
     <!-- 添加活动侧弹窗 -->
     <!-- 批量删除学员弹窗 -->
@@ -867,7 +863,7 @@
         </div>
       </div>
     </a-modal>
-   
+
     <!-- 是否确认删除任务弹窗 -->
     <!-- 确认删除阶段弹窗 -->
     <a-modal
@@ -921,6 +917,7 @@ import { message } from "ant-design-vue";
 import { storage } from "../../api/storage";
 import { deleteStudyTask } from "../../api/indexStudy";
 import draggable from "vuedraggable";
+import { editTask } from "../../api/indexTaskadd";
 export default {
   name: "LevelAddDetail",
   components: {
@@ -949,7 +946,7 @@ export default {
           name: "默认关卡",
         },
       ],
-  
+
       tableData: [
         {
           key: 1,
@@ -1150,15 +1147,15 @@ export default {
       editID: "", // 要编辑的任务id
       EditWorkId: "", // 要编辑的 workid
       EditTestId: "",
-      EditRefId:"",
+      EditRefId: "",
-      EditLiveId:"",
+      EditLiveId: "",
-      EditDiscussId:"",
+      EditDiscussId: "",
-      EditActiveId:"",
+      EditActiveId: "",
-      EditEvalId:"",
+      EditEvalId: "",
-      EditInvistId:"",
+      EditInvistId: "",
-      EditVoteId:"",
+      EditVoteId: "",
       routerTaskId: "",
-      chapterId:"",
+      chapterId: "",
       stageId: "",
       cC: false,
       value1: "",
@@ -1181,7 +1178,7 @@ export default {
       selectRow: [], //选择行
       selectAll: 0, //0：未选择，1：全选，2：部分选择
     });
-  
+
     //新建关卡
     const editChapter = () => {
       if (!state.value1) return message.warning("请输入关卡名称");
@@ -1232,7 +1229,7 @@ export default {
     };
     // 作业和考试的抽屉
     const showDrawerAddHomework = (id, eleId) => {
-      console.log("homework==============",id,state.isactive)
+      console.log("homework==============", id, state.isactive);
       state.addhomeworkvisible = true;
       state.EditWorkId = id;
       state.routerTaskId = eleId;
@@ -1253,8 +1250,7 @@ export default {
       // state.addinvistVisible = true;
       state.addinvistvisible = true;
       state.routerTaskId = eleId;
-      state.EditInvistId =id;
+      state.EditInvistId = id;
-     
     };
     const showDrawerAddVote = (id, eleId) => {
       // state.addhomeworkvisible = true;
@@ -1272,7 +1268,7 @@ export default {
       state.EditRefId = id;
       state.routerTaskId = eleId;
     };
-    
+
     const showDrawerAddDiscuss = (id, eleId) => {
       state.adddiscussvisible = true;
       state.EditDiscussId = id;
@@ -1300,6 +1296,10 @@ export default {
               checked1: element.flag,
               routerTaskId: element.routerTaskId,
               courseId: element.courseId,
+              stageId: element.stageId,
+              type: element.type,
+              routerId: element.routerId,
+              chapterId: element.chapterId,
             };
             array.push(obj);
           });
@@ -1347,7 +1347,7 @@ export default {
     const showImpStu = () => {
       state.AddImpStuvisible = true;
     };
-   
+
     const checkType = (index) => {
       let typeRules = [
         "",
@@ -1590,7 +1590,6 @@ export default {
         });
     };
 
-   
     const closeDeleteModel = () => {
       state.deleteModal = false;
       state.deleteID = "";
@@ -1692,7 +1691,6 @@ export default {
         });
     };
 
-
     //编辑的按钮
     const decideType = (type, id, eleId) => {
       state.edit = true;
@@ -1705,22 +1703,21 @@ export default {
         showDrawerAddHomework(id, eleId);
       } else if (type == "考试") {
         showDrawerAddTest(id, eleId);
-      }else if (type == "讨论") {
+      } else if (type == "讨论") {
         showDrawerAddDiscuss(id, eleId);
-      }else if (type == "活动") {
+      } else if (type == "活动") {
         showDrawerAddActive(id, eleId);
-      }else if (type == "测评") {
+      } else if (type == "测评") {
-        showDrawerAddInvist (id, eleId);
+        showDrawerAddInvist(id, eleId);
-      }else if (type == "评估") {
+      } else if (type == "评估") {
-        showDrawerAddEval (id, eleId);
+        showDrawerAddEval(id, eleId);
-      }
+      } else if (type == "投票") {
-      else if (type == "投票") {
         showDrawerAddVote(id, eleId);
       }
     };
     //删除关卡
     const deleteChapter = (chapterId) => {
-      console.log('chapterId',chapterId)
+      console.log("chapterId", chapterId);
       let obj = {
         chapterId: chapterId,
       };
@@ -1733,6 +1730,32 @@ export default {
           console.log("删除关卡失败", err);
         });
     };
+
+    const changeCourseType = (ele) => {
+      console.log("任务id", ele.id);
+      console.log("flag", ele.checked1);
+      let obj = {
+        chapterId: ele.chapterId,
+        courseId: ele.courseId,
+        duration: ele.cretime,
+        flag: ele.checked1,
+        name: ele.creater,
+        routerId: ele.routerId,
+        routerTaskId: ele.routerTaskId,
+        type: ele.type,
+      };
+      editTask(obj)
+        .then((res) => {
+          console.log(`修改状态成功${res.data}`);
+          message.destroy();
+          message.success("修改成功");
+        })
+        .catch((err) => {
+          console.log(`修改状态失败${err.data}`);
+          message.destroy();
+          message.warning("修改失败");
+        });
+    };
     return {
       ...toRefs(state),
       // tableDataFunc,
@@ -1774,6 +1797,7 @@ export default {
       decideType,
       updateTableData,
       deleteChapter,
+      changeCourseType,
     };
   },
 };

src/views/projectcenter/ProjectManage.vue

@@ -1161,7 +1161,6 @@ export default {
       getTableDate();
     };
 
-
     const searchSubmit = () => {
       console.log("点击了搜索");
       state.currentPage = 1;
@@ -2921,6 +2920,9 @@ export default {
                     data.subList.map((data2) => {
                       data2.paraentName = value.name + "/" + data.name;
                       data2.isbj = "class";
+                      storage.set("isbj", data.projectId);
+                      // console.log(data2.paraentName, "conme");
+                      storage.set("pN", data2.paraentName);
                     });
                     // console.log("lalallalaa", data);
                   } else {

src/views/projectcenter/SonProject.vue

@@ -1,6 +1,6 @@
 <!---- 创建单层子项目页面 --->
 <template>
-	<div class="projectAdd">
+	<div class="sonproject">
 		<div class="header">
 			<span class="title">创建/编辑单层子项目</span>
 			<div @click="backPage" style="cursor: pointer;" to="/projectmanage" class="goback">
@@ -765,7 +765,7 @@ export default {
 };
 </script>
 <style lang="scss">
-.projectAdd {
+.sonproject {
 	width: 100%;
 	// height: inherit;
 	// flex: 1;

src/views/projectcenter/TaskAdd.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="allCon">
+  <div class="taskadd">
     <div class="left clearfix">
       <div class="leftmain">
         <div class="tit">
@@ -310,7 +310,7 @@
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
               v-model:projectTaskId="projectTaskId"
-              v-model:EditInvistId = "EditInvistId"
+              v-model:EditInvistId="EditInvistId"
             />
           </div>
           <!-- 添加评估侧弹窗 -->
@@ -332,8 +332,9 @@
                 v-model:projectId="projectId"
                 v-model:chooseStageId="chooseStageId"
                 v-model:projectTaskId="projectTaskId"
-                v-model:voteId = "voteId"
+                v-model:EditVoteId="EditVoteId"
-                v-model:ballotId = "ballotId"
+                v-model:voteId="voteId"
+                v-model:ballotId="ballotId"
               />
             </div>
             <!-- 添加投票侧弹窗 -->
@@ -345,7 +346,7 @@
           <div class="onerow">
             <div class="taskmain">任务列表</div>
             <button class="btn" @click="showChangeModal">移动任务到阶段</button>
-            <div class="edit" @click="deleteTaskAll">
+            <div class="edit" @click="showdeAll">
               <img
                 class="editimg"
                 src="../../assets/images/projectadd/delete.png"
@@ -501,10 +502,10 @@
                         <div class="opacationt clearfix">
                           <a-switch
                             style="margin-left: -50px; margin-top: 3px"
-                            :checked="element.checked1"
+                            v-model:checked="element.checked1"
                             size="small"
                             active-color="red"
-                            @click="changeCourseType(element.id)"
+                            @click="changeCourseType(element)"
                           />
                           <div class="showt clearfix">
                             <div
@@ -795,6 +796,35 @@
         </div>
       </div>
     </a-modal>
+    <a-modal
+      v-model:visible="deAll"
+      :footer="null"
+      :closable="cC"
+      wrapClassName="ConfirmModal"
+      centered="true"
+    >
+      <div class="delete">
+        <div class="del_header"></div>
+        <div class="del_main">
+          <div class="header">
+            <div class="icon"></div>
+            <span>提示</span>
+            <div class="close_exit" @click="closeDeAll"></div>
+          </div>
+          <div class="body">
+            <span>您确定要批量删除任务吗</span>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1">
+              <div class="btnText" @click="closeDeAll">取消</div>
+            </div>
+            <div class="del_btn btn2">
+              <div class="btnText" @click="deleteTaskAll">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
     <!-- 移动任务到阶段 -->
     <a-modal
       style="padding: 0"
@@ -802,7 +832,7 @@
       v-model:visible="visiblene"
       :footer="null"
       centered="true"
-      wrapClassName="changeModal"
+      wrapClassName="moveModal"
     >
       <div class="con">
         <div class="header">
@@ -858,7 +888,6 @@ import * as apimove from "../../api/indexMovetask";
 import draggable from "vuedraggable";
 import { storage } from "../../api/storage";
 
-
 const drawercolumns = [
   {
     title: "项目名称",
@@ -928,17 +957,16 @@ export default {
       isLiveEdit: false, //直播编辑
       EditRefId: null, //要编辑的外链的id
       EditLiveId: null, //要编辑的直播的ids
-      EditDiscussId:null,//要编辑的讨论的id
+      deAll: false,
-      EditActiveId:null,//要编辑的活动id
+      EditDiscussId: null, //要编辑的讨论的id
-      EditWorkId:null, // 要编辑的作业id
+      EditActiveId: null, //要编辑的活动id
-      EditTestId: null,// 要编辑的考试id
+      EditWorkId: null, // 要编辑的作业id
-      EditOnlineId:null, //要编辑的在线id
+      EditTestId: null, // 要编辑的考试id
-      EditEvalId:null,
+      EditEvalId: null,
-      evaluationId: null, //编辑需要的id
+      EditInvistId: null,
-      EditInvistId:null,
       EditVoteId: null, //编辑需要投票的id
       ballotId: "", //编辑需要的题干id
-      projectTaskId:null, // 要编辑的具体任务id
+      projectTaskId: null, // 要编辑的具体任务id
       projectNameList: [
         {
           id: 1,
@@ -1171,6 +1199,9 @@ export default {
           checked1: value.flag ? true : false,
           checked: false, //是否选中类型
           courseId: value.courseId,
+          projectId: value.projectId,
+          stageId: value.stageId,
+          type: value.type,
         };
         array.push(obj);
       });
@@ -1336,7 +1367,6 @@ export default {
             // console.log("22222", res.data.data.stageList);
             let leng = res.data.data.stageList.length;
             if (leng > 0) {
-     
               let arr = res.data.data.stageList[0].taskList;
               console.log("任务列表", arr);
               getTableData(arr);
@@ -1362,8 +1392,6 @@ export default {
         });
     };
 
-
-
     //获取修改、删除id（投票)
     const changeVData = (data) => {
       console.log("获取修改、删除id投票", data);
@@ -1375,7 +1403,7 @@ export default {
       console.log("添加数据", data);
       getTask(data);
     };
-    
+
     //删除任务
     const deleteTask = () => {
       let obj = { projectTaskIds: state.deleteID };
@@ -1432,8 +1460,11 @@ export default {
           })
           .catch((err) => {
             console.log(err);
+            message.destroy();
+            message.warning("批量删除失败");
           });
       });
+      state.deAll = false;
     };
     const onSelectChange = (selectedRowKeys) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
@@ -1516,12 +1547,12 @@ export default {
       state.projectTaskId = eleId;
       state.adddiscussvisible = true;
     };
-   
+
     const showDrawerAddActive = (id, eleId) => {
       state.addactivevisible = true;
       state.EditActiveId = id;
       state.projectTaskId = eleId;
-      console.log("active=======",id);
+      console.log("active=======", id);
     };
     const showDrawerAddEval = (id, eleId) => {
       state.addevalvisible = true;
@@ -1535,6 +1566,7 @@ export default {
       state.projectTaskId = eleId;
     };
     const showDrawerAddVote = (id, eleId) => {
+      console.log(id, eleId, '95835325932953295325');
       state.addvotevisible = true;
       state.EditVoteId = id;
       state.projectTaskId = eleId;
@@ -1584,6 +1616,8 @@ export default {
         });
       }
       state.selectRow = arr;
+      console.log(state.selectRow, "xuanzhong");
+      console.log(Object.prototype.toString.call(state.selectRow));
       //判断是否是全部选择或者是全部未选择来修改selectAll框的样式
       if (arr.length !== 0) {
         if (arr.length === state.tableData.length) {
@@ -1622,11 +1656,33 @@ export default {
       state.selectRow = array;
     };
     //修改任务的课程类型 id为任务id
-    const changeCourseType = (id) => {
+    const changeCourseType = (ele) => {
-      console.log("任务id", id);
+      console.log("任务id", ele.id);
+      console.log("flag", ele.checked1);
+      let obj = {
+        courseId: ele.courseId,
+        duration: ele.cretime == "-" ? 0 : ele.cretime,
+        flag: ele.checked1,
+        name: ele.creater,
+        projectId: ele.projectId,
+        projectTaskId: ele.id,
+        stageId: ele.stageId,
+        type: ele.type,
+      };
+      api
+        .addTask(obj)
+        .then((res) => {
+          console.log(`修改状态成功${res.data}`);
+          message.destroy();
+          message.success("修改成功");
+        })
+        .catch((err) => {
+          console.log(`修改状态失败${err.data}`);
+          message.destroy();
+          message.warning("修改失败");
+        });
     };
- 
+
- 
     //打开测评的弹窗
     const showEditEvalDrawer = (id, eleId) => {
       console.log("222222222222222222222", id);
@@ -1661,6 +1717,17 @@ export default {
         showDrawerOnline(id, eleId);
       }
     };
+    const showdeAll = () => {
+      if (state.selectRow.length == 0) {
+        message.destroy();
+        return message.warning("请选择要删除的任务");
+      } else {
+        state.deAll = true;
+      }
+    };
+    const closeDeAll = () => {
+      state.deAll = false;
+    };
     return {
       ...toRefs(state),
       selectProjectName,
@@ -1708,8 +1775,8 @@ export default {
       moveTask,
       deleteTaskAll,
       decideType,
-      
+      showdeAll,
-      
+      closeDeAll,
     };
   },
 };
@@ -1857,8 +1924,77 @@ export default {
       }
     }
   }
+
+  .name {
+    width: 78%;
+    // background-color: lightcoral;
+    display: flex;
+    margin-top: 20px;
+    align-items: center;
+    //height: 40px;
+    // border: 1px solid black;
+    .namebox {
+      width: 120px;
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+      flex-shrink: 0;
+      .nameimg {
+        width: 10px;
+        height: 10px;
+      }
+    }
+    .d {
+      margin-top: 8px;
+      font-size: 25px;
+      color: #ff4e4e;
+    }
+    .box {
+      position: relative;
+      margin-left: 14px;
+      .box1 {
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        width: 50px;
+        margin-left: -25px;
+        margin-top: -5px;
+        border-top: 2px solid rgba(78, 166, 255, 1);
+      }
+      .box2 {
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        height: 50px;
+        //margin-left: -5px;
+        margin-top: -25px;
+        border-left: 2px solid rgba(78, 166, 255, 1);
+      }
+    }
+    .inname {
+      color: #000000;
+      font-size: 14px;
+      margin-left: 7px;
+    }
+    .in {
+      margin-left: 14px;
+      flex: 1;
+      // .ant-radio-wrapper {
+      // }
+      .ant-input-affix-wrapper {
+        width: 384px;
+        border-radius: 8px;
+      }
+      .ant-input {
+        border-radius: 8px;
+        // height: 120%;
+        //width: 384px;
+        height: 30px;
+      }
+    }
+  }
 }
-.changeModal {
+.moveModal {
   .ant-modal {
     width: 549px !important;
     height: 245px !important;
@@ -1959,179 +2095,112 @@ export default {
     }
   }
 }
-.info {
+// .info {
-  width: 78%;
+//   width: 78%;
-  // background-color: lightcoral;
+//   // background-color: lightcoral;
-  display: flex;
+//   display: flex;
-  margin-top: 30px;
+//   margin-top: 30px;
-  // align-items: center;
+//   // align-items: center;
-  // height: 40px;
+//   // height: 40px;
-  // border: 1px solid black;
+//   // border: 1px solid black;
 
-  .inname {
+//   .inname {
-    color: #6f6f6f;
+//     color: #6f6f6f;
-    font-size: 14px;
+//     font-size: 14px;
-    margin-left: 26px;
+//     margin-left: 26px;
-    margin-top: 15px;
+//     margin-top: 15px;
-  }
+//   }
-  .in {
+//   .in {
-    margin-left: 14px;
+//     margin-left: 14px;
-    width: 81%;
+//     width: 81%;
-    position: relative;
+//     position: relative;
-    .ant-input {
+//     .ant-input {
-      border-radius: 5px;
+//       border-radius: 5px;
-      // height: 120%;
+//       // height: 120%;
-      width: 100%;
+//       width: 100%;
-      height: 130px;
+//       height: 130px;
-      resize: none;
+//       resize: none;
-    }
+//     }
-  }
+//   }
-}
+// }
-.name {
-  width: 78%;
-  // background-color: lightcoral;
-  display: flex;
-  margin-top: 20px;
-  align-items: center;
-  //height: 40px;
-  // border: 1px solid black;
-  .namebox {
-    width: 120px;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    flex-shrink: 0;
-    .nameimg {
-      width: 10px;
-      height: 10px;
-    }
-  }
-  .d {
-    margin-top: 8px;
-    font-size: 25px;
-    color: #ff4e4e;
-  }
-  .box {
-    position: relative;
-    margin-left: 14px;
-    .box1 {
-      position: absolute;
-      left: 50%;
-      top: 50%;
-      width: 50px;
-      margin-left: -25px;
-      margin-top: -5px;
-      border-top: 2px solid rgba(78, 166, 255, 1);
-    }
-    .box2 {
-      position: absolute;
-      left: 50%;
-      top: 50%;
-      height: 50px;
-      //margin-left: -5px;
-      margin-top: -25px;
-      border-left: 2px solid rgba(78, 166, 255, 1);
-    }
-  }
-  .inname {
-    color: #000000;
-    font-size: 14px;
-    margin-left: 7px;
-  }
-  .in {
-    margin-left: 14px;
-    flex: 1;
-    // .ant-radio-wrapper {
-    // }
-    .ant-input-affix-wrapper {
-      width: 384px;
-      border-radius: 8px;
-    }
-    .ant-input {
-      border-radius: 8px;
-      // height: 120%;
-      //width: 384px;
-      height: 30px;
-    }
-  }
-}
-.drawerStyle {
-  .ant-drawer-content-wrapper {
-    // max-width: 1000px;
-    .ant-drawer-header {
-      display: none !important;
-    }
-    .ant-drawer-body {
-      padding: 0;
-    }
-  }
-  .drawerMain {
-    min-width: 600px;
-    margin: 0px 32px 0px 32px;
-    overflow-x: auto;
-    display: flex;
-    flex-direction: column;
-    .header {
-      height: 73px;
-      border-bottom: 1px solid #e8e8e8;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      // background-color: red;
-      margin-bottom: 20px;
-      .headerTitle {
-        font-size: 18px;
-        font-weight: 600;
-        color: #333333;
-        line-height: 25px;
-        // margin-left: 24px;
-      }
-    }
-    .drawerbox {
-      margin: 20px 38px 30px;
-      th {
-        background-color: #eff4fc !important;
-      }
 
-      .ant-table-tbody
+// .drawerStyle {
-        > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+//   .ant-drawer-content-wrapper {
-        > td {
+//     // max-width: 1000px;
-        background: #f6f9fd;
+//     .ant-drawer-header {
-      }
+//       display: none !important;
-    }
+//     }
-    .btnn {
+//     .ant-drawer-body {
-      height: 72px;
+//       padding: 0;
-      width: 100%;
+//     }
-      position: absolute;
+//   }
-      bottom: 0;
+//   .drawerMain {
-      left: 0;
+//     min-width: 600px;
-      display: flex;
+//     margin: 0px 32px 0px 32px;
-      align-items: center;
+//     overflow-x: auto;
-      justify-content: center;
+//     display: flex;
-      box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+//     flex-direction: column;
-      .btn1 {
+//     .header {
-        width: 100px;
+//       height: 73px;
-        height: 40px;
+//       border-bottom: 1px solid #e8e8e8;
-        border: 1px solid #4ea6ff;
+//       display: flex;
-        border-radius: 8px;
+//       justify-content: space-between;
-        color: #4ea6ff;
+//       align-items: center;
-        background-color: #fff;
+//       // background-color: red;
-        cursor: pointer;
+//       margin-bottom: 20px;
-      }
+//       .headerTitle {
-      .btn2 {
+//         font-size: 18px;
-        cursor: pointer;
+//         font-weight: 600;
-        width: 100px;
+//         color: #333333;
-        height: 40px;
+//         line-height: 25px;
-        background: #4ea6ff;
+//         // margin-left: 24px;
-        border-radius: 8px;
+//       }
-        border: 0;
+//     }
-        margin-left: 15px;
+//     .drawerbox {
-        color: #fff;
+//       margin: 20px 38px 30px;
-      }
+//       th {
-    }
+//         background-color: #eff4fc !important;
-  }
+//       }
-}
+
-.allCon {
+//       .ant-table-tbody
+//         > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+//         > td {
+//         background: #f6f9fd;
+//       }
+//     }
+//     .btnn {
+//       height: 72px;
+//       width: 100%;
+//       position: absolute;
+//       bottom: 0;
+//       left: 0;
+//       display: flex;
+//       align-items: center;
+//       justify-content: center;
+//       box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+//       .btn1 {
+//         width: 100px;
+//         height: 40px;
+//         border: 1px solid #4ea6ff;
+//         border-radius: 8px;
+//         color: #4ea6ff;
+//         background-color: #fff;
+//         cursor: pointer;
+//       }
+//       .btn2 {
+//         cursor: pointer;
+//         width: 100px;
+//         height: 40px;
+//         background: #4ea6ff;
+//         border-radius: 8px;
+//         border: 0;
+//         margin-left: 15px;
+//         color: #fff;
+//       }
+//     }
+//   }
+// }
+.taskadd {
   width: 100%;
   display: flex;
   min-width: 933px;

src/views/system/SystemManage.vue

@@ -89,6 +89,12 @@
     <div @click="downloadQr(400)">下载400</div>
     <div @click="downloadQr(800)">下载800</div>
   </div>
+
+<div @click="changeCodevisible">显示二维码弹窗</div>
+  <two-dimensional-code v-model:codevisible="codevisible" :codeInfo="codeInfo" index="0"/>
+
+  <div @click="changeCodevisible2">显示二维码弹窗22</div>
+  <two-dimensional-code v-model:codevisible="codevisible2" :codeInfo="codeInfo2" index="1"/>
 </template>
 <script>
 import { reactive, toRefs } from "vue";
@@ -105,6 +111,8 @@ import { useRouter } from "vue-router";
 import draggable from "vuedraggable";
 import QrcodeVue from "qrcode.vue";
 import html2canvas from "html2canvas";
+
+import TwoDimensionalCode from '../../components/TwoDimensionalCode.vue'
 export default {
   name: "SystemManage",
   components: {
@@ -113,6 +121,7 @@ export default {
     // PlusOutlined,
     draggable,
     QrcodeVue,
+    TwoDimensionalCode
   },
   setup() {
     const state = reactive({
@@ -148,8 +157,14 @@ export default {
           name: "拖拽六",
         },
       ],
+      
       qrcodeUrl: "https://www.baidu.com/",
       qrcodeSize:800,
+
+      codevisible:false,
+      codeInfo:{},
+      codevisible2:false,
+      codeInfo2:{}
     });
 
     const showDrawer = () => {
@@ -303,6 +318,24 @@ let canvasBox = document.createElement('canvas');
       //   a.click();
       });
     };
+
+    //显示二维码弹窗
+    const changeCodevisible=()=>{
+      state.codevisible=true
+      state.codeInfo={
+        title:"签到二维码",
+        name:'管理者进阶面授课程',
+        url:"https://www.baidu.com/",
+      }
+    }
+    const changeCodevisible2=()=>{
+      state.codevisible2=true
+      state.codeInfo2={
+        title:"签到二维码2222",
+        name:'管理者进阶面授课程2222',
+        url:"https://blog.csdn.net/qq_44034384/article/details/93612152",
+      }
+    }
     return {
       ...toRefs(state),
       showDrawer,
@@ -311,6 +344,8 @@ let canvasBox = document.createElement('canvas');
       beforeUpload,
       golearningpath,
       downloadQr,
+      changeCodevisible,
+      changeCodevisible2,
     };
   },
 };