elink-star
/
epmet-oper-gov
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

shibei_prod
dai 4 years ago
parent
e0b6d2a447 51eac5b301
commit
f8db89c889
8 changed files with 135 additions and 156 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/assets/scss/modules/visual/basicInfoMain.scss
  2. 2
      src/views/modules/base/community/buildTable.vue
  3. 2
      src/views/modules/base/community/communityTable.vue
  4. 2
      src/views/modules/base/community/roomTable.vue
  5. 2
      src/views/modules/visual/basicinfo/basicInfoCommunity.vue
  6. 126
      src/views/modules/visual/basicinfo/cpts/topic-info.vue
  7. 3
      src/views/modules/visual/communityGovern/cpt/project-info.vue
  8. 24
      src/views/modules/visual/heart/index.vue

6
src/assets/scss/modules/visual/basicInfoMain.scss
View File

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

2
src/views/modules/base/community/buildTable.vue
View File

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

2
src/views/modules/base/community/communityTable.vue
View File

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

2
src/views/modules/base/community/roomTable.vue
View File

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

2
src/views/modules/visual/basicinfo/basicInfoCommunity.vue
View File

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

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

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

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

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

24
src/views/modules/visual/heart/index.vue
View File

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

Write Preview
Loading…
Cancel
Save