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

bugs

feature
tianq 3 years ago
parent
a8142e6e0b
commit
4462b0aeec
5 changed files with 238 additions and 292 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. 7
      src/views/dataBoard/renfang/index.vue
  2. 259
      src/views/dataBoard/renfang/resi/class.vue
  3. 245
      src/views/main-navbar.vue
  4. 10
      src/views/modules/home/index.vue
  5. 7
      src/views/modules/shequ/chaxun.vue

7
src/views/dataBoard/renfang/index.vue
View File

@ -292,7 +292,7 @@
<div class="list" v-if="resiCategoryData.length > 0"> <div class="list" v-if="resiCategoryData.length > 0">
<div <div
class="item" class="item"
@click="toResiClassPage(item.code, item.name)" @click="toResiClassPage('normal',item.code, item.name)"
:key="item.code + index" :key="item.code + index"
v-for="(item, index) in resiCategoryData" v-for="(item, index) in resiCategoryData"
> >
@ -332,7 +332,7 @@
v-if="resiCategoryForecastData.length > 0" v-if="resiCategoryForecastData.length > 0"
> >
<div <div
@click="toResiClassPage(item.code, item.name)" @click="toResiClassPage('ai',item.code, item.name)"
class="item" class="item"
:key="item.code + index" :key="item.code + index"
v-for="( v-for="(
@ -561,13 +561,14 @@ export default {
this.loading = true; this.loading = true;
}, },
toResiClassPage(type_id = "", type_name) { toResiClassPage(pageType,type_id = "", type_name) {
this.$router.push({ this.$router.push({
path: "/dataBoard/renfang/resi-class", path: "/dataBoard/renfang/resi-class",
query: { query: {
org_id: this.orgId, org_id: this.orgId,
type_id, type_id,
type_name, type_name,
pageType
}, },
}); });
}, },

259
src/views/dataBoard/renfang/resi/class.vue
View File

