Compare commits

...

4 Commits

  1. 2
      .env.production
  2. 2
      src/js/dai/request.js
  3. 6
      src/js/store/index.js
  4. 2
      src/mixins/process-module.js
  5. 5
      src/router/index.js
  6. 4
      src/views/main-content.vue
  7. 4
      src/views/main-navbar.vue
  8. 13
      src/views/modules/base/community/buildTable.vue
  9. 25
      src/views/modules/base/community/communityTable.vue
  10. 34
      src/views/modules/base/community/roomTable.vue
  11. 10
      src/views/modules/base/resi.vue
  12. 6
      src/views/pages/index.vue

2
.env.production

@ -1,4 +1,4 @@
NODE_ENV=production NODE_ENV=production
VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api VUE_APP_API_SERVER = http://172.22.68.29/api
VUE_APP_NODE_ENV=prod VUE_APP_NODE_ENV=prod
VUE_APP_PUBLIC_PATH=epmet-oper VUE_APP_PUBLIC_PATH=epmet-oper

2
src/js/dai/request.js

@ -42,7 +42,7 @@ const request = curry(
if (res.data.code > 8000 && res.data.code < 10000) { if (res.data.code > 8000 && res.data.code < 10000) {
// Message.error(res.data.msg); // Message.error(res.data.msg);
} }
if (res.code == 10005 || res.code == 10006 || res.code == 10007) { if (res.data.code == 10005 || res.data.code == 10006 || res.data.code == 10007) {
// 10005 token为空 10006登陆超时 10007别处登录 // 10005 token为空 10006登陆超时 10007别处登录
console.log("登录失效"); console.log("登录失效");
Message.error(res.data.msg); Message.error(res.data.msg);

6
src/js/store/index.js

@ -20,8 +20,8 @@ export default new Vuex.Store({
sidebarFold: false, sidebarFold: false,
// 侧边栏, 菜单 // 侧边栏, 菜单
sidebarMenuList: [], sidebarMenuList: [],
sidebarMenuActiveName: "", sidebarMenuActiveName: "房屋管理",
LevelOneMenuActiveName: "", LevelOneMenuActiveName: "人房信息",
sidebarActiveSubMenuList: [], sidebarActiveSubMenuList: [],
// 内容, 是否需要刷新 // 内容, 是否需要刷新
contentIsNeedRefresh: false, contentIsNeedRefresh: false,
@ -33,7 +33,7 @@ export default new Vuex.Store({
title: "首页", title: "首页",
}, },
], ],
contentTabsActiveName: "indexWork", contentTabsActiveName: "base-community-community",
mainShuju: { mainShuju: {
menuList: [], menuList: [],

2
src/mixins/process-module.js

@ -34,7 +34,7 @@ export default {
var tabName = this.$store.state.contentTabsActiveName var tabName = this.$store.state.contentTabsActiveName
this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName) this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName)
if (this.$store.state.contentTabs.length <= 0) { if (this.$store.state.contentTabs.length <= 0) {
this.$store.state.sidebarMenuActiveName = this.$store.state.contentTabsActiveName = 'home' this.$store.state.sidebarMenuActiveName = this.$store.state.contentTabsActiveName = 'base-community-community'
return false return false
} }
if (tabName === this.$store.state.contentTabsActiveName) { if (tabName === this.$store.state.contentTabsActiveName) {

5
src/router/index.js

@ -89,7 +89,8 @@ export const moduleRoutes = {
component: () => import("@/views/main"), component: () => import("@/views/main"),
name: "main", name: "main",
redirect: { redirect: {
path: "/main/shequ-index", // path: "/main/shequ-index",
path: "/main/base-resi",
}, },
meta: { meta: {
title: "主入口布局", title: "主入口布局",
@ -110,7 +111,6 @@ export const moduleRoutes = {
name: "unopen", name: "unopen",
meta: { meta: {
title: "未开放功能", title: "未开放功能",
isTab: true,
}, },
}, },
{ {
@ -125,7 +125,6 @@ export const moduleRoutes = {
}, },
], ],
}; };
// pc端菜单的 如果没有配置 默认的 或者配置了默认的 但没有权限 默认选中第一 // pc端菜单的 如果没有配置 默认的 或者配置了默认的 但没有权限 默认选中第一
function cookApiDataItem(item) { function cookApiDataItem(item) {
function n2one(v) { function n2one(v) {

4
src/views/main-content.vue

@ -172,7 +172,9 @@ export default {
}, },
// tabs, tab // tabs, tab
tabRemoveHandle(tabName) { tabRemoveHandle(tabName) {
if (tabName === "home") { if (tabName === "base-community-community") {
this.$store.state.sidebarMenuActiveName =
this.$store.state.contentTabsActiveName = "base-community-community";
return false; return false;
} }
this.$store.state.contentTabs = this.$store.state.contentTabs.filter( this.$store.state.contentTabs = this.$store.state.contentTabs.filter(

4
src/views/main-navbar.vue

@ -43,9 +43,9 @@
mode="horizontal" mode="horizontal"
class="aui-navbar__menu mr-auto z-div" class="aui-navbar__menu mr-auto z-div"
> >
<el-menu-item @click="toIndexPage"> <!-- <el-menu-item @click="toIndexPage">
<span>首页</span> <span>首页</span>
</el-menu-item> </el-menu-item> -->
<el-menu-item <el-menu-item
v-show="menu.showFlag==1" v-show="menu.showFlag==1"

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

@ -8,7 +8,8 @@
size="small" size="small"
@click="handleAdd">新增楼栋</el-button> @click="handleAdd">新增楼栋</el-button>
<div class="btn_upload" <div class="btn_upload"
v-if="showImportBtn"> >
<!-- v-if="showImportBtn" -->
<el-button style=";margin-left:10px" <el-button style=";margin-left:10px"
class="diy-button--export" class="diy-button--export"
size="small" size="small"
@ -59,8 +60,9 @@
size="small" size="small"
:disabled="yihuyidangDisabled" :disabled="yihuyidangDisabled"
@click="handleExportYihuyidang()">导出一户一档</el-button> @click="handleExportYihuyidang()">导出一户一档</el-button>
<!-- v-if="displayedBaobiaoBtn" -->
<el-button size="small" <el-button size="small"
v-if="displayedBaobiaoBtn"
class="diy-button--add" class="diy-button--add"
@click="reportForm">智能填报</el-button> @click="reportForm">智能填报</el-button>
</div> </div>
@ -159,13 +161,14 @@
class="div-table-button--detail" class="div-table-button--detail"
size="small" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
<el-button v-if="scope.row.showBtn" <!-- v-if="scope.row.showBtn" -->
<el-button
type="text" type="text"
class="div-table-button--edit" class="div-table-button--edit"
size="small" size="small"
@click="handleEdit(scope.row)">修改</el-button> @click="handleEdit(scope.row)">修改</el-button>
<!-- v-if="scope.row.showBtn" -->
<el-button v-if="scope.row.showBtn" <el-button
type="text" type="text"
class="div-table-button--delete" class="div-table-button--delete"
size="small" size="small"

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

@ -2,13 +2,15 @@
<div> <div>
<div class="div_btn"> <div class="div_btn">
<el-button v-if="showYhymInfo && customerId!=='1535072605621841922'" <!-- v-if="showYhymInfo && customerId!=='1535072605621841922'" -->
<el-button
style="" style=""
class="diy-button--reset" class="diy-button--reset"
size="small" size="small"
:loading="yhymLoading" :loading="yhymLoading"
@click="handleYhymInfo">补全一房一码信息</el-button> @click="handleYhymInfo">补全一房一码信息</el-button>
<el-button v-if="showYhymInfo && customerId!=='1535072605621841922'" <!-- v-if="showYhymInfo && customerId!=='1535072605621841922'" -->
<el-button
style="" style=""
class="diy-button--export" class="diy-button--export"
size="small" size="small"
@ -20,7 +22,8 @@
@click="handleAdd">新增小区</el-button> @click="handleAdd">新增小区</el-button>
<div class="btn_upload" <div class="btn_upload"
v-if="showImportBtn"> >
<!-- v-if="showImportBtn" -->
<el-button style="" <el-button style=""
class="diy-button--export" class="diy-button--export"
size="small" size="small"
@ -40,7 +43,7 @@
class="diy-button--delete">导入小区数据</el-button> class="diy-button--delete">导入小区数据</el-button>
</el-upload> </el-upload>
<el-button style=";margin-left:10px" <el-button style="margin-left:10px"
class="diy-button--export" class="diy-button--export"
size="small" size="small"
@click="handleExportModule('building')">下载楼栋模板</el-button> @click="handleExportModule('building')">下载楼栋模板</el-button>
@ -58,7 +61,7 @@
size="small" size="small"
class="diy-button--delete">导入楼栋数据</el-button> class="diy-button--delete">导入楼栋数据</el-button>
</el-upload> </el-upload>
<el-button style=";margin-left:10px" <el-button style="margin-left:10px"
class="diy-button--export" class="diy-button--export"
size="small" size="small"
@click="handleExportModule('room')">下载房屋模板</el-button> @click="handleExportModule('room')">下载房屋模板</el-button>
@ -82,7 +85,8 @@
class="diy-button--reset" class="diy-button--reset"
size="small" size="small"
@click="handleExportOpen">导出</el-button> @click="handleExportOpen">导出</el-button>
<el-button v-if="agencyObj.level == 'community'" <!-- v-if="agencyObj.level == 'community'" -->
<el-button
style="margin-left:10px" style="margin-left:10px"
class="diy-button--qrcode" class="diy-button--qrcode"
size="small" size="small"
@ -96,9 +100,8 @@
size="small" size="small"
:disabled="yihuyidangDisabled" :disabled="yihuyidangDisabled"
@click="handleExportYihuyidang()">导出一户一档</el-button> --> @click="handleExportYihuyidang()">导出一户一档</el-button> -->
<!-- v-if="displayedBaobiaoBtn" -->
<el-button size="small" <el-button size="small"
v-if="displayedBaobiaoBtn"
class="diy-button--add" class="diy-button--add"
@click="reportForm">智能填报</el-button> @click="reportForm">智能填报</el-button>
</div> </div>
@ -161,13 +164,15 @@
class="div-table-button--detail" class="div-table-button--detail"
size="small" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
<el-button v-if="scope.row.showBtn" <!-- v-if="scope.row.showBtn" -->
<el-button
type="text" type="text"
class="div-table-button--edit" class="div-table-button--edit"
size="small" size="small"
@click="handleEdit(scope.row)">修改</el-button> @click="handleEdit(scope.row)">修改</el-button>
<el-button v-if="scope.row.showBtn" <!-- v-if="scope.row.showBtn" -->
<el-button
type="text" type="text"
class="div-table-button--delete" class="div-table-button--delete"
size="small" size="small"

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

@ -1,22 +1,25 @@
<template> <template>
<div> <div>
<div class="div_btn"> <div class="div_btn">
<el-button v-if="agencyObj.level === 'building' || source !== 'search'" <!-- v-if="agencyObj.level === 'building' || source !== 'search'" -->
<el-button
v-show="btnAuths.ic_house_add" v-show="btnAuths.ic_house_add"
style="float: left" style="float: left"
class="diy-button--add" class="diy-button--add"
size="small" size="small"
@click="handleAdd">新增房屋</el-button> @click="handleAdd">新增房屋</el-button>
<div class="btn_upload" <div class="btn_upload"
v-if="showImportBtn"> >
<!-- v-if="showImportBtn" -->
<el-button :headers="$getElUploadHeaders()" <el-button :headers="$getElUploadHeaders()"
v-if="btnAuths.ic_house_import"
style="float: left" style="float: left"
class="diy-button--export" class="diy-button--export"
size="small" size="small"
@click="handleExportModule">下载房屋模板</el-button> @click="handleExportModule">下载房屋模板</el-button>
<!-- v-if="btnAuths.ic_house_import" -->
<el-upload ref="upload" <el-upload ref="upload"
v-if="btnAuths.ic_house_import"
:multiple="false" :multiple="false"
:show-file-list="false" :show-file-list="false"
:before-upload="beforeUpload" :before-upload="beforeUpload"
@ -25,31 +28,36 @@
:limit="1" :limit="1"
:on-exceed="handleExceed" :on-exceed="handleExceed"
:http-request="uploadFile"> :http-request="uploadFile">
<!-- v-if="btnAuths.ic_house_import" -->
<el-button style="margin-left: 10px" <el-button style="margin-left: 10px"
size="small" size="small"
class="diy-button--delete">导入房屋数据</el-button> class="diy-button--delete">导入房屋数据</el-button>
</el-upload> </el-upload>
</div> </div>
<el-button style="float: left; margin-left: 10px" <el-button style="float: left; margin-left: 10px"
v-if="btnAuths.ic_house_export"
class="diy-button--reset" class="diy-button--reset"
size="small" size="small"
@click="handleExport">导出</el-button> @click="handleExport">导出</el-button>
<!-- v-if="btnAuths.ic_house_export" -->
<el-button style="float: left; margin-left: 10px" <el-button style="float: left; margin-left: 10px"
v-if="btnAuths.ic_house_batch_del"
class="diy-button--more" class="diy-button--more"
size="small" size="small"
@click="deleteBatch">批量删除</el-button> @click="deleteBatch">批量删除</el-button>
<!-- v-if="btnAuths.ic_house_batch_del" -->
<el-button style="margin-left: 10px" <el-button style="margin-left: 10px"
v-if="btnAuths.ic_house_export_yhyd"
class="diy-button--export" class="diy-button--export"
size="small" size="small"
:disabled="yihuyidangDisabled" :disabled="yihuyidangDisabled"
@click="handleExportYihuyidang()">导出一户一档</el-button> @click="handleExportYihuyidang()">导出一户一档</el-button>
<!-- v-if="btnAuths.ic_house_export_yhyd" -->
<el-button size="small" <el-button size="small"
class="diy-button--add" class="diy-button--add"
v-if="btnAuths.ic_house_smart_import && displayedBaobiaoBtn"
@click="reportForm">智能填报</el-button> @click="reportForm">智能填报</el-button>
<!-- v-if="btnAuths.ic_house_smart_import && displayedBaobiaoBtn" -->
</div> </div>
<div class="div_table_item"> <div class="div_table_item">
@ -150,18 +158,20 @@
align="center" align="center"
class="operate"> class="operate">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- v-if="btnAuths.ic_house_view" -->
<el-button type="text" <el-button type="text"
v-if="btnAuths.ic_house_view"
class="div-table-button--detail" class="div-table-button--detail"
size="small" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
<el-button v-if="btnAuths.ic_house_update && scope.row.showBtn" <!-- v-if="btnAuths.ic_house_update && scope.row.showBtn" -->
<el-button
type="text" type="text"
class="div-table-button--edit" class="div-table-button--edit"
size="small" size="small"
@click="handleEdit(scope.row)">修改</el-button> @click="handleEdit(scope.row)">修改</el-button>
<!-- v-if="btnAuths.ic_house_del && scope.row.showBtn" -->
<el-button v-if="btnAuths.ic_house_del && scope.row.showBtn" <el-button
type="text" type="text"
class="div-table-button--delete" class="div-table-button--delete"
size="small" size="small"

10
src/views/modules/base/resi.vue

@ -151,12 +151,18 @@
type="text" type="text"
size="small" size="small"
class="div-table-button--detail">变更记录</el-button> class="div-table-button--detail">变更记录</el-button>
<template v-if="filterEdit(scope.row.ORG_ID)"> <!-- v-if="btnAuths.ic_resi_update" -->
<el-button v-if="btnAuths.ic_resi_update" <el-button
@click="handleEdit(scope.row)" @click="handleEdit(scope.row)"
type="text" type="text"
size="small" size="small"
class="div-table-button--edit">修改</el-button> class="div-table-button--edit">修改</el-button>
<template v-if="filterEdit(scope.row.ORG_ID)">
<!-- <el-button v-if="btnAuths.ic_resi_update"
@click="handleEdit(scope.row)"
type="text"
size="small"
class="div-table-button--edit">修改</el-button> -->
<el-popconfirm v-if="btnAuths.ic_resi_del" <el-popconfirm v-if="btnAuths.ic_resi_del"
title="删除之后无法回复,确认删除?" title="删除之后无法回复,确认删除?"
@onConfirm="handleDel(scope.row)"> @onConfirm="handleDel(scope.row)">

6
src/views/pages/index.vue

@ -1,6 +1,6 @@
<template> <template>
<div class="g-app"> <div class="g-app">
<div class="g-bd" v-if="true"> <div class="g-bd" v-if="false">
<div class="m-list"> <div class="m-list">
<div class="list"> <div class="list">
<div class="item" @click="handleClickItem(1)"> <div class="item" @click="handleClickItem(1)">
@ -49,7 +49,9 @@ export default {
}, },
components: {}, components: {},
computed: {}, computed: {},
created() {}, created() {
this.handleClickItem(1)
},
mounted() {}, mounted() {},
beforeRouteEnter(to, from, next) { beforeRouteEnter(to, from, next) {

Loading…
Cancel
Save