From f2159ab1d632d342d0bb38288a7239e9c28a9749 Mon Sep 17 00:00:00 2001
From: "452061493@qq.com" <452061493@qq.com>
Date: Mon, 15 Apr 2024 17:29:55 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=EF=BC=88=E5=AD=97=E7=AC=A6=E6=88=AA=E6=96=AD=EF=BC=89?=
 =?UTF-8?q?=202.=E4=BC=81=E4=B8=9A=E8=AF=A6=E6=83=85=E5=92=8C=E6=89=A7?=
 =?UTF-8?q?=E6=B3=95=E4=BF=A1=E6=81=AF=E7=99=BB=E8=AE=B0=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8F=B3=E4=B8=8A=E8=A7=92=E6=B7=BB=E5=8A=A0"=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E9=A6=96=E9=A1=B5=E2=80=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/common/analyse.vue                | 18 +++++++++++++---
 src/views/enforce/enterpriseScanPreview.vue | 24 +++++++++++++++++----
 src/views/enforce/sign.vue                  | 14 +++++++++++-
 3 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/src/views/common/analyse.vue b/src/views/common/analyse.vue
index 6bd8825..6f2db13 100644
--- a/src/views/common/analyse.vue
+++ b/src/views/common/analyse.vue
@@ -116,10 +116,13 @@ const initSchedule = (dataAll,targetId) =>{
   var myChartLine = echarts.init(document.getElementById(targetId));
   let myColor = ['#3C83FF']
   var option = {
+    tooltip: {
+      trigger: 'item'
+    },
     grid: { // 直角坐标系内绘图网格
       top: '-5%',
       bottom: '5%',
-      left: '45%', //grid 组件离容器左侧的距离,
+      left: '50%', //grid 组件离容器左侧的距离,
       //left的值可以是80这样具体像素值，
       //也可以是'80%'这样相对于容器高度的百分比
       right: '18%',
@@ -172,6 +175,15 @@ const initSchedule = (dataAll,targetId) =>{
           ]
           return arr.join('')
         },
+        formatter: function (params) {
+          var maxLength = 6;
+          //判断长度，超出使用...代替
+          if (params && params.length > maxLength) {
+            return params.substring(0, maxLength - 1) + '.';
+          } else {
+            return params;
+          }
+        },
         textStyle: {
           rich: {
             a: {
@@ -197,7 +209,7 @@ const initSchedule = (dataAll,targetId) =>{
     },
     series: [ //系列列表。每个系列通过 type 决定自己的图表类型
       {
-        name: '%', //系列名称
+        name: '', //系列名称
         type: 'bar', //柱状、条形图
         barWidth: 15, //柱条的宽度,默认自适应
         data: dataAll.dataPercent, //系列中数据内容数组
@@ -231,7 +243,7 @@ const initSchedule = (dataAll,targetId) =>{
         //zlevel 大的 Canvas 会放在 zlevel 小的 Canvas 的上面
       },
       {
-        name: '进度条背景',
+        name: '',
         type: 'bar',
         label: { //图形上的文本标签
           show: true,
diff --git a/src/views/enforce/enterpriseScanPreview.vue b/src/views/enforce/enterpriseScanPreview.vue
index 1bfe7b4..fe71553 100644
--- a/src/views/enforce/enterpriseScanPreview.vue
+++ b/src/views/enforce/enterpriseScanPreview.vue
@@ -11,6 +11,7 @@
 			</header-nav>
 		</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="white-body">
@@ -60,6 +61,14 @@ const boutiqueAttr = reactive({
 }); // 商品卡片展示
 
 
+
+// 返回首页
+const toEnforceHomeView = () =>{
+  router.push({
+    path: "/enforceHome",
+  });
+};
+
 const toSign = () =>{
   router.push({ 
           path: "/sign",
@@ -92,10 +101,10 @@ const toRegistrationListView = async() =>{
           path: "/enterprise/registrationList",
     });
 }
-const toComplaintView = async() =>{
-    router.push({ 
-          path: "/enterprise/complaint",
-    });
+const toComplaintView = async() => {
+  router.push({
+    path: "/enterprise/complaint",
+  });
 }
 
 // 触底加载
@@ -154,6 +163,13 @@ const goBack = () => {
   }
 }
 
+.tohome {
+  position: absolute;
+  top: 1.25%;
+  right: 5%;
+  font-size: 0.5rem;
+}
+
 /deep/ .van-tabs__wrap {
   padding: 2% 3%;
 }
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index fe6cbc1..8ade12b 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -4,6 +4,7 @@
 		<div class="header_body">
 			<header-nav :slefBack="true" @goBack="goBack" :titelText="`执法信息登记`"></header-nav>
 		</div>
+    <span class="tohome" @click="toEnforceHomeView"><i class="van-badge__wrapper van-icon van-icon-wap-home-o"></i></span>
 		<!-- 中间 -->
 		<div class="warp_body">
             <van-form @failed="onFailed" @submit="submit">
@@ -305,7 +306,12 @@ const goBack = () => {
 	router.go(-1);
 };
 
-
+// 返回首页
+const toEnforceHomeView = () =>{
+  router.push({
+    path: "/enforceHome",
+  });
+};
 
 const uploadFiles = (file) =>{
     uploadFile(file,(res) =>{
@@ -388,6 +394,12 @@ const reciveData2 = (item) =>{
 </script>
 
 <style lang="less" scoped>
+.tohome {
+  position: absolute;
+  top: 1.25%;
+  right: 5%;
+  font-size: 0.5rem;
+}
 .address_edit {
     display: flex;
     flex-direction: column;