Commit cdcb4a8c by crushh

update: dist

parent 7e7641e4
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<ul class="datebox" v-for="(lis, index) in dateLis" :key="lis.key"> <ul class="datebox" v-for="(lis, index) in dateLis" :key="lis.key">
<li :class="dateKey == index ? 'activeClass' : 'noActive'" class="dateLisBox" @click="btnChange(index)">{{ lis.value }}</li> <li :class="dateKey == index ? 'activeClass' : 'noActive'" class="dateLisBox" @click="btnChange(index)">{{ lis.value }}</li>
</ul> </ul>
<el-date-picker class="w256" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" @change="onDateChange" value-format="yyyy-MM-dd"> </el-date-picker> <el-date-picker class="w256" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" @change="onDateChange" value-format="yyyy-MM-dd" :clearable="false"> </el-date-picker>
</div> </div>
</div> </div>
<new-add-chart :charData="charData" id="new-add-chart" style="margin-top:26px"></new-add-chart> <new-add-chart :charData="charData" id="new-add-chart" style="margin-top:26px"></new-add-chart>
...@@ -196,6 +196,21 @@ export default { ...@@ -196,6 +196,21 @@ export default {
statisticsChart(para).then(res => { statisticsChart(para).then(res => {
const { result } = res.data; const { result } = res.data;
this.charData = result; this.charData = result;
this.charData = [
{ addNum: 1, bizDate: '2021-07', clickNum: 3, clickTimes: 0 },
{ addNum: 2, bizDate: '2021-08', clickNum: 30, clickTimes: 10 },
{ addNum: 3, bizDate: '2021-09', clickNum: 40, clickTimes: 0 },
{ addNum: 4, bizDate: '2021-10', clickNum: 3, clickTimes: 40 },
{ addNum: 5, bizDate: '2021-11', clickNum: 3, clickTimes: 0 },
{ addNum: 6, bizDate: '2021-12', clickNum: 3, clickTimes: 20 },
{ addNum: 0, bizDate: '2022-01', clickNum: 30, clickTimes: 20 },
{ addNum: 6, bizDate: '2022-02', clickNum: 30, clickTimes: 0 },
{ addNum: 4, bizDate: '2022-03', clickNum: 20, clickTimes: 30 },
{ addNum: 4, bizDate: '2022-04', clickNum: 203, clickTimes: 0 },
{ addNum: 4, bizDate: '2022-05', clickNum: 20, clickTimes: 10 },
{ addNum: 4, bizDate: '2022-06', clickNum: 20, clickTimes: 0 },
{ addNum: 4, bizDate: '2022-07', clickNum: 10, clickTimes: 10 }
];
}); });
}, },
statisticsTotal() { statisticsTotal() {
...@@ -262,6 +277,7 @@ export default { ...@@ -262,6 +277,7 @@ export default {
this.getDetail(); this.getDetail();
this.getChartList(); this.getChartList();
this.statisticsTotal(); this.statisticsTotal();
this.btnChange(0);
document.getElementById('hb-layout-pager-one').addEventListener('scroll', this.scrollMethod); document.getElementById('hb-layout-pager-one').addEventListener('scroll', this.scrollMethod);
}, },
destroyed() { destroyed() {
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<span class="pageTitle">{{ card.pageTitle }}</span> <span class="pageTitle">{{ card.pageTitle }}</span>
<img src="@/assets/iphone-head.png" /> <img src="@/assets/iphone-head.png" />
<div class="content"> <div class="content">
<img :src="card.pageBackgroudImg" v-show="card.pageBackgroudImg" class="bgImg" /> <img :src="card.pageBackgroundImg" v-show="card.pageBackgroundImg" class="bgImg" />
<div class="enterpriseInfo"> <div class="enterpriseInfo">
<div class="logo"> <div class="logo">
<img :src="card.merchantLogo" /> <img :src="card.merchantLogo" />
...@@ -52,7 +52,7 @@ export default { ...@@ -52,7 +52,7 @@ export default {
merchantName: '', merchantName: '',
merchantPhoneNumber: '', merchantPhoneNumber: '',
merchantLogo: '', merchantLogo: '',
pageBackgroudImg: '', pageBackgroundImg: '',
guideComment: '' guideComment: ''
} }
}; };
...@@ -68,8 +68,8 @@ export default { ...@@ -68,8 +68,8 @@ export default {
content: { content: {
handler(val) { handler(val) {
if (val) { if (val) {
const { pageName, pageCode, pageId, pageTitle, merchantName, merchantPhoneNumber, merchantLogo, pageBackgroudImg, guideComment, createorName, createTime } = val; const { pageName, pageCode, pageId, pageTitle, merchantName, merchantPhoneNumber, merchantLogo, pageBackgroundImg, guideComment, createorName, createTime } = val;
this.card = { pageName, pageCode, pageId, pageTitle, merchantName, merchantPhoneNumber, merchantLogo, pageBackgroudImg, guideComment, createorName, createTime }; this.card = { pageName, pageCode, pageId, pageTitle, merchantName, merchantPhoneNumber, merchantLogo, pageBackgroundImg, guideComment, createorName, createTime };
} }
}, },
immediate: true immediate: true
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div> <div>
<div class="daily-set-content" v-loading="loading"> <div class="daily-set-content" v-loading="loading">
<el-form label-width="100px" ref="form" :model="form" :rules="rules" class="form"> <el-form label-width="100px" ref="form" :model="form" :rules="rules" class="form">
<el-form-item label="模板名称" prop="pageName" required> <el-form-item label="模板名称" prop="pageName">
<el-input show-word-limit placeholder="请输入模板名称" type="text" v-model="form.pageName" maxlength="20" class="w-340"></el-input> <el-input show-word-limit placeholder="请输入模板名称" type="text" v-model="form.pageName" maxlength="20" class="w-340"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="页面标题" prop="pageTitle"> <el-form-item label="页面标题" prop="pageTitle">
...@@ -79,7 +79,8 @@ export default { ...@@ -79,7 +79,8 @@ export default {
loading: false, loading: false,
btnLoading: false, btnLoading: false,
rules: { rules: {
merchantPhoneNumber: [{ validator: merchantPhoneNumberVal }] merchantPhoneNumber: [{ validator: merchantPhoneNumberVal }],
pageName: [{ required: true, message: '请输入模板名称' }]
} }
}; };
}, },
......
...@@ -37,6 +37,7 @@ export default { ...@@ -37,6 +37,7 @@ export default {
loading: false, loading: false,
total: 0, total: 0,
pageId: '', pageId: '',
dialogVisible: false,
list: [ list: [
{ {
pageName: '模板名称模板名称模板名称模板名称模板', pageName: '模板名称模板名称模板名称模板名称模板',
...@@ -197,7 +198,7 @@ export default { ...@@ -197,7 +198,7 @@ export default {
this.$router.push(`/ladingPageEdit/${item.pageId}`); this.$router.push(`/ladingPageEdit/${item.pageId}`);
}, },
goLinkDetail(referId) { goLinkDetail(referId) {
console.log(referId); this.dialogVisible = false;
this.$router.push(`/attractFlowLinkInfo/${referId}`); this.$router.push(`/attractFlowLinkInfo/${referId}`);
} }
} }
......
...@@ -60,6 +60,86 @@ export default { ...@@ -60,6 +60,86 @@ export default {
{ name: '今日点击人数', value: 'clickNum', marker: { symbol: 'line', style: { stroke: '#14C9C9', lineWidth: 12, lineHeight: 8 } } } { name: '今日点击人数', value: 'clickNum', marker: { symbol: 'line', style: { stroke: '#14C9C9', lineWidth: 12, lineHeight: 8 } } }
] ]
}); });
//坐标轴配置(法一配置)
this.chart.axis('bizDate', {
line: {
style: {
stroke: '#606266',
lineDash: [3, 3]
}
},
tickLine: {
style: {
fill: '#E4E7ED',
lineDash: [3, 3]
}
},
label: {
style: {
fill: '#606266'
}
}
});
this.chart.axis('addNum', {
grid: {
line: {
type: 'line',
style: {
stroke: '#E4E7ED',
lineDash: [3, 3]
}
}
},
label: {
style: {
fill: '#606266'
},
formatter: val => {
// 格式化参数值
return val;
}
}
});
this.chart.axis('clickTimes', {
grid: {
line: {
type: 'line',
style: {
stroke: '#E4E7ED',
lineDash: [3, 3]
}
}
},
label: {
style: {
fill: '#606266'
},
formatter: val => {
// 格式化参数值
return val;
}
}
});
this.chart.axis('clickNum', {
grid: {
line: {
type: 'line',
style: {
stroke: '#E4E7ED',
lineDash: [3, 3]
}
}
},
label: {
style: {
fill: '#606266'
},
formatter: val => {
// 格式化参数值
return val;
}
}
});
this.chart.tooltip({ this.chart.tooltip({
showCrosshairs: true, showCrosshairs: true,
shared: true, shared: true,
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<ul class="datebox" v-for="(lis, index) in dateLis" :key="lis.key"> <ul class="datebox" v-for="(lis, index) in dateLis" :key="lis.key">
<li :class="dateKey == index ? 'activeClass' : 'noActive'" class="dateLisBox" @click="btnChange(index)">{{ lis.value }}</li> <li :class="dateKey == index ? 'activeClass' : 'noActive'" class="dateLisBox" @click="btnChange(index)">{{ lis.value }}</li>
</ul> </ul>
<el-date-picker class="w256" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" @change="onDateChange" value-format="yyyy-MM-dd"> </el-date-picker> <el-date-picker class="w256" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" :picker-options="pickerOptions()" @change="onDateChange" value-format="yyyy-MM-dd" :clearable="false"> </el-date-picker>
</div> </div>
</div> </div>
<new-add-chart :charData="overViewData.dateList" id="new-add-chart"></new-add-chart> <new-add-chart :charData="overViewData.dateList" id="new-add-chart"></new-add-chart>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<ul class="datebox" v-for="(lis, index) in dateLis" :key="lis.key"> <ul class="datebox" v-for="(lis, index) in dateLis" :key="lis.key">
<li :class="active == index ? 'activeClass' : 'noActive'" class="dateLisBox" @click="btnChange(index)">{{ lis.value }}</li> <li :class="active == index ? 'activeClass' : 'noActive'" class="dateLisBox" @click="btnChange(index)">{{ lis.value }}</li>
</ul> </ul>
<el-date-picker class="w256" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd" :picker-options="pickerOptions()" @change="onDateChange"> </el-date-picker> <el-date-picker class="w256" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd" :picker-options="pickerOptions()" @change="onDateChange" :clearable="false"> </el-date-picker>
</div> </div>
</el-row> </el-row>
<el-table class="mt18" :data="tableData" @sort-change="sortChange"> <el-table class="mt18" :data="tableData" @sort-change="sortChange">
......
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