From 820c5c3229e79f7a1140bb29326999fff3fb6ab9 Mon Sep 17 00:00:00 2001
From: kbing1981 <549711992@qq.com>
Date: Thu, 5 Sep 2024 11:30:38 +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

---
 .../src/views/bl/kcKetangbiao/itemPage.vue    |  23 ++--
 .../src/views/bl/zjSqxx/ZjSqxxList.vue        |  17 ++-
 .../bl/zjSqxx/components/ZjSqxxEditForm.vue   |  18 +--
 .../src/views/system/notice/index.vue         | 106 +++++++++++++-----
 4 files changed, 116 insertions(+), 48 deletions(-)

diff --git a/jeecgboot-vue3/src/views/bl/kcKetangbiao/itemPage.vue b/jeecgboot-vue3/src/views/bl/kcKetangbiao/itemPage.vue
index 3fe372f..4ea20e8 100644
--- a/jeecgboot-vue3/src/views/bl/kcKetangbiao/itemPage.vue
+++ b/jeecgboot-vue3/src/views/bl/kcKetangbiao/itemPage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="mdule-box">
+  <div class="mdule-box1">
     <div>
       <!-- <div style="width: 100%; height: 20px; background-color: #1c84c6"></div> -->
       <div class="schedule-title">
@@ -163,17 +163,7 @@ body{
   border-radius: 5px;
   line-height: 23px;
 }
-.mdule-box{
-  border: 2px solid #ececec;
-  background: #fff;
-  border-radius:10px;
-}
-.mdule-box:hover{
-  border: 2px solid #ececec;
-  background: #fff;
-  border-radius:10px;
-  box-shadow: 2px 2px 10px 1px #ececec;
-}
+
 .schedule-title{
   width: 100%;
   white-space: normal;
@@ -217,5 +207,14 @@ body{
 .schedule-word{
   padding:12px 5px;
   font-size:16px;
+}
+ .mdule-box1{
+  border: 2px solid #eff1f4;
+  background: #fff;
+  border-radius:5px;
+}
+.mdule-box1:hover{
+  box-shadow: 2px 2px 10px 1px #ddd;
+  cursor: pointer;
 }
 </style>
diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxxList.vue b/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxxList.vue
index 83423e9..31179c6 100644
--- a/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxxList.vue
+++ b/jeecgboot-vue3/src/views/bl/zjSqxx/ZjSqxxList.vue
@@ -2,7 +2,7 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol" class="mdule-box">
         <a-row :gutter="24">
           <a-col :lg="6">
             <a-form-item name="zjNo">
@@ -46,7 +46,7 @@
       </a-form>
     </div>
     <!--引用表格-->
-    <BasicTable @register="registerTable">
+    <BasicTable @register="registerTable" style="border-radius:5px;">
       <!--插槽:table标题-->
       <template #tableTitle>
         <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
@@ -253,4 +253,17 @@
       width: 100%;
     }
   }
+  .mdule-box{
+  border: 2px solid #eff1f4;
+  background: #fff;
+  border-radius:5px;
+  padding: 20px 0  0 20px;
+}
+.mdule-box:hover{
+  border: 2px solid #eff1f4;
+  background: #fff;
+  border-radius:5px;
+  box-shadow: 2px 2px 10px 1px #ddd;
+  cursor: pointer;
+}
 </style>
diff --git a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue
index 3f2769f..d24874e 100644
--- a/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue
+++ b/jeecgboot-vue3/src/views/bl/zjSqxx/components/ZjSqxxEditForm.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-spin :spinning="confirmLoading">
+  <a-spin :spinning="confirmLoading" >
     <JFormContainer :disabled="disabled">
-      <template #detail>
+      <template #detail >
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ZjSqxxForm" >
           <a-row>
+            <a-col :span="24" class="mdule-box" style="margin-bottom:10px;">
 						<a-col :span="24">
 							<a-form-item label="教工号" v-bind="validateInfos.zjNo" id="ZjSqxxForm-zjNo" name="zjNo">
 								<a-input v-model:value="formData.zjNo" placeholder="请输入教工号"  allow-clear ></a-input>
@@ -14,6 +15,7 @@
 								<a-input v-model:value="formData.zjName" placeholder="请输入专家姓名"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
+            </a-col>
 						<!-- 过程考核 -->
             <a-col :span="24" v-if="formData.sqfw == '0'" class="mdule-box">
               <a-row>
@@ -382,19 +384,19 @@ function ketangSuccess(record) {
 <style lang="less" scoped>
   .antd-modal-form {
     padding: 14px;
-    background: #f7f7f7;
-  }
+    background: #f7f8fa;
+     }
 .mdule-box{
-  border: 2px solid #ececec;
+  border: 2px solid #eff1f4;
   background: #fff;
   border-radius:10px;
-  padding: 20px 0;
+  padding: 20px 0 0 0;
 }
 .mdule-box:hover{
-  border: 2px solid #ececec;
+  border: 2px solid #eff1f4;
   background: #fff;
   border-radius:10px;
-  box-shadow: 2px 2px 10px 1px #ececec;
+  box-shadow: 2px 2px 10px 1px #ddd;
   cursor: pointer;
 }
 </style>
