feats

src/pages/my/components/Notice.jsx

@@ -1,21 +0,0 @@
-import React from 'react';
-import { View, Image } from '@tarojs/components';
-import smallbell from '@/assets/icons/smallbell.png';
-import Taro from '@tarojs/taro';
-import style from './notice.module.less';
-
-export default (props) => {
-
-  const onClick = () => {
-    Taro.navigateTo({
-      url: `/pages/my/edit/index`
-    })
-  }
-
-  return (
-    <View className={style['wrapper-middle-box']} onClick={onClick}>
-      <Image className={style['wrapper-middle-img']} src={smallbell} />
-      <View className={style['wrapper-middle-text3']}>消息通知</View>
-    </View>
-  )
-}

src/pages/my/components/notice.module.less

@@ -1,16 +0,0 @@
-.wrapper-middle-box {
-  box-shadow: 0px 18px 22px 0px rgba(0, 0, 0, 0.06);
-  border-radius: 8px;
-  display: grid;
-  place-items: center;
-  margin-bottom: 20px;
-
-  .wrapper-middle-img {
-    width: 120px;
-    height: 120px;
-  }
-  .wrapper-middle-text3 {
-    font-size: 32px;
-    margin-bottom: 36px;
-  }
-}

src/pages/my/index.jsx

@@ -3,11 +3,18 @@ import Page from '@/layouts/index';
 import { View, Image } from '@tarojs/components';
 import headportrait from '@/assets/icons/headportrait.png';
 import peopleicon from '@/assets/icons/peopleicon.png';
+import smallbell from '@/assets/icons/smallbell.png';
 import { Card } from '@antmjs/vantui';
-import Notice from './components/Notice';
+import Taro from '@tarojs/taro';
 import './index.less';
 
 export default (props) => {
+  const onClick = () => {
+    Taro.navigateTo({
+      url: `/pages/my/edit/index`
+    })
+  }
+
   return (
     <Page tabBar="mine">
       <View className="wrapper-header">
@@ -28,7 +35,10 @@ export default (props) => {
           <View className="wrapper-middle-text">所在部门</View>
           <View className="wrapper-middle-text2">县文明办</View>
         </View>
-        <Notice />
+        <View className="wrapper-middle-box" onClick={onClick}>
+          <Image className="wrapper-middle-img" src={smallbell} />
+          <View className="wrapper-middle-text3">消息通知</View>
+        </View>
       </View>
     </Page>
   )

src/pages/my/index.less

@@ -74,4 +74,8 @@
     font-size: 28px;
     color: #757575;
   }
+  .wrapper-middle-text3 {
+    font-size: 32px;
+    margin-bottom: 50px;
+  }
 }

src/pages/statistics/index.jsx

@@ -36,6 +36,7 @@ export default (props) => {
         left: '3%',
         right: '4%',
         bottom: '3%',
+        width: '290px',
         containLabel: true
       },
       xAxis: [
@@ -47,7 +48,8 @@ export default (props) => {
       ],
       yAxis: [
         {
-          type: 'value'
+          type: 'value',
+          minInterval: 1
         }
       ],
       series: [
@@ -108,6 +110,7 @@ export default (props) => {
         left: '3%',
         right: '4%',
         bottom: '3%',
+        width: '290px',
         containLabel: true
       },
       xAxis: [
@@ -116,6 +119,7 @@ export default (props) => {
           boundaryGap: false,
           data: ['已处理', '未处理', '逾期'],
           boundaryGap: true,
+          name: '状态',
           axisTick: {
             alignWithLabel: true,
           }
@@ -123,12 +127,15 @@ export default (props) => {
       ],
       yAxis: [
         {
-          type: 'value'
+          type: 'value',
+          minInterval: 1,
+          name: '交办次数'
         }
       ],
       series: [
         {
           type: 'bar',
+          barWidth: '20%',
           itemStyle: {
             color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
               { offset: 0, color: '#F772D1' },
@@ -168,6 +175,7 @@ export default (props) => {
         left: '3%',
         right: '4%',
         bottom: '3%',
+        width: '290px',
         containLabel: true
       },
       xAxis: [
@@ -178,17 +186,23 @@ export default (props) => {
           boundaryGap: true,
           axisTick: {
             alignWithLabel: true,
+          },
+          axisLabel: {
+            interval: 0,
+            rotate: 40
           }
         }
       ],
       yAxis: [
         {
-          type: 'value'
+          type: 'value',
+          minInterval: 1
         }
       ],
       series: [
         {
           type: 'bar',
+          barWidth: '20%',
           itemStyle: {
             color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
               { offset: 0, color: '#FB9900' },
@@ -222,7 +236,7 @@ export default (props) => {
         <ec-canvas canvasId="mychart-bar" ec={ec2}></ec-canvas>
       </view>
       <view class="container">
-        <ec-canvas canvasId="mychart-bar" ec={ec3}></ec-canvas>
+        <ec-canvas canvasId="mychart-bar2" ec={ec3}></ec-canvas>
       </view>
     </Page>
   )

src/pages/statistics/index.less

@@ -3,5 +3,4 @@
   border-radius: 8px;
   margin: var(--main-space);
   height: 24%;
-  margin-bottom: 20px;
 }