From f0a61d90bbdcb23d71df8b3967e4d3df325b8940 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Mon, 6 Jun 2022 18:08:11 +0800
Subject: [PATCH 1/6] Merge branch 'teacher' of D:\bjxask\gitBoe\portal with
 conflicts.

---
 .env.development | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.env.development b/.env.development
index 7b0a0c13..89df411e 100644
--- a/.env.development
+++ b/.env.development
@@ -14,7 +14,10 @@ VUE_APP_BOE_WEB_URL = 'https://u.boe.com'
 VUE_APP_BOE_MOBILE_URL = 'http://192.168.0.10:8082/mobile'
 
 # File路径的基础url
-VUE_APP_FILE_BASE_URL = 'http://localhost:9090/cdn/upload'
+VUE_APP_FILE_BASE_URL = 'http://192.168.0.10:9090/cdn/upload'
+
+# File路径的基础url的相对路径，加此项是为了不影响之前的路径配置
+VUE_APP_FILE_RELATIVE_PATH = '/upload'
 
 # 登录地址
 VUE_APP_LOGIN_URL='/pc/login'

From efbc1b0518b5b30d7ab8f40ac5c058f117b9f9be Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Mon, 6 Jun 2022 18:43:35 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=95=99=E5=B8=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/TeacherList.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/manage/TeacherList.vue b/src/views/manage/TeacherList.vue
index 6b803f79..d51b232f 100644
--- a/src/views/manage/TeacherList.vue
+++ b/src/views/manage/TeacherList.vue
@@ -39,6 +39,9 @@
       <!-- <el-table-column label="创建时间" sortable prop="sysCreateTime"></el-table-column> -->
       <el-table-column label="修改时间" sortable width="155" prop="sysUpdateTime"></el-table-column>
       <el-table-column label="授课时长" prop="teaching"></el-table-column>
+      <el-table-column label="教师体系" prop="tsystemName"></el-table-column>
+      <el-table-column label="教师级别" prop="tlevelName"></el-table-column>
+      <el-table-column label="发薪地" prop="salaryName"></el-table-column>
       <el-table-column label="在职状态" width="90" :filters="[{ text: '在职', value: '0'}, { text: '离职', value: '1' }]"
       :filter-method="filterWork">
         <template slot-scope="scope">
@@ -143,7 +146,8 @@
            </el-radio-group>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input v-model="form.description" clearable type="textarea" :autosize='{ minRows: 3, maxRows: 6 }'></el-input>
+          <!-- <el-input v-model="form.description" clearable type="textarea" :autosize='{ minRows: 3, maxRows: 6 }'></el-input> -->
+          <WxEditor v-model="form.description" :minHeight="50"></WxEditor>
         </el-form-item>
         <el-form-item label="擅长课程">
           <el-input v-model="form.courses" clearable placeholder="请输入"></el-input>
@@ -169,6 +173,7 @@
 </template>
 
 <script>
+  import WxEditor from '@/components/Editor/index.vue';
   import teacherApi from "@/api/modules/teacher";
   import teacherBoeApi from "@/api/boe/teacher";
   import userApi from "@/api/system/user";
