授课页面静态页调整

src/components/project/Editor.vue

@@ -7,7 +7,7 @@
 -->
 <template> 
     <div style="border: 1px solid #ccc; width: 100%; ">
-      <Toolbar style="border-bottom: 1px solid #ccc" :editor="editorRef" :defaultConfig="toolbarConfig" mode="default" />
+      <Toolbar style="border-bottom: 1px solid #ccc ;font-size:4px"  :editor="editorRef" :defaultConfig="toolbarConfig" mode="default" />
       <Editor style="height: 100px; overflow-y: hidden" v-model="valueHtml" :defaultConfig="editorConfig" mode="default" @onCreated="handleCreated" @customPaste="customPaste" />
     </div>
     <!-- <el-button style="margin: 0 auto" @click="getEditorHTML">获取富文本HTML内容</el-button> -->

src/views/lecturer/ExternalLecturer.vue

@@ -1,6 +1,6 @@
 <!-- 外部讲师页面 -->
 <template>
-  <div class="projectManage">
+  <div class="ExternalLecturer">
     <div>
   </div>
     <!-- 搜索框及按钮 -->
@@ -90,7 +90,7 @@
         </div>
           <!-- 个人详情 -->
         <div style="border: 1px rgb(177, 177, 177) solid; margin-left: 33px; margin-right: 33px; margin-bottom: 33px;" v-show="tagsshow==1">
-        <div class="projectManage">
+        <div class="ExternalLecturer">
           <div class="filter">
             <div class="filterItems">
               <!-- <div class="select">
@@ -149,7 +149,7 @@
               <div class="select">
                 <span style="display:inline-block ;width:80px ;text-align:center ">备注 :</span>
                 <a-input type="textarea"  v-if="teacherdialog1 == 0" v-model:value="formParam.remark"
-                  style="width:200px; height: 40px; ">
+                  style="width:500px; height: 80px; ">
                 </a-input>
                 <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.userNo }}</span>
         </div>
@@ -163,7 +163,7 @@
         </div>
       </div>
        <!-- 授课记录 -->
-       <div class="projectManage" v-show="tagsshow==2" style="margin">
+       <div class="ExternalLecturer" v-show="tagsshow==2" style="margin">
           <div style="padding: 33px">
         <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="teacherrecordsColumns"
         
@@ -245,12 +245,11 @@
 <script lang="jsx">
 import { reactive, toRefs, ref } from "vue";
 import Editor from "@/components/project/Editor";
