From f2c134fb2ba5292a2bcfa0c42a3a35f95e4e88de Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 23 Aug 2024 09:51:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |   6 +-
 .../src/jeecg/components/JDictSelectTag.vue   |   3 +-
 src/router/routes/modules/stuzy/stuzy.ts      |   8 +
 src/router/routes/modules/zy/zy.ts            |   8 +
 .../kc/zyJxdgBanben/ZyJxdgBanben.data.ts      |   2 +-
 .../kc/zyJxdgBanben/ZyJxdgBanbenList.vue      |  10 +-
 .../kc/zyJxdgBanben/ZyJxdgStudentList.vue     | 586 +++++++++++++
 .../kc/zyJxdgBanben/ZyJxdgTeacherList.vue     | 768 ++++++++++++++++++
 .../components/ZyJxdgBanbenEditForm.vue       |   7 +-
 .../components/ZyJxdgBanbenForm.vue           |  37 +-
 .../checkKecheng/dqxqkcMenu.vue               |  24 +-
 src/views/site/studentWdkc/studentMenu.vue    |  32 +-
 src/views/site/studentWdkc/studentWdkc.vue    |   2 +-
 13 files changed, 1435 insertions(+), 58 deletions(-)
 create mode 100644 src/views/kc/zyJxdgBanben/ZyJxdgStudentList.vue
 create mode 100644 src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue

diff --git a/.env.production b/.env.production
index bc405b0..896dbb4 100644
--- a/.env.production
+++ b/.env.production
@@ -19,8 +19,8 @@ VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
 VITE_GLOB_API_URL=/jeecg-boot
 
 #后台接口全路径地址(必填)
-# VITE_GLOB_DOMAIN_URL=https://zxkccx.webvpn.nenu.edu.cn/jeecg-boot
-VITE_GLOB_DOMAIN_URL=https://kczxcs.nenu.edu.cn/jeecg-boot
+VITE_GLOB_DOMAIN_URL=https://zxkccx.webvpn.nenu.edu.cn/jeecg-boot
+# VITE_GLOB_DOMAIN_URL=https://kczxcs.nenu.edu.cn/jeecg-boot
 # VITE_GLOB_DOMAIN_URL=http://210.47.29.100/jeecg-boot
 
 #RTC服务器地址
@@ -39,5 +39,5 @@ VITE_USE_PWA = false
 VITE_LEGACY = false
 
 # 是否开启单点登录
-VITE_GLOB_APP_OPEN_SSO = false
+VITE_GLOB_APP_OPEN_SSO = true
 
diff --git a/src/components/Form/src/jeecg/components/JDictSelectTag.vue b/src/components/Form/src/jeecg/components/JDictSelectTag.vue
index 6f16cf2..4666577 100644
--- a/src/components/Form/src/jeecg/components/JDictSelectTag.vue
+++ b/src/components/Form/src/jeecg/components/JDictSelectTag.vue
@@ -38,7 +38,7 @@
       @change="handleChange"
       style="width:90%;"
     >
-      <a-select-option v-if="showChooseOption" :value="null">请选择…</a-select-option>
+      <a-select-option v-if="showChooseOption" :value="null">{{libelName?libelName:'请选择…'}}</a-select-option>
       <template v-for="item in dictOptions" :key="`${item.value}`">
         <a-select-option :value="item.value">
           <span style="display: inline-block; width: 90%" :title="item.label">
@@ -69,6 +69,7 @@
       type: propTypes.string,
       placeholder: propTypes.string,
       stringToNumber: propTypes.bool,
+      libelName: propTypes.string,
       getPopupContainer: {
         type: Function,
         default: (node) => node.parentNode,
diff --git a/src/router/routes/modules/stuzy/stuzy.ts b/src/router/routes/modules/stuzy/stuzy.ts
index 5fa2a59..bd0615e 100644
--- a/src/router/routes/modules/stuzy/stuzy.ts
+++ b/src/router/routes/modules/stuzy/stuzy.ts
@@ -38,6 +38,14 @@ const stuzy: AppRouteModule = {
       },
       component: () => import('/@/views/zy/zyInfo/StudentZyInfoQmksMainList.vue'),
     },
+    {
+      path: 'studentJxdg',
+      name: 'studentJxdg',
+      meta: {
+        title: '教学大纲',
+      },
+      component: () => import('/@/views/kc/zyJxdgBanben/ZyJxdgStudentList.vue'),
+    },
     {
       path: 'studentLszy',
       name: 'studentLszy',
diff --git a/src/router/routes/modules/zy/zy.ts b/src/router/routes/modules/zy/zy.ts
index bcd4108..2bd3212 100644
--- a/src/router/routes/modules/zy/zy.ts
+++ b/src/router/routes/modules/zy/zy.ts
@@ -127,6 +127,14 @@ const zuoye: AppRouteModule = {
         title: '存档信息',
       },
     },
+    {
+      path: 'dqkcJxdg',
+      name: 'dqkcJxdg',
+      component: () => import('/@/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue'),
+      meta: {
+        title: '教学大纲',
+      },
+    },
 
   ]
 }
diff --git a/src/views/kc/zyJxdgBanben/ZyJxdgBanben.data.ts b/src/views/kc/zyJxdgBanben/ZyJxdgBanben.data.ts
index 951279b..52d8e4b 100644
--- a/src/views/kc/zyJxdgBanben/ZyJxdgBanben.data.ts
+++ b/src/views/kc/zyJxdgBanben/ZyJxdgBanben.data.ts
@@ -16,7 +16,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'twoTitle_dictText'
    },
    {
-    title: '是否使用',
+    title: '是否发布',
     align:"center",
     dataIndex: 'sfsy_dictText'
    },
diff --git a/src/views/kc/zyJxdgBanben/ZyJxdgBanbenList.vue b/src/views/kc/zyJxdgBanben/ZyJxdgBanbenList.vue
index fba2dab..d82ed18 100644
--- a/src/views/kc/zyJxdgBanben/ZyJxdgBanbenList.vue
+++ b/src/views/kc/zyJxdgBanben/ZyJxdgBanbenList.vue
@@ -83,8 +83,7 @@
            canResize:false,
            useSearchForm: false,
            actionColumn: {
-               width: 220,
-               fixed:'right'
+               width: 280,
            },
            beforeFetch: (params) => {
              return Object.assign(params, queryParam.value);
@@ -128,7 +127,7 @@
     openModal4(true, {
        record,
        isUpdate: true,
-       showFooter: true,
+       showFooter: false,
      });
    }
 
