Skip to content

周志凯 / read-space-proj

Go to a project
Commit 32e55518 by 周志凯
Options

styles: update mall

1 parent 360cf225
Expand all
Inline Side-by-side
Showing 42 changed files with 191 additions and 571 deletions
src/api/backendManage.js
...@@ -514,6 +514,9 @@ const management = { ...@@ -514,6 +514,9 @@ const management = {
editMenu(roleUnid, appUnid, params, config) { editMenu(roleUnid, appUnid, params, config) {
return req('post', `${window._vionConfig.menuUrl}/api/v1/auth/roles/${roleUnid}/apps/${appUnid}/menus`, params, config) return req('post', `${window._vionConfig.menuUrl}/api/v1/auth/roles/${roleUnid}/apps/${appUnid}/menus`, params, config)
}, },
delMenuNode(appUnid, menuUnid, params, config) {
return req('delete', `${window._vionConfig.menuUrl}/api/v1/auth/apps/${appUnid}/menus/${menuUnid}`, params, config)
},
/** /**
* 给角色分配菜单 默认 vion * 给角色分配菜单 默认 vion
*/ */
......
src/assets/i18n/langs/zh_CN.js
...@@ -518,7 +518,7 @@ const zh_CN = { ...@@ -518,7 +518,7 @@ const zh_CN = {
aliveTime: '心跳时间', aliveTime: '心跳时间',
tabWarn: '数据报警', tabWarn: '数据报警',
tabPush: '数据推送', tabPush: '数据推送',
notifyKpiMall: '商场', notifyKpiMall: '书店',
notifyKpiGate: '监控点', notifyKpiGate: '监控点',
notifyDeviceStatus: '设备状态', notifyDeviceStatus: '设备状态',
faceData: '报表数据', faceData: '报表数据',
...@@ -670,7 +670,7 @@ const zh_CN = { ...@@ -670,7 +670,7 @@ const zh_CN = {
ip: '请输入IP地址', ip: '请输入IP地址',
deviceNumber: '请输入设备序列号', deviceNumber: '请输入设备序列号',
Site: '请输入监控点名称', Site: '请输入监控点名称',
mall: '请选择所属广场', mall: '请选择所属书店',
nodata: '无数据', nodata: '无数据',
x: 'X轴', x: 'X轴',
y: 'Y轴', y: 'Y轴',
...@@ -720,7 +720,8 @@ const zh_CN = { ...@@ -720,7 +720,8 @@ const zh_CN = {
intervalSelect: '请选择间隔时间', intervalSelect: '请选择间隔时间',
orderNumberSelect: '请输入阶数', orderNumberSelect: '请输入阶数',
startMinSelect: '请输入开始分钟', startMinSelect: '请输入开始分钟',
endMinSelect: '请输入结束分钟' endMinSelect: '请输入结束分钟',
timeSelect: '请选择时间'
}, },
message:{ message:{
get: '获取', get: '获取',
...@@ -804,8 +805,8 @@ const zh_CN = { ...@@ -804,8 +805,8 @@ const zh_CN = {
deviceSelect: '请选择设备序列号!', deviceSelect: '请选择设备序列号!',
unsupportChartType: '图表类型不支持!', unsupportChartType: '图表类型不支持!',
businessTimeErr: '营业时间设置失败!', businessTimeErr: '营业时间设置失败!',
addMallErr: '添加广场失败!', addMallErr: '添加书店失败!',
editMallErr: '编辑广场失败!', editMallErr: '编辑书店失败!',
emptyShop: '区域为空!', emptyShop: '区域为空!',
notSupportFunction: '您没有此功能的访问权限或项目使用的硬件产品不支持此功能!!', notSupportFunction: '您没有此功能的访问权限或项目使用的硬件产品不支持此功能!!',
customLossTimeVaild: '自定义流失时间不合法!' customLossTimeVaild: '自定义流失时间不合法!'
......
src/main.js
...@@ -57,7 +57,7 @@ Object.keys(custom).forEach(key => { ...@@ -57,7 +57,7 @@ Object.keys(custom).forEach(key => {
// 读取配置文件 多项目 默认6.0 平台 // 读取配置文件 多项目 默认6.0 平台
document.title = '阅读空间' document.title = '阅读空间'
Vue.prototype.$Project = 'store' Vue.prototype.$Project = 'mall'
// 读取配置文件 菜单权限 默认有菜单权限 // 读取配置文件 菜单权限 默认有菜单权限
Vue.prototype.$Menu = window._vionConfig.allMenu || false; Vue.prototype.$Menu = window._vionConfig.allMenu || false;
......
src/views/Analysis/AdditionHeatmap/addHeatmap.vue
<template> <template>
<div class="addition-heatmap" @mousemove="mousemoveHandle" @mouseout="mouseoutHandle"> <div class="addition-heatmap" @mousemove="mousemoveHandle" @mouseout="mouseoutHandle">
<el-header height="70px"> <el-header height="70px">
<span class="seq-title">门店客流统计</span> <span class="seq-title">{{ $t('echartsTitle.faceDistributionfaceTraffic') }}</span>
<span class="more-option-wrapper" @click="showCollapse"> <span class="more-option-wrapper" @click="showCollapse">
<span class="more-option-text">更多选项</span> <span class="more-option-text">{{ $t('asis.moreOp') }}</span>
<i :class="moreOptVisible ? 'el-icon-arrow-down more-option-arrow' : 'el-icon-arrow-down more-option-arrow more-option-up'"></i> <i :class="moreOptVisible ? 'el-icon-arrow-down more-option-arrow' : 'el-icon-arrow-down more-option-arrow more-option-up'"></i>
</span> </span>
</el-header> </el-header>
...@@ -11,17 +11,17 @@ ...@@ -11,17 +11,17 @@
<div class="heatmap-condition" v-show="moreOptVisible"> <div class="heatmap-condition" v-show="moreOptVisible">
<ul class="condition-box"> <ul class="condition-box">
<li class="condition-item"> <li class="condition-item">
<span class="condition-item-text">店铺: </span> <span class="condition-item-text">{{ $t('asisTab.storeT') }}</span>
<div class="condition-item-option"> <div class="condition-item-option">
<el-select v-model="storeVal" placeholder="选择门店"> <el-select v-model="storeVal" :placeholder="$t('pholder.shopS')">
<!-- <el-option v-for="" :key=""></el-option> --> <!-- <el-option v-for="" :key=""></el-option> -->
</el-select> </el-select>
</div> </div>
</li> </li>
<li class="condition-item"> <li class="condition-item">
<span class="condition-item-text">日期: </span> <span class="condition-item-text">{{ $t('asisTab.date') }}</span>
<div class="condition-item-option"> <div class="condition-item-option">
<el-date-picker v-model="timeVal" class="time-opt" placeholder="请选择时间" :picker-options="pickerOptions1"></el-date-picker> <el-date-picker v-model="timeVal" class="time-opt" :placeholder="$t('pholder.timeSelect')" :picker-options="pickerOptions1"></el-date-picker>
</div> </div>
</li> </li>
<li class="condition-item"> <li class="condition-item">
......
src/views/Analysis/common/option/actMoreOption.vue
...@@ -341,29 +341,11 @@ export default { ...@@ -341,29 +341,11 @@ export default {
}, },
created() { created() {
this.yearTime = new Date(); this.yearTime = new Date();
this.tabItem = []; this.tabItem = [{
if(this.$Project === 'mall') { label: 'mall',
let localCondition = { value: 'mall',
'mall': 'mall', className: 'analysis-item'
'inOut': 'io', }]
'floor': 'floor',
'store': 'shop',
'format': 'format',
};
for(let i in localCondition) {
this.tabItem.push({
label: i,
value: localCondition[i],
className: 'analysis-item'
})
}
} else {
this.tabItem = [{
label: 'mall',
value: 'mall',
className: 'analysis-item'
}]
}
this.tabClickHandle(0); this.tabClickHandle(0);
let _this = this; let _this = this;
_this.windowWidth = window.innerWidth _this.windowWidth = window.innerWidth
......
src/views/Analysis/common/option/basicAsisOption.vue
...@@ -357,14 +357,8 @@ export default { ...@@ -357,14 +357,8 @@ export default {
} }
}, },
created() { created() {
this.tabItem = []; this.tabItem = ['mall'].map(item => ({ label: item, value: item }))
if (this.$Project === 'mall') { this.gateLevelList = ['all', 'mall'].map(item => ({ label: item, value: item }))
this.tabItem = (['mall', 'gate', 'floor', 'zone', 'format']).map(item => ({ label: item, value: item }))
this.gateLevelList = ['all', 'mall', 'floor', 'zone'].map(item => ({ label: item, value: item }))
} else {
this.tabItem = ['mall'].map(item => ({ label: item, value: item }))
this.gateLevelList = ['all', 'mall'].map(item => ({ label: item, value: item }))
}
}, },
mounted() { mounted() {
this.tabClickHandle('mall'); this.tabClickHandle('mall');
......
src/views/Analysis/common/option/comprehenMoreOption.vue
...@@ -391,28 +391,11 @@ export default { ...@@ -391,28 +391,11 @@ export default {
} }
}, },
created() { created() {
this.tabItem = []; this.tabItem = [{
if(this.$Project === 'mall') { label: 'mall',
let localCondition = { value: 'mall',
'mall': 'mall', className: 'analysis-item'
'inOut': 'io', }]
'floor': 'floor',
'store': 'shop'
};
for(let i in localCondition) {
this.tabItem.push({
label: i,
value: localCondition[i],
className: 'analysis-item'
})
}
} else {
this.tabItem = [{
label: 'mall',
value: 'mall',
className: 'analysis-item'
}]
}
}, },
methods: { methods: {
i18nFormatter(label){ i18nFormatter(label){
......
src/views/Analysis/common/option/comtMoreOption.vue
...@@ -268,28 +268,11 @@ export default { ...@@ -268,28 +268,11 @@ export default {
} }
}, },
created() { created() {
this.tabItem = []; this.tabItem = [{
if(this.$Project === 'mall') { label: 'mall',
let localCondition = { value: 'mall',
'mall': 'mall', className: 'analysis-item'
'inOut': 'io', }]
'floor': 'floor',
'store': 'shop'
};
for(let i in localCondition) {
this.tabItem.push({
label: i,
value: localCondition[i],
className: 'analysis-item'
})
}
} else {
this.tabItem = [{
label: 'mall',
value: 'mall',
className: 'analysis-item'
}]
}
}, },
methods: { methods: {
i18nFormatter(label){ i18nFormatter(label){
......
src/views/Analysis/common/option/durationTimeOption.vue
...@@ -266,20 +266,12 @@ export default { ...@@ -266,20 +266,12 @@ export default {
} }
}, },
created() { created() {
this.tabItem = []; this.tabItem = [
if (this.$Project === "mall") { {
this.tabItem = ["mall", "floor"].map(item => ({ label: "mall",
label: item, value: "mall"
value: item }
})); ];
} else {
this.tabItem = [
{
label: "mall",
value: "mall"
}
];
}
this.asisLevel = "mall"; this.asisLevel = "mall";
}, },
mounted() { mounted() {
......
src/views/Analysis/common/option/floorHeatmapMoreOption.vue
...@@ -308,47 +308,18 @@ export default { ...@@ -308,47 +308,18 @@ export default {
} }
}, },
created() { created() {
this.tabItem = []; this.tabItem = [{
if(this.$Project === 'mall') { label: 'mall',
let localCondition = { value: 'mall',
// 'mall': 'mall', className: 'analysis-item'
// 'inOut': 'io', }];
'floor': 'floor', this.gateLevelList = [{
// 'store': 'shop' label: 'all',
}; value: 'all'
let gateleve = { }, {
'all': 'all', label: 'mall',
'mall': 'mall', value: 'mall'
'floor': 'floor', }];
'store': 'zone',
}
for(let i in localCondition) {
this.tabItem.push({
label: i,
value: localCondition[i],
className: 'analysis-item'
})
}
for(let i in gateleve) {
this.gateLevelList.push({
label: i,
value: gateleve[i],
})
}
} else {
this.tabItem = [{
label: 'mall',
value: 'mall',
className: 'analysis-item'
}];
this.gateLevelList = [{
label: 'all',
value: 'all'
}, {
label: 'mall',
value: 'mall'
}];
}
}, },
watch: { watch: {
dayTime(val) { dayTime(val) {
...@@ -885,6 +856,7 @@ export default { ...@@ -885,6 +856,7 @@ export default {
mounted() { mounted() {
let {dayDate, weekDate, monthDate , yearDate, customDate} = this.createDate(); let {dayDate, weekDate, monthDate , yearDate, customDate} = this.createDate();
this.dayTime = dayDate; this.dayTime = dayDate;
this.tabClickHandle(0);
// this.weekTime = this.weekTime ? this.weekTime : new Date(); // this.weekTime = this.weekTime ? this.weekTime : new Date();
// this.monthTime = this.monthTime ? this.monthTime : new Date(); // this.monthTime = this.monthTime ? this.monthTime : new Date();
// this.yearTime = this.yearTime ? this.yearTime : new Date(); // this.yearTime = this.yearTime ? this.yearTime : new Date();
......
src/views/Analysis/common/option/floorTrafficheatMoreOption.vue
...@@ -324,34 +324,17 @@ export default { ...@@ -324,34 +324,17 @@ export default {
} }
}, },
created() { created() {
this.tabItem = []; this.tabItem = [{
if(this.$Project === 'mall') { label: 'mall',
let localCondition = { value: 'mall',
'mall': 'mall', className: 'analysis-item'
// // 'inOut': 'io',
// 'floor': 'floor',
// 'store': 'shop'
};
for(let i in localCondition) {
this.tabItem.push({
label: i,
value: localCondition[i],
className: 'analysis-item'
})
}
} else {
this.tabItem = [{
label: 'mall',
value: 'mall',
className: 'analysis-item'
}
// , {
// label: 'inOut',
// value: 'io',
// className: 'analysis-item'
// }
]
} }
// , {
// label: 'inOut',
// value: 'io',
// className: 'analysis-item'
// }
]
this.tabClickHandle(0); this.tabClickHandle(0);
}, },
watcn: { watcn: {
......
src/views/Analysis/common/option/holidayMoreOption.vue
...@@ -262,29 +262,11 @@ export default { ...@@ -262,29 +262,11 @@ export default {
} }
}, },
created() { created() {
this.tabItem = []; this.tabItem = [{
if(this.$Project === 'mall') { label: 'mall',
let localCondition = { value: 'mall',
'mall': 'mall', className: 'analysis-item'
'inOut': 'io', }]
'floor': 'floor',
'store': 'shop',
'format': 'format'
};
for(let i in localCondition) {
this.tabItem.push({
label: i,
value: localCondition[i],
className: 'analysis-item'
})
}
} else {
this.tabItem = [{
label: 'mall',
value: 'mall',
className: 'analysis-item'
}]
}
this.tabClickHandle(0); this.tabClickHandle(0);
}, },
watch: { watch: {
......
src/views/Analysis/common/option/ioFlowOption.vue
...@@ -332,28 +332,11 @@ export default { ...@@ -332,28 +332,11 @@ export default {
} }
}, },
created() { created() {
this.tabItem = []; this.tabItem = [{
if(this.$Project === 'mall') { label: 'mall',
let localCondition = { value: 'mall',
'mall': 'mall', className: 'analysis-item'
'inOut': 'io', }]
'floor': 'floor',
'store': 'shop'
};
for(let i in localCondition) {
this.tabItem.push({
label: i,
value: localCondition[i],
className: 'analysis-item'
})
}
} else {
this.tabItem = [{
label: 'mall',
value: 'mall',
className: 'analysis-item'
}]
}
this.tabClickHandle(0); this.tabClickHandle(0);
}, },
mounted() { mounted() {
......
src/views/Analysis/common/option/mainStoreMoreOption.vue
...@@ -314,34 +314,17 @@ export default { ...@@ -314,34 +314,17 @@ export default {
} }
}, },
created() { created() {
this.tabItem = []; this.tabItem = [{
if(this.$Project === 'mall') { label: 'mall',
let localCondition = { value: 'mall',
'mall': 'mall', className: 'analysis-item'
// 'inOut': 'io', },
// 'floor': 'floor', // {
// 'store': 'shop' // label: 'inOut',
}; // value: 'io',
for(let i in localCondition) { // className: 'analysis-item'
this.tabItem.push({ // }
label: i, ]
value: localCondition[i],
className: 'analysis-item'
})
}
} else {
this.tabItem = [{
label: 'mall',
value: 'mall',
className: 'analysis-item'
},
// {
// label: 'inOut',
// value: 'io',
// className: 'analysis-item'
// }
]
}
this.tabClickHandle(0); this.tabClickHandle(0);
}, },
watch: { watch: {
......
src/views/Analysis/common/option/mlMoreOption.vue
...@@ -177,25 +177,11 @@ export default { ...@@ -177,25 +177,11 @@ export default {
} }
}, },
created() { created() {
this.tabItem = []; this.tabItem.push({
if(this.$Project === 'mall') { label: 'floor',
let localCondition = { value: 'floor',
'floor': 'floor' className: 'analysis-item'
}; })
for(let i in localCondition) {
this.tabItem.push({
label: i,
value: localCondition[i],
className: 'analysis-item'
})
}
} else {
this.tabItem.push({
label: 'floor',
value: 'floor',
className: 'analysis-item'
})
}
}, },
watch: { watch: {
dayTime(val) { dayTime(val) {
......
src/views/Analysis/common/option/pointHeatMoreOption.vue
...@@ -293,34 +293,17 @@ export default { ...@@ -293,34 +293,17 @@ export default {
} }
}, },
created() { created() {
this.tabItem = []; this.tabItem = [{
if(this.$Project === 'mall') { label: 'mall',
let localCondition = { value: 'mall',
'mall': 'mall', className: 'analysis-item'
// // 'inOut': 'io',
// 'floor': 'floor',
// 'store': 'shop'
};
for(let i in localCondition) {
this.tabItem.push({
label: i,
value: localCondition[i],
className: 'analysis-item'
})
}
} else {
this.tabItem = [{
label: 'mall',
value: 'mall',
className: 'analysis-item'
}
// , {
// label: 'inOut',
// value: 'io',
// className: 'analysis-item'
// }
]
} }
// , {
// label: 'inOut',
// value: 'io',
// className: 'analysis-item'
// }
]
this.tabClickHandle(0); this.tabClickHandle(0);
}, },
methods: { methods: {
......
src/views/Analysis/common/option/rankOption.vue
...@@ -401,29 +401,11 @@ export default { ...@@ -401,29 +401,11 @@ export default {
} }
}, },
created() { created() {
this.tabItem = []; this.tabItem = [{
if(this.$Project === 'mall') { label: 'mall',
let localCondition = { value: 'mall',
'mall': 'mall', className: 'analysis-item'
'inOut': 'io', }]
'floor': 'floor',
'store': 'shop',
'format': 'format'
};
for(let i in localCondition) {
this.tabItem.push({
label: i,
value: localCondition[i],
className: 'analysis-item'
})
}
} else {
this.tabItem = [{
label: 'mall',
value: 'mall',
className: 'analysis-item'
}]
}
this.tabClickHandle(0); this.tabClickHandle(0);
}, },
methods: { methods: {
......
src/views/Analysis/common/option/retentionMoreOption.vue
...@@ -114,18 +114,10 @@ export default { ...@@ -114,18 +114,10 @@ export default {
} }
}, },
created() { created() {
this.tabItem = [] this.tabItem = [{
if (this.$Project === 'mall') { label: 'mall',
this.tabItem = ['mall'].map(item => ({ value: 'mall'
label: item, }]
value: item
}))
} else {
this.tabItem = [{
label: 'mall',
value: 'mall'
}]
}
this.asisLevel = 'mall' this.asisLevel = 'mall'
}, },
methods: { methods: {
......
src/views/Analysis/common/option/returnshopMoreOption.vue
...@@ -379,28 +379,11 @@ export default { ...@@ -379,28 +379,11 @@ export default {
} }
}, },
created() { created() {
this.tabItem = []; this.tabItem = [{
if(this.$Project === 'mall') { label: 'mall',
let localCondition = { value: 'mall',
'mall': 'mall', className: 'analysis-item'
'inOut': 'io', }]
'floor': 'floor',
'store': 'shop'
};
for(let i in localCondition) {
this.tabItem.push({
label: i,
value: localCondition[i],
className: 'analysis-item'
})
}
} else {
this.tabItem = [{
label: 'mall',
value: 'mall',
className: 'analysis-item'
}]
}
this.tabClickHandle(0); this.tabClickHandle(0);
}, },
methods: { methods: {
......
src/views/Analysis/common/option/seqMoreOption.vue
...@@ -366,41 +366,11 @@ export default { ...@@ -366,41 +366,11 @@ export default {
} }
}, },
created() { created() {
this.tabItem = []; this.tabItem = [{
if(this.$Project === 'mall') { label: 'mall',
let localCondition = { value: 'mall',
'mall': 'mall', className: 'analysis-item'
'inOut': 'io', }];
'floor': 'floor',
'store': 'shop',
'format': 'format'
};
let gateleve = {
'all': 'all',
'mall': 'mall',
'floor': 'floor',
'store': 'zone',
}
for(let i in localCondition) {
this.tabItem.push({
label: i,
value: localCondition[i],
className: 'analysis-item'
})
}
for(let i in gateleve) {
this.gateLevelList.push({
label: i,
value: gateleve[i],
})
}
} else {
this.tabItem = [{
label: 'mall',
value: 'mall',
className: 'analysis-item'
}];
}
this.tabClickHandle(0); this.tabClickHandle(0);
}, },
watch: { watch: {
......
src/views/Analysis/common/option/srMoreOption.vue
...@@ -348,28 +348,11 @@ export default { ...@@ -348,28 +348,11 @@ export default {
} }
}, },
created() { created() {
this.tabItem = []; this.tabItem = [{
if(this.$Project === 'mall') { label: 'mall',
let localCondition = { value: 'mall',
'mall': 'mall', className: 'analysis-item'
'inOut': 'io', }]
'floor': 'floor',
'store': 'shop'
};
for(let i in localCondition) {
this.tabItem.push({
label: i,
value: localCondition[i],
className: 'analysis-item'
})
}
} else {
this.tabItem = [{
label: 'mall',
value: 'mall',
className: 'analysis-item'
}]
}
this.tabClickHandle(0); this.tabClickHandle(0);
}, },
watch: { watch: {
......
src/views/Analysis/common/option/timeCompMoreOption.vue
...@@ -229,41 +229,11 @@ export default { ...@@ -229,41 +229,11 @@ export default {
} }
}, },
created() { created() {
this.tabItem = []; this.tabItem = [{
if(this.$Project === 'mall') { label: 'mall',
let localCondition = { value: 'mall',
'mall': 'mall', className: 'analysis-item'
'inOut': 'io', }];
'floor': 'floor',
'store': 'shop',
'format': 'format'
};
let gateleve = {
'all': 'all',
'mall': 'mall',
'floor': 'floor',
'store': 'zone',
}
for(let i in localCondition) {
this.tabItem.push({
label: i,
value: localCondition[i],
className: 'analysis-item'
})
}
for(let i in gateleve) {
this.gateLevelList.push({
label: i,
value: gateleve[i],
})
}
} else {
this.tabItem = [{
label: 'mall',
value: 'mall',
className: 'analysis-item'
}];
}
}, },
methods: { methods: {
i18nFormatter(label){ i18nFormatter(label){
...@@ -628,6 +598,7 @@ export default { ...@@ -628,6 +598,7 @@ export default {
}, },
mounted() { mounted() {
// this.tabClickHandle(0); // this.tabClickHandle(0);
this.tabClickHandle(0);
this.time1Val = this.time1Val || [this.dayReduce(new Date(), 15), dateUnit.dateFormat(new Date(), 'yyyy-MM-dd')]; this.time1Val = this.time1Val || [this.dayReduce(new Date(), 15), dateUnit.dateFormat(new Date(), 'yyyy-MM-dd')];
this.time2Val = this.time2Val || [this.dayReduce(new Date(), 30), this.dayReduce(new Date(), 16)]; this.time2Val = this.time2Val || [this.dayReduce(new Date(), 30), this.dayReduce(new Date(), 16)];
// this.initAsis(); // this.initAsis();
......
src/views/Analysis/common/option/timeMoreOption.vue
...@@ -273,41 +273,11 @@ export default { ...@@ -273,41 +273,11 @@ export default {
} }
}, },
created() { created() {
this.tabItem = []; this.tabItem = [{
if(this.$Project === 'mall') { label: 'mall',
let localCondition = { value: 'mall',
'mall': 'mall', className: 'analysis-item'
'inOut': 'io', }];
'floor': 'floor',
'store': 'shop',
'format': 'format'
};
let gateleve = {
'all': 'all',
'mall': 'mall',
'floor': 'floor',
'store': 'zone',
}
for(let i in localCondition) {
this.tabItem.push({
label: i,
value: localCondition[i],
className: 'analysis-item'
})
}
for(let i in gateleve) {
this.gateLevelList.push({
label: i,
value: gateleve[i],
})
}
} else {
this.tabItem = [{
label: 'mall',
value: 'mall',
className: 'analysis-item'
}];
}
this.tabClickHandle(0); this.tabClickHandle(0);
}, },
watch: { watch: {
......
src/views/Analysis/common/option/weatherMoreOption.vue
...@@ -269,29 +269,11 @@ export default { ...@@ -269,29 +269,11 @@ export default {
} }
}, },
created() { created() {
this.tabItem = []; this.tabItem = [{
if(this.$Project === 'mall') { label: 'mall',
let localCondition = { value: 'mall',
'mall': 'mall', className: 'analysis-item'
'inOut': 'io', }]
'floor': 'floor',
'store': 'shop',
'format': 'format'
};
for(let i in localCondition) {
this.tabItem.push({
label: i,
value: localCondition[i],
className: 'analysis-item'
})
}
} else {
this.tabItem = [{
label: 'mall',
value: 'mall',
className: 'analysis-item'
}]
}
this.tabClickHandle(0); this.tabClickHandle(0);
}, },
watch: { watch: {
......
src/views/Analysis/common/option/weekCompOption.vue
...@@ -270,48 +270,18 @@ export default { ...@@ -270,48 +270,18 @@ export default {
} }
}, },
created() { created() {
this.tabItem = []; this.tabItem = [{
if(this.$Project === 'mall') { label: 'mall',
let localCondition = { value: 'mall',
'mall': 'mall', className: 'analysis-item'
'inOut': 'io', }];
'floor': 'floor', this.gateLevelList = [{
'store': 'shop', label: 'all',
'format': 'format' value: 'all'
}; }, {
let gateleve = { label: 'mall',
'all': 'all', value: 'mall'
'mall': 'mall', }];
'floor': 'floor',
'store': 'zone',
}
for(let i in localCondition) {
this.tabItem.push({
label: i,
value: localCondition[i],
className: 'analysis-item'
})
}
for(let i in gateleve) {
this.gateLevelList.push({
label: i,
value: gateleve[i],
})
}
} else {
this.tabItem = [{
label: 'mall',
value: 'mall',
className: 'analysis-item'
}];
this.gateLevelList = [{
label: 'all',
value: 'all'
}, {
label: 'mall',
value: 'mall'
}];
}
this.tabClickHandle(0); this.tabClickHandle(0);
let _this = this; let _this = this;
_this.windowWidth = window.innerWidth _this.windowWidth = window.innerWidth
......
src/views/Management/ActManage/addAct.vue
...@@ -93,7 +93,7 @@ export default { ...@@ -93,7 +93,7 @@ export default {
{ required: true, message: '请选择状态', trigger: 'change' }, { required: true, message: '请选择状态', trigger: 'change' },
], ],
// mallId: [ // mallId: [
// { required: true, message: '请选择门店', trigger: 'change' }, // { required: true, message: '请选择书店', trigger: 'change' },
// ], // ],
// accountId: [ // accountId: [
// { required: true, message: '请选择集团', trigger: 'blur' }, // { required: true, message: '请选择集团', trigger: 'blur' },
......
src/views/Management/BlocManage/editBloc.vue
...@@ -113,11 +113,15 @@ export default { ...@@ -113,11 +113,15 @@ export default {
editDialogVisible: false, editDialogVisible: false,
uploadHeader: {}, uploadHeader: {},
editForm: { editForm: {
logoPath: '', name: '',
manager: '',
expireDate: '',
mapDisplay: 1, mapDisplay: 1,
mapLongitude: null, mapLongitude: null,
mapLatitude: null, mapLatitude: null,
mapZoom: 0 logoPath: '',
mapZoom: 0,
intro: ''
}, },
logoUploadUrl: window._vionConfig.apiUrl + "/accounts/upload", logoUploadUrl: window._vionConfig.apiUrl + "/accounts/upload",
logoPathUrl: window._vionConfig.imagesUrl + "/images/", logoPathUrl: window._vionConfig.imagesUrl + "/images/",
...@@ -150,15 +154,17 @@ export default { ...@@ -150,15 +154,17 @@ export default {
}); });
}, },
dialogInit(data) { dialogInit(data) {
console.log(data)
this.rowId = data.id; this.rowId = data.id;
Object.keys(data).forEach(k => { Object.keys(this.editForm).forEach(k => {
this.editForm[k] = data[k] this.editForm[k] = data[k]
}) })
this.editDialogVisible = true
this.editForm.mapLongitude = data.mapLongitude || null this.editForm.mapLongitude = data.mapLongitude || null
this.editForm.mapLatitude = data.mapLatitude || null this.editForm.mapLatitude = data.mapLatitude || null
this.editForm.mapZoom = data.mapZoom || 11 this.editForm.mapZoom = data.mapZoom || 11
this.editForm.logoPath = data.logoPath || "" this.editForm.logoPath = data.logoPath || ""
this.editDialogVisible = true console.log('editForm', this.editForm)
}, },
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
const isJPG = file.type === "image/jpeg"; const isJPG = file.type === "image/jpeg";
......
src/views/Management/DeviceScreenshot/addDevice.vue
...@@ -112,10 +112,10 @@ export default { ...@@ -112,10 +112,10 @@ export default {
{ required: true, message: '请输入设备序列号', trigger: 'blur' } { required: true, message: '请输入设备序列号', trigger: 'blur' }
], ],
accountId: [{ accountId: [{
required: true, message: '请选择集团', trigger: 'change' required: true, message: '请选择商户', trigger: 'change'
}], }],
mallId: [{ mallId: [{
required: true, message: '请选择门店', trigger: 'change' required: true, message: '请选择书店', trigger: 'change'
}] }]
}, },
curMallId: null, curMallId: null,
......
src/views/Management/DeviceScreenshot/bindDevice.vue
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
:close-on-click-modal="false" :close-on-click-modal="false"
@close="bindDialogClose"> @close="bindDialogClose">
<div class="mall-sel-box"> <div class="mall-sel-box">
<el-select class="belong-mall-sel" v-model="belongMallVal" placeholder="选择所属门店"> <el-select class="belong-mall-sel" v-model="belongMallVal" :placeholder="$t('pholder.mall')">
<el-option v-for="(mallItem, mallIndex) in belongMallList" :label="mallItem.name" :value="mallItem.id" :key="mallIndex"></el-option> <el-option v-for="(mallItem, mallIndex) in belongMallList" :label="mallItem.name" :value="mallItem.id" :key="mallIndex"></el-option>
</el-select> </el-select>
</div> </div>
......
src/views/Management/DeviceStatus/addDevice.vue
...@@ -112,10 +112,10 @@ export default { ...@@ -112,10 +112,10 @@ export default {
{ required: true, message: '请输入设备序列号', trigger: 'blur' } { required: true, message: '请输入设备序列号', trigger: 'blur' }
], ],
accountId: [{ accountId: [{
required: true, message: '请选择集团', trigger: 'change' required: true, message: '请选择商户', trigger: 'change'
}], }],
mallId: [{ mallId: [{
required: true, message: '请选择门店', trigger: 'change' required: true, message: '请选择书店', trigger: 'change'
}] }]
}, },
curMallId: null, curMallId: null,
......
src/views/Management/FloorManage/editFloor.vue
...@@ -90,7 +90,7 @@ export default { ...@@ -90,7 +90,7 @@ export default {
// { required: true, message: '请选择状态', trigger: 'blur' }, // { required: true, message: '请选择状态', trigger: 'blur' },
// ], // ],
mallId: [ mallId: [
{ required: true, message: '请选择门店', trigger: 'change' }, { required: true, message: '请选择书店', trigger: 'change' },
], ],
// accountId: [ // accountId: [
// { required: true, message: '请选择集团', trigger: 'change' }, // { required: true, message: '请选择集团', trigger: 'change' },
...@@ -126,7 +126,7 @@ export default { ...@@ -126,7 +126,7 @@ export default {
dialogInit(data) { dialogInit(data) {
this.rowId = data.id; this.rowId = data.id;
this.editForm = data; this.editForm = data;
this.editForm.floorPlan = data.floorPlan ? data.floorPlan : ''; this.editForm.floorPlan = data.floorPlan || '';
this.editDialogVisible = true; this.editDialogVisible = true;
}, },
dialogOpen(formDatas) { dialogOpen(formDatas) {
......
src/views/Management/FloorManage/floorManage.vue
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</span>--> </span>-->
<!-- <span class="titles">广场选择</span> --> <!-- <span class="titles">广场选择</span> -->
<div class="manage-select-box"> <div class="manage-select-box">
<el-select v-model="mallValue" filterable placeholder="广场选择" @change="mallChange"> <el-select v-model="mallValue" filterable :placeholder="$t('pholder.shopS')" @change="mallChange">
<el-option <el-option
v-for="item in mallListForTerm" v-for="item in mallListForTerm"
:key="item.id" :key="item.id"
......
src/views/Management/GateManage/addGate.vue
...@@ -200,7 +200,7 @@ export default { ...@@ -200,7 +200,7 @@ export default {
{ validator: checkY, trigger: 'change' } { validator: checkY, trigger: 'change' }
], ],
mallId: [ mallId: [
{ required: true, message: '请选择门店', trigger: 'change' }, { required: true, message: '请选择书店', trigger: 'change' },
], ],
// accountId: [ // accountId: [
// { required: true, message: '请选择集团', trigger: 'blur' } // { required: true, message: '请选择集团', trigger: 'blur' }
......
src/views/Management/GateManage/editGate.vue
...@@ -197,7 +197,7 @@ export default { ...@@ -197,7 +197,7 @@ export default {
{ validator: checkY, trigger: 'change' } { validator: checkY, trigger: 'change' }
], ],
mallId: [ mallId: [
{ required: true, message: '请选择门店', trigger: 'change' }, { required: true, message: '请选择书店', trigger: 'change' },
], ],
// accountId: [ // accountId: [
// { required: true, message: '请选择集团', trigger: 'blur' } // { required: true, message: '请选择集团', trigger: 'blur' }
......
src/views/Management/GateManage/gateManage.vue
...@@ -321,7 +321,7 @@ export default { ...@@ -321,7 +321,7 @@ export default {
// { required: true, message: '请输入y坐标', trigger: 'change' }, // { required: true, message: '请输入y坐标', trigger: 'change' },
{ validator: checkY, trigger: "change" } { validator: checkY, trigger: "change" }
], ],
mallId: [{ required: true, message: "请选择门店", trigger: "change" }], mallId: [{ required: true, message: "请选择书店", trigger: "change" }],
// accountId: [ // accountId: [
// { required: true, message: '请选择集团', trigger: 'blur' } // { required: true, message: '请选择集团', trigger: 'blur' }
// ], // ],
......
src/views/Management/HolidayManage/holidayManage.vue
...@@ -271,7 +271,7 @@ export default { ...@@ -271,7 +271,7 @@ export default {
type: [{ required: true, message: "请选择类型", trigger: "change" }], type: [{ required: true, message: "请选择类型", trigger: "change" }],
status: [{ required: true, message: "请选择状态", trigger: "change" }], status: [{ required: true, message: "请选择状态", trigger: "change" }],
// mallId: [ // mallId: [
// { required: true, message: '请选择门店', trigger: 'change' }, // { required: true, message: '请选择书店', trigger: 'change' },
// ], // ],
// accountId: [ // accountId: [
// { required: true, message: '请选择集团', trigger: 'blur' }, // { required: true, message: '请选择集团', trigger: 'blur' },
......
src/views/Management/ZoneManage/zoneManage.vue
...@@ -243,6 +243,7 @@ export default { ...@@ -243,6 +243,7 @@ export default {
getTableData() { getTableData() {
this.dataMsg = this.$t('echartsTitle.loading') this.dataMsg = this.$t('echartsTitle.loading')
let _mallId = this.mallValue || null; let _mallId = this.mallValue || null;
if (!this.blocValue || !_mallId) return
let _floorId = this.floorValue || null; let _floorId = this.floorValue || null;
var tabelParams = { var tabelParams = {
accountId: this.blocValue, accountId: this.blocValue,
......
src/views/Management/menuManage/menuManage.vue
...@@ -199,6 +199,7 @@ export default { ...@@ -199,6 +199,7 @@ export default {
this.btnDisabled = false; this.btnDisabled = false;
}, },
delNode(ev, n, d, s) { delNode(ev, n, d, s) {
const { appunid } = this
let e = ev || window.event; let e = ev || window.event;
e.stopPropagation(); e.stopPropagation();
this.$confirm( this.$confirm(
...@@ -212,22 +213,21 @@ export default { ...@@ -212,22 +213,21 @@ export default {
) )
.then(() => { .then(() => {
this.$api.management this.$api.management
.delGroup(d.unid, { .delMenuNode(appunid, d.unid)
// _t: Date.parse(new Date()) / 1000
})
.then(res => { .then(res => {
if (res.data.code == 200) { console.log(res)
if (d.unid == this.groupForm.unid) { if (res.data.ecode === 200) {
this.groupForm = { // if (d.unid == this.groupForm.unid) {
name: "", // this.groupForm = {
// nameEn: '', // name: "",
pid: -1, // // nameEn: '',
pUnid: -1, // pid: -1,
id: "", // pUnid: -1,
unid: '', // id: "",
intro: "" // unid: '',
}; // intro: ""
} // };
// }
let parent = n.parent; let parent = n.parent;
let children = parent.data.children || parent.data; let children = parent.data.children || parent.data;
let index = children.findIndex(item => item.unid === d.unid); let index = children.findIndex(item => item.unid === d.unid);
......
src/views/others-page/repeatCustomerStore.vue
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
</div> </div>
<el-table :data="tableData" class="asis-table baseasis-table" :max-height="tableHeight"> <el-table :data="tableData" class="asis-table baseasis-table" :max-height="tableHeight">
<el-table-column prop="orderNum" align="center" label="序号"></el-table-column> <el-table-column prop="orderNum" align="center" label="序号"></el-table-column>
<el-table-column prop="mallId" align="center" label="门店ID"></el-table-column> <el-table-column prop="mallId" align="center" label="书店ID"></el-table-column>
<el-table-column prop="name" align="center" label="门店名称" show-overflow-tooltip></el-table-column> <el-table-column prop="name" align="center" label="书店名称" show-overflow-tooltip></el-table-column>
<el-table-column prop="countdate" align="center" label="日期" :formatter="dateFormatter"></el-table-column> <el-table-column prop="countdate" align="center" label="日期" :formatter="dateFormatter"></el-table-column>
<el-table-column prop="count" align="center" label="多次到店人数"></el-table-column> <el-table-column prop="count" align="center" label="多次到店人数"></el-table-column>
</el-table> </el-table>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!