feats

src/app.config.js

@@ -20,7 +20,10 @@ export default defineAppConfig({
     'pages/reporting/detail/index',
     'pages/reset-password/index',
     'pages/check/list/index',
+    'pages/check/loc/list/index',
     'pages/check/edit/index',
+    'pages/notice/list/index',
+    'pages/notice/edit/index',
   ],
   window: {
     // backgroundColor: '#1A7565',

src/components/Pickerful/index.jsx

@@ -1,7 +1,13 @@
 import React from 'react';
 import { View, ScrollView } from '@tarojs/components';
 import { Button, Popup, Search, Cell, Icon } from '@antmjs/vantui';
-import style from './style.module.less';
+import VABC from '@/components/VABC';
+
+const wrapperStyle = {
+  width: '90vw',
+  height: '100vh',
+  paddingBottom: 'env(safe-area-inset-bottom)',
+}
 
 export default (props) => {
   const { show, value, keyValue, labelValue = 'name', dictAPI, onChange, onCancel } = props;
@@ -37,33 +43,39 @@ export default (props) => {
   
   return (
     <Popup position="right" show={show} onClose={onCancel}>
-      <View className={style['pickerful-box']}>
-        <Search
-          onChange={(e) => setSearchText(e.detail)}
-          placeholder="请输入搜索关键词"
-          onSearch={onSearch}
-          clearable
-        />
-        <ScrollView scrollY style={{ flex: 1 }}>
-          {
-            list.map(item => (
-              <Cell
-                key={item[keyValue]}
-                title={item[labelValue]}
-                renderRightIcon={
-                  checked && checked[keyValue] == item[keyValue] ?
-                  <Icon name="success" color="#1A7565" /> :
-                  null
-                }
-                onClick={() => setChecked(item)}
-              />
-            ))
-          }
-        </ScrollView>
-        <View style={{ padding: '8px 2em' }}>
-          <Button block type="primary" disabled={!checked} onClick={onClick}>确定</Button>
-        </View>
-      </View>
+      <VABC
+        header={(
+          <Search
+            onChange={(e) => setSearchText(e.detail)}
+            placeholder="请输入搜索关键词"
+            onSearch={onSearch}
+            clearable
+          />
+        )}
+        footer={(
+          <View style={{ padding: '8px 2em' }}>
+            <Button block type="primary" disabled={!checked} onClick={onClick}>确定</Button>
+          </View>
+        )}
+        style={wrapperStyle}
+      >
+          <ScrollView scrollY style={{ height: '100%' }}>
+            {
+              list.map(item => (
+                <Cell
+                  key={item[keyValue]}
+                  title={item[labelValue]}
+                  renderRightIcon={
+                    checked && checked[keyValue] == item[keyValue] ?
+                    <Icon name="success" color="#1A7565" /> :
+                    null
+                  }
+                  onClick={() => setChecked(item)}
+                />
+              ))
+            }
+          </ScrollView>
+      </VABC>
     </Popup>
   )
 }

src/components/Pickerful/style.module.less

@@ -1,13 +0,0 @@
-
-.pickerful-box {
-  width: 90vw;
-  height: 100vh;
-  padding-bottom: env(safe-area-inset-bottom);
-  display: flex;
-  flex-direction: column;
-
-  & > view {
-    flex: none;
-  }
-}
-

src/components/PowerList/index.jsx

@@ -4,17 +4,26 @@ import { View } from '@tarojs/components';
 import { PowerScrollView } from '@antmjs/vantui';
 
 export default (props) => {
-  const { request, params, renderItem } = props;
+  const { request, params, renderItem, onLoadingChange } = props;
 
   const pageSize = 20;
   const pageNumRef = React.useRef(1);
   const listRef = React.useRef([]);
+  const [loading, setLoading] = React.useState(false);
   const [list, setList] = React.useState([]);
   const [finished, setFinished] = React.useState(true);
   listRef.current = list;
 
+  const changeLoading = (val) => {
+    setLoading(val);
+    if (onLoadingChange) {
+      onLoadingChange(val);
+    }
+  }
+
   const queryData = React.useCallback((options = {}) => {
     return new Promise((resolve, reject) => {
+      changeLoading(true);
       request({
         pageSize,
         ...(params || {}),
@@ -29,8 +38,10 @@ export default (props) => {
         }
 
         setFinished(current >= pages);
+        changeLoading(false);
         resolve();
       }).catch((err) => {
+        changeLoading(false);
         reject(err);
       });
     });

src/components/VABC/index.jsx

@@ -0,0 +1,30 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import clsScope from './style.module.less';
+
+export default (props) => {
+  const { style, header, footer  } = props;
+  
+  return (
+    <View className={clsScope['v-abc-wrapper']} style={style}>
+      {
+        header && (
+          <View className={clsScope['v-abc-hd']}>
+            {header}
+          </View>
+        )
+      }
+      <View className={clsScope['v-abc-bd']}>
+        {props.children}
+      </View>
+      {
+        footer && (
+          <View className={clsScope['v-abc-ft']}>
+            {footer}
+          </View>
+        )
+      }
+    </View>
+  )
+}

src/components/VABC/style.module.less

@@ -0,0 +1,19 @@
+
+.v-abc-wrapper {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .v-abc-hd {
+    flex: none;
+  }
+
+  .v-abc-bd {
+    flex: 1;
+    overflow: hidden;
+  }
+
+  .v-abc-ft {
+    flex: none;
+  }
+}

src/components/map/index.jsx

@@ -6,7 +6,7 @@ import iconPath from '@/assets/icons/marker.png';
 import style from './style.module.less';
 
 export default (props) => {
-  const { location } = props;
+  const { location, onLocChange } = props;
 
   const [currentPos, setCurPos] = React.useState();
   const [lngLat, setLngLat] = React.useState([,]);
@@ -39,6 +39,7 @@ export default (props) => {
   React.useEffect(() => {
     getLocation().then((res) => {
       setCurPos(res);
+      onLocChange([res.longitude, res.latitude].join(','))
     }).catch((err) => {
       Taro.showToast({
         title: '定位失败',

src/layouts/TabBar.jsx

@@ -33,7 +33,7 @@ const notice = {
   label: '公告',
   icon: noticeIcon,
   activeIcon: noticeActiveIcon,
-  page: '/pages/index3/index'
+  page: '/pages/notice/list/index'
 }
 const issue = {
   name: 'issue',
@@ -62,7 +62,7 @@ export default (props) => {
 
   const tabItems = React.useMemo(() => {
     if (!user) return [];
-    
+
     if (user.dutyList.indexOf(ROLE_INSPECTOR) > -1 // 督察员
       || user.dutyList.indexOf(ROLE_MANAGER) > -1 // 管理员
     ) {

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

@@ -1,26 +0,0 @@
-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/Footer/index.jsx

@@ -0,0 +1,65 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Button } from '@antmjs/vantui';
+import QuSelect from '../QuSelect';
+import style from './style.module.less';
+
+export default (props) => {
+  const { value, list, readonly, onChange, onSubmit } = props;
+
+  const [isPrev, isFinished] = React.useMemo(() => {
+    const total = list?.length || 0;
+
+    return [
+      value > 0,
+      value >= total - 1,
+    ]
+  }, [value, list]);
+
+  const onPrev = () => {
+    onChange(value - 1);
+  }
+
+  const onNext = () => {
+    if (isFinished) {
+      onSubmit()
+    } else {
+      onChange(value + 1);
+    }
+  }
+  
+  return (
+    <View className={style['qu-footer-wrapper']}>
+      {
+        !readonly && value > -1 && (
+          <View className={style['qu-footer-sel']}>
+            <QuSelect
+              value={value}
+              list={list}
+              onChange={onChange}
+            />
+          </View>
+        )
+      }
+      <View className={style['qu-footer-act']}>
+        {
+          isPrev && <Button type="primary" block plain hairline style={{flex: 1}} onClick={onPrev}>上一题</Button>
+        }
+        {
+          value == -1 ? (
+            <Button type="primary" block style={{flex: 1, marginLeft: isPrev ? '1em' : 0 }} onClick={onNext}>
+              {readonly ? '查看测评' : '开始测评'}
+            </Button>
+          ) : (
+            !(readonly && isFinished) && (
+              <Button type="primary" block style={{flex: 1, marginLeft: isPrev ? '1em' : 0 }} onClick={onNext}>
+                {isFinished ? '提交' : '下一题'}
+              </Button>
+              )
+          )
+        }
+      </View>
+    </View>
+  )
+}

src/pages/check/edit/components/Footer/style.module.less

@@ -0,0 +1,21 @@
+
+.qu-footer-wrapper {
+  width: 100%;
+  overflow: hidden;
+  padding: var(--main-space) 0;
+  background: #fff;
+  display: flex;
+  align-items: center;
+
+  .qu-footer-sel {
+    flex: none;
+    margin-right: 2em;
+  }
+
+  .qu-footer-act {
+    flex: 1;
+    display: flex;
+    overflow: hidden;
+    padding: 0 var(--main-space);
+  }
+}

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

@@ -0,0 +1,61 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { CellGroup, Cell, Field } from '@antmjs/vantui';
+import Map from '@/components/map';
+import { getTaCheckItemAnswer } from '@/services/tacheckitem';
+import mapIcon from '@/assets/icons/marker.png';
+
+export default (props) => {
+  const { checkItemInfo, checkType, answer, readonly, onChange, onLoadingChange } = props;
+
+  const [loc, setLoc] = React.useState();
+
+  const setLoading = (v) => {
+    if (onLoadingChange) {
+      onLoadingChange(v)
+    }
+  }
+  
+  const setFieldChange = (key, val) => {
+    onChange({
+      location: loc,
+      ...answer || {},
+      [key]: val,
+    })
+  }
+
+  // 获取答题主记录信息
+  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>
+      <Map location={answer?.location} onLocChange={setLoc} />
+      <CellGroup>
+        <Cell
+          title="点位"
+          value={checkItemInfo?.name}
+        />
+        <Field
+          readonly={readonly}
+          placeholder={checkType == 'loc' ? '请输入地址' : '请填写小区名称'}
+          value={answer?.addr}
+          leftIcon={mapIcon}
+          onChange={e => setFieldChange('addr', e.detail)}
+        />
+      </CellGroup>
+    </View>
+  )
+}

src/pages/check/edit/components/QuSelect/index.jsx

@@ -0,0 +1,68 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View, Text } from '@tarojs/components';
+import { Popup, Cell, Icon } from '@antmjs/vantui';
+import RatioView from '@/components/RatioView';
+import style from './style.module.less';
+
+const Bar = (props) => {
+  const {cursor, total, onClick} =  props;
+
+  const handleClick = (e) => {
+    if (onClick) {
+      onClick(e);
+    }
+  }
+
+  return (
+    <View className={style['qu-board-title']} onClick={handleClick}>
+      <Icon name="weapp-nav" size={60} color="var(--main-bg-color)" />
+      <Text>{cursor + 1}</Text>
+      <Text> / </Text>
+      <Text>{total}</Text>
+    </View>
+  )
+}
+
+
+export default (props) => {
+  const { value = 0, list, onChange } = props;
+
+  const [show, setShow] = React.useState(false);
+
+  const handleClick = (e, inx) => {
+    e.stopPropagation();
+    setShow(false);
+
+    if (onChange) {
+      onChange(inx);
+    }
+  }
+  
+  return (
+    <View className={style['qu-board-bar']}>
+      <Bar cursor={value} total={list?.length} onClick={() => setShow(true)} />
+      <Popup position="bottom" show={show} onClose={() => setShow(false)}>
+        <View className={style['qu-board-wrapper']}>
+          <Bar cursor={value} total={list?.length} />
+          <View className={style['qu-board-bd']}>
+            {
+              list?.map((it, inx) => {
+                const cls = [
+                  style['qu-board-bd-item'],
+                  it?.finished ? style['qu-board-bd-active'] : false,
+                ].filter(Boolean).join(' ')
+
+                return (
+                  <RatioView key={inx}>
+                    <View className={cls} onClick={e => handleClick(e, inx)}>{inx + 1}</View>
+                  </RatioView>
+                )
+              })
+            }
+          </View>
+        </View>
+      </Popup>
+    </View>
+  )
+}

src/pages/check/edit/components/QuSelect/style.module.less

@@ -0,0 +1,50 @@
+.qu-board-bar {
+  display: inline-block;
+}
+
+.qu-board-title {
+  font-size: 28px;
+  color: #999;
+  font-weight: bold;
+  display: flex;
+  align-items: center;
+  padding: 0 var(--main-space);
+
+  & > text {
+    line-height: 3em;
+    &:first-of-type {
+      margin-left: 0.6em;
+    }
+  }
+}
+
+.qu-board-wrapper {
+  background: #fff;
+
+  .qu-board-bd {
+    padding: var(--main-space) calc(var(--main-space) * 2);
+    display: grid;
+    grid-template-columns: repeat(5, 1fr);
+    row-gap: 36px;
+    column-gap: 36px;
+
+    .qu-board-bd-item {
+      width: 100%;
+      height: 100%;
+      border-radius: 50%;
+      overflow: hidden;
+      display: grid;
+      place-items: center;
+      font-size: 30px;
+      color: #666;
+      font-weight: bold;
+      border: 2px solid var(--main-bg-color);
+
+      &.qu-board-bd-active {
+        color: #fff;
+        border: 2px solid transparent;
+        background-color: var(--main-bg-color);
+      }
+    }
+  }
+}

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

@@ -0,0 +1,107 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View, RichText, Text } from '@tarojs/components';
+import { CellGroup, Cell, Field, Radio, RadioGroup, Button } from '@antmjs/vantui';
+import Uploader from '@/components/Uploader/index';
+import { getTaCheckAnswerItem } from '@/services/tacheckansweritem';
+
+
+export default (props) => {
+  const { quInfo, answerItem, readonly, onChange, onLoadingChange } = props;
+
+  const setLoading = (v) => {
+    if (onLoadingChange) {
+      onLoadingChange(v);
+    }
+  }
+
+  const setFieldChange = (key, val) => {
+    if (readonly) return;
+
+    onChange({
+      ...(answerItem || {}),
+      quId: quInfo.quId,
+      [key]: val,
+    })
+  }
+
+  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>
+      <RadioGroup value={answerItem?.answerCode}>
+        <CellGroup>
+          <Cell
+            border={false}
+            renderTitle={(
+              <View style={{fontWeight: 'bold'}}>
+                <Text>{quInfo?.sortNo}、</Text>
+                <Text>{quInfo?.title}</Text>
+              </View>
+            )}
+          />
+          {
+            quInfo?.quType == 'fill' && (
+              <Field
+                label="答案:"
+                clearable
+                readonly={readonly}
+                value={answerItem?.answer}
+                placeholder="填写数字"
+                renderButton={quInfo?.fillUnit}
+                onChange={(e) => setFieldChange('answer', e.detail - 0)}
+              />
+            )
+          }
+          {
+            (quInfo?.answerList || []).map((it) => {              
+              return (
+                <Cell
+                  key={it.answerId}
+                  title={it.answer}
+                  clickable
+                  border={false}
+                  onClick={() => setFieldChange('answerCode', it.answerCode)}
+                  renderRightIcon={<Radio checkedColor="var(--main-bg-color)" readonly={readonly} name={it.answerCode}></Radio>}
+                />
+              );
+            })
+          }
+        </CellGroup>
+      </RadioGroup>
+      <CellGroup style={{marginTop: '20px'}}>
+        <Cell title="测评标准" />
+        <Cell
+          renderTitle={
+            <RichText nodes={quInfo?.stand} />
+          }
+        />
+      </CellGroup>
+      <CellGroup style={{marginTop: '20px'}}>        
+        <Cell title="拍照或视频" border={false} />
+
+        <Cell
+          renderTitle={
+            <Uploader
+              disabled={readonly}
+              value={answerItem?.attachList}
+              onChange={e => setFieldChange('attachList',e)}
+            />
+          }
+        />
+      </CellGroup>
+    </View>
+  )
+}

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

@@ -1,13 +0,0 @@
-.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

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

src/pages/check/edit/index.jsx

@@ -1,249 +1,250 @@
-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(false);
-  const [evaluationPage2, setEvaluationPage2] = React.useState(false);
-  const [evaluationPage3, setEvaluationPage3] = React.useState(true);
-  console.log('fff', evaluationPage3);
-  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);
-    console.log('ff', evaluationPage3);
-  }
-
-
-
-  const onChangePage3 = () => {
-    setEvaluationPage3(false);
-  }
-
-  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 >
-    </>
-  )
-}
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View, ScrollView } from '@tarojs/components';
+import { Notify } from '@antmjs/vantui';
+import Page from '@/layouts/index';
+import {
+  getTaCheckItemById,
+  getTaCheckItemByCheck,
+  preCheck,
+  getTaCheckItemAnswer,
+  putTaCheckItemAnswer,
+} from '@/services/tacheckitem';
+import { getTaCheckItemQu } from '@/services/tacheckitemqu';
+import VABC from '@/components/VABC';
+import { ROLE_INSPECTOR } from '@/utils/user';
+import LocForm from './components/LocForm';
+import Question from './components/Question';
+import Footer from './components/Footer/index';
+
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { id, checkId, typ } = router.params;
+
+  const [loading, setLoading] = React.useState(false);
+  const [readonly, setReadonly] = React.useState(false);
+  const [checkItemInfo, setCheckItemInfo] = React.useState();
+  const [quList, setQuList] = React.useState([]);
+  const [index, setIndex] = React.useState(-1);
+  const [answer, setAnswer] = React.useState();
+
+  React.useMemo(() => {
+    if (typ == 'loc') {
+      Taro.setNavigationBarTitle('实地测评');
+    } else {
+      Taro.setNavigationBarTitle('调查问卷');
+    }
+  }, [typ]);
+
+  const onIndexChange = (n) => {
+    if (index == -1 && n != -1) {
+      if (!readonly) {
+        if (!answer?.addr) {
+          Notify.show({
+            message: typ == 'loc' ? '请填写地址' : '请填写小区名称',
+            type: 'warning',
+          })
+          return;
+        }
+        if (!answer?.location) {
+          Notify.show({
+            message: '未能获取定位信息, 请重试',
+            type: 'warning',
+          })
+          return;
+        }
+      }
+    }
+
+    setIndex(n);
+  }
+
+  const onAnswerItemChange = (answerItem, quInfo) => {
+    if (!answerItem) return;
+
+    const an = { ...(answer || {}) }
+    const answerItemList = an.answerItemList || []
+
+    if ((answerItem.answerCode || answerItem.answer) &&
+      answerItem.attachList?.length) {
+      // 说明这一题已经回答完毕
+      quInfo.finished = true
+    } else {
+      quInfo.finished = false
+    }
+
+    // 更新问题列表中是否作答的标志位
+    setQuList(quList.map(x => x.quId == quInfo.quId ? quInfo : x));
+
+    if (answerItemList.length) {
+      let found = false;
+      an.answerItemList = answerItemList.map(x => {
+        if (x.quId == answerItem.quId) {
+          found = true;
+          return answerItem;
+        } else {
+          return x;
+        }
+      });
+
+      if (!found) {
+        answerItemList.push(answerItem);
+        an.answerItemList = answerItemList;
+      }
+    } else {
+      answerItemList.push(answerItem);
+      an.answerItemList = answerItemList;
+    }
+
+    setAnswer(an);
+  }
+
+  // 作答
+  const onSubmit = () => {
+    if (readonly) return;
+
+    const finished = quList.filter(x => x.finished).length == quList.length;
+    if (!answer || !answer.answerItemList || !finished) {
+      Notify.show({
+        message: '请作答完成所有题目',
+        type: 'warning',
+      })
+      return;
+    }
+
+    setLoading(true);
+    putTaCheckItemAnswer(id, answer).then(() => {
+      setLoading(false);
+      const t = setTimeout(() => {
+        clearTimeout(t);
+        Taro.navigateBack({ delta: 1 });
+      }, 1000);
+    }).catch(() => {
+      setLoading(false);
+    });
+  }
+
+  // 查询当前测评点位主记录
+  React.useEffect(() => {
+    if (id) {
+      setLoading(true);
+      getTaCheckItemById(id).then(res => {
+        setLoading(false);
+        setCheckItemInfo(res);
+      }).catch(() => {
+        setLoading(false);
+      });
+    }
+  }, [id]);
+
+  // 查询当前测评调查问卷主记录
+  React.useEffect(() => {
+    if (checkId && typ == 'survey') {
+      setLoading(true);
+      getTaCheckItemByCheck(checkId, typ).then(res => {
+        setLoading(false);
+        setCheckItemInfo(res);
+      }).catch(() => {
+        setLoading(false);
+      });
+    }
+  }, [checkId, typ]);
+
+  // 查询其他信息
+  React.useEffect(() => {
+    if (checkItemInfo?.itemId) {
+      const { itemId } = checkItemInfo;
+      setLoading(true);
+
+      preCheck(itemId, { noSuccesTip: true }).then((checkRes) => {
+        if (checkRes.errorCode < 0) {
+          setLoading(false);
+          Notify.show({
+            message: checkRes.message,
+            type: 'warning',
+          })
+
+          Taro.navigateBack({ delta: 1 })
+          return;
+        }
+
+        if (checkRes.errorCode > 0) {
+          setReadonly(true);
+          // Notify.show({
+          //   message: checkRes.message,
+          //   type: 'warning',
+          // })
+        }
+
+        // 查询我的答案
+        getTaCheckItemAnswer(itemId).then(setAnswer);
+
+        // 查询当前测评主记录的所有问题
+        getTaCheckItemQu({ pageSize: 200, itemId }).then(res => {
+          setLoading(false);
+          setQuList(res.records || []);
+        }).catch(() => {
+          setLoading(false);
+        });
+
+      }).catch(() => {
+        setLoading(false);
+      });
+    }
+  }, [checkItemInfo]);
+
+  return (
+    <Page loading={loading} roles={[ROLE_INSPECTOR]}>
+      <VABC
+        footer={(
+          <Footer
+            value={index}
+            readonly={readonly}
+            list={quList}
+            onChange={onIndexChange}
+            onSubmit={onSubmit}
+          />
+        )}
+      >
+        <ScrollView scrollY style={{ height: '100%' }}>
+          {
+            index == -1 && (
+              <LocForm
+                checkType={typ}
+                readonly={readonly}
+                checkItemInfo={checkItemInfo}
+                answer={answer}
+                onChange={setAnswer}
+                onLoadingChange={setLoading}
+              />
+            )
+          }
+          {
+            quList.map((x, inx) => {
+              const answerItem = answer?.answerItemList?.filter(y => y.quId == x.quId)[0];
+
+              return (
+                index == inx && (
+                  <Question
+                    key={x.quId}
+                    cursor={inx}
+                    readonly={readonly}
+                    quInfo={x}
+                    answerItem={answerItem}
+                    total={quList?.length}
+                    onChange={e => onAnswerItemChange(e, x)}
+                    onPrev={() => onIndexChange(null, -1)}
+                    onNext={() => onIndexChange(null, 1)}
+                    onLoadingChange={setLoading}
+                  />
+                )
+              )
+            })
+          }
+
+        </ScrollView>
+      </VABC>
+    </Page>
+  )
+}

src/pages/check/list/components/Card.jsx

@@ -0,0 +1,51 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View, Text } from '@tarojs/components';
+import { Cell, Button } from '@antmjs/vantui';
+import style from './style.module.less';
+
+export default (props) => {
+  const { detail, onClick } = props;
+
+  const handleClick = (e) => {
+    if (onClick) {
+      onClick(e)
+    }
+  }
+  
+  return (
+    <View className={style['check-card-wrapper']}>
+      <Cell
+        renderTitle={(
+          <View className={style['check-card-title']}>
+            <View>{detail?.title}</View>
+            <View className={style['check-card-subtitle']}>
+              <View>{detail?.startDate}</View>
+              <View>{detail?.endDate}</View>
+            </View>
+          </View>
+        )}
+        renderLabel={(
+          <View className={style['check-card-actions']}>
+            <View>
+              <Button
+                plain
+                type="primary"
+                icon="location-o"
+                onClick={() => handleClick('loc')}
+              >实地测评</Button>
+            </View>
+            <View>
+              <Button
+                plain
+                type="primary"
+                icon="orders-o"
+                onClick={() => handleClick('survey')}
+              >调查问卷</Button>
+            </View>
+          </View>
+        )}
+      />
+    </View>
+  )
+}

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

@@ -0,0 +1,39 @@
+
+.check-card-wrapper {
+  width: calc(100% - var(--main-space) * 2);
+  margin: var(--main-space);
+  background: #FFFFFF;
+  box-shadow: 0px 18px 22px 1px rgba(0,0,0,0.06);
+  border-radius: 8px;
+  overflow: hidden;
+
+  .check-card-title {
+    font-size: 30px;
+    color: #333;
+
+    display: flex;
+
+    & > View {
+      flex: 1;
+    }
+
+    .check-card-subtitle {
+      flex: none;
+      font-size: 24px;
+      color: #757575;
+      margin-left: 1em;
+    }
+  }
+
+  .check-card-actions {
+    display: flex;
+    align-items: center;
+    width: 100%;
+
+    & > view {
+      flex: 1;
+      text-align: center;
+      font-size: 28px;
+    }
+  }
+}

src/pages/check/list/index.jsx

@@ -5,20 +5,33 @@ 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";
-
+import { getTaCheck } from '@/services/tacheck';
+import Card from './components/Card';
 
+const queryParams = {isValid: true};
 export default (props) => {
+
+  const onClick = (typ, item) => {
+    if (typ == 'loc') {
+      Taro.navigateTo({
+        url: `/pages/check/loc/list/index?checkId=${item.checkId}`
+      })
+    } else {
+      Taro.navigateTo({
+        url: `/pages/check/edit/index?checkId=${item.checkId}&typ=${typ}`
+      })
+    }
+  }
+
   return (
     <Page roles={[ROLE_INSPECTOR]}>
-      <Tabs sticky>
-        <Tab title="实地测评">
-          <List />
-        </Tab>
-        <Tab title="问卷调查">
-
-        </Tab>
-      </Tabs>
+      <PowerList
+        request={getTaCheck}
+        params={queryParams}
+        renderItem={item => (
+          <Card key={item.checkId} detail={item} onClick={(e) => onClick(e, item)} />
+        )}
+      />
     </Page>
   )
 }

src/pages/check/loc/edit/components/Footer/index.jsx

@@ -0,0 +1,65 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Button } from '@antmjs/vantui';
+import QuSelect from '../QuSelect';
+import style from './style.module.less';
+
+export default (props) => {
+  const { value, list, readonly, onChange, onSubmit } = props;
+
+  const [isPrev, isFinished] = React.useMemo(() => {
+    const total = list?.length || 0;
+
+    return [
+      value > 0,
+      value >= total - 1,
+    ]
+  }, [value, list]);
+
+  const onPrev = () => {
+    onChange(value - 1);
+  }
+
+  const onNext = () => {
+    if (isFinished) {
+      onSubmit()
+    } else {
+      onChange(value + 1);
+    }
+  }
+  
+  return (
+    <View className={style['qu-footer-wrapper']}>
+      {
+        !readonly && value > -1 && (
+          <View className={style['qu-footer-sel']}>
+            <QuSelect
+              value={value}
+              list={list}
+              onChange={onChange}
+            />
+          </View>
+        )
+      }
+      <View className={style['qu-footer-act']}>
+        {
+          isPrev && <Button type="primary" block plain hairline style={{flex: 1}} onClick={onPrev}>上一题</Button>
+        }
+        {
+          value == -1 ? (
+            <Button type="primary" block style={{flex: 1, marginLeft: isPrev ? '1em' : 0 }} onClick={onNext}>
+              {readonly ? '查看测评' : '开始测评'}
+            </Button>
+          ) : (
+            !(readonly && isFinished) && (
+              <Button type="primary" block style={{flex: 1, marginLeft: isPrev ? '1em' : 0 }} onClick={onNext}>
+                {isFinished ? '提交' : '下一题'}
+              </Button>
+              )
+          )
+        }
+      </View>
+    </View>
+  )
+}

src/pages/check/loc/edit/components/Footer/style.module.less

@@ -0,0 +1,21 @@
+
+.qu-footer-wrapper {
+  width: 100%;
+  overflow: hidden;
+  padding: var(--main-space) 0;
+  background: #fff;
+  display: flex;
+  align-items: center;
+
+  .qu-footer-sel {
+    flex: none;
+    margin-right: 2em;
+  }
+
+  .qu-footer-act {
+    flex: 1;
+    display: flex;
+    overflow: hidden;
+    padding: 0 var(--main-space);
+  }
+}

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

@@ -0,0 +1,61 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { CellGroup, Cell, Field } from '@antmjs/vantui';
+import Map from '@/components/map';
+import { getTaCheckItemAnswer } from '@/services/tacheckitem';
+import mapIcon from '@/assets/icons/marker.png';
+
+export default (props) => {
+  const { checkItemInfo, answer, readonly, onChange, onLoadingChange } = props;
+
+  const [loc, setLoc] = React.useState();
+
+  const setLoading = (v) => {
+    if (onLoadingChange) {
+      onLoadingChange(v)
+    }
+  }
+  
+  const setFieldChange = (key, val) => {
+    onChange({
+      location: loc,
+      ...answer || {},
+      [key]: val,
+    })
+  }
+
+  // 获取答题主记录信息
+  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>
+      <Map location={answer?.location} onLocChange={setLoc} />
+      <CellGroup>
+        <Cell
+          title="点位"
+          value={checkItemInfo?.name}
+        />
+        <Field
+          readonly={readonly}
+          placeholder="请输入地址"
+          value={answer?.addr}
+          leftIcon={mapIcon}
+          onChange={e => setFieldChange('addr', e.detail)}
+        />
+      </CellGroup>
+    </View>
+  )
+}

src/pages/check/loc/edit/components/QuSelect/index.jsx

@@ -0,0 +1,68 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View, Text } from '@tarojs/components';
+import { Popup, Cell, Icon } from '@antmjs/vantui';
+import RatioView from '@/components/RatioView';
+import style from './style.module.less';
+
+const Bar = (props) => {
+  const {cursor, total, onClick} =  props;
+
+  const handleClick = (e) => {
+    if (onClick) {
+      onClick(e);
+    }
+  }
+
+  return (
+    <View className={style['qu-board-title']} onClick={handleClick}>
+      <Icon name="weapp-nav" size={60} color="var(--main-bg-color)" />
+      <Text>{cursor + 1}</Text>
+      <Text> / </Text>
+      <Text>{total}</Text>
+    </View>
+  )
+}
+
+
+export default (props) => {
+  const { value = 0, list, onChange } = props;
+
+  const [show, setShow] = React.useState(false);
+
+  const handleClick = (e, inx) => {
+    e.stopPropagation();
+    setShow(false);
+
+    if (onChange) {
+      onChange(inx);
+    }
+  }
+  
+  return (
+    <View className={style['qu-board-bar']}>
+      <Bar cursor={value} total={list?.length} onClick={() => setShow(true)} />
+      <Popup position="bottom" show={show} onClose={() => setShow(false)}>
+        <View className={style['qu-board-wrapper']}>
+          <Bar cursor={value} total={list?.length} />
+          <View className={style['qu-board-bd']}>
+            {
+              list?.map((it, inx) => {
+                const cls = [
+                  style['qu-board-bd-item'],
+                  it?.finished ? style['qu-board-bd-active'] : false,
+                ].filter(Boolean).join(' ')
+
+                return (
+                  <RatioView key={inx}>
+                    <View className={cls} onClick={e => handleClick(e, inx)}>{inx + 1}</View>
+                  </RatioView>
+                )
+              })
+            }
+          </View>
+        </View>
+      </Popup>
+    </View>
+  )
+}

src/pages/check/loc/edit/components/QuSelect/style.module.less

@@ -0,0 +1,50 @@
+.qu-board-bar {
+  display: inline-block;
+}
+
+.qu-board-title {
+  font-size: 28px;
+  color: #999;
+  font-weight: bold;
+  display: flex;
+  align-items: center;
+  padding: 0 var(--main-space);
+
+  & > text {
+    line-height: 3em;
+    &:first-of-type {
+      margin-left: 0.6em;
+    }
+  }
+}
+
+.qu-board-wrapper {
+  background: #fff;
+
+  .qu-board-bd {
+    padding: var(--main-space) calc(var(--main-space) * 2);
+    display: grid;
+    grid-template-columns: repeat(5, 1fr);
+    row-gap: 36px;
+    column-gap: 36px;
+
+    .qu-board-bd-item {
+      width: 100%;
+      height: 100%;
+      border-radius: 50%;
+      overflow: hidden;
+      display: grid;
+      place-items: center;
+      font-size: 30px;
+      color: #666;
+      font-weight: bold;
+      border: 2px solid var(--main-bg-color);
+
+      &.qu-board-bd-active {
+        color: #fff;
+        border: 2px solid transparent;
+        background-color: var(--main-bg-color);
+      }
+    }
+  }
+}

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

@@ -0,0 +1,107 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View, RichText, Text } from '@tarojs/components';
+import { CellGroup, Cell, Field, Radio, RadioGroup, Button } from '@antmjs/vantui';
+import Uploader from '@/components/Uploader/index';
+import { getTaCheckAnswerItem } from '@/services/tacheckansweritem';
+
+
+export default (props) => {
+  const { quInfo, answerItem, readonly, onChange, onLoadingChange } = props;
+
+  const setLoading = (v) => {
+    if (onLoadingChange) {
+      onLoadingChange(v);
+    }
+  }
+
+  const setFieldChange = (key, val) => {
+    if (readonly) return;
+
+    onChange({
+      ...(answerItem || {}),
+      quId: quInfo.quId,
+      [key]: val,
+    })
+  }
+
+  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>
+      <RadioGroup value={answerItem?.answerCode}>
+        <CellGroup>
+          <Cell
+            border={false}
+            renderTitle={(
+              <View style={{fontWeight: 'bold'}}>
+                <Text>{quInfo?.sortNo}、</Text>
+                <Text>{quInfo?.title}</Text>
+              </View>
+            )}
+          />
+          {
+            quInfo?.quType == 'fill' && (
+              <Field
+                label="答案:"
+                clearable
+                readonly={readonly}
+                value={answerItem?.answer}
+                placeholder="填写数字"
+                renderButton={quInfo?.fillUnit}
+                onChange={(e) => setFieldChange('answer', e.detail - 0)}
+              />
+            )
+          }
+          {
+            (quInfo?.answerList || []).map((it) => {              
+              return (
+                <Cell
+                  key={it.answerId}
+                  title={it.answer}
+                  clickable
+                  border={false}
+                  onClick={() => setFieldChange('answerCode', it.answerCode)}
+                  renderRightIcon={<Radio checkedColor="var(--main-bg-color)" readonly={readonly} name={it.answerCode}></Radio>}
+                />
+              );
+            })
+          }
+        </CellGroup>
+      </RadioGroup>
+      <CellGroup style={{marginTop: '20px'}}>
+        <Cell title="测评标准" />
+        <Cell
+          renderTitle={
+            <RichText nodes={quInfo?.stand} />
+          }
+        />
+      </CellGroup>
+      <CellGroup style={{marginTop: '20px'}}>        
+        <Cell title="拍照或视频" border={false} />
+
+        <Cell
+          renderTitle={
+            <Uploader
+              disabled={readonly}
+              value={answerItem?.attachList}
+              onChange={e => setFieldChange('attachList',e)}
+            />
+          }
+        />
+      </CellGroup>
+    </View>
+  )
+}

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

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

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

@@ -0,0 +1,207 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View, ScrollView } from '@tarojs/components';
+import { Notify } from '@antmjs/vantui';
+import Page from '@/layouts/index';
+import { getTaCheckItemById, preCheck, getTaCheckItemAnswer, putTaCheckItemAnswer } from '@/services/tacheckitem';
+import { getTaCheckItemQu } from '@/services/tacheckitemqu';
+import VABC from '@/components/VABC';
+import { ROLE_INSPECTOR } from '@/utils/user';
+import LocForm from './components/LocForm';
+import Question from './components/Question';
+import Footer from './components/Footer/index';
+
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { id } = router.params;
+
+  const [loading, setLoading] = React.useState(false);
+  const [readonly, setReadonly] = React.useState(false);
+  const [checkItemInfo, setCheckItemInfo] = React.useState();
+  const [quList, setQuList] = React.useState([]);
+  const [index, setIndex] = React.useState(-1);
+  const [answer, setAnswer] = React.useState();
+
+  const onIndexChange = (n) => {
+    if (index == -1 && n != -1) {
+      if (!readonly) {
+        if (!answer?.addr) {
+          Notify.show({
+            message: '请填写地址',
+            type: 'warning',
+          })
+          return;
+        }
+        if (!answer?.location) {
+          Notify.show({
+            message: '未能获取定位信息, 请重试',
+            type: 'warning',
+          })
+          return;
+        }
+      }
+    }
+
+    setIndex(n);
+  }
+
+  const onAnswerItemChange = (answerItem, quInfo) => {
+    if (!answerItem) return;
+
+    const an = {...(answer || {})}
+    const answerItemList = an.answerItemList || []
+
+    if ((answerItem.answerCode || answerItem.answer) &&
+      answerItem.attachList?.length) {
+        // 说明这一题已经回答完毕
+        quInfo.finished = true
+      } else {
+        quInfo.finished = false
+      }
+    
+    // 更新问题列表中是否作答的标志位
+    setQuList(quList.map(x => x.quId == quInfo.quId ? quInfo : x));
+
+    if (answerItemList.length) {
+      let found = false;
+      an.answerItemList = answerItemList.map(x => {
+        if (x.quId == answerItem.quId) {
+          found = true;
+          return answerItem;
+        } else {
+          return x;
+        }
+      });
+
+      if (!found) {
+        answerItemList.push(answerItem);
+        an.answerItemList = answerItemList;
+      }
+    } else {
+      answerItemList.push(answerItem);
+      an.answerItemList = answerItemList;
+    }
+
+    setAnswer(an);
+  }
+
+  // 作答
+  const onSubmit = () => {
+    if (readonly) return;
+
+    const finished = quList.filter(x => x.finished).length == quList.length;
+    if (!answer || !answer.answerItemList || !finished) {
+      Notify.show({
+        message: '请作答完成所有题目',
+        type: 'warning',
+      })
+      return;
+    }
+
+    setLoading(true);
+    putTaCheckItemAnswer(id, answer).then(() => {
+      setLoading(false);
+      const t = setTimeout(() => {
+        clearTimeout(t);
+        Taro.navigateBack({delta: 1});
+      }, 1000);      
+    }).catch(() => {
+      setLoading(false);
+    });
+  }
+
+  React.useEffect(() => {
+    setLoading(true);
+    preCheck(id, { noSuccesTip: true }).then((checkRes) => {
+      if (checkRes.errorCode < 0) {
+        Notify.show({
+          message: checkRes.message,
+          type: 'warning',
+        })
+
+        Taro.navigateBack({delta: 1})
+        return;
+      }
+
+      if (checkRes.errorCode > 0) {
+        setReadonly(true);
+        // Notify.show({
+        //   message: checkRes.message,
+        //   type: 'warning',
+        // })
+      }
+
+      // 查询当前测评点位(问卷)主记录
+      getTaCheckItemById(id).then(res => {
+        setCheckItemInfo(res);
+      });
+      
+      // 查询我的答案
+      getTaCheckItemAnswer(id).then(setAnswer);
+  
+      // 查询当前测评主记录的所有问题
+      getTaCheckItemQu({pageSize: 200, itemId: id}).then(res => {
+        setLoading(false);
+        setQuList(res.records || []);
+      }).catch(() => {
+        setLoading(false);
+      });
+    }).catch(() => {
+      setLoading(false);
+    });
+  }, [id]);
+  
+  return (
+    <Page loading={loading} roles={[ROLE_INSPECTOR]}>
+      <VABC
+        footer={(
+          <Footer
+            value={index}
+            readonly={readonly}
+            list={quList}
+            onChange={onIndexChange}
+            onSubmit={onSubmit}
+          />
+        )}
+      >
+        <ScrollView scrollY style={{height: '100%'}}>
+        {
+          index == -1 && (
+            <LocForm
+              readonly={readonly}
+              checkItemInfo={checkItemInfo}
+              answer={answer}
+              onChange={setAnswer}
+              onLoadingChange={setLoading}
+            />
+          )
+        }
+        {
+          quList.map((x, inx) => {
+            const answerItem = answer?.answerItemList?.filter(y => y.quId == x.quId)[0];
+
+            return (
+              index == inx && (
+                <Question
+                  key={x.quId}
+                  cursor={inx}
+                  readonly={readonly}
+                  quInfo={x}
+                  answerItem={answerItem}
+                  total={quList?.length}
+                  onChange={e => onAnswerItemChange(e, x)}
+                  onPrev={() => onIndexChange(null, -1)}
+                  onNext={() => onIndexChange(null, 1)}
+                  onLoadingChange={setLoading}
+                />
+              )
+            )
+          })
+        }
+          
+        </ScrollView>
+      </VABC>
+    </Page>
+  )
+}

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

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

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

