Skip to content

D
dcxy-manage-shell
Commit 9d6226d2 by 姜雷
Options

Merge branch 'test' into 'master'

Test See merge request !164
parents 15624639 c0195888
Showing with 128 additions and 34 deletions
.env
VUE_APP_SYSTEM_VERSION=1.0.1
VUE_APP_BASE_URL=/
VUE_APP_DEV_LIB_URL=
VUE_APP_CUSTOMER_MENU_CODE=0001
VUE_APP_BASE_MENU_CODE=0002
VUE_APP_SYSTEM_MENU_CODE=0003
VUE_APP_FEEDBACK_MENU_CODE=0018
VUE_APP_WARNNING_MENU_CODE=0100
VUE_APP_STATISTICS_MENU_CODE=0044
VUE_APP_DEVICE_MENU_CODE=0048
VUE_APP_CUSTOMER_OPERATE_CODE=0077
......@@ -17,3 +19,4 @@ VUE_APP_CUSTOMER_SERVER_URL=http://ex-dev-customer-manage.168cad.top
VUE_APP_BASE_SERVER_URL=http://ex-dev-dcxy-base-manage.168cad.top
VUE_APP_BASE_SERVER_URL_APP=http://ex-dev-dcxy-base-app.168cad.top
VUE_APP_STATISTICS_SERVER_URL=http://ex-dev-dcxy-statistics-manage.168cad.top
VUE_APP_DEVICE_SERVER_URL=http://in-dev-device-management-api.168cad.top
.env.dev
......@@ -5,3 +5,4 @@ VUE_APP_CUSTOMER_SERVER_URL=http://ex-dev-customer-manage.168cad.top
VUE_APP_BASE_SERVER_URL=http://ex-dev-dcxy-base-manage.168cad.top
VUE_APP_BASE_SERVER_URL_APP=http://ex-dev-dcxy-base-app.168cad.top
VUE_APP_STATISTICS_SERVER_URL=http://ex-dev-dcxy-statistics-manage.168cad.top
VUE_APP_DEVICE_SERVER_URL=http://in-dev-device-management-api.168cad.top
.env.test
......@@ -4,3 +4,4 @@ VUE_APP_CUSTOMER_SERVER_URL=http://ex-test-customer-manage.168cad.top
VUE_APP_BASE_SERVER_URL=http://ex-test-dcxy-base-manage.168cad.top
VUE_APP_BASE_SERVER_URL_APP=http://ex-test-dcxy-base-app.168cad.top
VUE_APP_STATISTICS_SERVER_URL=http://ex-test-dcxy-statistics-manage.168cad.top
VUE_APP_DEVICE_SERVER_URL=http://in-test-device-management-api.168cad.top
public/index.html
......@@ -21,14 +21,14 @@
<div id="app"></div>
<script src="https://webapi.amap.com/maps?v=1.4.12&key=dd6103c90f2f17310a8711f2d330a0a6"></script>
<script src="https://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script>
<script src="<%= VUE_APP_DEV_LIB_URL %>/lib/manageShell.umd.min.js"></script>
<script src="<%= VUE_APP_SUBSYSTEM %>/customerManage/lib/customerManage.umd.min.js"></script>
<script src="<%= VUE_APP_SUBSYSTEM %>/baseManage/lib/baseManage.umd.min.js"></script>
<script src="<%= VUE_APP_SUBSYSTEM %>/systemManage/lib/systemManage.umd.min.js"></script>
<script src="<%= VUE_APP_SUBSYSTEM %>/operateManage/lib/operateManage.umd.min.js"></script>
<script src="<%= VUE_APP_SUBSYSTEM %>/statisticsManage/lib/statisticsManage.umd.min.js"></script>
<script src="<%= VUE_APP_SUBSYSTEM %>/deviceManage/lib/deviceManage.umd.min.js"></script>
<script src="<%= VUE_APP_SUBSYSTEM %>/smaproManage/lib/smaproManage.umd.min.js"></script>
<script src="<%= VUE_APP_DEV_LIB_URL %>/lib/manageShell.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script>
<script src="<%= VUE_APP_SUBSYSTEM %>/customerManage/lib/customerManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script>
<script src="<%= VUE_APP_SUBSYSTEM %>/baseManage/lib/baseManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script>
<script src="<%= VUE_APP_SUBSYSTEM %>/systemManage/lib/systemManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script>
<script src="<%= VUE_APP_SUBSYSTEM %>/operateManage/lib/operateManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script>
<script src="<%= VUE_APP_SUBSYSTEM %>/statisticsManage/lib/statisticsManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script>
<script src="<%= VUE_APP_SUBSYSTEM %>/deviceManage/lib/deviceManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script>
<script src="<%= VUE_APP_SUBSYSTEM %>/smaproManage/lib/smaproManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script>
<!-- built files will be auto injected -->
</body>
......
src/App.vue
......@@ -132,7 +132,7 @@ export default {
},
},
methods: {
...mapActions(['updateFeedbackPage']),
...mapActions(['updateFeedbackPage', 'updateWarnningPage']),
showComponents(store) {
this.isInnerPage =
this.whiteList.indexOf(this.$route.path) !== -1 ? false : true;
......@@ -189,9 +189,14 @@ export default {
},
getFeedbackPage() {
let feedbackCode = process.env.VUE_APP_FEEDBACK_MENU_CODE;
let menu = getMenuDataByCode(this.route, feedbackCode);
if (menu) {
this.updateFeedbackPage(menu.name);
let feedbackMenu = getMenuDataByCode(this.route, feedbackCode);
let warnningCode = process.env.VUE_APP_WARNNING_MENU_CODE;
let warnningMenu = getMenuDataByCode(this.route, warnningCode);
if (feedbackMenu) {
this.updateFeedbackPage(feedbackMenu.name);
}
if (warnningMenu) {
this.updateWarnningPage(warnningMenu.name);
}
},
},
......
src/api/dashboard/dashboard.js
import fetch from '../fetch';
const path = process.env.VUE_APP_STATISTICS_SERVER_URL;
const devicePath = process.env.VUE_APP_DEVICE_SERVER_URL;
export const fetchConsumeList = req =>
fetch({
......@@ -36,3 +37,8 @@ export const getFeedbackList = req =>
url: path + '/dcxy/reportInfo/queryFeedbackList',
...req,
});
export const getWarnningCount = req =>
fetch({
url: devicePath + '/device/warning/count',
...req,
});
src/components/input/AreaDashboard/mixin.js
......@@ -12,7 +12,7 @@ export default {
};
},
created() {
this.storeIndex = store.install(this.$store);
this.storeIndex = store.install(this.$store, this.$attrs);
},
mounted() {
if (this.dashboardArea && !this.dashboardArea.length) {
......
src/components/input/AreaDashboard/store.js
......@@ -3,21 +3,19 @@ import areaStroe from './areaStore';
let index = 0;
export default {
install(store) {
install(store, attrs) {
let name = attrs.name ? attrs.name : 'Da' + index++;
if (!store.state.base) {
store.registerModule(['base'], {
state: {},
});
}
if (!store.state.base['dashboardArea' + index]) {
store.registerModule(['base', 'dashboardArea' + index], areaStroe);
} else {
index++;
store.registerModule(['base', 'dashboardArea' + index], areaStroe);
if (!store.state.base['dashboardArea' + name]) {
store.registerModule(['base', 'dashboardArea' + name], areaStroe);
}
return index;
return name;
},
uninstall(store) {
uninstall(store, index) {
store.unregisterModule(['base', 'dashboardArea' + index]);
},
};
src/containers/Dashboard/CampusCustomerData/CampusCustomerData.vue
......@@ -10,6 +10,7 @@
</search-item>
<search-item label="区域">
<dashboard-area-select
name='campusData'
:operateId="filters.operateId"
:value="filters.choiceareaIds"
multiple
......
src/containers/Dashboard/CustomerData/CustomerData.vue
......@@ -10,6 +10,7 @@
</search-item>
<search-item label="区域">
<dashboard-area-select
name='customerData'
:operateId="filters.operateId"
:value="filters.areaId"
multiple
......
src/containers/Dashboard/Dashboard.js
......@@ -2,6 +2,7 @@ import {
fetchConsumeList,
fetchReportList,
fetchTitleList,
getWarnningCount,
} from '@/api/dashboard/dashboard';
import customerData from './CustomerData/CustomerDataStore';
import customerRecharge from './CustomerRecharge/CustomerRechargeStore';
......@@ -22,6 +23,7 @@ const LOADING_SERVICE = 'LOADING_SERVICE';
const LOADING_EQUIPMENT = 'LOADING_EQUIPMENT';
const LOADING_REGIST = 'LOADING_REGIST';
const LOADING_REGIST_BY_DAY = 'LOADING_REGIST_BY_DAY';
const GET_WARNNING_COUNT = 'GET_WARNNING_COUNT';
const initFilters = () => ({
operateId: undefined,
......@@ -68,6 +70,7 @@ const state = () => ({
activeCount: 0,
countArea: 0,
countCustomer: 0,
warnningCount: 0,
},
});
......@@ -202,6 +205,11 @@ const actions = {
commit(GET_TITLE_DATA, data);
});
},
getWarnningCount({ commit }) {
getWarnningCount().then(res => {
commit(GET_WARNNING_COUNT, res.data);
});
},
updateCampusName({ commit }, data) {
if (data) {
commit(GET_CAMPUS_DATA, data);
......@@ -286,7 +294,12 @@ const mutations = {
state.report.activeUser = activeList;
},
[GET_TITLE_DATA](state, data) {
state.title = data;
state.title.activeCount = data.activeCount;
state.title.countArea = data.countArea;
state.title.countCustomer = data.countCustomer;
},
[GET_WARNNING_COUNT](state, count) {
state.title.warnningCount = count;
},
[GET_CAMPUS_DATA](state, name) {
state.consume.areaInfo = name;
......
src/containers/Dashboard/Dashboard.vue
......@@ -36,12 +36,30 @@ export default {
created() {
this.initData();
},
data() {
return {
timer: null,
};
},
beforeDestroy() {
if (this.timer) {
clearInterval(this.timer);
}
},
methods: {
...mapActions('Dashboard', ['fetchConsumeList', 'fetchTitleList']),
...mapActions('Dashboard', [
'fetchConsumeList',
'fetchTitleList',
'getWarnningCount',
]),
...mapActions(['updateBackPage']),
initData() {
this.fetchConsumeList();
this.fetchTitleList();
this.getWarnningCount();
this.timer = setInterval(() => {
this.getWarnningCount();
}, 5000);
},
},
};
......
src/containers/HomePage/Demo.vue
......@@ -8,29 +8,47 @@
@input="val => updateFilters({operateId: val,areaIdArr:[]})"
/>
</search-item>
<!-- <search-item label="区域">
<search-item label="区域1">
<dashboard-area-select
:operateId="filters.operateId"
:value="filters.areaIdArr"
name='da1'
:operateId="3"
:value="filters.areaIdArr1"
multiple
@input="val => updateFilters({areaIdArr: val})"
/>
</search-item> -->
<search-item label="区域">
</search-item>
<search-item label="区域2">
<dashboard-area-select
name='da2'
:operateId="28"
:value="filters.areaIdArr2"
multiple
@input="val => updateFilters({areaIdArr: val})"
/>
</search-item>
<search-item label="区域3">
<dashboard-area-select
:operateId="39"
:value="filters.areaIdArr3"
multiple
@input="val => updateFilters({areaIdArr: val})"
/>
</search-item>
<!-- <search-item label="区域">
<area-select
:value="filters.areaId"
@input="val => updateFilters({areaId: val})"
/>
</search-item>
</search-item> -->
<search-item label="服务">
<!-- <search-item label="服务">
<area-service-select
:areaId="filters.areaId"
:filterList="[3]"
:value="filters.service"
@input="val => updateFilters({service: val})"
/>
</search-item>
</search-item> -->
</template>
</list-layout>
</template>
......@@ -41,7 +59,9 @@ export default {
return {
filters: {
operateId: undefined,
areaIdArr: [],
areaIdArr1: [15],
areaIdArr2: [123],
areaIdArr3: [128],
areaId: undefined,
service: undefined,
},
......
src/containers/layout/IconMenu/IconMenu.vue
......@@ -6,7 +6,10 @@
>
<div class="dataItem">所运营的校区<span class="dataNumber">{{titleData.countArea}}</span></div>
<div class="dataItem">累计用户数<span class="dataNumber">{{titleData.countCustomer}}</span></div>
<div class="dataItem">活跃用户数<span class="dataNumber">{{titleData.activeCount}}</span></div>
<div
class="dataItem clickable"
@click="goWarnningPage"
>今日系统告警数<span class="dataNumber">{{titleData.warnningCount}}</span></div>
</div>
<div
class="IconMenus-list"
......@@ -99,7 +102,7 @@ export default {
},
computed: {
...mapGetters('Dashboard', ['titleData']),
...mapGetters(['collectList', 'dashboardBackPage']),
...mapGetters(['collectList', 'dashboardBackPage', 'warnningPage']),
formatRoute() {
let routeList = this.routers.filter(
menu =>
......@@ -162,6 +165,18 @@ export default {
});
}
},
goWarnningPage() {
if (this.warnningPage) {
this.$router.push({
name: this.warnningPage,
query: {
isToday: true,
},
});
} else {
this.$message.error('无告警页面权限');
}
},
},
};
</script>
......@@ -186,6 +201,9 @@ export default {
justify-content: center;
align-items: center;
}
.clickable {
cursor: pointer;
}
.dataNumber {
margin-left: 10px;
font-size: 16px;
......
src/store/modules/app/index.js
......@@ -4,6 +4,7 @@ import { FETCH_START, FETCH_DONE } from './mutation-types';
const GET_WHITE_LIST = 'GET_WHITE_LIST';
const UPDATE_BACK_PAGE = 'UPDATE_BACK_PAGE';
const UPDATE_FEEDBACK_PAGE = 'UPDATE_FEEDBACK_PAGE';
const UPDATE_WARNNING_PAGE = 'UPDATE_WARNNING_PAGE';
let fetchCount = 0;
const state = () => ({
......@@ -11,6 +12,7 @@ const state = () => ({
whiteList: [],
dashboardBackPage: undefined,
feedbackPage: undefined,
warnningPage: undefined,
});
const getters = {
......@@ -18,6 +20,7 @@ const getters = {
whiteList: state => state.whiteList,
dashboardBackPage: state => state.dashboardBackPage,
feedbackPage: state => state.feedbackPage,
warnningPage: state => state.warnningPage,
};
const actions = {
......@@ -36,6 +39,9 @@ const actions = {
updateFeedbackPage({ commit }, name) {
commit(UPDATE_FEEDBACK_PAGE, name);
},
updateWarnningPage({ commit }, name) {
commit(UPDATE_WARNNING_PAGE, name);
},
};
const mutations = {
[FETCH_START](state, notLoading) {
......@@ -61,6 +67,9 @@ const mutations = {
[UPDATE_FEEDBACK_PAGE](state, name) {
state.feedbackPage = name;
},
[UPDATE_WARNNING_PAGE](state, name) {
state.warnningPage = name;
},
};
export default {
modules: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment