From cdb570d9b588f3ae992668b71750ef307a08e410 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 6 Sep 2022 10:52:45 +0800
Subject: [PATCH 1/5] 111

---
 src/views/modules/communityParty/calendar/index.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue
index fd3a8692a..a513d2054 100644
--- a/src/views/modules/communityParty/calendar/index.vue
+++ b/src/views/modules/communityParty/calendar/index.vue
@@ -48,6 +48,10 @@
                   <span>活动类型：</span>
                   <span>{{ item.actTypeName }}</span>
                 </div>
+                <div class="item-prop">
+                  <span>活动主题：</span>
+                  <span>{{ item.topic }}</span>
+                </div>
                 <div class="item-prop">
                   <span>开始时间：</span>
                   <span>{{ item.holdTime }}</span>
@@ -184,6 +188,10 @@
                         <span>活动类型：</span>
                         <span>{{ item.actTypeName }}</span>
                       </div>
+                      <div class="item-prop">
+                        <span>活动主题：</span>
+                        <span>{{ item.topic }}</span>
+                      </div>
                       <div class="item-prop">
                         <span>开始时间：</span>
                         <span>{{ item.holdTime }}</span>

From 1ba72f0bbd3652fc33c8c53c2fe72c3a2cf51e19 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 6 Sep 2022 10:57:58 +0800
Subject: [PATCH 2/5] kuandu

---
 src/views/modules/communityParty/stas/index.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue
index b063e674b..04efa189a 100644
--- a/src/views/modules/communityParty/stas/index.vue
+++ b/src/views/modules/communityParty/stas/index.vue
@@ -75,42 +75,42 @@
                          header-align="center"
                          align="center"
                          label="支部党员大会(次)"
-                         min-width="80">
+                         >
         </el-table-column>
         <el-table-column prop="wyhNum"
                          header-align="center"
                          align="center"
                          label="支部委员会(次)"
                          show-overflow-tooltip
-                         max-width="100">
+                         >
         </el-table-column>
         <el-table-column prop="dxzhNum"
                          header-align="center"
                          show-overflow-tooltip
                          align="center"
                          label="党小组会(次)"
-                         mix-width="80">
+                         >
         </el-table-column>
         <el-table-column prop="dkNum"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="党课(次)"
-                         mix-width="80">
+                         >
         </el-table-column>
         <el-table-column prop="ztdrNum"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="主题党日(次)"
-                         width="100">
+                         >
         </el-table-column>
         <el-table-column prop="wmfwNum"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
                          label="为民服务活动(次)"
-                         width="130">
+                         >
         </el-table-column>
       </el-table>
     </div>

From 518c07a608c54f79138361398bdd26da9c9c6b46 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 6 Sep 2022 11:15:47 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityParty/calendar/cpts/calendar.vue | 4 ++--
 src/views/modules/communityParty/calendar/index.vue         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/communityParty/calendar/cpts/calendar.vue b/src/views/modules/communityParty/calendar/cpts/calendar.vue