@@ -0,0 +1,51 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Cell, Tag } from '@antmjs/vantui';
+import Page from '@/layouts/index';
+import PowerList from '@/components/PowerList';
+import { getTaCheckItem } from '@/services/tacheckitem';
+import { ROLE_INSPECTOR } from '@/utils/user';
+
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { checkId } = router.params;
+
+  const [loading, setLoading] = React.useState(false);
+
+  const params = React.useMemo(() => ({
+    checkId,
+    itemType: 'loc',
+    pageSize: 100,
+    mustValid: true,
+  }), [checkId]);
+
+  const onClick = (item) => {
+    Taro.navigateTo({
+      url: `/pages/check/edit/index?id=${item.itemId}&typ=${item.itemType}`
+    })
+  }
+  
+  return (
+    <Page loading={loading} roles={[ROLE_INSPECTOR]}>
+      <PowerList
+        request={getTaCheckItem}
+        params={params}
+        renderItem={item => (
+          <Cell
+            isLink
+            key={item.itemId}
+            title={item.name}
+            onClick={() => onClick(item)}
+          >
+            {
+              item.readonly ? <Tag color="var(--main-bg-color)">已答完</Tag> : null
+            }
+          </Cell>
+        )}
+        onLoadingChange={setLoading}
+      />
+    </Page>
+  )
+}

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

