From d74df2254cdc16e7ec592afcf51d1e26ba9443b5 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Mon, 26 Aug 2024 11:47:46 +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     | 71 +++++++++++--------
 .../components/ZyJxdgBanbenDetailForm.vue     | 21 +++++-
 .../components/ZyJxdgBanbenForm.vue           | 42 +++++++----
 3 files changed, 88 insertions(+), 46 deletions(-)

diff --git a/src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue b/src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue
index a6c6ad7..c81d533 100644
--- a/src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue
+++ b/src/views/kc/zyJxdgBanben/ZyJxdgTeacherList.vue
@@ -17,7 +17,7 @@
       <a-row>
         <a-col :span="24">
           <span class="title">填写教学大纲内容</span>
-          <a-button type="primary" @click="init" style="float: right; margin-right: 8px; margin-top: -6px">
+          <a-button type="primary" @click="init" style="float: right; margin-right: 8px; margin-top: -1px">
             <Icon icon="ant-design:export-outlined" />返回
           </a-button>
           <a-divider />
@@ -25,11 +25,11 @@
         <a-col :span="24">
           <a-row>
             <a-col :span="24">
-              <div style="width: 100%; padding: 2px 20px; color: #666; font-size: 14px; background: #f6f6f6"
+              <div style="width: 100%; padding: 2px 20px; font-size:12px; color:#18a689; border-left:3px solid #18a689;"
                 ><span>请选择填写的教学大纲版本</span></div
               >
             </a-col>
-            <a-col :span="23" style="margin: 0 auto; border: 1px solid #eceff6; border-radius: 4px; margin-top: 8px">
+            <a-col :span="24" style="margin: 0 auto; border: 1px solid #eceff6; border-radius: 4px; margin-top: 8px">
               <a-table :columns="jxdgbbColumns" :dataSource="jxdgbbDataSource" :pagination="false">
                 <template #bodyCell="{ column, record }">
                   <template v-if="column.key === 'action'">
@@ -46,31 +46,31 @@
               :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: #f0f7f6">
                   <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-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-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-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-input :placeholder="`请输入` + item2.title" v-model:value="item2.content" 
                         /></a-form-item>
                       </a-col>
                     </a-row>
@@ -80,7 +80,7 @@
                 <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>
+                      <a-input placeholder="请输入内容" v-model:value="record[column.key]" style="width: 80%;"></a-input>
                     </template>
                   </a-table>
                 </a-col>
@@ -95,10 +95,10 @@
                         placeholder="请输入内容"
                         v-model:value="item2.title"
                         class="form-pattern"
-                        style="width: 80%; margin: 0 10px 5px 20px"
+                        style="width:90%; "
                         @blur="handleGlxm(item)"
                       ></a-input>
-                      <button @click="handleDhwbDel(item, index2)" class="ant-btn" style="margin: 8px 0">删除</button>
+                      <button @click="handleDhwbDel(item, index2)" class="ant-btn">删除</button>
                     </a-col>
                   </a-row>
                 </a-col>
@@ -110,7 +110,7 @@
                     </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" />
-                      <button @click="handleDhfwbDel(item, index2)" class="ant-btn" style="margin: 8px 0">删除</button>
+                      <button @click="handleDhfwbDel(item, index2)" class="ant-btn" style="margin: 8px 0 ">删除</button>
                     </a-col>
                   </a-row>
                 </a-col>
@@ -154,7 +154,7 @@
                           placeholder="请输入内容"
                           v-model:value="record[column.key]"
                           @blur="handleTwoGlxm(item)"
-                          style="width: 100%"
+                          style="width: 100%;"
                         ></a-input>
                       </template>
                     </template>
@@ -184,7 +184,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">
@@ -197,7 +197,7 @@
                               placeholder="请输入内容"
                               v-model:value="item3.title"
                               class="Sheet"
-                              style="width: 80%; margin: 0 10px 10px 15px"
+                              style="width:92%; margin: 0 10px 10px 20px"
                               :disabled="index3 == 0"
                               @blur="handle2Glxm(item)"
                             ></a-input>
@@ -215,7 +215,7 @@
                 <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>