@ -1,35 +1,16 @@
<template> <template>
<div class="g-pgi"> <div class="g-pgi">
<!-- 组织路由 --> <!-- 组织路由 -->
<cpt-bread <cpt-bread :separator="'/'" @tap="handleClickBreadItem" :breadList="breadList"></cpt-bread>
:separator="'/'"
@tap="handleClickBreadItem"
:breadList="breadList"
></cpt-bread>
<div class="m-title"> <div class="m-title">
<img <img class="title_img" src="@/assets/images/index/list-logo.png" alt />
class="title_img"
src="@/assets/images/index/list-logo.png"
alt
/>
<div class="tip_title">{{ tableTitle }}</div> <div class="tip_title">{{ tableTitle }}</div>
<div class="title_line"></div> <div class="title_line"></div>
<div class="second-select" v-if="type_id == 'special_popu'"> <div class="second-select" v-if="type_id == 'special_popu'">
<el-select <el-select v-model="subclassId" :popper-append-to-body="false" placeholder="请选择">
v-model="subclassId" <el-option v-for="item in subclassList" :key="item.value" :label="item.label" :value="item.value" @click.native="handleChangeDate(item.value)"></el-option>
:popper-append-to-body="false"
placeholder="请选择"
>
<el-option
v-for="item in subclassList"
:key="item.value"
:label="item.label"
:value="item.value"
@click.native="handleChangeDate(item.value)"
>
</el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
@ -47,56 +28,51 @@
></cpt-tb> ></cpt-tb>
</div> </div>
<resi-details <resi-details @close="displayedResiId = ''" :resi-id="displayedResiId" v-if="displayedResiId" />
@close="displayedResiId = ''"
:resi-id="displayedResiId"
v-if="displayedResiId"
/>
</div> </div>
</template> </template>
<script> <script>
import cptTb from "@/views/dataBoard/cpts/tb"; import cptTb from '@/views/dataBoard/cpts/tb';
import cptBread from "@/views/dataBoard/renfang/cpts/bread"; import cptBread from '@/views/dataBoard/renfang/cpts/bread';
import resiDetails from "@/views/dataBoard/cpts/resi-details"; import resiDetails from '@/views/dataBoard/cpts/resi-details';
import { requestPostBi } from "@/js/dai/request-bipass"; import { requestPostBi } from '@/js/dai/request-bipass';
import getQueryPara from "dai-js/modules/getQueryPara"; import getQueryPara from 'dai-js/modules/getQueryPara';
export default { export default {
name: "resi-list", name: 'resi-list',
components: { components: {
cptTb, cptTb,
cptBread, cptBread,
resiDetails, resiDetails
}, },
data() { data() {
return { return {
breadList: [ breadList: [
{ {
type: "back", type: 'back',
meta: { meta: {
title: "人房总览", title: '人房总览'
}, }
}, },
{ {
meta: { meta: {
title: "居民类别", title: '居民类别'
}, }
}, }
], ],
tableTitle: "居民类别", tableTitle: '居民类别',
searchName: "", searchName: '',
pageType: '',
orgLevel: "", orgLevel: '',
org_id: "", org_id: '',
type_id: "", // 居民类别 type_id: '', // 居民类别
type_name: '',
loading: true, loading: true,
pageSize: pageSize: parseInt(localStorage.getItem('dataBoard_PageSize')) || 20,
parseInt(localStorage.getItem("dataBoard_PageSize")) || 20,
pageNo: 1, pageNo: 1,
total: 0, total: 0,
srcTableData: [], srcTableData: [],
@ -104,73 +80,65 @@ export default {
colList: [ colList: [
{ {
align: "left", align: 'left',
width: "5%", width: '5%'
}, },
{ {
align: "left", align: 'left',
width: "10%", width: '10%'
}, },
{ {
align: "left", align: 'left',
width: "20%", width: '20%'
}, },
{ {
align: "left", align: 'left',
width: "20%", width: '20%'
}, },
{ {
align: "left", align: 'left',
width: "15%", width: '15%'
}, },
{ {
align: "left", align: 'left',
width: "10%", width: '10%'
}, },
{ {
align: "left", align: 'left',
width: "5%", width: '5%'
}, },
{ {
align: "left", align: 'left',
width: "10%", width: '10%'
}, },
{ {
align: "left", align: 'left',
width: "10%", width: '10%'
}, }
], ],
header: [ header: ['序号', '姓名', '所属网格', '所属房屋', '联系电话', '证件号', '性别', '出生日期', '操作'],
"序号",
"姓名",
"所属网格",
"所属房屋",
"联系电话",
"证件号",
"性别",
"出生日期",
"操作",
],
displayedResiId: "", displayedResiId: '',
subclassList: [], subclassList: [],
subclassId: "", subclassId: ''
}; };
}, },
activated() { activated() {
this.org_id = getQueryPara("org_id"); this.org_id = getQueryPara('org_id');
this.type_id = getQueryPara("type_id"); this.type_id = getQueryPara('type_id');
const type_name = getQueryPara("type_name"); this.pageType = getQueryPara('pageType');
this.breadList[1].meta.title = type_name + "居民列表"; this.type_name = getQueryPara('type_name');
this.tableTitle = type_name + "居民列表"; const type_name = getQueryPara('type_name');
this.breadList[1].meta.title = type_name + '居民列表';
this.tableTitle = type_name + '居民列表';
this.pageNo = 1; this.pageNo = 1;
this.getList(); this.getList();
this.getCount(); this.getCount();
if (this.type_id == "special_popu") { if (this.type_id == 'special_popu') {
this.getSubclass(); this.getSubclass();
} }
}, },
@ -180,12 +148,12 @@ export default {
this.pageNo = 1; this.pageNo = 1;
this.getList(); this.getList();
this.getCount(); this.getCount();
}, }
}, },
methods: { methods: {
handleClickBreadItem({ item }) { handleClickBreadItem({ item }) {
if (item.type == "back") { if (item.type == 'back') {
this.$router.back(); this.$router.back();
} }
}, },
@ -203,25 +171,25 @@ export default {
}, },
handleSizeChange(pageSize) { handleSizeChange(pageSize) {
localStorage.setItem("dataBoard_PageSize", pageSize); localStorage.setItem('dataBoard_PageSize', pageSize);
this.pageSize = pageSize; this.pageSize = pageSize;
this.getList(); this.getList();
}, },
async getSubclass() { async getSubclass() {
console.log("=================getSubclass"); console.log('=================getSubclass');
const { org_id, type_id } = this; const { org_id, type_id } = this;
this.loading = true; this.loading = true;
const url = "special_type_list"; const url = 'special_type_list';
const { data, code, msg } = await requestPostBi( const { data, code, msg } = await requestPostBi(
url, url,
{ {
queryParam: { queryParam: {
org_id, org_id,
type_id, type_id
}, }
}, },
{ {
// mockId: 62648939, // mockId: 62648939,
@ -234,7 +202,7 @@ export default {
this.subclassList = data.map((item, index) => { this.subclassList = data.map((item, index) => {
return { return {
label: item.type_name, label: item.type_name,
value: item.type_id, value: item.type_id
}; };
}); });
} else { } else {
@ -243,20 +211,33 @@ export default {
}, },
async getList() { async getList() {
console.log('dddddddddddddddddddd', this.type_name);
const { org_id, type_id, subclassId, pageNo, pageSize } = this; const { org_id, type_id, subclassId, pageNo, pageSize } = this;
this.loading = true; this.loading = true;
let url = '';
const url = "resident_class_list"; let queryParam = {};
if (this.pageType == 'normal') {
url = 'resident_class_list';
queryParam = {
org_id,
type_id: subclassId || type_id,
pageNo,
pageSize
};
} else {
url = 'resident_class_predict_list';
queryParam = {
org_id,
resi_class_name: this.type_name,
page_num:pageNo,
page_size:pageSize
};
}
const { data, code, msg } = await requestPostBi( const { data, code, msg } = await requestPostBi(
url, url,
{ {
queryParam: { queryParam
org_id,
type_id: subclassId || type_id,
pageNo,
pageSize,
},
}, },
{ {
// mockId: 60069169, // mockId: 60069169,
@ -268,21 +249,37 @@ export default {
if (code === 0) { if (code === 0) {
this.srcTableData = data; this.srcTableData = data;
// this.total = data.total; // this.total = data.total;
if (this.pageType == 'normal') {
this.list = data.map((item, index) => { this.list = data.map((item, index) => {
return [ return [
index + 1, index + 1,
item.user_name ? item.user_name : "--", item.user_name ? item.user_name : '--',
item.grid ? item.grid : "--", item.grid ? item.grid : '--',
item.house ? item.house : "--", item.house ? item.house : '--',
item.telephone ? item.telephone : "--", item.telephone ? item.telephone : '--',
item.idcard ? item.idcard : "--", item.idcard ? item.idcard : '--',
item.gender ? item.gender : "--", item.gender ? item.gender : '--',
item.birthday ? item.birthday : "--", item.birthday ? item.birthday : '--',
{ type: "operate", list: ["查看"] }, { type: 'operate', list: ['查看'] }
]; ];
}); });
}else{
this.list = data.map((item, index) => {
return [
index + 1,
item.name ? item.name : '--',
item.grid ? item.grid : '--',
item.house ? item.house : '--',
item.telephone ? item.telephone : '--',
item.idcard ? item.idcard : '--',
item.gender ? item.gender : '--',
item.birthday ? item.birthday : '--',
{ type: 'operate', list: ['查看'] }
];
});
}
} else { } else {
this.$message.error(msg); this.$message.error(msg);
} }
@ -291,17 +288,31 @@ export default {
async getCount() { async getCount() {
const { org_id, type_id, subclassId, pageNo, pageSize } = this; const { org_id, type_id, subclassId, pageNo, pageSize } = this;
const url = "resident_class_list_total"; let url = '';
let queryParam = {};
if (this.pageType == 'normal') {
url = 'resident_class_list_total';
queryParam = {
org_id,
type_id: subclassId || type_id,
pageNo,
pageSize
};
} else {
url = 'resident_class_predict_total';
queryParam = {
org_id,
resi_class_name: this.type_name,
page_num:pageNo,
page_size:pageSize
};
}
const { data, code, msg } = await requestPostBi( const { data, code, msg } = await requestPostBi(
url, url,
{ {
queryParam: { queryParam
org_id,
type_id: subclassId || type_id,
pageNo,
pageSize,
},
}, },
{ {
// mockId: 63070913, // mockId: 63070913,
@ -313,12 +324,12 @@ export default {
} else { } else {
this.$message.error(msg); this.$message.error(msg);
} }
}, }
}, },
destroyed() { destroyed() {
console.log("我已经离开了！"); console.log('我已经离开了！');
}, }
}; };
</script> </script>

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

@ -2,76 +2,38 @@
<div> <div>
<nav v-if="showHeader" class="aui-navbar"> <nav v-if="showHeader" class="aui-navbar">
<div class="aui-navbar__header"> <div class="aui-navbar__header">
<div class="aui-navbar__logo"> <div class="aui-navbar__logo"><img v-if="$store.state.user.headUrl" :src="$store.state.user.headUrl" /></div>
<img
v-if="$store.state.user.headUrl"
:src="$store.state.user.headUrl"
/>
</div>
<h1 class="aui-navbar__brand"> <h1 class="aui-navbar__brand">
<a class="aui-navbar__brand-lg" href="javascript:;">{{ <a class="aui-navbar__brand-lg" href="javascript:;">{{ this.$store.state.user.agencyName }}</a>
this.$store.state.user.agencyName <a class="aui-navbar__brand-mini" href="javascript:;">{{ this.$store.state.user.agencyName.slice(0, 2) }}</a>
}}</a>
<a class="aui-navbar__brand-mini" href="javascript:;">{{
this.$store.state.user.agencyName.slice(0, 2)
}}</a>
</h1> </h1>
</div> </div>
<div class="aui-navbar__body"> <div class="aui-navbar__body">
<el-menu class="aui-navbar__menu mr-auto" mode="horizontal"> <el-menu class="aui-navbar__menu mr-auto" mode="horizontal">
<el-menu-item <el-menu-item v-if="false" index="1" @click="$store.state.sidebarFold = !$store.state.sidebarFold">
v-if="false" <svg class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--switch" aria-hidden="true"><use xlink:href="#icon-outdent"></use></svg>
index="1"
@click="
$store.state.sidebarFold = !$store.state.sidebarFold
"
>
<svg
class="icon-svg aui-navbar__icon-menu aui-navbar__icon-menu--switch"
aria-hidden="true"
>
<use xlink:href="#icon-outdent"></use>
</svg>
</el-menu-item> </el-menu-item>
<el-menu-item v-if="true" index="2" @click="refresh()"> <el-menu-item v-if="true" index="2" @click="refresh()">
<svg <svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true"><use xlink:href="#icon-sync"></use></svg>
class="icon-svg aui-navbar__icon-menu"
aria-hidden="true"
>
<use xlink:href="#icon-sync"></use>
</svg>
</el-menu-item> </el-menu-item>
</el-menu> </el-menu>
<el-menu <el-menu class="aui-navbar__menu" mode="horizontal" style="min-width: 180px">
class="aui-navbar__menu" <el-menu-item index="3" @click="handleCLickNav">
mode="horizontal"
style="min-width: 180px"
>
<el-menu-item
index="3"
@click="handleCLickNav"
>
<div class="nav-item"> <div class="nav-item">
<img src="~@/assets/images/main/nav-sjdb.png" /> <img src="~@/assets/images/main/nav-sjdb.png" />
<span>数据看板</span> <span>数据看板</span>
</div> </div>
</el-menu-item> </el-menu-item>
<el-menu-item <el-menu-item index="3" @click="$router.push({ name: 'dataBoard' })">
index="3"
@click="$router.push({ name: 'dataBoard' })"
>
<div class="nav-item"> <div class="nav-item">
<img src="~@/assets/images/main/nav-zntb.png" /> <img src="~@/assets/images/main/nav-zntb.png" />
<span>智能填报</span> <span>智能填报</span>
</div> </div>
</el-menu-item> </el-menu-item>
<el-menu-item <el-menu-item index="3" @click="$router.push({ name: 'dataBoard' })">
index="3"
@click="$router.push({ name: 'dataBoard' })"
>
<div class="nav-item"> <div class="nav-item">
<img src="~@/assets/images/main/nav-sjjy.png" /> <img src="~@/assets/images/main/nav-sjjy.png" />
<span>数据校验</span> <span>数据校验</span>
@ -79,174 +41,143 @@
</el-menu-item> </el-menu-item>
</el-menu> </el-menu>
<el-menu <el-menu class="aui-navbar__menu" mode="horizontal" style="min-width: 180px">
class="aui-navbar__menu"
mode="horizontal"
style="min-width: 180px"
>
<el-menu-item index="3" @click="toImportRecord"> <el-menu-item index="3" @click="toImportRecord">
<div class="img-nav"> <div class="img-nav">
<div class="img-wrap"> <div class="img-wrap"><img src="~@/assets/images/main/time.png" /></div>
<img src="~@/assets/images/main/time.png" />
</div>
</div> </div>
</el-menu-item> </el-menu-item>
<el-menu-item index="2" @click="toNoticePage"> <el-menu-item index="2" @click="toNoticePage">
<div class="img-nav" :class="{ 'z-on': false }"> <div class="img-nav" :class="{ 'z-on': false }">
<span class="corner-dot" v-if="unreadMsgNum > 0">{{ <span class="corner-dot" v-if="unreadMsgNum > 0">{{ unreadMsgNum }}</span>
unreadMsgNum <div class="img-wrap"><img src="~@/assets/images/main/hint.png" /></div>
}}</span>
<div class="img-wrap">
<img src="~@/assets/images/main/hint.png" />
</div>
</div> </div>
</el-menu-item> </el-menu-item>
<el-menu-item index="1" class="aui-navbar__avatar"> <el-menu-item index="1" class="aui-navbar__avatar">
<el-dropdown placement="bottom" :show-timeout="0"> <el-dropdown placement="bottom" :show-timeout="0">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<img <img v-if="$store.state.user.gender === '2'" src="~@/assets/images/main/default-avatar.png" />
v-if="$store.state.user.gender === '2'" <img v-else src="~@/assets/images/main/default-avatar.png" />
src="~@/assets/images/main/default-avatar.png"
/>
<img
v-else
src="~@/assets/images/main/default-avatar.png"
/>
<span>{{ $store.state.user.realName }}</span> <span>{{ $store.state.user.realName }}</span>
<i class="el-icon-arrow-down"></i> <i class="el-icon-arrow-down"></i>
</span> </span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item <el-dropdown-item @click.native="updatePasswordHandle()">{{ $t('updatePassword.title') }}</el-dropdown-item>
@click.native="updatePasswordHandle()" <el-dropdown-item @click.native="logoutHandle()">{{ $t('logout') }}</el-dropdown-item>
>{{
$t("updatePassword.title")
}}</el-dropdown-item
>
<el-dropdown-item
@click.native="logoutHandle()"
>{{ $t("logout") }}</el-dropdown-item
>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</el-menu-item> </el-menu-item>
</el-menu> </el-menu>
</div> </div>
<!-- 弹窗, 修改密码 --> <!-- 弹窗, 修改密码 -->
<update-password-work <update-password-work v-if="updatePassowrdVisible" ref="updatePassowrd"></update-password-work>
v-if="updatePassowrdVisible"
ref="updatePassowrd"
></update-password-work>
</nav> </nav>
<nav v-else class="aui-navbar main-line"></nav> <nav v-else class="aui-navbar main-line"></nav>
<div <div class="m-newMsg" v-if="noticeList.length > 0 && displayedNoticeList">
class="m-newMsg"
v-if="noticeList.length > 0 && displayedNoticeList"
>
<div class="title">新提醒</div> <div class="title">新提醒</div>
<div class="btn-close" @click="displayedNoticeList = false"> <div class="btn-close" @click="displayedNoticeList = false"><img src="~@/assets/images/main/close.png" /></div>
<img src="~@/assets/images/main/close.png" />
</div>
<div class="row"> <div class="row">
<span class="date">{{ noticeList[0].createdTime }}</span> <span class="date">{{ noticeList[0].createdTime }}</span>
<i class="i-new">NEW</i> <i class="i-new">NEW</i>
</div> </div>
<div class="cnt" @click="toNoticePage"> <div class="cnt" @click="toNoticePage()">{{ noticeList[0].content }}</div>
{{ noticeList[0].content }}
</div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { messages } from "@/i18n"; import { messages } from '@/i18n';
import screenfull from "screenfull"; import screenfull from 'screenfull';
import UpdatePasswordWork from "./main-navbar-update-password-work"; import UpdatePasswordWork from './main-navbar-update-password-work';
import { clearLoginInfo } from "@/utils"; import { clearLoginInfo } from '@/utils';
import { requestPost, requestGet } from "@/js/dai/request"; import { requestPost, requestGet } from '@/js/dai/request';
import nextTick from "dai-js/tools/nextTick"; import nextTick from 'dai-js/tools/nextTick';
export default { export default {
inject: ["refresh"], inject: ['refresh'],
data() { data() {
return { return {
showHeader: true, showHeader: true,
i18nMessages: messages, i18nMessages: messages,
updatePassowrdVisible: false, updatePassowrdVisible: false,
customerName: "", customerName: '',
unreadMsgNum: 0, unreadMsgNum: 0,
noticeList: [], noticeList: [],
displayedNoticeList: true, displayedNoticeList: true
}; };
}, },
components: { components: {
UpdatePasswordWork, UpdatePasswordWork
}, },
created() { created() {
let platformToken = localStorage.getItem("showHeader") || ""; let platformToken = localStorage.getItem('showHeader') || '';
if ( if (typeof platformToken !== 'undefined' && platformToken !== 'undefined' && platformToken !== '') {
typeof platformToken !== "undefined" &&
platformToken !== "undefined" &&
platformToken !== ""
) {
this.showHeader = false; this.showHeader = false;
} }
this.changeCustomerName(); this.changeCustomerName();
console.log("=============================", this.userType); console.log('=============================', this.userType);
this.pollGetNoticeData(); this.pollGetNoticeData();
}, },
computed: { computed: {
userType() { userType() {
return localStorage.getItem("userType"); return localStorage.getItem('userType');
}, }
}, },
methods: { methods: {
async readClearOne(item) {
console.log('item', item);
const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}`;
const { data, code, msg } = await requestPost(url);
if (code == 0) {
} else if (code >= 8000) {
this.$message.error(msg);
}
},
toNoticePage() { toNoticePage() {
this.displayedNoticeList = false; this.displayedNoticeList = false;
this.$router.replace("/main/home-notice"); this.readClearOne(this.noticeList[0]);
this.$router.replace('/main/home-notice');
}, },
toImportRecord(){ toImportRecord() {
this.$router.replace("/main/importRecord-index"); this.$router.replace('/main/importRecord-index');
}, },
toIndexPage() { toIndexPage() {
this.$router.replace("/index"); this.$router.replace('/index');
}, },
// 通过menuId与动态(菜单)路由进行匹配跳转至指定路由 // 通过menuId与动态(菜单)路由进行匹配跳转至指定路由
gotoRouteHandle(menuId, idx) { gotoRouteHandle(menuId, idx) {
var route = window.SITE_CONFIG["dynamicMenuRoutes"].filter( var route = window.SITE_CONFIG['dynamicMenuRoutes'].filter(item => item.meta.menuId === menuId)[0];
(item) => item.meta.menuId === menuId
)[0];
if (route) { if (route) {
if (route.meta.iframeURL.endsWith("【跳转新页面】")) { if (route.meta.iframeURL.endsWith('【跳转新页面】')) {
return window.open(route.meta.iframeURL.slice(0, -7)); return window.open(route.meta.iframeURL.slice(0, -7));
} else { } else {
this.$router.push({ name: route.name }); this.$router.push({ name: route.name });
} }
} }
this.$store.state.LevelOneMenuActiveName = menuId; this.$store.state.LevelOneMenuActiveName = menuId;
this.$store.state.sidebarActiveSubMenuList = this.$store.state.sidebarActiveSubMenuList = this.$store.state.sidebarMenuList[idx].children || [];
this.$store.state.sidebarMenuList[idx].children || []; console.log('this.$store.state', this.$store.state);
console.log("this.$store.state", this.$store.state); console.log('this.$route', this.$route);
console.log("this.$route", this.$route);
}, },
changeCustomerName(customerName) { changeCustomerName(customerName) {
this.customerName = this.customerName = localStorage.getItem('customerName') || '党建引领基层治理互联管理平台';
localStorage.getItem("customerName") ||
"党建引领基层治理互联管理平台";
}, },
// 全屏 // 全屏
fullscreenHandle() { fullscreenHandle() {
if (!screenfull.enabled) { if (!screenfull.enabled) {
return this.$message({ return this.$message({
message: this.$t("fullscreen.prompt"), message: this.$t('fullscreen.prompt'),
type: "warning", type: 'warning',
duration: 500, duration: 500
}); });
} }
screenfull.toggle(); screenfull.toggle();
@ -260,25 +191,18 @@ export default {
}, },
// 退出 // 退出
logoutHandle() { logoutHandle() {
this.$confirm( this.$confirm(this.$t('prompt.info', { handle: this.$t('logout') }), this.$t('prompt.title'), {
this.$t("prompt.info", { handle: this.$t("logout") }), confirmButtonText: this.$t('confirm'),
this.$t("prompt.title"), cancelButtonText: this.$t('cancel'),
{ type: 'warning'
confirmButtonText: this.$t("confirm"), })
cancelButtonText: this.$t("cancel"),
type: "warning",
}
)
.then(() => { .then(() => {
//关闭所有标签页 //关闭所有标签页
// tabs, 关闭全部 // tabs, 关闭全部
this.$store.state.contentTabs = this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name === 'home');
this.$store.state.contentTabs.filter(
(item) => item.name === "home"
);
this.$http this.$http
.post("/auth/login/logout") .post('/auth/login/logout')
.then(({ data: res }) => { .then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
//别处登陆时 退出不提示 直接跳登陆页即可 //别处登陆时 退出不提示 直接跳登陆页即可
@ -288,7 +212,7 @@ export default {
} }
clearLoginInfo(); clearLoginInfo();
this.$router.push({ name: "login" }); this.$router.push({ name: 'login' });
// if (localStorage.getItem('userType') === 'work') { // if (localStorage.getItem('userType') === 'work') {
// this.$router.push({ name: 'loginWork' }) // this.$router.push({ name: 'loginWork' })
// } else { // } else {
@ -308,16 +232,16 @@ export default {
// 智能提醒数据 // 智能提醒数据
async getNoticeData() { async getNoticeData() {
const url = "/message/intelligentMessage/msg/notice"; const url = '/message/intelligentMessage/msg/notice';
const { data, code, msg } = await requestGet(url, {}); const { data, code, msg } = await requestGet(url, {});
if (code === 0) { if (code === 0) {
console.log("列表请求成功！！！！！！！！！！！！！！"); console.log('列表请求成功！！！！！！！！！！！！！！');
if (data.unreadNum > 0 && this.unreadMsgNum < data.unreadNum) { if (data.unreadNum > 0 && this.unreadMsgNum < data.unreadNum) {
this.getNoticeList(); this.getNoticeList();
this.displayedNoticeList = true; this.displayedNoticeList = true;
setTimeout(()=>{ setTimeout(() => {
this.displayedNoticeList = false; this.displayedNoticeList = false;
},5000) }, 5000);
} }
this.unreadMsgNum = data.unreadNum; this.unreadMsgNum = data.unreadNum;
} else { } else {
@ -326,11 +250,11 @@ export default {
//加载组织数据 //加载组织数据
async getNoticeList() { async getNoticeList() {
const url = "/message/intelligentMessage/page"; const url = '/message/intelligentMessage/page';
let params = { let params = {
page: this.pageNo, page: this.pageNo,
limit: this.pageSize, limit: this.pageSize,
readFlag: 0, readFlag: 0
}; };
const { data, code, msg } = await requestGet(url, params); const { data, code, msg } = await requestGet(url, params);
@ -341,19 +265,19 @@ export default {
this.$message.error(msg); this.$message.error(msg);
} }
}, },
handleCLickNav(){ handleCLickNav() {
let routeData = this.$router.resolve({ let routeData = this.$router.resolve({
name: "dataBoard" name: 'dataBoard'
}); });
// window.open(this.$router.push({ name: 'dataBoard' })) // window.open(this.$router.push({ name: 'dataBoard' }))
window.open(routeData.href, '_blank'); window.open(routeData.href, '_blank');
}, }
}, }
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "~@/assets/scss/c/function.scss"; @import '~@/assets/scss/c/function.scss';
.main-line { .main-line {
height: 50px; height: 50px;
@ -392,8 +316,7 @@ export default {
padding: 16px; padding: 16px;
width: 320px; width: 320px;
background: #ffffff; background: #ffffff;
box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08), box-shadow: 0px 6px 16px 0px rgba(0, 0, 0, 0.08), 0px 3px 6px -4px rgba(0, 0, 0, 0.12);
0px 3px 6px -4px rgba(0, 0, 0, 0.12);
border-radius: 4px; border-radius: 4px;
.title { .title {
@ -450,7 +373,7 @@ export default {
font-weight: 400; font-weight: 400;
line-height: 22px; line-height: 22px;
cursor: pointer; cursor: pointer;
&:hover{ &:hover {
color: #0056d6 !important; color: #0056d6 !important;
} }
} }

10
src/views/modules/home/index.vue
View File

@ -11,13 +11,13 @@
<div class="tabs"> <div class="tabs">
<div <div
:class="{ 'z-on': searchData.type == 'jumin' }" :class="{ 'z-on': searchData.type == 'jumin' }"
@click="searchData.type = 'jumin'" @click="searchDataTab('jumin')"
> >
查居民 查居民
</div> </div>
<div <div
:class="{ 'z-on': searchData.type == 'fangwu' }" :class="{ 'z-on': searchData.type == 'fangwu' }"
@click="searchData.type = 'fangwu'" @click="searchDataTab('fangwu')"
> >
查房屋 查房屋
</div> </div>
@ -349,6 +349,11 @@ export default {
); );
}, },
methods: { methods: {
searchDataTab(str){
searchData.type = str;
this.handleClickSearchBtn();
},
handleClickCategory(item) { handleClickCategory(item) {
this.$router.push({ this.$router.push({
path: "/main/base-resi", path: "/main/base-resi",
@ -384,6 +389,7 @@ export default {
}, },
handleClickSearchBtn() { handleClickSearchBtn() {
console.log("dddd")
const { const {
searchData: { type, searchKey }, searchData: { type, searchKey },
} = this; } = this;

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

@ -754,9 +754,11 @@ export default {
}, },
handleClickSearchBtn() { handleClickSearchBtn() {
const { const {
searchData: { type, searchKey }, searchData: { type, searchKey },
} = this; } = this;
console.log("ddddddddd",type)
if (!searchKey) return this.$message.error("请输入搜索条件"); if (!searchKey) return this.$message.error("请输入搜索条件");
if (type == "jumin") { if (type == "jumin") {
this.searchJumin.pageNo = 1; this.searchJumin.pageNo = 1;
@ -885,7 +887,10 @@ export default {
} }
}, },
handelClickTab(type){ handelClickTab(type){
this.searchData.type = type console.log(type)
this.searchData.type = type;
this.handleClickSearchBtn()
// this.searchData.searchKey = '' // this.searchData.searchKey = ''
} }
}, },

Write Preview
Loading…
Cancel
Save