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

src/components/drawers/AddFaceteach.vue

@@ -29,13 +29,16 @@
               </div>
               <span style="margin-right: 3px">课程名称：</span>
             </div>
-            <div class="btnbox">
+            <div class="btnbox" style="position: relative">
               <a-input
                 v-model:value="courseName"
-                style="width: 384px; height: 32px"
-                placeholder="请输入名称"
+                style="width: 423px; height: 32px"
+                placeholder="请输入名称，最多输入20个字"
                 :maxlength="20"
               />
+              <div class="inp_num" style="position: absolute; right: 115px">
+                <span style="color: #c7cbd2"> {{ courseName.length }}/20 </span>
+              </div>
             </div>
           </div>
           <div class="main_item">
@@ -95,7 +98,7 @@
               </div>
               <span style="margin-right: 3px">授课教师：</span>
             </div>
-            <div class="btnbox">
+            <div class="btnbox" style="width: 423px">
               <!--              <a-auto-complete placeholder="选择老师" :value="memberValue.label" style="width: 364px"-->
               <!--                               :options="options" @change="handleChange2" @search="handleSearch"></a-auto-complete>-->
               <ProjectManager
@@ -238,7 +241,7 @@
               </a-checkbox>
             </div>
           </div>
-           -->       
+           -->
 
           <div class="main_item">
             <div class="signbox">
@@ -358,7 +361,9 @@
             </div>
             <div class="btnbox">
               <a-tag closable color="processing" @close="logT">
-                <span style="font-size: 14px; line-height: 33px">{{testName}}</span>
+                <span style="font-size: 14px; line-height: 33px">{{
+                  testName
+                }}</span>
               </a-tag>
             </div>
           </div>
@@ -405,8 +410,8 @@ import ProjectManager from "@/components/project/ProjectManagerNew";
 
 import { detail } from "../../api/indexCourse";
 import { queryAppraiseDetailById } from "../../api/indexInvist";
