diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxjsjbxxController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxjsjbxxController.java
index 9d4baf795..153acb8d2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxjsjbxxController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxjsjbxxController.java
@@ -33,6 +33,18 @@ public class TsbzJxjsjbxxController extends BaseController
     @Autowired
     private ITsbzJxjsjbxxService tsbzJxjsjbxxService;
 
+    /**
+     * 查询见习教师基本信息列表，没有基地校的教师列表
+     */
+    @PreAuthorize("@ss.hasPermi('jxjs:jdx:list')")
+    @GetMapping("/listnotjdx")
+    public TableDataInfo listnotjdx(TsbzJxjsjbxx tsbzJxjsjbxx)
+    {
+        startPage();
+        List<TsbzJxjsjbxx> list = tsbzJxjsjbxxService.selectTsbzJxjsjbxxListnotjdx(tsbzJxjsjbxx);
+        return getDataTable(list);
+    }
+
     /**
      * 查询见习教师基本信息列表
      */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/mapper/TsbzJxjsjbxxMapper.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/mapper/TsbzJxjsjbxxMapper.java
index 27ccfc227..a2e5ed7ff 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jxjs/mapper/TsbzJxjsjbxxMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/mapper/TsbzJxjsjbxxMapper.java
@@ -28,6 +28,14 @@ public interface TsbzJxjsjbxxMapper
      */
     public List<TsbzJxjsjbxx> selectTsbzJxjsjbxxList(TsbzJxjsjbxx tsbzJxjsjbxx);
 
+    /**
+     * 查询见习教师基本信息列表
+     *
+     * @param tsbzJxjsjbxx 见习教师基本信息
+     * @return 见习教师基本信息集合
+     */
+    public List<TsbzJxjsjbxx> selectTsbzJxjsjbxxListnotjdx(TsbzJxjsjbxx tsbzJxjsjbxx);
+
     /**
      * 新增见习教师基本信息
      * 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/ITsbzJxjsjbxxService.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/ITsbzJxjsjbxxService.java
index 07ef2ec70..ad93de979 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/ITsbzJxjsjbxxService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/ITsbzJxjsjbxxService.java
@@ -27,6 +27,14 @@ public interface ITsbzJxjsjbxxService
      */
     public List<TsbzJxjsjbxx> selectTsbzJxjsjbxxList(TsbzJxjsjbxx tsbzJxjsjbxx);
 