index c653429eb..439de3a20 100644
--- a/src/views/modules/communityParty/calendar/cpts/calendar.vue
+++ b/src/views/modules/communityParty/calendar/cpts/calendar.vue
@@ -197,8 +197,8 @@ export default {
       width: 14.285%;
       text-align: center;
       box-sizing: border-box;
-      padding: 8px 0;
-      height: 100px;
+      padding: 12px 0;
+      height: 125px;
       background-color: #ffffff;
       opacity: 0.4;
 
diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue
index a513d2054..449217106 100644
--- a/src/views/modules/communityParty/calendar/index.vue
+++ b/src/views/modules/communityParty/calendar/index.vue
@@ -790,8 +790,8 @@ $red: #f33;
 
   .tip {
     position: relative;
-    margin: -15px 0px 0px 0px;
-    padding: 8px 2px 3px 12px;
+    margin: 0px 0px 0px 0px;
+    padding: 8px 2px 5px 12px;
     line-height: 18px;
     box-shadow: 0 0 10px 5px #eee;
     background-color: #ffffff;

From 3bb8193d7ac5f412928a86b9c24df0ce7ad8645d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 6 Sep 2022 13:33:43 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=92=A4=E5=9B=9E=E5=95=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityParty/calendar/cpts/calendar.vue | 4 ++--
 src/views/modules/communityParty/calendar/index.vue         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/communityParty/calendar/cpts/calendar.vue b/src/views/modules/communityParty/calendar/cpts/calendar.vue
index 439de3a20..c653429eb 100644
--- a/src/views/modules/communityParty/calendar/cpts/calendar.vue
+++ b/src/views/modules/communityParty/calendar/cpts/calendar.vue
@@ -197,8 +197,8 @@ export default {
       width: 14.285%;
       text-align: center;
       box-sizing: border-box;
-      padding: 12px 0;
-      height: 125px;
+      padding: 8px 0;
+      height: 100px;
       background-color: #ffffff;
       opacity: 0.4;
 
diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue
index 449217106..a513d2054 100644
--- a/src/views/modules/communityParty/calendar/index.vue
+++ b/src/views/modules/communityParty/calendar/index.vue
@@ -790,8 +790,8 @@ $red: #f33;
 
   .tip {
     position: relative;
-    margin: 0px 0px 0px 0px;
-    padding: 8px 2px 5px 12px;
+    margin: -15px 0px 0px 0px;
+    padding: 8px 2px 3px 12px;
     line-height: 18px;
     box-shadow: 0 0 10px 5px #eee;
     background-color: #ffffff;

From 03672179437554a185cae541e29e0b45ae9a8b8a Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 8 Sep 2022 10:55:04 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=B8=BB=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityParty/calendar/cpts/calendar.vue | 46 +++++++++----------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/views/modules/communityParty/calendar/cpts/calendar.vue b/src/views/modules/communityParty/calendar/cpts/calendar.vue
index 401f2c828..0b2840ab2 100644
--- a/src/views/modules/communityParty/calendar/cpts/calendar.vue
+++ b/src/views/modules/communityParty/calendar/cpts/calendar.vue
@@ -1,35 +1,33 @@
 <template>
   <div class="m-calendar">
     <div class="top-list">
-      <div
-        class="top"
-        v-for="(item, index) in top"
-        :class="{ 'z-weekend': index > 4 }"
-        :key="item"
-      >
+      <div class="top"
+           v-for="(item, index) in top"
+           :class="{ 'z-weekend': index > 4 }"
+           :key="item">
         {{ item }}
       </div>
     </div>
     <!-- 日历号 -->
     <div class="date-list">
-      <div
-        class="date-item"
-        :class="{
+      <div class="date-item"
+           :class="{
           'z-on': item.format == currentDate,
           'z-this-month': item.thisMonth,
           'z-today': item.isToday,
           'z-after-today': item.afterToday,
           'z-weekend': item.day == 6 || item.day == 0,
         }"
-        v-for="(item, index) in visibleCalendar"
-        :key="index"
-        @click="handleClickDate(item)"
-      >
+           v-for="(item, index) in visibleCalendar"
+           :key="index"
+           @click="handleClickDate(item)">
         <div class="date">{{ item.date }}</div>
         <div class="nongli">
           {{ computeNongliText(item.year, item.month, item.date) }}
         </div>
-        <slot name="date-item" v-bind:item="item" v-bind:index="index"> </slot>
+        <slot name="date-item"
+              v-bind:item="item"
+              v-bind:index="index"> </slot>
       </div>
     </div>
   </div>
@@ -49,7 +47,7 @@ export default {
       default: new Date().getMonth(),
     },
   },
-  data() {
+  data () {
     return {
       top: ["一", "二", "三", "四", "五", "六", "日"],
       currentDate: "",
@@ -57,7 +55,7 @@ export default {
   },
   computed: {
     // 获取当前月份显示日历,共42天
-    visibleCalendar() {
+    visibleCalendar () {
       // 获取今天的年月日
       const { currentYear, currentMonth } = this;
       const today = new Date();
@@ -118,30 +116,30 @@ export default {
     },
   },
   watch: {
-    visibleCalendar() {
+    visibleCalendar () {
       this.init();
     },
   },
-  mounted() {
+  mounted () {
     console.log("123", this.time);
     this.init();
   },
   methods: {
-    computeNongliText(y, m, d) {
-      let item = nongli.solar2lunar(y, m+1, d);
+    computeNongliText (y, m, d) {
+      let item = nongli.solar2lunar(y, m + 1, d);
       return item.festival || item.lunarFestival || item.Term || item.IDayCn;
     },
 
-    init() {
+    init () {
       if (!this.currentDate) {
         this.handleClickDate(
           this.visibleCalendar.find((item) => item.isToday) ||
-            this.visibleCalendar.filter((item) => item.thisMonth)[0]
+          this.visibleCalendar.filter((item) => item.thisMonth)[0]
         );
       }
     },
 
-    handleClickDate(item) {
+    handleClickDate (item) {
       console.log("点击日历日期", item);
       this.currentDate = item.format;
 
@@ -235,7 +233,7 @@ export default {
         color: #3e8ef7;
       }
 
-      .nongli{
+      .nongli {
         position: absolute;
         z-index: 0;
         left: 0;