-import {queryWorkDetailById} from "@/api/indexWork";
-import {queryExaminationDetailById} from "@/api/indexExam";
+import { queryWorkDetailById } from "@/api/indexWork";
+import { queryExaminationDetailById } from "@/api/indexExam";
 export default {
   name: "AddFaceteach",
   components: {
@@ -609,19 +614,22 @@ export default {
         state.EditWorkId = result.homeWorkId;
         state.assessmentId = result.evaluateId;
         state.needEval = result.evaluateId;
-        detail({offcourseId:result.offcourseId}).then((res)=>{
-          state.chooseCourseName =res.data.data.name;
-
+        detail({ offcourseId: result.offcourseId }).then((res) => {
+          state.chooseCourseName = res.data.data.name;
         });
-        queryAppraiseDetailById({assessmentId:result.evaluateId}).then((res)=>{
-          state.assessmentName =res.data.data.assessmentName;
-        });
-        queryWorkDetailById({workId:result.homeWorkId}).then((res)=>{
+        queryAppraiseDetailById({ assessmentId: result.evaluateId }).then(
+          (res) => {
+            state.assessmentName = res.data.data.assessmentName;
+          }
+        );
+        queryWorkDetailById({ workId: result.homeWorkId }).then((res) => {
           state.workName = res.data.data.workName;
         });
-        queryExaminationDetailById({ examinationId: result.testId }).then((res)=>{
-          state.testName = res.data.data.examinationName;
-        });
+        queryExaminationDetailById({ examinationId: result.testId }).then(
+          (res) => {
+            state.testName = res.data.data.examinationName;
+          }
+        );
         console.log("state=======", state);
       });
     };
@@ -730,7 +738,7 @@ export default {
         await ProjectEditTask(editObj)
           .then(() => {
             console.log("props.EditFaceId", props.EditFaceId);
-           // message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
+            // message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
           })
           .catch(() => {
             //message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`);

src/components/drawers/AddOnline.vue

@@ -31,7 +31,8 @@
                 />
               </div>
             </div>
-            <div class="mii_ipt">
+            <!-- 2022-12-10注释 后面放开 李晓鸽 -->
+            <!-- <div class="mii_ipt">
               <div class="ipt_name">课程分类：</div>
               <div class="select">
                 <a-select
@@ -44,7 +45,7 @@
                   showSearch
                 />
               </div>
-            </div>
+            </div> -->
           </div>
           <div class="mi_btns">
             <div class="btn btn1" @click="searchList()">
@@ -98,7 +99,7 @@
               <div class="pa">
                 <a-pagination
                   v-if="tableDataTotal > 10"
-                  showSizeChanger="true"
+                  :showSizeChanger="false"
                   showQuickJumper="true"
                   hideOnSinglePage="true"
                   :pageSize="pageSize"
@@ -129,7 +130,7 @@
             <div class="pa">
               <a-pagination
                 v-if="tableDataTotal > 10"
-                showSizeChanger="true"
+                :showSizeChanger="false"
                 showQuickJumper="true"
                 hideOnSinglePage="true"
                 :pageSize="pageSize"
@@ -159,7 +160,7 @@ import {
   RouterEditTask,
   IsExistence,
   IsExistenceProject,
-  IsExistenceProjectTemplate
+  IsExistenceProjectTemplate,
 } from "@/api/indexTask";
 import { addTempTask } from "../../api/indexTaskadd";
 export default {
@@ -572,9 +573,10 @@ export default {
           projectTaskId: props.projectTaskId || 0,
           stageId: props.chooseStageId || 0,
           type: 1,
-        }).then(res=>{
-          console.log(res)
-          console.log("模板项目中是否包含此在线课了", res);
+        })
+          .then((res) => {
+            console.log(res);
+            console.log("模板项目中是否包含此在线课了", res);
             if (res.data.data.length) {
               let strdata = res.data.data;
               let tipStr = "";
@@ -599,21 +601,26 @@ export default {
                   type: 1,
                 })
                   .then((res) => {
-                    console.log('新增或者编辑在线课',res)
+                    console.log("新增或者编辑在线课", res);
                     message.destroy();
-                    message.success(`${props.edit ? "编辑" : "新增"}模板库任务成功`);
+                    message.success(
+                      `${props.edit ? "编辑" : "新增"}模板库任务成功`
+                    );
                     ctx.emit("changeData", false);
                     closeDrawer();
                   })
                   .catch(() => {
                     message.destroy();
-                    message.error(`${props.edit ? "编辑" : "新增"}模板库任务失败`);
+                    message.error(
+                      `${props.edit ? "编辑" : "新增"}模板库任务失败`
+                    );
                   });
-              })
+              });
             }
-        }).catch(err=>{
-          console.log(err)
-        })
+          })
+          .catch((err) => {
+            console.log(err);
+          });
       }
       //if(state.addOnlineList.Target==undefined){
       // closeDrawer();

src/components/project/ProjectManager.vue

