diff --git a/weapp/src/packages/patrol/index.jsx b/weapp/src/packages/patrol/index.jsx index b0574aed..e1e18170 100644 --- a/weapp/src/packages/patrol/index.jsx +++ b/weapp/src/packages/patrol/index.jsx @@ -9,6 +9,9 @@ import './index.scss'; import arrowIcon from '../../static/img/patrol/arrow-down.svg'; const Index = () => { + const userInfo = Taro.getStorageSync('userInfo') || {}; + const isSuperAdmin = userInfo && userInfo.username === 'SuperAdmin' ? true : false + const router = useRouter() const { params: { type } } = router const isView = type === 'view' ? true : false @@ -281,28 +284,30 @@ const Index = () => { return ( - - 上报类型 - - { - typeList.map((item, i) => { - return ( - - {item.text} - - ) - }) - } - - - + { + !isSuperAdmin && + + 上报类型 + + { + typeList.map((item, i) => { + return ( + + {item.text} + + ) + }) + } + + + } { Taro.hideLoading() if (res.statusCode == 200) { - setListData(res.data) - setShowListData(res.data.filter(item => isPatrol ? item.reportType === 'patrol' : item.reportType === 'conserve')) - return res.data; + let { data } = res + if (limit === 'my') { + data = data.filter(item => item.user.name === userInfo.name) + } + setListData(data) + setShowListData(data.filter(item => isPatrol ? item.reportType === 'patrol' : item.reportType === 'conserve')) + return data; } else { dealError(res.data.message || '请求出错'); } diff --git a/weapp/src/pages/user/index.jsx b/weapp/src/pages/user/index.jsx index 3cb03da2..b2f24a95 100644 --- a/weapp/src/pages/user/index.jsx +++ b/weapp/src/pages/user/index.jsx @@ -16,11 +16,24 @@ const { webUrl } = cfg; const Index = ({ ...props }) => { const userInfo = Taro.getStorageSync('userInfo') || {}; + const isSuperAdmin = userInfo && userInfo.username === 'SuperAdmin' ? true : false const changePassword = () => { Taro.navigateTo({ url: '/packages/changePassword/index' }) } + const toMyReport = () => { + Taro.navigateTo({ + url: '/packages/patrolView/index?limit=my' + }) + } + + const toPatrolReport = () => { + Taro.navigateTo({ + url: '/packages/patrol/index?type=edit' + }) + } + const onLogout = () => { Taro.showModal({ title: '提示', @@ -36,7 +49,7 @@ const Index = ({ ...props }) => { } }) } - + return ( @@ -49,9 +62,11 @@ const Index = ({ ...props }) => { - goRedirect(1)}> + - 我的填报 + + {isSuperAdmin ? '巡查上报' : '我的上报'} + @@ -60,7 +75,7 @@ const Index = ({ ...props }) => { 修改密码 - + 退出登录 diff --git a/web/client/src/sections/organization/components/depModal.js b/web/client/src/sections/organization/components/depModal.js index ae12d57d..59f6ed5e 100644 --- a/web/client/src/sections/organization/components/depModal.js +++ b/web/client/src/sections/organization/components/depModal.js @@ -43,7 +43,7 @@ const DepModal = (props) => { autocomplete: 'new-password' }} rules={[ - { required: true, message: '请输入部门名称' }, { max: 20, message: '请输入10个字以内的名称' } + { required: true, message: '请输入部门名称' }, { max: 10, message: '请输入10个字以内的名称' } ]} /> { < ProFormText name={['contract', 'phone']} @@ -156,7 +155,6 @@ const UserModal = (props) => { function mapStateToProps(state) { const { depMessage } = state; - console.log('depMessage:', depMessage); const pakData = (dep) => { // console.log(dep); return dep.map((d) => { diff --git a/web/client/src/sections/quanju/containers/example.js b/web/client/src/sections/quanju/containers/example.js index 62a34a9f..d3bc89f8 100644 --- a/web/client/src/sections/quanju/containers/example.js +++ b/web/client/src/sections/quanju/containers/example.js @@ -26,8 +26,7 @@ const Example = (props) => { useEffect(() => { - const timer = setTimeout(() => { - const map = new AMap.Map(MAPID, { + const map = new AMap.Map(MAPID, { //resizeEnable: true, center: [115.912663, 28.543149],//地图中心点,初始定位加载显示楼块 // center: [115.857952, 28.683003],//地图中心点 @@ -46,7 +45,10 @@ const Example = (props) => { window.onload = function () { windowOnload = true; } - }, 100); + + + + //主题样式 @@ -57,8 +59,7 @@ const Example = (props) => { }) map.clearMap(); if (map) map.destroy(); - map = null; - clearTimeout(timer) + } }, []) diff --git a/web/client/src/sections/quanju/containers/footer/conserve/right/right-bottom.js b/web/client/src/sections/quanju/containers/footer/conserve/right/right-bottom.js index efcc9de0..f3f15c41 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/right/right-bottom.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/right/right-bottom.js @@ -15,7 +15,7 @@ let underColorList = [ "rgba(255,194,20,0.5)" ] -const type = ['culvert','', 'road', 'bridge'] +const type = ['culvert', '', 'road', 'bridge'] const RightBottom = (props) => { const { roadMaintenances } = props @@ -23,7 +23,7 @@ const RightBottom = (props) => { let typesNum = null const list = roadMaintenances?.reportCount?.map((r, index) => { totalData += Number(r.count) - if (r.projectType === type[index]) { + if (r.projectType === 'culvert' || 'road' || 'bridge') { typesNum += Number(r.count) } switch (r.projectType) { @@ -41,12 +41,16 @@ const RightBottom = (props) => { return { name: '桥梁', value: r.count - } + }; + case '其他': + return { + name: '其他', + value: r.count + }; } }).filter(f => f !== undefined) - const otherNum = totalData - typesNum - console.log(); - otherNum !== null && list?.push({ name: '其他', value: otherNum }) + // const otherNum = totalData - typesNum + // otherNum !== null && list?.push({ name: '其他', value: otherNum }) const style = { height: "31%", marginTop: "3%" } return ( <>