elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

改bug中

feature
dai 3 years ago
parent
f935f496cd
commit
6fd5477a5e
5 changed files with 456 additions and 274 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 188
      src/views/dataBoard/renfang/cpts/rkfx.vue
  2. 6
      src/views/dataBoard/renfang/resi/list.vue
  3. 2
      src/views/dataBoard/renfang/warn/resi.vue
  4. 80
      src/views/main-navbar.vue
  5. 2
      src/views/modules/shequ/chaxun.vue

188
src/views/dataBoard/renfang/cpts/rkfx.vue
View File

@ -17,6 +17,7 @@
class="legend-row"
:key="'pie' + item.name"
v-for="item in pieData"
@click="handleClickItem(item)"
>
<div class="name">{{ item.name }}</div>
<div class="content">
@ -122,6 +123,19 @@ export default {
this.getPie();
},
handleClickItem(item) {
const { type, name } = item;
this.$router.push({
path: "/dataBoard/renfang/resi-list",
query: {
org_id: this.orgId,
type,
type_category: this.currentTab,
type_name: name,
},
});
},
// 获取房屋总数等
async getInfo() {
const url = "resident_analyze";
@ -176,50 +190,166 @@ export default {
const { currentTab, info } = this;
if (currentTab == "性别") {
this.pieData = [
{ value: info.male_count, name: "男" },
{ value: info.female_count, name: "女" },
{
value: info.male_count,
type: "male_count",
name: "男性",
},
{
value: info.female_count,
type: "female_count",
name: "女性",
},
];
} else if (currentTab == "户籍") {
this.pieData = [
{ value: info.local_count, name: "本地户籍" },
{ value: info.field_count, name: "外地户籍" },
{
value: info.local_count,
type: "local_count",
name: "本地户籍",
},
{
value: info.field_count,
type: "field_count",
name: "外地户籍",
},
];
} else if (currentTab == "人户状况") {
this.pieData = [
{ value: info.resi_y_house_y_count, name: "人户一致" },
{ value: info.resi_y_house_n_count, name: "人在户不在" },
{ value: info.resi_n_house_y_count, name: "户在人不在" },
{
value: info.resi_y_house_y_count,
type: "resi_y_house_y_count",
name: "人户一致",
},
{
value: info.resi_y_house_n_count,
type: "resi_y_house_n_count",
name: "人在户不在",
},
{
value: info.resi_n_house_y_count,
type: "resi_n_house_y_count",
name: "户在人不在",
},
];
} else if (currentTab == "年龄") {
this.pieData = [
{ value: info.age50_count, name: "50岁以下" },
{ value: info.age5059_count, name: "50-59岁" },
{ value: info.age6069_count, name: "60-69岁" },
{ value: info.age7079_count, name: "70-79岁" },
{ value: info.age80_count, name: "80岁以上" },
{
value: info.age50_count,
type: "age50_count",
name: "50岁以下",
},
{
value: info.age5059_count,
type: "age5059_count",
name: "50-59岁",
},
{
value: info.age6069_count,
type: "age6069_count",
name: "60-69岁",
},
{
value: info.age7079_count,
type: "age7079_count",
name: "70-79岁",
},
{
value: info.age80_count,
type: "age80_count",
name: "80岁以上",
},
];
} else if (currentTab == "志愿者类别") {
this.pieData = [
{ value: info.culture_count, name: "文化队伍" },
{ value: info.committee_count, name: "楼委会" },
{ value: info.capable_count, name: "能人达人" },
{ value: info.friend_count, name: "老友俱乐部" },
{ value: info.agent_count, name: "代办员" },
{ value: info.mediator_count, name: "调解员" },
{ value: info.collector_count, name: "采集员" },
{ value: info.security_count, name: "治安巡逻员" },
{ value: info.party_mem_count, name: "党员中心户" },
{
value: info.culture_count,
type: "culture_count",
name: "文化队伍",
},
{
value: info.committee_count,
type: "committee_count",
name: "楼委会",
},
{
value: info.capable_count,
type: "capable_count",
name: "能人达人",
},
{
value: info.friend_count,
type: "friend_count",
name: "老友俱乐部",
},
{
value: info.agent_count,
type: "agent_count",
name: "代办员",
},
{
value: info.mediator_count,
type: "mediator_count",
name: "调解员",
},
{
value: info.collector_count,
type: "collector_count",
name: "采集员",
},
{
value: info.security_count,
type: "security_count",
name: "治安巡逻员",
},
{
value: info.party_mem_count,
type: "party_mem_count",
name: "党员中心户",
},
];
} else if (currentTab == "党员文化程度") {
this.pieData = [
{ value: info.primary_count, name: "小学及文盲" },
{ value: info.junior_high_count, name: "初中" },
{ value: info.second_speci_count, name: "中专" },
{ value: info.high_school_count, name: "高中" },
{ value: info.junior_college_count, name: "大专" },
{ value: info.undergrad_count, name: "本科" },
{ value: info.master_count, name: "硕士" },
{ value: info.doctor_count, name: "博士" },
{
value: info.primary_count,
type: "primary_count",
name: "小学及文盲",
},
{
value: info.junior_high_count,
type: "junior_high_count",
name: "初中",
},
{
value: info.second_speci_count,
type: "second_speci_count",
name: "中专",
},
{
value: info.high_school_count,
type: "high_school_count",
name: "高中",
},
{
value: info.junior_college_count,
type: "junior_college_count",
name: "大专",
},
{
value: info.undergrad_count,
type: "undergrad_count",
name: "本科",
},
{
value: info.master_count,
type: "master_count",
name: "硕士",
},
{
value: info.doctor_count,
type: "doctor_count",
name: "博士",
},
];
} else if (currentTab == "下级人口分布") {
this.pieData = [];

6
src/views/dataBoard/renfang/resi/list.vue
View File

@ -139,9 +139,13 @@ export default {
};
},
mounted() {
activated() {
this.org_id = getQueryPara("org_id");
this.resiType = getQueryPara("type");
const type_name = getQueryPara("type_name");
this.breadList[1].meta.title = type_name + "居民列表";
this.tableTitle = type_name + "居民列表";
this.getList();
},

2
src/views/dataBoard/renfang/warn/resi.vue
View File

@ -123,7 +123,7 @@ export default {
};
},
mounted() {
activated() {
this.getList();
},

80
src/views/main-navbar.vue
View File

@ -23,7 +23,9 @@
<el-menu-item
v-if="false"
index="1"
@click="$store.state.sidebarFold = !$store.state.sidebarFold"
@click="
$store.state.sidebarFold = !$store.state.sidebarFold
"
>
<svg
class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--switch"
@ -34,7 +36,10 @@
</el-menu-item>
<el-menu-item v-if="true" index="2" @click="refresh()">
<svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true">
<svg
class="icon-svg aui-navbar__icon-menu"
aria-hidden="true"
>
<use xlink:href="#icon-sync"></use>
</svg>
</el-menu-item>
@ -45,19 +50,28 @@
mode="horizontal"
style="min-width: 180px"
>
<el-menu-item index="3" @click="$router.push({ name: 'dataBoard' })">
<el-menu-item
index="3"
@click="$router.push({ name: 'dataBoard' })"
>
<div class="nav-item">
<img src="~@/assets/images/main/nav-sjdb.png" />
<span>数据看板</span>
</div>
</el-menu-item>
<el-menu-item index="3" @click="$router.push({ name: 'dataBoard' })">
<el-menu-item
index="3"
@click="$router.push({ name: 'dataBoard' })"
>
<div class="nav-item">
<img src="~@/assets/images/main/nav-zntb.png" />
<span>智能填报</span>
</div>
</el-menu-item>
<el-menu-item index="3" @click="$router.push({ name: 'dataBoard' })">
<el-menu-item
index="3"
@click="$router.push({ name: 'dataBoard' })"
>
<div class="nav-item">
<img src="~@/assets/images/main/nav-sjjy.png" />
<span>数据校验</span>
@ -77,7 +91,10 @@
</el-menu-item>
<el-menu-item index="2" @click="toRemindPage">
<div class="img-nav" :class="{ 'z-on': notice }">
<div class="img-nav" :class="{ 'z-on': false }">
<span class="corner-dot" v-if="unreadMsgNum > 0">{{
unreadMsgNum
}}</span>
<img src="~@/assets/images/main/hint.png" />
</div>
</el-menu-item>
@ -89,17 +106,24 @@
v-if="$store.state.user.gender === '2'"
src="~@/assets/images/main/default-avatar.png"
/>
<img v-else src="~@/assets/images/main/default-avatar.png" />
<img
v-else
src="~@/assets/images/main/default-avatar.png"
/>
<span>{{ $store.state.user.realName }}</span>
<i class="el-icon-arrow-down"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="updatePasswordHandle()">{{
<el-dropdown-item
@click.native="updatePasswordHandle()"
>{{
$t("updatePassword.title")
}}</el-dropdown-item>
<el-dropdown-item @click.native="logoutHandle()">{{
$t("logout")
}}</el-dropdown-item>
}}</el-dropdown-item
>
<el-dropdown-item
@click.native="logoutHandle()"
>{{ $t("logout") }}</el-dropdown-item
>
</el-dropdown-menu>
</el-dropdown>
</el-menu-item>
@ -132,7 +156,7 @@ export default {
updatePassowrdVisible: false,
customerName: "",
notice: false,
unreadMsgNum: 0,
};
},
components: {
@ -185,7 +209,8 @@ export default {
},
changeCustomerName(customerName) {
this.customerName =
localStorage.getItem("customerName") || "党建引领基层治理互联管理平台";
localStorage.getItem("customerName") ||
"党建引领基层治理互联管理平台";
},
// 全屏
fullscreenHandle() {
@ -219,7 +244,8 @@ export default {
.then(() => {
//关闭所有标签页
// tabs, 关闭全部
this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
this.$store.state.contentTabs =
this.$store.state.contentTabs.filter(
(item) => item.name === "home"
);
@ -258,7 +284,7 @@ export default {
const { data, code, msg } = await requestGet(url, {});
if (code === 0) {
console.log("列表请求成功！！！！！！！！！！！！！！");
this.notice = data.unreadNum > 0;
this.unreadMsgNum = data.unreadNum;
} else {
}
},
@ -271,4 +297,26 @@ export default {
height: 50px;
background: #eeeeee;
}
.img-nav {
position: relative;
.corner-dot {
position: absolute;
z-index: 100;
display: block;
top: -5px;
right: -5px;
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #ffffff;
line-height: 16px;
min-width: 16px;
height: 16px;
background: #ff4d4f;
border-radius: 100%;
border: 1px solid #ffffff;
text-align: center;
}
}
</style>

2
src/views/modules/shequ/chaxun.vue
View File

@ -587,7 +587,7 @@ export default {
}
},
},
mounted() {
activated() {
this.getApiData();
this.firstSearch();

Write Preview
Loading…
Cancel
Save