@@ -69,7 +69,7 @@ export default {
 
     onMounted(() => {
       console.log("onMounted");
-      init()
+      init();
     });
 
     function getMember() {

src/components/project/ProjectManagerNew.vue

@@ -8,7 +8,6 @@
       v-model:value="managerArray"
       :placeholder="placeholder"
       :filterOption="false"
-      style="width: 440px;"
       :options="isOpen?options:selectOptions"
       allowClear
       showSearch
@@ -20,6 +19,7 @@
       @change="change"
       @blur="blur"
       :show-arrow="false"
+      style="width: 100%"
   >
     <template v-if="loading" #notFoundContent>
       <a-spin size="small"/>

src/components/student/Student.vue

@@ -0,0 +1,481 @@
+<template>
+  <a-drawer
+      :visible="visiable"
+      class="drawerStyle ProjCheckship"
+      placement="right"
+      width="45%"
+  >
+    <div class="drawerMain" id="ProjCheckship">
+      <div class="header">
+        <div class="headerTitle">
+          {{ {1: '查看权', 2: '管理权', 3: '添加学员'}[type] || '' }}
+        </div>
+        <img
+            style="width: 29px; height: 29px; cursor: pointer"
+            src="../../assets/images/basicinfo/close.png"
+            @click="closeDrawer"
+        />
+      </div>
+      <div style="width:100%;display: grid;grid-template-columns: 750px auto;">
+        <div class="tabs">
+          <a-tabs v-model:activeKey="activeKey">
+            <a-tab-pane :key="1" tab="快速选人">
+              <div :style="{ height: screenHeight - 235 + 'px' }">
+                <div class="tab1">
+                  <a-form-item label="姓名">
+                    <a-input
+                        v-model:value="nameSearch.keyword"
+                        style="width: 270px; height: 40px; border-radius: 8px"
+                        placeholder="请输入姓名"
+                    />
+                    <a-button type="primary" @click="onSearchStu" style="margin-left: 20px;border-radius: 4px">
+                      <template #icon>
+                        <SearchOutlined/>
+                      </template>
+                      搜索
+                    </a-button>
+                    <a-button @click="resetStu" style="margin-left: 20px;border-radius: 4px">重置</a-button>
+                  </a-form-item>
+                </div>
+                <div class="chooseLeft" style="display: grid;grid-template-columns: 250px auto">
+                  <div :style="{ height: screenHeight - 235 + 'px' ,overflowY:'auto'}">
+                    <a-tree
+                        allow-clear
+                        tree-default-expand-all
+                        :tree-data="treeData"
+                        :fieldNames="{
+                          children: 'treeChildList',
+                          key: 'id',
+                          title: 'name',
+                          value: 'name',
+                        }"
+                        @select="stuStuOrgSelect"
+                    >
+                    </a-tree>
+                  </div>
+                  <div class="tableBox tabb">
+                    <a-table
+                        :columns="stuColumns"
+                        :data-source="stuData"
+                        :pagination="stuPagination"
+                        :loading="stuLoading"
+                        row-key="id"
+                        :row-selection="stuRowSelection"
+                    />
+                  </div>
+                </div>
+              </div>
+            </a-tab-pane>
+            <a-tab-pane :key="2" tab="添加组织">
+              <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+              >
+                <div class="tab2">
+                  <a-form-item label="组织：">
+                    <a-input
+                        v-model:value="searchOrgName.keyword"
+                        style="width: 230px; height: 40px; border-radius: 8px"
+                        placeholder="请输入组织"
+                    />
+                    <a-button type="primary" @click="searchOrg" style="margin-left: 20px;border-radius: 4px">
+                      <template #icon>
+                        <SearchOutlined/>
+                      </template>
+                      搜索
+                    </a-button>
+                    <a-button @click="resetOrg" style="margin-left: 20px;border-radius: 4px">重置</a-button>
+                  </a-form-item>
+                </div>
+                <div class="boeTree">
+                  <a-tree
+                      :tree-data="searchOrgName.keyword ? orgData : treeData"
+                      @select="onOrgSelectChange"
+                      :fieldNames="{
+                          children: 'treeChildList',
+                          key: 'id',
+                          title: 'name',
+                          value: 'name',
+                        }"
+                      row-key="id"
+                      :row-selection="orgRowSelection"
+                      multiple
+                  >
+                  </a-tree>
+<!--                  <div>-->
+<!--                    <a-table-->
+<!--                        :columns="stuColumns"-->
+<!--                        :data-source="stuData"-->
+<!--                        :pagination="stuPagination"-->
+<!--                        :loading="orgLoading"-->
+<!--                        row-key="id"-->
+<!--                        :row-selection="stuRowSelection"-->
+<!--                    />-->
+<!--                  </div>-->
+                </div>
+              </div>
+            </a-tab-pane>
+            <a-tab-pane :key="3" tab="受众关联">
+              <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+              >
+                <div>
+                  <a-form-item label="受众名称：">
+                    <a-input
+                        v-model:value="audienceName.keyword"
+                        style="width: 260px; height: 40px; border-radius: 8px"
+                        placeholder="请输入受众名称"
+                    />
+                    <a-button type="primary" @click="searchAudi" style="margin-left: 20px;border-radius: 4px">
+                      <template #icon>
+                        <SearchOutlined/>
+                      </template>
+                      搜索
+                    </a-button>
+                    <a-button @click="resetAudienceInfo" style="margin-left: 20px;border-radius: 4px">重置</a-button>
+                  </a-form-item>
+                </div>
+                <div class="tableBox tabb">
+                  <a-table
+                      style="border: 1px solid #f2f6fe"
+                      row-key="id"
+                      :columns="audiColums"
+                      :data-source="audiData"
+                      :loading="audiLoading"
+                      :pagination="auditPagination"
+                      :row-selection="auditRowSelection"
+                  />
+                </div>
+              </div>
+            </a-tab-pane>
+          </a-tabs>
+        </div>
+        <div style="padding:100px 0 0 20px;display: grid;grid-template-rows: auto auto auto;">
+          <div>
+            <div style="margin-top: 20px">快速选人</div>
+            <a-tag :closable="true" color="#409eff" @close="stuDel(i)" v-for="(item,i) in selectsData.studentList"
+                   :key="i" style="margin-top:20px">
+              {{ item.realName }}
+            </a-tag>
+          </div>
+          <div>
+            <div style="margin-top: 20px">组织添加</div>
+            <a-tag :closable="true" color="#409eff" @close="orgDel(i)" v-for="(item,i) in selectsData.deptList" :key="i"
+                   style="margin-top:20px">
+              {{ item.name }}
+            </a-tag>
+          </div>
+          <div>
+            <div style="margin-top: 20px">受众添加</div>
+            <a-tag :closable="true" color="#409eff" @close="AuditDel(i)" v-for="(item,i) in selectsData.groupList"
+                   :key="i" style="margin-top:20px">
+              {{ item.audienceName }}
+            </a-tag>
+          </div>
+        </div>
+      </div>
+      <div class="btnn">
+        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="submitAuth">确定</button>
+      </div>
+    </div>
+  </a-drawer>
+</template>
+<script setup>
+import {computed, defineEmits, defineProps, onMounted, ref, watch} from "vue";
+import {useStore} from "vuex";
+import {request, useBoeApi, useBoeApiPage} from "@/api/request";
+import {AUDIENCE_LIST, ORG_CHILD_LIST, ORG_LIST, USER_LIST} from "@/api/ThirdApi";
+import {saveStu} from "@/api/index1";
+
+const store = useStore();
+const emit = defineEmits()
+const props = defineProps({
+  type: Number,
+  visiable: {
+    type: Boolean,
+    default: false
+  },
+})
+
+const activeKey = ref(1)
+const visiableState = ref(false)
+const selectsData = ref({
+  studentList: [],
+  deptList: [],
+  groupList: []
+})
+const nameSearch = ref({
+  keyword: '',
+  departId: null,
+  page: 1,
+  pageSize: 10
+})
+const audienceName = ref({
+  keyword: '',
+  page: 1,
+  pageSize: 10
+})
+const searchOrgName = ref({
+  keyword: '',
+  page: 1,
+  pageSize: 10
+})
+
+const {
+  data: stuData,
+  fetch: searchStu,
+  page: stuPageNo,
+  pageSize: stuPageSize,
+  loading: stuLoading,
+  total: stuTotal
+} = useBoeApiPage(USER_LIST, nameSearch.value, {
+  init: true,
+  result: res => res.result.userInfoList,
+  totalPage: res => res.result.totalPage,
+  total: res => res.result.totalElement
+})
+
+const {
+  data: orgData,
+  fetch: searchOrg,
+  loading: orgLoading
+} = useBoeApi(ORG_LIST, searchOrgName.value)
+
+const {
+  data: audiData,
+  fetch: searchAudi,
+  page: audiPageNo,
+  pageSize: audiPageSize,
+  loading: audiLoading,
+  total: audiTotal
+} = useBoeApiPage(AUDIENCE_LIST, audienceName.value, {
+  init: true,
+  result: res => res.result.audienceList,
+  totalPage: res => res.result.totalPage,
+  total: res => res.result.totalElement
+})
+
+const stuColumns = ref([
+  {
+    title: "姓名",
+    dataIndex: "realName",
+    key: "realName",
+    width: 80,
+    align: "center",
+    className: "h",
+    ellipsis: true,
+  },
+  {
+    title: "工号",
+    dataIndex: "userNo",
+    key: "userNo",
+    width: 80,
+    align: "center",
+    className: "h",
+    ellipsis: true,
+  },
+  {
+    title: "归属组织",
+    dataIndex: "orgName",
+    key: "orgName",
+    width: 80,
+    align: "center",
+    className: "h",
+    ellipsis: true,
+  },
+  {
+    title: "部门",
+    dataIndex: "departName",
+    key: "departName",
+    width: 80,
+    align: "center",
+    className: "h",
+    ellipsis: true,
+  },
+])
+const audiColums = ref([{
+  title: "id",
+  dataIndex: "id",
+  key: "id",
+  width: 35,
+  align: "center",
+  className: "h",
+},
+  {
+    title: "受众名称",
+    dataIndex: "audienceName",
+    key: "audienceName",
+    width: 30,
+    align: "left",
+    className: "h",
+    ellipsis: true,
+  },
+  {
+    title: "人数",
+    dataIndex: "totalMember",
+    key: "totalMember",
+    width: 30,
+    align: "center",
+    className: "h",
+  },
+  {
+    title: "类型",
+    dataIndex: "audienceType",
+    key: "audienceType",
+    width: 40,
+    align: "center",
+    className: "h",
+  },
+])
+const stuSelectKeys = ref([])
+const orgSelectKeys = ref([])
+const auditSelectKeys = ref([])
+const screenHeight = ref(document.body.clientHeight)
+const stuRowSelection = computed(() => ({
+  columnWidth: 20,
+  selectedRowKeys: stuSelectKeys.value,
+  onChange: onStuSelectChange,
+  preserveSelectedRowKeys: true,
+}))
+const orgRowSelection = computed(() => ({
+  columnWidth: 20,
+  selectedRowKeys: orgSelectKeys.value,
+  onChange: onOrgSelectChange,
+  preserveSelectedRowKeys: true,
+}))
+
+const stuPagination = computed(() => ({
+  total: stuTotal.value,
+  showSizeChanger: false,
+  current: stuPageNo.value,
+  pageSize: stuPageSize.value,
+  onChange: changePagination
+}))
+
+const auditPagination = computed(() => ({
+  total: audiTotal.value,
+  showSizeChanger: false,
+  current: audiPageNo.value,
+  pageSize: audiPageSize.value,
+  onChange: auditChangePagination
+}))
+
+const auditRowSelection = computed(() => ({
+  columnWidth: 20,
+  selectedRowKeys: auditSelectKeys.value,
+  onChange: onAuditSelectChange,
+  preserveSelectedRowKeys: true,
+}))
+
+onMounted(() => {
+});
+
+const closeDrawer = () => {
+
+};
+//获取组织树
+const treeData = computed(() => {
+  return store.state.orgtreeList ? store.state.orgtreeList : [];
+});
+
+function onSearchStu() {
+  nameSearch.value.page = 1
+  searchStu()
+}
+
+function stuStuOrgSelect(e) {
+  nameSearch.value.departId = e.join('')
+  searchStu()
+}
+
+function stuDel(i) {
+  stuSelectKeys.value = stuSelectKeys.value.filter(e => e !== selectsData.value.studentList[i].id)
+  selectsData.value.studentList.splice(i, 1)
+}
+
+function AuditDel(i) {
+  auditSelectKeys.value = auditSelectKeys.value.filter(e => e !== selectsData.value.groupList[i].id)
+  selectsData.value.groupList.splice(i, 1)
+}
+
+function orgSelect(key, obj) {
+  console.log(obj)
+  request(ORG_CHILD_LIST, {orgId: null}).then(res => {
+    console.log(res.result)
+  })
+}
+
+function onStuSelectChange(e, l) {
+  stuSelectKeys.value = e
+  selectsData.value.studentList = l
+}
+
+function onOrgSelectChange(e, l) {
+  orgRowSelection.value = e
+  selectsData.value.deptList = l.selectedNodes
+}
+
+function onAuditSelectChange(e, l) {
+  auditSelectKeys.value = e
+  selectsData.value.groupList = l
+}
+
+const stuDepartmentSelect = (e) => {
+  nameSearch.value.orgId = e.join('')
+  searchStu()
+};
+
+//分页获取学员
+const changePagination = (page) => {
+  nameSearch.value.page = page;
+  searchStu()
+};
+
+const auditChangePagination = (page) => {
+  console.log(1111111111)
+  console.log(page)
+  audienceName.value.page = page;
+  searchAudi()
+};
+
+//重置
+const resetStu = () => {
+  deleteDepSelect();
+  nameSearch.value = {keyword: '', page: 1, pageSize: 10}
+};
+//清空选择部门信息
+const deleteDepSelect = () => {
+  stuSelectKeys.value = []
+};
+
+//重置组织
+const resetOrg = () => {
+  searchOrgName.value = {keyword: '', page: 1, pageSize: 10}
+};
+
+//重置受众
+const resetAudienceInfo = () => {
+  audienceName.value = {keyword: '', page: 1, pageSize: 10}
+};
+
+//全部清除
+const deleteAll = () => {
+  selectsData.value = {
+    studentList: [],
+    deptList: [],
+    groupList: []
+  }
+};
+//确定添加授权
+const submitAuth = () => {
+  emit('update:visiable', false)
+  saveStu(selectsData.value)
+};
+
+
+</script>
+<style>
+.ant-btn-primary {
+  background-color: #409eff !important;
+}
+</style>