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

src/assets/scss/modules/visual/basicInfoMain.scss

@@ -267,13 +267,13 @@
       //   margin-left: 0;
       // }
 
-      > span {
+      .housename {
+        margin-top: 70px;
         font-size: 24px;
         font-family: PingFang SC;
         font-weight: 500;
         color: #ffffff;
-        line-height: 18px;
-        line-height: 190px;
+        // line-height: 180px;
       }
 
       .icon_party {

src/views/modules/base/community/buildTable.vue

@@ -156,7 +156,7 @@ export default {
     return {
       loading: false,
       total: 0,
-      pageSize: 10,
+      pageSize: 20,
       pageNo: 0,
       tableLoading: true,
 

src/views/modules/base/community/communityTable.vue

@@ -157,7 +157,7 @@ export default {
     return {
       loading: false,
       total: 0,
-      pageSize: 10,
+      pageSize: 20,
       pageNo: 0,
       tableLoading: true,
 

src/views/modules/base/community/roomTable.vue

@@ -167,7 +167,7 @@ export default {
     return {
       loading: false,
       total: 0,
-      pageSize: 10,
+      pageSize: 20,
       pageNo: 0,
       tableLoading: true,
 

src/views/modules/visual/basicinfo/basicInfoCommunity.vue

@@ -29,7 +29,7 @@
                :key="index"
                :class="['item',{'item_sel':selHouseIndex==index}]"
                @click="handleClickRoom(index)">
-            <span>{{item.houseName}}</span>
+            <div class="housename">{{item.houseName}}</div>
 
             <div class="icon_party">
               <img :src="item.partyUrl"

src/views/modules/visual/basicinfo/cpts/topic-info.vue

@@ -7,7 +7,8 @@
           <span>话题详情</span>
         </div>
 
-        <div class="btn-close" @click="handleClose">
+        <div class="btn-close"
+             @click="handleClose">
           <img src="@/assets/img/shuju/people/close.png" />
         </div>
 
@@ -15,12 +16,10 @@
           <div class="info-title">话题内容</div>
           <div class="info-content">{{ info.topicContent }}</div>
           <div class="info-pics">
-            <img
-              :src="src"
+            <img :src="src"
                  :key="src"
                  v-for="src in info.topicImgs"
-              @click="watchImg(src)"
-            />
+                 @click="watchImg(src)" />
           </div>
           <div class="info-prop">
             <span>发布时间：</span>
@@ -37,65 +36,57 @@
         </div>
 
         <div class="tabs">
-          <div
-            class="tab-btn"
+          <div class="tab-btn"
                @click="subStartGroupIndex"
-            v-if="groupList.length > 9"
-          >
+               v-if="groupList.length > 9">
             <img src="@/assets/img/shuju/people/arrow-double-left.png" />
           </div>
-          <div
-            v-show="index >= startGroupIndex && index < startGroupIndex + 9"
+          <div v-show="index >= startGroupIndex && index < startGroupIndex + 9"
                class="tab"
                :class="groupIndex % groupList.length == index ? 'z-on' : ''"
                :key="'tab' + index"
                @click="groupIndex = index"
-            v-for="(item, index) in groupList"
-          >
+               v-for="(item, index) in groupList">
             {{ item.label }}
           </div>
-          <div
-            class="tab-btn"
+          <div class="tab-btn"
                @click="addStartGroupIndex"
-            v-if="groupList.length > 9"
-          >
+               v-if="groupList.length > 9">
             <img src="@/assets/img/shuju/people/arrow-double-right.png" />
           </div>
         </div>
 
         <div class="m-case">
-          <div class="m-yanpan" v-if="groupIndex == 0">
+          <div class="m-yanpan"
+               v-if="groupIndex == 0">
             <div v-if="issueInfo.projectId">
-              <analyse
-                v-if="yanPan.loading"
+              <analyse v-if="yanPan.loading"
                        singleTitle="楼院小组"
                        :userList="yanPan.houseUserList"
                        :userName="yanPan.icUserName"
                        :singleList="yanPan.categoryList"
                        @user="toUserInfo"
-                @project="toProjectInfo"
-              />
+                       @project="toProjectInfo" />
               <screen-loading v-else>加载中</screen-loading>
             </div>
-            <div v-else class="m-hint">
-              <img
-                src="@/assets/img/modules/visual/noData.png"
-                class="no-data-img"
-              />
+            <div v-else
+                 class="m-hint">
+              <img src="@/assets/img/modules/visual/noData.png"
+                   class="no-data-img" />
             </div>
           </div>
-          <div class="m-tb" v-if="groupIndex == 1">
-            <cpt-tb
-              :col-list="comment.colList"
+          <div class="m-tb"
+               v-if="groupIndex == 1">
+            <cpt-tb :col-list="comment.colList"
                     :loading="comment.loading"
                     :header="comment.header"
                     :list="comment.list"
-              @operate="checkTopicCommentImg"
-            ></cpt-tb>
+                    @operate="checkTopicCommentImg"></cpt-tb>
           </div>
 
           <div v-if="groupIndex == 2">
-            <div class="m-row" v-if="info.issueId">
+            <div class="m-row"
+                 v-if="info.issueId">
               <div class="m-info">
                 <div class="info-prop">
                   <span>议题标题：</span>
@@ -113,7 +104,8 @@
                   <span>议题发起人：</span>
                   <span>{{ issueInfo.issueInitiator }}</span>
                 </div>
-                <div class="info-prop">
+                <div v-if="issueInfo.topicInfo&&issueInfo.topicInfo.groupName"
+                     class="info-prop">
                   <span>议题来源：</span>
                   <span>{{ issueInfo.topicInfo.groupName }}</span>
                 </div>
@@ -143,22 +135,20 @@
                   </div>
                 </div>
 
-                <line-chart
-                  v-if="issueChartData.length > 0"
-                  :list="issueChartData"
-                />
+                <line-chart v-if="issueChartData.length > 0"
+                            :list="issueChartData" />
               </div>
             </div>
-            <div v-else class="m-hint">
-              <img
-                src="@/assets/img/modules/visual/noData.png"
-                class="no-data-img"
-              />
+            <div v-else
+                 class="m-hint">
+              <img src="@/assets/img/modules/visual/noData.png"
+                   class="no-data-img" />
             </div>
           </div>
 
           <div v-if="groupIndex == 3">
-            <div class="m-row" v-if="issueInfo.projectId">
+            <div class="m-row"
+                 v-if="issueInfo.projectId">
               <div class="m-info">
                 <div class="info-prop">
                   <span>项目标题：</span>
@@ -176,33 +166,36 @@
                   <span>当前处理部门：</span>
                   <span>{{ projectInfo.departmentNameList.join("、") }}</span>
                 </div>
-                <div class="info-prop" v-if="projectCate.length > 0">
+                <div class="info-prop"
+                     v-if="projectCate.length > 0">
                   <span>分类：</span>
                   <fold-text :row="3">
-                    <div :key="item.name" v-for="item in projectCate">
+                    <div :key="item.name"
+                         v-for="item in projectCate">
                       {{ item.name }}
                     </div>
                   </fold-text>
                 </div>
-                <div class="info-prop" v-if="projectTag.length > 0">
+                <div class="info-prop"
+                     v-if="projectTag.length > 0">
                   <span>标签：</span>
                   <fold-text :row="3">
-                    <div :key="item.name" v-for="item in projectTag">
+                    <div :key="item.name"
+                         v-for="item in projectTag">
                       {{ item.name }}
                     </div>
                   </fold-text>
                 </div>
               </div>
 
-              <div class="m-process" v-if="projectProcess.length > 0">
+              <div class="m-process"
+                   v-if="projectProcess.length > 0">
                 <div class="process-title">处理进展</div>
                 <div class="list">
-                  <div
-                    class="item"
+                  <div class="item"
                        :class="index === 0 ? 'z-on' : ''"
                        :key="item.processId"
-                    v-for="(item, index) in projectProcess"
-                  >
+                       v-for="(item, index) in projectProcess">
                     <div class="item-row">
                       <div class="name">{{ item.processName }}</div>
                       <div class="date">
@@ -215,20 +208,16 @@
                       <div class="detail-value">{{ item.departmentName }}</div>
                     </div>
 
-                    <div
-                      class="detail"
-                      v-if="item.processName != '转项目' && item.publicReply"
-                    >
+                    <div class="detail"
+                         v-if="item.processName != '转项目' && item.publicReply">
                       <div class="detail-field">说 明：</div>
                       <div class="detail-value">
                         <fold-text :row="3">{{ item.publicReply }}</fold-text>
                       </div>
                     </div>
 
-                    <div
-                      class="detail"
-                      v-if="item.processName != '转项目' && item.internalRemark"
-                    >
+                    <div class="detail"
+                         v-if="item.processName != '转项目' && item.internalRemark">
                       <div class="detail-field">内部备注：</div>
                       <div class="detail-value">
                         <fold-text :row="3">{{
@@ -238,12 +227,10 @@
                     </div>
                     <div class="detail">
                       <div class="attachement-list">
-                        <a
-                          :href="att.url"
+                        <a :href="att.url"
                            target="_blank"
                            :key="att.url"
-                          v-for="att in item.internalFile"
-                        >
+                           v-for="att in item.internalFile">
                           <i class="el-icon-folder-opened"></i>
                           {{ att.name }}
                         </a>
@@ -253,11 +240,10 @@
                 </div>
               </div>
             </div>
-            <div v-else class="m-hint">
-              <img
-                src="@/assets/img/modules/visual/noData.png"
-                class="no-data-img"
-              />
+            <div v-else
+                 class="m-hint">
+              <img src="@/assets/img/modules/visual/noData.png"
+                   class="no-data-img" />
             </div>
           </div>
         </div>

src/views/modules/visual/communityGovern/cpt/project-info.vue

@@ -173,7 +173,8 @@
                   <span>议题发起人：</span>
                   <span>{{ issueInfo.issueInitiator }}</span>
                 </div>
-                <div class="info-prop">
+                <div v-if="issueInfo.topicInfo&&issueInfo.topicInfo.groupName"
+                     class="info-prop">
                   <span>议题来源：</span>
                   <span>{{ issueInfo.topicInfo.groupName }}</span>
                 </div>

src/views/modules/visual/heart/index.vue

@@ -2,14 +2,12 @@
   <div>
     <div class="m-sizer">
       <span>时间：</span>
-      <el-date-picker
-        v-model="monthId"
+      <el-date-picker v-model="monthId"
                       type="month"
                       :clearable="false"
                       prefix-icon="el-icon-caret-bottom"
                       placeholder="选择日期"
-        value-format="yyyyMM"
-      >
+                      value-format="yyyyMM">
       </el-date-picker>
     </div>
 
@@ -22,13 +20,11 @@
           </div>
 
           <div class="tb">
-            <cpt-tb
-              :highlight-top3="true"
+            <cpt-tb :highlight-top3="true"
                     :col-list="tb3.colList"
                     :loading="tb3.loading"
                     :header="tb3.header"
-              :list="tb3.list"
-            ></cpt-tb>
+                    :list="tb3.list"></cpt-tb>
           </div>
         </cpt-card>
       </div>
@@ -41,13 +37,11 @@
           </div>
 
           <div class="tb">
-            <cpt-tb
-              :highlight-top3="true"
+            <cpt-tb :highlight-top3="true"
                     :col-list="tb2.colList"
                     :loading="tb2.loading"
                     :header="tb2.header"
-              :list="tb2.list"
-            ></cpt-tb>
+                    :list="tb2.list"></cpt-tb>
           </div>
         </cpt-card>
       </div>
@@ -60,13 +54,11 @@
           </div>
 
           <div class="tb">
-            <cpt-tb
-              :highlight-top3="true"
+            <cpt-tb :highlight-top3="true"
                     :col-list="tb1.colList"
                     :loading="tb1.loading"
                     :header="tb1.header"
-              :list="tb1.list"
-            ></cpt-tb>
+                    :list="tb1.list"></cpt-tb>
           </div>
         </cpt-card>
       </div>