Commit f8f2b6db by caoyanzhi

update: 菜单应用

parent a32926a3
...@@ -64,7 +64,6 @@ export default { ...@@ -64,7 +64,6 @@ export default {
}, },
data() { data() {
return { return {
activeId: '2',
loading: false, loading: false,
searchInput: '', searchInput: '',
tableData: [], tableData: [],
...@@ -220,7 +219,6 @@ export default { ...@@ -220,7 +219,6 @@ export default {
}, },
mounted() { mounted() {
let that = this; let that = this;
that.$emit('showTab', '1');
if (!!that.brandId) { if (!!that.brandId) {
that.getTableList(); that.getTableList();
} }
......
...@@ -122,7 +122,6 @@ export default { ...@@ -122,7 +122,6 @@ export default {
}, },
data() { data() {
return { return {
activeId: '2',
dateRange: '', dateRange: '',
searchInput: '', searchInput: '',
tableData: [], tableData: [],
...@@ -281,7 +280,6 @@ export default { ...@@ -281,7 +280,6 @@ export default {
}, },
mounted() { mounted() {
let that = this; let that = this;
that.$emit('showTab', '2');
if (!!that.brandId) { if (!!that.brandId) {
that.getTableList(); that.getTableList();
} }
......
...@@ -96,12 +96,6 @@ export default { ...@@ -96,12 +96,6 @@ export default {
default() { default() {
return ''; return '';
} }
},
activeGroupId: {
type: String,
default() {
return '';
}
} }
}, },
components: { components: {
...@@ -140,7 +134,6 @@ export default { ...@@ -140,7 +134,6 @@ export default {
}; */ }; */
return { return {
activeBrand: this.brandId, // 商户(品牌) id activeBrand: this.brandId, // 商户(品牌) id
activeGroup: this.activeGroupId, // 商户(品牌) groupId
activeId: '3', activeId: '3',
wxEnterpriseId: localStorage.getItem('userInfos') ? JSON.parse(localStorage.getItem('userInfos')).wxEnterpriseId : '', wxEnterpriseId: localStorage.getItem('userInfos') ? JSON.parse(localStorage.getItem('userInfos')).wxEnterpriseId : '',
selectCoupCard: {}, //已选卡券对象 selectCoupCard: {}, //已选卡券对象
...@@ -412,23 +405,15 @@ export default { ...@@ -412,23 +405,15 @@ export default {
}; };
that.selectCoupCard = {}; that.selectCoupCard = {};
} }
},
activeGroupId: function(newData, oldData) {
const that = this;
if (!!newData) {
that.activeGroup = newData;
}
} }
}, },
mounted() { mounted() {
const that = this; const that = this;
that.activeBrand = that.brandId; that.activeBrand = that.brandId;
if (that.$route.query.coupCardId && that.brandId) { if (that.$route.query.coupCardId && that.brandId) {
that.$emit('showTab', '1', '11');
that.addTag = false; that.addTag = false;
that.getCardData(); that.getCardData();
} else { } else {
that.$emit('showTab', '1', '12');
that.loadingPage = false; that.loadingPage = false;
} }
} }
......
...@@ -41,25 +41,11 @@ export default { ...@@ -41,25 +41,11 @@ export default {
default() { default() {
return ''; return '';
} }
},
tabType: {
type: String,
default() {
return '1';
}
},
activeGroupId: {
type: String,
default() {
return '';
}
} }
}, },
data() { data() {
return { return {
projectName: '', // 当前项目名 projectName: '', // 当前项目名
activeName: 'first',
activeGroup: this.activeGroupId, // 商户(品牌) groupId
wxEnterpriseRelatedId: JSON.parse(localStorage.getItem('userInfos')).wxEnterpriseId, wxEnterpriseRelatedId: JSON.parse(localStorage.getItem('userInfos')).wxEnterpriseId,
myCustomData: { myCustomData: {
wmOrderShow: 0, wmOrderShow: 0,
...@@ -148,7 +134,6 @@ export default { ...@@ -148,7 +134,6 @@ export default {
}, },
mounted() { mounted() {
const that = this; const that = this;
that.$emit('showTab', '14');
that.getShowSet(that.brandId); that.getShowSet(that.brandId);
}, },
components: {} components: {}
......
...@@ -34,18 +34,6 @@ export default { ...@@ -34,18 +34,6 @@ export default {
default() { default() {
return ''; return '';
} }
},
tabType: {
type: String,
default() {
return '1';
}
},
activeGroupId: {
type: String,
default() {
return '';
}
} }
}, },
data() { data() {
...@@ -162,7 +150,6 @@ export default { ...@@ -162,7 +150,6 @@ export default {
}, },
mounted() { mounted() {
const that = this; const that = this;
that.$emit('showTab', '13');
that.getCustomerSet(that.brandId); that.getCustomerSet(that.brandId);
}, },
components: {} components: {}
......
...@@ -137,25 +137,12 @@ export default { ...@@ -137,25 +137,12 @@ export default {
default() { default() {
return ''; return '';
} }
},
tabType: {
type: String,
default() {
return '1';
}
},
activeGroupId: {
type: String,
default() {
return '';
}
} }
}, },
mounted() { mounted() {
this.brandId && this.getTagCategoryList(); this.brandId && this.getTagCategoryList();
this.brandId && this.getTableList(); this.brandId && this.getTableList();
this.checkSyncCount(); this.checkSyncCount();
this.$emit('showTab', '15');
}, },
data() { data() {
return { return {
......
...@@ -104,18 +104,6 @@ export default { ...@@ -104,18 +104,6 @@ export default {
default() { default() {
return ''; return '';
} }
},
tabType: {
type: String,
default() {
return '1';
}
},
activeGroupId: {
type: String,
default() {
return '';
}
} }
}, },
data() { data() {
...@@ -552,7 +540,6 @@ export default { ...@@ -552,7 +540,6 @@ export default {
}, },
mounted() { mounted() {
const that = this; const that = this;
that.$emit('showTab', '2');
if (that.brandId) { if (that.brandId) {
that.getGicData(that.brandId); that.getGicData(that.brandId);
} }
......
...@@ -207,7 +207,6 @@ export default { ...@@ -207,7 +207,6 @@ export default {
}, },
mounted() { mounted() {
this.getTalbeList(); this.getTalbeList();
this.$emit('showTab', '15', '151');
}, },
filters: { filters: {
taskType(v) { taskType(v) {
......
...@@ -34,18 +34,6 @@ export default { ...@@ -34,18 +34,6 @@ export default {
default() { default() {
return ''; return '';
} }
},
tabType: {
type: String,
default() {
return '1';
}
},
activeGroupId: {
type: String,
default() {
return '';
}
} }
}, },
data() { data() {
...@@ -144,7 +132,6 @@ export default { ...@@ -144,7 +132,6 @@ export default {
}, },
mounted() { mounted() {
const that = this; const that = this;
that.$emit('showTab', '1');
if (that.brandId) { if (that.brandId) {
that.getCustomerSet(that.brandId); that.getCustomerSet(that.brandId);
} }
......
...@@ -533,14 +533,9 @@ export default { ...@@ -533,14 +533,9 @@ export default {
watch: {}, watch: {},
mounted() { mounted() {
const that = this; const that = this;
that.$emit('showTab', 3);
document.documentElement.style.backgroundColor = '#f0f2f5';
that.getGroupData(); that.getGroupData();
that.getTableList(); that.getTableList();
}, },
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
},
components: { groupDialog, selectGroup, textTable, imageTable, webTable, videoTable, fileTable, appsTable, textEdit, imageEdit, webEdit, videoEdit, fileEdit, appsEdit } components: { groupDialog, selectGroup, textTable, imageTable, webTable, videoTable, fileTable, appsTable, textEdit, imageEdit, webEdit, videoEdit, fileEdit, appsEdit }
}; };
</script> </script>
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
--> -->
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
<nav-crumb :navpath="navpath"> </nav-crumb>
<div class="right-content"> <div class="right-content">
<div class="right-box" style="min-height: calc(100vh - 104px);"> <div class="right-box" style="min-height: calc(100vh - 104px);">
<div class="apps-content flex" style="min-height: calc(100vh - 104px);"> <div class="apps-content flex" style="min-height: calc(100vh - 104px);">
...@@ -79,7 +78,6 @@ ...@@ -79,7 +78,6 @@
</div> </div>
</template> </template>
<script> <script>
import navCrumb from '@/components/nav/nav.vue';
import gicSelectGroupMult from '@/components/login-data/gic-select-group-mult.vue'; import gicSelectGroupMult from '@/components/login-data/gic-select-group-mult.vue';
import activeChart from '@/components/login-data/active-chart.vue'; import activeChart from '@/components/login-data/active-chart.vue';
import { getRequest, postRequest, postExcel } from '@/api/api'; import { getRequest, postRequest, postExcel } from '@/api/api';
...@@ -91,17 +89,6 @@ export default { ...@@ -91,17 +89,6 @@ export default {
name: 'activeDetail', name: 'activeDetail',
data() { data() {
return { return {
// 面包屑参数
navpath: [
{
name: '好办使用详情',
path: '/enterpriseUseData?brandId=' + this.$route.query.brandId
},
{
name: '活跃人员明细',
path: ''
}
],
selectStartDay: '', // 默认当天之前一天时间 selectStartDay: '', // 默认当天之前一天时间
selectEndDay: '', // 默认当天之前七天时间 selectEndDay: '', // 默认当天之前七天时间
charData: [], //[{ date: 'Jan', active: '激活', value: 7 }, { date: 'Jan', active: '未激活', value: 3.9 }, { date: 'Feb', active: '激活', value: 6.9 }, { date: 'Feb', active: '未激活', value: 4.2 }, { date: 'Mar', active: '激活', value: 9.5 }, { date: 'Mar', active: '未激活', value: 5.7 }], charData: [], //[{ date: 'Jan', active: '激活', value: 7 }, { date: 'Jan', active: '未激活', value: 3.9 }, { date: 'Feb', active: '激活', value: 6.9 }, { date: 'Feb', active: '未激活', value: 4.2 }, { date: 'Mar', active: '激活', value: 9.5 }, { date: 'Mar', active: '未激活', value: 5.7 }],
...@@ -290,29 +277,14 @@ export default { ...@@ -290,29 +277,14 @@ export default {
}); });
} }
}, },
watch: {
activeBrand: function(newData, oldData) {
const that = this;
that.activeBrand = newData;
},
activeGroup: function(newData, oldData) {
const that = this;
that.activeGroup = newData;
}
},
mounted() { mounted() {
const that = this; const that = this;
that.selectStartDay = dateFormat.timeStampToYmd(new Date().getTime() - 7 * 24 * 3600 * 1000); that.selectStartDay = dateFormat.timeStampToYmd(new Date().getTime() - 7 * 24 * 3600 * 1000);
that.selectEndDay = dateFormat.timeStampToYmd(new Date().getTime() - 24 * 3600 * 1000); that.selectEndDay = dateFormat.timeStampToYmd(new Date().getTime() - 24 * 3600 * 1000);
that.getLoginData(); that.getLoginData();
that.getTableList(); that.getTableList();
document.documentElement.style.backgroundColor = '#f0f2f5';
},
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
}, },
components: { components: {
navCrumb,
gicSelectGroupMult, gicSelectGroupMult,
activeChart activeChart
} }
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
--> -->
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
<nav-crumb :navpath="navpath"> </nav-crumb>
<div class="right-content"> <div class="right-content">
<div class="right-box" style="min-height: calc(100vh - 104px);"> <div class="right-box" style="min-height: calc(100vh - 104px);">
<div class="apps-content flex" style="min-height: calc(100vh - 104px);"> <div class="apps-content flex" style="min-height: calc(100vh - 104px);">
...@@ -74,7 +73,6 @@ ...@@ -74,7 +73,6 @@
</div> </div>
</template> </template>
<script> <script>
import navCrumb from '@/components/nav/nav.vue';
import areaChart from '@/components/login-data/area-chart.vue'; import areaChart from '@/components/login-data/area-chart.vue';
import gicSelectGroupMult from '@/components/login-data/gic-select-group-mult.vue'; import gicSelectGroupMult from '@/components/login-data/gic-select-group-mult.vue';
...@@ -87,17 +85,6 @@ export default { ...@@ -87,17 +85,6 @@ export default {
name: 'activeDetail', name: 'activeDetail',
data() { data() {
return { return {
// 面包屑参数
navpath: [
{
name: '好办使用详情',
path: '/enterpriseUseData?brandId=' + this.$route.query.brandId
},
{
name: '区域登录明细',
path: ''
}
],
selectStartDay: '', selectStartDay: '',
selectEndDay: '', selectEndDay: '',
selectTableDay: '', selectTableDay: '',
...@@ -304,16 +291,6 @@ export default { ...@@ -304,16 +291,6 @@ export default {
}); });
} }
}, },
watch: {
activeBrand: function(newData, oldData) {
const that = this;
that.activeBrand = newData;
},
activeGroup: function(newData, oldData) {
const that = this;
that.activeGroup = newData;
}
},
mounted() { mounted() {
const that = this; const that = this;
that.selectStartDay = dateFormat.timeStampToYmd(new Date().getTime() - 7 * 24 * 3600 * 1000); that.selectStartDay = dateFormat.timeStampToYmd(new Date().getTime() - 7 * 24 * 3600 * 1000);
...@@ -323,13 +300,8 @@ export default { ...@@ -323,13 +300,8 @@ export default {
that.getTableList(); that.getTableList();
that.getTendData(); that.getTendData();
}); });
document.documentElement.style.backgroundColor = '#f0f2f5';
},
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
}, },
components: { components: {
navCrumb,
areaChart, areaChart,
gicSelectGroupMult gicSelectGroupMult
} }
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
--> -->
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
<!-- <nav-crumb :navpath="navpath"> </nav-crumb> -->
<div class="right-content"> <div class="right-content">
<div class="right-box"> <div class="right-box">
<div class="apps-content flex"> <div class="apps-content flex">
...@@ -23,12 +22,6 @@ ...@@ -23,12 +22,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="my-customer-brand">
<span class="font-14 color-606266 ">切换商户</span
><el-select class="p-l-10" v-model="activeBrand" placeholder="请选择" @change="changeSelect">
<el-option v-for="item in brandListData" :key="item.enterpriseId" :label="item.enterpriseName" :value="item.enterpriseId"> </el-option>
</el-select>
</div>
</div> </div>
<div class="data-total-view m-t-20"> <div class="data-total-view m-t-20">
<total-preview :activeBrand="activeBrand" :loginData="loginData"></total-preview> <total-preview :activeBrand="activeBrand" :loginData="loginData"></total-preview>
...@@ -84,12 +77,11 @@ ...@@ -84,12 +77,11 @@
</div> </div>
</template> </template>
<script> <script>
import navCrumb from '@/components/nav/nav.vue';
import totalPreview from '@/components/login-data/total-preview.vue'; import totalPreview from '@/components/login-data/total-preview.vue';
import dayLoginChart from '@/components/login-data/day-login-chart.vue'; import dayLoginChart from '@/components/login-data/day-login-chart.vue';
import areaProgress from '@/components/login-data/area-progress.vue'; import areaProgress from '@/components/login-data/area-progress.vue';
import timeLoginChart from '@/components/login-data/time-login-chart.vue'; import timeLoginChart from '@/components/login-data/time-login-chart.vue';
import { getRequest, postRequest } from '@/api/api'; import { getRequest } from '@/api/api';
import errMsg from '@/common/js/error'; import errMsg from '@/common/js/error';
import dateFormat from '@/filters/index.js'; import dateFormat from '@/filters/index.js';
// import { _debounce } from '@/common/js/public'; // import { _debounce } from '@/common/js/public';
...@@ -98,17 +90,6 @@ export default { ...@@ -98,17 +90,6 @@ export default {
name: 'activeDetail', name: 'activeDetail',
data() { data() {
return { return {
// 面包屑参数
navpath: [
{
name: '好办使用详情',
path: '/enterpriseUseData'
},
{
name: '激活人员明细',
path: ''
}
],
selectTendDay: '', selectTendDay: '',
selectStartDay: '', // 默认当天之前一天时间 selectStartDay: '', // 默认当天之前一天时间
selectEndDay: '', // 默认当天之前七天时间 selectEndDay: '', // 默认当天之前七天时间
...@@ -119,7 +100,6 @@ export default { ...@@ -119,7 +100,6 @@ export default {
return time.getTime() >= Date.now() - 8.64e7 || time.getTime() < seven; return time.getTime() >= Date.now() - 8.64e7 || time.getTime() < seven;
} }
}, },
brandListData: [],
activeBrand: '', activeBrand: '',
loginData: { loginData: {
totalClerkCnt: '0', totalClerkCnt: '0',
...@@ -161,47 +141,6 @@ export default { ...@@ -161,47 +141,6 @@ export default {
that.getTendData(); that.getTendData();
}, },
/** /**
* 选择品牌
*/
changeSelect(val) {
const that = this;
that.brandListData.forEach(ele => {
if (ele.enterpriseId == val) {
that.activeBrand = ele.enterpriseId;
}
});
that.getLoginData();
that.getTendData();
that.getAreaLoginData();
},
/**
* 获取品牌
*/
getBrandData() {
const that = this;
postRequest('/haoban-manage3-web/wx-enterprise-list', {})
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
if (!!resData.result && !!resData.result.length) {
that.brandListData = resData.result;
that.activeBrand = sessionStorage.getItem('userInfoBrandId') ? sessionStorage.getItem('userInfoBrandId') : !!that.$route.query.brandId ? that.$route.query.brandId : that.brandListData[0].enterpriseId;
that.getLoginData();
that.getTendData();
that.getAreaLoginData();
}
return;
}
errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
});
},
/**
* 路由跳转 * 路由跳转
*/ */
changeRoute(path) { changeRoute(path) {
...@@ -308,30 +247,17 @@ export default { ...@@ -308,30 +247,17 @@ export default {
}); });
} }
}, },
watch: {
// activeBrand: function(newData, oldData) {
// const that = this;
// if (newData) {
// // that.getLoginData();
// // that.getTendData();
// // that.getAreaLoginData();
// }
// that.activeBrand = newData;
// }
},
mounted() { mounted() {
const that = this; const that = this;
that.selectStartDay = dateFormat.timeStampToYmd(new Date().getTime() - 7 * 24 * 3600 * 1000); that.selectStartDay = dateFormat.timeStampToYmd(new Date().getTime() - 7 * 24 * 3600 * 1000);
that.selectEndDay = dateFormat.timeStampToYmd(new Date().getTime() - 24 * 3600 * 1000); that.selectEndDay = dateFormat.timeStampToYmd(new Date().getTime() - 24 * 3600 * 1000);
that.selectTendDay = dateFormat.timeStampToYmd(new Date().getTime() - 24 * 3600 * 1000); that.selectTendDay = dateFormat.timeStampToYmd(new Date().getTime() - 24 * 3600 * 1000);
that.getBrandData(); this.activeBrand = JSON.parse(sessionStorage.getItem('userInfos') || '{}').enterpriseId;
document.documentElement.style.backgroundColor = '#f0f2f5'; that.getLoginData();
}, that.getTendData();
destroyed() { that.getAreaLoginData();
document.documentElement.style.backgroundColor = '#fff';
}, },
components: { components: {
navCrumb,
totalPreview, totalPreview,
dayLoginChart, dayLoginChart,
areaProgress, areaProgress,
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
--> -->
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
<nav-crumb :navpath="navpath"> </nav-crumb>
<div class="right-content"> <div class="right-content">
<div class="right-box" style="min-height: calc(100vh - 104px);"> <div class="right-box" style="min-height: calc(100vh - 104px);">
<div class="apps-content flex" style="min-height: calc(100vh - 104px);"> <div class="apps-content flex" style="min-height: calc(100vh - 104px);">
...@@ -134,7 +133,6 @@ ...@@ -134,7 +133,6 @@
</div> </div>
</template> </template>
<script> <script>
import navCrumb from '@/components/nav/nav.vue';
import gicSelectGroupMult from '@/components/login-data/gic-select-group-mult.vue'; import gicSelectGroupMult from '@/components/login-data/gic-select-group-mult.vue';
import dayLoginChart from '@/components/login-data/day-login-chart.vue'; import dayLoginChart from '@/components/login-data/day-login-chart.vue';
import timeLoginChart from '@/components/login-data/time-login-chart.vue'; import timeLoginChart from '@/components/login-data/time-login-chart.vue';
...@@ -147,17 +145,6 @@ export default { ...@@ -147,17 +145,6 @@ export default {
name: 'activeDetail', name: 'activeDetail',
data() { data() {
return { return {
// 面包屑参数
navpath: [
{
name: '好办使用详情',
path: '/enterpriseUseData?brandId=' + this.$route.query.brandId
},
{
name: '登录人员明细',
path: ''
}
],
selectTendDay: '', selectTendDay: '',
activeName: 'first', activeName: 'first',
selectStartDay: '', selectStartDay: '',
...@@ -415,16 +402,6 @@ export default { ...@@ -415,16 +402,6 @@ export default {
}); });
} }
}, },
watch: {
activeBrand: function(newData, oldData) {
const that = this;
that.activeBrand = newData;
},
activeGroup: function(newData, oldData) {
const that = this;
that.activeGroup = newData;
}
},
mounted() { mounted() {
const that = this; const that = this;
that.selectStartDay = dateFormat.timeStampToYmd(new Date().getTime() - 7 * 24 * 3600 * 1000); that.selectStartDay = dateFormat.timeStampToYmd(new Date().getTime() - 7 * 24 * 3600 * 1000);
...@@ -436,13 +413,8 @@ export default { ...@@ -436,13 +413,8 @@ export default {
that.getTableList(); that.getTableList();
that.getTendData(); that.getTendData();
}); });
document.documentElement.style.backgroundColor = '#f0f2f5';
},
destroyed() {
document.documentElement.style.backgroundColor = '#fff';
}, },
components: { components: {
navCrumb,
gicSelectGroupMult, gicSelectGroupMult,
dayLoginChart, dayLoginChart,
timeLoginChart timeLoginChart
......
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