@@ -177,7 +182,7 @@
   import { mapGetters } from 'vuex';
   export default {
     name: 'teacher',
-    components:{imageUpload,teacherDetails},
+    components:{imageUpload,teacherDetails,WxEditor},
     data(){
       return {
         query:{
@@ -368,6 +373,9 @@
           waitStatus:0,//在职
           certStatus:0,//未认证
         }
+        this.tSystemData = {};
+        this.tLevelData= {};
+        this.coverImage = '';
         this.dialogVisible=true
       },
       filterWork(value,row){
@@ -436,8 +444,8 @@
             if (res.status == 200 && res.result != null) {
               this.havaInfo = true;
               this.form.account = res.result.account;
-              if(res.result.photo != '') {
-                this.coverImage = this.fileBaseUrl+res.result.photo;
+              if(res.result.account.avatar != '') {
+                this.coverImage = this.fileBaseUrl+res.result.account.avatar;
               }
               this.form.user = res.result;
             } else {

From c3a61d1272c2da0b568e7c5d4898cb323a5845dc Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 6 Jun 2022 20:43:44 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=99=E5=B8=88?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/TeacherList.vue    | 58 ++++++++++++-----------------
 src/views/manage/teacherDetails.vue | 25 +++++++------
 2 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/src/views/manage/TeacherList.vue b/src/views/manage/TeacherList.vue
index d51b232f..57e2bf90 100644
--- a/src/views/manage/TeacherList.vue
+++ b/src/views/manage/TeacherList.vue
@@ -3,17 +3,17 @@
     <div style="padding-bottom: 10px;">
       <div style="display: flex;justify-content:flex-start;">
              <div style="padding: 0px 5px;">
-             <el-select v-model="query.tSystemId" value-key="id" clearable @change="queryChangeSystem" placeholder="请选择教师体系">
+             <el-select v-model="query.tsystemId" value-key="id" clearable @change="queryChangeSystem" placeholder="请选择教师体系">
                  <el-option v-for="item in systemData" :key="item.id" :label="item.name" :value="item.id"></el-option>
               </el-select>
            </div>
            <!-- 要在换一个变量与新建区别开 -->
             <div style="padding: 0px 5px;">
-              <el-select v-model="query.tLevelId" clearable value-key="id" placeholder="请选择教师级别">
+              <el-select v-model="query.tlevelId" clearable value-key="id" placeholder="请选择教师级别">
                 <el-option v-for="item in queryLevelData" :key="item.id" :label="item.name" :value="item.id"></el-option>
               </el-select>
          </div>
-          <div style="padding: 0px 5px;"><el-input placeholder="请输入姓名" v-model="query.queryName" clearable></el-input></div>
+          <div style="padding: 0px 5px;"><el-input placeholder="请输入姓名" v-model="query.name" clearable></el-input></div>
                 <div style="padding: 0px 5px;">
               <el-select v-model="query.salaryId" clearable value-key="id" placeholder="请选择发薪地">
                 <el-option v-for="item in placeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
@@ -186,10 +186,10 @@
     data(){
       return {
         query:{
-          tSystemId:'',
-          tSystemIds:'',
-          tLevelId:'',
-          queryName:'',
+          tsystemId:'',
+          tsystemIds:'',
+          tlevelId:'',
+          name:'',
           salaryId:'',
           pageIndex: 1,
           pageSize: 10,
@@ -232,7 +232,6 @@
           ]
         },
         selectList:[],
-        queryName:"",
         dialogVisible:false,
         tableData:[],
         searchName:null,
@@ -349,10 +348,9 @@
         this.levelData=array;
       },
       reset (){
-       this.query.queryName = '';
-       this.query.tSystemId='',
-       this.query.tLevelId='',
-       this.query.queryName='',
+       this.query.name = '';
+       this.query.tsystemId='',
+       this.query.tlevelId='',
        this.query.salaryId='',
        this.query.pageIndex= 1,
        this.query.pageSize= 10,
@@ -588,15 +586,8 @@
       },
       loadData(pageIndex) {
         this.query.pageIndex = pageIndex;
-        this.query.tSystemIds = this.query.tSystemId || this.teacherSystemids.join();
-        teacherApi
-          .page(
-            this.query
-            // pageIndex: this.pageIndex,
-            // pageSize: this.pageSize,
-            // name: this.queryName,
-          )
-          .then((res) => {
+        this.query.tsystemIds = this.query.tsystemId || this.teacherSystemids.join();
+        teacherApi.page(this.query).then((res) => {
             if (res.status == 200) {
               const result = res.result;
               this.tableData = result.list;
@@ -667,33 +658,32 @@
           })
           ids = ids.join();
         }
-        //如果是勾选的，那需要传id的值，使用逗号分隔
-        //get请求
-        // var eleLink = document.createElement('a');
-        // eleLink.download = '教师列表';
-        // eleLink.style.display = 'none';
-        // eleLink.href = `${process.env.VUE_APP_BASE_API}/xboe/teacher/export?name=${this.queryName}`;
-        // document.body.appendChild(eleLink);
-        // eleLink.click();
-        // 然后移除
-        // document.body.removeChild(eleLink);
-
         //post请求
         var eleForm=document.createElement('form');
         eleForm.style="display:none;";
         eleForm.method='post';
-        eleForm.action=`${process.env.VUE_APP_BASE_API}/xboe/teacher/export?name=${this.queryName}`;
-
+        eleForm.action=`${process.env.VUE_APP_BASE_API}/xboe/teacher/export?name=${this.query.name}`;
+        //添加ids条件
         var hdnFilePath = document.createElement('input');
         hdnFilePath.type = 'hidden';
         hdnFilePath.name = 'ids';
         hdnFilePath.value = ids;
         eleForm.appendChild(hdnFilePath);
+        //添加查询姓名
+        var hdnName = document.createElement('input');
+        hdnName.type = 'hidden';
+        hdnName.name = 'name';
+        hdnName.value = this.query.name;
+        eleForm.appendChild(hdnName);
+
         document.body.appendChild(eleForm);
         eleForm.submit();
         document.body.removeChild(eleForm);
       },
       exportCourse(row){
+        if(!row.sysId){
+           this.$message({message:'无原系统教师关联，只导出新系统的教师课程',type:'warning'});
+        }
         var eleLink = document.createElement('a');
         eleLink.download = '教师授课信息';
         eleLink.style.display = 'none';
diff --git a/src/views/manage/teacherDetails.vue b/src/views/manage/teacherDetails.vue
index 38d3e7a9..20504d32 100644
--- a/src/views/manage/teacherDetails.vue
+++ b/src/views/manage/teacherDetails.vue
@@ -26,7 +26,7 @@
                  <el-col :span="12">
                  <el-form-item label="初始授课时长:">{{formatSeconds(form.default_teaching_time)}}</el-form-item></el-col>
               </el-form-item>
-            
+
             <el-form-item label="讲师体系:">
                 <el-col :span="12">{{form.system_name}}</el-col>
                 <el-col :span="12">
@@ -52,7 +52,7 @@
                 </el-col>
             </el-form-item>
 
-           
+
             <!-- <el-form-item label="认证人:"> -->
                  <!-- <el-col :span="12">--</el-col> -->
                  <!-- <el-col :span="12"> -->
@@ -374,8 +374,8 @@ export default {
           type: 'warning'
         }).then(() => {
            let data = {
-            courseId:row.courseId,   // 课程id  
-            modId:row.modId,   // 模块id 
+            courseId:row.courseId,   // 课程id
+            modId:row.modId,   // 模块id
             teacherId:row.teacherId,  // 教师id
             remark:'',   // 备注
         }
@@ -387,17 +387,17 @@ export default {
                 message: '删除成功!'
             });
             } else {
-              this.$message.error(res.message);  
+              this.$message.error(res.message);
             }
          })
-          
+
         }).catch(() => {
           this.$message({
             type: 'info',
             message: '已取消删除'
-          });          
+          });
         });
-       
+
       },
       recordsUpdate(row) {
        this.records.row = row;
@@ -454,8 +454,8 @@ export default {
     },
     editModelTeacher() {
         let data = {
-            courseId:this.records.row.courseId,   // 课程id  
-            modId:this.records.row.modId,   // 模块id 
+            courseId:this.records.row.courseId,   // 课程id
+            modId:this.records.row.modId,   // 模块id
             teacherId:this.records.row.teacherId,  // 教师id
             teachingTime:this.records.row.teachingTime,   // 授课时间
         }
@@ -495,13 +495,14 @@ export default {
       this.getCourseScore()
     },
     getDetail() {
+      //应该是自己系统的教师信息呀
       teacherBoeApi.teacherInfo(this.id).then(res => {
         if (res.status == 200) {
           const result = res.result;
           this.form = result;
           this.synchronization(res.result);
         } else {
-          this.$message.error(res.message); 
+          this.$message.error(res.message);
         }
       });
     },
@@ -539,7 +540,7 @@ export default {
        console.log(res)
       }
     })
