feats

package-lock.json

@@ -2004,6 +2004,7 @@
       "version": "3.5.7",
       "resolved": "https://registry.npmmirror.com/@tarojs/plugin-platform-alipay/-/plugin-platform-alipay-3.5.7.tgz",
       "integrity": "sha512-dt2H/evyuwbpkC1HRVzkyUoQ9AoHznNTV8mIDCqebDRJgrHcfHvvkYYbT6VPoTnZUdNHvlzgZU5I1RyY21wk2g==",
+      "dev": true,
       "requires": {
         "@tarojs/components": "3.5.7",
         "@tarojs/service": "3.5.7",
@@ -2014,6 +2015,7 @@
       "version": "3.5.7",
       "resolved": "https://registry.npmmirror.com/@tarojs/plugin-platform-jd/-/plugin-platform-jd-3.5.7.tgz",
       "integrity": "sha512-e84XL4mxvLC2BhppIx6VJ+M0XiavL5kho9qQh51oPI89BlYPWo+udV4go88j39szbZXbo0JNJ/qIxbxs3WVQvg==",
+      "dev": true,
       "requires": {
         "@tarojs/service": "3.5.7",
         "@tarojs/shared": "3.5.7"
@@ -2023,6 +2025,7 @@
       "version": "3.5.7",
       "resolved": "https://registry.npmmirror.com/@tarojs/plugin-platform-qq/-/plugin-platform-qq-3.5.7.tgz",
       "integrity": "sha512-Twr9IfqLeU4Vrzt2CqOvkawx7N7/qoIAqXGDcAAhTZKp06bd4T7vijnD2RyPxcDmIM/ShZqm1u8nAy5/byBqGg==",
+      "dev": true,
       "requires": {
         "@tarojs/plugin-platform-weapp": "3.5.7",
         "@tarojs/service": "3.5.7",
@@ -2033,6 +2036,7 @@
       "version": "3.5.7",
       "resolved": "https://registry.npmmirror.com/@tarojs/plugin-platform-swan/-/plugin-platform-swan-3.5.7.tgz",
       "integrity": "sha512-JGUrJXCTiun1EWnQfxQ1wfCtwuwXRohK9zL4izBYe6KJPrJTrOQYc/APqmA4g6W9kSqTbgjnN9PoYnC1aCFrHQ==",
+      "dev": true,
       "requires": {
         "@tarojs/components": "3.5.7",
         "@tarojs/service": "3.5.7",
@@ -2043,6 +2047,7 @@
       "version": "3.5.7",
       "resolved": "https://registry.npmmirror.com/@tarojs/plugin-platform-tt/-/plugin-platform-tt-3.5.7.tgz",
       "integrity": "sha512-fOtjaIgCQ1pfJfULw8rm1DX0asYgbS7xdWtiC9vP/7tlXc8vp0l8Q5lP8kbEbVLohNwJrU2dak7n1g9iD2X0Vg==",
+      "dev": true,
       "requires": {
         "@tarojs/components": "3.5.7",
         "@tarojs/service": "3.5.7",
@@ -3182,6 +3187,11 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true
     },
+    "@zjxpcyc/react-tiny-store": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/@zjxpcyc/react-tiny-store/-/react-tiny-store-2.0.1.tgz",
+      "integrity": "sha512-+MTTcQ9aU8OMl7YrmX8UVnM5qUDktdHl0wpxmI5dVIwZxvHsKRKZuQn+ExOeCvJAVC2l+ubS7afT9rzTHPuPrA=="
+    },
     "abab": {
       "version": "2.0.6",
       "resolved": "https://registry.npmmirror.com/abab/-/abab-2.0.6.tgz",
@@ -4102,6 +4112,15 @@
       "integrity": "sha512-M8Sby4wRLuLr+9UB8V31knVRf/rl0xkk51A7um6hUCvVPyOvLtI0u0k1OPiMgE2d7CwmeSa33NzGpaALHPQCPg==",
       "dev": true
     },
+    "babel-plugin-import": {
+      "version": "1.13.5",
+      "resolved": "https://registry.npmmirror.com/babel-plugin-import/-/babel-plugin-import-1.13.5.tgz",
+      "integrity": "sha512-IkqnoV+ov1hdJVofly9pXRJmeDm9EtROfrc5i6eII0Hix2xMs5FEm8FG3ExMvazbnZBbgHIt6qdO8And6lCloQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-module-imports": "^7.0.0"
+      }
+    },
     "babel-plugin-jsx-attributes-array-to-object": {
       "version": "0.3.0",
       "resolved": "https://registry.npmmirror.com/babel-plugin-jsx-attributes-array-to-object/-/babel-plugin-jsx-attributes-array-to-object-0.3.0.tgz",
@@ -5267,8 +5286,7 @@
     "charenc": {
       "version": "0.0.2",
       "resolved": "https://registry.npmmirror.com/charenc/-/charenc-0.0.2.tgz",
-      "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==",
-      "dev": true
+      "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA=="
     },
     "chokidar": {
       "version": "3.5.3",
@@ -6047,8 +6065,7 @@
     "crypt": {
       "version": "0.0.2",
       "resolved": "https://registry.npmmirror.com/crypt/-/crypt-0.0.2.tgz",
-      "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
-      "dev": true
+      "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow=="
     },
     "crypto-browserify": {
       "version": "3.12.0",
@@ -10199,8 +10216,7 @@
     "is-buffer": {
       "version": "1.1.6",
       "resolved": "https://registry.npmmirror.com/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
     "is-callable": {
       "version": "1.2.7",
@@ -11227,7 +11243,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmmirror.com/md5/-/md5-2.3.0.tgz",
       "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
-      "dev": true,
       "requires": {
         "charenc": "0.0.2",
         "crypt": "0.0.2",

src/app.config.js

@@ -19,6 +19,8 @@ export default defineAppConfig({
     'pages/reporting/index',
     'pages/reporting/detail/index',
     'pages/reset-password/index',
+    'pages/check/list/index',
+    'pages/check/edit/index',
   ],
   window: {
     // backgroundColor: '#1A7565',

src/components/ScrollPage/index.jsx

@@ -0,0 +1,12 @@
+import React from 'react';
+import { View } from '@tarojs/components';
+import style from './style.module.less';
+
+export default (props) => {
+  return (
+    <View className={style['box']}>
+      <View className={style['page']} />
+      <View className={style['button']} />
+    </View>
+  )
+}

src/components/ScrollPage/style.module.less

@@ -0,0 +1,11 @@
+.box {
+  display: flex;
+  .page {
+    flex: 1;
+    height: 100%;
+  }
+  .button {
+    flex: none;
+    height: 100px;
+  }
+}

src/pages/check/components/List.jsx

@@ -0,0 +1,28 @@
+import React from 'react';
+import { View, Text } from '@tarojs/components';
+import { Button, Row, Col } from '@antmjs/vantui';
+import Taro from '@tarojs/taro';
+import style from './list.module.less';
+
+export default (props) => {
+  const onClick = () => {
+    Taro.navigateTo({
+      url: `/pages/check/edit/index`
+    })
+  }
+
+  return (
+    <View className={style['box']}>
+      <Row>
+        <View className={style['box-text']}>
+          <Col span={19}>关于第X界实地测评</Col>
+          <Col span={5}>
+            <Button round size="mini" color="#1A7565" onClick={onClick}>去完成</Button>
+          </Col>
+        </View>
+      </Row>
+      <View className={style['dashed']}></View>
+      <View className={style['box-text2']}>发布日期:<Text className={style['time']}>2022-12-06</Text><Text>12:00</Text></View>
+    </View>
+  )
+}

src/pages/check/components/list.module.less

@@ -0,0 +1,28 @@
+.box {
+  width: 92%;
+  height: 221px;
+  box-shadow: 0px 18px 22px 1px rgba(67, 65, 65, 0.06);
+  margin: 50px auto;
+  .box-text {
+    margin-left: 10px;
+    padding-top: 15px;
+    text-align: left;
+    font-size: 30px;
+    color: var(--main-bg-color);
+  }
+  .dashed {
+    width: 94%;
+    border-bottom: 2px dashed #dcdcdc;
+    margin: 0 auto;
+    position: relative;
+    top: 26px;
+  }
+  .box-text2 {
+    margin-left: 10px;
+    padding-top: 55px;
+    .time {
+      padding-left: 10px;
+      padding-right: 10px;
+    }
+  }
+}

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

@@ -0,0 +1,26 @@
+import React from 'react';
+import { View } from '@tarojs/components';
+import { Radio, RadioGroup, Row, Col, CellGroup, Cell } from '@antmjs/vantui'
+import style from './choice.module.less';
+
+export default (props) => {
+  const { value } = props;
+  return (
+    <CellGroup className={style['cell']}>
+      <Cell title="测评内容" border={false} size="large" />
+      <Cell className={style['text']} title="在显著位置看到市民公约或居民公约展示" border={false} />
+      <Row>
+        <Col offset="3" span="12">
+          <RadioGroup value={value}>
+            <Cell border={false}>
+              <Radio checkedColor="var(--main-bg-color)">A.符合</Radio>
+            </Cell>
+            <Cell border={false} className={style['radio']}>
+              <Radio checkedColor="var(--main-bg-color)">B.不符合</Radio>
+            </Cell>
+          </RadioGroup>
+        </Col>
+      </Row>
+    </CellGroup>
+  )
+}

src/pages/check/edit/components/choice.module.less

@@ -0,0 +1,13 @@
+.cell {
+  margin-bottom: 40px;
+  .text {
+    text-align: center;
+    color: var(--main-bg-color);
+    padding-top: 0px;
+    padding-bottom: 0px;
+  }
+  .radio {
+    padding-top: 0px;
+    margin-bottom: 40px;
+  }
+}

src/pages/check/edit/index.config.js

@@ -0,0 +1,4 @@
+// eslint-disable-next-line no-undef
+export default definePageConfig({
+  navigationBarTitleText: '实地测评'
+})

src/pages/check/edit/index.jsx

@@ -0,0 +1,252 @@
+import React from 'react';
+import Map from '@/components/map';
+import Page from '@/layouts/index';
+import { Button, Field, Cell, CellGroup, Row, Col, Image } from '@antmjs/vantui';
+import mapIcon from '@/assets/icons/marker.png';
+import LocType from '@/components/LocType';
+import { View, Input } from '@tarojs/components';
+import Uploader from '@/components/Uploader/index';
+import ScrollPage from '@/components/ScrollPage/index';
+import icon from '@/assets/icons/box.png';
+import Choice from "./components/Choice";
+
+export default (props) => {
+  const {
+    issue,
+    readOnly,
+    showOrg,
+    showExpireDate,
+    renderFields,
+    renderAction,
+  } = props;
+
+  const [inx, setInx] = React.useState(-1);
+
+  const num = 1;
+  const count = 15;
+
+  const [formData, setFormData] = React.useState({
+    typeId: undefined,
+    typeName: undefined,
+    locId: undefined,
+    locName: undefined,
+    location: undefined,
+    addr: undefined,
+    content: undefined,
+    attachList: [],
+  });
+
+  const [showLocType, setShowLocType] = React.useState(false);
+  const [evaluationPage, setEvaluationPage] = React.useState(true);
+  const [evaluationPage2, setEvaluationPage2] = React.useState(false);
+  const [evaluationPage3, setEvaluationPage3] = React.useState(false);
+  const [scrollPage, setScrollPage] = React.useState(false);
+
+  const onLocTypeChange = (_, it) => {
+    setFormData({
+      ...formData,
+      locId: it.typeId,
+      locName: it.name,
+    });
+    setShowLocType(false);
+  }
+
+  const setFieldChange = (field, value) => {
+    setFormData({
+      ...formData,
+      [field]: value,
+    })
+  }
+
+  const onChangePage = () => {
+    setEvaluationPage(false);
+    setEvaluationPage2(true);
+  }
+
+  const onChangePage2 = () => {
+    setEvaluationPage2(false);
+    setEvaluationPage3(true);
+  }
+
+  const onChangePage3 = () => {
+    setEvaluationPage3(false);
+    setScrollPage(true);
+  }
+
+  return (
+    <>
+      <Page>
+        {
+          evaluationPage && (<>
+            <LocType
+              show={showLocType}
+              value={formData.addr}
+              onCancel={() => setShowLocType(false)}
+              onChange={onLocTypeChange}
+            />
+            <Map location={formData.location} />
+            <CellGroup>
+              <Cell
+                title="点位"
+                isLink
+                value={formData.locName}
+                onClick={() => !readOnly && setShowLocType(true)}
+              />
+              <Field
+                placeholder="请输入地址"
+                value={formData.addr}
+                leftIcon={mapIcon}
+              // readonly={readOnly}
+              // onChange={e => setFieldChange('addr', e.detail)}
+              />
+            </CellGroup>
+
+            <CellGroup style={{ padding: 'var(--main-space)', position: 'relative', top: '330px' }}>
+              <Button
+                type="primary"
+                block
+                onClick={onChangePage}
+              >
+                下一步
+              </Button>
+            </CellGroup>
+          </>)
+        }
+
+        {
+          evaluationPage2 && (
+            <View style={{ flex: '1' }}>
+
+              <Choice />
+
+              <CellGroup>
+                <Cell title="评测标准" border={false} size="large" />
+                <Row>
+                  <Col offset="2" span="20">
+                    <Cell
+                      title="
+                  在显著位置看到市民公约或居民公约展示"
+                      border={false}
+                      style={{ paddingTop: '0px' }}
+                    />
+                  </Col>
+                </Row>
+              </CellGroup>
+
+              <CellGroup style={{ marginTop: '20px' }}>
+                <Cell title="拍照" border={false} size="large" />
+
+                <Cell
+                  renderTitle={
+                    <Uploader
+                      value={formData.attachList}
+                      disabled={readOnly}
+                      onChange={e => setFieldChange('attachList', e)}
+                    />
+                  }
+                />
+              </CellGroup>
+
+              <View style={{ position: 'relative', marginBottom: '20px', flex: 'none' }}>
+                <View style={{ position: 'absolute', width: '100%', top: '100px' }}>
+                  <CellGroup style={{ marginTop: '20px', padding: 'var(--main-space)' }}>
+                    <Button
+                      type="primary"
+                      block
+                      onClick={onChangePage2}
+                    >
+                      下一题
+                    </Button>
+                  </CellGroup>
+
+                  <CellGroup>
+                    <Cell
+                      style={{ textAlign: 'right' }}
+                    >
+                      <Image src={icon} width="25px" height="25px"
+                        style={{ verticalAlign: 'middle', marginRight: '10px' }}
+                      />
+                      {num + '/' + count}
+                    </Cell>
+                  </CellGroup>
+                </View>
+              </View>
+            </View>)
+        }
+
+        {
+          evaluationPage3 && (
+            <ScrollPage>
+              <CellGroup>
+                <Cell title="测评内容" border={false} size="large" style={{ paddingBottom: '0px' }} />
+                <View style={{ padding: 'var(--main-space)', paddingTop: '0px' }}>
+                  <View style={{ padding: 'var(--main-space)', fontSize: '14px', color: 'var(--main-bg-color)' }}>
+                    垃圾乱扔，乱张贴（具体标准），测评结果：<Input type="text" style={{ width: '45px', display: 'inline-block', verticalAlign: 'middle' }} />处。（此处填写数字）
+                  </View>
+                </View>
+              </CellGroup>
+
+              <CellGroup>
+                <Cell title="评测标准" border={false} size="large" />
+                <Row>
+                  <Col offset="2" span="20">
+                    <Cell
+                      title="
+                    (1)每看到1处垃圾乱扔(1平方米以内的垃圾算作1处)计为1处;
+                    (2)每看到1处乱张贴乱涂写乱刻画《1平米内出现的算作1 处在统一设置的信息栏中张贴的小广告不算作失分点)计为1处;
+                    (3)每看到建筑物外立面的1处大面积破损污损《高3米以上、宽2米以上)计为1处。"
+                      border={false}
+                      style={{ paddingTop: '0px' }}
+                    />
+                  </Col>
+                </Row>
+              </CellGroup>
+
+              <CellGroup style={{ marginTop: '20px' }}>
+                <Cell title="拍照" border={false} size="large" />
+
+                <Cell
+                  renderTitle={
+                    <Uploader
+                      value={formData.attachList}
+                      disabled={readOnly}
+                      onChange={e => setFieldChange('attachList', e)}
+                    />
+                  }
+                />
+              </CellGroup>
+
+              <CellGroup style={{ marginTop: '20px', padding: 'var(--main-space)' }}>
+                <Row>
+                  <Col offset="1" span="10">
+                    <Button
+                      type="primary"
+                      block
+                    >
+                      上一题
+                    </Button>
+                  </Col>
+                  <Col offset="2" span="10">
+                    <Button
+                      type="primary"
+                      block
+                      onClick={onChangePage3}
+                    >
+                      下一题
+                    </Button>
+                  </Col>
+                </Row>
+              </CellGroup>
+            </ScrollPage>)
+        }
+      </Page >
+      <View>
+        {
+          scrollPage && (
+            <ScrollPage />
+          )
+        }
+      </View>
+    </>
+  )
+}

src/pages/check/list/index.config.js

@@ -0,0 +1,4 @@
+// eslint-disable-next-line no-undef
+export default definePageConfig({
+  navigationBarTitleText: '模拟测评'
+})

src/pages/check/list/index.jsx

@@ -0,0 +1,24 @@
+import React from 'react';
+import Page from '@/layouts/index';
+import { Tab, Tabs, Button } from '@antmjs/vantui';
+import { ROLE_INSPECTOR, ROLE_MANAGER } from '@/utils/user';
+import { View } from '@tarojs/components';
+import Taro from '@tarojs/taro';
+import PowerList from '@/components/PowerList';
+import List from "../components/List";
+
+
+export default (props) => {
+  return (
+    <Page roles={[ROLE_INSPECTOR]}>
+      <Tabs sticky>
+        <Tab title="实地测评">
+          <List />
+        </Tab>
+        <Tab title="问卷调查">
+
+        </Tab>
+      </Tabs>
+    </Page>
+  )
+}

src/pages/home/index.jsx

@@ -12,7 +12,7 @@ const menus = {
   [ROLE_INSPECTOR]: [
     { icon: 'icon9', text: '我的上报', link: '/pages/issue/list/index' },
     { icon: 'icon11', text: '消息通知', link: '' },
-    { icon: 'icon10', text: '模拟测评', link: '' },
+    { icon: 'icon10', text: '模拟测评', link: '/pages/check/list/index' },
   ],
 
   [ROLE_MANAGER]: [
@@ -50,7 +50,7 @@ export default (props) => {
     <Page tabBar="home" className='home-page'>
       <Head user={user} />
       <BannerCard />
-      
+
       <View className="menu-icons">
         {
           menuArr.map(x => (

src/pages/issue/components/Issue/index.jsx

@@ -41,13 +41,13 @@ export default (props) => {
   const [showDatePicker, setShowDatePicker] = React.useState(false);
   const [bizStatus, setBizStatus] = React.useState();
   const [issueProcess, setIssueProcess] = React.useState([]);
-  
+
   const issueReject = React.useMemo(() => {
     if (!issueProcess || !issueProcess.length) return {};
 
     return issueProcess.filter(x => x.processStatus === 'reject')[0] || {};
   }, [issueProcess]);
-    
+
   const onLocTypeChange = (_, it) => {
     setFormData({
       ...formData,
@@ -95,15 +95,15 @@ export default (props) => {
     if (issue) {
       setFormData(issue);
       setBizStatus(getIssueStatus(issue));
-      
+
       if (issue.processStatus == 'reject') {
-        getIssueProcess({pageSize: 100, issueId: issue.issueId}).then(res => {
+        getIssueProcess({ pageSize: 100, issueId: issue.issueId }).then(res => {
           setIssueProcess(res.records || []);
         })
       }
     }
   }, [issue]);
-  
+
   return (
     <View>
       <LocType
@@ -156,35 +156,35 @@ export default (props) => {
 
       {
         readOnly && bizStatus && (
-          <CellGroup style={{marginTop: '20px'}}>
+          <CellGroup style={{ marginTop: '20px' }}>
             <Cell
               title="状态"
               value={bizStatus.label}
             />
 
-          {
-            issueReject.processId && (
-              <>
-                <Cell title="驳回原因" />        
-                <Field
-                  readonly
-                  type="textarea"
-                  autosize={{ minHeight: '120px' }}
-                  value={issueReject.processResult}
-                />
-              </>
-            )
-          }
+            {
+              issueReject.processId && (
+                <>
+                  <Cell title="驳回原因" />
+                  <Field
+                    readonly
+                    type="textarea"
+                    autosize={{ minHeight: '120px' }}
+                    value={issueReject.processResult}
+                  />
+                </>
+              )
+            }
           </CellGroup>
         )
       }
-      
 
-      <CellGroup style={{marginTop: '20px'}}>
+
+      <CellGroup style={{ marginTop: '20px' }}>
         <Cell
           title="问题分类"
           isLink={!readOnly}
-          style={{marginTop: '20px'}}
+          style={{ marginTop: '20px' }}
           value={formData.typeName}
           onClick={() => !readOnly && setShowIssueType(true)}
         />
@@ -199,8 +199,8 @@ export default (props) => {
           onChange={e => setFieldChange('content', e.detail)}
         />
       </CellGroup>
-            
-      <CellGroup style={{marginTop: '20px'}}>        
+
+      {/* <CellGroup style={{marginTop: '20px'}}>        
         <Cell title="拍照或视频" border={false} />
 
         <Cell
@@ -212,11 +212,11 @@ export default (props) => {
             />
           }
         />
-      </CellGroup>
+      </CellGroup> */}
 
       {
         (showOrg || showExpireDate) && (
-          <CellGroup style={{marginTop: '20px'}}>
+          <CellGroup style={{ marginTop: '20px' }}>
             {
               showOrg && (
                 <Cell
@@ -256,7 +256,7 @@ export default (props) => {
 
       {
         renderAction ? (
-          <View style={{margin: '20px auto'}}>
+          <View style={{ margin: '20px auto' }}>
             {renderAction(formData)}
           </View>
         ) : null

src/pages/issue/edit/components/Save.jsx

@@ -10,7 +10,7 @@ export default (props) => {
   const { formData } = props;
 
   const [loading, setLoading] = React.useState(false);
-  
+
   // 新增问题单
   const onSubmit = () => {
     try {
@@ -38,7 +38,7 @@ export default (props) => {
       setLoading(false);
     })
   }
-  
+
   return (
     <Button block type="primary" loading={loading} onClick={onSubmit}>提交</Button>
   )