From 4fe266e468e4601e1604c20a53e29b7a4b98b1d7 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Mon, 26 Aug 2024 14:51:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kc/zyJxdgBanben/ZyJxdgTeacherList.vue     | 27 ++++-----
 .../components/ZyJxdgBanbenDetailForm.vue     | 56 +++++++++----------
 .../components/ZyJxdgBanbenDetailModal.vue    |  2 +-
 3 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue b/src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue
index c81d533..7374bb4 100644
--- a/src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue
+++ b/src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue
@@ -29,7 +29,7 @@
                 ><span>请选择填写的教学大纲版本</span></div
               >
             </a-col>
-            <a-col :span="24" style="margin: 0 auto; border: 1px solid #eceff6; border-radius: 4px; margin-top: 8px">
+            <a-col :span="24" class="borderstyle">
               <a-table :columns="jxdgbbColumns" :dataSource="jxdgbbDataSource" :pagination="false">
                 <template #bodyCell="{ column, record }">
                   <template v-if="column.key === 'action'">
@@ -108,7 +108,7 @@
                     <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" style="text-align: right">
+                    <a-col v-for="(item2, index2) in item.list" :key="index2" style="text-align: right;">
                       <j-editor placeholder="请输入内容" v-model:value="item2.title" :disabled="disabled" />
                       <button @click="handleDhfwbDel(item, index2)" class="ant-btn" style="margin: 8px 0 ">删除</button>
                     </a-col>
@@ -120,7 +120,7 @@
                     <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-col v-for="(item2, index2) in item.list" :key="index2" style="text-align: right;">
                       <a-textarea placeholder="请输入内容" v-model:value="item2.title" :disabled="disabled" />
                       <button @click="handleDhwbAreaDel(item, index2)" class="ant-btn" style="margin: 8px 0">删除</button>
                     </a-col>
@@ -197,7 +197,7 @@
                               placeholder="请输入内容"
                               v-model:value="item3.title"
                               class="Sheet"
-                              style="width:92%; margin: 0 10px 10px 20px"
+                              style="width:92%; "
                               :disabled="index3 == 0"
                               @blur="handle2Glxm(item)"
                             ></a-input>
@@ -339,14 +339,14 @@
           :span="23"
           v-for="(item, index) in zyJxdgMainTable.dataSource"
           :key="index"
-          style="margin: 8px auto; background: #fff; border: 1px solid #eee"
+          class="borderstyle"
         >
           <a-row>
-            <a-col :span="24" style="height: 40px; line-height: 40px; background-color: #f6f6f6">
+            <a-col :span="24" style="height: 40px; line-height: 40px; background-color: #eff6f4">
               <span class="title">{{ item.title }}</span>
             </a-col>
             <!-- 单行文本	1	 -->
-            <a-col v-if="item.type === '1'" :span="24" style="margin: 10px">
+            <a-col v-if="item.type === '1'" :span="24" style="margin: 10px;">
               <span class="Text-Content" v-text="item.content"></span>
             </a-col>
             <!-- 多行文本	2	 -->
@@ -404,7 +404,7 @@
 
             <!-- 自增表格	9  -->
             <a-col v-else-if="item.type === '9' || item.type === '15'" :span="24">
-              <a-table :columns="getTableZzColumns2(item.zyJxdgPzxxList)" :dataSource="item.list" :pagination="false"> </a-table>
+              <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">
@@ -439,8 +439,8 @@
               <a-row>
                 <a-col>
                   <a-row v-for="(item2, index2) in item.list" :key="index2" class="dhxg">
-                    <a-col v-for="(item3, index3) in item2.list" :key="index3" style="line-height: 40px">
-                      <a-row style="padding: 10px">
+                    <a-col v-for="(item3, index3) in item2.list" :key="index3" style="line-height: 40px;">
+                      <a-row style="padding:5px; ">
                         <a-col style="text-align: left" :span="7"> {{ item3.title }}: </a-col>
                         <a-col :span="15">
                           {{ item3.content }}