-  }  
+  }
   }
 };
 </script>

From 8739a879fb0c8c7359995134eae9976687474ee4 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 6 Jun 2022 20:54:17 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/TeacherList.vue    |  8 ++----
 src/views/manage/teacherDetails.vue | 41 +++++++++++++----------------
 2 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/src/views/manage/TeacherList.vue b/src/views/manage/TeacherList.vue
index 57e2bf90..5fc5d8c2 100644
--- a/src/views/manage/TeacherList.vue
+++ b/src/views/manage/TeacherList.vue
@@ -158,12 +158,8 @@
         <el-button :loading="saveLoading" type="primary" @click="saveHandle">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog
-    title="教师详情"
-    :close-on-click-modal="false"
-    :visible.sync="showTeacherDetails"
-    width="800px">
-    <teacher-details v-if="teacherDetailsId != ''" :id="teacherDetailsId" :newId="teacherDetailId"></teacher-details>
+    <el-dialog title="教师详情" :close-on-click-modal="false" :visible.sync="showTeacherDetails" width="800px">
+    <teacher-details v-if="teacherDetailId != ''" :id="teacherDetailsId" :newId="teacherDetailId"></teacher-details>
     <span slot="footer" class="dialog-footer">
       <el-button @click="handleCloseOne()">取 消</el-button>
       <!-- <el-button type="primary" @click="showTeacherDetails = false">确 定</el-button> -->