@@ -108,7 +108,7 @@ export default (props) => {
     <View>
       <LocType
         show={showLocType}
-        value={formData.addr}
+        value={formData.locId}
         onCancel={() => setShowLocType(false)}
         onChange={onLocTypeChange}
       />

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

@@ -0,0 +1,33 @@
+import React from 'react';
+import { Cell, CellGroup } from '@antmjs/vantui';
+import { View } from '@tarojs/components';
+import Taro from '@tarojs/taro';
+import style from './style.module.less';
+
+export default (props) => {
+
+  const onClick = () => {
+    Taro.navigateTo({
+      url: `/pages/notice/edit/index`
+    })
+  }
+
+  return (
+    <View className={style['notice-card-wrapper']}>
+      <CellGroup>
+        <Cell
+          title="关于2022年模拟测评报告"
+          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>
+          </>
+          )}
+        />
+      </CellGroup>
+    </View>
+  )
+}

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

@@ -0,0 +1,15 @@
+.notice-card-wrapper {
+  width: calc(100% - var(--main-space) * 2);
+  margin: var(--main-space);
+  background: #ffffff;
+  box-shadow: 0px 18px 22px 1px rgba(0, 0, 0, 0.06);
+  border-radius: 8px;
+  overflow: hidden;
+  .notice-card-title {
+    font-weight: bold;
+    display: inline-block;
+  }
+  .notice-card-title2 {
+    display: inline-block;
+  }
+}

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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,25 @@
+.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/edit/index.config.js

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

