Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov

# Conflicts: # src/views/modules/communityParty/calendar/cpts/calendar.vue
3 years ago · 5d9cf5d206
2 changed files with 14 additions and 6 deletions
--- a/src/views/modules/communityParty/calendar/index.vue
+++ b/src/views/modules/communityParty/calendar/index.vue
@ -55,6 +55,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>
@ -229,6 +233,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>
--- 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>