diff --git a/jeecgboot-vue3/src/views/system/notice/index.vue b/jeecgboot-vue3/src/views/system/notice/index.vue
index 7665f81..3a4575d 100644
--- a/jeecgboot-vue3/src/views/system/notice/index.vue
+++ b/jeecgboot-vue3/src/views/system/notice/index.vue
@@ -20,10 +20,11 @@
               <a-button preIcon="ant-design:plus-outlined" type="primary" @click="handleAdd">新建</a-button>
             </a-col>
           </a-row>
-          <div v-for="notice in noticeList">
+          <div v-for="notice in noticeList" class="mdule-box">
             <a-row class="item-header-border">
               <a-col :span="16">
-                <span class="item-title">{{notice.titile}}【{{showDictValue(notice.sendStatus, statusData)}}】</span>
+                <span class="item-title" style="font-weight: bold;">{{notice.titile}}</span>
+                <span class="state-cx">{{showDictValue(notice.sendStatus, statusData)}}</span>
               </a-col>
               <a-col :span="8" class="item-text-right">
                 <a-button v-if="notice.sendStatus!=1" class="item-button-border" type="link" @click="handleEdit(notice)">编辑</a-button>
@@ -226,59 +227,75 @@ function handleReturn(record){
   padding: 8px 10px 8px 10px;
   margin-bottom: 8px;
   background-color: #ffffff;
-  border-radius: 2px;
+  border-radius: 5px;
   line-height: 46px;
 }
 
+.title-form:hover{
+   box-shadow: 2px 2px 5px 2px #ddd;
+}
+
 .item-table{
   padding: 6px;
-  background-color: #ffffff;
-  border-radius: 2px;
+  background-color: #f7f8fa;
+  border-radius: 5px;
   min-height: 600px;
+  margin:10px 0;
+  padding:0 10px 10px 10px;
+  box-shadow: 2px 2px 10px 2px #ddd;
 }
-
 .item-header-border{
-  border-style: solid;
-  border-top-width: 1px;
-  border-bottom-width: 0px;
-  border-left-width: 1px;
-  border-right-width: 1px;
-  border-color: #333333;
+  // border-style: solid;
+  // border-top-width: 1px;
+  // border-bottom-width: 0px;
+  // border-left-width: 1px;
+  // border-right-width: 1px;
+  // border-color: #333333;
+  margin-top:3px;
 }
 
 .item-content-border{
   border-style: solid;
   border-top-width: 1px;
   border-bottom-width: 1px;
-  border-left-width: 1px;
-  border-right-width: 1px;
-  border-color: #333333;
+  border-left-width: 0px;
+  border-right-width: 0px;
+  border-color: #f7f7f7;
+  margin-top: 10px;
+  color: #666;
 }
 
 .item-bottom-border{
   border-style: solid;
   border-top-width: 0px;
-  border-bottom-width: 1px;
-  border-left-width: 1px;
-  border-right-width: 1px;
-  border-color: #333333;
-  margin-bottom: 30px;
+  // border-bottom-width: 1px;
+  // border-left-width: 1px;
+  // border-right-width: 1px;
+  // border-color: #333333;
 }
 
 .item-button-border{
-  border-style: solid;
-  border-left-width: 1px;
-  border-color: #e5e7eb;
+  // border-style: solid;
+  // border-left-width: 1px;
+  // border-color: #59afff;
+  background: #e8f4ff;
+  margin-right: 5px;
+  color: #1890ff;
+}
+.item-button-border:hover{
+  // border-style: solid;
+  // border-left-width: 1px;
+  // border-color: #59afff;
+  background: #f7f8fa;
 }
-
 .item-text-right{
   text-align: right;
 }
 
 .item-title{
-  font-weight: bold;
   font-size: 16px;
   padding-left: 10px;
+  margin-top: 10px;
 }
 
 .item-content{
@@ -292,5 +309,42 @@ function handleReturn(record){
 .item-padding-right{
   padding-right: 8px;
 }
-
+.mdule-box{
+  border: 2px solid #eff1f4;
+  background: #fff;
+  border-radius:5px;
+  padding: 10px;
+  margin-bottom: 10px;
+}
+.mdule-box:hover{
+  border: 2px solid #afd9ff;
+  background: #fff;
+  border-radius:5px;
+  box-shadow: 2px 2px 10px 2px #ddd;
+  cursor: pointer;
+}
+.state-fb{
+  background: #e5f8f0;
+  color: #00bf6f;
+  font-size: 12px;
+  border-radius:3px;
+  margin-left: 5px;
+  padding: 2px 6px;
+}
+.state-cx{
+  background: #e5f4ff;
+  color: #65b2f3;
+  font-size: 12px;
+  border-radius:3px;
+  margin-left: 5px;
+  padding: 2px 6px;
+}
+.state-cg{
+  background: #ffeeea;
+  color: #fc5531;
+  font-size: 12px;
+  border-radius:3px;
+  margin-left: 5px;
+  padding: 2px 6px;
+}
 </style>