src/pages/notice/edit/index.jsx

@@ -0,0 +1,11 @@
+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/list/index.config.js

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

src/pages/notice/list/index.jsx

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

src/services/tacheck.js

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

src/services/tacheckansweritem.js

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

src/services/tacheckitem.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request';
+
+/*
+ * 分页查询
+ */
+export const getTaCheckItem = (params) => request('/api/taCheckItem', { params });
+
+/*
+ * 新增数据
+ */
+export const postTaCheckItem = (data) => request('/api/taCheckItem', { data, method: 'post' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getTaCheckItemById = (id) => request(`/api/taCheckItem/${id}`);
+
+/**
+ * 更新数据
+ * @param {*} id
+ * @param {*} data
+ * @returns
+ */
+export const putTaCheckItem = (id, data) => request(`/api/taCheckItem/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteTaCheckItem = (id) => request(`/api/taCheckItem/${id}`, { method: 'delete' });
+
+export const preCheck = (id, opts = {}) => request(`/api/taCheckItem/${id}/answer/pre-check`, { method: 'put', ...opts });
+
+/*
+ * 获取当前答案
+ */
+export const getTaCheckItemAnswer = (id) => request(`/api/taCheckItem/${id}/answer`);
+
+/*
+ * 获取当前答案
+ */
+export const putTaCheckItemAnswer = (id, data) => request(`/api/taCheckItem/${id}/answer`, { method: 'put', data });
+
+/*
+ * 通过测评ID获取测评ITEM
+ */
+export const getTaCheckItemByCheck = (checkId, typ) => request(`/api/taCheck/${checkId}/item/${typ}`);

src/services/tacheckitemqu.js

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

src/utils/request.js

@@ -13,7 +13,7 @@ const getQueryStrByParams = params => {
 
 export default function request(api, options = {}) {
   return new Promise((resolve, reject) => {
-    const { method = 'GET', params, data = {}, header = {}, silent = false, ...cfgs } = options;
+    const { method = 'GET', params, data = {}, header = {}, silent = false, noSuccesTip, ...cfgs } = options;
     const queryStr = params ? getQueryStrByParams(params) : undefined;
     // eslint-disable-next-line no-undef
     const url = queryStr ? `${HOST}${api}?${queryStr}` : `${HOST}${api}`;
@@ -53,15 +53,17 @@ export default function request(api, options = {}) {
       }
 
       if (data.code === 1000) {
-        if (data.data.token) {
+        if (data.data?.token) {
           setToken(data.data.token);
         }
 
         if (!silent && 'GET' !== method.toUpperCase()) {
-          Taro.showToast({
-            title: '操作成功',
-            icon: 'none',
-          })
+          if (!noSuccesTip) {
+            Taro.showToast({
+              title: '操作成功',
+              icon: 'none',
+            })
+          }
         }
 
         resolve(data.data);