feats

config/prod.js

@@ -4,6 +4,7 @@ module.exports = {
   },
   defineConstants: {
     HOST: '"http://localhost:9087"'
+    // HOST: '"https://t.njyz.tech"'
   },
   mini: {},
   h5: {

src/app.config.js

@@ -13,8 +13,7 @@ export default defineAppConfig({
     'pages/apply/verify/index',
     'pages/apply/detail/index',
     'pages/message/list/index',
-    'pages/index3/index',
-    'pages/index4/index',
+    'pages/checkStand/index',
     'pages/reporting/index',
     'pages/reporting/detail/index',
     'pages/reset-password/index',
@@ -22,7 +21,7 @@ export default defineAppConfig({
     'pages/check/loc/list/index',
     'pages/check/edit/index',
     'pages/notice/index',
-    'pages/notice/edit/index',
+    'pages/notice/detail/index',
     'pages/my/index',
     'pages/my/edit/index',
     'pages/statistics/index'

src/components/Auth.jsx

@@ -4,21 +4,9 @@ import { useModel } from '@/store';
 
 export default (props) => {
   const { roles = [] } = props;
-  const { user } = useModel('user');
+  const { duty } = useModel('user');
 
-  const targets = user?.dutyList || [];
-
-  let hasRights = false;
-  for(let role of roles) {
-    if (hasRights) {
-      continue;
-    }
-
-    const found = targets.indexOf(role) > -1;
-    if (found) {
-      hasRights = found;
-    }
-  }
+  const hasRights = roles.indexOf(duty) > -1;
 
   return !roles.length || hasRights ? props.children : (
     <View style={{width: '100%', height: '100%', display: 'grid', placeItems: 'center'}}>

src/layouts/TabBar.jsx

@@ -47,7 +47,7 @@ const check = {
   label: '测评标准',
   icon: checkIcon,
   activeIcon: checkActiveIcon,
-  page: '/pages/index4/index'
+  page: '/pages/checkStand/index'
 }
 const mine = {
   name: 'mine',
@@ -59,13 +59,13 @@ const mine = {
 }
 
 export default (props) => {
-  const { active = -1, className, user } = props;
+  const { active = -1, className, duty } = props;
 
   const tabItems = React.useMemo(() => {
-    if (!user) return [];
+    if (!duty) return [];
 
-    if (user.dutyList.indexOf(ROLE_INSPECTOR) > -1 // 督察员
-      || user.dutyList.indexOf(ROLE_MANAGER) > -1 // 管理员
+    if (duty == ROLE_INSPECTOR // 督察员
+      || duty == ROLE_MANAGER // 管理员
     ) {
       return [
         home,
@@ -76,7 +76,7 @@ export default (props) => {
       ]
     }
 
-    if (user.dutyList.indexOf(ROLE_ORG_USER) > -1) {
+    if (duty == ROLE_ORG_USER) {
       return [
         home,
         notice,
@@ -85,7 +85,7 @@ export default (props) => {
     }
 
     return [];
-  }, [user]);
+  }, [duty]);
 
   const onChange = (e) => {
     const url = tabItems.filter(x => x.name === e.detail)[0].page;

src/layouts/index.jsx

@@ -11,7 +11,7 @@ import laySty from './layout.module.less';
 export default (props) => {
   const { className, style, roles, tabBar = false, loading } = props;
 
-  const { person, user } = useModel('user');
+  const { person, user, duty } = useModel('user');
 
   const containerClass = `${laySty['page-conatiner']} ${tabBar ? laySty['with-tabbar'] : ''} ${className}`;
 
@@ -51,7 +51,7 @@ export default (props) => {
         }
       </View>
       {
-        tabBar && <TabBar className={laySty['page-tabbar']} active={tabBar} user={user} />
+        tabBar && <TabBar className={laySty['page-tabbar']} active={tabBar} duty={duty} />
       }
     </View>
   )

src/pages/check/edit/components/LocForm.jsx

@@ -25,20 +25,20 @@ export default (props) => {
     })
   }
 
-  // 获取答题主记录信息
-  React.useEffect(() => {
-    if (checkItemInfo?.itemId) {
-      setLoading(true);
-      getTaCheckItemAnswer(checkItemInfo?.itemId).then((res) => {
-        if (res) {
-          onChange(res);
-        }
-        setLoading(false);
-      }).catch(() => {
-        setLoading(false);
-      });
-    }
-  }, [checkItemInfo?.itemId])
+  // // 获取答题主记录信息
+  // React.useEffect(() => {
+  //   if (checkItemInfo?.itemId) {
+  //     setLoading(true);
+  //     getTaCheckItemAnswer(checkItemInfo?.itemId).then((res) => {
+  //       if (res) {
+  //         onChange(res);
+  //       }
+  //       setLoading(false);
+  //     }).catch(() => {
+  //       setLoading(false);
+  //     });
+  //   }
+  // }, [checkItemInfo?.itemId])
   
   return (
     <View>

src/pages/check/edit/components/Question.jsx

@@ -25,19 +25,19 @@ export default (props) => {
     })
   }
 
-  React.useEffect(() => {
-    if (quInfo?.quId) {
-      setLoading(true);
-      getTaCheckAnswerItem({ quId: quInfo.quId, isMine: true }).then(res => {
-        if (res && res[0]) {
-          onChange(res[0]);
-        }
-        setLoading(false);
-      }).catch(() => {
-        setLoading(false);
-      });
-    }
-  }, [quInfo?.quId]);
+  // React.useEffect(() => {
+  //   if (quInfo?.quId) {
+  //     setLoading(true);
+  //     getTaCheckAnswerItem({ quId: quInfo.quId, isMine: true }).then(res => {
+  //       if (res && res[0]) {
+  //         onChange(res[0]);
+  //       }
+  //       setLoading(false);
+  //     }).catch(() => {
+  //       setLoading(false);
+  //     });
+  //   }
+  // }, [quInfo?.quId]);
   
   return (
     <View>

src/pages/check/edit/index.jsx

@@ -178,8 +178,8 @@ export default (props) => {
         }
 
         // 查询我的答案
-        getTaCheckItemAnswer(itemId).then(setAnswer);
-
+        // getTaCheckItemAnswer(itemId).then(setAnswer);
+    
         // 查询当前测评主记录的所有问题
         getTaCheckItemQu({ pageSize: 200, itemId }).then(res => {
           setLoading(false);

src/pages/check/loc/list/index.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
-import { Cell, Tag } from '@antmjs/vantui';
+import { Cell, Tag, Notify } from '@antmjs/vantui';
 import Page from '@/layouts/index';
 import PowerList from '@/components/PowerList';
 import { getTaCheckItem } from '@/services/tacheckitem';
@@ -22,6 +22,14 @@ export default (props) => {
   }), [checkId]);
 
   const onClick = (item) => {
+    if (item.answerNum >= item.num) {
+      Notify.show({
+        message: '当前测评问卷已收齐',
+        type: 'warning',
+      })
+      return;
+    }
+
     Taro.navigateTo({
       url: `/pages/check/edit/index?id=${item.itemId}&typ=${item.itemType}`
     })
@@ -40,7 +48,7 @@ export default (props) => {
             onClick={() => onClick(item)}
           >
             {
-              item.readonly ? <Tag color="var(--main-bg-color)">已答完</Tag> : null
+              item.num <= item.answerNum ? <Tag color="var(--main-bg-color)">{`${item.answerNum}/${item.num}`}</Tag> : null
             }
           </Cell>
         )}

src/pages/checkStand/index.config.js

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: '测评标准'
+})

src/pages/checkStand/index.jsx

@@ -0,0 +1,31 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import Page from '@/layouts/index';
+import { View, RichText } from '@tarojs/components';
+import { getTaCheckStandById } from '@/services/tacheckstand';
+
+export default (props) => {
+
+  const [loading, setLoading] = React.useState(false);
+  const [detail, setDetail] = React.useState();
+
+  React.useEffect(() => {
+    setLoading(true);
+
+    // ID 固定是 1
+    getTaCheckStandById(1).then((res) => {
+      setDetail(res);
+      setLoading(false);
+    }).catch(() => {
+      setLoading(false);
+    });
+  }, []);
+  
+  return (
+    <Page tabBar="check" loading={loading}>
+      <View style={{ padding: 'var(--main-space)' }}>
+        <RichText style={{ lineHeight: '2em' }} nodes={detail?.content} />
+      </View>
+    </Page>
+  )
+}

src/pages/home/components/Head.jsx

@@ -1,25 +1,49 @@
 import React from 'react';
 import { View, Image } from '@tarojs/components';
+import { ActionSheet, Cell } from '@antmjs/vantui';
 import { ROLES, ROLE_CITIZEN } from '@/utils/user';
 import logo from '@/assets/image/logo.png';
 import avatar from '@/assets/icons/avatar.png';
 import style from './head.module.less';
 
 export default (props) => {
-  const { user = {} } = props;
+  const { user = {}, duty, onDutyChange } = props;
   const { dutyList = [] } = user;
-  const role = ROLES[dutyList[0] || ROLE_CITIZEN];
+  const role = ROLES[duty || ROLE_CITIZEN];
+
+  const [show, setShow] = React.useState(false);
+
+  const actions = React.useMemo(() => {
+    return dutyList.map(x => ({name: ROLES[x], value: x}));
+  }, [dutyList]);
+
+  const onClick = () => {
+    if (dutyList.length < 1) return;
+    setShow(true);
+  }
+
+  const onSelect = (e) => {
+    onDutyChange(e.detail.value)
+  }
 
   return (
     <View className={style.head}>
       <View className={style.profile}>
         <View style={{ letterSpacing: '2px' }}>Hi, {user.name}!</View>
-        <View className={style.badge}>
+        <View className={style.badge} onClick={onClick}>
           <View className={style.icon}>
             <Image src={avatar} />
           </View>
           <View>{role}</View>
         </View>
+        <ActionSheet
+          title="请选择身份"
+          position="bottom"
+          show={show}
+          actions={actions}
+          onClose={() => setShow(false)}
+          onSelect={onSelect}
+        />
       </View>
       <View className={style.avatar}>
         <Image src={user.avatar || logo}></Image>

src/pages/home/index.jsx

@@ -3,52 +3,63 @@ import { View, Text, Image } from '@tarojs/components'
 import Page from '@/layouts/index';
 import { useModel } from '@/store';
 import MenuIcon from '@/components/MenuIcon';
-import { ROLE_INSPECTOR, ROLE_MANAGER, ROLE_ORG_USER } from '@/utils/user';
+import { ROLE_INSPECTOR, ROLE_MANAGER, ROLE_ORG_USER, ROLE_QUERY_PERSON } from '@/utils/user';
 import Head from './components/Head';
 import BannerCard from './components/BannerCard';
 import './index.less';
 
 const menus = {
+  // 督察员
   [ROLE_INSPECTOR]: [
     { icon: 'icon9', text: '我的上报', link: '/pages/issue/list/index' },
-    { icon: 'icon11', text: '消息通知', link: '' },
+    { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
     { icon: 'icon10', text: '模拟测评', link: '/pages/check/list/index' },
   ],
 
+  // 平台管理员
   [ROLE_MANAGER]: [
     { icon: 'icon1', text: '待 交 办', link: '/pages/issue/list2/index?title=待交办&bizStatus=start' },
     { icon: 'icon2', text: '已 交 办', link: '/pages/issue/list2/index?title=已交办&bizStatus=assigned' },
-    { icon: 'icon3', text: '已 办 结', link: '/pages/issue/list2/index?title=已办结报&bizStatus=end' },
+    { icon: 'icon3', text: '已 办 结', link: '/pages/issue/list2/index?title=已办结&bizStatus=end' },
     { icon: 'icon4', text: '消单申请', link: '/pages/apply/list/index?title=消单申请&applyType=end' },
     { icon: 'icon5', text: '逾期警告', link: '/pages/issue/list2/index?title=逾期警告&bizStatus=expired' },
     { icon: 'icon6', text: '延期申请', link: '/pages/apply/list/index?title=延期申请&applyType=delay' },
     { icon: 'icon7', text: '统计查询', link: '' },
     { icon: 'icon9', text: '我的上报', link: '/pages/issue/list2/index?title=我的上报&mine=true' },
-    { icon: 'icon11', text: '消息通知', link: '' },
+    { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
   ],
 
+  // 责任单位用户
   [ROLE_ORG_USER]: [
     { icon: 'icon2', text: '处 理 中', link: '/pages/org/issue/list/index?title=处理中&bizStatus=assigned' },
-    { icon: 'icon3', text: '已 办 结', link: '/pages/org/issue/list/index?title=已办结报&bizStatus=end' },
+    { icon: 'icon3', text: '已 办 结', link: '/pages/org/issue/list/index?title=已办结&bizStatus=end' },
     { icon: 'icon5', text: '已 逾 期', link: '' },
     { icon: 'icon7', text: '统计查询', link: '' },
     { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
-  ]
+  ],
+
+  // 查询人员
+  [ROLE_QUERY_PERSON]: [
+    { icon: 'icon1', text: '未 处 理', link: '/pages/issue/list2/index?title=未处理&bizStatus=start' },
+    { icon: 'icon2', text: '处 理 中', link: '/pages/issue/list2/index?title=处理中&bizStatus=assigned' },
+    { icon: 'icon3', text: '已 办 结', link: '/pages/issue/list2/index?title=已办结&bizStatus=end' },
+    { icon: 'icon7', text: '统计查询', link: '' },
+  ],
 }
 
 export default (props) => {
 
-  const { user } = useModel('user');
+  const { user, duty, updateDuty } = useModel('user');
 
   const menuArr = React.useMemo(() => {
-    if (!user || !user.dutyList) return [];
+    if (!duty) return [];
 
-    return menus[user.dutyList[0]];
-  }, [user])
+    return menus[duty];
+  }, [duty])
 
   return (
     <Page tabBar="home" className='home-page'>
-      <Head user={user} />
+      <Head user={user} duty={duty} onDutyChange={updateDuty} />
       <BannerCard />
 
       <View className="menu-icons">

src/pages/index3/index.config.js

@@ -1,3 +0,0 @@
-export default definePageConfig({
-  navigationBarTitleText: '首页'
-})

src/pages/index3/index.jsx

@@ -1,24 +0,0 @@
-import { Component } from 'react'
-import { View, Text } from '@tarojs/components'
-import './index.less'
-
-export default class Index extends Component {
-
-  componentWillMount () { }
-
-  componentDidMount () { }
-
-  componentWillUnmount () { }
-
-  componentDidShow () { }
-
-  componentDidHide () { }
-
-  render () {
-    return (
-      <View className='index'>
-        <Text>Hello world!</Text>
-      </View>
-    )
-  }
-}

src/pages/index4/index.config.js

@@ -1,3 +0,0 @@
-export default definePageConfig({
-  navigationBarTitleText: '首页'
-})

src/pages/index4/index.jsx

@@ -1,24 +0,0 @@
-import { Component } from 'react'
-import { View, Text } from '@tarojs/components'
-import './index.less'
-
-export default class Index extends Component {
-
-  componentWillMount () { }
-
-  componentDidMount () { }
-
-  componentWillUnmount () { }
-
-  componentDidShow () { }
-
-  componentDidHide () { }
-
-  render () {
-    return (
-      <View className='index'>
-        <Text>Hello world!</Text>
-      </View>
-    )
-  }
-}

src/pages/issue/edit/index.jsx

@@ -17,7 +17,7 @@ export default (props) => {
   const router = Taro.useRouter();
   const { id, act } = router.params;
 
-  const { user } = useModel('user');
+  const { user, duty } = useModel('user');
 
   const [loading, setLoading] = React.useState(false);
   const [issue, setIssue] = React.useState();
@@ -29,11 +29,8 @@ export default (props) => {
     canAssigned,
     canCancel,
   ] = React.useMemo(() => {
-    if (!issue) return [];
-    if (!user) return [];
-
     // 如果是督察员
-    if (user.dutyList.indexOf(ROLE_INSPECTOR) > -1) {
+    if (duty == ROLE_INSPECTOR) {
       return [
         issue.processNode != 'start' && issue.processStatus != 'reject',
         issue.processNode == 'start' || issue.processStatus == 'reject',
@@ -43,7 +40,7 @@ export default (props) => {
     }
 
     // 如果是管理员
-    if (user?.dutyList.indexOf(ROLE_MANAGER) > -1) {
+    if (duty == ROLE_MANAGER) {
       return [
         issue.processNode != 'start',
         false,
@@ -53,14 +50,14 @@ export default (props) => {
     }
 
     return [];
-  }, [issue, user]);
+  }, [issue, duty]);
 
-  const onIssueChange = (val = {}) => {
-    setIssue({
-      ...(issue || {}),
-      ...val,
-    })
-  }
+  // const onIssueChange = (val = {}) => {
+  //   setIssue({
+  //     ...(issue || {}),
+  //     ...val,
+  //   })
+  // }
   
   React.useEffect(() => {
     if (id) {

src/pages/notice/components/Card/index.jsx

@@ -2,13 +2,18 @@ import React from 'react';
 import { Cell, CellGroup } from '@antmjs/vantui';
 import { View } from '@tarojs/components';
 import Taro from '@tarojs/taro';
+import { getDtStr } from '@/utils/date';
 import style from './style.module.less';
 
 export default (props) => {
 
+  const { dataset } = props;
+
+  const dateStr = React.useMemo(() => dataset?.createDate ? getDtStr(dataset.createDate) : '-', [dataset]);
+
   const onClick = () => {
     Taro.navigateTo({
-      url: `/pages/notice/edit/index`
+      url: `/pages/notice/detail/index?id=${dataset.noticeId}`
     })
   }
 
@@ -16,14 +21,15 @@ export default (props) => {
     <View className={style['notice-card-wrapper']}>
       <CellGroup>
         <Cell
-          title="关于2022年模拟测评报告"
+          title={dataset?.title}
           isLink size="large"
           style={{ color: 'var(--main-bg-color)' }}
           onClick={() => onClick()}
         />
         <Cell
           renderTitle={(<>
-            <View className={style['notice-card-title']}>日期： </View><View className={style['notice-card-title2']}>2022-12-06 12:00</View>
+            <View className={style['notice-card-title']}>日期： </View>
+            <View className={style['notice-card-title2']}>{dateStr}</View>
           </>
           )}
         />

src/pages/notice/components/Details/index.jsx

@@ -1,20 +0,0 @@
-import React from 'react';
-import { View } from '@tarojs/components';
-import style from './style.module.less';
-
-export default (props) => {
-  return (
-    <View className={style['notice-wrapper']} style={style}>
-      <View className={style['notice-hd']}>
-        【关于2022年模拟测评公告】
-        <View className={style['notice-hd2']}>2022-12-06 12:00</View>
-      </View>
-      <View className={style['notice-bd']}>
-
-      </View>
-      <View className={style['notice-ft']}>
-
-      </View>
-    </View>
-  )
-}

src/pages/notice/components/Details/style.module.less

@@ -1,25 +0,0 @@
-.notice-wrapper {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-
-  .notice-hd {
-    flex: none;
-    margin: var(--main-space);
-    font-weight: bold;
-    .notice-hd2 {
-      font-weight: 400;
-      margin-left: var(--main-space);
-    }
-  }
-
-  .notice-bd {
-    flex: 1;
-    overflow: hidden;
-    margin: var(--main-space);
-  }
-
-  .notice-ft {
-    flex: none;
-  }
-}

src/pages/notice/detail/index.jsx

@@ -0,0 +1,65 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View, Image, RichText } from '@tarojs/components';
+import Page from '@/layouts/index';
+import { getTaNoticeById } from '@/services/tanotice';
+import { getDtStr } from '@/utils/date';
+import style from './style.module.less';
+
+export default (props) => {
+
+  const [loading, setLoading] = React.useState(false);
+  const [detail, setDetail] = React.useState();
+  const dateStr = React.useMemo(() => detail?.createDate ? getDtStr(detail.createDate) : '-', [detail]);
+
+  const router = Taro.useRouter();
+  const { id } = router.params;
+
+  const onPreview = () => {
+    if (!detail?.thumb) return;
+
+    Taro.previewMedia({
+      sources: [
+        {
+          url: detail.thumb,
+        },        
+      ],
+      current: 0,
+    })
+  }
+
+  React.useEffect(() => {
+    if (id) {
+      setLoading(true);
+      getTaNoticeById(id).then((res) => {
+        setDetail(res);
+        Taro.setNavigationBarTitle({
+          title: res.title,
+        })
+        setLoading(false);
+      }).catch(er => {
+        console.error(er);
+        setLoading(false);
+      });
+    }
+  }, [id]);
+
+  
+  return (
+    <Page loading={loading}>
+      <View className={style['notice-wrapper']} style={style}>
+        <View className={style['notice-hd']}>
+          {detail?.title}
+          <View className={style['notice-hd2']}>{dateStr}</View>
+        </View>
+        <View className={style['notice-bd']}>
+          <Image src={detail?.thumb} onClick={onPreview}></Image>
+          <RichText nodes={detail?.content} />
+        </View>
+        <View className={style['notice-ft']}>
+
+        </View>
+      </View>
+    </Page>
+  )
+}

src/pages/notice/detail/style.module.less

@@ -0,0 +1,30 @@
+.notice-wrapper {
+  height: 100%;
+  overflow-y: auto;
+  padding: var(--main-space);
+
+  .notice-hd {
+    font-size: 36px;
+    line-height: 2em;
+    text-align: center;
+
+    .notice-hd2 {
+      text-align: right;
+      font-size: 24px;
+      margin-left: var(--main-space);
+    }
+  }
+
+  .notice-bd {
+    image {
+      width: 100%;
+    }
+
+    rich-text {
+      line-height: 2em;
+    }
+  }
+
+  .notice-ft {
+  }
+}

src/pages/notice/edit/index.jsx

@@ -1,11 +0,0 @@
-import React from 'react';
-import Page from '@/layouts/index';
-import Details from '../components/Details/index';
-
-export default (props) => {
-  return (
-    <Page>
-      <Details />
-    </Page>
-  )
-}

src/pages/notice/index.jsx

@@ -1,12 +1,22 @@
 import React from 'react';
 import Page from '@/layouts/index';
+import PowerList from '@/components/PowerList';
+import { getTaNotice } from '@/services/tanotice';
 import Card from './components/Card/index';
 
 export default (props) => {
 
+  const [loading, setLoading] = React.useState(false);
+
   return (
     <Page tabBar="notice">
-      <Card />
+      <PowerList
+        request={getTaNotice}
+        params={{status: 1}}
+        renderItem={(item) => (
+          <Card key={item.noticeId} dataset={item} />
+        )}
+      />
     </Page>
   )
 }

src/pages/statistics/index.jsx

@@ -23,24 +23,33 @@ export default (props) => {
       title: {
         text: '上报统计'
       },
-      grid: {
-        containLabel: true
-      },
       tooltip: {
-        show: true,
-        trigger: 'axis'
-      },
-      xAxis: {
-        type: 'category',
-        boundaryGap: false,
-        data: ['12/01', '12/02', '12/03', '12/04', '12/05', '12/06', '12/07'],
-        // show: false
+        trigger: 'axis',
+        axisPointer: {
+          type: 'cross',
+          label: {
+            backgroundColor: '#0A9071'
+          }
+        }
       },
-      yAxis: {
-        x: 'center',
-        type: 'value',
-        // show: false
+      grid: {
+        left: '3%',
+        right: '4%',
+        bottom: '3%',
+        containLabel: true
       },
+      xAxis: [
+        {
+          type: 'category',
+          boundaryGap: false,
+          data: ['12/01', '12/02', '12/03', '12/04', '12/05', '12/06', '12/07']
+        }
+      ],
+      yAxis: [
+        {
+          type: 'value'
+        }
+      ],
       series: [
         {
           name: 'Line 1',
@@ -56,18 +65,18 @@ export default (props) => {
             color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
               {
                 offset: 0,
-                color: 'rgb(128, 255, 165)'
+                color: '#0A9071'
               },
               {
                 offset: 1,
-                color: 'rgb(1, 191, 236)'
+                color: '#FFF'
               }
             ])
           },
           emphasis: {
             focus: 'series'
           },
-          data: [180, 332, 191, 294, 210, 151, 230]
+          data: [1.8, 3.3, 1.9, 2.9, 2.1, 1.5, 2.3]
         }
       ]
     };
@@ -80,6 +89,125 @@ export default (props) => {
     onInit: initChart
   };
 
+  function initChart2 (canvas, width, height, dpr) {
+
+    console.log('---------->', canvas, width, height)
+
+    const chart = echarts.init(canvas, null, {
+      width: width,
+      height: height,
+      devicePixelRatio: dpr // new
+    });
+    canvas.setChart(chart);
+
+    var option = {
+      title: {
+        text: '交办统计'
+      },
+      grid: {
+        left: '3%',
+        right: '4%',
+        bottom: '3%',
+        containLabel: true
+      },
+      xAxis: [
+        {
+          type: 'category',
+          boundaryGap: false,
+          data: ['已处理', '未处理', '逾期'],
+          boundaryGap: true,
+          axisTick: {
+            alignWithLabel: true,
+          }
+        }
+      ],
+      yAxis: [
+        {
+          type: 'value'
+        }
+      ],
+      series: [
+        {
+          type: 'bar',
+          itemStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              { offset: 0, color: '#F772D1' },
+              { offset: 0.5, color: '#C872F2' },
+              { offset: 1, color: '#E5BEF8' }
+            ])
+          },
+          data: [2, 3, 1]
+        }
+      ]
+    };
+
+    chart.setOption(option);
+    return chart;
+  }
+
+  const ec2 = {
+    onInit: initChart2
+  };
+
+  function initChart3 (canvas, width, height, dpr) {
+
+    console.log('---------->', canvas, width, height)
+
+    const chart = echarts.init(canvas, null, {
+      width: width,
+      height: height,
+      devicePixelRatio: dpr // new
+    });
+    canvas.setChart(chart);
+
+    var option = {
+      title: {
+        text: '问题分类'
+      },
+      grid: {
+        left: '3%',
+        right: '4%',
+        bottom: '3%',
+        containLabel: true
+      },
+      xAxis: [
+        {
+          type: 'category',
+          boundaryGap: false,
+          data: ['公益宣传', '环境卫生', '基础设施', '文明素养', '公共秩序', '其他'],
+          boundaryGap: true,
+          axisTick: {
+            alignWithLabel: true,
+          }
+        }
+      ],
+      yAxis: [
+        {
+          type: 'value'
+        }
+      ],
+      series: [
+        {
+          type: 'bar',
+          itemStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+              { offset: 0, color: '#FB9900' },
+              { offset: 1, color: '#FFD38F' }
+            ])
+          },
+          data: [2, 1, 2, 3, 2, 1]
+        }
+      ]
+    };
+
+    chart.setOption(option);
+    return chart;
+  }
+
+  const ec3 = {
+    onInit: initChart3
+  };
+
   return (
     <Page>
       <View>
@@ -87,8 +215,14 @@ export default (props) => {
           <Cell title="时间维度" isLink value="本周" />
         </CellGroup>
       </View>
-      <view class="container" style={{ height: '500px' }}>
-        <ec-canvas canvasId="mychart-bar" ec={ec}></ec-canvas>
+      <view class="container">
+        <ec-canvas canvasId="mychart-line" ec={ec}></ec-canvas>
+      </view>
+      <view class="container">
+        <ec-canvas canvasId="mychart-bar" ec={ec2}></ec-canvas>
+      </view>
+      <view class="container">
+        <ec-canvas canvasId="mychart-bar" ec={ec3}></ec-canvas>
       </view>
     </Page>
   )

src/pages/statistics/index.less

@@ -0,0 +1,7 @@
+.container {
+  box-shadow: 0px 18px 22px 0px rgba(0, 0, 0, 0.06);
+  border-radius: 8px;
+  margin: var(--main-space);
+  height: 24%;
+  margin-bottom: 20px;
+}

src/services/tacheckstand.js

@@ -0,0 +1,29 @@
+import request from '@/utils/request';
+
+/*
+ * 分页查询
+ */
+export const getTaCheckStand = (params) => request('/api/taCheckStand', { params });
+
+/*
+ * 新增数据
+ */
+export const postTaCheckStand = (data) => request('/api/taCheckStand', { data, method: 'post' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getTaCheckStandById = (id) => request(`/api/taCheckStand/${id}`);
+
+/**
+ * 更新数据
+ * @param {*} id
+ * @param {*} data
+ * @returns
+ */
+export const putTaCheckStand = (id, data) => request(`/api/taCheckStand/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteTaCheckStand = (id) => request(`/api/taCheckStand/${id}`, { method: 'delete' });

src/services/tanotice.js

@@ -0,0 +1,26 @@
+import request from '@/utils/request';
+
+/*
+ * 分页查询
+ */
+export const getTaNotice = (params) => request('/api/taNotice', { params });
+
+/*
+ * 新增数据
+ */
+export const postTaNotice = (data) => request('/api/taNotice', { data, method: 'post' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getTaNoticeById = (id) => request(`/api/taNotice/${id}`);
+
+/*
+ * 更新数据
+ */
+export const putTaNotice = (id, data) => request(`/api/taNotice/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteTaNotice = (id) => request(`/api/taNotice/${id}`, { method: 'delete' });

src/store/user.js

@@ -6,6 +6,7 @@ import { login, signin, currentUser } from '@/services/wxma';
 export default function useUser() {
   const [person, setPerson] = React.useState();
   const [user, setUser] = React.useState();
+  const [duty, setDuty] = React.useState();
 
   const maLogin = (code) => {
     login(code).then(res => {
@@ -15,20 +16,41 @@ export default function useUser() {
     });
   }
 
+  const updateDuty = (d) => {
+    setDuty(d);
+    Taro.setStorageSync('duty', d);
+  }
+
+  const initDuty = (u) => {
+    const d = Taro.getStorageSync('duty');
+    const dutyList = u?.dutyList || [];
+    if (d) {
+      if (dutyList.indexOf(d) < 0) {
+        updateDuty(dutyList[0]);
+      } else {
+        updateDuty(d);
+      }
+    } else {
+      updateDuty(dutyList[0]);
+    }
+  }
+
   const maSignIn = (params) => {
     const data = {
       ...params,
       password: md5(params.password)
-    }
+    };
 
     return signin(data).then(res => {
       setUser(res.user);
+      initDuty(res.user);
     })
   }
 
   const current = () => {
     currentUser().then(res => {
       setUser(res.user);
+      initDuty(res.user);
     })
   }
 
@@ -36,7 +58,9 @@ export default function useUser() {
     user,
     person,
     current,
+    duty,
     signin: maSignIn,
     login: maLogin,
+    updateDuty,
   }
 }