@@ -223,10 +223,10 @@
                       <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-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:97%; margin-left:10px; text-align: left"></a-input>
                               </span>
                               <span v-if="item3.type === '2'">
                                 <a-select
@@ -234,7 +234,7 @@
                                   v-model:value="item3.content"
                                   mode="tags"
                                   :disabled="disabled"
-                                  style="width: 90%"
+                                  style="width:97%; text-align:left;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">{{
@@ -245,8 +245,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:5px 0">删除</button>
                         </a-col>
                       </a-row>
                     </a-col>
@@ -257,12 +257,12 @@
                 <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 :placeholder="`请选择课程目标`" v-model:value="checkKcmb" :disabled="disabled" style="width: 90%; margin:10px 0">
                             <a-select-option value="">请选择课程目标</a-select-option>
                             <a-select-option :value="peizhi.title" v-for="(peizhi, index2) in kcmbDataSource" :key="index2">{{
                               peizhi.title
@@ -270,7 +270,7 @@
                           </a-select>
                         </a-col>
                         <a-col :span="10">
-                          <a-select :placeholder="`请选择考核方式`" v-model:value="checkKhfs" :disabled="disabled" mode="tags" style="width: 90%">
+                          <a-select :placeholder="`请选择考核方式`" v-model:value="checkKhfs" :disabled="disabled" mode="tags" style="width: 90%;margin:10px 0">
                             <a-select-option value="">请选择考核方式</a-select-option>
                             <a-select-option :value="peizhi.title" v-for="(peizhi, index2) in khmbDataSource" :key="index2">{{
                               peizhi.title
@@ -278,7 +278,7 @@
                           </a-select>
                         </a-col>
                         <a-col :span="4">
-                          <button class="ant-btn" @click="handleKhmbqueren(item)" style="margin-left: 10px">确认</button>
+                          <button class="ant-btn" @click="handleKhmbqueren(item)" style="margin:10px 0">确认</button>
                         </a-col>
                       </a-row>
                     </a-col>
@@ -424,7 +424,7 @@
                   <a-row>
                     <a-col v-for="(item3, index3) in item2" :span="index3 == 0 ? '5' : '16'" :key="index3">
                       <!-- -{{ item3 }}- -->
-                      <span style="line-height: 40px; margin-left: 15px" v-if="index3 == 0"> {{ item3.title }} ： </span>
+                      <span style="line-height: 40px; margin-left: 15px;" v-if="index3 == 0"> {{ item3.title }}: </span>
                       <span style="line-height: 40px" v-else>
                         {{ item3.title }}
                       </span>
@@ -441,7 +441,7 @@
                   <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 style="text-align: left" :span="7"> {{ item3.title }}： </a-col>
+                        <a-col style="text-align: left" :span="7"> {{ item3.title }}: </a-col>
                         <a-col :span="15">
                           {{ item3.content }}
                         </a-col>
@@ -1274,4 +1274,19 @@ onMounted(() => {
   margin: 17px;
   border-radius: 10px;
 }
+.borderstyle{
+  margin:8px auto;
+  border:1px solid #f0f0f0;
+  padding:12px;
+  background:#fff;
+  border-radius:5px;
+}
+.borderstyle:hover{
+  margin:8px auto;
+  border:1px solid #f0f0f0;
+  padding:12px;
+  background:#fff;
+  border-radius:5px;
+  box-shadow: 2px 2px 10px 1px #d4d4d4;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailForm.vue b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailForm.vue
index e956e41..67f884c 100644
--- a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailForm.vue
+++ b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenDetailForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-spin :spinning="loading">
+  <a-spin :spinning="loading" >
     <!-- <a-form v-bind="formItemLayout">
       <a-row>
         <a-col :span="24">
@@ -38,7 +38,7 @@
         :span="23"
         v-for="(item, index) in zyJxdgMainTable.dataSource"
         :key="index"
-        style="margin: 8px auto; border: 1px solid #f5f5f5; background: #fbfbfb; border-radius: 5px"
+        class="borderstyle"
       >
         <a-row>
           <a-col :span="24">
@@ -921,7 +921,7 @@ export default defineComponent({
 .increase {
   position: absolute;
   right: 4px;
-  top: -37px;
+  top: -36px;
 }
 .place-dele {
   margin: 10px 0;
@@ -930,4 +930,19 @@ export default defineComponent({
   color: #91949a;
   border-radius: 4px;
 }
+.borderstyle{
+  margin:8px auto;
+  border:1px solid #f0f0f0;
+  padding:12px;
+  background:#fff;
+  border-radius:5px;
+}
+.borderstyle:hover{
+  margin:8px auto;
+  border:1px solid #f0f0f0;
+  padding:12px;
+  background:#fff;
+  border-radius:5px;
+  box-shadow: 2px 2px 10px 1px #d4d4d4;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenForm.vue b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenForm.vue
index e3d50f3..91b6a59 100644
--- a/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenForm.vue
+++ b/src/views/kc/zyJxdgBanben/components/ZyJxdgBanbenForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-spin :spinning="loading" >
+  <a-spin :spinning="loading">
     <a-form v-bind="formItemLayout" style=" padding-top:20px;" >
       <a-row>
         <a-col :span="24">
@@ -30,28 +30,28 @@
           <div class="explain-word">3.被关联项目禁用问题：目前只支持文本及表格进行关联，富文本、表单、多行文本不支持被关联！</div>
         </div>
       </a-col>
-      <a-col :span="23" v-for="(item,index) in zyJxdgMainTable.dataSource" :key="index" style="margin:8px auto;border:1px solid #f5f5f5;padding:10px;background:#fbfbfb;border-radius:5px;">
+      <a-col :span="23" v-for="(item,index) in zyJxdgMainTable.dataSource" :key="index" class="borderstyle">
         <a-row style="margin:10px;">
           <a-col :span="6" style="padding-right:10px;">
             <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" :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" mode="tags" :disabled="disabled" style="margin-left:-12px;width: 100%;">
+            <a-select  placeholder="请选择关联第几个项目"  v-model:value="item.guanlian" mode="tags" :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">
+          <a-col :span="6" >
             <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="21">
+          <a-col :span="22">
             <a-input v-model:value="item.tsy" placeholder="请输入提示语" :disabled="disabled" class="Prompt-language" />
           </a-col>
-          <a-col :span="3">
-            <button @click="handleOneDel(item,index)" class="ant-btn" style="margin-left:10px">删除</button>
+          <a-col :span="2">
+            <button @click="handleOneDel(item,index)" class="ant-btn" style="margin-left:10px;width:100%">删除</button>
           </a-col>
 <!-- 
 单行文本	1	 
@@ -77,11 +77,11 @@
               </a-col>
               <a-col :span="24" v-for="(twoItem,index2) in item.zyJxdgPzxxList" :key="index2">
                 <a-row>
-                  <a-col :span="21">
+                  <a-col :span="22">
                     <a-input v-model:value="twoItem.title" placeholder="请输入选项" :disabled="disabled" class="fields-add"/>
                   </a-col>
-                  <a-col :span="3"><close-outlined />
-                     <button @click="handleTwoDel(item,index2)" class="ant-btn" style="margin-left:10px">删除</button>
+                  <a-col :span="2"><close-outlined />
+                     <button @click="handleTwoDel(item,index2)" class="ant-btn" type="button"  style="margin-left:10px; width:100%">删除</button>
                   </a-col>
                 </a-row>
               </a-col>
@@ -321,14 +321,26 @@
   border-radius: 4px;
 }
 .Prompt-language{
-  color: #bda787;
+  color: #95989e;
   font-size:14px;
 }
 .explain-word{
   color:#ff9924;
   font-size:12px;
 }
-.ant-btn{
-    color: #666;
-  }
+.borderstyle{
+  margin:8px auto;
+  border:1px solid #f0f0f0;
+  padding:12px;
+  background:#fff;
+  border-radius:5px;
+}
+.borderstyle:hover{
+  margin:8px auto;
+  border:1px solid #f0f0f0;
+  padding:12px;
+  background:#fff;
+  border-radius:5px;
+  box-shadow: 2px 2px 10px 1px #d4d4d4;
+}
 </style>
\ No newline at end of file