-import {getTeacherSystemList ,getTeacherPayRollPriceList, getLevel,insertTeacher,deleteTeacher,updateInTeacher, updateTeacherState} from "../../api/indexPeojiectManage";
-import {getOutTeacherList ,getOuterTeacherById ,getOuterTeacherCourseList} from "../../api/ExternalLecturer";
+import {getOutTeacherList ,getOuterTeacherById ,getOuterTeacherCourseList,deleteTeacher,updateInTeacher, updateTeacherState} from "../../api/Lecturer";
 // import {getProjSt} from "../../api/indexProjStu";
 // import AddTeacher from "../../components/drawers/project/AddTeacher"
 export default { 
-  name: "projectManage",
+  name: "ExternalLecturer",
   components: {
     // AddTeacher,
     Editor
@@ -260,8 +259,6 @@ export default {
       promotionrecordsLoading:false ,  //晋级记录遮罩层
       tableLoading:false,
       tagsshow:"1",
-      PlaceOfPayList:[],
-      LecturerSystemList:[],
       delTeacherId:null, //删除id确认
       editTeacherid:null,//修改状态id确认
       userNoid:null,    //讲师详情工号确认 
@@ -277,7 +274,6 @@ export default {
       tableDataTotal: -1,//table列表总条数
       teacherrecordstableDataTotal:-1,//授课记录列表总条数
       formParam: {
-        authenticationStatus: 1 //认证状态
       },
       searchParam: {
         name:null,//姓名
@@ -287,89 +283,10 @@ export default {
       },
       activeName:'first'
     })
-    const LecturerSystemList = ref([
-    //   { value: 0, systemName: "讲师体系" },
-    ]);
-    //获取讲师体系列表
-    const LecturerSystemLista =() => {
-      // console.log('点击了LecturerSystemLista')
-      getTeacherSystemList().then((res)=>{
-        if (res.data.code === 200) {
-            let arr = res.data.data;
-            let array = LecturerSystemList.value;
-            arr.map((value) => {
-              let obj = {
-                value: value.id,
-                label: value.name,
-              };
-              array.push(obj);
-            });
-            LecturerSystemList.value = array;
-          }
-        console.log("获取讲师",LecturerSystemList);
-      }) 
-    }
-    //获取内部讲师级别
-    LecturerSystemLista()
-    const getLevelList = ref([
-      // { value: 0, label: "未定级" },
-    ])
-    const getLevelLista =() => {
-      getLevel().then((res)=>{
-        if (res.data.code === 200) {
-            let arr = res.data.data;
-            let array = getLevelList.value;
-            arr.map((value) => {
-              let obj = {
-                value: value.id,
-                label: value.name,
-              };
-              array.push(obj);
-            });
-            getLevelList.value = array;
-          }
-      }) 
-    }
-    getLevelLista()
-    const OnTheJobStatusList = ref([
-      { value: 0, label: "在职" },
-      { value: 1, label: "离职" },
-    ])
-    const AuthenticationStatusList = ref([
-      { value: 0, label: "未认证" },
-      { value: 1, label: "已认证" },
-    ])
-    const PlaceOfPayList = ref([
-      // { value: 0, label: "发薪地B1" },
-    ])
-     //获取讲师发薪地列表
-     const PlaceOfPayLista =() => {
-      getTeacherPayRollPriceList().then((res)=>{
-        if (res.data.code === 200) {
-            let arr = res.data.data;
-            let array = PlaceOfPayList.value;
-            arr.map((value) => {
-              let obj = {
-                value: value.payrollPlaceId,
-                label: value.payrollPlaceName,
-              };
-              array.push(obj);
-            });
-            PlaceOfPayList.value = array;
-          }
-        console.log("获取发薪地", PlaceOfPayList);
-      })
-    }
-    PlaceOfPayLista()
     const AccountStatusList = ref([
       { value: 0, label: "启用" },
       { value: 1, label: "停用" },
     ])
-    const teacheExpertiseList= ref([
-    { value: 0, label: "领导力"  , children: [{value: 0, label: "管理团队"  ,value: 1, label: "管理业务"  ,value: 2, label: "管理自我"   }]},
-    { value: 1, label: "专业力"  , children: [{value: 0, label: "管理团队"  ,value: 1, label: "专业力"  ,value: 2, label: "专业力"   }]},
-    { value: 2, label: "通用力"  , children: [{value: 0, label: "管理团队"  ,value: 1, label: "通用力"  ,value: 2, label: "通用力"   }]},
-    ])
     const columns = ref([
     {
         title: '讲师编号 ',
@@ -448,14 +365,14 @@ export default {
     ])
     // 搜索
     const searchSubmit = () => {
-      // getLevelLista()
-      // LecturerSystemLista()
-      // PlaceOfPayLista()
       getTableDate();
     };
     //重置
     const searchReset = () => {
-      state.searchParam = { pageNo: 1, pageSize: 10 , name:null,
+      state.searchParam = {
+         pageNo: 1, 
+         pageSize: 10 , 
+         name:null,
         status:null};
       getTableDate();
     };
@@ -466,7 +383,7 @@ export default {
       let objA = {...state.searchParam};
       getOutTeacherList(objA)
         .then((res) => {
-          tableData.value = res.data.data
+          tableData.value = res.data.data.records
           state.tableDataTotal = Number(res.data.data.total);
           state.tableLoading=false 
           // console.log("获取讲师tableDatateacherName", tableData);
@@ -515,13 +432,6 @@ export default {
       state.teacherdialog = true;
       state.teacherdialogtitle = '修改信息'
       TeacherSystem()
-      // state.formParam.name = record.name;
-      // state.formParam.userNo = record.userNo;
-      // state.formParam.organizationDTO = record.organizationDTO;
-      // state.formParam.teachingDuration = record.teachingDuration;
-      // state.formParam.grade = record.grade;
-      // state.formParam.lecturerSystem = record.lecturerSystem;
-      // state.formParam.authenticationStatus = record.authenticationStatus;
     }
     //保存
     const createTeacherDialog =()=>{
@@ -606,17 +516,13 @@ export default {
 
     //清空数据
     const cancel = () => {
-      // state.formParam=({
-      //  //讲师姓名
-      state.formParam.name = null;
-      // 手机号
-      state.formParam.mobile = null;
-      //  邮箱
-      state.formParam.email = null;
-      //讲师介绍
-      state.formParam.teacherIntrofuce =null;
-      //备注
-      state.formParam.remark =null;
+      state.formParam= {
+        name :null ,
+        mobile:null ,
+        email:null,
+        teacherIntrofuce:null ,
+        remark:null 
+      }
       console.log(state.formParam);
     }
     //表格内查看数据操作
@@ -629,15 +535,15 @@ export default {
       // alert(record.grade)
       TeacherSystem()
     }
-    //内部讲师详情
+    //外部讲师详情
     const TeacherSystem=()=>{
       let ids={userNo :  state.userNoid }
       getOuterTeacherById(ids).then((res) => {
-          console.log("内部讲师详情", res.data);
+          console.log("外部讲师详情", res.data);
           state.formParam= res.data.data
       }) 
       .catch((err) => {
-          console.log("内部讲师详情", err);
+          console.log("外部讲师详情", err);
         });
     }
     // tab 标签切换
@@ -771,13 +677,6 @@ export default {
     return {
       ...toRefs(state),
       // handleExport,
-      LecturerSystemList,
-      getLevelList,
-      OnTheJobStatusList,
-      getLevelLista,
-      PlaceOfPayLista,
-      AuthenticationStatusList,
-      PlaceOfPayList,
       AccountStatusList,
       searchSubmit,
       searchReset,
@@ -794,10 +693,7 @@ export default {
       createTeacherDialog,
       handleOperate,
       closehandleOperate,
-      teacheExpertiseList,
        getTableDate, //list接口数据调用
-      // getStu
-      LecturerSystemLista,
       TeacherSystem,
       particulars,
       teacherrecords,
@@ -874,7 +770,7 @@ export default {
   text-align: center;
 }
 
-.projectManage {
+.ExternalLecturer {
   width: 100%;
   height: 100%;
   display: flex;

src/views/lecturer/InsideLecturer.vue

@@ -1,6 +1,6 @@
 <!-- 项目页面 -->
 <template>
-  <div class="projectManage">
+  <div class="InsideLecturer">
     <div>
   </div>
     <!-- 搜索框及按钮 -->
@@ -11,6 +11,10 @@
           <a-input v-model:value="searchParam.userNo " style="width: 230px; height: 40px; border-radius: 8px"
             placeholder="请输入工号/姓名检索" allowClear showSearch>
           </a-input>
+          
+          <!-- <a-select style="width: 230px" placeholder="请选择所属组织" v-model:value="searchParam.userNo"
+            :options="infoteacherList">
+          </a-select> -->
         </div>
         <div class="select">
           <a-select style="width: 230px" placeholder="讲师体系" v-model:value="searchParam.tsystemName"
@@ -114,7 +118,7 @@
         </div>
           <!-- 个人详情 -->
         <div style="border: 1px rgb(177, 177, 177) solid; margin-left: 33px; margin-right: 33px; margin-bottom: 33px;" v-show="tagsshow==1">
-        <div class="projectManage" >
+        <div class="InsideLecturer" >
           <div class="filter">
             <div class="filterItems">
               <!-- <div class="select">
@@ -246,10 +250,10 @@
               <div class="select">
                 <span style="display:inline-block ;width:80px ;text-align:center ">教师专长 :</span>
           <a-select  v-if="teacherdialog1 == 0"  style="width: 230px" placeholder="" v-model:value="formParam.TeacherExpertise"
-            :options="TeacherExpertiseList">
+            :options="TeacherExpertiseList.map(pro => ({value:pro }))">
           </a-select>
           <a-select  v-if="teacherdialog1 == 0" style="width: 230px" placeholder="" v-model:value="formParam.getTeacherExpertiseByPid"
-            :options="getTeacherExpertiseByPidList">
+            :options="getTeacherExpertiseByPidList.map(pid=>({value:pid})) ">
           </a-select>
           <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.expertise }}</span>
         </div>
@@ -263,7 +267,7 @@
         </div>
       </div>
        <!-- 授课记录 -->
-       <div class="projectManage" v-show="tagsshow==2" style="margin">
+       <div class="InsideLecturer" v-show="tagsshow==2" style="margin">
           <div style="padding: 33px">
         <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="teacherrecordsColumns"
         
@@ -284,7 +288,7 @@
           />
           </div>
           <!-- 晋级记录 -->
-          <div class="projectManage" v-show="tagsshow==3" style="margin">
+          <div class="InsideLecturer" v-show="tagsshow==3" style="margin">
             <div style="padding: 33px">
               <div style="font-size:24px;font-weight:500">晋升过程</div>
         <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="promotionrecordsColumns"
@@ -355,14 +359,14 @@
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref } from "vue";
+import { reactive, toRefs, ref ,watch} from "vue";
 import Editor from "@/components/project/Editor";
 import Upload from "@/components/project/Upload";
-import {getTeacherSystemList , getTeacherList,getTeacherPayRollPriceList, getLevel,insertTeacher,deleteTeacher,updateInTeacher,getTeacherById, updateTeacherState,getTeacherCourseList , getTeacherExpertise,getTeacherExpertiseByPid ,infoteacher } from "../../api/indexPeojiectManage";
+import {getTeacherSystemList , getTeacherList,getTeacherPayRollPriceList, getLevel,insertTeacher,deleteTeacher,updateInTeacher,getTeacherById, updateTeacherState,getTeacherCourseList , getTeacherExpertise,getTeacherExpertiseByPid ,infoteacher } from "../../api/Lecturer";
 // import {getProjSt} from "../../api/indexProjStu";
 // import AddTeacher from "../../components/drawers/project/AddTeacher"
 export default { 
-  name: "projectManage",
+  name: "InsideLecturer",
   components: {
     // AddTeacher,
     Editor,
@@ -493,55 +497,65 @@ export default {
 
     //获取讲师父 专长
     const TeacherExpertiseList = ref([
-    //   { value: 0, systemName: "讲师体系" },
+      { value: 0, systemName: "讲师体系" },
+      { value: 1, systemName: "讲师体系1" },
     ]);
     const getTeacherExpertisea =() => {
-      // console.log('点击了LecturerSystemLista')
-      getTeacherExpertise().then((res)=>{
-        if (res.data.code === 200) {
-            let arr = res.data.data;
-            let array = TeacherExpertiseList.value;
-            arr.map((value) => {
-              let obj = {
-                value: value.id,
-                label: value.name,
-              };
-              array.push(obj);
-            });
-            TeacherExpertiseList.value = array;
-          }
-      }) 
-      getTeacherExpertiseByPida()
+    //   // console.log('点击了LecturerSystemLista')
+    //   getTeacherExpertise().then((res)=>{
+    //     if (res.data.code === 200) {
+    //         let arr = res.data.data;
+    //         let array = TeacherExpertiseList.value;
+    //         arr.map((value) => {
+    //           let obj = {
+    //             value: value.id,
+    //             label: value.name,
+    //           };
+    //           array.push(obj);
+    //         });
+    //         TeacherExpertiseList.value = array;
+    //       }
+    //   }) 
+    //   getTeacherExpertiseByPida()
     }
      //获取讲师子 专长
     const getTeacherExpertiseByPidList = ref([
-    //   { value: 0, systemName: "讲师体系" },
+    [  { value: 0, systemName: "讲师体系1" },
+       { value: 1, systemName: "讲师体系" },],
+       [ [  { value: 0, systemName: "讲师1" },
+       { value: 1, systemName: "讲师" },],]
     ]);
     const getTeacherExpertiseByPida =() => {
-    let pid = {id :29}
-      // console.log('点击了LecturerSystemLista')
-      getTeacherExpertiseByPid(pid).then((res)=>{
-        if (res.data.code === 200) {
-            let arr = res.data.data;
-            let array = getTeacherExpertiseByPidList.value;
-            arr.map((value) => {
-              let obj = {
-                value: value.id,
-                label: value.name,
-              };
-              array.push(obj);
-            });
-            getTeacherExpertiseByPidList.value = array;
-          }
-      }) 
+    // let pid = {id :29}
+    //   // console.log('点击了LecturerSystemLista')
+    //   getTeacherExpertiseByPid(pid).then((res)=>{
+    //     if (res.data.code === 200) {
+    //         let arr = res.data.data;
+    //         let array = getTeacherExpertiseByPidList.value;
+    //         arr.map((value) => {
+    //           let obj = {
+    //             value: value.id,
+    //             label: value.name,
+    //           };
+    //           array.push(obj);
+    //         });
+    //         getTeacherExpertiseByPidList.value = array;
+    //       }
+    //   }) 
     }
+    watch(
+    ()=>state.formParam.TeacherExpertise,
+    val => {
+        state.formParam.getTeacherExpertiseByPid = state.getTeacherExpertiseByPidList[val][0];
+      },
+    )
        //新增页面内部姓名
        const infoteacherList = ref([
     //   { value: 0, systemName: "讲师体系" },
     ]);
     const  getinfoteacher = (obj) => {
       state.tableLoading=true 
-      infoteacher()
+      ()
         .then((res) => {
           infoteacherList.value = res.data.data.records
       }) 
@@ -709,8 +723,18 @@ export default {
     };
     //重置
     const searchReset = () => {
-      state.searchParam = { pageNo: 1, pageSize: 10 };
-      // getTableDate();
+      state.searchParam = { 
+        userNo:null,
+        tsystemName:null,
+        tlevelName:null,
+        waitStatus:null,
+        certStatus:null,
+        salaryName:null,
+        status:null,
+        pageNo: 1, 
+        pageSize: 10 ,
+      };
+      getTableDate();
     };
     //  List接口数据
      const getTableDate = (obj) => {
@@ -760,7 +784,6 @@ export default {
       state.teacherdialog1 = 0
       state.teacherdialog = true;
       state.teacherdialogtitle = '新增讲师'
-      //获取内部讲师级别
       LecturerSystemLista()
       getLevelLista()
       getTeacherExpertisea()
@@ -857,28 +880,19 @@ export default {
 
     //清空数据
     const cancel = () => {
-      // state.formParam=({
-      //  //讲师姓名
-      state.formParam.name = null;
-      //  // 讲师工号
-      state.formParam.userNo = null;
-      //  //将讲师组织
-      state.formParam.departId = null;
-      //  //初始授课时长
-      state.formParam.defaultTeachingTime = null,
-        //讲师等级
-        state.formParam.tlevelName = null;
-      //讲师体;
-      state.formParam.tsystemName = null;
-      //  //认证状;
-      state.formParam.certStatus = 1;
-      //讲师介绍
-      state.formParam.teacherIntrofuce =null;
-      //工作经历
-      state.formParam.workHistory =null;
-      //擅长课程
-      state.formParam.proficientInCourse =null;
-      console.log(state.formParam);
+      state.formParam ={
+        name:null,
+        userNo:null,
+        departId:null,
+        defaultTeachingTime:null,
+        tlevelName:null,
+        tsystemName:null,
+        certStatus:1,
+        teacherIntrofuce:null,
+        workHistory:null,
+        proficientInCourse:null,
+      }
+     
     }
     //表格内查看数据操作
     const handleLook = (record) => {
@@ -888,8 +902,8 @@ export default {
       state.userNoid= record.userNo
       state.lookTeacherId= record.id
       // alert(record.grade)
-      // TeacherSystem()
-      getteacherrecordstableData ()
+      TeacherSystem()
+      // getteacherrecordstableData ()
     }
     //内部讲师详情
     const TeacherSystem=()=>{
@@ -909,8 +923,7 @@ export default {
     }
     const teacherrecords=()=>{
       state.tagsshow= 2
-    //  getteacherrecordstableData ()
-       console.log(state.tagsshow)
+     getteacherrecordstableData ()
     }
     const promotionrecords=()=>{
       state.tagsshow= 3
@@ -1197,7 +1210,7 @@ export default {
   text-align: center;
 }
 
-.projectManage {
+.InsideLecturer {
   width: 100%;
   height: 100%;
   display: flex;