diff --git a/src/views/manage/teacherDetails.vue b/src/views/manage/teacherDetails.vue
index 20504d32..1c94b6b8 100644
--- a/src/views/manage/teacherDetails.vue
+++ b/src/views/manage/teacherDetails.vue
@@ -146,28 +146,11 @@
             </div> -->
         </el-tab-pane>
         <el-tab-pane label="授课资格" name="third">
-            <el-table height="430"
-            :data="qualify.list"
-            style="width: 100%">
-            <el-table-column
-                prop="courseCode"
-                label="课程编号"
-                width="180">
-            </el-table-column>
-            <el-table-column
-                prop="courseName" show-overflow-tooltip
-                label="课程名称"
-                width="250">
-            </el-table-column>
-               <el-table-column
-                prop="dictionaryName"
-                label="课程分类"
-                width="180">
-            </el-table-column>
-            <el-table-column
-                prop="courseType"
-                label="课程类型"
-                width="100">
+            <el-table height="430" :data="qualify.list" style="width: 100%">
+            <el-table-column  prop="courseCode" label="课程编号" width="180"> </el-table-column>
+            <el-table-column prop="courseName" show-overflow-tooltip label="课程名称" width="250"> </el-table-column>
+            <el-table-column prop="dictionaryName" label="课程分类" width="180"> </el-table-column>
+            <el-table-column prop="courseType" label="课程类型"  width="100">
                 <template slot-scope="scope">
                   <span v-if="scope.row.courseType == '0'">录播</span>
                   <span v-if="scope.row.courseType == '1'">面授</span>
@@ -327,9 +310,15 @@ export default {
     };
   },
   mounted() {
-      this.getDetail(this.id);
       this.getAvatar();
   },
+  watch:{
+    id(newVal){
+      if(newVal){
+        this.getDetail(newVal);
+      }
+    }
+  },
   computed: {
     ...mapGetters(["userInfo"])
   },
