Browse Source

1.修改统计分析(字符截断)

2.企业详情和执法信息登记页面右上角添加"返回首页“
master
蟑螂恶霸 3 years ago
parent
commit
f2159ab1d6
  1. 18
      src/views/common/analyse.vue
  2. 16
      src/views/enforce/enterpriseScanPreview.vue
  3. 14
      src/views/enforce/sign.vue

18
src/views/common/analyse.vue

@ -116,10 +116,13 @@ const initSchedule = (dataAll,targetId) =>{
var myChartLine = echarts.init(document.getElementById(targetId)); var myChartLine = echarts.init(document.getElementById(targetId));
let myColor = ['#3C83FF'] let myColor = ['#3C83FF']
var option = { var option = {
tooltip: {
trigger: 'item'
},
grid: { // 直角坐标系内绘图网格 grid: { // 直角坐标系内绘图网格
top: '-5%', top: '-5%',
bottom: '5%', bottom: '5%',
left: '45%', //grid 组件离容器左侧的距离, left: '50%', //grid 组件离容器左侧的距离,
//left的值可以是80这样具体像素值, //left的值可以是80这样具体像素值,
//也可以是'80%'这样相对于容器高度的百分比 //也可以是'80%'这样相对于容器高度的百分比
right: '18%', right: '18%',
@ -172,6 +175,15 @@ const initSchedule = (dataAll,targetId) =>{
] ]
return arr.join('') return arr.join('')
}, },
formatter: function (params) {
var maxLength = 6;
//判断长度,超出使用...代替
if (params && params.length > maxLength) {
return params.substring(0, maxLength - 1) + '.';
} else {
return params;
}
},
textStyle: { textStyle: {
rich: { rich: {
a: { a: {
@ -197,7 +209,7 @@ const initSchedule = (dataAll,targetId) =>{
}, },
series: [ //系列列表。每个系列通过 type 决定自己的图表类型 series: [ //系列列表。每个系列通过 type 决定自己的图表类型
{ {
name: '%', //系列名称 name: '', //系列名称
type: 'bar', //柱状、条形图 type: 'bar', //柱状、条形图
barWidth: 15, //柱条的宽度,默认自适应 barWidth: 15, //柱条的宽度,默认自适应
data: dataAll.dataPercent, //系列中数据内容数组 data: dataAll.dataPercent, //系列中数据内容数组
@ -231,7 +243,7 @@ const initSchedule = (dataAll,targetId) =>{
//zlevel 大的 Canvas 会放在 zlevel 小的 Canvas 的上面 //zlevel 大的 Canvas 会放在 zlevel 小的 Canvas 的上面
}, },
{ {
name: '进度条背景', name: '',
type: 'bar', type: 'bar',
label: { //图形上的文本标签 label: { //图形上的文本标签
show: true, show: true,

16
src/views/enforce/enterpriseScanPreview.vue

@ -11,6 +11,7 @@
</header-nav> </header-nav>
</div> </div>
<span class="tohome" @click="toEnforceHomeView"><i class="van-badge__wrapper van-icon van-icon-wap-home-o"></i></span>
<!-- 中间 --> <!-- 中间 -->
<div class="warp_body"> <div class="warp_body">
<div class="white-body"> <div class="white-body">
@ -60,6 +61,14 @@ const boutiqueAttr = reactive({
}); // 商品卡片展示 }); // 商品卡片展示
// 返回首页
const toEnforceHomeView = () =>{
router.push({
path: "/enforceHome",
});
};
const toSign = () =>{ const toSign = () =>{
router.push({ router.push({
path: "/sign", path: "/sign",
@ -154,6 +163,13 @@ const goBack = () => {
} }
} }
.tohome {
position: absolute;
top: 1.25%;
right: 5%;
font-size: 0.5rem;
}
/deep/ .van-tabs__wrap { /deep/ .van-tabs__wrap {
padding: 2% 3%; padding: 2% 3%;
} }

14
src/views/enforce/sign.vue

@ -4,6 +4,7 @@
<div class="header_body"> <div class="header_body">
<header-nav :slefBack="true" @goBack="goBack" :titelText="`执法信息登记`"></header-nav> <header-nav :slefBack="true" @goBack="goBack" :titelText="`执法信息登记`"></header-nav>
</div> </div>
<span class="tohome" @click="toEnforceHomeView"><i class="van-badge__wrapper van-icon van-icon-wap-home-o"></i></span>
<!-- 中间 --> <!-- 中间 -->
<div class="warp_body"> <div class="warp_body">
<van-form @failed="onFailed" @submit="submit"> <van-form @failed="onFailed" @submit="submit">
@ -305,7 +306,12 @@ const goBack = () => {
router.go(-1); router.go(-1);
}; };
// 返回首页
const toEnforceHomeView = () =>{
router.push({
path: "/enforceHome",
});
};
const uploadFiles = (file) =>{ const uploadFiles = (file) =>{
uploadFile(file,(res) =>{ uploadFile(file,(res) =>{
@ -388,6 +394,12 @@ const reciveData2 = (item) =>{
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.tohome {
position: absolute;
top: 1.25%;
right: 5%;
font-size: 0.5rem;
}
.address_edit { .address_edit {
display: flex; display: flex;
flex-direction: column; flex-direction: column;

Loading…
Cancel
Save