@@ -1193,7 +1193,7 @@ onMounted(() => {
 }
 .ant-form-item {
   box-sizing: border-box;
-  margin: 10px 0;
+  margin: 6px 0;
   padding: 0;
   color: rgba(0, 0, 0, 0.85);
   font-size: 14px;
@@ -1203,6 +1203,7 @@ onMounted(() => {
   font-feature-settings: tnum;
   /* margin-bottom: 24px; */
   vertical-align: top;
+  background: #fafafa ;
 }
 .bled-countenance {
   color: #333333;
@@ -1252,11 +1253,11 @@ onMounted(() => {
 }
 .Text-Content {
   padding: 10px;
-  color: #888;
+  color: #777;
 }
 .dhxg {
   padding: 15px;
-  border: 1px solid #ccc;
+  border: 1px solid #f0f0f0;
   margin: 15px;
   border-radius: 10px;
 }
diff --git a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailForm.vue b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailForm.vue
index 67f884c..0b8f694 100644
--- a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailForm.vue
+++ b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailForm.vue
@@ -45,7 +45,7 @@
             <div class="title">{{ item.title }}</div>
           </a-col>
           <!-- 单行文本	1	 -->
-          <a-col v-if="item.type === '1'" :span="24">
+          <a-col v-if="item.type === '1'" :span="24" >
             <a-input placeholder="请输入内容" v-model:value="item.content" style="width: 100%"></a-input>
           </a-col>
           <!-- 多行文本	2	 -->
@@ -58,11 +58,11 @@
           </a-col>
           <!-- 固定表单（基础信息）	4	 -->
           <a-col v-else-if="item.type === '4'" v-model:value="item.content" :span="24">
-            <a-col style="margin-bottom: 15px"></a-col>
+            <a-col style="margin-bottom: 15px;"></a-col>
             <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-form-item :label="item2.title"><a-input :placeholder="`请输入` + item2.title"  v-model:value="item2.content"/></a-form-item>
                   <!-- {{ item2.title }}:<a-input placeholder="请输入内容" style="width:60%;"></a-input>  -->
                 </a-col>
               </a-row>
@@ -70,9 +70,9 @@
           </a-col>
           <!-- 自增表格	5	 -->
           <a-col v-else-if="item.type === '5'" :span="24">
-            <a-table :columns="getTableColumns(item.zyJxdgPzxxList)" :dataSource="item.list" :pagination="false">
+            <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>
+                <a-input placeholder="请输入内容" v-model:value="record[column.key]" style="width: 80%;"></a-input>
                 <!-- <template v-if="column.key === 'name'">
                 </template> -->
               </template>
@@ -82,7 +82,7 @@
           <a-col v-else-if="item.type === '6'" :span="24">
             <a-row>
               <a-col>
-                <a-button type="primary" @click="handleDhwb(item)" class="increase">添加</a-button>
+                <a-button type="primary" @click="handleDhwb(item)" class="increase" preIcon="ant-design:plus-outlined">添加</a-button>
               </a-col>
               <a-col style="margin-bottom: 15px"></a-col>
               <a-col v-for="(item2, index2) in item.list" :key="index2">
@@ -101,7 +101,7 @@
           <a-col v-else-if="item.type === '7'" :span="24">
             <a-row>
               <a-col>
-                <a-button type="primary" @click="handleDhfwb(item)" class="increase">添加</a-button>
+                <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" style="text-align: right">
                 <j-editor placeholder="请输入内容" v-model:value="item2.title" :disabled="disabled" style="width: 500px; height: 200px" />
@@ -113,7 +113,7 @@
           <a-col v-else-if="item.type === '8'" :span="24">
             <a-row>
               <a-col>
-                <a-button type="primary" @click="handleDhwbArea(item)" class="increase">添加</a-button>
+                <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" />
@@ -124,7 +124,7 @@
 
           <!-- 自增表格	9  -->
           <a-col v-else-if="item.type === '9' || item.type === '15'" :span="24">
-            <div><a-button type="primary" @click="handleZzbg(item)" class="increase">新增</a-button> </div>
+            <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'">
@@ -138,7 +138,7 @@
           </a-col>
           <!-- 自增表格（两列关联）	10 -->
           <a-col v-else-if="item.type === '10'" :span="24">
-            <div><a-button type="primary" @click="handleZzbg(item)" class="increase">新增</a-button> </div>
+            <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'">
@@ -152,7 +152,7 @@
           </a-col>
           <!-- 自增表格（多专业）	11 -->
           <a-col v-else-if="item.type === '11'" :span="24">
-            <div><a-button type="primary" @click="handleZzbg(item)" class="increase">新增</a-button> </div>
+            <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'">
@@ -170,7 +170,7 @@
           <a-col v-else-if="item.type === '12'" :span="24">
             <a-row>
               <a-col>
-                <a-button type="primary" @click="handleKcmbZzbg(item)" class="increase">添加</a-button>
+                <a-button type="primary" @click="handleKcmbZzbg(item)" class="increase" preIcon="ant-design:plus-outlined">添加</a-button>
               </a-col>
               <a-col style="margin-bottom: 15px"></a-col>
               <a-col v-for="(item2, index2) in item.list2Map" :key="index2">
@@ -183,7 +183,7 @@
                         placeholder="请输入内容"
                         v-model:value="item3.title"
                         class="Sheet"
-                        style="width: 80%; margin: 0 10px 10px 15px"
+                        style="width:95%; margin: 0 10px 10px 15px"
                         :disabled="index3 == 0"
                         @blur="handle2Glxm(item)"
                       ></a-input>
@@ -201,18 +201,18 @@
           <a-col v-else-if="item.type === '13'" :span="24">
             <a-row>
               <a-col>
-                <a-button type="primary" @click="handle13Zzbg(item)" class="increase">添加</a-button>
+                <a-button type="primary" @click="handle13Zzbg(item)" class="increase" preIcon="ant-design:plus-outlined">添加</a-button>
               </a-col>
               <a-col style="margin-bottom: 15px"></a-col>
               <a-col>
                 <!-- -{{ item.list}}- -->
                 <a-row v-for="(item2, index2) in item.list" :key="index2">
-                  <a-col v-for="(item3, index3) in item2.list" :key="index3" style="line-height: 40px">
+                  <a-col v-for="(item3, index3) in item2.list" :key="index3" style="line-height: 40px;">
                     <a-row>
-                      <a-col style="text-align: left" :span="6"> {{ item3.title }}： </a-col>
+                      <a-col style="text-align: right;color:#777" :span="6"> {{ item3.title }}: </a-col>
                       <a-col :span="18">
                         <span v-if="item3.type === '1'">
-                          <a-input v-model:value="item3.content" style="width: 90%"></a-input>
+                          <a-input v-model:value="item3.content" style="width:98%; margin-left:10px;"></a-input>
                         </span>
                         <span v-if="item3.type === '2'">
                           <a-select
@@ -220,7 +220,7 @@
                             v-model:value="item3.content"
                             mode="tags"
                             :disabled="disabled"
-                            style="width: 90%"
+                            style="width:98%;margin-left:10px;"
                           >
                             <a-select-option value="">{{ `请选择` + item3.title }}</a-select-option>
                             <a-select-option :value="peizhi.title" v-for="(peizhi, index2) in kcmbDataSource" :key="index2">{{
@@ -231,8 +231,8 @@
                       </a-col>
                     </a-row>
                   </a-col>
-                  <a-col style="text-align: right">
-                    <button class="ant-btn" @click="handle13DelZzbg(item, index2)" style="margin-left: 10px">删除</button>
+                  <a-col style="text-align:right;margin-right:9px;">
+                    <button class="ant-btn" @click="handle13DelZzbg(item, index2)" style="margin:10px 0">删除</button>
                   </a-col>
                 </a-row>
               </a-col>
@@ -243,28 +243,28 @@
           <a-col v-else-if="item.type === '14'" :span="24">
             <a-row>
               <a-col>
-                <a-button type="primary" @click="handle14Zzbg(item)" class="increase">添加</a-button>
+                <a-button type="primary" @click="handle14Zzbg(item)" class="increase" preIcon="ant-design:plus-outlined">添加</a-button>
               </a-col>
               <a-col v-if="kcmbShow">
                 <a-row>
-                  <a-col :span="10">
-                    <a-select :placeholder="`请选择课程目标`" v-model:value="checkKcmb" :disabled="disabled" style="width: 90%">
-                      <a-select-option value="">请选择课程目标</a-select-option>
+                  <a-col :span="11">
+                    <a-select :placeholder="`请选择课程目标`" v-model:value="checkKcmb" :disabled="disabled" style="width:92%; margin:15px">
+                      <a-select-option value="">请选择课程目标</a-select-option> 
                       <a-select-option :value="peizhi.title" v-for="(peizhi, index2) in kcmbDataSource" :key="index2">{{
                         peizhi.title
                       }}</a-select-option>
                     </a-select>
                   </a-col>
-                  <a-col :span="10">
-                    <a-select :placeholder="`请选择考核方式`" v-model:value="checkKhfs" :disabled="disabled" mode="tags" style="width: 90%">
+                  <a-col :span="11">
+                    <a-select :placeholder="`请选择考核方式`" v-model:value="checkKhfs" :disabled="disabled" mode="tags" style="width:94%;margin:15px 0">
                       <a-select-option value="">请选择考核方式</a-select-option>
                       <a-select-option :value="peizhi.title" v-for="(peizhi, index2) in khmbDataSource" :key="index2">{{
                         peizhi.title
                       }}</a-select-option>
                     </a-select>
                   </a-col>
-                  <a-col :span="4">
-                    <button class="ant-btn" @click="handleKhmbqueren(item)" style="margin-left: 10px">确认</button>
+                  <a-col :span="2">
+                    <button class="ant-btn" @click="handleKhmbqueren(item)" style="margin:15px 0; margin-left:4px;">确认</button>
                   </a-col>
                 </a-row>
               </a-col>
diff --git a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailModal.vue b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailModal.vue
index 9007644..e1d64a5 100644
--- a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailModal.vue
+++ b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" :width="1100" @ok="handleSubmit">
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" :width="1100"  @ok="handleSubmit" >
     <zy-jxdg-banben-form ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></zy-jxdg-banben-form>
   </BasicModal>
 </template>