@@ -167,15 +166,16 @@
            onClick: handleEdit.bind(null, record),
          },
          {
-           label: '填写',
+           label: '模仿教师填写',
            onClick: handleTianxie.bind(null, record),
          },
          {
-           label: '详情',
+           label: '填写后详情',
            onClick: handleDetail.bind(null, record),
          }, {
            label: '删除',
            popConfirm: {
+            placement: 'topRight',
              title: '是否确认删除',
              confirm: handleDelete.bind(null, record),
            }
diff --git a/src/views/kc/zyJxdgBanben/ZyJxdgStudentList.vue b/src/views/kc/zyJxdgBanben/ZyJxdgStudentList.vue
new file mode 100644
index 0000000..c6e7b4b
--- /dev/null
+++ b/src/views/kc/zyJxdgBanben/ZyJxdgStudentList.vue
@@ -0,0 +1,586 @@
+<template>
+  <div style="background: #fafafa; height: calc(100vh - 225px); overflow-y: auto; margin: 10px 0; padding: 8px 0 0 0">
+    <div v-if="showType == 0">
+      <a-row>
+        <a-col :span="24"><span class="title">教学大纲</span><a-divider /></a-col>
+        <div class="work-img">
+          <img class="work-img-img" src="../../../assets/images/homework.png" />
+        </div>
+        <a-col :span="24" style="text-align: center; color: #494b56">
+          <div>学生您好，</div>
+          <div>教师还未设置教学大纲，暂时无法查看</div>
+        </a-col>
+      </a-row>
+    </div>
+    <div v-if="showType == 999">
+      <a-row>
+        <a-col :span="24">
+          <span class="title">教学大纲内容</span>
+          <a-divider />
+        </a-col>
+        <a-col :span="24" v-for="(item, index) in zyJxdgMainTable.dataSource" :key="index">
+          <a-row>
+            <a-col :span="24" style="margin-bottom: 15px; height: 40px; margin-top: 15px; background-color: rgba(1, 156, 136, 0.1)">
+              <span class="title">{{ item.title }}</span>
+            </a-col>
+            <!-- 单行文本	1	 -->
+            <a-col v-if="item.type === '1'" :span="24" style="margin: 10px; ">
+              <span v-text="item.content"></span>
+            </a-col>
+            <!-- 多行文本	2	 -->
+            <a-col v-else-if="item.type === '2'" :span="24" style="margin: 10px; ">
+              <span v-text="item.content"></span>
+            </a-col>
+            <!-- 富文本	3	 -->
+            <a-col v-else-if="item.type === '3'" :span="24">
+              <div v-html="item.content"></div>
+            </a-col>
+            <!-- 固定表单（基础信息）	4	 -->
+            <a-col v-else-if="item.type === '4'" v-model:value="item.content" :span="24">
+              <a-form v-bind="formItemLayout">
+                <a-row>
+                  <a-col v-for="(item2, index2) in item.zyJxdgPzxxList" :key="index2" :span="12">
+                    <a-form-item :label="item2.title" >
+                      <span v-text="item2.content"></span>
+                    </a-form-item>
+                  </a-col>
+                </a-row>
+              </a-form>
+            </a-col>
+            <!-- 自增表格	5	 -->
+            <a-col v-else-if="item.type === '5'" :span="24">
+              <a-table :columns="getTableColumns(item.zyJxdgPzxxList)" :dataSource="item.list" :pagination="false">
+                <!-- <template #bodyCell="{ column, record }">
+                  <a-input placeholder="请输入内容" v-model:value="record[column.key]" style="width: 80%"></a-input>
+                </template> -->
+              </a-table>
+            </a-col>
+            <!-- 自增单行文本	6	 -->
+            <a-col v-else-if="item.type === '6'" :span="24">
+              <a-row>
+                <a-col v-for="(item2, index2) in item.list" :key="index2" style="margin: 10px; ">
+                  <span v-text="item2.title"></span>
+                </a-col>
+              </a-row>
+            </a-col>
+            <!-- 自增富文本	7	 -->
+            <a-col v-else-if="item.type === '7'" :span="24">
+              <a-row>
+                <a-col v-for="(item2, index2) in item.list" :key="index2">
+                  <div v-html="item2.title"></div>
+                </a-col>
+              </a-row>
+            </a-col>
+            <!-- 自增多行文本	8  -->
+            <a-col v-else-if="item.type === '8'" :span="24">
+              <a-row>
+                <a-col v-for="(item2, index2) in item.list" :key="index2"  style="margin: 10px; ">
+                  <span v-text="item2.title"></span>
+                </a-col>
+              </a-row>
+            </a-col>
+
+            <!-- 自增表格	9  -->
+            <a-col v-else-if="item.type === '9'" :span="24">
+              <a-table :columns="getTableZzColumns2(item.zyJxdgPzxxList)" :dataSource="item.list" :pagination="false">
+              </a-table>
+            </a-col>
+            <!-- 自增表格（两列关联）	10 -->
+            <a-col v-else-if="item.type === '10'" :span="24">
+              <a-table :columns="getTableZzColumns(item.zyJxdgPzxxList)" :dataSource="item.list" :pagination="false">
+              </a-table>
+            </a-col>
+
+            <a-col v-else> </a-col>
+
+            <!-- <a-col :span="24">
+              <span class="tishi">
+                <span>{{ item.tsy }}</span>
+              </span>
+            </a-col> -->
+          </a-row>
+        </a-col>
+      </a-row>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" name="zyJxdgBanben-zyJxdgBanben" setup>
+import { ref, reactive, computed, unref, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import { defHttp } from '/@/utils/http/axios';
+import { queryZyJxdgMainListByMainId, queryDataById, saveOrUpdate2, queryZyJxdgMainListByMainId2 } from '/@/views/kc/zyJxdgBanben/ZyJxdgBanben.api';
+import JEditor from '/@/components/Form/src/jeecg/components/JEditor.vue';
+
+//当前路由信息
+const { currentRoute } = useRouter();
+const { query } = unref(currentRoute);
+const { rwbh, xqxn, type, teano } = query; //获取传递参数
+const showType = ref<number>(0);
+const jxdgInfo = ref<any>({});
+const jxdgbbDataSource = ref<any>([]);
+const disabled = ref<boolean>(false);
+
+const zyJxdgMainTable = reactive<Record<string, any>>({
+  loading: false,
+  dataSource: [],
+});
+
+const formItemLayout = {
+  labelCol: { xs: { span: 24 }, sm: { span: 8 } },
+  wrapperCol: { xs: { span: 24 }, sm: { span: 13 } },
+};
+
+//关联项目计算方法
+function handleGlxm(item) {
+  var sfsglxm = item.sfsglxm;
+  if (sfsglxm == '1') {
+    //判断是否是关联项目
+    var list1 = item.list; //课程目标集合
+    if (list1 != null) {
+      //关联项目是否有值
+      var sort = item.sort; //第几个关联项目
+      var alllist = zyJxdgMainTable.dataSource; //获取全部的数据
+      for (var j = 0; j < alllist.length; j++) {
+        for (var i = 0; i < list1.length; i++) {
+          var item1 = list1[i];
+          var title = item1.title; //具体信息
+          var item2 = alllist[j]; //具体数据
+          item2.list = item2.list || [];
+          if (item2.guanlian == sort) {
+            //关联项目等于当前数据
+            if (i == 0) {
+              //判断第一回将原来的清空重新赋值
+              item2.list = [];
+            }
+            //判断当前项是否等于关联项
+            var item3 = item2.zyJxdgPzxxList;
+            if (item3 != null && item3.length > 0) {
+              item2.list.push({ [item3[0].id]: title });
+            }
+          }
+        }
+      }
+    }
+  }
+}
+function handleFabu(sffb){
+
+  defHttp.post({ url: '/zyJxdgTeacherMain/zyJxdgTeacherMain/edit', params: { sffb,id:jxdgInfo.value.id} }).then((res) => {
+      init()
+  });
+}
+//两列关联项目计算方法
+function handleTwoGlxm(item) {
+  var sfsglxm = item.sfsglxm;
+  if (sfsglxm == '1') {
+    //判断是否是关联项目
+    var list1 = item.list; //课程目标集合
+    if (list1 != null) {
+      //关联项目是否有值
+      var sort = item.sort; //第几个关联项目
+      var alllist = zyJxdgMainTable.dataSource; //获取全部的数据
+      for (var j = 0; j < alllist.length; j++) {
+        for (var i = 0; i < list1.length; i++) {
+          var item1 = list1[i];
+          var item2 = alllist[j]; //具体数据
+          item2.list = item2.list || [];
+
+          if (item2.guanlian == sort) {
+            //判断当前项是否等于关联项
+            var item3 = item.zyJxdgPzxxList;
+            var item4 = item2.zyJxdgPzxxList;
+            var title1 = item1[item3[0].id];
+            var title2 = item1[item3[1].id];
+            //关联项目等于当前数据
+            if (i == 0) {
+              //判断第一回将原来的清空重新赋值
+              item2.list = [];
+            }
+            if (item3 != null && item3.length > 0) {
+              item2.list.push({ [item4[0].id]: title1, [item4[1].id]: title2 });
+            }
+          }
+        }
+      }
+    }
+  }
+}
+//新增单行文本
+function handleDhwb(item) {
+  item.list = item.list || [];
+  item.list.push({
+    title: '',
+    sort: item.list.length + 1,
+  });
+}
+//删除单行文本
+function handleDhwbDel(item, index) {
+  item.list.splice(index, 1);
+  for (var i = 0; i < item.list.length; i++) {
+    item.list[i].sort = i;
+  }
+}
+
+//新增多行富文本
+function handleDhfwb(item) {
+  item.list = item.list || [];
+  item.list.push({
+    title: '',
+    sort: item.list.length + 1,
+  });
+}
+//删除多行富文本
+function handleDhfwbDel(item, index) {
+  item.list.splice(index, 1);
+  for (var i = 0; i < item.list.length; i++) {
+    item.list[i].sort = i;
+  }
+}
+
+//新增多行富文本
+function handleDhwbArea(item) {
+  item.list = item.list || [];
+  item.list.push({
+    title: '',
+    sort: item.list.length + 1,
+  });
+}
+//删除多行富文本
+function handleDhwbAreaDel(item, index) {
+  item.list.splice(index, 1);
+  for (var i = 0; i < item.list.length; i++) {
+    item.list[i].sort = i;
+  }
+}
+
+//新增自增表格
+function handleZzbg(item) {
+  item.list = item.list || [];
+  item.list.push({
+    title: '',
+    sort: item.list.length,
+  });
+}
+//删除自增表格
+function handleZzbgDel(list, record) {
+  list.splice(record, 1);
+  for (var i = 0; i < list.length; i++) {
+    list[i].sort = i;
+  }
+}
+//获取列表列表头
+function getTableColumns(list) {
+  let columns = reactive<any>([]);
+  for (var i = 0; i < list.length; i++) {
+    var par = list[i];
+    var inePar = {
+      title: par.title,
+      dataIndex: par.id,
+      key: par.id,
+    };
+    columns.push(inePar);
+  }
+  return columns;
+}
+//获取自增列表列表头
+function getTableZzColumns(list) {
+  let columns = reactive<any>([]);
+  for (var i = 0; i < list.length; i++) {
+    var par = list[i];
+    var inePar = {
+      title: par.title,
+      dataIndex: par.id,
+      key: par.id,
+    };
+    columns.push(inePar);
+  }
+  var inePar2 = {
+    title: '操作',
+    dataIndex: 'action',
+    key: 'action',
+  };
+  columns.push(inePar2);
+  return columns;
+}
+
+//获取自增列表列表头
+function getTableZzColumns2(list) {
+  let columns = reactive<any>([]);
+  for (var i = 0; i < list.length; i++) {
+    var par = list[i];
+    var inePar = {
+      title: par.title,
+      dataIndex: par.id,
+      key: par.id,
+    };
+    columns.push(inePar);
+  }
+  return columns;
+}
+
+//选择教学大纲版本
+async function handleCheckBanben(record) {
+  jxdgInfo.value.banbenId = record.id;
+  jxdgInfo.value.rwbh = rwbh;
+  jxdgInfo.value.teacherNo = teano;
+
+  //子表数据
+  var id = record.id;
+  const zyJxdgMainDataList = await queryZyJxdgMainListByMainId(id);
+  zyJxdgMainTable.dataSource = [...zyJxdgMainDataList];
+}
+async function submitForm() {
+  const alllist = zyJxdgMainTable.dataSource;
+  var values = {
+    id: jxdgInfo.value.id,
+    rwbh: rwbh,
+    banbenId: jxdgInfo.value.banbenId,
+    teacherNo: teano,
+    sffb: '0',
+    list: alllist,
+  };
+  console.log('表单提交数据', values);
+  const isUpdate = values.id ? true : false;
+  await saveOrUpdate2(values, isUpdate);
+  setTimeout(() => {
+    init();
+  }, 1000);
+}
+//切换显示模块
+function handleShowType(type) {
+  if (type == 1) {
+    jxdgInfo.value = {};
+    zyJxdgMainTable.dataSource = [];
+    defHttp.get({ url: '/zyJxdgBanben/zyJxdgBanben/list', params: { sffb: '1', pageNo: -1 } }).then((res) => {
+      jxdgbbDataSource.value = res.records;
+    });
+  }else if(type == 2){
+    type = 1;
+    
+    defHttp.get({ url: '/zyJxdgBanben/zyJxdgBanben/list', params: { sffb: '1', pageNo: -1 } }).then((res) => {
+      jxdgbbDataSource.value = res.records;
+    });
+
+    var teacherNo = teano;
+    zyJxdgMainTable.dataSource = [];
+    defHttp.get({ url: '/zyJxdgTeacherMain/zyJxdgTeacherMain/queryByRwbhList', params: { rwbh, teacherNo } }).then((res) => {
+      zyJxdgMainTable.dataSource = [...res];
+    });
+  }
+  showType.value = type;
+}
+
+//初始化查询
+async function init() {
+  console.log('rwbh--->', rwbh);
+  defHttp.get({ url: '/zyJxdgTeacherMain/zyJxdgTeacherMain/queryByRwbh', params: { rwbh, xqxn, teacherNo: teano } }).then((res) => {
+    if (res) {
+      jxdgInfo.value = res;
+      showType.value = 999;
+      var teacherNo = teano;
+      defHttp.get({ url: '/zyJxdgTeacherMain/zyJxdgTeacherMain/queryByRwbhList', params: { rwbh, teacherNo } }).then((res) => {
+        zyJxdgMainTable.dataSource = [...res];
+      });
+    } else {
+      showType.value = 0;
+    }
+  });
+  if (jxdgInfo.value.id) {
+  }
+}
+
+const jxdgbbColumns = [
+  {
+    title: '版本',
+    align: 'center',
+    dataIndex: 'title',
+  },
+  {
+    title: '课程类型',
+    align: 'center',
+    dataIndex: 'twoTitle_dictText',
+  },
+  {
+    title: '操作',
+    align: 'action',
+    key: 'action',
+  },
+];
+
+onMounted(() => {
+  init();
+});
+</script>
+<style lang="less" scoped>
+.title {
+  margin-left: 20px;
+  font-size: 16px;
+  font-weight: bold;
+}
+.title2 {
+  font-size: 16px;
+  font-weight: bold;
+}
+.ant-divider-horizontal {
+  display: flex;
+  clear: both;
+  width: 100%;
+  min-width: 100%;
+  margin: 3px 0 5px;
+}
+.tishi {
+  width: 100%;
+  font-size: 12px;
+  color: #fd8f02;
+  margin-top: -4px;
+  background: #fffbf2;
+  text-align: center;
+  padding: 6px 0;
+}
+.cardClass {
+  min-height: 200px;
+}
+.sznrClass {
+  line-height: 40px;
+  text-align: center;
+}
+.ant-card {
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+  color: rgb(0 0 0);
+  font-size: 14px;
+  font-variant: tabular-nums;
+  line-height: 1.5715;
+  list-style: none;
+  font-feature-settings: tnum;
+  position: relative;
+  border-radius: 5px;
+  border: 1px solid #dadada;
+  background: #f7f7f7;
+}
+.ant-card-head {
+  min-height: 48px;
+  margin-bottom: -1px;
+  padding: 0 24px;
+  color: rgba(0, 0, 0, 0.85);
+  font-weight: 500;
+  font-size: 16px;
+  background: transparent;
+  border-bottom: 1px solid #dadada;
+  border-radius: 2px 2px 0 0;
+}
+.ellipsis {
+  overflow: hidden; /* 确保超出容器的内容被裁剪 */
+  white-space: nowrap; /* 确保文本在一行内显示 */
+  text-overflow: ellipsis; /* 超出部分显示省略号 */
+}
+.ellip-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-end;
+  margin-top: -10px;
+}
+.elli-title {
+  font-size: 16px;
+  font-weight: bold;
+}
+.ellip-word {
+  font-size: 12px;
+  color: #666666;
+  margin-right: 10px;
+}
+.ellip-word2 {
+  font-size: 12px;
+  color: #333;
+  font-weight: bold;
+}
+.zuanqu:hover {
+  cursor: pointer;
+  color: #18a689;
+}
+.data-suggest {
+  display: flex;
+  flex-direction: column;
+  text-align: center;
+  width: 25%;
+  margin-right: 3px;
+  padding: 8px 3px;
+  border-radius: 5px;
+  background: #f7f7f7;
+  margin-top: 10px;
+}
+.data-suggest span:nth-child(1) {
+  font-size: 16px;
+  font-weight: bold;
+}
+.data-suggest span:nth-child(2) {
+  font-size: 12px;
+}
+.work-img {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  margin-top: 80px;
+  margin-bottom: 30px;
+}
+.work-img-img {
+  width: 180px;
+  height: 139px;
+}
+.buttonClass {
+  background: #1ab394;
+  font-weight: 600;
+  color: #fff;
+  border-radius: 3px;
+  border: none;
+}
+.mar-right20 {
+  margin-right: 14px;
+}
+.button-zhta {
+  color: #666666;
+  cursor: pointer;
+}
+.button-zhta:hover {
+  cursor: pointer;
+  color: #18a689;
+}
+.sear-distance {
+  padding: 0 10px;
+}
+.ant-form-item {
+  box-sizing: border-box;
+  margin: 10px 0;
+  padding: 0;
+  color: rgba(0, 0, 0, 0.85);
+  font-size: 14px;
+  font-variant: tabular-nums;
+  line-height: 1.5715;
+  list-style: none;
+  font-feature-settings: tnum;
+  /* margin-bottom: 24px; */
+  vertical-align: top;
+}
+.bled-countenance {
+  color: #333333;
+}
+.bled-countenance2 {
+  color: #999999;
+  font-size: 12px;
+}
+.region {
+  margin: 5px 10px;
+  padding-bottom: 20px;
+  background: #fff;
+  border-radius: 5px;
+}
+.region-title {
+  font-size: 16px;
+  color: #029c88;
+  padding: 8px 20px;
+  border-left: 5px solid #029c88;
+  margin-bottom: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue b/src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue
new file mode 100644
index 0000000..402d218
--- /dev/null
+++ b/src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue
@@ -0,0 +1,768 @@
+<template>
+  <div style="background: #fafafa; height: calc(100vh - 225px); overflow-y: auto; margin: 10px 0; padding: 8px 0 0 0">
+    <div v-if="showType == 0">
+      <a-row>
+        <a-col :span="24"><span class="title">教学大纲设置</span><a-divider /></a-col>
+        <div class="tishi">温馨提示：设置完成后，您也可以在课程教学过程中，随时根据实际情况进行调整。</div>
+        <div class="work-img">
+          <img class="work-img-img" src="../../../assets/images/homework.png" />
+        </div>
+        <a-col :span="24" style="text-align: center; color: #494b56">
+          <div>老师您好，</div>
+          <div>您还未填写教学大纲内容，请您及时填写教学大纲内容</div>
+          <div style="margin-top: 30px" class="ant-btn buttonClass"><a @click="handleShowType(1)">填写教学大纲内容</a></div>
+        </a-col>
+      </a-row>
+    </div>
+    <div v-if="showType == 1">
+      <a-row>
+        <a-col :span="24">
+          <span class="title">填写教学大纲内容</span>
+          <a-button type="primary" @click="init" style="float: right; margin-right: 8px"> <Icon icon="ant-design:export-outlined" />返回 </a-button>
+          <a-divider />
+        </a-col>
+        <a-col :span="24">
+          <a-row>
+            <a-col :span="24">
+              <span style="margin:10px;">请选择填写的教学大纲版本</span>
+            </a-col>
+            <a-col :span="24">
+              <a-table :columns="jxdgbbColumns" :dataSource="jxdgbbDataSource" :pagination="false">
+                <template #bodyCell="{ column, record }">
+                  <template v-if="column.key === 'action'">
+                    <a-button type="primary" @click="handleCheckBanben(record)">选择</a-button>
+                  </template>
+                </template>
+              </a-table>
+            </a-col>
+          </a-row>
+        </a-col>
+        <a-col>
+          <a-row>
+            <a-col :span="24" v-for="(item, index) in zyJxdgMainTable.dataSource" :key="index">
+              <a-row>
+                <a-col :span="24" style="margin-bottom: 15px; height: 40px; margin-top: 15px; background-color: rgba(1, 156, 136, 0.1)">
+                  <span class="title">{{ item.title }}</span>
+                </a-col>
+                <!-- 单行文本	1	 -->
+                <a-col v-if="item.type === '1'" :span="24">
+                  <a-input placeholder="请输入内容" v-model:value="item.content" style="width: 100%" @blur="handleGlxm(item)"></a-input>
+                </a-col>
+                <!-- 多行文本	2	 -->
+                <a-col v-else-if="item.type === '2'" :span="24">
+                  <a-textarea placeholder="请输入内容" v-model:value="item.content" style="width: 100%"></a-textarea>
+                </a-col>
+                <!-- 富文本	3	 -->
+                <a-col v-else-if="item.type === '3'" :span="24">
+                  <j-editor placeholder="请输入内容" v-model:value="item.content" :disabled="disabled" />
+                </a-col>
+                <!-- 固定表单（基础信息）	4	 -->
+                <a-col v-else-if="item.type === '4'" v-model:value="item.content" :span="24">
+                  <a-form v-bind="formItemLayout">
+                    <a-row>
+                      <a-col v-for="(item2, index2) in item.zyJxdgPzxxList" :key="index2" :span="12">
+                        <a-form-item :label="item2.title"
+                          ><a-input :placeholder="`请输入` + item2.title" v-model:value="item2.content"
+                        /></a-form-item>
+                      </a-col>
+                    </a-row>
+                  </a-form>
+                </a-col>
+                <!-- 自增表格	5	 -->
+                <a-col v-else-if="item.type === '5'" :span="24">
+                  <a-table :columns="getTableColumns(item.zyJxdgPzxxList)" :dataSource="item.list" :pagination="false">
+                    <template #bodyCell="{ column, record }">
+                      <a-input placeholder="请输入内容" v-model:value="record[column.key]" style="width: 80%"></a-input>
+                    </template>
+                  </a-table>
+                </a-col>
+                <!-- 自增单行文本	6	 -->
+                <a-col v-else-if="item.type === '6'" :span="24">
+                  <a-row>
+                    <a-col>
+                      <a-button type="primary" @click="handleDhwb(item)" class="increase" preIcon="ant-design:plus-outlined">添加</a-button>
+                    </a-col>
+                    <a-col v-for="(item2, index2) in item.list" :key="index2">
+                      <a-input
+                        placeholder="请输入内容"
+                        v-model:value="item2.title"
+                        style="width: 80%; margin: 0 10px 10px 0px"
+                        @blur="handleGlxm(item)"
+                      ></a-input>
+                      <a-button type="danger" @click="handleDhwbDel(item, index2)">删除</a-button>
+                    </a-col>
+                  </a-row>
+                </a-col>
+                <!-- 自增富文本	7	 -->
+                <a-col v-else-if="item.type === '7'" :span="24">
+                  <a-row>
+                    <a-col>
+                      <a-button type="primary" @click="handleDhfwb(item)" class="increase" preIcon="ant-design:plus-outlined">添加</a-button>
+                    </a-col>
+                    <a-col v-for="(item2, index2) in item.list" :key="index2">
+                      <j-editor placeholder="请输入内容" v-model:value="item2.title" :disabled="disabled" />
+                      <a-button type="danger" @click="handleDhfwbDel(item, index2)" style="margin-top: 10px"></a-button>
+                    </a-col>
+                  </a-row>
+                </a-col>
+                <!-- 自增多行文本	8  -->
+                <a-col v-else-if="item.type === '8'" :span="24">
+                  <a-row>
+                    <a-col>
+                      <a-button type="primary" @click="handleDhwbArea(item)" class="increase" preIcon="ant-design:plus-outlined">添加</a-button>
+                    </a-col>
+                    <a-col v-for="(item2, index2) in item.list" :key="index2" style="text-align: right">
+                      <a-textarea placeholder="请输入内容" v-model:value="item2.title" :disabled="disabled" />
+                      <a-button type="danger" @click="handleDhwbAreaDel(item, index2)" class="place-dele">删除</a-button>
+                    </a-col>
+                  </a-row>
+                </a-col>
+
+                <!-- 自增表格	9  -->
+                <a-col v-else-if="item.type === '9'" :span="24">
+                  <div><a-button type="primary" @click="handleZzbg(item)" class="increase" preIcon="ant-design:plus-outlined">新增</a-button> </div>
+                  <a-table :columns="getTableZzColumns(item.zyJxdgPzxxList)" :dataSource="item.list" :pagination="false">
+                    <template #bodyCell="{ column, record }">
+                      <template v-if="column.key === 'action'">
+                        <a-button type="danger" @click="handleZzbgDel(item.list, record.sort)">删除</a-button>
+                      </template>
+                      <template v-else>
+                        <a-input placeholder="请输入内容" v-model:value="record[column.key]" style="width: 100%"></a-input>
+                      </template>
+                    </template>
+                  </a-table>
+                </a-col>
+                <!-- 自增表格（两列关联）	10 -->
+                <a-col v-else-if="item.type === '10'" :span="24">
+                  <div><a-button type="primary" @click="handleZzbg(item)" class="increase" preIcon="ant-design:plus-outlined">新增</a-button> </div>
+                  <a-table :columns="getTableZzColumns(item.zyJxdgPzxxList)" :dataSource="item.list" :pagination="false">
+                    <template #bodyCell="{ column, record }">
+                      <template v-if="column.key === 'action'">
+                        <a-button type="danger" @click="handleZzbgDel(item.list, record.sort)">删除</a-button>
+                      </template>
+                      <template v-else>
+                        <a-input
+                          placeholder="请输入内容"
+                          v-model:value="record[column.key]"
+                          @blur="handleTwoGlxm(item)"
+                          style="width: 100%"
+                        ></a-input>
+                      </template>
+                    </template>
+                  </a-table>
+                </a-col>
+
+                <a-col v-else> </a-col>
+
+                <a-col :span="24" v-if="item.tsy">
+                  <span class="tishi">
+                    <span>{{ item.tsy }}</span>
+                  </span>
+                </a-col>
+              </a-row>
+            </a-col>
+          </a-row>
+        </a-col>
+        <a-col :span="24" style="text-align: center" v-if="jxdgInfo.banbenId">
+          <a-button type="primary" @click="submitForm">保存</a-button>
+        </a-col>
+      </a-row>
+    </div>
+    <div v-if="showType == 999">
+      <a-row>
+        <a-col :span="24">
+          <span class="title">教学大纲内容</span>
+          <a-button type="primary" @click="handleShowType(2)" style="float: right; margin-right: 8px"> <Icon icon="ant-design:form-outlined" />编辑 </a-button>
+          <a-button type="primary" @click="handleFabu(1)" style="float: right; margin-right: 8px" v-if="jxdgInfo.sffb == '0'"> <Icon icon="ant-design:check-outlined"/>发布 </a-button>
+          <a-button type="primary" @click="handleFabu(0)" style="float: right; margin-right: 8px" v-if="jxdgInfo.sffb == '1'"> <Icon icon="ant-design:export-outlined"/>撤销</a-button>
+          <a-divider />
+        </a-col>
+        <a-col :span="24" v-for="(item, index) in zyJxdgMainTable.dataSource" :key="index">
+          <a-row>
+            <a-col :span="24" style="margin-bottom: 15px; height: 40px; margin-top: 15px; background-color: rgba(1, 156, 136, 0.1)">
+              <span class="title">{{ item.title }}</span>
+            </a-col>
+            <!-- 单行文本	1	 -->
+            <a-col v-if="item.type === '1'" :span="24" style="margin: 10px; ">
+              <span v-text="item.content"></span>
+            </a-col>
+            <!-- 多行文本	2	 -->
+            <a-col v-else-if="item.type === '2'" :span="24" style="margin: 10px; ">
+              <span v-text="item.content"></span>
+            </a-col>
+            <!-- 富文本	3	 -->
+            <a-col v-else-if="item.type === '3'" :span="24">
+              <div v-html="item.content"></div>
+            </a-col>
+            <!-- 固定表单（基础信息）	4	 -->
+            <a-col v-else-if="item.type === '4'" v-model:value="item.content" :span="24">
+              <a-form v-bind="formItemLayout">
+                <a-row>
+                  <a-col v-for="(item2, index2) in item.zyJxdgPzxxList" :key="index2" :span="12">
+                    <a-form-item :label="item2.title" >
+                      <span v-text="item2.content"></span>
+                    </a-form-item>
+                  </a-col>
+                </a-row>
+              </a-form>
+            </a-col>
+            <!-- 自增表格	5	 -->
+            <a-col v-else-if="item.type === '5'" :span="24">
+              <a-table :columns="getTableColumns(item.zyJxdgPzxxList)" :dataSource="item.list" :pagination="false">
+                <!-- <template #bodyCell="{ column, record }">
+                  <a-input placeholder="请输入内容" v-model:value="record[column.key]" style="width: 80%"></a-input>
+                </template> -->
+              </a-table>
+            </a-col>
+            <!-- 自增单行文本	6	 -->
+            <a-col v-else-if="item.type === '6'" :span="24">
+              <a-row>
+                <a-col v-for="(item2, index2) in item.list" :key="index2" style="margin: 10px; ">
+                  <span v-text="item2.title"></span>
+                </a-col>
+              </a-row>
+            </a-col>
+            <!-- 自增富文本	7	 -->
+            <a-col v-else-if="item.type === '7'" :span="24">
+              <a-row>
+                <a-col v-for="(item2, index2) in item.list" :key="index2">
+                  <div v-html="item2.title"></div>
+                </a-col>
+              </a-row>
+            </a-col>
+            <!-- 自增多行文本	8  -->
+            <a-col v-else-if="item.type === '8'" :span="24">
+              <a-row>
+                <a-col v-for="(item2, index2) in item.list" :key="index2"  style="margin: 10px; ">
+                  <span v-text="item2.title"></span>
+                </a-col>
+              </a-row>
+            </a-col>
+
+            <!-- 自增表格	9  -->
+            <a-col v-else-if="item.type === '9'" :span="24">
+              <a-table :columns="getTableZzColumns2(item.zyJxdgPzxxList)" :dataSource="item.list" :pagination="false">
+              </a-table>
+            </a-col>
+            <!-- 自增表格（两列关联）	10 -->
+            <a-col v-else-if="item.type === '10'" :span="24">
+              <a-table :columns="getTableZzColumns(item.zyJxdgPzxxList)" :dataSource="item.list" :pagination="false">
+              </a-table>
+            </a-col>
+
+            <a-col v-else> </a-col>
+
+            <a-col :span="24" v-if="item.tsy">
+              <span class="tishi">
+                <span>{{ item.tsy }}</span>
+              </span>
+            </a-col>
+          </a-row>
+        </a-col>
+      </a-row>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" name="zyJxdgBanben-zyJxdgBanben" setup>
+import { ref, reactive, computed, unref, onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import { defHttp } from '/@/utils/http/axios';
+import { queryZyJxdgMainListByMainId, queryDataById, saveOrUpdate2, queryZyJxdgMainListByMainId2 } from '/@/views/kc/zyJxdgBanben/ZyJxdgBanben.api';
+import JEditor from '/@/components/Form/src/jeecg/components/JEditor.vue';
+
+//当前路由信息
+const { currentRoute } = useRouter();
+const { query } = unref(currentRoute);
+const { rwbh, xqxn, type, teano } = query; //获取传递参数
+const showType = ref<number>(0);
+const jxdgInfo = ref<any>({});
+const jxdgbbDataSource = ref<any>([]);
+const disabled = ref<boolean>(false);
+
+const zyJxdgMainTable = reactive<Record<string, any>>({
+  loading: false,
+  dataSource: [],
+});
+
+const formItemLayout = {
+  labelCol: { xs: { span: 24 }, sm: { span: 8 } },
+  wrapperCol: { xs: { span: 24 }, sm: { span: 13 } },
+};
+
+//关联项目计算方法
+function handleGlxm(item) {
+  var sfsglxm = item.sfsglxm;
+  if (sfsglxm == '1') {
+    //判断是否是关联项目
+    var list1 = item.list; //课程目标集合
+    if (list1 != null) {
+      //关联项目是否有值
+      var sort = item.sort; //第几个关联项目
+      var alllist = zyJxdgMainTable.dataSource; //获取全部的数据
+      for (var j = 0; j < alllist.length; j++) {
+        for (var i = 0; i < list1.length; i++) {
+          var item1 = list1[i];
+          var title = item1.title; //具体信息
+          var item2 = alllist[j]; //具体数据
+          item2.list = item2.list || [];
+          if (item2.guanlian == sort) {
+            //关联项目等于当前数据
+            if (i == 0) {
+              //判断第一回将原来的清空重新赋值
+              item2.list = [];
+            }
+            //判断当前项是否等于关联项
+            var item3 = item2.zyJxdgPzxxList;
+            if (item3 != null && item3.length > 0) {
+              item2.list.push({ [item3[0].id]: title });
+            }
+          }
+        }
+      }
+    }
+  }
+}
+function handleFabu(sffb){
+
+  defHttp.post({ url: '/zyJxdgTeacherMain/zyJxdgTeacherMain/edit', params: { sffb,id:jxdgInfo.value.id} }).then((res) => {
+      init()
+  });
+}
+//两列关联项目计算方法
+function handleTwoGlxm(item) {
+  var sfsglxm = item.sfsglxm;
+  if (sfsglxm == '1') {
+    //判断是否是关联项目
+    var list1 = item.list; //课程目标集合
+    if (list1 != null) {
+      //关联项目是否有值
+      var sort = item.sort; //第几个关联项目
+      var alllist = zyJxdgMainTable.dataSource; //获取全部的数据
+      for (var j = 0; j < alllist.length; j++) {
+        for (var i = 0; i < list1.length; i++) {
+          var item1 = list1[i];
+          var item2 = alllist[j]; //具体数据
+          item2.list = item2.list || [];
+
+          if (item2.guanlian == sort) {
+            //判断当前项是否等于关联项
+            var item3 = item.zyJxdgPzxxList;
+            var item4 = item2.zyJxdgPzxxList;
+            var title1 = item1[item3[0].id];
+            var title2 = item1[item3[1].id];
+            //关联项目等于当前数据
+            if (i == 0) {
+              //判断第一回将原来的清空重新赋值
+              item2.list = [];
+            }
+            if (item3 != null && item3.length > 0) {
+              item2.list.push({ [item4[0].id]: title1, [item4[1].id]: title2 });
+            }
+          }
+        }
+      }
+    }
+  }
+}
+//新增单行文本
+function handleDhwb(item) {
+  item.list = item.list || [];
+  item.list.push({
+    title: '',
+    sort: item.list.length + 1,
+  });
+
+
+  
+}
+//删除单行文本
+function handleDhwbDel(item, index) {
+  item.list.splice(index, 1);
+  for (var i = 0; i < item.list.length; i++) {
+    item.list[i].sort = i;
+  }
+}
+
+//新增多行富文本
+function handleDhfwb(item) {
+  item.list = item.list || [];
+  item.list.push({
+    title: '',
+    sort: item.list.length + 1,
+  });
+}
+//删除多行富文本
+function handleDhfwbDel(item, index) {
+  item.list.splice(index, 1);
+  for (var i = 0; i < item.list.length; i++) {
+    item.list[i].sort = i;
+  }
+}
+
+//新增多行富文本
+function handleDhwbArea(item) {
+  item.list = item.list || [];
+  item.list.push({
+    title: '',
+    sort: item.list.length + 1,
+  });
+}
+//删除多行富文本
+function handleDhwbAreaDel(item, index) {
+  item.list.splice(index, 1);
+  for (var i = 0; i < item.list.length; i++) {
+    item.list[i].sort = i;
+  }
+}
+
+//新增自增表格
+function handleZzbg(item) {
+  item.list = item.list || [];
+  item.list.push({
+    title: '',
+    sort: item.list.length,
+  });
+}
+//删除自增表格
+function handleZzbgDel(list, record) {
+  list.splice(record, 1);
+  for (var i = 0; i < list.length; i++) {
+    list[i].sort = i;
+  }
+}
+//获取列表列表头
+function getTableColumns(list) {
+  let columns = reactive<any>([]);
+  for (var i = 0; i < list.length; i++) {
+    var par = list[i];
+    var inePar = {
+      title: par.title,
+      dataIndex: par.id,
+      key: par.id,
+    };
+    columns.push(inePar);
+  }
+  return columns;
+}
+//获取自增列表列表头
+function getTableZzColumns(list) {
+  let columns = reactive<any>([]);
+  for (var i = 0; i < list.length; i++) {
+    var par = list[i];
+    var inePar = {
+      title: par.title,
+      dataIndex: par.id,
+      key: par.id,
+    };
+    columns.push(inePar);
+  }
+  var inePar2 = {
+    title: '操作',
+    dataIndex: 'action',
+    key: 'action',
+  };
+  columns.push(inePar2);
+  return columns;
+}
+
+//获取自增列表列表头
+function getTableZzColumns2(list) {
+  let columns = reactive<any>([]);
+  for (var i = 0; i < list.length; i++) {
+    var par = list[i];
+    var inePar = {
+      title: par.title,
+      dataIndex: par.id,
+      key: par.id,
+    };
+    columns.push(inePar);
+  }
+  return columns;
+}
+
+//选择教学大纲版本
+async function handleCheckBanben(record) {
+  jxdgInfo.value.banbenId = record.id;
+  jxdgInfo.value.rwbh = rwbh;
+  jxdgInfo.value.teacherNo = teano;
+
+  //子表数据
+  var id = record.id;
+  const zyJxdgMainDataList = await queryZyJxdgMainListByMainId(id);
+  zyJxdgMainTable.dataSource = [...zyJxdgMainDataList];
+}
+async function submitForm() {
+  const alllist = zyJxdgMainTable.dataSource;
+  var values = {
+    id: jxdgInfo.value.id,
+    rwbh: rwbh,
+    banbenId: jxdgInfo.value.banbenId,
+    teacherNo: teano,
+    sffb: '0',
+    list: alllist,
+  };
+  console.log('表单提交数据', values);
+  const isUpdate = values.id ? true : false;
+  await saveOrUpdate2(values, isUpdate);
+  setTimeout(() => {
+    init();
+  }, 1000);
+}
+//切换显示模块
+function handleShowType(type) {
+  if (type == 1) {
+    jxdgInfo.value = {};
+    zyJxdgMainTable.dataSource = [];
+    defHttp.get({ url: '/zyJxdgBanben/zyJxdgBanben/list', params: { sfsy: '1', pageNo: -1 } }).then((res) => {
+      jxdgbbDataSource.value = res.records;
+    });
+  }else if(type == 2){
+    type = 1;
+    
+    defHttp.get({ url: '/zyJxdgBanben/zyJxdgBanben/list', params: { sfsy: '1', pageNo: -1 } }).then((res) => {
+      jxdgbbDataSource.value = res.records;
+    });
+
+    var teacherNo = teano;
+    zyJxdgMainTable.dataSource = [];
+    defHttp.get({ url: '/zyJxdgTeacherMain/zyJxdgTeacherMain/queryByRwbhList', params: { rwbh, teacherNo } }).then((res) => {
+      zyJxdgMainTable.dataSource = [...res];
+    });
+  }
+  showType.value = type;
+}
+
+//初始化查询
+async function init() {
+  console.log('rwbh--->', rwbh);
+  defHttp.get({ url: '/zyJxdgTeacherMain/zyJxdgTeacherMain/queryByRwbh', params: { rwbh, xqxn, teacherNo: teano } }).then((res) => {
+    if (res) {
+      jxdgInfo.value = res;
+      showType.value = 999;
+      var teacherNo = teano;
+      defHttp.get({ url: '/zyJxdgTeacherMain/zyJxdgTeacherMain/queryByRwbhList', params: { rwbh, teacherNo } }).then((res) => {
+        zyJxdgMainTable.dataSource = [...res];
+      });
+    } else {
+      showType.value = 0;
+    }
+  });
+  if (jxdgInfo.value.id) {
+  }
+}
+
+const jxdgbbColumns = [
+  {
+    title: '版本',
+    align: 'center',
+    dataIndex: 'title',
+  },
+  {
+    title: '课程类型',
+    align: 'center',
+    dataIndex: 'twoTitle_dictText',
+  },
+  {
+    title: '操作',
+    align: 'action',
+    key: 'action',
+  },
+];
+
+onMounted(() => {
+  init();
+});
+</script>
+<style lang="less" scoped>
+.title {
+  margin-left: 20px;
+  font-size: 16px;
+  font-weight: bold;
+}
+.title2 {
+  font-size: 16px;
+  font-weight: bold;
+}
+.ant-divider-horizontal {
+  display: flex;
+  clear: both;
+  width: 100%;
+  min-width: 100%;
+  margin: 3px 0 5px;
+}
+.tishi {
+  width: 100%;
+  font-size: 12px;
+  color: #fd8f02;
+  margin-top: -4px;
+  background: #fffbf2;
+  text-align: center;
+  padding: 6px 0;
+}
+.cardClass {
+  min-height: 200px;
+}
+.sznrClass {
+  line-height: 40px;
+  text-align: center;
+}
+.ant-card {
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
+  color: rgb(0 0 0);
+  font-size: 14px;
+  font-variant: tabular-nums;
+  line-height: 1.5715;
+  list-style: none;
+  font-feature-settings: tnum;
+  position: relative;
+  border-radius: 5px;
+  border: 1px solid #dadada;
+  background: #f7f7f7;
+}
+.ant-card-head {
+  min-height: 48px;
+  margin-bottom: -1px;
+  padding: 0 24px;
+  color: rgba(0, 0, 0, 0.85);
+  font-weight: 500;
+  font-size: 16px;
+  background: transparent;
+  border-bottom: 1px solid #dadada;
+  border-radius: 2px 2px 0 0;
+}
+.ellipsis {
+  overflow: hidden; /* 确保超出容器的内容被裁剪 */
+  white-space: nowrap; /* 确保文本在一行内显示 */
+  text-overflow: ellipsis; /* 超出部分显示省略号 */
+}
+.ellip-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-end;
+  margin-top: -10px;
+}
+.elli-title {
+  font-size: 16px;
+  font-weight: bold;
+}
+.ellip-word {
+  font-size: 12px;
+  color: #666666;
+  margin-right: 10px;
+}
+.ellip-word2 {
+  font-size: 12px;
+  color: #333;
+  font-weight: bold;
+}
+.zuanqu:hover {
+  cursor: pointer;
+  color: #18a689;
+}
+.data-suggest {
+  display: flex;
+  flex-direction: column;
+  text-align: center;
+  width: 25%;
+  margin-right: 3px;
+  padding: 8px 3px;
+  border-radius: 5px;
+  background: #f7f7f7;
+  margin-top: 10px;
+}
+.data-suggest span:nth-child(1) {
+  font-size: 16px;
+  font-weight: bold;
+}
+.data-suggest span:nth-child(2) {
+  font-size: 12px;
+}
+.work-img {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  margin-top: 80px;
+  margin-bottom: 30px;
+}
+.work-img-img {
+  width: 180px;
+  height: 139px;
+}
+.buttonClass {
+  background: #1ab394;
+  font-weight: 600;
+  color: #fff;
+  border-radius: 3px;
+  border: none;
+}
+.mar-right20 {
+  margin-right: 14px;
+}
+.button-zhta {
+  color: #666666;
+  cursor: pointer;
+}
+.button-zhta:hover {
+  cursor: pointer;
+  color: #18a689;
+}
+.sear-distance {
+  padding: 0 10px;
+}
+.ant-form-item {
+  box-sizing: border-box;
+  margin: 10px 0;
+  padding: 0;
+  color: rgba(0, 0, 0, 0.85);
+  font-size: 14px;
+  font-variant: tabular-nums;
+  line-height: 1.5715;
+  list-style: none;
+  font-feature-settings: tnum;
+  /* margin-bottom: 24px; */
+  vertical-align: top;
+}
+.bled-countenance {
+  color: #333333;
+}
+.bled-countenance2 {
+  color: #999999;
+  font-size: 12px;
+}
+.region {
+  margin: 5px 10px;
+  padding-bottom: 20px;
+  background: #fff;
+  border-radius: 5px;
+}
+.region-title {
+  font-size: 16px;
+  color: #029c88;
+  padding: 8px 20px;
+  border-left: 5px solid #029c88;
+  margin-bottom: 20px;
+}
+
+.tishi {
+  width: 100%;
+  display: flex;
+  flex-direction: column; 
+  text-align: left;
+  margin: 5px;
+}
+.tishi span{
+  font-size: 12px;
+  color: #fd8f02;
+}
+.increase{
+  position: absolute;
+  right:6px;
+  top:-51px;
+}
+.place-dele{
+  margin:10px 0;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenEditForm.vue b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenEditForm.vue
index 4c8c9d8..c5e18ef 100644
--- a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenEditForm.vue
+++ b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenEditForm.vue
@@ -2,14 +2,14 @@
   <a-spin :spinning="loading" >
     <a-form v-bind="formItemLayout">
       <a-row>
-        <a-col :span="12">
-          <a-form-item label="课程类型" v-bind="validateInfos.twoTitle"> （{{ oldInfo.twoTitle_dictText }}） </a-form-item>
-        </a-col>
         <a-col :span="12">
           <a-form-item label="版本" v-bind="validateInfos.title" >
             {{ formData.title }}
           </a-form-item>
         </a-col>
+        <a-col :span="12">
+          <a-form-item label="课程类型" v-bind="validateInfos.twoTitle"> （{{ oldInfo.twoTitle_dictText }}） </a-form-item>
+        </a-col>
         
       </a-row>
     </a-form>
@@ -118,7 +118,6 @@
           <!-- 自增表格（两列关联）	10 -->
           <a-col v-else-if="item.type === '10'" :span="24">
             <div><a-button type="primary" @click="handleZzbg(item)" class="increase"  preIcon="ant-design:plus-outlined">新增</a-button> </div>
-            -{{ getTableZzColumns(item.zyJxdgPzxxList) }}-
             <a-table :columns="getTableZzColumns(item.zyJxdgPzxxList)" :dataSource="item.list" :pagination="false">
               <template #bodyCell="{ column, record }">
                 <template v-if="column.key === 'action'">
diff --git a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenForm.vue b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenForm.vue
index 5ea66dc..cff7030 100644
--- a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenForm.vue
+++ b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenForm.vue
@@ -9,12 +9,12 @@
         </a-col>
         <a-col :span="24">
           <a-form-item label="课程类型" v-bind="validateInfos.twoTitle" >
-            <j-dict-select-tag type='list' v-model:value="formData.twoTitle" dictCode="kclx" placeholder="请选择课程类型1111" :disabled="disabled"/>
+            <j-dict-select-tag type='list' v-model:value="formData.twoTitle" dictCode="kclx" placeholder="请选择课程类型" :disabled="disabled"/>
           </a-form-item>
         </a-col>
         <a-col :span="24">
-          <a-form-item label="是否使用" v-bind="validateInfos.sfsy">
-            <j-dict-select-tag type='radio' v-model:value="formData.sfsy" dictCode="yn" placeholder="请选择是否使用" :disabled="disabled"/>
+          <a-form-item label="是否发布" v-bind="validateInfos.sfsy">
+            <j-dict-select-tag type='radio' v-model:value="formData.sfsy" dictCode="yn" placeholder="请选择是否发布" :disabled="disabled"/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -23,6 +23,12 @@
     <a-row>
       <a-col :span="24" style="text-align:left; margin-left:10px;">
         <a-button type="primary" @click="handleOneType" preIcon="ant-design:plus-outlined">新增项目</a-button>
+        <div style="color: red;">
+          <div>说明：</div>
+          <div>1.关联第几个项目：若根据某个项目自动生成关联关系，请选择指定项目！</div>
+          <div>2.是否是被关联项目：如果被其他项目关联，请选择是，否则不起效！</div>
+          <div>3.被关联项目禁用问题：目前只支持文本及表格进行关联，富文本、表单、多行文本不支持被关联！</div>
+        </div>
       </a-col>
       <a-col :span="24" v-for="(item,index) in zyJxdgMainTable.dataSource" :key="index">
         <a-row style="margin:10px;">
@@ -30,16 +36,16 @@
             <a-input v-model:value="item.title" placeholder="请输入标题" :disabled="disabled" class="input-title"/>
           </a-col>
           <a-col :span="6" style="padding-right:4px;">
-            <j-dict-select-tag  type='list' v-model:value="item.type" dictCode="jxdglx" placeholder="请选择填写类型" :disabled="disabled" style="	width: 100%;"/>
+            <j-dict-select-tag  type='list' v-model:value="item.type" dictCode="jxdglx" :disabled="disabled" style="	width: 100%;"/>
           </a-col>
           <a-col :span="6">
-            <a-select  placeholder="请选择关联项目" v-model:value="item.guanlian" :disabled="disabled" style="margin-left:-12px;width: 100%;">
-              <a-select-option  value="">请选择关联项目</a-select-option>
+            <a-select  placeholder="请选择关联第几个项目" v-model:value="item.guanlian" :disabled="disabled" style="margin-left:-12px;width: 100%;">
+              <a-select-option  value="">请选择关联第几个项目</a-select-option>
               <a-select-option :value="peizhi.sort" v-for="(peizhi,index2) in zyJxdgMainTable.dataSource" :key="index2">{{peizhi.title}}</a-select-option>
             </a-select>
           </a-col>
           <a-col :span="6">
-            <j-dict-select-tag type='list' v-model:value="item.sfsglxm" dictCode="yn" placeholder="请选择是否是关联项目" :disabled="disabled"/>
+            <j-dict-select-tag type='select' v-model:value="item.sfsglxm" dictCode="yn" libelName="是否是被关联项目" :disabled="disabled || item.type == '2' || item.type == '3' || item.type == '4' || item.type == '7' || item.guanlian == '8' "/>
           </a-col>
           <a-col :span="18">
             <a-input v-model:value="item.tsy" placeholder="请输入提示语" :disabled="disabled" class="Prompt-language" />
@@ -47,11 +53,18 @@
           <a-col :span="6">
             <a-button type="danger" @click="handleOneDel(item,index)"  style="margin-left:10px">删除</a-button>
           </a-col>
-          <!-- 单行文本	1	
-          多行文本	2	
-          富文本	3	
-          表单	4	
-          表格	5	 -->
+<!-- 
+单行文本	1	 a
+多行文本	2	
+富文本	3	
+固定表单（基础信息）	4	
+关联表格	5	   a
+自增单行文本	6	  a
+自增富文本	7	
+自增多行文本	8	
+自增表格	9	  a
+自增表格（两列关联）	10 a
+-->
           <a-col v-if="item.type==='4' || item.type==='5' || item.type==='9'|| item.type==='10'">
             <a-row>
               <a-col :span="24">
diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
index 72ac691..ab564b5 100644
--- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
+++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue
@@ -20,23 +20,26 @@
               <BarChartOutlined />
             </template>
             <span @click="getGzt('kcjs')">课程简介</span>
-            <!-- <template #title>教学内容</template>
-            <a-menu-item key="1" @click="getGzt('kcjs')">课程简介</a-menu-item>
-            <a-menu-item key="3" @click="gotoPageByName('jiaoXueDanYuanNeiRong')">教学单元</a-menu-item> -->
           </a-menu-item >
-          <a-menu-item key="sub2">
+          <a-menu-item  key="sub2">
+            <template #icon>
+              <SettingOutlined />
+            </template>
+            <span @click="getGzt('jxdg')">教学大纲</span>
+          </a-menu-item >
+          <a-menu-item key="sub3">
             <template #icon>
               <SnippetsOutlined />
             </template>
             <span @click="getGzt('dqzy')">课程作业</span>
           </a-menu-item>
-          <a-menu-item key="sub3">
+          <a-menu-item key="sub4">
             <template #icon>
               <AppstoreOutlined />
             </template>
             <span @click="getGzt('qmzy')">期末考试</span>
           </a-menu-item>
-          <a-menu-item key="sub21">
+          <a-menu-item key="sub5">
             <template #icon>
               <AppstoreAddOutlined />
             </template>
@@ -79,16 +82,19 @@
             <a-menu-item key="sub1">
               <span @click="getGzt('kcjs')">课程简介</span>
             </a-menu-item>
+            <a-menu-item key="sub2">
+              <span @click="getGzt('jxdg')">教学大纲</span>
+            </a-menu-item>
             <!-- <a-menu-item key="sub2">
               <span @click="gotoPageByName('jiaoXueDanYuanNeiRong')">教学单元</span>
             </a-menu-item> -->
             <a-menu-item key="sub3">
               <span @click="getGzt('dqzy')">课程作业</span>
             </a-menu-item>
-            <a-menu-item key="sub31">
+            <a-menu-item key="sub4">
               <span @click="getGzt('qmzy')">期末考试</span>
             </a-menu-item>
-            <a-menu-item key="sub4">
+            <a-menu-item key="sub5">
               <span @click="getGzt('kcjc')">课堂测验</span>
             </a-menu-item>
             <!-- <a-menu-item key="sub5">
@@ -163,6 +169,8 @@ function getGzt(zytype) {
     href = '/zy/dqkcCdxx';
   } else if (zytype == 'qmzy') {
     href = '/zy/dqkcQmzy';
+  }else if (zytype == 'jxdg') {
+    href = '/zy/dqkcJxdg';
   }
 
   router.push({ path: href, query: { rwbh, xqxn, type, teano } });
diff --git a/src/views/site/studentWdkc/studentMenu.vue b/src/views/site/studentWdkc/studentMenu.vue
index f1acf6f..58c13ce 100644
--- a/src/views/site/studentWdkc/studentMenu.vue
+++ b/src/views/site/studentWdkc/studentMenu.vue
@@ -21,14 +21,12 @@
                     </template>
                     <span @click="getGzt('kcjs')">课程简介</span>
                   </a-menu-item>
-                  <!-- <a-sub-menu key="sub2">
+                  <a-menu-item key="sub3">
                     <template #icon>
-                      <PieChartOutlined />
+                      <SettingOutlined />
                     </template>
-                    <template #title>课程内容</template>
-                    <a-menu-item key="1" @click="getGzt('kcjs')">课程简介</a-menu-item>
-                    <a-menu-item key="3" @click="getGzt('stuJiaoXueDanYuanNeiRong')">教学单元</a-menu-item>
-                  </a-sub-menu> -->
+                    <span @click="getGzt('jxdg')">教学大纲</span>
+                  </a-menu-item>
                   <a-menu-item key="sub4">
                     <template #icon>
                       <SnippetsOutlined />
@@ -47,18 +45,6 @@
                     </template>
                     <span @click="getGzt('kcjc')">课程测验</span>
                   </a-menu-item>
-                  <!-- <a-menu-item key="sub5">
-                    <template #icon>
-                      <PieChartOutlined />
-                    </template>
-                    <span @click="getGzt('dcwj')">问卷调查</span>
-                  </a-menu-item>
-                  <a-menu-item key="sub6">
-                    <template #icon>
-                      <PieChartOutlined />
-                    </template>
-                    <span @click="getGzt('tlq')">讨论区</span>
-                  </a-menu-item> -->
                 </a-menu>
               </a-col>
               <a-col :lg="0" :xs="{ span: 24 }" style="text-align: right;">
@@ -69,19 +55,17 @@
                 >
                 <a-sub-menu key="min0">
                   <template #icon>
-                    <!-- <SettingOutlined /> -->
                     <MenuUnfoldOutlined />
                   </template>
-                  <!-- <template #title>菜单</template> -->
                   <a-menu-item key="min1">
                     <span @click="getGzt('tzgg')">通知公告</span>
                   </a-menu-item>
                   <a-menu-item key="min2">
                     <span @click="getGzt('kcjs')">课程简介</span>
                   </a-menu-item>
-                  <!-- <a-menu-item key="min3">
-                    <span @click="getGzt('stuJiaoXueDanYuanNeiRong')">教学单元</span>
-                  </a-menu-item> -->
+                  <a-menu-item key="min3">
+                    <span @click="getGzt('jxdg')">教学大纲</span>
+                  </a-menu-item>
                   <a-menu-item key="min4">
                     <span @click="getGzt('dqzy')">课程作业</span>
                   </a-menu-item>
@@ -151,6 +135,8 @@ import { MailOutlined, AppstoreOutlined, SettingOutlined, MenuUnfoldOutlined,Pie
       return;
     }else if(zytype=='qmks'){//期末考试
       href = "/stuzy/studentQmks";
+    }else if(zytype=='jxdg'){//jxdg
+      href = "/stuzy/studentJxdg";
     }
 
     router.push({path:href,query: {rwbh,xqxn,type,teano}});
diff --git a/src/views/site/studentWdkc/studentWdkc.vue b/src/views/site/studentWdkc/studentWdkc.vue
index 28bdeb3..3d7bf0f 100644
--- a/src/views/site/studentWdkc/studentWdkc.vue
+++ b/src/views/site/studentWdkc/studentWdkc.vue
@@ -110,7 +110,7 @@ function openKecheng(record) {
   // defHttp.post({ url: '/zyDbtx/zyDbtx/deleteByRwbhCreate', params: { rwbh: record.rwbh, fbr: jgh } }).then((res) => {
   //   loaddata();
   // });
-  var url = '/stuzy/StudentGonggaoList?rwbh=' + record.rwbh + '&xqxn=' + record.xqxn ;
+  var url = '/stuzy/StudentGonggaoList?rwbh=' + record.rwbh + '&xqxn=' + record.xqxn +"&teano="+record.jgh;
   window.open(url, '_blank');
 }
 </script>