+    /**
+     * 查询见习教师基本信息列表
+     *
+     * @param tsbzJxjsjbxx 见习教师基本信息
+     * @return 见习教师基本信息集合
+     */
+    public List<TsbzJxjsjbxx> selectTsbzJxjsjbxxListnotjdx(TsbzJxjsjbxx tsbzJxjsjbxx);
+
     /**
      * 新增见习教师基本信息
      * 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/impl/TsbzJxjsjbxxServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/impl/TsbzJxjsjbxxServiceImpl.java
index d6f77fb04..eed32e6f2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/impl/TsbzJxjsjbxxServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/impl/TsbzJxjsjbxxServiceImpl.java
@@ -44,6 +44,18 @@ public class TsbzJxjsjbxxServiceImpl implements ITsbzJxjsjbxxService
         return tsbzJxjsjbxxMapper.selectTsbzJxjsjbxxList(tsbzJxjsjbxx);
     }
 
+    /**
+     * 查询见习教师基本信息列表
+     *
+     * @param tsbzJxjsjbxx 见习教师基本信息
+     * @return 见习教师基本信息
+     */
+    @Override
+    public List<TsbzJxjsjbxx> selectTsbzJxjsjbxxListnotjdx(TsbzJxjsjbxx tsbzJxjsjbxx)
+    {
+        return tsbzJxjsjbxxMapper.selectTsbzJxjsjbxxListnotjdx(tsbzJxjsjbxx);
+    }
+
     /**
      * 新增见习教师基本信息
      * 
diff --git a/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxjsjbxxMapper.xml b/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxjsjbxxMapper.xml
index 0f0636afa..2131b168b 100644
--- a/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxjsjbxxMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxjsjbxxMapper.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.jxjs.mapper.TsbzJxjsjbxxMapper">
-    
+
     <resultMap type="TsbzJxjsjbxx" id="TsbzJxjsjbxxResult">
-        <result property="id"    column="id"    />
-        <result property="otherid"    column="otherid"    />
-        <result property="name"    column="name"    />
-        <result property="jxbh"    column="jxbh"    />
-        <result property="xb"    column="xb"    />
-        <result property="csrq"    column="csrq"    />
-        <result property="email"    column="email"    />
-        <result property="phone"    column="phone"    />
-        <result property="yzbm"    column="yzbm"    />
-        <result property="zzmm"    column="zzmm"    />
-        <result property="mz"    column="mz"    />
-        <result property="prdwid"    column="prdwid"    />
-        <result property="prdwmc"    column="prdwmc"    />
-        <result property="jdxid"    column="jdxid"    />
-        <result property="rjxd"    column="rjxd"    />
-        <result property="rjxk"    column="rjxk"    />
-        <result property="rjnj"    column="rjnj"    />
-        <result property="byyx"    column="byyx"    />
-        <result property="xl"    column="xl"    />
-        <result property="xw"    column="xw"    />
-        <result property="sfsfs"    column="sfsfs"    />
-        <result property="lqnf"    column="lqnf"    />
-        <result property="createTime"    column="create_time"    />
+        <result property="id" column="id"/>
+        <result property="otherid" column="otherid"/>
+        <result property="name" column="name"/>
+        <result property="jxbh" column="jxbh"/>
+        <result property="xb" column="xb"/>
+        <result property="csrq" column="csrq"/>
+        <result property="email" column="email"/>
+        <result property="phone" column="phone"/>
+        <result property="yzbm" column="yzbm"/>
+        <result property="zzmm" column="zzmm"/>
+        <result property="mz" column="mz"/>
+        <result property="prdwid" column="prdwid"/>
+        <result property="prdwmc" column="prdwmc"/>
+        <result property="jdxid" column="jdxid"/>
+        <result property="rjxd" column="rjxd"/>
+        <result property="rjxk" column="rjxk"/>
+        <result property="rjnj" column="rjnj"/>
+        <result property="byyx" column="byyx"/>
+        <result property="xl" column="xl"/>
+        <result property="xw" column="xw"/>
+        <result property="sfsfs" column="sfsfs"/>
+        <result property="lqnf" column="lqnf"/>
+        <result property="createTime" column="create_time"/>
     </resultMap>
 
     <sql id="selectTsbzJxjsjbxxVo">
@@ -36,36 +36,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTsbzJxjsjbxxList" parameterType="TsbzJxjsjbxx" resultMap="TsbzJxjsjbxxResult">
         <include refid="selectTsbzJxjsjbxxVo"/>
-        <where>  
-            <if test="otherid != null  and otherid != ''"> and otherid = #{otherid}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="jxbh != null  and jxbh != ''"> and jxbh = #{jxbh}</if>
-            <if test="xb != null  and xb != ''"> and xb = #{xb}</if>
-            <if test="csrq != null "> and csrq = #{csrq}</if>
-            <if test="email != null  and email != ''"> and email = #{email}</if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
-            <if test="yzbm != null  and yzbm != ''"> and yzbm = #{yzbm}</if>
-            <if test="zzmm != null  and zzmm != ''"> and zzmm = #{zzmm}</if>
-            <if test="mz != null  and mz != ''"> and mz = #{mz}</if>
-            <if test="prdwid != null  and prdwid != ''"> and prdwid = #{prdwid}</if>
-            <if test="prdwmc != null  and prdwmc != ''"> and prdwmc = #{prdwmc}</if>
-            <if test="jdxid != null  and jdxid != ''"> and jdxid = #{jdxid}</if>
-            <if test="rjxd != null  and rjxd != ''"> and rjxd = #{rjxd}</if>
-            <if test="rjxk != null  and rjxk != ''"> and rjxk = #{rjxk}</if>
-            <if test="rjnj != null  and rjnj != ''"> and rjnj = #{rjnj}</if>
-            <if test="byyx != null  and byyx != ''"> and byyx = #{byyx}</if>
-            <if test="xl != null  and xl != ''"> and xl = #{xl}</if>
-            <if test="xw != null  and xw != ''"> and xw = #{xw}</if>
-            <if test="sfsfs != null  and sfsfs != ''"> and sfsfs = #{sfsfs}</if>
-            <if test="lqnf != null  and lqnf != ''"> and lqnf = #{lqnf}</if>
+        <where>
+            <if test="otherid != null  and otherid != ''">and otherid = #{otherid}</if>
+            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="jxbh != null  and jxbh != ''">and jxbh = #{jxbh}</if>
+            <if test="xb != null  and xb != ''">and xb = #{xb}</if>
+            <if test="csrq != null ">and csrq = #{csrq}</if>
+            <if test="email != null  and email != ''">and email = #{email}</if>
+            <if test="phone != null  and phone != ''">and phone = #{phone}</if>
+            <if test="yzbm != null  and yzbm != ''">and yzbm = #{yzbm}</if>
+            <if test="zzmm != null  and zzmm != ''">and zzmm = #{zzmm}</if>
+            <if test="mz != null  and mz != ''">and mz = #{mz}</if>
+            <if test="prdwid != null  and prdwid != ''">and prdwid = #{prdwid}</if>
+            <if test="prdwmc != null  and prdwmc != ''">and prdwmc = #{prdwmc}</if>
+            <if test="jdxid != null  and jdxid != ''">and jdxid = #{jdxid}</if>
+            <if test="rjxd != null  and rjxd != ''">and rjxd = #{rjxd}</if>
+            <if test="rjxk != null  and rjxk != ''">and rjxk = #{rjxk}</if>
+            <if test="rjnj != null  and rjnj != ''">and rjnj = #{rjnj}</if>
+            <if test="byyx != null  and byyx != ''">and byyx = #{byyx}</if>
+            <if test="xl != null  and xl != ''">and xl = #{xl}</if>
+            <if test="xw != null  and xw != ''">and xw = #{xw}</if>
+            <if test="sfsfs != null  and sfsfs != ''">and sfsfs = #{sfsfs}</if>
+            <if test="lqnf != null  and lqnf != ''">and lqnf = #{lqnf}</if>
         </where>
     </select>
-    
+
+    <select id="selectTsbzJxjsjbxxListnotjdx" parameterType="TsbzJxjsjbxx" resultMap="TsbzJxjsjbxxResult">
+        <include refid="selectTsbzJxjsjbxxVo"/>
+        where jdxid is null
+        <if test="otherid != null  and otherid != ''">and otherid = #{otherid}</if>
+        <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+        <if test="jxbh != null  and jxbh != ''">and jxbh = #{jxbh}</if>
+        <if test="xb != null  and xb != ''">and xb = #{xb}</if>
+        <if test="csrq != null ">and csrq = #{csrq}</if>
+        <if test="email != null  and email != ''">and email = #{email}</if>
+        <if test="phone != null  and phone != ''">and phone = #{phone}</if>
+        <if test="yzbm != null  and yzbm != ''">and yzbm = #{yzbm}</if>
+        <if test="zzmm != null  and zzmm != ''">and zzmm = #{zzmm}</if>
+        <if test="mz != null  and mz != ''">and mz = #{mz}</if>
+        <if test="prdwid != null  and prdwid != ''">and prdwid = #{prdwid}</if>
+        <if test="prdwmc != null  and prdwmc != ''">and prdwmc = #{prdwmc}</if>
+        <!--<if test="jdxid != null  and jdxid != ''"> and jdxid = #{jdxid}</if>-->
+        <if test="rjxd != null  and rjxd != ''">and rjxd = #{rjxd}</if>
+        <if test="rjxk != null  and rjxk != ''">and rjxk = #{rjxk}</if>
+        <if test="rjnj != null  and rjnj != ''">and rjnj = #{rjnj}</if>
+        <if test="byyx != null  and byyx != ''">and byyx = #{byyx}</if>
+        <if test="xl != null  and xl != ''">and xl = #{xl}</if>
+        <if test="xw != null  and xw != ''">and xw = #{xw}</if>
+        <if test="sfsfs != null  and sfsfs != ''">and sfsfs = #{sfsfs}</if>
+        <if test="lqnf != null  and lqnf != ''">and lqnf = #{lqnf}</if>
+    </select>
+
     <select id="selectTsbzJxjsjbxxById" parameterType="Long" resultMap="TsbzJxjsjbxxResult">
         <include refid="selectTsbzJxjsjbxxVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTsbzJxjsjbxx" parameterType="TsbzJxjsjbxx">
         insert into tsbz_jxjsjbxx
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -92,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sfsfs != null">sfsfs,</if>
             <if test="lqnf != null">lqnf,</if>
             <if test="createTime != null">create_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="otherid != null">#{otherid},</if>
@@ -117,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="sfsfs != null">#{sfsfs},</if>
             <if test="lqnf != null">#{lqnf},</if>
             <if test="createTime != null">#{createTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateTsbzJxjsjbxx" parameterType="TsbzJxjsjbxx">
@@ -154,10 +180,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteTsbzJxjsjbxxByIds" parameterType="String">
-        delete from tsbz_jxjsjbxx where id in 
+        delete from tsbz_jxjsjbxx where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-    
+
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/jxjs/jxjsjbxx.js b/ruoyi-ui/src/api/jxjs/jxjsjbxx.js
index fd4f0140e..44fa2dd45 100644
--- a/ruoyi-ui/src/api/jxjs/jxjsjbxx.js
+++ b/ruoyi-ui/src/api/jxjs/jxjsjbxx.js
@@ -9,6 +9,15 @@ export function listJxjsjbxx(query) {
   })
 }
 
+// 查询见习教师基本信息列表
+export function listJxjsjbxxnotjdx(query) {
+  return request({
+    url: '/jxjs/jxjsjbxx/listnotjdx',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询见习教师基本信息详细
 export function getJxjsjbxx(id) {
   return request({
diff --git a/ruoyi-ui/src/components/Editor/index.vue b/ruoyi-ui/src/components/Editor/index.vue
index 7fadf6f60..fdbd052d9 100644
--- a/ruoyi-ui/src/components/Editor/index.vue
+++ b/ruoyi-ui/src/components/Editor/index.vue
@@ -147,7 +147,7 @@ export default {
 .editor {
   white-space: pre-wrap!important;
   line-height: normal !important;
-  height: 192px;
+  /* height: 192px; */
 }
 .quill-img {
   display: none;
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 59238d96e..d47f92db7 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -25,17 +25,14 @@ import Layout from '@/layout'
  */
 
 // 公共路由
-export const constantRoutes = [
-  {
+export const constantRoutes = [{
     path: '/redirect',
     component: Layout,
     hidden: true,
-    children: [
-      {
-        path: '/redirect/:path(.*)',
-        component: (resolve) => require(['@/views/redirect'], resolve)
-      }
-    ]
+    children: [{
+      path: '/redirect/:path(.*)',
+      component: (resolve) => require(['@/views/redirect'], resolve)
+    }]
   },
   {
     path: '/login',
@@ -56,72 +53,93 @@ export const constantRoutes = [
     path: '',
     component: Layout,
     redirect: 'index',
-    children: [
-      {
-        path: 'index',
-        component: (resolve) => require(['@/views/index'], resolve),
-        name: '首页',
-        meta: { title: '首页', icon: 'dashboard', noCache: true, affix: true }
+    children: [{
+      path: 'index',
+      component: (resolve) => require(['@/views/index'], resolve),
+      name: '首页',
+      meta: {
+        title: '首页',
+        icon: 'dashboard',
+        noCache: true,
+        affix: true
       }
-    ]
+    }]
   },
   {
     path: '/user',
     component: Layout,
     hidden: true,
     redirect: 'noredirect',
-    children: [
-      {
-        path: 'profile',
-        component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
-        name: 'Profile',
-        meta: { title: '个人中心', icon: 'user' }
+    children: [{
+      path: 'profile',
+      component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
+      name: 'Profile',
+      meta: {
+        title: '个人中心',
+        icon: 'user'
       }
-    ]
+    }]
   },
   {
     path: '/dict',
     component: Layout,
     hidden: true,
-    children: [
-      {
-        path: 'type/data/:dictId(\\d+)',
-        component: (resolve) => require(['@/views/system/dict/data'], resolve),
-        name: 'Data',
-        meta: { title: '字典数据', icon: '' }
+    children: [{
+      path: 'type/data/:dictId(\\d+)',
+      component: (resolve) => require(['@/views/system/dict/data'], resolve),
+      name: 'Data',
+      meta: {
+        title: '字典数据',
+        icon: ''
       }
-    ]
+    }]
+  },
+  {
+    path: '/jxjs',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: 'jdx/jxjsjbxx/data/:id',
+      component: (resolve) => require(['@/views/jxjs/jdx/data'], resolve),
+      name: 'jdxjxjsjbxx',
+      meta: {
+        title: '基地校见习教师',
+        icon: ''
+      }
+    }]
   },
   {
     path: '/job',
     component: Layout,
     hidden: true,
-    children: [
-      {
-        path: 'log',
-        component: (resolve) => require(['@/views/monitor/job/log'], resolve),
-        name: 'JobLog',
-        meta: { title: '调度日志' }
+    children: [{
+      path: 'log',
+      component: (resolve) => require(['@/views/monitor/job/log'], resolve),
+      name: 'JobLog',
+      meta: {
+        title: '调度日志'
       }
-    ]
+    }]
   },
   {
     path: '/gen',
     component: Layout,
     hidden: true,
-    children: [
-      {
-        path: 'edit/:tableId(\\d+)',
-        component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
-        name: 'GenEdit',
-        meta: { title: '修改生成配置' }
+    children: [{
+      path: 'edit/:tableId(\\d+)',
+      component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
+      name: 'GenEdit',
+      meta: {
+        title: '修改生成配置'
       }
-    ]
+    }]
   }
 ]
 
 export default new Router({
   mode: 'history', // 去掉url中的#
-  scrollBehavior: () => ({ y: 0 }),
+  scrollBehavior: () => ({
+    y: 0
+  }),
   routes: constantRoutes
 })
diff --git a/ruoyi-ui/src/views/jxjs/jdx/data.vue b/ruoyi-ui/src/views/jxjs/jdx/data.vue
new file mode 100644
index 000000000..298031144
--- /dev/null
+++ b/ruoyi-ui/src/views/jxjs/jdx/data.vue
@@ -0,0 +1,443 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="姓名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="性别" prop="xb">
+        <el-select v-model="queryParams.xb" placeholder="请选择性别" clearable size="small">
+          <el-option
+            v-for="dict in xbOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="政治面貌" prop="zzmm">
+        <el-select v-model="queryParams.zzmm" placeholder="请选择政治面貌" clearable size="small">
+          <el-option
+            v-for="dict in zzmmOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="民族" prop="mz">
+        <el-select v-model="queryParams.mz" placeholder="请选择民族" clearable size="small">
+          <el-option
+            v-for="dict in mzOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="任教学段" prop="rjxd">
+        <el-select v-model="queryParams.rjxd" placeholder="请选择任教学段" clearable size="small">
+          <el-option
+            v-for="dict in rjxdOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="任教学科" prop="rjxk">
+        <el-select v-model="queryParams.rjxk" placeholder="请选择任教学科" clearable size="small">
+          <el-option
+            v-for="dict in rjxkOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="任教年级" prop="rjnj">
+        <el-select v-model="queryParams.rjnj" placeholder="请选择任教年级" clearable size="small">
+          <el-option
+            v-for="dict in rjnjOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="学历" prop="xl">
+        <el-select v-model="queryParams.xl" placeholder="请选择学历" clearable size="small">
+          <el-option
+            v-for="dict in xlOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="学位" prop="xw">
+        <el-select v-model="queryParams.xw" placeholder="请选择学位" clearable size="small">
+          <el-option
+            v-for="dict in xwOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="师范生" prop="sfsfs">
+        <el-select v-model="queryParams.sfsfs" placeholder="请选择是否师范生" clearable size="small">
+          <el-option
+            v-for="dict in sfsfsOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="录取年份" prop="lqnf">
+        <el-select v-model="queryParams.lqnf" placeholder="请选择录取年份" clearable size="small">
+          <el-option
+            v-for="dict in lqnfOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="聘任单位" prop="prdwid">
+        <el-input
+          v-model="queryParams.prdwid"
+          placeholder="请输入聘任单位"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="基地校" prop="jdxid">
+        <el-input
+          v-model="queryParams.jdxid"
+          placeholder="请输入基地校"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="毕业院校" prop="byyx">
+        <el-input
+          v-model="queryParams.byyx"
+          placeholder="请输入毕业院校"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="jxjsjbxxList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="姓名" align="center" prop="name" />
+      <el-table-column label="性别" align="center" prop="xb" :formatter="xbFormat" />
+      <el-table-column label="政治面貌" align="center" prop="zzmm" :formatter="zzmmFormat" />
+      <el-table-column label="民族" align="center" prop="mz" :formatter="mzFormat" />
+      <el-table-column label="学历" align="center" prop="xl" :formatter="xlFormat" />
+      <el-table-column label="学位" align="center" prop="xw" :formatter="xwFormat" />
+      <el-table-column label="是否师范生" align="center" prop="sfsfs" :formatter="sfsfsFormat" />
+      <el-table-column label="录取年份" align="center" prop="lqnf" :formatter="lqnfFormat" />
+      <!-- <el-table-column label="出生日期" align="center" prop="csrq" width="180">
+      <el-table-column label="聘任单位" align="center" prop="prdwid" />
+      <el-table-column label="聘任单位名称" align="center" prop="prdwmc" />
+      <el-table-column label="基地校" align="center" prop="jdxid" />
+      <el-table-column label="任教学段" align="center" prop="rjxd" :formatter="rjxdFormat" />
+      <el-table-column label="任教学科" align="center" prop="rjxk" :formatter="rjxkFormat" />
+      <el-table-column label="任教年级" align="center" prop="rjnj" :formatter="rjnjFormat" />
+      <el-table-column label="毕业院校" align="center" prop="byyx" /> 
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.csrq, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['jxjs:jxjsjbxx:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import { listJxjsjbxx, getJxjsjbxx, updateJxjsjbxx } from "@/api/jxjs/jxjsjbxx";
+
+export default {
+  name: "Jxjsjbxx",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 见习教师基本信息表格数据
+      jxjsjbxxList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 性别字典
+      xbOptions: [],
+      // 政治面貌字典
+      zzmmOptions: [],
+      // 民族字典
+      mzOptions: [],
+      // 任教学段字典
+      rjxdOptions: [],
+      // 任教学科字典
+      rjxkOptions: [],
+      // 任教年级字典
+      rjnjOptions: [],
+      // 学历字典
+      xlOptions: [],
+      // 学位字典
+      xwOptions: [],
+      // 是否师范生字典
+      sfsfsOptions: [],
+      // 录取年份字典
+      lqnfOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        otherid: null,
+        name: null,
+        jxbh: null,
+        xb: null,
+        csrq: null,
+        email: null,
+        phone: null,
+        yzbm: null,
+        zzmm: null,
+        mz: null,
+        prdwid: null,
+        prdwmc: null,
+        jdxid: null,
+        rjxd: null,
+        rjxk: null,
+        rjnj: null,
+        byyx: null,
+        xl: null,
+        xw: null,
+        sfsfs: null,
+        lqnf: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "教师名称不能为空", trigger: "blur" },
+        ],
+        jxbh: [
+          { required: true, message: "进修编号不能为空", trigger: "blur" },
+        ],
+        xb: [{ required: true, message: "教师性别不能为空", trigger: "blur" }],
+        csrq: [
+          { required: true, message: "出生日期不能为空", trigger: "blur" },
+        ],
+        phone: [{ required: true, message: "电话不能为空", trigger: "blur" }],
+      },
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("sys_user_sex").then((response) => {
+      this.xbOptions = response.data;
+    });
+    this.getDicts("sys_dm_zzmm").then((response) => {
+      this.zzmmOptions = response.data;
+    });
+    this.getDicts("sys_dm_mz").then((response) => {
+      this.mzOptions = response.data;
+    });
+    this.getDicts("sys_dm_rjxd").then((response) => {
+      this.rjxdOptions = response.data;
+    });
+    this.getDicts("sys_dm_rjxk").then((response) => {
+      this.rjxkOptions = response.data;
+    });
+    this.getDicts("sys_dm_rjnj").then((response) => {
+      this.rjnjOptions = response.data;
+    });
+    this.getDicts("sys_dm_xl").then((response) => {
+      this.xlOptions = response.data;
+    });
+    this.getDicts("sys_dm_xw").then((response) => {
+      this.xwOptions = response.data;
+    });
+    this.getDicts("sys_dm_sfsfs").then((response) => {
+      this.sfsfsOptions = response.data;
+    });
+    this.getDicts("sys_dm_rxnf").then((response) => {
+      this.lqnfOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询见习教师基本信息列表 */
+    getList() {
+      this.loading = true;
+      listJxjsjbxx(this.queryParams).then((response) => {
+        this.jxjsjbxxList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 性别字典翻译
+    xbFormat(row, column) {
+      return this.selectDictLabel(this.xbOptions, row.xb);
+    },
+    // 政治面貌字典翻译
+    zzmmFormat(row, column) {
+      return this.selectDictLabel(this.zzmmOptions, row.zzmm);
+    },
+    // 民族字典翻译
+    mzFormat(row, column) {
+      return this.selectDictLabel(this.mzOptions, row.mz);
+    },
+    // 任教学段字典翻译
+    rjxdFormat(row, column) {
+      return this.selectDictLabel(this.rjxdOptions, row.rjxd);
+    },
+    // 任教学科字典翻译
+    rjxkFormat(row, column) {
+      return this.selectDictLabel(this.rjxkOptions, row.rjxk);
+    },
+    // 任教年级字典翻译
+    rjnjFormat(row, column) {
+      return this.selectDictLabel(this.rjnjOptions, row.rjnj);
+    },
+    // 学历字典翻译
+    xlFormat(row, column) {
+      return this.selectDictLabel(this.xlOptions, row.xl);
+    },
+    // 学位字典翻译
+    xwFormat(row, column) {
+      return this.selectDictLabel(this.xwOptions, row.xw);
+    },
+    // 是否师范生字典翻译
+    sfsfsFormat(row, column) {
+      return this.selectDictLabel(this.sfsfsOptions, row.sfsfs);
+    },
+    // 录取年份字典翻译
+    lqnfFormat(row, column) {
+      return this.selectDictLabel(this.lqnfOptions, row.lqnf);
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        otherid: null,
+        name: null,
+        jxbh: null,
+        xb: null,
+        csrq: null,
+        email: null,
+        phone: null,
+        yzbm: null,
+        zzmm: null,
+        mz: null,
+        prdwid: null,
+        prdwmc: null,
+        jdxid: null,
+        rjxd: null,
+        rjxk: null,
+        rjnj: null,
+        byyx: null,
+        xl: null,
+        xw: null,
+        sfsfs: null,
+        lqnf: null,
+        createTime: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm(
+        '是否确认删除见习教师基本信息编号为"' + ids + '"的数据项?',
+        "警告",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(function () {
+          return delJxjsjbxx(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+        .catch(function () {});
+    },
+  },
+};
+</script>
diff --git a/ruoyi-ui/src/views/jxjs/jdx/index.vue b/ruoyi-ui/src/views/jxjs/jdx/index.vue
index 5b3904ce7..475a47d40 100644
--- a/ruoyi-ui/src/views/jxjs/jdx/index.vue
+++ b/ruoyi-ui/src/views/jxjs/jdx/index.vue
@@ -97,7 +97,14 @@
     <el-table v-loading="loading" :data="jdxList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="标识" align="center" prop="id" /> -->
-      <el-table-column label="基地校名称" align="center" prop="jdxmc" />
+      <!-- <el-table-column label="基地校名称" align="center" prop="jdxmc" /> -->
+      <el-table-column label="基地校名称" align="center" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <router-link :to="'/jxjs/jdx/jxjsjbxx/data/' + scope.row.id" class="link-type">
+            <span>{{ scope.row.jdxmc }}</span>
+          </router-link>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="学校类别" align="center" prop="xxlb" /> -->
       <el-table-column label="学校办别" align="center" prop="xxbb" :formatter="xxbbFormat" />
       <el-table-column label="办学类型" align="center" prop="bxlx" :formatter="bxlxFormat" />
@@ -182,12 +189,36 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 添加或修改基地校对话框 -->
+    <el-dialog title="基地校分配见习教师" :visible.sync="open_fpjs" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-table :data="jxjsjbxxList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <!-- <el-table-column label="编号" align="center" prop="id" /> -->
+          <el-table-column label="姓名" align="center" prop="name" />
+          <!-- <el-table-column label="性别" align="center" prop="xb" :formatter="xbFormat" />
+          <el-table-column label="政治面貌" align="center" prop="zzmm" :formatter="zzmmFormat" />
+          <el-table-column label="民族" align="center" prop="mz" :formatter="mzFormat" />
+          <el-table-column label="学历" align="center" prop="xl" :formatter="xlFormat" />
+          <el-table-column label="学位" align="center" prop="xw" :formatter="xwFormat" />
+          <el-table-column label="是否师范生" align="center" prop="sfsfs" :formatter="sfsfsFormat" />-->
+          <el-table-column label="录取年份" align="center" prop="lqnf" />
+        </el-table>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel_fpjs">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listJdx, getJdx, delJdx, addJdx, updateJdx } from "@/api/jxjs/jdx";
 
+import { listJxjsjbxxnotjdx, getJxjsjbxx } from "@/api/jxjs/jxjsjbxx";
+
 export default {
   name: "Jdx",
   data() {
@@ -206,10 +237,13 @@ export default {
       total: 0,
       // 基地校表格数据
       jdxList: [],
+      jxjsjbxxList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      // 是否显示弹出层
+      open_fpjs: false,
       //字典
       nfOptions: [],
       xxbbOptions: [],
@@ -281,11 +315,21 @@ export default {
         this.loading = false;
       });
     },
+    /** 查询基地校列表 */
+    getJxjsList() {
+      listJxjsjbxxnotjdx(null).then((response) => {
+        this.jxjsjbxxList = response.rows;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
       this.reset();
     },
+    // 取消按钮
+    cancel_fpjs() {
+      this.open_fpjs = false;
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -377,6 +421,8 @@ export default {
     handleFpjs(row) {
       const ids = row.id || this.ids;
       console.log(ids);
+      this.open_fpjs = true;
+      this.getJxjsList();
     },
   },
 };