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

src/components/drawers/AddLive.vue

@@ -188,10 +188,12 @@
               <span style="margin-right: 3px">回放设置：</span>
             </div>
             <div class="btnbox">
-              <a-switch v-model:checked="formData.livePlayback"/>
+              <a-switch v-model:checked="formData.livePlayback"
+              @change="getchange(formData.livePlayback)"
+              />
             </div>
           </div>
-          <div v-if="switchC1">
+          <div v-if="formData.livePlayback">
             <div class="main_item">
               <div class="signbox">
                 <span style="margin-right: 3px">回放链接：</span>
@@ -325,6 +327,9 @@ const removePG = () => {
   formData.value.assessmentId = ''
   formData.value.assessmentName = ''
 };
+const getchange=(mess)=> {
+      console.log(mess); //输出true或者false
+};
 const props = defineProps({
   type: Number,
   taskList: []
@@ -493,11 +498,14 @@ const beforeUpload = (file) => {
   formDatas.append("file", file);
   fileUp(formDatas).then((res) => {
     if (res.data.code === 200) {
-      console.log(res)
-      imageUrl.value = res.data
-      formData.value.liveCover = res.data
+      console.log(res.data.data,45);
+        imageUrl.value = process.env.VUE_APP_FILE_PATH +res.data.data
+        formData.value.liveCover =process.env.VUE_APP_FILE_PATH + res.data.data
+      
+
+      
       // state.hasImgName = file.name;
-      // emit("src", { id: curItem.value.id, src: res.data.data });
+      // emit("src", { id: '', src: res.data.data });
     }
   });
   return false;

src/components/drawers/AddOnline.vue

@@ -11,79 +11,28 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div v-if="taskIndex>=0" class="headerTitle">编辑在线</div>
-        <div v-else class="headerTitle">添加在线</div>
-        <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
-        />
+        <div class="headerTitle">{{ taskIndex === -1 ? "编辑" : "添加" }}任务</div>
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
+             @click="closeDrawer"/>
       </div>
-      <div class="contentMain">
-        <div class="main_items">
-          <div class="mi_ipts">
-            <div class="mii_ipt">
-              <div class="ipt_name"></div>
-              <div class="fi_input">
-                <a-input
-                    v-model:value="params.keyword"
-                    style="
-                    width: 280px;
-                    height: 40px;
-                    border-radius: 8px;
-                    padding-right: 49px;
-                  "
-                    placeholder="请输入课程名称"
-                    maxlength="20"
-                />
-                <div class="inp_num" style="position: absolute; right: 7px">
-                  <span style="color: #c7cbd2"> </span>
-                </div>
-              </div>
-            </div>
-            <div class="mii_ipt">
-              <div class="ipt_name">课程分类：</div>
-              <div class="select">
-                <a-select
-                    v-model:value="params.type"
-                    dropdownClassName="dropdown-style"
-                    style="width: 240px"
-                    placeholder="请选择课程分类"
-                    :options="categoryOption"
-                    allowClear
-                />
-              </div>
-            </div>
-          </div>
-          <div class="mi_btns">
-            <div class="btn btn1" @click="fetch()">
-              <div class="search"></div>
-              <div class="btnText">搜索</div>
-            </div>
-            <div class="btn btn2" @click="reset()">
-              <div class="search"></div>
-              <div class="btnText">重置</div>
-            </div>
-          </div>
-        </div>
-        <div class="main_table">
-          <div>
-            <div>
-              <a-table
-                  :customRow="customRow"
-                  class="ant-table-striped"
-                  :row-class-name="(_, index) => (index % 2 === 1 ? 'table-striped' : null)"
-                  row-key="id"
-                  :columns="columns"
-                  :data-source="data"
-                  :loading="loading"
-                  :pagination="pagination"
-                  :row-selection="rowSelection"
-              />
-            </div>
-          </div>
+      <div>
+        <div class="contentMain" style="padding:20px">
+          <CreateOnline>
+            <a-button type="primary" style="border-radius: 4px">{{
+                taskIndex === -1 ? '选择/新建课程' : '重新选择'
+              }}
+            </a-button>
+          </CreateOnline>
         </div>
       </div>
+      <div class="drawerMain">
+        <a-table
+            :columns="columns"
+            :data-source="selectsData"
+            row-key="id"
+            :pagination="false"
+        />
+      </div>
       <div class="main_btns">
         <button class="btn1" @click="closeDrawer">取消</button>
         <button class="btn2" @click="confirm">确定</button>
@@ -92,10 +41,9 @@
   </a-drawer>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, ref, watch} from "vue";
-import {useBoeApiPage} from "@/api/request";
-import {ONLINE_PAGE} from "@/api/ThirdApi";
+import {defineEmits, defineProps, ref, watch} from "vue";
 import {message} from "ant-design-vue";
+import CreateOnline from "@/components/drawers/CreateOnline.vue";
 
 const props = defineProps({
   type: Number,
@@ -107,146 +55,61 @@ const rowSelectKeys = ref([]);
 const selectsData = ref([]);
 
 const emit = defineEmits({})
-
-watch(taskIndex, () => {
-  if (taskIndex.value >= 0) {
-    rowSelectKeys.value = [props.taskList[taskIndex.value].courseId]
-    selectsData.value = data.value.find(t => t.id === props.taskList[taskIndex.value].courseId) || {}
-  }
-})
-
-const categoryOption = ref([
-  {
-    value: 10,
-    label: "微课",
-  },
-  {
-    value: 20,
-    label: "录播课",
-  },
-  {
-    value: 21,
-    label: "直播",
-  },
-  {
-    value: 30,
-    label: "面授",
-  },
-  {
-    value: 90,
-    label: "混合",
-  },
-
-])
-
 const columns = ref([
   {
-    title: "名称",
+    title: "课程名称",
     dataIndex: "name",
     key: "name",
-    width: "30%",
+    width: "200px",
     ellipsis: true,
   },
   {
     title: "课程分类",
     dataIndex: "type",
     key: "type",
-    width: "15%",
+    width: "100px",
     align: "center",
-    ellipsis: true,
     customRender: ({record: {type}}) => ({10: '微课', 21: '直播', 20: '录播', 30: '面授', 90: '混合'}[type]),
   },
   {
     title: "创建人",
-    dataIndex: "sysCreateBy",
-    key: "sysCreateBy",
-    width: "15%x",
+    dataIndex: "authorName",
+    key: "authorName",
+    width: "100px",
     align: "center",
-    ellipsis: true,
   },
   {
     title: "时长",
-    dataIndex: "studyTime",
-    key: "studyTime",
-    width: "15%x",
+    dataIndex: "authorName",
+    key: "authorName",
+    width: "80px",
     align: "center",
-    ellipsis: true,
   },
   {
     title: "发布时间",
     dataIndex: "publishTime",
     key: "publishTime",
-    width: "25%",
+    width: "100px",
     align: "center",
-    ellipsis: true,
   },
 ])
-const params = ref({
-  keyword: '',
-  pageIndex: 1,
-  pageSize: 10,
-  orderAsc: true,
-  publish: true,
-  contenttype: 20
-})
-
-const {data, loading, total, fetch} = useBoeApiPage(ONLINE_PAGE, params.value, {
-  init: false,
-  result: res => res.result.list,
-  totalPage: res => res.result.totalPages,
-  total: res => res.result.count
-})
-
-
-const pagination = computed(() => ({
-  total: total.value,
-  showSizeChanger: false,
-  current: params.value.pageIndex,
-  pageSize: params.value.pageSize,
-  onChange: changePagination,
-}));
-
-const customRow = (record) => ({
-  onClick: () => {
-    rowSelectKeys.value = [record.id]
-    selectsData.value = [record]
+watch(taskIndex, () => {
+  if (taskIndex.value >= 0) {
+    rowSelectKeys.value = []
   }
 })
 
-const changePagination = (e) => {
-  params.value.pageIndex = e;
-  fetch()
-};
-const rowSelection = computed(() => ({
-  type: 'radio',
-  columnWidth: 20,
-  selectedRowKeys: rowSelectKeys.value,
-  onChange: onSelectChange,
-  preserveSelectedRowKeys: true,
-}));
-
-function onSelectChange(e, l) {
-  rowSelectKeys.value = e;
-  selectsData.value = l;
-}
-
-function reset() {
-  rowSelectKeys.value = [];
-  selectsData.value = [];
-  params.value.pageIndex = 1
-  params.value.keyword = ''
-  fetch()
-}
 
 const closeDrawer = () => {
   visible.value = false
   taskIndex.value = -1
-  reset()
+  selectsData.value = []
+  rowSelectKeys.value = []
 };
 
 function confirm() {
   if (!selectsData.value.length || !rowSelectKeys.value.length) {
-    message.warning("请选择案例！");
+    message.warning("请选择在线课！");
     return
   }
   if (taskIndex.value === -1) {
@@ -267,14 +130,20 @@ function confirm() {
   closeDrawer()
 }
 
+function selectCourse(id, name) {
+  rowSelectKeys.value = [id]
+  selectsData.value = [{id, name}]
+}
+
 function openDrawer(i, row) {
-  row && (rowSelectKeys.value = [row.info]);
-  row && (selectsData.value = [{name: row.name, id: row.courseId}]);
+  window.selectCourse = selectCourse
+  row && (rowSelectKeys.value = [row.courseId]);
+  row && (selectsData.value = [row.info]);
   (i >= 0) && (taskIndex.value = i);
   visible.value = true
 }
 
-defineExpose({openDrawer})
+defineExpose({openDrawer, selectCourse})
 </script>
 <style lang="scss">
 

src/components/drawers/CreateOnline.vue

@@ -0,0 +1,394 @@
+<template>
+  <div @click="openModal">
+    <slot></slot>
+  </div>
+  <a-modal
+      :visible="visible"
+      :footer="null"
+      :centered="true"
+      :maskClosable="false"
+      width="679"
+      height="437"
+      @cancel="closeModal"
+  >
+    <iframe
+        id="iframe"
+        style="width: 800px; height: 500px"
+        :src="iframeUrl + '/course/manages?f=choose'"
+        name="myframe"
+        security="restricted"
+        sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+    ></iframe>
+  </a-modal>
+</template>
+<script setup>
+import {ref} from "vue";
+import {iframeUrl} from "@/api/method";
+
+const visible = ref(false)
+
+function openModal() {
+  window.selectCourse(1,'测试测试测试测试测试测试')
+  visible.value = true
+}
+
+function closeModal() {
+  visible.value = false
+}
+
+</script>
+<style lang="scss">
+
+
+.ant-table-striped :deep(.table-striped) td {
+  background-color: #fafafa !important;
+}
+
+.addonlineDrawer {
+  .drawerMain {
+    .header {
+      height: 73px;
+      border-bottom: 1px solid #e8e8e8;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      flex-shrink: 0;
+
+      .headerTitle {
+        font-size: 18px;
+        font-weight: 600;
+        color: #333333;
+        line-height: 25px;
+        margin-left: 24px;
+      }
+    }
+
+    .contentMain {
+      padding-right: 12px;
+
+      .main_items {
+        display: flex;
+
+        margin-top: 32px;
+        margin-bottom: 12px;
+        flex-wrap: wrap;
+
+        .mi_ipts {
+          display: flex;
+          margin-bottom: 20px;
+
+          .mii_ipt {
+            display: flex;
+            align-items: center;
+            margin-right: 24px;
+
+            .ipt_name {
+              white-space: nowrap;
+            }
+          }
+        }
+
+        .mi_btns {
+          display: flex;
+          margin-left: 38px;
+          margin-bottom: 20px;
+          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;
+            justify-content: center;
+            margin-left: 14px;
+            flex-shrink: 0;
+
+            .search {
+              background-size: 100%;
+            }
+
+            .btnText {
+              font-size: 14px;
+              font-weight: 400;
+              line-height: 36px;
+              margin-left: 5px;
+            }
+          }
+
+          .btn1 {
+            background: rgb(64, 158, 255);
+
+            .search {
+              width: 15px;
+              height: 17px;
+              background-image: url("@/assets/images/coursewareManage/search0.png");
+            }
+
+            .btnText {
+              color: rgb(255, 255, 255);
+            }
+          }
+
+          .btn2 {
+            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: #4ea6ff;
+            }
+          }
+
+          .btn2:hover {
+            background: rgba(64, 158, 255, 1);
+
+            .search {
+              background-image: url("@/assets/images/courseManage/reset0.png");
+            }
+
+            .btnText {
+              color: #ffffff;
+            }
+          }
+        }
+      }
+
+      .main_notice {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 3px;
+        height: 40px;
+        background-color: #e9f6fe;
+
+        .mntc_left {
+          display: flex;
+          align-items: center;
+
+          .notice_icon {
+            width: 14px;
+            height: 14px;
+            margin-right: 9px;
+            margin-left: 9px;
+            background-image: url(@/assets/images/coursewareManage/gan.png);
+            background-size: 100% 100%;
+          }
+        }
+
+        .mntc_right {
+          cursor: pointer;
+        }
+      }
+
+      .main_table {
+        position: relative;
+        padding-bottom: 80px;
+
+        .ant-checkbox-wrapper {
+          align-items: center;
+          margin-top: -2px;
+        }
+
+        .ant-table-selection-column {
+          padding: 0px !important;
+          padding-left: 5px !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;
+        }
+
+        .pa {
+          left: 0;
+          width: 100%;
+          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;
+      }
+    }
+  }
+}
+
+.changeModal {
+  .ant-modal {
+    width: 549px !important;
+    height: 245px !important;
+
+    .ant-modal-close-x {
+      display: none;
+    }
+
+    .ant-modal-content {
+      width: 549px !important;
+      height: 245px !important;
+
+      .ant-modal-body {
+        padding: 0 !important;
+        width: 549px !important;
+        height: 245px !important;
+
+        .con {
+          // background-color: #bfa;
+          width: 100%;
+          height: 100%;
+
+          .header {
+            width: 100%;
+            display: flex;
+            height: 68px;
+            position: relative;
+            justify-content: center;
+
+            background: linear-gradient(
+                    rgba(78, 166, 255, 0.2) 0%,
+                    rgba(78, 166, 255, 0) 100%
+            );
+
+            .inhe {
+              width: 80%;
+              height: 100%;
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+
+              .mod {
+                left: 30px;
+                top: 27px;
+                position: absolute;
+                width: 18px;
+                height: 17px;
+                background-image: url(../../assets/images/leveladd/mod.png);
+              }
+
+              .tz {
+                color: #000000;
+                font-weight: 400;
+                font-size: 16px;
+              }
+
+              .mg {
+                width: 20px;
+                height: 20px;
+                background-image: url(../../assets/images/basicinfo/close22.png);
+                background-size: 100% 100%;
+                cursor: pointer;
+              }
+            }
+          }
+
+          .mid {
+            width: 100%;
+            display: flex;
+            height: 100%;
+            justify-content: center;
+
+            .inher {
+              width: 80%;
+              height: 100%;
+
+              .cur {
+                color: #6f6f6f;
+                font-size: 14px;
+              }
+
+              .select {
+                margin-top: 10px;
+              }
+
+              .btn {
+                width: 100%;
+                display: flex;
+                justify-content: center;
+                margin-top: 30px;
+
+                .sameb {
+                  width: 100px;
+                  height: 40px;
+                  font-size: 14px;
+
+                  border-radius: 8px;
+                }
+
+                .btn1 {
+                  color: #4ea6ff;
+                  background: #ffffff;
+                  border: 1px solid #4ea6ff;
+                }
+
+                .btn2 {
+                  margin-left: 16px;
+                  border: 0;
+                  color: #ffffff;
+                  background: #4ea6ff;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/components/drawers/EvList.vue

@@ -17,7 +17,7 @@
               <div class="ipt_name"></div>
               <div class="fi_input">
                 <a-input v-model:value="params.keyword" style="width: 424px; height: 40px; border-radius: 8px"
-                         placeholder="请输入项目名称"/>
+                         placeholder="请输入测评名称"/>
               </div>
             </div>
           </div>
@@ -117,11 +117,18 @@ const taskIndex = ref(-1);
 
 const {data, loading, total, fetch} = useBoeApiPage(TEST_PAGE, params.value, {
   init: false,
-  result: res => res.result.data,
+  result: res => {
+    let newArr = []
+    for(let i=0;i<res.result.data.length;i++){
+      res.result.data[i].id = res.result.data[i].quiz_kid;
+      newArr.push(res.result.data[i])
+    }
+    return newArr
+  },
   totalPage: res => res.result.total_page_num,
   total: res => res.result.count
 })
-
+console.log(data)
 watch(taskIndex, () => {
   if (taskIndex.value >= 0) {
     rowSelectKeys.value = [props.taskList[taskIndex.value].courseId]
@@ -182,11 +189,11 @@ const closeDrawer = () => {
 
 function confirm() {
   if (!selectsData.value.length || !rowSelectKeys.value.length) {
-    message.warning("请选择案例！");
+    message.warning("请选择测评！");
     return
   }
   if (taskIndex.value === -1) {
-    const list = props.taskList
+    let list = props.taskList
     list.push({
       name: selectsData.value[0].title,
       type: 3,

src/components/drawers/TaskFaceIn.vue

@@ -190,14 +190,25 @@ export default {
       type: Boolean,
       default: false,
     },
+    projectId: {
+      type: Number,
+      default: null,
+    },
+    studentId: {
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
-    console.log(1222)
     const state = reactive({
       fileType: ["xls", "xlsx"],
       importLeader:
         process.env.VUE_APP_BASE_API +
-        `/admin/studentGroup/importGroup/${props.projectId}`,
+        `/admin/offcourse/importGroup/${props.routerId}`,
       uploadpercent: -1,
       uploadErr: false, //上传失败
       addLoading: false,

src/components/student/OnlineClassModelStudent.vue

@@ -2,22 +2,22 @@
   <a-modal
       :visible="visiable"
       :centered="true"
-      :width="1000"
+      width="70%"
       title="学员管理"
       @cancel="closeDrawer"
   >
     <div class="header-content">
-      <div>
-          xxxxxxxx课程
+      <div style="font-size: 16px">
+        xxxxxxxx  课程
       </div>
       <div>
-        内容分类:12312
+        <span style="color:#999">内容分类</span>：12312
       </div>
       <div>
-        授课教师:12312
+        <span style="color:#999">授课教师</span>：12312
       </div>
       <div>
-        状态审核:12312
+        <span style="color:#999">审核状态</span>：12312
       </div>
     </div>
     <div class="TableStudent">
@@ -41,21 +41,14 @@
               style="background: #4ea6ff; color: #fff; width: 100px"
               @click="searchStu"
           >
-            <template #icon>
-              <img
-                  style="margin-right: 10px"
-                  src="../../assets/images/courseManage/search0.png"
-              /></template>
+            <template #icon><img style="margin-right: 10px" src="../../assets/images/courseManage/search0.png"/>
+            </template>
             搜索
           </a-button>
         </a-col>
         <a-col :span="2">
           <a-button class="cus-btn white" style="width: 100px" @click="reset">
-            <template #icon>
-              <img
-                  style="margin-right: 10px"
-                  src="../../assets/images/leveladd/reset.png"
-              /></template>
+            <template #icon><img style="margin-right: 10px" src="../../assets/images/leveladd/reset.png"/></template>
             重置
           </a-button>
         </a-col>
@@ -65,7 +58,6 @@
           type="flex"
           gutter="12"
           style="padding-left: 20px; margin-right: 0px"
-          v-if="checkPer(permissions)"
       >
         <a-col :span="1.5">
           <CommonStudent
@@ -75,103 +67,12 @@
               :stage="stage"
           >
             <a-button class="cus-btn" style="background: #4ea6ff; color: #fff">
-              <template #icon
-              ><img
-                  style="margin-right: 10px"
-                  src="../../assets/images/courseManage/add0.png"
-              /></template>
+              <template #icon><img style="margin-right: 10px" src="../../assets/images/courseManage/add0.png"/>
+              </template>
               添加学员
             </a-button>
           </CommonStudent>
         </a-col>
-        <!-- 新加导入学员 批量换组 导出学习信息  -->
-        <a-col :span="1.5" v-if="type === 1 || type === 2">
-          <a-button class="cus-btn white" @click="showImpStu">
-            <template #icon
-            ><img
-                style="margin-right: 10px"
-                src="../../assets/images/basicinfo/in2.png"
-            /></template>
-            导入学员
-          </a-button>
-        </a-col>
-        <!--
-        <a-col :span="1.5" v-if="type === 1">
-          <a-button class="cus-btn white"> 批量换组 </a-button>
-        </a-col>-->
-        <a-col :span="1.5" v-if="type === 1">
-          <a-button class="cus-btn white" @click="exportTaskStu">
-            导出学习信息
-          </a-button>
-        </a-col>
-
-        <a-col :span="1.5" v-if="type === 2">
-          <a-button class="cus-btn white" @click="exportTaskStuRouter">
-            导出学习信息
-          </a-button>
-        </a-col>
-        <a-col :span="1.5">
-          <a-button class="cus-btn white" @click="bathDel">
-            <template #icon
-            ><img
-                style="margin-right: 10px"
-                src="../../assets/images/projectadd/delete.png"
-            /></template>
-            批量删除
-          </a-button>
-        </a-col>
-        <a-col :span="1.5" v-if="type === 2">
-          <a-button class="cus-btn white" @click="showChangeModal">
-            <template #icon></template>
-            批量调整关卡
-          </a-button>
-        </a-col>
-        <!-- 新加批量操作、导出、导出作业 -->
-        <a-col :span="1.5" v-if="type === 3" class="batchOpera">
-          <div class="stmm_btn btn4" @click="hideShow">
-            <div class="btn4_sub">
-              <span style="color: #4ea6ff; margin-right: 4px"> 批量操作 </span>
-              <div
-                  class="b_zk"
-                  :style="{ display: hideshow ? 'block' : 'none' }"
-              ></div>
-              <div
-                  class="b_sq"
-                  :style="{ display: hideshow ? 'none' : 'block' }"
-              ></div>
-            </div>
-            <div
-                class="btn4_sup"
-                :style="{ display: hideshow ? 'none' : 'block' }"
-            >
-              <div class="btnsbox">
-                <div class="btn4_tit" @click="showEScoreModal">
-                  <span>批量录入成绩</span>
-                </div>
-                <div class="btn4_op1" @click="updateStatus(1)">
-                  <span>批量结业</span>
-                </div>
-                <div class="btn4_op2" @click="updateStatus(0)">
-                  <span>批量通过</span>
-                </div>
-                <div class="btn4_op3" @click="updateStatus(2)">
-                  <span>批量拒绝</span>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="stmm_btn btn5" @click="exportStu">
-            <div class="export"></div>
-            <div class="btnText">导出</div>
-          </div>
-          <div
-              class="stmm_btn btn5"
-              style="margin-left: 15px"
-              @click="exportHomeWorkShow"
-          >
-            <div class="btnText">导出作业</div>
-          </div>
-        </a-col>
       </a-row>
       <div style="margin-top: 20px">
         <a-table
@@ -194,7 +95,7 @@
   </a-modal>
 </template>
 <script setup>
-import {computed, createVNode, defineProps, defineExpose, ref, watch} from "vue";
+import {computed, createVNode, defineExpose, defineProps, ref, watch} from "vue";
 import {usePage} from "@/api/request";
 import {STUDENT_LIST} from "@/api/apis";
 import {delStudentList} from "@/api/index1";
@@ -339,14 +240,16 @@ defineExpose({
 })
 </script>
 <style lang="scss">
-.header-content{
-  padding:20px;
-  border:1px solid #eef9f3;
+.header-content {
+  padding: 20px;
+  border: 1px solid #eef9f3;
   margin-bottom: 20px;
-  div{
+
+  div {
     margin-top: 10px;
   }
 }
+
 .cus-btn {
   width: 100%;
   height: 40px;

src/components/student/TableStudent.vue

@@ -795,7 +795,11 @@ const AddImpStuvisibleClose = (isget) => {
   if (isget) {
     getStuList();
   }
-};
+}
+function startLoading(){
+  tableData.value.loading = true;
+}
+defineExpose({getStuList,startLoading})
 </script>
 <style lang="scss">
 .TableStudent {

src/components/vote/AddVote.vue

@@ -74,7 +74,7 @@
               <span>创建投票题干：</span>
             </div>
             <div class="btnbox">
-              <CreateVote v-model:options="formData.voteStemDtoList">
+              <CreateVote v-model:options="formData.voteStemDtoList" :list="formData.voteStemDtoList">
                 <button class="xkbtn">
                   {{ formData.voteStemDtoList.length ? "编辑" : "创建" }}投票题干
                 </button>

src/components/vote/CreateVote.vue

@@ -71,28 +71,58 @@
   </a-drawer>
 </template>
 <script setup>
-import {defineEmits, defineProps, ref} from "vue";
+import {defineEmits, defineProps, ref, watch} from "vue";
 import VoteQuestion from "./VoteQuestion.vue";
 
-defineProps({
-  options: []
+const prop = defineProps({
+  options: [],
+  list: []
 })
 const emit = defineEmits({})
-const formData = ref({list: []})
+const formData = ref({list: [{}]})
+const initData = ref({list: [{}]})
+
+console.log(prop.options.length);
 
 const visible = ref(false)
 
 function openDrawer() {
+  
+  if (prop.options.length > 0) {
+ 
+    for(let i in initData.value) {
+      console.log(formData.value[i])
+      if (initData.value[i].valueSingle != formData.value[i].valueSingle) {
+        console.log('不等于')
+        formData.value[i].valueSingle = initData.value[i].valueSingle
+      }
+    }
+
+  }else {
+    formData.value.list = []
+    setTimeout(() =>{
+      formData.value.list = [{}]
+    }, 100)
+  }
   visible.value = true
 }
 
+watch(formData.value, () => {
+  console.log('111',formData.value)
+})
+
 const closeDrawer = () => {
+  console.log('formData',formData.value)
+  // formData.value = JSON.parse(JSON.stringify(initData.value));
   visible.value = false
 };
 
 async function confirm() {
+  console.log('confirm');
+  initData.value = JSON.parse(JSON.stringify(formData.value));
   emit('update:options', formData.value.list)
-  closeDrawer()
+  // closeDrawer()
+  visible.value = false
 }
 
 function handleAdd() {

src/components/vote/VoteQuestion.vue

@@ -62,6 +62,7 @@ const emit = defineEmits({})
 const formData = ref({optionDetailList: []})
 
 watch(formData.value, () => {
+  console.log(formData.value)
   emit('update:item', formData.value)
 })
 

src/views/courselibrary/CoursewareManage.vue

@@ -1727,6 +1727,8 @@ const columns1 = [
           return "停用";
         case "1":
           return "启用";
+        case "-1":
+          return "已删除";
       }
     },
   },

src/views/courselibrary/OnlineManage.vue

@@ -21,7 +21,7 @@
     ></iframe>
     <OnlineClassModelStudent ref="stuRef"></OnlineClassModelStudent>
     <div @click="test">
-      asdfasdf
+      测试
     </div>
   </div>
 </template>
@@ -32,12 +32,12 @@ import OnlineClassModelStudent from "@/components/student/OnlineClassModelStuden
 
 const stuRef = ref()
 
-onMounted(()=>{
-  window.openStudentModel = stuRef.value.openDrawer
+onMounted(() => {
+  window.openSelectStu = stuRef.value.openDrawer
 })
 
-function test(){
-  window.openStudentModel()
+function test() {
+  window.openSelectStu()
 }
 </script>
 <style lang="scss">
@@ -47,6 +47,7 @@ function test(){
   display: flex;
   flex-direction: column;
 }
+
 .btnn {
   height: 72px;
   width: 100%;
@@ -55,6 +56,7 @@ function test(){
   align-items: center;
   justify-content: center;
   box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+
   .btn1 {
     width: 100px;
     height: 40px;
@@ -64,6 +66,7 @@ function test(){
     background-color: #fff;
     cursor: pointer;
   }
+
   .btn2 {
     cursor: pointer;
     width: 100px;

src/views/courselibrary/courseModal.vue

@@ -369,7 +369,7 @@ export default defineComponent({
 			// 课程三级分类
 		});
     const store = useStore();
-
+console.log(store,666);
     const sysTypeOptions = computed(() => store.state.content_type);
     const optionsUrl = computed(() => store.state.course_pic);
 
@@ -513,6 +513,7 @@ export default defineComponent({
 
 		// 点击图片选择图片
 		const choicePic = (value) => {
+			console.log(111111112);
 			state.feng_mian_1 = value;
 		}
 

src/views/learningpath/LevelAdd.vue

@@ -566,24 +566,7 @@
         <a-tab-pane key="3" tab="学员管理" force-render>
           <TableStudent
             :permissions="permissions"
-            v-if="isreload"
-            :type="2"
-            :id="routerId"
-            :stage="stage"
-            :columns="tableDataFunc()"
-          >
-            <template #extension="{ data: { record } }">
-              <a-button type="link" @click="showStudent(record)">查看</a-button>
-              <a-button
-                type="link"
-                @click="setLevels(record)"
-                v-if="checkPer(permissions)"
-                >调整</a-button
-              >
-            </template>
-          </TableStudent>
-          <TableStudent
-            v-else
+            ref="stuRef"
             :type="2"
             :id="routerId"
             :stage="stage"
@@ -1082,7 +1065,11 @@
         v-model:studentId="studentId"
       />
       <!-- 面授学员抽屉 -->
-      <RouterFaceStu v-model:FSvisible="FSvisible" :datasource="facestudent" />
+      <RouterFaceStu v-model:FSvisible="FSvisible"
+      :datasource="facestudent"
+      :type="2"
+      :routerId="routerId"
+      />
       <!-- 活动考勤抽屉 -->
       <active-attendance
         v-model:AAvisible="AAvisible"
@@ -1360,7 +1347,9 @@
     <!-- 项目管理抽屉 结束-->
 
     <!-- 批量面授报名 -->
-    <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible" />
+    <task-imp-stu v-model:TaskFaceImpStuvisible="TaskFaceImpStuvisible"
+    :type="2"
+    :routerId="routerId" />
   </div>
 </template>
 <script>
@@ -1428,7 +1417,7 @@ export default {
   setup() {
     const router = useRouter();
     const route = useRoute();
-
+    const stuRef = ref()
     // const store = useStore();
     const state = reactive({
       permissions: "",
@@ -2823,33 +2812,19 @@ export default {
     }
 
     // 点击确定 调整关卡
-    function changeLevel() {
-      state.isreload = false;
+    async function changeLevel() {
       if (!state.curLevel) {
         message.error("请选择关卡");
         return;
       }
-      moveStudent({ targetId: state.curLevel, ids: [state.curStuID] })
-        .then((res) => {
-          console.log(res);
-          state.visiblene = false;
-          message.destroy();
-          state.isreload = true;
-          message.success("调整关卡成功");
-          state.curLevel = undefined;
-          state.curStuID = "";
-          state.curLevelName = "";
-          getStudent();
-        })
-        .catch((err) => {
-          console.log(err);
-          state.visiblene = false;
-          message.error("调整关卡失败");
-          state.isreload = true;
-          state.curLevel = undefined;
-          state.curStuID = "";
-          state.curLevelName = "";
-        });
+      state.visiblene = false;
+      message.success("调整关卡成功");
+      stuRef.value.startLoading()
+      await moveStudent({targetId: state.curLevel, ids: [state.curStuID]})
+      state.curLevel = undefined;
+      state.curStuID = "";
+      state.curLevelName = "";
+      stuRef.value.getStuList()
     }
 
     // 面授课学员报名弹框
@@ -2861,6 +2836,7 @@ export default {
     return {
       ...toRefs(state),
       ...toRefs(levelList),
+      stuRef,
       clearChooseStu,
       showDeleteALLModal,
       closeDeleteALLModal,

src/views/learningpath/LevelAddDetail.vue

@@ -621,6 +621,7 @@ const closeChangeModal = () => {
 const temporaryStorage = async () => {
   templateLoading.value = true
   await request(ROUTER_DETAIL_MODIFY, routerInfo.value)
+  await getDetail()
   message.success("暂存成功");
   templateLoading.value = false
 };

src/views/projectcenter/LibraryAdd.vue

@@ -38,7 +38,8 @@
           ><div style="display: flex">
             <img class="img2" src="../../assets/images/leveladd/back.png" />
             <div class="return">返回</div>
-          </div></router-link
+          </div>
+          </router-link
         >
       </div>
     </div>
@@ -332,7 +333,7 @@
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
-<!--
+
         <a-tab-pane key="3" tab="项目积分">
           <div class="split"></div>
           <div class="projectscore">
@@ -478,7 +479,7 @@
             </div>
           </div>
         </a-tab-pane>
--->
+
 
         <a-tab-pane key="4" tab="设置">
           <div class="split"></div>

src/views/projectcenter/ProjectAdd.vue

@@ -119,7 +119,7 @@
                 separator="至"
                 :show-time="{ format: 'HH:mm' }"
                 :placeholder="['      开始时间', '        结束时间']"
-                :disabled-date="disabledDate"
+               
                 v-model:value="projectInfo.rangeTime"
                 style="width: 100%; height: 40px; border-radius: 5px"
                 valueFormat="YYYY-MM-DD HH:mm"

src/views/projectcenter/TaskAdd.vue

@@ -5,8 +5,8 @@
         <div class="leftmain">
           <div class="tit">
             阶段
-            <img src="../../assets/images/projectadd/right.png" style="margin-left: 10px; cursor: pointer"
-                 @click="showCancel"/>
+              <img src="../../assets/images/projectadd/right.png" style="margin-left: 10px; cursor: pointer"
+                  @click="showCancel" v-show="projectInfo.stageList[0].id != '0'" />
           </div>
           <div class="btn btn3" @click="showModal" style="margin-left: 19px">
             <div class="search"></div>
@@ -14,8 +14,8 @@
           </div>
           <div class="maincon" style="background-color: #fff">
             <Draggable v-model="projectInfo.stageList" chosenClass="chosen" ghostClass="ghost" forceFallback="true"
-                       group="stage" animation="500">
-              <template #item="{ element,index }">
+                       group="stage" animation="500" v-if="JSON.stringify(projectInfo.stageList[0].taskDraftDtoList[0]) != '{}'">
+              <template #item="{ element,index }" >
                 <div class="items" v-if="element.id !=='0' && !element.deleted"
                      :class="activeIndex === index ? 'active' : ''"
                      @click="changeStageIndex(index)">
@@ -498,7 +498,7 @@
           <div class="header">
             <div class="icon"></div>
             <span>提示</span>
-            <div class="close_exit" @click="closeDeleteStage"></div>
+            <!-- <div class="close_exit" @click="closeDeleteStage"></div> -->
           </div>
           <div class="body">
             <span style="width:320px;display:flex;justify-content:center;align-items:center;">{{
@@ -659,11 +659,15 @@ const closeDeleteStage = () => {
 };
 //删除阶段
 const deleteStage = () => {
+  console.log(12345);
   if (projectInfo.value.stageList.length === 1) {
     projectInfo.value.stageList = [{id: '0', stageId: '0', name: '', remark: '', taskDraftDtoList: []}];
+    deleteStageModal.value = false;
     return
   }
-  projectInfo.value.stageList.splice(activeIndex.value, 1)
+  projectInfo.value.stageList.splice(activeIndex.value, 1);
+  activeIndex.value = activeIndex.value-1;
+  deleteStageModal.value = false;
 };
 onMounted(() => {
   document.getElementsByTagName("main")[0].style.background = "rgb(245, 247, 250,1)";

src/views/projectcenter/TaskPage.vue

@@ -2801,8 +2801,8 @@ export default {
           .completionRank(obj)
           .then((res) => {
             console.log("项目进度榜单获取", res);
-            if (res.data.datas) {
-              state.jindutabledata = res.data.datas;
+            if (res.data.data.datas) {
+              state.jindutabledata = res.data.data.datas;
               state.processRankLoading = false;
             } else {
               state.jindutabledata = [];
@@ -2916,11 +2916,12 @@ export default {
                 state.valuestu2 = 0;
               } else {
                 // 有阶段任务
+                console.log(levelList.stageList)
                 let arrStage = [];
                 for (let i = 0; i < levelList.stageList.length; i++) {
-                  if (levelList.stageList[i].stageId !== "0") {
+                  if (levelList.stageList[i].id !== "0") {
                     let obj = {
-                      value: levelList.stageList[i].stageId,
+                      value: levelList.stageList[i].id,
                       label: levelList.stageList[i].name,
                     };
                     arrStage.push(obj);