@@ -496,6 +485,12 @@ export default {
     },
     getDetail() {
       //应该是自己系统的教师信息呀
+      teacherApi.detail(this.newId).then(rs=>{
+         if(rs.status==200){
+           
+         }
+      });
+      
       teacherBoeApi.teacherInfo(this.id).then(res => {
         if (res.status == 200) {
           const result = res.result;

From 6f015d61e1d1b0712118ca95ebcecb9ef937137f Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Tue, 7 Jun 2022 11:35:04 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=95=99=E5=B8=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/TeacherList.vue    |  3 ++-
 src/views/manage/teacherDetails.vue | 31 +++++++++++++++++------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/views/manage/TeacherList.vue b/src/views/manage/TeacherList.vue
index 5fc5d8c2..df835fc0 100644
--- a/src/views/manage/TeacherList.vue
+++ b/src/views/manage/TeacherList.vue
@@ -48,7 +48,7 @@
           {{scope.row.waitStatus=='0'?'在职': scope.row.waitStatus=='1' ? '离职' :''}}
         </template>
       </el-table-column>
-      <el-table-column label="认证状态" width="90" :filters="[{ text: '未认证', value: '0'}, { text: '已认证', value: '1' }]"
+      <el-table-column label="认证状态" width="90" :filters="[{ text: '未认证', value: 0}, { text: '已认证', value: 1 }]"
       :filter-method="filterCertification">
         <template slot-scope="scope">
           {{scope.row.certStatus==0 ?'未认证': scope.row.certStatus==1 ? '已认证' :''}}
@@ -258,6 +258,7 @@
      showTeacherDetails(val) {
       if(!val) {
         this.teacherDetailsId = '';
+        this.teacherDetailId = '';
       }
      }
     },
diff --git a/src/views/manage/teacherDetails.vue b/src/views/manage/teacherDetails.vue
index 1c94b6b8..74555056 100644
--- a/src/views/manage/teacherDetails.vue
+++ b/src/views/manage/teacherDetails.vue
@@ -22,21 +22,21 @@
                  </el-col>
                 </el-form-item>
              <el-form-item label="讲师组织:" >
-                <el-col :span="12">{{form.company_name}}</el-col>
+                <el-col :span="12">{{form.company_name? form.company_name:'--'}}</el-col>
                  <el-col :span="12">
-                 <el-form-item label="初始授课时长:">{{formatSeconds(form.default_teaching_time)}}</el-form-item></el-col>
+                 <el-form-item label="初始授课时长:">{{form.default_teaching_time? formatSeconds(form.default_teaching_time):'--'}}</el-form-item></el-col>
               </el-form-item>
 
             <el-form-item label="讲师体系:">
-                <el-col :span="12">{{form.system_name}}</el-col>
+                <el-col :span="12">{{newForm.tsystemName? newForm.tsystemName:'--'}}</el-col>
                 <el-col :span="12">
                  <el-form-item label="讲师级别:">
-                 {{form.level_name}}
+                 {{newForm.tlevelName? newForm.tlevelName:'--'}}
                  </el-form-item>
                  </el-col>
             </el-form-item>
             <el-form-item label="总计授课时长:">
-                <el-col :span="12">{{formatSeconds(form.teaching_time)}}</el-col>
+                <el-col :span="12">{{form.teaching_time? formatSeconds(form.teaching_time):'--'}}</el-col>
                 <el-col :span="12">
                     <el-form-item label="认证状态:">
                     {{form.is_certify == 1? '已认证':'未认证'}}
@@ -44,10 +44,11 @@
                 </el-col>
             </el-form-item>
             <el-form-item label="认证时间:">
-               <el-col :span="12">{{formatsec(form.certify_at *1000)}}</el-col>
+               <el-col :span="12">{{form.certify_at? formatsec(form.certify_at *1000):'--'}}</el-col>
                 <el-col :span="12">
                   <el-form-item label="认证资料:">
-                    <i style="color:blue" title="点击下载" @click="downloadActioon(form.certification)" class="el-icon-download"></i>
+                    <i style="color:blue" v-if="form.certification" title="点击下载" @click="downloadActioon(form.certification)" class="el-icon-download"></i>
+                    <span v-else>--</span>
                   </el-form-item>
                 </el-col>
             </el-form-item>
@@ -57,12 +58,12 @@
                  <!-- <el-col :span="12">--</el-col> -->
                  <!-- <el-col :span="12"> -->
             <el-form-item label="讲师介绍:">
-                <div v-html="form.description"></div>
+                <div v-html="newForm.description"></div>
             </el-form-item>
                  <!-- </el-col>
             </el-form-item> -->
             <el-form-item label="讲师备注:">
-               {{form.remark}}
+               {{newForm.remark}}
             </el-form-item>
           </el-form>
           </el-col>
@@ -311,6 +312,10 @@ export default {
   },
   mounted() {
       this.getAvatar();
+      if(this.id) {
+        this.getDetail();
+      }
+      
   },
   watch:{
     id(newVal){
@@ -485,11 +490,11 @@ export default {
     },
     getDetail() {
       //应该是自己系统的教师信息呀
-      teacherApi.detail(this.newId).then(rs=>{
-         if(rs.status==200){
+      // teacherApi.detail(this.newId).then(rs=>{
+      //    if(rs.status==200){
            
-         }
-      });
+      //    }
+      // });
       
       teacherBoeApi.teacherInfo(this.id).then(res => {
         if (res.status == 200) {

From 870bc1309aa449d6fc89611c1624a8a455ef589e Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Tue, 7 Jun 2022 16:30:28 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Editor/index.vue     | 31 ++++++----
 src/utils/datetime.js               | 13 ++--
 src/views/manage/TeacherList.vue    | 63 ++++++++++---------
 src/views/manage/teacherDetails.vue | 95 ++++++++---------------------
 4 files changed, 86 insertions(+), 116 deletions(-)

diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue
index 1cb36fad..29eebc4e 100644
--- a/src/components/Editor/index.vue
+++ b/src/components/Editor/index.vue
@@ -24,6 +24,19 @@ const lineHeightStyle = new lineHeightAttributor("lineHeight", "line-height", {
   scope: Parchment.Scope.INLINE,
   whitelist: ["1", "1.5", "2", "3", "4"]
 });
+const toolbarOptions = [
+    ["bold", "italic", "underline", "strike"],       // 加粗 斜体 下划线 删除线
+    ["blockquote", "code-block"],                    // 引用  代码块
+    [{ list: "ordered" }, { list: "bullet" }],       // 有序、无序列表
+    [{ indent: "-1" }, { indent: "+1" }],            // 缩进
+    [{ size: [false,"18px"] }],   // 字体大小
+    [{ header: [1, 2, 3, 4, 5, 6, false] }],         // 标题
+    [{ color: [] }, { background: [] }],             // 字体颜色、字体背景颜色
+    [{ align: [] }],                                 // 对齐方式
+    [{ lineheight: ['initial', '1', '1.5', '2', '3', '4'] }],
+    ["clean"],                                       // 清除文本格式
+    ["link", "image"]
+  ]
 Quill.register({ 'formats/lineHeight': lineHeightStyle }, true)
 export default {
   name: "Editor",
@@ -33,6 +46,10 @@ export default {
       type: String,
       default: "",
     },
+    toobar:{
+      type: Boolean,
+      default: true
+    },
     placeholder: {
       type: String,
       default: "请输入长度大于100个字符的内容",
@@ -68,19 +85,7 @@ export default {
           },
           // 工具栏配置
           toolbar: {
-            container:[
-              ["bold", "italic", "underline", "strike"],       // 加粗 斜体 下划线 删除线
-              ["blockquote", "code-block"],                    // 引用  代码块
-              [{ list: "ordered" }, { list: "bullet" }],       // 有序、无序列表
-              [{ indent: "-1" }, { indent: "+1" }],            // 缩进
-              [{ size: [false,"18px"] }],   // 字体大小
-              [{ header: [1, 2, 3, 4, 5, 6, false] }],         // 标题
-              [{ color: [] }, { background: [] }],             // 字体颜色、字体背景颜色
-              [{ align: [] }],                                 // 对齐方式
-              [{ lineheight: ['initial', '1', '1.5', '2', '3', '4'] }],
-              ["clean"],                                       // 清除文本格式
-              ["link", "image"]                       // 链接、图片、视频, "video"
-            ],
+            container:this.toobar? toolbarOptions:[],
             handlers: {
               image: function(value) {
                 if (value) {
diff --git a/src/utils/datetime.js b/src/utils/datetime.js
index 8a71be1b..64735195 100644
--- a/src/utils/datetime.js
+++ b/src/utils/datetime.js
@@ -3,7 +3,7 @@
 //    fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
 //   }
 //   let o = {
-//    'M+': new date(date).getMonth() +1, 
+//    'M+': new date(date).getMonth() +1,
 //    'd+': date.getDate(),
 //    'h+': date.getHours(),
 //    'm+': date.getMinutes(),
@@ -70,11 +70,16 @@ export function formatDate(date){
 // 秒转时分秒
 export function formatSeconds(value) {
   let result = parseInt(value)
-  let h = Math.floor(result / 3600) < 10 ? '0' + Math.floor(result / 3600) : Math.floor(result / 3600);
-  let m = Math.floor((result / 60 % 60)) < 10 ? '0' + Math.floor((result / 60 % 60)) : Math.floor((result / 60 % 60));
-  let s = Math.floor((result % 60)) < 10 ? '0' + Math.floor((result % 60)) : Math.floor((result % 60));
+  let d= Math.floor(result / (3600*24));
+  let last=Math.floor(result % (3600*24));
+  let h = Math.floor(last / 3600) < 10 ? '0' + Math.floor(last / 3600) : Math.floor(last / 3600);
+  let m = Math.floor((last / 60 % 60)) < 10 ? '0' + Math.floor((last / 60 % 60)) : Math.floor((last / 60 % 60));
+  let s = Math.floor((last % 60)) < 10 ? '0' + Math.floor((last % 60)) : Math.floor((last % 60));
 
   let res = '';
+  if(d>0){
+    res += `${d}天`;
+  }
   if(h !== '00'){
     res += `${h}小时`;
   }
diff --git a/src/views/manage/TeacherList.vue b/src/views/manage/TeacherList.vue
index df835fc0..47d9c06c 100644
--- a/src/views/manage/TeacherList.vue
+++ b/src/views/manage/TeacherList.vue
@@ -1,31 +1,38 @@
 <template>
   <div class="u-page">
     <div style="padding-bottom: 10px;">
-      <div style="display: flex;justify-content:flex-start;">
-             <div style="padding: 0px 5px;">
-             <el-select v-model="query.tsystemId" value-key="id" clearable @change="queryChangeSystem" placeholder="请选择教师体系">
-                 <el-option v-for="item in systemData" :key="item.id" :label="item.name" :value="item.id"></el-option>
-              </el-select>
-           </div>
-           <!-- 要在换一个变量与新建区别开 -->
-            <div style="padding: 0px 5px;">
-              <el-select v-model="query.tlevelId" clearable value-key="id" placeholder="请选择教师级别">
-                <el-option v-for="item in queryLevelData" :key="item.id" :label="item.name" :value="item.id"></el-option>
-              </el-select>
-         </div>
-          <div style="padding: 0px 5px;"><el-input placeholder="请输入姓名" v-model="query.name" clearable></el-input></div>
-                <div style="padding: 0px 5px;">
-              <el-select v-model="query.salaryId" clearable value-key="id" placeholder="请选择发薪地">
-                <el-option v-for="item in placeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
-              </el-select>
-         </div>
-      </div>
-         <div style="margin-top:10px;padding: 0px 5px;">
+      <div>
+        <el-row :gutter="5">
+          <el-col :span="4">
+            <el-select style="width: 100%" v-model="query.tsystemId" value-key="id" clearable @change="queryChangeSystem" placeholder="教师体系">
+              <el-option v-for="item in systemData" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-col>
+          <el-col :span="4">
+            <el-select style="width: 100%" v-model="query.tlevelId" clearable value-key="id" placeholder="教师级别">
+              <el-option v-for="item in queryLevelData" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </el-col>
+          <el-col :span="4">
+            <el-input style="width: 100%" placeholder="姓名" v-model="query.name" clearable></el-input>
+          </el-col>
+          <el-col :span="4">
+            <el-select style="width: 100%" v-model="query.salaryId" clearable value-key="id" placeholder="发薪地">
+              <el-option v-for="item in placeList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            </el-select>
+          </el-col>
+          <el-col :span="8">
             <el-button icon="el-icon-search" type="primary"  @click="loadData(1)">搜索</el-button>
             <el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button>
-            <el-button icon="el-icon-circle-plus-outline" type="primary"  @click="openDialog">新建教师</el-button>
-            <el-button icon="el-icon-folder-opened" type="primary" @click="exportsExcel">导出</el-button>
-          </div>
+          </el-col>
+        </el-row>
+      </div>
+
+      <div style="margin-top:10px;padding: 0px 5px;">
+
+        <el-button icon="el-icon-circle-plus-outline" type="primary"  @click="openDialog">新建教师</el-button>
+        <el-button icon="el-icon-folder-opened" type="primary" @click="exportsExcel">导出</el-button>
+      </div>
     </div>
     <el-table ref="teacherTable" style="100%" :data="tableData" border stripe @selection-change="handleSelectionChange">
       <el-table-column type="selection"></el-table-column>
@@ -72,7 +79,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <div style="text-align: center;margin-top: 70px;">
+    <div style="text-align: center;margin-top: 50px;">
         <el-pagination
           background
           @size-change="handleSizeChange"
@@ -84,7 +91,7 @@
           :total="count">
         </el-pagination>
     </div>
-    <div style="height: 100px;"></div>
+    <div style="height: 50px;"></div>
     <el-dialog :title="newOrEdit" custom-class="g-dialog" width="900px" :visible.sync="dialogVisible" :close-on-click-modal='false' >
       <el-form label-width="100px" :model="form" ref="form" :rules="rules">
         <el-form-item>
@@ -146,8 +153,8 @@
            </el-radio-group>
         </el-form-item>
         <el-form-item label="备注">
-          <!-- <el-input v-model="form.description" clearable type="textarea" :autosize='{ minRows: 3, maxRows: 6 }'></el-input> -->
-          <WxEditor v-model="form.description" :minHeight="50"></WxEditor>
+          <el-input v-model="form.description" clearable type="textarea" :autosize='{ minRows: 3, maxRows: 6 }'></el-input>
+          <!--<WxEditor :toobar="false" v-model="form.description" :minHeight="50"></WxEditor>-->
         </el-form-item>
         <el-form-item label="擅长课程">
           <el-input v-model="form.courses" clearable placeholder="请输入"></el-input>
@@ -161,7 +168,7 @@
     <el-dialog title="教师详情" :close-on-click-modal="false" :visible.sync="showTeacherDetails" width="800px">
     <teacher-details v-if="teacherDetailId != ''" :id="teacherDetailsId" :newId="teacherDetailId"></teacher-details>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="handleCloseOne()">取 消</el-button>
+      <el-button @click="handleCloseOne()">关 闭</el-button>
       <!-- <el-button type="primary" @click="showTeacherDetails = false">确 定</el-button> -->
     </span>
 </el-dialog>
diff --git a/src/views/manage/teacherDetails.vue b/src/views/manage/teacherDetails.vue
index 74555056..b1378a1f 100644
--- a/src/views/manage/teacherDetails.vue
+++ b/src/views/manage/teacherDetails.vue
@@ -82,51 +82,29 @@
                         </el-option>
                     </el-select></div>
             </div>
-            <el-table height="430"
-            :data="records.list"
-            style="width: 100%;margin-top:10px">
-            <el-table-column
-                prop="courseCode" width="120"
-                label="班级编号">
+            <el-table height="430" :data="records.list"  style="width: 100%;margin-top:10px">
+            <el-table-column prop="courseCode" width="120" label="班级编号">
             </el-table-column>
-            <el-table-column
-                prop="courseType"
-                label="类型">
+            <el-table-column prop="courseType" label="类型">
                 <template slot-scope="scope">
                     <span v-if="scope.row.courseType == '1'">面授班</span>
                     <span v-if="scope.row.courseType == '2'">训练班</span>
                     <span v-if="scope.row.courseType == '0'">在线班</span>
                 </template>
             </el-table-column>
-            <el-table-column
-                prop="courseName" show-overflow-tooltip
-                label="班级名称" width="180">
+            <el-table-column prop="courseName" show-overflow-tooltip label="班级名称" width="180">
             </el-table-column>
-               <el-table-column
-                prop="modName" show-overflow-tooltip
-                label="模块名称"
-                width="100">
+               <el-table-column prop="modName" show-overflow-tooltip label="模块名称" width="100">
             </el-table-column>
-            <el-table-column
-                prop="teachingTime"
-                label="授课时长(min)" width="120">
+            <el-table-column prop="teachingTime" label="授课时长(min)" width="120">
             </el-table-column>
-            <el-table-column
-                prop="openStartTime"
-                label="开班时间" width="140">
+            <el-table-column prop="openStartTime" label="开班时间" width="140">
             </el-table-column>
-                <el-table-column
-                prop="courseStatus"
-                label="班级状态"
-                width="100">
+            <el-table-column prop="courseStatus" label="班级状态" width="100">
             </el-table-column>
-            <el-table-column
-                prop="teacherScore"
-                label="评分">
+            <el-table-column prop="teacherScore" label="评分">
             </el-table-column>
-                <el-table-column
-                label="操作"
-                width="120">
+              <el-table-column label="操作" width="120">
                <template slot-scope="scope">
                     <el-button type="text" @click="recordsUpdate(scope.row)">修改</el-button>
                     <el-button type="text" @click="recordsDel(scope.row)">删除</el-button>
@@ -173,55 +151,30 @@
             </div> -->
         </el-tab-pane>
         <el-tab-pane label="未开班资源" name="fourth">
-          <el-table height="430"
-            :data="courseInfoList"
-            style="width: 100%">
-            <el-table-column
-                prop="courseCode"
-                label="班级编号"
-                width="120">
+          <el-table height="430" :data="courseInfoList" style="width: 100%">
+            <el-table-column prop="courseCode" label="班级编号" width="120">
             </el-table-column>
-            <el-table-column
-                prop="courseName" show-overflow-tooltip
-                label="班级名称"
-                width="200">
+            <el-table-column prop="courseName" show-overflow-tooltip label="班级名称" width="200">
             </el-table-column>
-            <el-table-column
-                prop="modName" width="150" show-overflow-tooltip
-                label="模块名称">
+            <el-table-column prop="modName" width="150" show-overflow-tooltip label="模块名称">
             </el-table-column>
-               <el-table-column
-                prop="teachingTime"
-                label="授课时长"
-                width="100">
+            <el-table-column prop="teachingTime" label="授课时长" width="100">
             </el-table-column>
-            <el-table-column
-                prop="openStartTime"
-                label="开班时间"
-                width="180">
+            <el-table-column prop="openStartTime" label="开班时间" width="180">
             </el-table-column>
             </el-table>
         </el-tab-pane>
         <el-tab-pane label="晋级过程" name="five">
-          <el-table height="370"
-            :data="precessList"
-            style="width: 100%">
-            <el-table-column
-                prop="operatorTime"
-                label="变更时间"
-                width="180">
+          <el-table height="370"  :data="precessList" style="width: 100%">
+            <el-table-column prop="operatorTime" label="变更时间"  width="180">
             </el-table-column>
-            <el-table-column
-                prop="type"
-                label="变更方式">
-                  <template slot-scope="scope">
+            <el-table-column prop="type" label="变更方式">
+                <template slot-scope="scope">
                     <span v-if="scope.row.type == '0'">手动</span>
                     <span v-if="scope.row.type == '1'">自动</span>
                 </template>
             </el-table-column>
-               <el-table-column
-                prop="afterLevelName"
-                label="变更结果">
+               <el-table-column prop="afterLevelName" label="变更结果">
             </el-table-column>
             <el-table-column
                 prop="operatorName"
@@ -315,7 +268,7 @@ export default {
       if(this.id) {
         this.getDetail();
       }
-      
+
   },
   watch:{
     id(newVal){
@@ -492,10 +445,10 @@ export default {
       //应该是自己系统的教师信息呀
       // teacherApi.detail(this.newId).then(rs=>{
       //    if(rs.status==200){
-           
+
       //    }
       // });
-      
+
       teacherBoeApi.teacherInfo(this.id).then(res => {
         if (res.status == 200) {
           const result = res.result;